From 925679e5ebd9d1b03519a73879a99a442c9244d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 6 Feb 2022 15:20:19 +0100 Subject: New: 0001-Remove_incorrect_i18n.merge_file_argument.patch; New 0005-Build_error_with_vala.patch --- ...Remove_incorrect_i18n.merge_file_argument.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch (limited to 'debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch') diff --git a/debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch b/debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch new file mode 100644 index 0000000..0fb73d0 --- /dev/null +++ b/debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch @@ -0,0 +1,30 @@ +Fix accessibility conflict of constant and its value +Origin: upstream, https://gitlab.gnome.org/GNOME/simple-scan/-/commit/c50802b213c325cfa957d66955f6de96908710d9 +Forwarded: not-needed +Applied-Upstream: commit: /c50802b213c325cfa957d66955f6de96908710d9 +Last-Update: 2022-02-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/data/meson.build +=================================================================== +--- trunk.orig/data/meson.build ++++ trunk/data/meson.build +@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gsch + install_dir: join_paths (datadir, 'glib-2.0', 'schemas')) + meson.add_install_script ('meson_compile_gschema.py') + +-i18n.merge_file ('desktop-file', +- input: 'simple-scan.desktop.in', ++i18n.merge_file (input: 'simple-scan.desktop.in', + output: 'simple-scan.desktop', + install: true, + install_dir: join_paths (datadir, 'applications'), + po_dir: '../po', + type: 'desktop') + +-i18n.merge_file ('appdata-file', +- input: 'simple-scan.appdata.xml.in', ++i18n.merge_file (input: 'simple-scan.appdata.xml.in', + output: 'simple-scan.appdata.xml', + install: true, + install_dir: join_paths (datadir, 'metainfo'), -- cgit v1.2.3