diff --git a/fbida.gcc10.patch b/fbida.gcc10.patch new file mode 100644 index 0000000..ccafd63 --- /dev/null +++ b/fbida.gcc10.patch @@ -0,0 +1,54 @@ +--- fbida-2.14/fbi.c.org 2020-03-15 17:02:17.944189632 +0100 ++++ fbida-2.14/fbi.c 2020-03-15 17:02:21.880223224 +0100 +@@ -100,7 +100,6 @@ + + /* graphics interface */ + gfxstate *gfx; +-int debug; + + /* framebuffer */ + char *fbdev = NULL; +--- fbida-2.14/filter.c 2020-03-15 16:44:17.159855150 +0100 ++++ fbida-2.14/filter.c 2020-03-15 16:44:27.017941447 +0100 +@@ -6,8 +6,6 @@ + #include "readers.h" + #include "filter.h" + +-int debug = 0; +- + /* ----------------------------------------------------------------------- */ + + static void +--- fbida-2.14/readers.c.org 2020-03-15 17:01:18.692683597 +0100 ++++ fbida-2.14/readers.c 2020-03-15 16:57:19.141632384 +0100 +@@ -6,6 +6,8 @@ + + #include "readers.h" + ++int debug=0; ++ + /* ----------------------------------------------------------------------- */ + + void load_bits_lsb(unsigned char *dst, unsigned char *src, int width, + +--- fbida-2.14/viewer.c.org 2020-03-15 17:05:02.991595832 +0100 ++++ fbida-2.14/viewer.c 2020-03-15 17:04:55.424531467 +0100 +@@ -40,7 +40,6 @@ + #define PROCESS_LINES 16 + +-int debug; + Cursor ptrs[POINTER_COUNT]; + + /* ----------------------------------------------------------------------- */ + +--- fbida-2.14/idaconfig.h.org 2020-03-15 17:07:09.239668196 +0100 ++++ fbida-2.14/idaconfig.h 2020-03-15 17:07:21.248770061 +0100 +@@ -17,7 +17,7 @@ + + /* -------------------------------------------------------------------------- */ + +-char *ida_lists; ++extern char *ida_lists; + + void ida_init_config(void); + void ida_read_config(void); diff --git a/fbida.spec b/fbida.spec index ec99da7..5d72940 100644 --- a/fbida.spec +++ b/fbida.spec @@ -22,6 +22,7 @@ BuildRequires: libwebp-devel BuildRequires: perl-generators BuildRequires: gcc Requires: ImageMagick dejavu-sans-mono-fonts +Patch0: fbida.gcc10.patch %description fbi displays the specified file(s) on the linux console using the @@ -51,9 +52,10 @@ editing functions are available too. %prep %setup -q +%patch0 -p1 %build -LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags} all +LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags} all verbose=1 %install cd man