Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package evince for openSUSE:Factory checked in at 2022-02-06 23:53:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evince (Old) and /work/SRC/openSUSE:Factory/.evince.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evince" Sun Feb 6 23:53:44 2022 rev:162 rq:951412 version:41.3 Changes: -------- --- /work/SRC/openSUSE:Factory/evince/evince.changes 2021-11-24 23:54:26.764484345 +0100 +++ /work/SRC/openSUSE:Factory/.evince.new.1898/evince.changes 2022-02-06 23:54:43.230644504 +0100 @@ -1,0 +2,7 @@ +Tue Feb 1 13:09:00 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Add 1060b24d051607f14220f148d2f7723b29897a54.patch: Fix build + with meson 0.60.0 and newer. +- Tweak our Provides/Obsolete of browser-plugin. + +------------------------------------------------------------------- New: ---- 1060b24d051607f14220f148d2f7723b29897a54.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evince.spec ++++++ --- /var/tmp/diff_new_pack.8LdBsn/_old 2022-02-06 23:54:44.590635306 +0100 +++ /var/tmp/diff_new_pack.8LdBsn/_new 2022-02-06 23:54:44.594635280 +0100 @@ -1,7 +1,7 @@ # # spec file for package evince # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,8 @@ Patch6: 0004-reversed-synctex-Annotate-functions-that-wrap-vfprintf.patch Patch7: 0005-reversed-synctex-Fix-compilation.patch Patch8: 0006-reversed-synctex-Update-from-version-1.18-to-1.21.patch +# PATCH-FIX-UPSTREAM 1060b24d051607f14220f148d2f7723b29897a54.patch -- Fix build with meson 0.60.0 and newer +Patch9: https://gitlab.gnome.org/GNOME/evince/-/commit/1060b24d051607f14220f148d2f7723b29897a54.patch BuildRequires: c_compiler BuildRequires: fdupes @@ -75,8 +77,8 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(zlib) # Disable the browser plugin and package, and make main package provide-obsolete plugin package for upgrade; see bgo#738270 -Provides: evince-browser-plugin -Obsoletes: evince-browser-plugin +Provides: evince-browser-plugin = %{version} +Obsoletes: evince-browser-plugin < 41.2 %description Evince is a document viewer capable of displaying single-page and multi-page @@ -223,6 +225,7 @@ %patch7 -p1 %patch8 -p1 %endif +%patch9 -p1 %build %meson \ ++++++ 1060b24d051607f14220f148d2f7723b29897a54.patch ++++++ >From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001 From: r-value <i...@rvalue.moe> Date: Wed, 17 Nov 2021 18:22:45 +0800 Subject: [PATCH] Remove incorrect args for i18n.merge_file `i18n.merge_file` has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.60.0 --- backend/meson.build | 1 - data/meson.build | 1 - meson.build | 1 - 3 files changed, 3 deletions(-) diff --git a/backend/meson.build b/backend/meson.build index e44c1d6d7..ab3df9acf 100644 --- a/backend/meson.build +++ b/backend/meson.build @@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends ) i18n.merge_file( - appstream, input: appstream_in, output: appstream, po_dir: po_dir, diff --git a/data/meson.build b/data/meson.build index 8a308b853..afc302098 100644 --- a/data/meson.build +++ b/data/meson.build @@ -15,7 +15,6 @@ foreach desktop: desktops ) i18n.merge_file( - desktop, type: 'desktop', input: desktop_in, output: desktop, diff --git a/meson.build b/meson.build index 34c86661f..f74efb3c4 100644 --- a/meson.build +++ b/meson.build @@ -492,7 +492,6 @@ install_headers( appdata = ev_namespace + '.appdata.xml' i18n.merge_file( - appdata, input: appdata + '.in', output: appdata, po_dir: po_dir, -- GitLab
