Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package simple-scan for openSUSE:Factory checked in at 2022-02-06 23:53:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/simple-scan (Old) and /work/SRC/openSUSE:Factory/.simple-scan.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "simple-scan" Sun Feb 6 23:53:19 2022 rev:82 rq:950840 version:40.7 Changes: -------- --- /work/SRC/openSUSE:Factory/simple-scan/simple-scan.changes 2022-01-20 00:12:52.198605101 +0100 +++ /work/SRC/openSUSE:Factory/.simple-scan.new.1898/simple-scan.changes 2022-02-06 23:53:21.023193079 +0100 @@ -1,0 +2,6 @@ +Tue Feb 1 17:41:40 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Add da6626debe00be1a0660f30cf2bf7629186c01d5.patch: Fix build + with meson 0.61.0 and newer. + +------------------------------------------------------------------- New: ---- da6626debe00be1a0660f30cf2bf7629186c01d5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simple-scan.spec ++++++ --- /var/tmp/diff_new_pack.ZMp02o/_old 2022-02-06 23:53:21.515189798 +0100 +++ /var/tmp/diff_new_pack.ZMp02o/_new 2022-02-06 23:53:21.519189772 +0100 @@ -26,6 +26,9 @@ Source0: https://download.gnome.org/sources/simple-scan/40/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM 200.patch dims...@opensuse.org -- Fix accessibility conflict of constant and its value Patch0: https://gitlab.gnome.org/GNOME/simple-scan/-/merge_requests/200.patch +# PATCH-FIX-UPSTREAM da6626debe00be1a0660f30cf2bf7629186c01d5.patch -- Fix build with meson 0.61.0 and newer +Patch1: https://gitlab.gnome.org/GNOME/simple-scan/-/commit/da6626debe00be1a0660f30cf2bf7629186c01d5.patch + BuildRequires: fdupes BuildRequires: meson BuildRequires: pkgconfig ++++++ da6626debe00be1a0660f30cf2bf7629186c01d5.patch ++++++ >From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001 From: r-value <i...@rvalue.moe> 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
