diff options
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/diffutils/diffutils-sdiff-no-waitpid.patch | 24 | ||||
| -rwxr-xr-x | source/ap/diffutils/diffutils.SlackBuild | 9 | ||||
| -rw-r--r-- | source/ap/diffutils/diffutils.mkdir_p.diff | 11 |
3 files changed, 1 insertions, 43 deletions
diff --git a/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch b/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch deleted file mode 100644 index c8eefb44b..000000000 --- a/source/ap/diffutils/diffutils-sdiff-no-waitpid.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur diffutils-2.9.orig/src/sdiff.c diffutils-2.9.new/src/sdiff.c ---- diffutils-2.9.orig/src/sdiff.c 2010-02-11 03:39:17.000000000 -0600 -+++ diffutils-2.9.new/src/sdiff.c 2010-02-14 02:28:19.077953690 -0600 -@@ -715,7 +715,7 @@ - ck_fclose (out); - - { -- int wstatus; -+ int wstatus = 0; - int werrno = 0; - - #if ! (HAVE_WORKING_FORK || HAVE_WORKING_VFORK) -@@ -724,11 +724,6 @@ - werrno = errno; - #else - ck_fclose (diffout); -- while (waitpid (diffpid, &wstatus, 0) < 0) -- if (errno == EINTR) -- checksigs (); -- else -- perror_fatal ("waitpid"); - diffpid = 0; - #endif - diff --git a/source/ap/diffutils/diffutils.SlackBuild b/source/ap/diffutils/diffutils.SlackBuild index 3653a4a59..eab4ff941 100755 --- a/source/ap/diffutils/diffutils.SlackBuild +++ b/source/ap/diffutils/diffutils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=diffutils VERSION=${VERSION:-$(echo diffutils-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -77,13 +77,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/diffutils-sdiff-no-waitpid.patch.gz | patch -p1 || exit 1 -# Prevent ruining sdiff.1 by touching it so it won't "regenerate": -touch man/sdiff.1 - -# Fix installation of NLS files: -zcat $CWD/diffutils.mkdir_p.diff.gz | patch -p1 || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/ap/diffutils/diffutils.mkdir_p.diff b/source/ap/diffutils/diffutils.mkdir_p.diff deleted file mode 100644 index 4ebaf69b7..000000000 --- a/source/ap/diffutils/diffutils.mkdir_p.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./po/Makefile.in.in.orig 2013-03-23 09:51:10.000000000 -0500 -+++ ./po/Makefile.in.in 2013-10-03 16:25:59.778992814 -0500 -@@ -42,7 +42,7 @@ - mkinstalldirs = $(SHELL) @install_sh@ -d - install_sh = $(SHELL) @install_sh@ - MKDIR_P = @MKDIR_P@ --mkdir_p = @mkdir_p@ -+mkdir_p = @MKDIR_P@ - - GMSGFMT_ = @GMSGFMT@ - GMSGFMT_no = @GMSGFMT@ |