diff options
Diffstat (limited to 'source/l')
5 files changed, 114 insertions, 3 deletions
diff --git a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild index fef37c2a5..2a56856d5 100755 --- a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild +++ b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gsettings-desktop-schemas 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/ocl-icd/ocl-icd.SlackBuild b/source/l/ocl-icd/ocl-icd.SlackBuild index 31bf84474..255da5964 100755 --- a/source/l/ocl-icd/ocl-icd.SlackBuild +++ b/source/l/ocl-icd/ocl-icd.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ocl-icd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/poppler/2ed4cd66401bc1d9683c94238e9024218d7be3ba.patch b/source/l/poppler/2ed4cd66401bc1d9683c94238e9024218d7be3ba.patch new file mode 100644 index 000000000..ed3169eab --- /dev/null +++ b/source/l/poppler/2ed4cd66401bc1d9683c94238e9024218d7be3ba.patch @@ -0,0 +1,26 @@ +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 new file mode 100644 index 000000000..31cba1c01 --- /dev/null +++ b/source/l/poppler/d7aa275b0bca86ae174e7e504dd269df2a0234cf.patch @@ -0,0 +1,81 @@ +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 76768ad9b..ee09a238a 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:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -77,6 +77,10 @@ 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 |