mirror of
https://github.com/Ponce/slackbuilds
synced 2024-12-01 01:00:03 +01:00
8459d36171
Signed-off-by: bedlam <dave@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
102 lines
3.1 KiB
Diff
102 lines
3.1 KiB
Diff
From ae752ea07895b918683f664fe78950255f7faab0 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 +++--
|
|
build-aux/flatpak/org.gnome.Nautilus.yml | 3 ++-
|
|
meson.build | 4 +++-
|
|
src/meson.build | 1 +
|
|
src/nautilus-files-view.c | 2 +-
|
|
5 files changed, 10 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
|
|
index 2857124c59..fb6213074e 100644
|
|
--- a/build-aux/flatpak/org.gnome.Nautilus.json
|
|
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
|
|
@@ -117,14 +117,15 @@
|
|
"buildsystem": "meson",
|
|
"builddir": true,
|
|
"config-opts": [
|
|
+ "-Ddocs=false",
|
|
+ "-Dbackends=gtk3",
|
|
"--libdir=/app/lib",
|
|
"--buildtype=debugoptimized"
|
|
],
|
|
"sources" : [
|
|
{
|
|
"type": "git",
|
|
- "url": "https://github.com/flatpak/libportal.git",
|
|
- "tag": "0.4"
|
|
+ "url": "https://github.com/flatpak/libportal.git"
|
|
}
|
|
]
|
|
},
|
|
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
|
|
index 3e15f4b11f..555f959050 100644
|
|
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
|
|
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
|
|
@@ -85,12 +85,13 @@ modules:
|
|
buildsystem: meson
|
|
builddir: true
|
|
config-opts:
|
|
+ - "-Ddocs=false"
|
|
+ - "-Dbackends=gtk3"
|
|
- "--libdir=/app/lib"
|
|
- "--buildtype=debugoptimized"
|
|
sources:
|
|
- type: git
|
|
url: https://github.com/flatpak/libportal.git
|
|
- tag: 0.4
|
|
- buildsystem: meson
|
|
builddir: true
|
|
name: nautilus
|
|
diff --git a/meson.build b/meson.build
|
|
index 927216636a..4626fa0bb7 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 682d6f3a3c..d7fb76d53d 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 64ca4377b3..61cb169b3a 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
|
|
|