Fix build error with gcc12

5 files changed, 63 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 0b93148..36c11d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ sane-backends (1.1.1-6) UNRELEASED; urgency=medium
 
   * debian/rules:
     - Remove # before $(INS_CONF).
+  * Fix build error with gcc12 (Closes: #1013034):
+    - New debian/patches/0200-disable-check-equal-stderr.patch.
+      + Thanks to Nathan Pratta Teodosio <nathan.teodosio@canonical.com>.
 
  -- Jörg Frings-Fürst <debian@jff.email>  Mon, 28 Mar 2022 17:33:56 +0200
 
diff --git a/debian/patches/0011-test.patch b/debian/patches/0011-test.patch
new file mode 100644
index 0000000..d4d4590
--- /dev/null
+++ b/debian/patches/0011-test.patch
@@ -0,0 +1,34 @@
+Index: trunk/frontend/jpegtopdf.c
+===================================================================
+--- trunk.orig/frontend/jpegtopdf.c
++++ trunk/frontend/jpegtopdf.c
+@@ -184,6 +184,7 @@ static SANE_Int _get_current_time( struc
+ 	SANE_Int		ret = SANE_ERR;
+ 	time_t			t;
+ 	long			tz;
++	long			timezone = 0;
+ 
+ 	if ( pt == NULL || sign_c == NULL || ptz_h == NULL || ptz_m == NULL ) {
+ 		goto EXIT;
+@@ -201,7 +202,7 @@ static SANE_Int _get_current_time( struc
+ 		goto EXIT;
+ 	}
+ 	/* get time difference ( OHH'mm' ) */
+-	tz = timezone;
++	tz = timezone; 
+ 	if ( tz > 0 ) {
+ 		*sign_c = '-';
+ 	}
+Index: trunk/configure.ac
+===================================================================
+--- trunk.orig/configure.ac
++++ trunk/configure.ac
+@@ -671,7 +671,7 @@ ALL_BACKENDS="abaton agfafocus apple art
+         mustek_usb mustek_usb2 nec net niash pie pieusb pint \
+         pixma plustek plustek_pp qcam ricoh ricoh2 rts8891 s9036 \
+         sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
+-        stv680 tamarack teco1 teco2 teco3 test u12 umax
++        stv680 tamarack teco1 teco2 teco3 test u12 umax \
+         umax_pp umax1220u v4l xerox_mfp p5"
+ 
+ # If user specifies backends manually then cause configure
diff --git a/debian/patches/0200-disable-check-equal-stderr.patch b/debian/patches/0200-disable-check-equal-stderr.patch
new file mode 100644
index 0000000..3f27ca5
--- /dev/null
+++ b/debian/patches/0200-disable-check-equal-stderr.patch
@@ -0,0 +1,23 @@
+Description: Build fails on GCC12:
+.
+minigtest.h:43:29: error: no match for ‘operator<<’ (operand types are ‘std::basic_ostream<char>’ and ‘const std::vector<long unsigned int>’)
+minigtest.h:43:29: error: no match for ‘operator<<’ (operand types are ‘std::basic_ostream<char>’ and ‘const std::vector<unsigned char>’)
+minigtest.h:43:29: error: no match for ‘operator<<’ (operand types are ‘std::basic_ostream<char>’ and ‘const genesys::Pixel’)
+minigtest.h:43:29: error: no match for ‘operator<<’ (operand types are ‘std::basic_ostream<char>’ and ‘const genesys::RawPixel’)
+minigtest.h:43:29: error: no match for ‘operator<<’ (operand types are ‘std::basic_ostream<char>’ and ‘const genesys::PixelFormat’)
+.
+Simply suppressing the print of the mismatch is the lowest effort workaround.
+Author: Nathan Pratta Teodosio <nathan.teodosio@canonical.com>
+Bug: 1013034
+Forwarded: No
+
+--- a/testsuite/backend/genesys/minigtest.h
++++ b/testsuite/backend/genesys/minigtest.h
+@@ -40,7 +40,6 @@
+         s_num_failures++;
+         std::cerr << "FAILURE at ";
+         print_location(std::cerr, function, path, line);
+-        std::cerr << " :\n" << t << " != " << u << "\n\n";
+     } else {
+         s_num_successes++;
+         std::cerr << "SUCCESS at ";
diff --git a/debian/patches/series b/debian/patches/series
index 4b9da30..d52a695 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+#0011-test.patch
 0195-genesys_fix_total_file_size_exceeding.patch
 0035-trim-libraries-in-sane-backends.pc.in.patch
 0040-remove_git.patch
@@ -21,3 +22,4 @@
 #0180-gt68xx_fix_use-after-free_two_memleaks.patch
 0185-Change_output_from_sane-find-scanner.patch
 #0190-remove-kernel-driver-for-plustek_pp.patch
+0200-disable-check-equal-stderr.patch
diff --git a/debian/rules b/debian/rules
index db84153..c98440b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ endif
 		--enable-pnm-backend \
 		--with-usb \
 		--without-v4l \
-		--disable-locking
+		--disable-locking \
 		$(INS_CONF)
 
 override_dh_autoreconf: