diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /gnome-base/gvfs/files | |
parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) |
gentoo resync : 15.01.2020
Diffstat (limited to 'gnome-base/gvfs/files')
-rw-r--r-- | gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch | 35 | ||||
-rw-r--r-- | gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch | 21 |
2 files changed, 0 insertions, 56 deletions
diff --git a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch deleted file mode 100644 index f3fe513d06e1..000000000000 --- a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 57010ebb148b9b14e40140c7a8ce133a72128cf6 Mon Sep 17 00:00:00 2001 -From: Robby Workman <rworkman@slackware.com> -Date: Thu, 18 Jul 2019 03:38:41 -0500 -Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so - -On Slackware development branch with gvfs-1.40.2, I just noticed this: - # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found" - libgvfscommon.so => not found - -After some backtracking, it seems that this first occurred in the -switchover from autotools to meson in the 1.36.x --> 1.38.x bump. - -Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and -assistance with troubleshooting this. - -Signed-off-by: Robby Workman <rworkman@slackware.com> ---- - daemon/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/daemon/meson.build b/daemon/meson.build -index 7f2608bd..0006f35e 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library( - dependencies: deps, - c_args: cflags, - install: true, -+ install_rpath: gvfs_rpath, - install_dir: gvfs_pkglibdir - ) - --- -2.20.1 - diff --git a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch b/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch deleted file mode 100644 index b2d2a91f5a76..000000000000 --- a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=776532 -https://bugs.gentoo.org/580234 - ---- a/metadata/meta-daemon.c -+++ b/metadata/meta-daemon.c -@@ -27,6 +27,7 @@ - #include <glib/gstdio.h> - #include <locale.h> - #include <stdlib.h> -+#include <sys/sysmacros.h> - #include "metatree.h" - #include "gvfsdaemonprotocol.h" - #include "metadata-dbus.h" ---- a/metadata/metatree.c -+++ b/metadata/metatree.c -@@ -1,4 +1,5 @@ - #include "config.h" -+#include <sys/sysmacros.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/mman.h> |