commit: 49691c5032ecf81e6dc96b98a04f7df36acbf2ee Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Apr 8 07:28:14 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Apr 8 07:28:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49691c50
media-gfx/fbida: Fix building with CFLAGS=-fno-common Package-Manager: Portage-2.3.96, Repoman-2.3.22 Closes: https://bugs.gentoo.org/713004 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> media-gfx/fbida/fbida-2.14.ebuild | 1 + media-gfx/fbida/files/fbida-2.14-fno-common.patch | 53 +++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild index c7ddbadf36c..9e5d00b136d 100644 --- a/media-gfx/fbida/fbida-2.14.ebuild +++ b/media-gfx/fbida/fbida-2.14.ebuild @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}"/ida-desktop.patch "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch "${FILESDIR}"/${PN}-2.14-Autoconf.patch + "${FILESDIR}"/${PN}-2.14-fno-common.patch ) src_configure() { diff --git a/media-gfx/fbida/files/fbida-2.14-fno-common.patch b/media-gfx/fbida/files/fbida-2.14-fno-common.patch new file mode 100644 index 00000000000..e2f29f6be7f --- /dev/null +++ b/media-gfx/fbida/files/fbida-2.14-fno-common.patch @@ -0,0 +1,53 @@ +--- a/fbi.c ++++ b/fbi.c +@@ -86,7 +86,6 @@ static int img_mem, max_mem_mb; + + /* graphics interface */ + gfxstate *gfx; +-int debug; + + /* framebuffer */ + char *fbdev = NULL; +--- a/filter.c ++++ b/filter.c +@@ -6,8 +6,6 @@ + #include "readers.h" + #include "filter.h" + +-int debug = 0; +- + /* ----------------------------------------------------------------------- */ + + static void +--- a/idaconfig.h ++++ b/idaconfig.h +@@ -17,7 +17,7 @@ + + /* -------------------------------------------------------------------------- */ + +-char *ida_lists; ++extern char *ida_lists; + + void ida_init_config(void); + void ida_read_config(void); +--- a/readers.c ++++ b/readers.c +@@ -7,6 +7,8 @@ + #include "readers.h" + #include "byteorder.h" + ++int debug=0; ++ + /* ----------------------------------------------------------------------- */ + + void load_bits_lsb(unsigned char *dst, unsigned char *src, int width, +--- a/viewer.c ++++ b/viewer.c +@@ -38,7 +38,6 @@ + + #define PROCESS_LINES 16 + +-int debug; + Cursor ptrs[POINTER_COUNT]; + + /* ----------------------------------------------------------------------- */
