summaryrefslogtreecommitdiffstats
path: root/source/l/parted
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-10-11 21:23:09 +0000
committer Eric Hameleers <alien@slackware.com>2019-10-12 08:59:49 +0200
commit23e8bbd2ccaaba30353a5cda8d73f33fdaafce20 (patch)
tree041137df244dba8f00a74c088ffc0073552545b1 /source/l/parted
parent962b7e28acdac1577db6e5810cf36a4ad792d5ac (diff)
downloadcurrent-23e8bbd2ccaaba30353a5cda8d73f33fdaafce20.tar.gz
current-23e8bbd2ccaaba30353a5cda8d73f33fdaafce20.tar.xz
Fri Oct 11 21:23:09 UTC 201920191011212309
a/kernel-generic-4.19.79-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.79-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.79-x86_64-1.txz: Upgraded. a/pkgtools-15.0-noarch-25.txz: Rebuilt. makepkg: speed up zero length files warning. ap/sqlite-3.30.1-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.79-x86-1.txz: Upgraded. k/kernel-source-4.19.79-noarch-1.txz: Upgraded. l/iso-codes-4.4-noarch-1.txz: Upgraded. l/parted-3.3-x86_64-1.txz: Upgraded. x/xf86-video-amdgpu-19.1.0-x86_64-1.txz: Upgraded. xap/rdesktop-1.9.0-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/parted')
-rwxr-xr-xsource/l/parted/parted.SlackBuild5
-rwxr-xr-xsource/l/parted/parted.SlackBuild.static5
-rw-r--r--source/l/parted/parted.configure.diff12
-rw-r--r--source/l/parted/parted.glibc228.diff10
4 files changed, 2 insertions, 30 deletions
diff --git a/source/l/parted/parted.SlackBuild b/source/l/parted/parted.SlackBuild
index 91e9a42d6..a10f29380 100755
--- a/source/l/parted/parted.SlackBuild
+++ b/source/l/parted/parted.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=parted
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -73,9 +73,6 @@ rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
cd ${PKGNAM}-$VERSION || exit 1
-zcat $CWD/parted.configure.diff.gz | patch -p1 || exit 1
-zcat $CWD/parted.glibc228.diff.gz | patch -p1 || exit 1
-
# Make sure ownerships and permissions are sane:
chown -R root:root .
find . \
diff --git a/source/l/parted/parted.SlackBuild.static b/source/l/parted/parted.SlackBuild.static
index 48b5925d3..96415ec81 100755
--- a/source/l/parted/parted.SlackBuild.static
+++ b/source/l/parted/parted.SlackBuild.static
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=parted
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -73,9 +73,6 @@ rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
cd ${PKGNAM}-$VERSION || exit 1
-zcat $CWD/parted.configure.diff.gz | patch -p1 || exit 1
-zcat $CWD/parted.glibc228.diff.gz | patch -p1 || exit 1
-
# Make sure ownerships and permissions are sane:
chown -R root:root .
find . \
diff --git a/source/l/parted/parted.configure.diff b/source/l/parted/parted.configure.diff
deleted file mode 100644
index 4368f82dd..000000000
--- a/source/l/parted/parted.configure.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur parted-2.3.orig//configure parted-2.3/configure
---- parted-2.3.orig//configure 2010-05-28 13:29:12.000000000 -0500
-+++ parted-2.3/configure 2010-07-12 03:23:18.314505370 -0500
-@@ -14199,7 +14199,7 @@
- # Don't try bare '--as-needed'; nothing likes it and the HP-UX 11.11
- # native cc issues annoying warnings and then ignores it,
- # which would cause us to incorrectly conclude that it worked.
-- for gl_flags in '-Wl,--as-needed' \
-+ for gl_flags in '-Wl,--no-as-needed' \
- '-Wl,-z,ignore' \
- '-z ignore'
-
diff --git a/source/l/parted/parted.glibc228.diff b/source/l/parted/parted.glibc228.diff
deleted file mode 100644
index db33798b0..000000000
--- a/source/l/parted/parted.glibc228.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./libparted/architecture.h.orig 2014-06-15 13:17:43.000000000 -0500
-+++ ./libparted/architecture.h 2018-09-18 18:55:41.959066415 -0500
-@@ -24,6 +24,7 @@
- #define _LIBPARTED_ARCH_H_INCLUDED
-
- #include <parted/disk.h>
-+#include <sys/sysmacros.h>
-
- struct _PedArchitecture {
- PedDiskArchOps* disk_ops;