summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-07-02 20:36:38 +0000
committerEric Hameleers <alien@slackware.com>2019-07-03 08:59:47 +0200
commited5de188b1ed607733e4e70b83631161dc845789 (patch)
treebdc2e3a55e557de3084c2897750919c4e3b8dd8d /source
parent68fc452c5b2257672e15fa91a4965dbda57134fa (diff)
downloadcurrent-ed5de188b1ed607733e4e70b83631161dc845789.tar.gz
Tue Jul 2 20:36:38 UTC 201920190702203638
d/python-setuptools-41.0.1-x86_64-2.txz: Rebuilt. l/freetype-2.10.1-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_51-x86_64-1.txz: Upgraded. n/php-7.3.7-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/ksh93/ksh93.SlackBuild4
-rwxr-xr-xsource/d/python-setuptools/python-setuptools.SlackBuild2
-rwxr-xr-xsource/l/at-spi2-atk/at-spi2-atk.SlackBuild2
-rwxr-xr-xsource/l/at-spi2-core/at-spi2-core.SlackBuild2
-rwxr-xr-xsource/l/atk/atk.SlackBuild2
-rwxr-xr-xsource/l/dconf-editor/dconf-editor.SlackBuild2
-rwxr-xr-xsource/l/dconf/dconf.SlackBuild2
-rwxr-xr-xsource/l/freetype/freetype.SlackBuild2
-rwxr-xr-xsource/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild2
-rwxr-xr-xsource/l/gexiv2/gexiv2.SlackBuild2
-rwxr-xr-xsource/l/glib-networking/glib-networking.SlackBuild2
-rwxr-xr-xsource/l/glib2/glib2.SlackBuild2
-rwxr-xr-xsource/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild4
-rwxr-xr-xsource/l/gvfs/gvfs.SlackBuild3
-rwxr-xr-xsource/l/json-glib/json-glib.SlackBuild2
-rwxr-xr-xsource/l/libnotify/libnotify.SlackBuild2
-rwxr-xr-xsource/l/libsoup/libsoup.SlackBuild3
-rwxr-xr-xsource/l/pygobject3/pygobject3.SlackBuild2
-rwxr-xr-xsource/n/iputils/iputils.SlackBuild2
-rwxr-xr-xsource/n/php/fetch-php.sh4
-rwxr-xr-xsource/x/libinput/libinput.SlackBuild4
-rwxr-xr-xsource/x/mesa/mesa.SlackBuild2
-rwxr-xr-xsource/xap/hexchat/hexchat.SlackBuild2
23 files changed, 30 insertions, 26 deletions
diff --git a/source/ap/ksh93/ksh93.SlackBuild b/source/ap/ksh93/ksh93.SlackBuild
index 6a3a9590..36a319a5 100755
--- a/source/ap/ksh93/ksh93.SlackBuild
+++ b/source/ap/ksh93/ksh93.SlackBuild
@@ -46,6 +46,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
@@ -107,7 +109,7 @@ meson setup \
--localstatedir=/var \
--buildtype=release \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild
index b178de8c..627e71b9 100755
--- a/source/d/python-setuptools/python-setuptools.SlackBuild
+++ b/source/d/python-setuptools/python-setuptools.SlackBuild
@@ -35,7 +35,7 @@ fi
PKGNAM=python-setuptools
VERSION=${VERSION:-$(echo setuptools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
SRCNAM=setuptools
diff --git a/source/l/at-spi2-atk/at-spi2-atk.SlackBuild b/source/l/at-spi2-atk/at-spi2-atk.SlackBuild
index 578eb332..599e62e4 100755
--- a/source/l/at-spi2-atk/at-spi2-atk.SlackBuild
+++ b/source/l/at-spi2-atk/at-spi2-atk.SlackBuild
@@ -95,7 +95,7 @@ meson setup \
--localstatedir=/var \
--buildtype=release \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/at-spi2-core/at-spi2-core.SlackBuild b/source/l/at-spi2-core/at-spi2-core.SlackBuild
index 83898d1b..8cb76daa 100755
--- a/source/l/at-spi2-core/at-spi2-core.SlackBuild
+++ b/source/l/at-spi2-core/at-spi2-core.SlackBuild
@@ -88,7 +88,7 @@ meson setup \
--localstatedir=/var \
--mandir=/usr/man \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/atk/atk.SlackBuild b/source/l/atk/atk.SlackBuild
index bae6fedc..4bdce1b2 100755
--- a/source/l/atk/atk.SlackBuild
+++ b/source/l/atk/atk.SlackBuild
@@ -96,7 +96,7 @@ meson setup \
-Dintrospection=true \
-Ddocs=true \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/dconf-editor/dconf-editor.SlackBuild b/source/l/dconf-editor/dconf-editor.SlackBuild
index 0566ff10..a15b8f26 100755
--- a/source/l/dconf-editor/dconf-editor.SlackBuild
+++ b/source/l/dconf-editor/dconf-editor.SlackBuild
@@ -96,7 +96,7 @@ meson setup \
--localstatedir=/var \
--buildtype=release \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/dconf/dconf.SlackBuild b/source/l/dconf/dconf.SlackBuild
index 61e6ef40..9d96652e 100755
--- a/source/l/dconf/dconf.SlackBuild
+++ b/source/l/dconf/dconf.SlackBuild
@@ -99,7 +99,7 @@ meson setup \
-Dgtk_doc=true \
-Dman=true \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild
index 69f53855..00b4c49f 100755
--- a/source/l/freetype/freetype.SlackBuild
+++ b/source/l/freetype/freetype.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=freetype
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
index 1a88f6df..8cda0fce 100755
--- a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
+++ b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild
@@ -99,7 +99,7 @@ meson setup \
-Dx11=true \
-Dinstalled_tests=false \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/gexiv2/gexiv2.SlackBuild b/source/l/gexiv2/gexiv2.SlackBuild
index 108030d2..eaae0508 100755
--- a/source/l/gexiv2/gexiv2.SlackBuild
+++ b/source/l/gexiv2/gexiv2.SlackBuild
@@ -88,7 +88,7 @@ meson setup \
--localstatedir=/var \
--mandir=/usr/man \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/glib-networking/glib-networking.SlackBuild b/source/l/glib-networking/glib-networking.SlackBuild
index 26c0befb..56ac842e 100755
--- a/source/l/glib-networking/glib-networking.SlackBuild
+++ b/source/l/glib-networking/glib-networking.SlackBuild
@@ -87,7 +87,7 @@ meson setup \
--localstatedir=/var \
--mandir=/usr/man \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild
index 66c5f11c..44615e2f 100755
--- a/source/l/glib2/glib2.SlackBuild
+++ b/source/l/glib2/glib2.SlackBuild
@@ -103,7 +103,7 @@ meson setup \
-Dgtk_doc=true \
-Dinstalled_tests=false \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild
index 86ed0a68..cbe8394b 100755
--- a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild
+++ b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild
@@ -50,6 +50,8 @@ fi
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
@@ -91,7 +93,7 @@ meson setup \
--localstatedir=/var \
--mandir=/usr/man \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/gvfs/gvfs.SlackBuild b/source/l/gvfs/gvfs.SlackBuild
index 0b78d022..c5c0836e 100755
--- a/source/l/gvfs/gvfs.SlackBuild
+++ b/source/l/gvfs/gvfs.SlackBuild
@@ -75,7 +75,6 @@ find . \
\( -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"
@@ -102,7 +101,7 @@ meson setup \
-Dsystemduserunitdir=no \
-Dtmpfilesdir=no \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/json-glib/json-glib.SlackBuild b/source/l/json-glib/json-glib.SlackBuild
index 61801228..77b6962d 100755
--- a/source/l/json-glib/json-glib.SlackBuild
+++ b/source/l/json-glib/json-glib.SlackBuild
@@ -104,7 +104,7 @@ meson setup \
--buildtype=release \
-Ddocs=true \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/libnotify/libnotify.SlackBuild b/source/l/libnotify/libnotify.SlackBuild
index 53a69c03..0beb380e 100755
--- a/source/l/libnotify/libnotify.SlackBuild
+++ b/source/l/libnotify/libnotify.SlackBuild
@@ -93,7 +93,7 @@ meson setup \
-Ddocbook_docs=disabled \
-Dtests=false \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/libsoup/libsoup.SlackBuild b/source/l/libsoup/libsoup.SlackBuild
index 48a9724e..39314847 100755
--- a/source/l/libsoup/libsoup.SlackBuild
+++ b/source/l/libsoup/libsoup.SlackBuild
@@ -72,7 +72,6 @@ cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-# EXAMPLE FOR MESON:
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
@@ -94,7 +93,7 @@ meson setup \
-Dvapi=true \
-Ddoc=true \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/l/pygobject3/pygobject3.SlackBuild b/source/l/pygobject3/pygobject3.SlackBuild
index 0393d965..1a461e58 100755
--- a/source/l/pygobject3/pygobject3.SlackBuild
+++ b/source/l/pygobject3/pygobject3.SlackBuild
@@ -97,7 +97,7 @@ meson setup \
--buildtype=release \
-Dpython=python3 \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index 715b2ebf..f9e57e53 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -96,7 +96,7 @@ meson setup \
-DBUILD_TRACEROUTE6=true \
-DBUILD_RARPD=true \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
cd ..
cd meson-build
diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh
index cc422ce0..16d4ec49 100755
--- a/source/n/php/fetch-php.sh
+++ b/source/n/php/fetch-php.sh
@@ -1,2 +1,2 @@
-lftpget http://us.php.net/distributions/php-7.3.6.tar.xz.asc
-lftpget http://us.php.net/distributions/php-7.3.6.tar.xz
+lftpget http://us.php.net/distributions/php-7.3.7.tar.xz.asc
+lftpget http://us.php.net/distributions/php-7.3.7.tar.xz
diff --git a/source/x/libinput/libinput.SlackBuild b/source/x/libinput/libinput.SlackBuild
index e4375ba7..05b9315c 100755
--- a/source/x/libinput/libinput.SlackBuild
+++ b/source/x/libinput/libinput.SlackBuild
@@ -50,6 +50,8 @@ fi
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
@@ -97,7 +99,7 @@ meson setup \
-Ddocumentation=false \
-Dtests=false \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 71092146..9b4cbe56 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -132,7 +132,7 @@ meson setup \
-Dgles1=false \
-Dgles2=true \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..
diff --git a/source/xap/hexchat/hexchat.SlackBuild b/source/xap/hexchat/hexchat.SlackBuild
index 4de9b3e5..512dc76a 100755
--- a/source/xap/hexchat/hexchat.SlackBuild
+++ b/source/xap/hexchat/hexchat.SlackBuild
@@ -96,7 +96,7 @@ meson setup \
-Dwith-lua=false \
-Dwith-python=python3 \
.. || exit 1
- ninja || exit 1
+ ninja $NUMJOBS || exit 1
DESTDIR=$PKG ninja install || exit 1
cd ..