From c8a9fabe254ba88c6ed20460a879bd54aef5c3dc Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Mon, 17 Feb 2020 12:19:13 +0100 Subject: Deps: removed packages that were added to Slackware distro today Moved to Slackware: brotli, hyphen, socat, qt5-webkit, woff2. --- deps/qt5-webkit/.deps | 3 - deps/qt5-webkit/.url | 1 - deps/qt5-webkit/patches/qt5-webkit.gcc7.patch | 34 ------ deps/qt5-webkit/patches/qt5-webkit.icu59.patch | 80 ------------- deps/qt5-webkit/patches/qt5-webkit.icu65.patch | 47 -------- deps/qt5-webkit/patches/qt5-webkit.pthread.patch | 32 ----- deps/qt5-webkit/qt5-webkit.SlackBuild | 143 ----------------------- deps/qt5-webkit/slack-desc | 19 --- 8 files changed, 359 deletions(-) delete mode 100644 deps/qt5-webkit/.deps delete mode 100644 deps/qt5-webkit/.url delete mode 100644 deps/qt5-webkit/patches/qt5-webkit.gcc7.patch delete mode 100644 deps/qt5-webkit/patches/qt5-webkit.icu59.patch delete mode 100644 deps/qt5-webkit/patches/qt5-webkit.icu65.patch delete mode 100644 deps/qt5-webkit/patches/qt5-webkit.pthread.patch delete mode 100755 deps/qt5-webkit/qt5-webkit.SlackBuild delete mode 100644 deps/qt5-webkit/slack-desc (limited to 'deps/qt5-webkit') diff --git a/deps/qt5-webkit/.deps b/deps/qt5-webkit/.deps deleted file mode 100644 index 14ae13d..0000000 --- a/deps/qt5-webkit/.deps +++ /dev/null @@ -1,3 +0,0 @@ -qt5 -hyphen -woff2 diff --git a/deps/qt5-webkit/.url b/deps/qt5-webkit/.url deleted file mode 100644 index 0037258..0000000 --- a/deps/qt5-webkit/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/annulen/webkit/releases/download/qtwebkit-5.212.0-alpha3/qtwebkit-5.212.0-alpha3.tar.xz diff --git a/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch b/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch deleted file mode 100644 index bddb6fc..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -u -r webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h ---- webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h 2017-02-20 17:20:15.000000000 +0100 -+++ webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h 2017-06-27 13:13:57.801527350 +0200 -@@ -581,29 +581,7 @@ - // FIXME: Does this really belong in StringImpl? - template static void copyChars(T* destination, const T* source, unsigned numCharacters) - { -- if (numCharacters == 1) { -- *destination = *source; -- return; -- } -- -- if (numCharacters <= s_copyCharsInlineCutOff) { -- unsigned i = 0; --#if (CPU(X86) || CPU(X86_64)) -- const unsigned charsPerInt = sizeof(uint32_t) / sizeof(T); -- -- if (numCharacters > charsPerInt) { -- unsigned stopCount = numCharacters & ~(charsPerInt - 1); -- -- const uint32_t* srcCharacters = reinterpret_cast(source); -- uint32_t* destCharacters = reinterpret_cast(destination); -- for (unsigned j = 0; i < stopCount; i += charsPerInt, ++j) -- destCharacters[j] = srcCharacters[j]; -- } --#endif -- for (; i < numCharacters; ++i) -- destination[i] = source[i]; -- } else -- memcpy(destination, source, numCharacters * sizeof(T)); -+ memcpy(destination, source, numCharacters * sizeof(T)); - } - - ALWAYS_INLINE static void copyChars(UChar* destination, const LChar* source, unsigned numCharacters) diff --git a/deps/qt5-webkit/patches/qt5-webkit.icu59.patch b/deps/qt5-webkit/patches/qt5-webkit.icu59.patch deleted file mode 100644 index 3eb73b2..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.icu59.patch +++ /dev/null @@ -1,80 +0,0 @@ -Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) -Date: 2017-04-29 -Initial Package Version: 5.8.0 -Upstream Status: Unknown -Origin: https://bugreports.qt.io/browse/QTBUG-35971 -Description: Fixes build with icu-59. - -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/JavaScriptCore/API/JSStringRef.h qtwebkit-opensource-src-5.8.0/Source/JavaScriptCore/API/JSStringRef.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/JavaScriptCore/API/JSStringRef.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/JavaScriptCore/API/JSStringRef.h 2017-04-29 17:03:35.280465079 -0500 -@@ -32,6 +32,7 @@ - #include - #endif - #include /* for size_t */ -+#include - - #ifdef __cplusplus - extern "C" { -@@ -43,7 +44,7 @@ extern "C" { - @typedef JSChar - @abstract A Unicode character. - */ -- typedef unsigned short JSChar; -+ typedef char16_t JSChar; - #else - typedef wchar_t JSChar; - #endif -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/Compiler.h qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/Compiler.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/Compiler.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/Compiler.h 2017-04-29 17:03:35.280465079 -0500 -@@ -61,6 +61,7 @@ - #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_feature(has_trivial_destructor) - #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums) - #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions) -+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES !defined(_LIBCPP_HAS_NO_UNICODE_CHARS) - - #endif - -@@ -142,6 +143,7 @@ - #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 - #endif - #if GCC_VERSION_AT_LEAST(4, 5, 0) -+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1 - #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1 - #endif - #if GCC_VERSION_AT_LEAST(4, 6, 0) -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/TypeTraits.h qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/TypeTraits.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/TypeTraits.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/TypeTraits.h 2017-04-29 17:03:35.280465079 -0500 -@@ -75,6 +75,10 @@ namespace WTF { - #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) - template<> struct IsInteger { static const bool value = true; }; - #endif -+#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES) -+ template<> struct IsInteger { static const bool value = true; }; -+ template<> struct IsInteger { static const bool value = true; }; -+#endif - - template struct IsFloatingPoint { static const bool value = false; }; - template<> struct IsFloatingPoint { static const bool value = true; }; -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WebKit2/Shared/API/c/WKString.h qtwebkit-opensource-src-5.8.0/Source/WebKit2/Shared/API/c/WKString.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/WebKit2/Shared/API/c/WKString.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/Shared/API/c/WKString.h 2017-04-29 17:03:35.280465079 -0500 -@@ -31,6 +31,7 @@ - #ifndef __cplusplus - #include - #endif -+#include - - #ifdef __cplusplus - extern "C" { -@@ -38,7 +39,7 @@ extern "C" { - - #if !defined(WIN32) && !defined(_WIN32) \ - && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ -- typedef unsigned short WKChar; -+ typedef char16_t WKChar; - #else - typedef wchar_t WKChar; - #endif diff --git a/deps/qt5-webkit/patches/qt5-webkit.icu65.patch b/deps/qt5-webkit/patches/qt5-webkit.icu65.patch deleted file mode 100644 index fe27d24..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.icu65.patch +++ /dev/null @@ -1,47 +0,0 @@ -# ----------------------------------------------------------------------------- -# Patch obtained from FreeBSD: -# https://svnweb.freebsd.org/ports/head/www/qt5-webkit/files/patch-Source_WebCore_dom_Document.cpp?view=co -# ----------------------------------------------------------------------------- -Regressed by https://github.com/unicode-org/icu/commit/480bec3ea652 - -In file included from Source/WebCore/dom/DOMAllInOne.cpp:67: -Source/WebCore/dom/Document.cpp:4410:39: error: expected ';' after do/while statement - U16_NEXT(characters, i, length, c) - ^ - ; -Source/WebCore/dom/Document.cpp:4415:43: error: expected ';' after do/while statement - U16_NEXT(characters, i, length, c) - ^ - ; -Source/WebCore/dom/Document.cpp:4477:46: error: expected ';' after do/while statement - U16_NEXT(qualifiedName, i, length, c) - ^ - ; - ---- Source/WebCore/dom/Document.cpp.orig 2019-06-26 16:25:02 UTC -+++ Source/WebCore/dom/Document.cpp -@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* character - unsigned i = 0; - - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNameStart(c)) - return false; - - while (i < length) { -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (!isValidNamePart(c)) - return false; - } -@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualif - - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(qualifiedName, i, length, c) -+ U16_NEXT(qualifiedName, i, length, c); - if (c == ':') { - if (sawColon) { - ec = NAMESPACE_ERR; - diff --git a/deps/qt5-webkit/patches/qt5-webkit.pthread.patch b/deps/qt5-webkit/patches/qt5-webkit.pthread.patch deleted file mode 100644 index 53d5439..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.pthread.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Mon, 22 Feb 2016 10:57:32 +0100 -Subject: [PATCH] Fix linking with libpthread - -WebKit use libpthread directly but is depending on other qt modules -causing it to be linked against, which might break unless -lpthread -is last. Instead just add it explicitly after the static libraries. - -Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 -Reviewed-by: Simon Hausmann -(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df) -Reviewed-by: Allan Sandfeld Jensen ---- - Tools/qmake/mkspecs/features/default_post.prf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf -index 67276b7..39bb3f7 100644 ---- a/Tools/qmake/mkspecs/features/default_post.prf -+++ b/Tools/qmake/mkspecs/features/default_post.prf -@@ -201,6 +201,7 @@ needToLink() { - linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir)) - LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs) - } -+ posix:!darwin: LIBS += -lpthread - } - - creating_module { --- -2.7.1 - diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild deleted file mode 100755 index 5bad338..0000000 --- a/deps/qt5-webkit/qt5-webkit.SlackBuild +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/sh - -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Derived from the qt5.SlackBuild - -# Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1, 5.9.0, 5.9.1, 5.212 2016, 2017, 2018, 2019 by Eric Hameleers, Eindhoven, NL - -PKGNAM=qt5-webkit -SRCVER=${SRCVER:-"5.212.0-alpha3"} -VERSION=$(echo $SRCVER | tr - _) -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf qtwebkit-$SRCVER -echo "Extracting qtwebkit-$SRCVER.tar.xz" -tar xf $CWD/qtwebkit-$SRCVER.tar.xz || exit 1 -cd qtwebkit-$SRCVER || exit 1 - -# Fix compilation against icu4c 65.1: -cat $CWD/patches/qt5-webkit.icu65.patch | patch -p0 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Use -reduce-relocations only on i?86 and x86_64 architextures. -# https://bugreports.qt-project.org/browse/QTBUG-36129 -if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then - RELOCATIONS="-reduce-relocations" -else - RELOCATIONS="" -fi - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing" -export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing" -export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5" -export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" - -mkdir build -cd build - cmake .. \ - -DPORT=Qt \ - -DQt5_DIR=$QTDIR \ - || exit 1 - make ${NUMJOBS} || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd .. - -# Strip binaries the Slackware way: -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Fix the path in prl files: -find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; - -# Add a documentation directory: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - ChangeLog* VERSION \ - $PKG/usr/doc/$PKGNAM-$VERSION -if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt5/doc/html ]; then - ( cd $PKG/usr/doc/$PKGNAM-$VERSION - ln -sf /usr/lib${LIBDIRSUFFIX}/qt5/doc/html . - ) -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/qt5-webkit/slack-desc b/deps/qt5-webkit/slack-desc deleted file mode 100644 index baba7e8..0000000 --- a/deps/qt5-webkit/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -qt5-webkit: qt5-webkit (Qt based web browser engine) -qt5-webkit: -qt5-webkit: Qtwebkit is a Qt based web browser engine. -qt5-webkit: This package contains the Qt5 based version. -qt5-webkit: -qt5-webkit: Homepage: http://qt-project.org -qt5-webkit: -qt5-webkit: -qt5-webkit: -qt5-webkit: -qt5-webkit: -- cgit v1.2.3-65-gdbad