Browse Source

l/qt5-webkit: Upgraded to qt5-webkit-5.212.0alpha3.

current-20191101
Damien Goutte-Gattat 2 years ago
parent
commit
1e8e26e20a
  1. 48
      l/qt5-webkit/qt5-webkit.SlackBuild
  2. 47
      l/qt5-webkit/qt5-webkit.icu65.patch
  3. 1
      l/qt5-webkit/qtwebkit-5.212.0-alpha3.tar.gz.sha256
  4. 1
      l/qt5-webkit/qtwebkit-opensource-src-5.9.1.tar.xz.sha256

48
l/qt5-webkit/qt5-webkit.SlackBuild

@ -23,15 +23,17 @@
#
# Adapted from Eric Hameleers' script.
#
# Latest QtWebKit sourcecode is available at: <http://www.qt.io/>.
# Latest QtWebKit sourcecode is available at:
# <https://github.com/qt/qtwebkit>.
#
# Depends: l/qt5
# Source package infos
NAMESRC=${NAMESRC:-qtwebkit}
VERSION=${VERSION:-5.9.1}
ARCHIVE=${ARCHIVE:-$NAMESRC-opensource-src-$VERSION.tar.xz}
WGET=${WGET:-https://download.qt.io/archive/qt/5.9/$VERSION/submodules/$ARCHIVE}
VERSION=${VERSION:-5.212.0-alpha3}
SLCKVER=${VERSION/-//}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
WGET=${WGET:-https://github.com/qt/qtwebkit/archive/v$VERSION.tar.gz}
# Build infos
NAMEPKG=${NAMEPKG:-qt5-webkit}
@ -91,8 +93,8 @@ case "$ARCH" in
esac
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing"
export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing"
export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5"
# Get and verify the source archive
@ -109,47 +111,28 @@ echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# Avoid unneeded warning messages
sed -e '/CONFIG/a QMAKE_CXXFLAGS += -Wno-expansion-to-defined' \
-i Tools/qmake/mkspecs/features/unix/default_pre.prf
# Fix compilation against icu4c 65.1
cat $CWD/qt5-webkit.icu65.patch | patch -p0 || exit 1
# Compile
mkdir build
cd build
qmake-qt5 ../WebKit.pro
cmake .. -DPORT=Qt -DQt5_DIR=/usr/lib$LIBDIRSUFFIX/qt5
make -j $JOBS
make install INSTALL_ROOT=$PKG
make install DESTDIR=$PKG
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 internal linking for Qt5WebKit.pc , thanks to Larry Hajali's SBo script:
sed -i \
-e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit[^ ]* ||" \
-e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit2[^ ]* ||" \
-e "s|-Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebCore[^ ]* ||" \
-e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/ANGLE[^ ]* ||" \
-e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/JavaScriptCore[^ ]* ||" \
-e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WTF[^ ]* ||" \
-e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \
$PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/Qt5WebKit.pc
# 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/$NAMEPKG-$VERSION
cp -a \
ChangeLog* VERSION \
$PKG/usr/doc/$NAMEPKG-$VERSION
if [ -d $PKG/usr/lib$LIBDIRSUFFIX/qt5/doc/html ]; then
( cd $PKG/usr/doc/$NAMEPKG-$VERSION
ln -sf /usr/lib$LIBDIRSUFFIX/qt5/doc/html .
)
fi
mkdir -p $PKG/usr/doc/$NAMEPKG-$SLCKVER
install -m 644 README LICENSE.LGPLv21 $PKG/usr/doc/$NAMEPKG-$SLCKVER
# Copy slack-desck and doinst.sh files
install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc
@ -157,6 +140,7 @@ install -m 755 $CWD/doinst.sh $PKG/install/doinst.sh
# Add dependency infos
cat <<EOF > $PKG/install/slack-required
hyphen
qt5
EOF
@ -165,7 +149,7 @@ cd $PKG
mkdir -p $OUT
PACKAGING="
chown root:root . -R
/sbin/makepkg -l y -c n $OUT/$NAMEPKG-$VERSION-$ARCH-$BUILD.$EXT
/sbin/makepkg -l y -c n $OUT/$NAMEPKG-$SLCKVER-$ARCH-$BUILD.$EXT
rm -rf $PKG
rm -rf $TMP/$NAME
"

47
l/qt5-webkit/qt5-webkit.icu65.patch

@ -0,0 +1,47 @@
# -----------------------------------------------------------------------------
# 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;

1
l/qt5-webkit/qtwebkit-5.212.0-alpha3.tar.gz.sha256

@ -0,0 +1 @@
02da485e8c53a4d6d51426bf9296c8454208804b49a63d870d26a301457ac2ef qtwebkit-5.212.0-alpha3.tar.gz

1
l/qt5-webkit/qtwebkit-opensource-src-5.9.1.tar.xz.sha256

@ -1 +0,0 @@
28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf qtwebkit-opensource-src-5.9.1.tar.xz
Loading…
Cancel
Save