From 00d2da881e67c379e9299a76409f8d14c87dee1743d9aa079e77d8d32683ce05 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 10 Jan 2022 11:31:19 +0000 Subject: [PATCH 1/3] Accepting request 944923 from GNOME:Next - Add f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch: Update libportal usage. Libportal 0.5 is the first release with a stable API so some changes were made. Following this, add pkgconfig(libportal-gtk3) BuildRequires, new dependency. OBS-URL: https://build.opensuse.org/request/show/944923 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog?expand=0&rev=286 --- eog.changes | 8 ++ eog.spec | 7 +- ...6b1ba33e87766dd9a1b227a3607d863d2197.patch | 77 +++++++++++++++++++ 3 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch diff --git a/eog.changes b/eog.changes index f9b1bd8..99d65fb 100644 --- a/eog.changes +++ b/eog.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Jan 8 14:17:56 UTC 2022 - Bjørn Lie + +- Add f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch: Update + libportal usage. Libportal 0.5 is the first release with a stable + API so some changes were made. Following this, add + pkgconfig(libportal-gtk3) BuildRequires, new dependency. + ------------------------------------------------------------------- Sat Dec 4 17:30:44 UTC 2021 - Bjørn Lie diff --git a/eog.spec b/eog.spec index 961cc6a..f5ad546 100644 --- a/eog.spec +++ b/eog.spec @@ -1,7 +1,7 @@ # # spec file for package eog # -# 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 @@ -24,6 +24,8 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Graphics/Viewers URL: https://wiki.gnome.org/Apps/EyeOfGnome Source0: https://download.gnome.org/sources/eog/41/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch -- Update libportal usage +Patch0: https://gitlab.gnome.org/GNOME/eog/-/commit/f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch BuildRequires: fdupes BuildRequires: gtk-doc @@ -45,7 +47,8 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libpeas-1.0) >= 0.7.4 BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 0.7.4 -BuildRequires: pkgconfig(libportal) >= 0.3 +BuildRequires: pkgconfig(libportal) >= 0.5 +BuildRequires: pkgconfig(libportal-gtk3) >= 0.5 BuildRequires: pkgconfig(librsvg-2.0) >= 2.44.0 BuildRequires: pkgconfig(shared-mime-info) >= 0.20 diff --git a/f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch b/f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch new file mode 100644 index 0000000..d7dc8ff --- /dev/null +++ b/f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch @@ -0,0 +1,77 @@ +From a06e6325907e136678b0bbe7058c25d688034afd Mon Sep 17 00:00:00 2001 +From: Patrick Griffis +Date: Tue, 21 Dec 2021 16:35:36 -0600 +Subject: [PATCH] Update libportal usage + +libportal 0.5 is the first release with a stable API so some changes +were made. +--- + meson.build | 8 ++++++-- + org.gnome.Eog.json | 9 +++++---- + src/eog-util.c | 2 +- + 3 files changed, 12 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 9a32e4bb..9d49aa45 100644 +--- a/meson.build ++++ b/meson.build +@@ -165,11 +165,15 @@ config_h.set('HAVE_EXEMPI', enable_xmp) + # xdg-desktop-portal support with libportal (optional) + enable_libportal = get_option('libportal') + if enable_libportal +- libportal_dep = dependency('libportal', version: '>= 0.3', required: false) ++ libportal_dep = dependency('libportal', version: '>= 0.5', required: false) + assert(libportal_dep.found() and cc.has_header('libportal/portal.h', dependencies: libportal_dep), + 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') + +- common_deps += libportal_dep ++ libportal_gtk3_dep = dependency('libportal-gtk3', version: '>= 0.5', required: false) ++ assert(libportal_gtk3_dep.found() and cc.has_header('libportal-gtk3/portal-gtk3.h', dependencies: libportal_gtk3_dep), ++ 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') ++ ++ common_deps += [libportal_dep, libportal_gtk3_dep] + endif + config_h.set('HAVE_LIBPORTAL', enable_libportal) + +diff --git a/org.gnome.Eog.json b/org.gnome.Eog.json +index 94f09234..b7def6af 100644 +--- a/org.gnome.Eog.json ++++ b/org.gnome.Eog.json +@@ -48,16 +48,17 @@ + { + "name" : "libportal", + "config-opts" : [ +- "--libdir=/app/lib", +- "--buildtype=debugoptimized" ++ "--buildtype=debugoptimized", ++ "-Dbackends=gtk3", ++ "-Dintrospection=false", ++ "-Ddocs=false" + ], + "buildsystem" : "meson", +- "builddir" : true, + "sources" : [ + { + "type" : "git", + "url" : "https://github.com/flatpak/libportal.git", +- "tag" : "0.4" ++ "tag" : "0.5" + } + ] + }, +diff --git a/src/eog-util.c b/src/eog-util.c +index 90b9768e..56d23472 100644 +--- a/src/eog-util.c ++++ b/src/eog-util.c +@@ -45,7 +45,7 @@ + #include + #ifdef HAVE_LIBPORTAL + #include +-#include ++#include + #endif + + void +-- +GitLab + From 3d4b8059ffb7778d0a01ee881945617de6a778eb6b1419632f3e5cb098151c88 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 11 Jan 2022 20:06:02 +0000 Subject: [PATCH 2/3] Accepting request 945667 from GNOME:Factory Revert to unpatched eog version since we revoked new libportal OBS-URL: https://build.opensuse.org/request/show/945667 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog?expand=0&rev=287 --- eog.changes | 8 -- eog.spec | 7 +- ...6b1ba33e87766dd9a1b227a3607d863d2197.patch | 77 ------------------- 3 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch diff --git a/eog.changes b/eog.changes index 99d65fb..f9b1bd8 100644 --- a/eog.changes +++ b/eog.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Sat Jan 8 14:17:56 UTC 2022 - Bjørn Lie - -- Add f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch: Update - libportal usage. Libportal 0.5 is the first release with a stable - API so some changes were made. Following this, add - pkgconfig(libportal-gtk3) BuildRequires, new dependency. - ------------------------------------------------------------------- Sat Dec 4 17:30:44 UTC 2021 - Bjørn Lie diff --git a/eog.spec b/eog.spec index f5ad546..961cc6a 100644 --- a/eog.spec +++ b/eog.spec @@ -1,7 +1,7 @@ # # spec file for package eog # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,8 +24,6 @@ License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Graphics/Viewers URL: https://wiki.gnome.org/Apps/EyeOfGnome Source0: https://download.gnome.org/sources/eog/41/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch -- Update libportal usage -Patch0: https://gitlab.gnome.org/GNOME/eog/-/commit/f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch BuildRequires: fdupes BuildRequires: gtk-doc @@ -47,8 +45,7 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libpeas-1.0) >= 0.7.4 BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 0.7.4 -BuildRequires: pkgconfig(libportal) >= 0.5 -BuildRequires: pkgconfig(libportal-gtk3) >= 0.5 +BuildRequires: pkgconfig(libportal) >= 0.3 BuildRequires: pkgconfig(librsvg-2.0) >= 2.44.0 BuildRequires: pkgconfig(shared-mime-info) >= 0.20 diff --git a/f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch b/f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch deleted file mode 100644 index d7dc8ff..0000000 --- a/f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch +++ /dev/null @@ -1,77 +0,0 @@ -From a06e6325907e136678b0bbe7058c25d688034afd Mon Sep 17 00:00:00 2001 -From: Patrick Griffis -Date: Tue, 21 Dec 2021 16:35:36 -0600 -Subject: [PATCH] Update libportal usage - -libportal 0.5 is the first release with a stable API so some changes -were made. ---- - meson.build | 8 ++++++-- - org.gnome.Eog.json | 9 +++++---- - src/eog-util.c | 2 +- - 3 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/meson.build b/meson.build -index 9a32e4bb..9d49aa45 100644 ---- a/meson.build -+++ b/meson.build -@@ -165,11 +165,15 @@ config_h.set('HAVE_EXEMPI', enable_xmp) - # xdg-desktop-portal support with libportal (optional) - enable_libportal = get_option('libportal') - if enable_libportal -- libportal_dep = dependency('libportal', version: '>= 0.3', required: false) -+ libportal_dep = dependency('libportal', version: '>= 0.5', required: false) - assert(libportal_dep.found() and cc.has_header('libportal/portal.h', dependencies: libportal_dep), - 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') - -- common_deps += libportal_dep -+ libportal_gtk3_dep = dependency('libportal-gtk3', version: '>= 0.5', required: false) -+ assert(libportal_gtk3_dep.found() and cc.has_header('libportal-gtk3/portal-gtk3.h', dependencies: libportal_gtk3_dep), -+ 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') -+ -+ common_deps += [libportal_dep, libportal_gtk3_dep] - endif - config_h.set('HAVE_LIBPORTAL', enable_libportal) - -diff --git a/org.gnome.Eog.json b/org.gnome.Eog.json -index 94f09234..b7def6af 100644 ---- a/org.gnome.Eog.json -+++ b/org.gnome.Eog.json -@@ -48,16 +48,17 @@ - { - "name" : "libportal", - "config-opts" : [ -- "--libdir=/app/lib", -- "--buildtype=debugoptimized" -+ "--buildtype=debugoptimized", -+ "-Dbackends=gtk3", -+ "-Dintrospection=false", -+ "-Ddocs=false" - ], - "buildsystem" : "meson", -- "builddir" : true, - "sources" : [ - { - "type" : "git", - "url" : "https://github.com/flatpak/libportal.git", -- "tag" : "0.4" -+ "tag" : "0.5" - } - ] - }, -diff --git a/src/eog-util.c b/src/eog-util.c -index 90b9768e..56d23472 100644 ---- a/src/eog-util.c -+++ b/src/eog-util.c -@@ -45,7 +45,7 @@ - #include - #ifdef HAVE_LIBPORTAL - #include --#include -+#include - #endif - - void --- -GitLab - From affb6df3a45587fe427f2ad51d2d4efc574d8bc6df77dbaf53ebd30c1a293d9c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 Mar 2022 08:36:21 +0000 Subject: [PATCH 3/3] Accepting request 963181 from GNOME:Next New stable rel OBS-URL: https://build.opensuse.org/request/show/963181 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog?expand=0&rev=288 --- eog-41.1.tar.xz | 3 --- eog-42.0.tar.xz | 3 +++ eog.changes | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ eog.spec | 13 +++++----- 4 files changed, 73 insertions(+), 9 deletions(-) delete mode 100644 eog-41.1.tar.xz create mode 100644 eog-42.0.tar.xz diff --git a/eog-41.1.tar.xz b/eog-41.1.tar.xz deleted file mode 100644 index 8c43e4a..0000000 --- a/eog-41.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86e1b9ba39dacf74226afa457ab983b41253b89f617bf54139cad0892d02d8a9 -size 3603320 diff --git a/eog-42.0.tar.xz b/eog-42.0.tar.xz new file mode 100644 index 0000000..10d0fba --- /dev/null +++ b/eog-42.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb35bfb5167a42121f59a7b9b7ac0d75bbd0517b9afd6d91831e84d35735ddf8 +size 4446392 diff --git a/eog.changes b/eog.changes index f9b1bd8..f32cd85 100644 --- a/eog.changes +++ b/eog.changes @@ -1,3 +1,66 @@ +------------------------------------------------------------------- +Sun Mar 20 08:09:08 UTC 2022 - Bjørn Lie + +- Update to version 42.0: + + appdata: Update screenshot. + + Fix discovery of Evince for multi-page images. + + EogWindow: Also set wallpaper as dark wallpaper. + + Updated translations. + +------------------------------------------------------------------- +Sat Mar 5 20:27:32 UTC 2022 - Bjørn Lie + +- Update to version 42.rc: + + Replace gtk_window_set_title with hdy_header_bar_set_title. + + Disable Presenter action if no images are loaded. + + Updated translations. + +------------------------------------------------------------------- +Sat Feb 12 21:34:33 UTC 2022 - Bjørn Lie + +- Update to version 42.beta: + + Use gtk_widget_queue_draw to display thumbnails faster + + Replace properties dialog + + Shortcuts: Update keyboard shortcuts + + eog-window: use correct type for display_profile + + doc: migrate to gi-docgen + + Use libhandy for dark style preference and rounded window + corners + + Updated translations. +- Replace gtk-doc with pkgconfig(gi-docgen) BuildRequires following + upstreams port. +- Add pkgconfig(libhandy-1) BuildRequires: New dependency. + +------------------------------------------------------------------- +Mon Jan 10 15:43:44 UTC 2022 - Bjørn Lie + +- Drop pkgconfig(libportal) and pkgconfig(libportal-gtk3) + BuildRequires and pass portal=false to meson. Libportal support + is now optional, and we do not need it as we are not doing a + flatpak. + +------------------------------------------------------------------- +Mon Jan 10 15:03:16 UTC 2022 - Dominique Leuenberger + +- Update to version 42.alpha: + + metainfo: Align app name with .desktop name. + + build: Set of improvements for meson. + + EogScrollView: Use overlay scrollbars. + + Update libportal usage. + + make zoom entry more visually stable. + + eog-image: fix double-free of eog image status mutex. + + Updated translations. +- Drop f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch: fixed + upstream. + +------------------------------------------------------------------- +Sat Jan 8 14:17:56 UTC 2022 - Bjørn Lie + +- Add f61f6b1ba33e87766dd9a1b227a3607d863d2197.patch: Update + libportal usage. Libportal 0.5 is the first release with a stable + API so some changes were made. Following this, add + pkgconfig(libportal-gtk3) BuildRequires, new dependency. + ------------------------------------------------------------------- Sat Dec 4 17:30:44 UTC 2021 - Bjørn Lie diff --git a/eog.spec b/eog.spec index 961cc6a..db313d7 100644 --- a/eog.spec +++ b/eog.spec @@ -1,7 +1,7 @@ # # spec file for package eog # -# 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 @@ -17,35 +17,35 @@ Name: eog -Version: 41.1 +Version: 42.0 Release: 0 Summary: Image Viewer for GNOME License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Graphics/Viewers URL: https://wiki.gnome.org/Apps/EyeOfGnome -Source0: https://download.gnome.org/sources/eog/41/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/eog/42/%{name}-%{version}.tar.xz BuildRequires: fdupes -BuildRequires: gtk-doc BuildRequires: libjpeg-devel BuildRequires: meson >= 0.44.0 BuildRequires: pkgconfig BuildRequires: yelp-tools BuildRequires: pkgconfig(exempi-2.0) >= 1.99.5 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.36.5 +BuildRequires: pkgconfig(gi-docgen) BuildRequires: pkgconfig(gio-2.0) >= 2.53.4 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.53.4 BuildRequires: pkgconfig(glib-2.0) >= 2.53.4 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 2.91.2 BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 2.91.92 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.15 BuildRequires: pkgconfig(gtk+-unix-print-3.0) >= 3.5.4 BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(libpeas-1.0) >= 0.7.4 BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 0.7.4 -BuildRequires: pkgconfig(libportal) >= 0.3 BuildRequires: pkgconfig(librsvg-2.0) >= 2.44.0 BuildRequires: pkgconfig(shared-mime-info) >= 0.20 @@ -81,6 +81,7 @@ developing eog plugins. -D gtk_doc=true \ -D introspection=true \ -D installed_tests=false \ + -D libportal=false \ %{nil} %meson_build