From 737a73a489dfff9ba7668953a47b715115ef56f9 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 17 Jul 2020 18:42:24 +0000
Subject: Fri Jul 17 18:42:24 UTC 2020

ap/mpg123-1.26.3-x86_64-1.txz:  Upgraded.
n/gpgme-1.14.0-x86_64-1.txz:  Upgraded.
xap/gnuplot-5.4.0-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/mpg123-1.26.3-x86_64-1_alsa.txz:  Upgraded.
---
 source/n/gpgme/gpgme.SlackBuild                     |  2 +-
 source/xap/gnuplot/gnuplot.SlackBuild               |  7 ++-----
 source/xap/gnuplot/gnuplot.fix.info.generation.diff | 11 -----------
 3 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 source/xap/gnuplot/gnuplot.fix.info.generation.diff

(limited to 'source')

diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild
index ef7caaac1..b3728391d 100755
--- a/source/n/gpgme/gpgme.SlackBuild
+++ b/source/n/gpgme/gpgme.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gpgme
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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
diff --git a/source/xap/gnuplot/gnuplot.SlackBuild b/source/xap/gnuplot/gnuplot.SlackBuild
index 16779f9f0..7c43cc749 100755
--- a/source/xap/gnuplot/gnuplot.SlackBuild
+++ b/source/xap/gnuplot/gnuplot.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gnuplot
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | 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
@@ -84,9 +84,6 @@ sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
   -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
   src/variable.c
 
-# Fix failure in building info file:
-zcat $CWD/gnuplot.fix.info.generation.diff.gz | patch -p1 --verbose || exit 1
-
 # To distribute gnuplot binaries, you can not use GNU readline, as
 # gnuplot does not use a GPL compatible free license.
 CFLAGS="$SLKCFLAGS" \
@@ -137,7 +134,7 @@ fi
 mkdir -p $PKG/usr/doc/gnuplot-$VERSION
 cp -a \
   BUGS CodeStyle Copyright INSTALL NEWS PATCHLEVEL PGPKEYS PORTING \
-  README* TODO VERSION \
+  README* RELEASE_NOTES TODO VERSION \
   $PKG/usr/doc/gnuplot-$VERSION
 cp -a demo $PKG/usr/doc/gnuplot-$VERSION
 rm -rf $PKG/usr/doc/gnuplot-$VERSION/demo/Make* $PKG/usr/doc/gnuplot-$VERSION/demo/html
diff --git a/source/xap/gnuplot/gnuplot.fix.info.generation.diff b/source/xap/gnuplot/gnuplot.fix.info.generation.diff
deleted file mode 100644
index ff4bd86df..000000000
--- a/source/xap/gnuplot/gnuplot.fix.info.generation.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./docs/doc2texi.el.orig	2017-05-18 11:30:19.000000000 -0500
-+++ ./docs/doc2texi.el	2017-09-30 13:21:17.213250046 -0500
-@@ -760,7 +760,7 @@
-     (while (re-search-forward "^#end" (point-max) "to_end")
-       (replace-match "@end itemize" t))
-     (goto-char (point-min))
--    (while (re-search-forward "^#b" (point-max) "to_end")
-+    (while (re-search-forward "^#b " (point-max) "to_end")
-       (replace-match "@item\n" t))
-     (goto-char (point-min))
-     (while (re-search-forward "^##" (point-max) "to_end")
-- 
cgit v1.2.3