diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:29:02 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-15 11:43:21 -0400 |
| commit | 4920f6e634eeecb37b501bdc024dfe0aab849ed0 (patch) | |
| tree | c7dd5859715071cb602133b67449a29488027f70 /gnu/packages/patches/nautilus-add-libportal-gtk3.patch | |
| parent | 513091dbd2eeba138b558f5f9bb1ee6e68eee01d (diff) | |
| parent | 3d297a0017210f1dd135592efb10846840a8af88 (diff) | |
| download | guix-4920f6e634eeecb37b501bdc024dfe0aab849ed0.tar guix-4920f6e634eeecb37b501bdc024dfe0aab849ed0.tar.gz | |
Merge branch 'staging' into core-updates
Conflicts resolved in:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/sdl.scm
pango-next, vala-next and librsvg-bootstrap were removed in the process.
Diffstat (limited to 'gnu/packages/patches/nautilus-add-libportal-gtk3.patch')
| -rw-r--r-- | gnu/packages/patches/nautilus-add-libportal-gtk3.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/gnu/packages/patches/nautilus-add-libportal-gtk3.patch b/gnu/packages/patches/nautilus-add-libportal-gtk3.patch deleted file mode 100644 index cefa47cc64..0000000000 --- a/gnu/packages/patches/nautilus-add-libportal-gtk3.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 55cfd66ccca391fc144f5863ff6bfc1f3b137e2d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniojpfernandes@gmail.com> -Date: Tue, 21 Dec 2021 17:42:27 +0000 -Subject: [PATCH] general: Add libportal-gtk3 dependency - -The portal-gtk3.h header has been moved into a separate library which -binds gtk3 explicitly. - -https://github.com/flatpak/libportal/pull/53 ---- - build-aux/flatpak/org.gnome.Nautilus.json | 5 +++-- ;; Changes removed in Guix - build-aux/flatpak/org.gnome.Nautilus.yml | 3 ++- ;; Changes removed in Guix - meson.build | 4 +++- - src/meson.build | 1 + - src/nautilus-files-view.c | 2 +- - 5 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index 927216636..4626fa0bb 100644 ---- a/meson.build -+++ b/meson.build -@@ -122,8 +122,10 @@ gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0') - gtk = dependency('gtk+-3.0', version: '>= 3.22.27') - libhandy = dependency('libhandy-1', version: '>= 1.1.90') - libportal = [] -+libportal_gtk3 = [] - if get_option('libportal') -- libportal = dependency('libportal', version: '>= 0.3') -+ libportal = dependency('libportal', version: '>= 0.5') -+ libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5') - endif - selinux = [] - if get_option('selinux') -diff --git a/src/meson.build b/src/meson.build -index 682d6f3a3..d7fb76d53 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -285,6 +285,7 @@ nautilus_deps = [ - libgd_dep, - libhandy, - libportal, -+ libportal_gtk3, - nautilus_extension, - selinux, - tracker_sparql, -diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c -index dfb7fb26c..a24005a11 100644 ---- a/src/nautilus-files-view.c -+++ b/src/nautilus-files-view.c -@@ -93,7 +93,7 @@ - - #ifdef HAVE_LIBPORTAL - #include <libportal/portal.h> --#include <libportal/portal-gtk3.h> -+#include <libportal-gtk3/portal-gtk3.h> - #endif - - /* Minimum starting update inverval */ --- -GitLab - |