- updated to 42.0

- added no-update patch (don't require gtk4-update-icon-cache at build time)
- dropped librsvg patch (we already have rusted librsvg)

diff --git a/eog-no-update.patch b/eog-no-update.patch
new file mode 100644 (file)
index 0000000..6f37ecf
--- /dev/null
+++ b/eog-no-update.patch
@@ -0,0 +1,14 @@
+--- eog-42.0/meson.build.orig  2022-03-19 21:06:05.357460000 +0100
++++ eog-42.0/meson.build       2022-04-08 16:10:49.643008327 +0200
+@@ -250,11 +250,6 @@ configure_file(
+   configuration: config_h,
+ )
+ 
+-gnome.post_install(
+-  glib_compile_schemas: true,
+-  gtk_update_icon_cache: true,
+-)
+-
+ summary({
+   'Source code location': source_root,
+   'Compiler': cc.get_id(),

diff --git a/eog.spec b/eog.spec
index da5d1a88a17152e8730d465adfc5684b8f310891..96b30d7283dcc2a015fb78a974c093fc99601c2c 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -7,13 +7,13 @@ Summary:      The Eye of GNOME image viewer
 Summary(pl.UTF-8):     Oko GNOME - przeglądarka obrazków
 Summary(pt_BR.UTF-8):  Visualizador de imagem Eye of GNOME
 Name:          eog
-Version:       41.1
+Version:       42.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
-Source0:       https://download.gnome.org/sources/eog/41/%{name}-%{version}.tar.xz
-# Source0-md5: 9a0e19d63acddbff9d54d1696f358455
-Patch0:                librsvg.patch
+Source0:       https://download.gnome.org/sources/eog/42/%{name}-%{version}.tar.xz
+# Source0-md5: f9d0815f6658db80a26c766bdb9adbb1
+Patch0:                %{name}-no-update.patch
 URL:           https://wiki.gnome.org/Apps/EyeOfGnome
 BuildRequires: docbook-dtd412-xml
 BuildRequires: exempi-devel >= 1.99.5
@@ -22,16 +22,19 @@ BuildRequires:      gettext-tools >= 0.19.7
 BuildRequires: glib2-devel >= 1:2.54.0
 BuildRequires: gnome-desktop-devel >= 3.2.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
-BuildRequires: gsettings-desktop-schemas-devel >= 3.4.0
-BuildRequires: gtk+3-devel >= 3.22.0
+BuildRequires: gsettings-desktop-schemas-devel >= 42
+BuildRequires: gtk+3-devel >= 3.24.15
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.16}
 BuildRequires: lcms2-devel >= 2
 BuildRequires: libexif-devel >= 1:0.6.14
+BuildRequires: libhandy1-devel >= 1.5.0
 BuildRequires: libjpeg-turbo-devel
+BuildRequires: libpeas-devel >= 1.0.0
 BuildRequires: libpeas-gtk-devel >= 1.0.0
-BuildRequires: libportal-devel >= 0.3
-%{?with_librsvg:BuildRequires: librsvg-devel >= 2.40.0}
-BuildRequires: meson >= 0.50.0
+BuildRequires: libportal-devel >= 0.5
+BuildRequires: libportal-gtk3-devel >= 0.5
+%{?with_librsvg:BuildRequires: librsvg-devel >= 2.44.0}
+BuildRequires: meson >= 0.58.0
 BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: rpm-build >= 4.6
@@ -50,9 +53,10 @@ Requires:    exempi >= 1.99.5
 Requires:      gdk-pixbuf2 >= 2.36.5
 Requires:      glib2 >= 1:2.54.0
 Requires:      gsettings-desktop-schemas >= 3.4.0
-Requires:      gtk+3 >= 3.22.0
+Requires:      gtk+3 >= 3.24.15
 Requires:      hicolor-icon-theme
 Requires:      libexif >= 1:0.6.14
+Requires:      libhandy1 >= 1.5.0
 %{?with_rsvg:Requires: librsvg >= 2.44.0}
 Requires:      shared-mime-info >= 0.50
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,7 +76,7 @@ Summary:      Header files for eog
 Summary(pl.UTF-8):     Pliki nagłówkowe eog
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      gtk+3-devel >= 3.22.0
+Requires:      gtk+3-devel >= 3.24.15
 
 %description devel
 Header files for eog.

diff --git a/librsvg.patch b/librsvg.patch
deleted file mode 100644 (file)
index b9072a7..0000000
--- a/librsvg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- eog-41.0/meson.build.orig  2021-09-18 23:35:28.033842600 +0200
-+++ eog-41.0/meson.build       2021-09-25 11:35:55.586686479 +0200
-@@ -206,7 +206,7 @@ config_h.set('HAVE_INTROSPECTION', enabl
- # RSVG (optional for scaling svg image)
- enable_librsvg = get_option('librsvg')
- if enable_librsvg
--  common_deps += dependency('librsvg-2.0', version: '>= 2.44.0')
-+  common_deps += dependency('librsvg-2.0', version: '>= 2.40.0')
- endif
- config_h.set('HAVE_RSVG', enable_librsvg)
-