diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 10:20:32 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 10:20:32 -0400 |
| commit | 3d297a0017210f1dd135592efb10846840a8af88 (patch) | |
| tree | 8868c35a558a6288b5097d65bee42dda291178e4 /gnu/packages/patches/eog-update-libportal-usage.patch | |
| parent | 279349209e44aaae6ca2aba328fe2a4d2da99f12 (diff) | |
| parent | 6737d8d3248301e65bc24291b1a776e4aa8c3648 (diff) | |
| download | guix-3d297a0017210f1dd135592efb10846840a8af88.tar.gz | |
Merge branch 'master' into staging
With resolved conflicts in: gnu/local.mk gnu/packages/freedesktop.scm gnu/packages/gnuzilla.scm
Diffstat (limited to 'gnu/packages/patches/eog-update-libportal-usage.patch')
| -rw-r--r-- | gnu/packages/patches/eog-update-libportal-usage.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/gnu/packages/patches/eog-update-libportal-usage.patch b/gnu/packages/patches/eog-update-libportal-usage.patch deleted file mode 100644 index 220a16ddc4..0000000000 --- a/gnu/packages/patches/eog-update-libportal-usage.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix eog to work with libportal-0.5 - -This patch is extracted from upstream, see here -https://gitlab.gnome.org/GNOME/eog/-/commit/a06e6325907e136678b0bbe7058c25d688034afd - -diff --git a/meson.build b/meson.build -index 9a32e4bb..9d49aa45 100644 ---- a/meson.build -+++ b/meson.build -@@ -165,10 +165,14 @@ 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/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 |