Browse Source

l/webkit2: Upgraded to webkit2-2.28.2.

current-20200608
Damien Goutte-Gattat 7 months ago
parent
commit
5c07f58f42
4 changed files with 10 additions and 72 deletions
  1. +0
    -62
      l/webkit2/WebKit-icu-65.1-fix.patch
  2. +9
    -9
      l/webkit2/webkit2.SlackBuild
  3. +0
    -1
      l/webkit2/webkitgtk-2.26.2.tar.xz.sha256
  4. +1
    -0
      l/webkit2/webkitgtk-2.28.2.tar.xz.sha256

+ 0
- 62
l/webkit2/WebKit-icu-65.1-fix.patch View File

@ -1,62 +0,0 @@
------------------------------------------------------------------------
r250747 | commit-queue@webkit.org | 2019-10-05 05:51:37 +0800 (六, 05 10月 2019) | 16 lines
Fix build with icu 65.1
https://bugs.webkit.org/show_bug.cgi?id=202600
Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04
Reviewed by Konstantin Tokarev.
Source/WebCore:
* dom/Document.cpp:
(WebCore::isValidNameNonASCII):
(WebCore::Document::parseQualifiedName):
Source/WTF:
* wtf/URLHelpers.cpp:
(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
Index: trunk/Source/WTF/wtf/URLHelpers.cpp
===================================================================
--- trunk/Source/WTF/wtf/URLHelpers.cpp (revision 250746)
+++ trunk/Source/WTF/wtf/URLHelpers.cpp (revision 250747)
@@ -301,7 +301,7 @@
Optional<UChar32> previousCodePoint;
while (i < length) {
UChar32 c;
- U16_NEXT(buffer, i, length, c)
+ U16_NEXT(buffer, i, length, c);
UErrorCode error = U_ZERO_ERROR;
UScriptCode script = uscript_getScript(c, &error);
if (error != U_ZERO_ERROR) {
Index: trunk/Source/WebCore/dom/Document.cpp
===================================================================
--- trunk/Source/WebCore/dom/Document.cpp (revision 250746)
+++ trunk/Source/WebCore/dom/Document.cpp (revision 250747)
@@ -4954,12 +4954,12 @@
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;
}
@@ -5019,7 +5019,7 @@
for (unsigned i = 0; i < length; ) {
UChar32 c;
- U16_NEXT(qualifiedName, i, length, c)
+ U16_NEXT(qualifiedName, i, length, c);
if (c == ':') {
if (sawColon)
return Exception { InvalidCharacterError };
------------------------------------------------------------------------

+ 9
- 9
l/webkit2/webkit2.SlackBuild View File

@ -1,6 +1,6 @@
#!/bin/bash
# Build script for Slackware
# Copyright (C) 2016,2017,2019 Damien Goutte-Gattat
# Copyright (C) 2016,2017,2019,2020 Damien Goutte-Gattat
#
# Redistribution and use of this script, with or without modifications,
# is permitted provided that the following conditions are met:
@ -25,11 +25,11 @@
# Latest webkitgtk sourcecode is available at:
# <https://www.webkitgtk.org/>.
#
# Depends: ap/bubblewrap, ap/xdg-dbus-proxy, l/hyphen
# Depends: ap/bubblewrap, ap/xdg-dbus-proxy, l/libseccomp
# Source package infos
NAMESRC=${NAMESRC:-webkitgtk}
VERSION=${VERSION:-2.26.2}
VERSION=${VERSION:-2.28.2}
ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.xz}
WGET=${WGET:-https://www.webkitgtk.org/releases/$ARCHIVE}
@ -86,17 +86,17 @@ cd $TMP
echo "Building $ARCHIVE..."
tar xf $CWD/$ARCHIVE
cd $NAME
# Fix building with icu-65.1
# <https://bugs.webkit.org/show_bug.cgi?id=202600>
patch -p 1 < $CWD/WebKit-icu-65.1-fix.patch
mkdir build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DPORT=GTK \
-DUSE_WOFF2=OFF \
-DUSE_WPE_RENDERER=OFF \
..
make -j $JOBS
# WTF? The build system is broken and nobody seems to know
# how to fix it (or even seems to care).
# <https://bugs.webkit.org/show_bug.cgi?id=195251>.
make -j $JOBS || make -C Source/JavascriptCore || make -j $JOBS
make install/strip DESTDIR=$PKG
# Install the documentation
@ -109,7 +109,7 @@ install -D -m 644 $CWD/slack-desc $PKG/install/slack-desc
# Add dependency infos
cat <<EOF > $PKG/install/slack-required
bubblewrap
hyphen
libseccomp
xdg-dbus-proxy
EOF


+ 0
- 1
l/webkit2/webkitgtk-2.26.2.tar.xz.sha256 View File

@ -1 +0,0 @@
6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512 webkitgtk-2.26.2.tar.xz

+ 1
- 0
l/webkit2/webkitgtk-2.28.2.tar.xz.sha256 View File

@ -0,0 +1 @@
b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc68c30bd webkitgtk-2.28.2.tar.xz

Loading…
Cancel
Save