summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-07-26 21:37:31 +0000
committerEric Hameleers <alien@slackware.com>2019-07-27 08:59:46 +0200
commit1a1f1ce393df7ca4b6574f2ad6ccfc36f0f0cad7 (patch)
treeb7e3ccc158f070653734b8269d52dfb5345c1883 /source
parent8b5c0b991d345c720e4c36441cf53151c23138cf (diff)
downloadcurrent-1a1f1ce393df7ca4b6574f2ad6ccfc36f0f0cad7.tar.gz
Fri Jul 26 21:37:31 UTC 201920190726213731
a/kernel-firmware-20190726_dff98c6-noarch-1.txz: Upgraded. a/kernel-generic-4.19.61-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.61-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.61-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.61-x86-1.txz: Upgraded. k/kernel-source-4.19.61-noarch-1.txz: Upgraded. l/babl-0.1.68-x86_64-1.txz: Upgraded. l/desktop-file-utils-0.24-x86_64-1.txz: Upgraded. l/zstd-1.4.2-x86_64-1.txz: Upgraded. n/ethtool-5.2-x86_64-1.txz: Upgraded. n/gnutls-3.6.9-x86_64-1.txz: Upgraded. x/xf86-video-s3-0.7.0-x86_64-1.txz: Upgraded. xap/gkrellm-2.3.11-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rw-r--r--source/k/kernel-configs/config-generic-4.19.61 (renamed from source/k/kernel-configs/config-generic-4.19.60)2
-rw-r--r--source/k/kernel-configs/config-generic-4.19.61.x64 (renamed from source/k/kernel-configs/config-generic-4.19.60.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-4.19.61-smp (renamed from source/k/kernel-configs/config-generic-smp-4.19.60-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-4.19.61 (renamed from source/k/kernel-configs/config-huge-4.19.60)2
-rw-r--r--source/k/kernel-configs/config-huge-4.19.61.x64 (renamed from source/k/kernel-configs/config-huge-4.19.60.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-4.19.61-smp (renamed from source/k/kernel-configs/config-huge-smp-4.19.60-smp)2
-rwxr-xr-xsource/l/babl/babl.SlackBuild4
-rwxr-xr-xsource/l/desktop-file-utils/desktop-file-utils.SlackBuild6
-rw-r--r--source/l/desktop-file-utils/desktop-file-utils.url1
-rwxr-xr-xsource/n/gnutls/gnutls.SlackBuild2
-rw-r--r--source/x/x11/build/xf86-video-s32
-rw-r--r--source/x/x11/patch/xf86-video-s3.patch7
-rwxr-xr-xsource/xap/gkrellm/gkrellm.SlackBuild8
-rw-r--r--source/xap/gkrellm/gkrellm.url1
14 files changed, 22 insertions, 21 deletions
diff --git a/source/k/kernel-configs/config-generic-4.19.60 b/source/k/kernel-configs/config-generic-4.19.61
index a4d5fac7..26e27355 100644
--- a/source/k/kernel-configs/config-generic-4.19.60
+++ b/source/k/kernel-configs/config-generic-4.19.61
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.60 Kernel Configuration
+# Linux/x86 4.19.61 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-generic-4.19.60.x64 b/source/k/kernel-configs/config-generic-4.19.61.x64
index e2ffbd69..b00d02d1 100644
--- a/source/k/kernel-configs/config-generic-4.19.60.x64
+++ b/source/k/kernel-configs/config-generic-4.19.61.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.60 Kernel Configuration
+# Linux/x86 4.19.61 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-generic-smp-4.19.60-smp b/source/k/kernel-configs/config-generic-smp-4.19.61-smp
index 79abfadf..f1addae1 100644
--- a/source/k/kernel-configs/config-generic-smp-4.19.60-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.19.61-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.60 Kernel Configuration
+# Linux/x86 4.19.61 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-4.19.60 b/source/k/kernel-configs/config-huge-4.19.61
index 17ae2458..8b0b2495 100644
--- a/source/k/kernel-configs/config-huge-4.19.60
+++ b/source/k/kernel-configs/config-huge-4.19.61
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.60 Kernel Configuration
+# Linux/x86 4.19.61 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-4.19.60.x64 b/source/k/kernel-configs/config-huge-4.19.61.x64
index 23898bef..ac92fea8 100644
--- a/source/k/kernel-configs/config-huge-4.19.60.x64
+++ b/source/k/kernel-configs/config-huge-4.19.61.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.60 Kernel Configuration
+# Linux/x86 4.19.61 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-smp-4.19.60-smp b/source/k/kernel-configs/config-huge-smp-4.19.61-smp
index b6b4e94d..d618784c 100644
--- a/source/k/kernel-configs/config-huge-smp-4.19.60-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.19.61-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.60 Kernel Configuration
+# Linux/x86 4.19.61 Kernel Configuration
#
#
diff --git a/source/l/babl/babl.SlackBuild b/source/l/babl/babl.SlackBuild
index 522dbd0d..77b864ee 100755
--- a/source/l/babl/babl.SlackBuild
+++ b/source/l/babl/babl.SlackBuild
@@ -78,6 +78,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+if [ ! -r configure ]; then
+ NOCONFIGURE=1 ./autogen.sh
+fi
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
diff --git a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild
index 5028e30f..d2a91128 100755
--- a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild
+++ b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild
@@ -23,8 +23,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=desktop-file-utils
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -63,7 +63,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
cd ${PKGNAM}-$VERSION || exit 1
zcat $CWD/desktop-file-utils.quiet.warnings.diff.gz | patch -p1 --verbose || exit 1
diff --git a/source/l/desktop-file-utils/desktop-file-utils.url b/source/l/desktop-file-utils/desktop-file-utils.url
new file mode 100644
index 00000000..94f6a624
--- /dev/null
+++ b/source/l/desktop-file-utils/desktop-file-utils.url
@@ -0,0 +1 @@
+http://www.freedesktop.org/software/desktop-file-utils/releases/
diff --git a/source/n/gnutls/gnutls.SlackBuild b/source/n/gnutls/gnutls.SlackBuild
index 9049b5da..a1db0200 100755
--- a/source/n/gnutls/gnutls.SlackBuild
+++ b/source/n/gnutls/gnutls.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gnutls
VERSION=${VERSION:-$(echo gnutls-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/x/x11/build/xf86-video-s3 b/source/x/x11/build/xf86-video-s3
index b4de3947..d00491fd 100644
--- a/source/x/x11/build/xf86-video-s3
+++ b/source/x/x11/build/xf86-video-s3
@@ -1 +1 @@
-11
+1
diff --git a/source/x/x11/patch/xf86-video-s3.patch b/source/x/x11/patch/xf86-video-s3.patch
deleted file mode 100644
index 17d7e829..00000000
--- a/source/x/x11/patch/xf86-video-s3.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-# Remove obsolete references to mibstore.h and miInitializeBackingStore():
-grep -r -l '#include "mibstore.h"' * | while read file ; do
- sed -i "s/#include \"mibstore.h\"//g" $file
-done
-grep -r -l 'miInitializeBackingStore(pScreen);' | while read file ; do
- sed -i "s/miInitializeBackingStore(pScreen);//g" $file
-done
diff --git a/source/xap/gkrellm/gkrellm.SlackBuild b/source/xap/gkrellm/gkrellm.SlackBuild
index c59fb749..102315b9 100755
--- a/source/xap/gkrellm/gkrellm.SlackBuild
+++ b/source/xap/gkrellm/gkrellm.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gkrellm
VERSION=${VERSION:-$(echo $PKGNAM-2*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
PKGVER=$VERSION
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -45,6 +45,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
if [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
else
@@ -59,7 +61,7 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf gkrellm-$VERSION
-tar xvf $CWD/gkrellm-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/gkrellm-$VERSION.tar.?z || exit 1
cd gkrellm-$VERSION || exit 1
# Fix library paths (works for all ARCHs):
sed -i -e "s#lib/gkrellm2#lib${LIBDIRSUFFIX}/gkrellm2#g" $(grep -lr 'lib/gkrellm2' *)
@@ -74,7 +76,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-make \
+make $NUMJOBS \
INSTALLROOT=/usr \
INSTALLDIR=/usr/bin \
INCLUDEDIR=/usr/include \
diff --git a/source/xap/gkrellm/gkrellm.url b/source/xap/gkrellm/gkrellm.url
new file mode 100644
index 00000000..b960ed15
--- /dev/null
+++ b/source/xap/gkrellm/gkrellm.url
@@ -0,0 +1 @@
+http://gkrellm.srcbox.net/releases