Package: efax-gtk Version: 3.2.8-2.1 Followup-For: Bug #957165 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu hirsute ubuntu-patch Control: tags -1 patch
Hi, In Ubuntu, the attached patch was applied to achieve the following: * d/p/gcc-10: Cherrypick/adapt upstream Git commit to fix FTBFS with GCC 10. Thanks for considering the patch. Logan
diff -Nru efax-gtk-3.2.8/debian/patches/gcc-10 efax-gtk-3.2.8/debian/patches/gcc-10 --- efax-gtk-3.2.8/debian/patches/gcc-10 1969-12-31 19:00:00.000000000 -0500 +++ efax-gtk-3.2.8/debian/patches/gcc-10 2021-01-19 22:05:35.000000000 -0500 @@ -0,0 +1,36 @@ +From 2158c724571bb424b0c20a071c3de17da5f2becb Mon Sep 17 00:00:00 2001 +From: Chris Vine <cv...@users.sourceforge.net> +Date: Tue, 2 Jun 2020 23:37:47 +0100 +Subject: [PATCH] Fix build for gcc-10 + +--- + ChangeLog | 6 ++ + efax/Makefile.am | 3 +- + efax/efaxlib.c | 2 + + efax/efaxlib.h | 2 +- + efax/efaxlib.h.orig | 226 ++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 237 insertions(+), 2 deletions(-) + create mode 100644 efax/efaxlib.h.orig + +--- a/efax/efaxlib.c ++++ b/efax/efaxlib.c +@@ -27,6 +27,8 @@ + #define DEFWIDTH 1728 /* 215x297 mm image at fax resolution */ + #define DEFHEIGHT 2287 + ++uchar reversebits [ 256 ], normalbits [ 256 ] ; ++ + extern t4tab wtab [ ( 64 + 27 + 13 ) + 1 ] ; /* T.4 coding tables */ + extern t4tab btab [ ( 64 + 27 + 13 ) + 1 ] ; + +--- a/efax/efaxlib.h ++++ b/efax/efaxlib.h +@@ -208,7 +208,7 @@ + /* Bit reversal lookup tables (note that the `normalbits' array + is the one actually used for the bit reversal. */ + +-uchar reversebits [ 256 ], normalbits [ 256 ] ; ++extern uchar reversebits [ 256 ], normalbits [ 256 ] ; + + void initbittab(void) ; + diff -Nru efax-gtk-3.2.8/debian/patches/series efax-gtk-3.2.8/debian/patches/series --- efax-gtk-3.2.8/debian/patches/series 2010-11-13 14:26:08.000000000 -0500 +++ efax-gtk-3.2.8/debian/patches/series 2021-01-19 22:03:48.000000000 -0500 @@ -1,2 +1,3 @@ desktop efax-manpages +gcc-10
