aboutsummaryrefslogtreecommitdiffstats
path: root/community/eog/0001-Update-libportal-usage.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/eog/0001-Update-libportal-usage.patch')
-rw-r--r--community/eog/0001-Update-libportal-usage.patch80
1 files changed, 0 insertions, 80 deletions
diff --git a/community/eog/0001-Update-libportal-usage.patch b/community/eog/0001-Update-libportal-usage.patch
deleted file mode 100644
index 733a4bafcbf..00000000000
--- a/community/eog/0001-Update-libportal-usage.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Patch merged upstream:
-https://gitlab.gnome.org/GNOME/eog/-/merge_requests/115
-
-From a06e6325907e136678b0bbe7058c25d688034afd Mon Sep 17 00:00:00 2001
-From: Patrick Griffis <pgriffis@igalia.com>
-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 <glib/gi18n.h>
- #ifdef HAVE_LIBPORTAL
- #include <libportal/portal.h>
--#include <libportal/portal-gtk3.h>
-+#include <libportal-gtk3/portal-gtk3.h>
- #endif
-
- void
---
-2.31.1
-