- updated to 42.1

- updated icon-theme patch, removed obsolete meson patch

diff --git a/evince-meson.patch b/evince-meson.patch
deleted file mode 100644 (file)
index 9f24044..0000000
--- a/evince-meson.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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,

diff --git a/evince.spec b/evince.spec
index 3160d2228f15bc0d8611a10579c9fd6e273496b8..d250c58bf87fb7fb2d0deb8082a001e0196fc982 100644 (file)
--- a/evince.spec
+++ b/evince.spec
@@ -10,14 +10,13 @@
 Summary:       Document viewer for multiple document formats
 Summary(pl.UTF-8):     Przeglądarka dokumentów w wielu formatach
 Name:          evince
-Version:       41.4
+Version:       42.1
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
-Source0:       https://download.gnome.org/sources/evince/41/%{name}-%{version}.tar.xz
-# Source0-md5: 920d88772c8e1a91027aec643258db4e
+Source0:       https://download.gnome.org/sources/evince/42/%{name}-%{version}.tar.xz
+# Source0-md5: 6d5410e00aa9219c97eb3fc6f40a2630
 Patch0:                icon-theme.patch
-Patch1:                %{name}-meson.patch
 URL:           https://wiki.gnome.org/Apps/Evince
 BuildRequires: cairo-devel >= 1.10.0
 BuildRequires: dbus-devel
@@ -33,11 +32,11 @@ BuildRequires:      gspell-devel >= 1.6.0
 BuildRequires: gstreamer-devel >= 1.0
 BuildRequires: gstreamer-plugins-base-devel >= 1.0
 BuildRequires: gtk+3-devel >= 3.22.0
-%{?with_apidocs:BuildRequires: gtk-doc >= 1.13}
+%{?with_apidocs:BuildRequires: gi-docgen >= 2021.1}
 BuildRequires: kpathsea-devel
-BuildRequires: libarchive-devel >= 3.2.0
+BuildRequires: libarchive-devel >= 3.6.0
 BuildRequires: libgxps-devel >= 0.2.1
-BuildRequires: libhandy1-devel >= 1.0.0
+BuildRequires: libhandy1-devel >= 1.5.0
 BuildRequires: libsecret-devel >= 0.5
 BuildRequires: libspectre-devel >= 0.2.0
 BuildRequires: libstdc++-devel
@@ -48,7 +47,7 @@ BuildRequires:        meson >= 0.53.0
 BuildRequires: ninja >= 1.5
 %{?with_nautilus:BuildRequires:        nautilus-devel >= 3.28.0}
 BuildRequires: pkgconfig
-BuildRequires: poppler-glib-devel >= 0.86.0
+BuildRequires: poppler-glib-devel >= 22.02.0
 BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.752
@@ -71,8 +70,8 @@ Requires:     gsettings-desktop-schemas
 Requires:      gspell >= 1.6.0
 Requires:      gtk-update-icon-cache
 Requires:      hicolor-icon-theme
-Requires:      libarchive >= 3.2.0
-Requires:      libhandy1 >= 1.0.0
+Requires:      libarchive >= 3.6.0
+Requires:      libhandy1 >= 1.5.0
 Requires:      libsecret >= 0.5
 Requires:      xorg-lib-libSM >= 1.0.0
 Suggests:      evince-backend-djvu
@@ -184,7 +183,7 @@ Summary(pl.UTF-8):  Przeglądanie dokumentów PDF przy użyciu Evince
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      libxml2 >= 1:2.6.31
-Requires:      poppler-glib >= 0.86.0
+Requires:      poppler-glib >= 22.02.0
 
 %description backend-pdf
 View PDF documents with Evince.
@@ -221,7 +220,6 @@ Przeglądanie dokumentów XPS przy użyciu Evince.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %meson build \
@@ -236,6 +234,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %ninja_install -C build
 
+%if %{with apidocs}
+# FIXME: where to package gi-docgen generated docs?
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/libev* $RPM_BUILD_ROOT%{_gtkdocdir}
+%endif
+
 %find_lang %{name} --with-gnome
 
 %clean
@@ -307,9 +311,8 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/evince
-%{_gtkdocdir}/libevdocument-3.0
-%{_gtkdocdir}/libevview-3.0
+%{_gtkdocdir}/libevdocument
+%{_gtkdocdir}/libevview
 %endif
 
 %files backend-djvu

diff --git a/icon-theme.patch b/icon-theme.patch
index f565e467e4fd6a8e9931e24ff81e44d29a67e80c..cbba219a594d648cf01cbd0372a3c0221824d35b 100644 (file)
--- a/icon-theme.patch
+++ b/icon-theme.patch
@@ -14,14 +14,14 @@
  
    # *** Nautilus property page build ***
    enable_nautilus = get_option('nautilus')
---- evince-3.38.0/shell/meson.build.orig       2020-09-12 21:36:51.862926000 +0200
-+++ evince-3.38.0/shell/meson.build    2020-09-20 10:41:51.863522110 +0200
-@@ -92,8 +92,6 @@
+--- evince-42.1/shell/meson.build.orig 2022-04-09 07:55:47.659825723 +0200
++++ evince-42.1/shell/meson.build      2022-04-09 08:05:33.756650564 +0200
+@@ -80,8 +80,6 @@ if ev_platform == 'win32'
      output: resource,
      command: [find_program('windres'), '@INPUT@', '-I', data_dir, '@OUTPUT@'],
    )
 -else
--  deps += adwaita_icon_theme_dep
+-  evince_deps += adwaita_icon_theme_dep
  endif
  
  if enable_dbus