From 904faf18a01564215de285b231fadb2e3f0957fd Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 31 Oct 2021 19:59:15 +0000
Subject: Sun Oct 31 19:59:15 UTC 2021

d/meson-0.59.3-x86_64-1.txz:  Upgraded.
  Reverted to a version that works better for us. Thanks to nobodino.
l/imagemagick-7.1.0_13-x86_64-1.txz:  Upgraded.
l/pcre2-10.39-x86_64-1.txz:  Upgraded.
l/sip-4.19.25-x86_64-4.txz:  Rebuilt.
  Fixed missing sip.h.
n/getmail-6.18.5-x86_64-1.txz:  Upgraded.
---
 source/l/sip/sip.SlackBuild         | 39 ++++++++++++++++++++++++++++++++++++-
 source/n/getmail/getmail.SlackBuild |  2 +-
 2 files changed, 39 insertions(+), 2 deletions(-)

(limited to 'source')

diff --git a/source/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild
index 4668df16a..3edf8c5c6 100755
--- a/source/l/sip/sip.SlackBuild
+++ b/source/l/sip/sip.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sip
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -86,6 +86,30 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
+python2 configure.py \
+  -b "/usr/bin" \
+  -d "$PYTHON2LIB" \
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  || exit 1
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+## Add the PyQt4 private sip module:
+#make clean
+#python2 configure.py \
+#  --sip-module PyQt4.sip \
+#  --no-tools \
+#  -b "/usr/bin" \
+#  -d "$PYTHON2LIB" \
+#  CFLAGS="$SLKCFLAGS" \
+#  CXXFLAGS="$SLKCFLAGS" \
+#  || exit 1
+#make $NUMJOBS || make || exit 1
+#make install DESTDIR=$PKG || exit 1
+
+# Add the PyQt5 private sip module:
+make clean
 python2 configure.py \
   --sip-module PyQt5.sip \
   --no-tools \
@@ -101,6 +125,7 @@ make install DESTDIR=$PKG || exit 1
 mv $PKG/usr/bin/sip $PKG/usr/bin/sip2
 
 make clean
+
 python3 configure.py \
   -b "/usr/bin" \
   -d "$PYTHON3LIB" \
@@ -109,6 +134,18 @@ python3 configure.py \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+## Add the PyQt4 private sip module:
+#make clean
+#python3 configure.py \
+#  --sip-module PyQt4.sip \
+#  --no-tools \
+#  -b "/usr/bin" \
+#  -d "$PYTHON3LIB" \
+#  CFLAGS="$SLKCFLAGS" \
+#  CXXFLAGS="$SLKCFLAGS" || exit 1
+#make $NUMJOBS || make || exit 1
+#make install DESTDIR=$PKG || exit 1
+
 # Add the PyQt5 private sip module:
 make clean
 python3 configure.py \
diff --git a/source/n/getmail/getmail.SlackBuild b/source/n/getmail/getmail.SlackBuild
index 47daff253..1830c241d 100755
--- a/source/n/getmail/getmail.SlackBuild
+++ b/source/n/getmail/getmail.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=getmail
 VERSION=${VERSION:-$(echo getmail6-*.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
-- 
cgit v1.2.3