diff options
Diffstat (limited to 'source/l')
-rwxr-xr-x | source/l/boost/boost.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/harfbuzz/harfbuzz.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/libical/libical.SlackBuild | 4 | ||||
-rw-r--r-- | source/l/libical/libical.true.false.diff | 17 | ||||
-rwxr-xr-x | source/l/libvisio/libvisio.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/qt/qt-nowebkit.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/qt5-webkit/qt5-webkit.SlackBuild | 8 | ||||
-rw-r--r-- | source/l/qt5-webkit/qt5-webkit.bison27.patch | 46 | ||||
-rw-r--r-- | source/l/qt5-webkit/qt5-webkit.icu68_1.diff | 34 | ||||
-rwxr-xr-x | source/l/qt5/qt5.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/raptor2/raptor2.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/vte/vte.SlackBuild | 2 |
12 files changed, 114 insertions, 9 deletions
diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index 80d32a63..ebe48488 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild index 4ba20e71..803507eb 100755 --- a/source/l/harfbuzz/harfbuzz.SlackBuild +++ b/source/l/harfbuzz/harfbuzz.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=harfbuzz 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 diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild index 56d88000..85589cc7 100755 --- a/source/l/libical/libical.SlackBuild +++ b/source/l/libical/libical.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libical VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -86,6 +86,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/libical.true.false.diff.gz | patch -p1 --verbose || exit 1 + mkdir build cd build cmake \ diff --git a/source/l/libical/libical.true.false.diff b/source/l/libical/libical.true.false.diff new file mode 100644 index 00000000..c1dda350 --- /dev/null +++ b/source/l/libical/libical.true.false.diff @@ -0,0 +1,17 @@ +--- ./src/libical/icalrecur.c.orig 2020-03-07 08:42:42.000000000 -0600 ++++ ./src/libical/icalrecur.c 2020-10-30 03:56:12.509914568 -0500 +@@ -142,6 +142,14 @@ + #include <stddef.h> /* For offsetof() macro */ + #include <stdlib.h> + ++#ifndef FALSE ++#define FALSE (0) ++#endif ++ ++#ifndef TRUE ++#define TRUE (!FALSE) ++#endif ++ + #if defined(HAVE_LIBICU) + #include <unicode/ucal.h> + #include <unicode/ustring.h> diff --git a/source/l/libvisio/libvisio.SlackBuild b/source/l/libvisio/libvisio.SlackBuild index 1e3caad9..9b39c2d9 100755 --- a/source/l/libvisio/libvisio.SlackBuild +++ b/source/l/libvisio/libvisio.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libvisio 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) "} diff --git a/source/l/qt/qt-nowebkit.SlackBuild b/source/l/qt/qt-nowebkit.SlackBuild index b29a32a2..f9e08a39 100755 --- a/source/l/qt/qt-nowebkit.SlackBuild +++ b/source/l/qt/qt-nowebkit.SlackBuild @@ -43,7 +43,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-16} +BUILD=${BUILD:-17} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild index 120b5524..6717b45b 100755 --- a/source/l/qt5-webkit/qt5-webkit.SlackBuild +++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=qt5-webkit SRCNAM=qtwebkit SRCVER=${SRCVER:-5.212.0-alpha4} VERSION=$(echo $SRCVER | tr - _) -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -97,6 +97,12 @@ else RELOCATIONS="" fi +# Fix for icu 68.1 no longer defining TRUE and FALSE externally: +zcat $CWD/qt5-webkit.icu68_1.diff.gz | patch -p1 --verbose || exit 1 + +# Fix for bison 3.7.x: +zcat $CWD/qt5-webkit.bison27.patch.gz | patch -p1 --verbose || exit 1 + export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing" export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing" diff --git a/source/l/qt5-webkit/qt5-webkit.bison27.patch b/source/l/qt5-webkit/qt5-webkit.bison27.patch new file mode 100644 index 00000000..e8f66ab1 --- /dev/null +++ b/source/l/qt5-webkit/qt5-webkit.bison27.patch @@ -0,0 +1,46 @@ +From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 +From: Dmitry Shachnev <mitya57@gmail.com> +Date: Tue, 4 Aug 2020 21:04:06 +0300 +Subject: [PATCH] Let Bison generate the header directly, to fix build with + Bison 3.7 + +Starting with Bison 3.7, the generated C++ file #include's the header +by default, instead of duplicating it. So we should not delete it. + +Remove the code to add #ifdef guards to the header, since Bison adds +them itself since version 2.6.3. +--- + Source/WebCore/css/makegrammar.pl | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 deletions(-) + +diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl +index 5d63b08102eb..9435701c7061 100644 +--- a/Source/WebCore/css/makegrammar.pl ++++ b/Source/WebCore/css/makegrammar.pl +@@ -73,25 +73,6 @@ + } + + my $fileBase = File::Spec->join($outputDir, $filename); +-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); ++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); + push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. + system(@bisonCommand) == 0 or die; +- +-open HEADER, ">$fileBase.h" or die; +-print HEADER << "EOF"; +-#ifndef CSSGRAMMAR_H +-#define CSSGRAMMAR_H +-EOF +- +-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; +-while (<HPP>) { +- print HEADER; +-} +-close HPP; +- +-print HEADER "#endif\n"; +-close HEADER; +- +-unlink("$fileBase.cpp.h"); +-unlink("$fileBase.hpp"); +- diff --git a/source/l/qt5-webkit/qt5-webkit.icu68_1.diff b/source/l/qt5-webkit/qt5-webkit.icu68_1.diff new file mode 100644 index 00000000..c15d33aa --- /dev/null +++ b/source/l/qt5-webkit/qt5-webkit.icu68_1.diff @@ -0,0 +1,34 @@ +--- ./Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 11:16:37.000000000 -0600 ++++ ./Source/WebCore/platform/text/icu/UTextProvider.h 2020-10-30 13:33:29.455998691 -0500 +@@ -28,6 +28,14 @@ + + #include <unicode/utext.h> + ++#ifndef FALSE ++#define FALSE (0) ++#endif ++ ++#ifndef TRUE ++#define TRUE (!FALSE) ++#endif ++ + namespace WebCore { + + enum class UTextProviderContext { +--- ./Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 11:16:37.000000000 -0600 ++++ ./Source/WebCore/platform/text/TextCodecICU.cpp 2020-10-30 13:34:33.196995165 -0500 +@@ -39,6 +39,14 @@ + #include <wtf/text/StringBuilder.h> + #include <wtf/unicode/CharacterNames.h> + ++#ifndef FALSE ++#define FALSE (0) ++#endif ++ ++#ifndef TRUE ++#define TRUE (!FALSE) ++#endif ++ + namespace WebCore { + + const size_t ConversionBufferSize = 16384; diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild index a1c5466d..fef415dd 100755 --- a/source/l/qt5/qt5.SlackBuild +++ b/source/l/qt5/qt5.SlackBuild @@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) diff --git a/source/l/raptor2/raptor2.SlackBuild b/source/l/raptor2/raptor2.SlackBuild index 18cd705a..1153263c 100755 --- a/source/l/raptor2/raptor2.SlackBuild +++ b/source/l/raptor2/raptor2.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=raptor2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-9} +BUILD=${BUILD:-10} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild index 9937c978..2b6d2076 100755 --- a/source/l/vte/vte.SlackBuild +++ b/source/l/vte/vte.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=vte VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |