evince: upgrade 41.4 -> 42.1

* Backported patch can go
* Release notes are huge. For details check 'news'-links in [1]

[1] https://download.gnome.org/sources/evince/42/

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 1 insertions, 54 deletions

diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch b/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch
deleted file mode 100644
index 68447bec8b..0000000000
--- a/meta-gnome/recipes-gnome/evince/evince/0001-Remove-incorrect-args-for-i18n.merge_file.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b525a64d26bcba4e3a74f09c580429625d8a2104 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
-
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- 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 14629f2..2f972a8 100644
---- a/backend/meson.build
-+++ b/backend/meson.build
-@@ -53,7 +53,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 8a308b8..afc3020 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 07fb8ec..0bb5d0f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -498,7 +498,6 @@ install_headers(
- appdata = ev_namespace + '.appdata.xml'
- 
- i18n.merge_file(
--  appdata,
-   input: appdata + '.in',
-   output: appdata,
-   po_dir: po_dir,
diff --git a/meta-gnome/recipes-gnome/evince/evince_41.4.bb b/meta-gnome/recipes-gnome/evince/evince_42.1.bb
index 6b3479c264..2e22f2e703 100644
--- a/meta-gnome/recipes-gnome/evince/evince_41.4.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_42.1.bb
@@ -24,8 +24,7 @@ inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection g
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
-SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch"
-SRC_URI[archive.sha256sum] = "ff245240f230922bec32a4d7b0a1d91b247a83d13484f99b74035d51eb232130"
+SRC_URI[archive.sha256sum] = "b24767bb3d5103b4e35b0e15cf033dbe2488f88700cdd882d22a43adeec2e80a"
 
 GTKDOC_MESON_OPTION = "gtk_doc"