17 files changed, 29 insertions, 125 deletions
diff --git a/source/ap/mariadb/mariadb.ConnectorName.cmake.diff b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
new file mode 100644
index 00000000..75da7d99
--- /dev/null
+++ b/source/ap/mariadb/mariadb.ConnectorName.cmake.diff
@@ -0,0 +1,12 @@
+diff -u -r --new-file mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake
+--- mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake	2021-02-16 08:50:36.000000000 -0600
++++ mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake	2021-04-03 12:41:14.858993480 -0500
+@@ -22,7 +22,7 @@
+     SET(MACHINE_NAME "x64")
+   ELSE()
+     SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild
index 63428060..b83511e9 100755
--- a/source/ap/mariadb/mariadb.SlackBuild
+++ b/source/ap/mariadb/mariadb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # Copyright 2011, 2012, 2013, 2014, 2017  Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
@@ -97,6 +97,9 @@ if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
   zcat $CWD/mysql.no.plugin_auth_pam.diff.gz | patch -p1 --verbose || exit 1
 fi
 
+# Fix a CMake syntax error:
+zcat $CWD/mariadb.ConnectorName.cmake.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra
index 7f8f011e..45a4fb75 100644
--- a/source/kde/kde/build/calligra
+++ b/source/kde/kde/build/calligra
@@ -1 +1 @@
-7
+8
diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/cantor
+++ b/source/kde/kde/build/cantor
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/kfilemetadata
+++ b/source/kde/kde/build/kfilemetadata
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile
index 7f8f011e..45a4fb75 100644
--- a/source/kde/kde/build/kile
+++ b/source/kde/kde/build/kile
@@ -1 +1 @@
-7
+8
diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/kitinerary
+++ b/source/kde/kde/build/kitinerary
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index 00750edc..b8626c4c 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-3
+4
diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular
index d00491fd..0cfbf088 100644
--- a/source/kde/kde/build/okular
+++ b/source/kde/kde/build/okular
@@ -1 +1 @@
-1
+2
diff --git a/source/l/isl/isl.SlackBuild b/source/l/isl/isl.SlackBuild
index 86ba47ba..27c2666f 100755
--- a/source/l/isl/isl.SlackBuild
+++ b/source/l/isl/isl.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=isl
 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/l/poppler/2ed4cd66401bc1d9683c94238e9024218d7be3ba.patch b/source/l/poppler/2ed4cd66401bc1d9683c94238e9024218d7be3ba.patch
deleted file mode 100644
index ed3169ea..00000000
--- a/source/l/poppler/2ed4cd66401bc1d9683c94238e9024218d7be3ba.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2ed4cd66401bc1d9683c94238e9024218d7be3ba Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 7 Apr 2021 00:14:59 +0200
-Subject: [PATCH] TextOutputDev: Fix crash in malformed file
-
-oss-fuzz/32952
----
- poppler/TextOutputDev.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
-index ea12b4689..956c13289 100644
---- a/poppler/TextOutputDev.cc
-+++ b/poppler/TextOutputDev.cc
-@@ -931,7 +931,7 @@ TextPool::~TextPool()
- int TextPool::getBaseIdx(double base) const
- {
-     const double baseIdxDouble = base / textPoolStep;
--    if (baseIdxDouble < minBaseIdx) {
-+    if (std::isnan(baseIdxDouble) || baseIdxDouble < minBaseIdx) {
-         return minBaseIdx;
-     }
-     if (baseIdxDouble > maxBaseIdx) {
--- 
-GitLab
-
diff --git a/source/l/poppler/d7aa275b0bca86ae174e7e504dd269df2a0234cf.patch b/source/l/poppler/d7aa275b0bca86ae174e7e504dd269df2a0234cf.patch
deleted file mode 100644
index 31cba1c0..00000000
--- a/source/l/poppler/d7aa275b0bca86ae174e7e504dd269df2a0234cf.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From d7aa275b0bca86ae174e7e504dd269df2a0234cf Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Tue, 6 Apr 2021 09:56:55 +0300
-Subject: [PATCH] Export SplashFont* symbols used by Scribus
-
-Scribus 1.5.6.1 compiled against poppler 21.04.0 was unable to load its
-PDF importer plugin without these classes being exported by libpoppler:
-
-- SplashFontFileID
-- SplashFontEngine
-- SplashFontSrc
----
- splash/SplashFontEngine.h | 3 ++-
- splash/SplashFontFile.h   | 3 ++-
- splash/SplashFontFileID.h | 4 +++-
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/splash/SplashFontEngine.h b/splash/SplashFontEngine.h
-index becc0d9ce..3e5458c09 100644
---- a/splash/SplashFontEngine.h
-+++ b/splash/SplashFontEngine.h
-@@ -30,6 +30,7 @@
- #include <array>
- 
- #include "SplashTypes.h"
-+#include "poppler_private_export.h"
- 
- class SplashT1FontEngine;
- class SplashFTFontEngine;
-@@ -44,7 +45,7 @@ class SplashFontSrc;
- // SplashFontEngine
- //------------------------------------------------------------------------
- 
--class SplashFontEngine
-+class POPPLER_PRIVATE_EXPORT SplashFontEngine
- {
- public:
-     // Create a font engine.
-diff --git a/splash/SplashFontFile.h b/splash/SplashFontFile.h
-index 598fd8325..539bd3075 100644
---- a/splash/SplashFontFile.h
-+++ b/splash/SplashFontFile.h
-@@ -23,6 +23,7 @@
- #define SPLASHFONTFILE_H
- 
- #include "SplashTypes.h"
-+#include "poppler_private_export.h"
- 
- class GooString;
- class SplashFontEngine;
-@@ -33,7 +34,7 @@ class SplashFontFileID;
- // SplashFontFile
- //------------------------------------------------------------------------
- 
--class SplashFontSrc
-+class POPPLER_PRIVATE_EXPORT SplashFontSrc
- {
- public:
-     SplashFontSrc();
-diff --git a/splash/SplashFontFileID.h b/splash/SplashFontFileID.h
-index 02b528aab..c127dd87f 100644
---- a/splash/SplashFontFileID.h
-+++ b/splash/SplashFontFileID.h
-@@ -21,11 +21,13 @@
- #ifndef SPLASHFONTFILEID_H
- #define SPLASHFONTFILEID_H
- 
-+#include "poppler_private_export.h"
-+
- //------------------------------------------------------------------------
- // SplashFontFileID
- //------------------------------------------------------------------------
- 
--class SplashFontFileID
-+class POPPLER_PRIVATE_EXPORT SplashFontFileID
- {
- public:
-     SplashFontFileID();
--- 
-GitLab
-
diff --git a/source/l/poppler/poppler.SlackBuild b/source/l/poppler/poppler.SlackBuild
index ee09a238..76768ad9 100755
--- a/source/l/poppler/poppler.SlackBuild
+++ b/source/l/poppler/poppler.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=poppler
 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
@@ -77,10 +77,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# Apply upstream patches to fix regressions:
-zcat $CWD/2ed4cd66401bc1d9683c94238e9024218d7be3ba.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/d7aa275b0bca86ae174e7e504dd269df2a0234cf.patch.gz | patch -p1 --verbose || exit 1
-
 mkdir cmake-build
 cd cmake-build
 
diff --git a/source/n/ethtool/ethtool.SlackBuild b/source/n/ethtool/ethtool.SlackBuild
index 5048ff26..16e35f4c 100755
--- a/source/n/ethtool/ethtool.SlackBuild
+++ b/source/n/ethtool/ethtool.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ethtool
 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/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild
index 438525ee..36a3a91e 100755
--- a/source/n/httpd/httpd.SlackBuild
+++ b/source/n/httpd/httpd.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=httpd
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/postfix/postfix.SlackBuild b/source/n/postfix/postfix.SlackBuild
index b3cbf888..3cc6375a 100755
--- a/source/n/postfix/postfix.SlackBuild
+++ b/source/n/postfix/postfix.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=postfix
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
diff --git a/source/xap/gparted/gparted.SlackBuild b/source/xap/gparted/gparted.SlackBuild
index 3beec60e..18c7e9ac 100755
--- a/source/xap/gparted/gparted.SlackBuild
+++ b/source/xap/gparted/gparted.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gparted
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}