From 3fb911844eaa3e98d80a8cc6c946202904fe8693 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 19 Sep 2019 22:48:58 +0000 Subject: Thu Sep 19 22:48:58 UTC 2019 Thanks to Robby Workman for helping upgrade the GTK stack! a/kernel-generic-4.19.74-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.74-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.74-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.74-x86-1.txz: Upgraded. d/vala-0.46.1-x86_64-1.txz: Upgraded. k/kernel-source-4.19.74-noarch-1.txz: Upgraded. l/adwaita-icon-theme-3.34.0-noarch-1.txz: Upgraded. l/at-spi2-atk-2.34.0-x86_64-1.txz: Upgraded. l/at-spi2-core-2.34.0-x86_64-1.txz: Upgraded. l/atk-2.34.1-x86_64-1.txz: Upgraded. l/dconf-0.34.0-x86_64-1.txz: Upgraded. l/dconf-editor-3.34.1-x86_64-1.txz: Upgraded. l/fuse3-3.6.2-x86_64-1.txz: Added. This is required by gvfs and sshfs. l/glib-networking-2.62.0-x86_64-1.txz: Upgraded. l/glib2-2.62.0-x86_64-1.txz: Upgraded. l/gnome-themes-extra-3.28-x86_64-1.txz: Added. l/gnome-themes-standard-3.22.3-x86_64-2.txz: Removed. Upstream has renamed this to gnome-themes-extra. l/gobject-introspection-1.62.0-x86_64-1.txz: Upgraded. l/gsettings-desktop-schemas-3.34.0-x86_64-1.txz: Upgraded. l/gvfs-1.42.0-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_65-x86_64-1.txz: Upgraded. l/librsvg-2.46.0-x86_64-1.txz: Upgraded. l/libsoup-2.68.1-x86_64-1.txz: Upgraded. l/pygobject3-3.34.0-x86_64-1.txz: Upgraded. l/python-packaging-19.2-x86_64-1.txz: Upgraded. l/vte-0.58.0-x86_64-1.txz: Upgraded. n/bind-9.14.6-x86_64-1.txz: Upgraded. n/sshfs-3.5.2-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- ...n.build-define-gvfs_rpath-for-libgvfsdaem.patch | 35 ---------------------- source/l/gvfs/gvfs.SlackBuild | 5 +--- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 source/l/gvfs/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch (limited to 'source/l/gvfs') diff --git a/source/l/gvfs/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch b/source/l/gvfs/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch deleted file mode 100644 index 232810144..000000000 --- a/source/l/gvfs/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 940cb1d7dc3bd511ebd71c359cc5386d3682e0ba Mon Sep 17 00:00:00 2001 -From: Robby Workman -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 ---- - daemon/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/daemon/meson.build b/daemon/meson.build -index 2d253e3b..75750cee 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -124,6 +124,7 @@ libgvfsdaemon = shared_library( - c_args: cflags, - install: true, - install_dir: gvfs_pkglibdir, -+ install_rpath: gvfs_rpath, - ) - - libgvfsdaemon_dep = declare_dependency( --- -2.22.0 - diff --git a/source/l/gvfs/gvfs.SlackBuild b/source/l/gvfs/gvfs.SlackBuild index 3497ad050..b59469b08 100755 --- a/source/l/gvfs/gvfs.SlackBuild +++ b/source/l/gvfs/gvfs.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gvfs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -75,9 +75,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# https://gitlab.gnome.org/GNOME/gvfs/issues/411 -zcat $CWD/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch.gz | patch -p1 --verbose || exit 1 - # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" -- cgit v1.2.3-65-gdbad