diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch deleted file mode 100644 index e193747322c..00000000000 --- a/srcpkgs/simple-scan/patches/meson-0.61.patch +++ /dev/null @@ -1,37 +0,0 @@ -From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001 -From: r-value -Date: Tue, 16 Nov 2021 02:43:11 +0800 -Subject: [PATCH] Remove incorrect i18n.merge_file argument - -The positional argument was being silently ignored until meson 0.60.0 where -it fails with "ERROR: Function does not take positional arguments". ---- - data/meson.build | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 2b5a0ee3..cf6e4ae1 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml', - 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'), --- -GitLab - diff --git a/srcpkgs/simple-scan/patches/vala-0.56.patch b/srcpkgs/simple-scan/patches/vala-0.56.patch deleted file mode 100644 index 0820cee20e4..00000000000 --- a/srcpkgs/simple-scan/patches/vala-0.56.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c50802b213c325cfa957d66955f6de96908710d9 Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Sat, 6 Nov 2021 19:46:07 +0100 -Subject: [PATCH] Fix accessibility conflict of constant and its value - ---- - src/simple-scan.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/simple-scan.vala b/src/simple-scan.vala -index c15a5418..71f32de9 100644 ---- a/src/simple-scan.vala -+++ b/src/simple-scan.vala -@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application - 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 */ --- -GitLab - diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template index 50ac5f2ea0b..effd37a933e 100644 --- a/srcpkgs/simple-scan/template +++ b/srcpkgs/simple-scan/template @@ -1,6 +1,6 @@ # Template file for 'simple-scan' pkgname=simple-scan -version=40.7 +version=42.1 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala" @@ -10,5 +10,6 @@ short_desc="GTK Simple scanning utility" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/simple-scan" +changelog="https://gitlab.gnome.org/GNOME/simple-scan/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7c551852cb5af7d34aa989f8ad5ede3cbe31828cf8dd5aec2b2b6fdcd1ac3d53 +checksum=859bc0611c1769b5bdaba9639deed359f50474c2eecf58bbbfd7ce21911b2226