diff options
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/patches/0011-test.patch | 34 | ||||
| -rw-r--r-- | debian/patches/0200-disable-check-equal-stderr.patch | 23 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rw-r--r-- | debian/sane-utils.postinst | 11 | ||||
| -rw-r--r-- | debian/sane-utils.postrm | 6 |
7 files changed, 82 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 93a91d7..67966a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +sane-backends (1.1.1-6) unstable; 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>. + * debian/sane-utils.postrm: + - Fix purge error (Closes: #1008822). + * debian/sane-utils.postinst: + - Fix inetd handling (Closes: #1009354). + + -- Jörg Frings-Fürst <debian@jff.email> Sun, 02 Oct 2022 09:54:28 +0200 + sane-backends (1.1.1-5) unstable; urgency=medium * debian/rules: 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 838508d..c98440b 100755 --- a/debian/rules +++ b/debian/rules @@ -56,8 +56,8 @@ endif --enable-pnm-backend \ --with-usb \ --without-v4l \ - --disable-locking -# $(INS_CONF) + --disable-locking \ + $(INS_CONF) override_dh_autoreconf: dh_autoreconf -Xlibtool.m4 diff --git a/debian/sane-utils.postinst b/debian/sane-utils.postinst index b026a6e..b334d59 100644 --- a/debian/sane-utils.postinst +++ b/debian/sane-utils.postinst @@ -31,11 +31,12 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then db_get sane-utils/saned_scanner_group SANED_IN_SCANNER="$RET" - # Add saned service, disabled by default - pathfind update-inetd - if [ $? = 0 ]; then - update-inetd --add "#<off># sane-port\tstream\ttcp\tnowait\tsaned:saned\t/usr/sbin/saned saned" - fi + if [ -f /etc/inetd.conf ]; then + # Add saned service, disabled by default + if pathfind update-inetd ; then + update-inetd --add "#<off># sane-port\tstream\ttcp\tnowait\tsaned:saned\t/usr/sbin/saned saned" + fi + fi # Stop debconf; output to stdout after this point. update-inetd needs debconf. db_stop diff --git a/debian/sane-utils.postrm b/debian/sane-utils.postrm index f5a0394..c748af6 100644 --- a/debian/sane-utils.postrm +++ b/debian/sane-utils.postrm @@ -1,10 +1,6 @@ #!/bin/sh set -e -# -# set -e are disabled because pathfind update-inetd -# gives an piuparts error. -# # # POSIX-compliant shell function @@ -54,8 +50,8 @@ if [ "$1" = purge ] ; then # remove user / group # if pathfind deluser ; then - deluser -q --group --system saned || true deluser -q --system --remove-home saned || true + deluser -q --group --system saned || true fi fi |