summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0190-Fix_scanimage_help.patch20
-rw-r--r--debian/patches/0205-ftbfs_with_GCC-15.patch22
-rw-r--r--debian/patches/series2
3 files changed, 44 insertions, 0 deletions
diff --git a/debian/patches/0190-Fix_scanimage_help.patch b/debian/patches/0190-Fix_scanimage_help.patch
new file mode 100644
index 0000000..9d0901f
--- /dev/null
+++ b/debian/patches/0190-Fix_scanimage_help.patch
@@ -0,0 +1,20 @@
+Description: Fix scanimage --help output
+Author: Jörg Frings-Fürst <debian@jff.email>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1094671
+Forwarded: https://gitlab.com/sane-project/backends/-/issues/795
+Last-Update: 2025-03-16
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/frontend/scanimage.c
+===================================================================
+--- trunk.orig/frontend/scanimage.c
++++ trunk/frontend/scanimage.c
+@@ -2372,7 +2372,7 @@ Parameters are separated by a blank from
+ %%n (newline)\n\
+ -b, --batch[=FORMAT] working in batch mode, FORMAT is `out%%d.pnm' `out%%d.tif'\n\
+ `out%%d.png' or `out%%d.jpg' by default depending on --format\n\
+- This option is incompatible with --output-file.");
++ This option is incompatible with --output-file.\n");
+ printf ("\
+ --batch-start=# page number to start naming files with\n\
+ --batch-count=# how many pages to scan in batch mode\n\
diff --git a/debian/patches/0205-ftbfs_with_GCC-15.patch b/debian/patches/0205-ftbfs_with_GCC-15.patch
new file mode 100644
index 0000000..54a7421
--- /dev/null
+++ b/debian/patches/0205-ftbfs_with_GCC-15.patch
@@ -0,0 +1,22 @@
+Description: Fix ftbfs with GCC-15
+Author: <name and email of author, optional>
+Origin: https://gitlab.com/sane-project/backends/-/commit/f5736eb50c3be88428f7d629b20c5c514df85b82
+Bug: https://gitlab.com/sane-project/backends/-/issues/796
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097841
+Last-Update: 2025-03-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/backend/sm3600.h
+===================================================================
+--- trunk.orig/backend/sm3600.h
++++ trunk/backend/sm3600.h
+@@ -77,7 +77,8 @@ Start: 2.4.2001
+
+ /* ====================================================================== */
+
+-typedef enum { false, true } TBool;
++#include <stdbool.h>
++typedef bool TBool;
+
+ typedef SANE_Status TState;
+
diff --git a/debian/patches/series b/debian/patches/series
index 5b54a3b..6e62f3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,5 @@
0610-fix_groff_font_warnings.patch
0180-Escl_force_idle_status.patch
0185-fix_memory.patch
+0190-Fix_scanimage_help.patch
+0205-ftbfs_with_GCC-15.patch