From 6cf09676315ded11c90f11f5137fa90bf3e260b3 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 15 Oct 2019 20:58:56 +0000 Subject: Tue Oct 15 20:58:56 UTC 2019 ap/ghostscript-9.50-x86_64-1.txz: Upgraded. d/icecream-1.3-x86_64-2.txz: Rebuilt. Have the profile scripts just check for -x /etc/rc.d/rc.iceccd, since pgrep with --ns $$ isn't working for non-root users. Thanks to Leopold E. Midha. d/python-pip-19.3-x86_64-1.txz: Upgraded. n/bluez-5.51-x86_64-2.txz: Rebuilt. Fixed path to obexd in org.bluez.obex.service. Thanks to Jean-Philippe Guillemin. x/xf86-video-ati-19.1.0-x86_64-1.txz: Upgraded. --- source/ap/ghostscript/ghostscript.url | 2 +- source/d/icecream/icecream.SlackBuild | 2 +- source/d/icecream/icecream.csh | 18 ++----- source/d/icecream/icecream.sh | 9 ++-- .../bluez/bluez-5.30-obexd_without_systemd-1.patch | 59 ---------------------- .../bluez/bluez-5.51-obexd_without_systemd-1.patch | 59 ++++++++++++++++++++++ source/n/bluez/bluez.SlackBuild | 4 +- .../xap/mozilla-firefox/mozilla-firefox.SlackBuild | 2 +- .../mozilla-thunderbird.SlackBuild | 2 +- 9 files changed, 71 insertions(+), 86 deletions(-) delete mode 100644 source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch create mode 100644 source/n/bluez/bluez-5.51-obexd_without_systemd-1.patch (limited to 'source') diff --git a/source/ap/ghostscript/ghostscript.url b/source/ap/ghostscript/ghostscript.url index 74e7b3eaa..6e3eab915 100644 --- a/source/ap/ghostscript/ghostscript.url +++ b/source/ap/ghostscript/ghostscript.url @@ -1 +1 @@ -https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs927/ghostscript-9.27.tar.xz +https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs950/ghostscript-9.50.tar.xz diff --git a/source/d/icecream/icecream.SlackBuild b/source/d/icecream/icecream.SlackBuild index 922984f83..9d90f7916 100755 --- a/source/d/icecream/icecream.SlackBuild +++ b/source/d/icecream/icecream.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=icecream SRCNAM=icecc VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/d/icecream/icecream.csh b/source/d/icecream/icecream.csh index 6c558d615..bcd06f058 100644 --- a/source/d/icecream/icecream.csh +++ b/source/d/icecream/icecream.csh @@ -1,19 +1,7 @@ #!/bin/csh -# Only add the icecream directory to the PATH if we see that icecc-scheduler -# and/or iceccd are running on this machine: +# Only add the icecream directory to the PATH if we see that iceccd is +# supposed to be running on this machine: -setenv ICECC_PRESENT false -/usr/bin/pgrep --ns $$ -f "^/usr/sbin/icecc-scheduler" > /dev/null -if ( $? == 0 ) then - setenv ICECC_PRESENT true -endif - -/usr/bin/pgrep --ns $$ -f "^/usr/sbin/iceccd" > /dev/null -if ( $? == 0 ) then - setenv ICECC_PRESENT true -endif - -if ( $ICECC_PRESENT == true ) then +if ( -x /etc/rc.d/rc.iceccd ) then setenv PATH /usr/libexec/icecc/bin:${PATH} endif - diff --git a/source/d/icecream/icecream.sh b/source/d/icecream/icecream.sh index 5e0afd573..824a7afb9 100644 --- a/source/d/icecream/icecream.sh +++ b/source/d/icecream/icecream.sh @@ -1,10 +1,7 @@ #!/bin/sh -# Only add the icecream directory to the PATH if we see that icecc-scheduler -# and/or iceccd are running on this machine: +# Only add the icecream directory to the PATH if we see that iceccd is +# supposed to be running on this machine: -if /usr/bin/pgrep --ns $$ -f "^/usr/sbin/icecc-scheduler" > /dev/null ; then - export PATH=/usr/libexec/icecc/bin:$PATH -elif /usr/bin/pgrep --ns $$ -f "^/usr/sbin/iceccd" > /dev/null ; then +if [ -x /etc/rc.d/rc.iceccd ]; then export PATH=/usr/libexec/icecc/bin:$PATH fi - diff --git a/source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch b/source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch deleted file mode 100644 index fd2616178..000000000 --- a/source/n/bluez/bluez-5.30-obexd_without_systemd-1.patch +++ /dev/null @@ -1,59 +0,0 @@ -Submitted By: Armin K. -Date: 2013-04-29 -Initial Package Version: 5.17 -Upstream Status: unknown -Origin: Arch Linux (Giovanni Campagna) -Description: Allow using obexd without systemd in the user session - -Not all sessions run systemd --user (actually, the majority -doesn't), so the dbus daemon must be able to spawn obexd -directly, and to do so it needs the full path of the daemon. ---- - Makefile.obexd | 4 ++-- - obexd/src/org.bluez.obex.service | 4 ---- - obexd/src/org.bluez.obex.service.in | 4 ++++ - 3 files changed, 6 insertions(+), 6 deletions(-) - delete mode 100644 obexd/src/org.bluez.obex.service - create mode 100644 obexd/src/org.bluez.obex.service.in - ---- ./Makefile.obexd.orig 2019-09-19 13:51:02.000000000 -0500 -+++ ./Makefile.obexd 2019-09-20 14:10:10.647348607 -0500 -@@ -1,12 +1,12 @@ - if SYSTEMD - systemduserunitdir = $(SYSTEMD_USERUNITDIR) - systemduserunit_DATA = obexd/src/obex.service -+endif - - dbussessionbusdir = $(DBUS_SESSIONBUSDIR) - dbussessionbus_DATA = obexd/src/org.bluez.obex.service --endif - --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in - - if OBEX - -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service -deleted file mode 100644 -index a538088..0000000 ---- a/obexd/src/org.bluez.obex.service -+++ /dev/null -@@ -1,4 +0,0 @@ --[D-BUS Service] --Name=org.bluez.obex --Exec=/bin/false --SystemdService=dbus-org.bluez.obex.service -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in -new file mode 100644 -index 0000000..9c815f2 ---- /dev/null -+++ b/obexd/src/org.bluez.obex.service.in -@@ -0,0 +1,4 @@ -+[D-BUS Service] -+Name=org.bluez.obex -+Exec=@libexecdir@/obexd -+SystemdService=dbus-org.bluez.obex.service --- -1.8.3.1 - - diff --git a/source/n/bluez/bluez-5.51-obexd_without_systemd-1.patch b/source/n/bluez/bluez-5.51-obexd_without_systemd-1.patch new file mode 100644 index 000000000..21c99acc4 --- /dev/null +++ b/source/n/bluez/bluez-5.51-obexd_without_systemd-1.patch @@ -0,0 +1,59 @@ +Submitted By: Armin K. +Date: 2013-04-29 +Initial Package Version: 5.17 +Upstream Status: unknown +Origin: Arch Linux (Giovanni Campagna) +Description: Allow using obexd without systemd in the user session + +Not all sessions run systemd --user (actually, the majority +doesn't), so the dbus daemon must be able to spawn obexd +directly, and to do so it needs the full path of the daemon. +--- + Makefile.obexd | 4 ++-- + obexd/src/org.bluez.obex.service | 4 ---- + obexd/src/org.bluez.obex.service.in | 4 ++++ + 3 files changed, 6 insertions(+), 6 deletions(-) + delete mode 100644 obexd/src/org.bluez.obex.service + create mode 100644 obexd/src/org.bluez.obex.service.in + +--- ./Makefile.obexd.orig 2019-09-19 13:51:02.000000000 -0500 ++++ ./Makefile.obexd 2019-09-20 14:10:10.647348607 -0500 +@@ -1,12 +1,12 @@ + if SYSTEMD + systemduserunitdir = $(SYSTEMD_USERUNITDIR) + systemduserunit_DATA = obexd/src/obex.service ++endif + + dbussessionbusdir = $(DBUS_SESSIONBUSDIR) + dbussessionbus_DATA = obexd/src/org.bluez.obex.service +-endif + +-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service ++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in + + if OBEX + +diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service +deleted file mode 100644 +index a538088..0000000 +--- a/obexd/src/org.bluez.obex.service ++++ /dev/null +@@ -1,4 +0,0 @@ +-[D-BUS Service] +-Name=org.bluez.obex +-Exec=/bin/false +-SystemdService=dbus-org.bluez.obex.service +diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in +new file mode 100644 +index 0000000..9c815f2 +--- /dev/null ++++ b/obexd/src/org.bluez.obex.service.in +@@ -0,0 +1,4 @@ ++[D-BUS Service] ++Name=org.bluez.obex ++Exec=@libexecdir@/bluetooth/obexd ++SystemdService=dbus-org.bluez.obex.service +-- +1.8.3.1 + + diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild index bb4b64644..dd99028a3 100755 --- a/source/n/bluez/bluez.SlackBuild +++ b/source/n/bluez/bluez.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=bluez 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) "} @@ -76,7 +76,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/bluez-5.30-obexd_without_systemd-1.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/bluez-5.51-obexd_without_systemd-1.patch.gz | patch -p1 --verbose || exit 1 # Fix bluetoothd crashes: zcat $CWD/refresh_adv_manager_for_non-LE_devices.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index ba2c2fd0f..0e11e04cc 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -165,7 +165,7 @@ rm -rf $PKG mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX} # Build or unpack build-time dependencies: -. build-deps.sh +. ./build-deps.sh cd $TMP rm -rf firefox-$RELEASEVER diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index 09038e75b..4889d5df9 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -146,7 +146,7 @@ rm -rf $PKG mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX} # Build or unpack build-time dependencies: -. build-deps.sh +. ./build-deps.sh cd $TMP rm -rf thunderbird-$RELEASEVER -- cgit v1.2.3