From 612d5685be4b6dc368aa4d02e96ead63bdb6e904 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 18 Jul 2019 20:46:19 +0000 Subject: Thu Jul 18 20:46:19 UTC 2019 a/kernel-firmware-20190717_bf13a71-noarch-1.txz: Upgraded. ap/mpg123-1.25.11-x86_64-1.txz: Upgraded. l/gvfs-1.40.2-x86_64-2.txz: Rebuilt. daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so This fixes "libgvfscommon.so => not found" running ldd on libgvfsdaemon.so. Thanks to Robby Workman. n/bind-9.14.4-x86_64-1.txz: Upgraded. x/libpciaccess-0.16-x86_64-1.txz: Upgraded. x/xinput-1.6.3-x86_64-1.txz: Upgraded. xap/mozilla-firefox-68.0.1esr-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/firefox/68.0.1esr/releasenotes/ extra/pure-alsa-system/mpg123-1.25.11-x86_64-1_alsa.txz: Upgraded. --- source/ap/mpg123/mpg123.SlackBuild | 2 +- ...n.build-define-gvfs_rpath-for-libgvfsdaem.patch | 35 +++++ source/l/gvfs/gvfs.SlackBuild | 5 +- source/l/gvfs/gvfs.SlackBuild.dev-utils | 158 --------------------- source/n/bind/bind.SlackBuild | 2 +- source/x/x11/build/xinput | 2 +- 6 files changed, 42 insertions(+), 162 deletions(-) create mode 100644 source/l/gvfs/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch delete mode 100755 source/l/gvfs/gvfs.SlackBuild.dev-utils (limited to 'source') diff --git a/source/ap/mpg123/mpg123.SlackBuild b/source/ap/mpg123/mpg123.SlackBuild index 716de8262..aa3dd9121 100755 --- a/source/ap/mpg123/mpg123.SlackBuild +++ b/source/ap/mpg123/mpg123.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mpg123 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) "} 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 new file mode 100644 index 000000000..232810144 --- /dev/null +++ b/source/l/gvfs/0001-daemon-meson.build-define-gvfs_rpath-for-libgvfsdaem.patch @@ -0,0 +1,35 @@ +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 b59469b08..3497ad050 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:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -75,6 +75,9 @@ 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" diff --git a/source/l/gvfs/gvfs.SlackBuild.dev-utils b/source/l/gvfs/gvfs.SlackBuild.dev-utils deleted file mode 100755 index e8c186450..000000000 --- a/source/l/gvfs/gvfs.SlackBuild.dev-utils +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/bash - -# Copyright 2009-2012 Robby Workman, Northport, Alabama, USA -# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -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} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - *) export ARCH=$( uname -m ) ;; - esac -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# EXAMPLE FOR MESON: -# Configure, build, and install: -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -mkdir meson-build -cd meson-build -meson setup \ - --prefix=/usr \ - --libdir=lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/libexec \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --includedir=/usr/include \ - --datadir=/usr/share \ - --mandir=/usr/man \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --buildtype=release \ - -Ddevel_utils=true \ - -Ddnssd=false \ - -Dgoa=false \ - -Dgoogle=false \ - -Dlogind=false \ - -Dman=true \ - -Dnfs=false \ - -Dsystemduserunitdir=no \ - -Dtmpfilesdir=no \ - .. || exit 1 - ninja || exit 1 - DESTDIR=$PKG ninja install || exit 1 -cd .. - -## This was an issue in 2012, but we will try commenting this sed command out -## in 2017 hoping that the issue no longer occurs... -## -## Don't set AutoMount to true for network volumes. Doing so leads to long -## delays in Thunar. Users may click the network button in Thunar to mount -## them instead. -#sed -i -e "s/AutoMount=true/AutoMount=false/g" $PKG/usr/share/gvfs/mounts/network.mount - -# Don't ship .la files: -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Compress and link manpages, if any: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING* INSTALL MAINTAINERS NEWS README* TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz | sed "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX}," > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index fa4e69386..a9ab917e4 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bind -VERSION=${VERSION:-9.14.3} +VERSION=${VERSION:-9.14.4} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/x/x11/build/xinput b/source/x/x11/build/xinput index 0cfbf0888..d00491fd7 100644 --- a/source/x/x11/build/xinput +++ b/source/x/x11/build/xinput @@ -1 +1 @@ -2 +1 -- cgit v1.2.3