summaryrefslogtreecommitdiff
path: root/debian/patches/0005-Build_error_with_vala.patch
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-02-06 19:47:23 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-02-06 19:47:23 +0100
commit14afa21f4a428f9a6a5788dc1fb8a3507a42d02f (patch)
tree2ca6334d6cc4a21e36eaf26289e2b7de41614b48 /debian/patches/0005-Build_error_with_vala.patch
parent93ed045b57d6a54c8aca76949c0017decbd2b787 (diff)
parent055f6f3e01bb718bfdd61331e1b13b0cdba6d718 (diff)
Merge tag 'debian/40.7-1' into develop
New upstream release
Diffstat (limited to 'debian/patches/0005-Build_error_with_vala.patch')
-rw-r--r--debian/patches/0005-Build_error_with_vala.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/debian/patches/0005-Build_error_with_vala.patch b/debian/patches/0005-Build_error_with_vala.patch
new file mode 100644
index 0000000..76387f0
--- /dev/null
+++ b/debian/patches/0005-Build_error_with_vala.patch
@@ -0,0 +1,20 @@
+Remove incorrect i18n.merge_file argument
+Origin: upstream, https://gitlab.gnome.org/GNOME/simple-scan/-/commit/da6626debe00be1a0660f30cf2bf7629186c01d5
+Bug: https://gitlab.gnome.org/GNOME/simple-scan/-/issues/284
+Forwarded: not-needed
+Last-Update: 2022-02-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/src/simple-scan.vala
+===================================================================
+--- trunk.orig/src/simple-scan.vala
++++ trunk/src/simple-scan.vala
+@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Applicatio
+ static bool show_version;
+ static bool debug_enabled;
+ static string? fix_pdf_filename = null;
+- public const OptionEntry[] options =
++ const OptionEntry[] options =
+ {
+ { "version", 'v', 0, OptionArg.NONE, ref show_version,
+ /* Help string for command line --version flag */