diff options
| -rw-r--r-- | nonprism/webkit2gtk/PKGBUILD | 75 | ||||
| -rw-r--r-- | nonprism/webkit2gtk/icu65.patch | 39 |
2 files changed, 32 insertions, 82 deletions
diff --git a/nonprism/webkit2gtk/PKGBUILD b/nonprism/webkit2gtk/PKGBUILD index b8a68e441..67cd6c8c0 100644 --- a/nonprism/webkit2gtk/PKGBUILD +++ b/nonprism/webkit2gtk/PKGBUILD @@ -1,81 +1,69 @@ -# $Id$ -# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor (Arch): Eric Bélanger <eric@archlinux.org> +# Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org> +# Contributor (arch): Eric Bélanger <eric@archlinux.org> # Contributor: Andreas Grapentin <andreas@grapentin.org> # Contributor: Jesús E. <heckyel@parabola.nu> # Contributor: André Silva <emulatorman@hyperbola.info> # Contributor: Luke R. <g4jc@openmailbox.org> # Contributor: Freemor <freemor@fremor.ca> +# Contributor: bill-auger <bill-auger@programmer.net> + # parabola changes and rationale: # - remove geoclue2 support +# - pinned to 'icu' sodep + pkgname=webkit2gtk -pkgver=2.28.2 +pkgver=2.30.4 pkgrel=2 -pkgrel+=.nonprism1 +pkgrel+=.nonprism2 pkgdesc="GTK+ Web content engine library" pkgdesc+=", without geoclue2 support" arch=(x86_64) -arch+=(i686 armv7h) +arch+=(armv7h i686) url="https://webkitgtk.org/" license=(custom) depends=(libxt libxslt enchant gst-plugins-base-libs libsecret libwebp openjpeg2 harfbuzz-icu gtk3 libnotify hyphen woff2 libwpe wpebackend-fdo - bubblewrap xdg-dbus-proxy) -makedepends=(gperf gobject-introspection ruby gtk-doc cmake python) -optdepends=('gst-plugins-base: free media decoding' - 'gst-plugins-good: media decoding' + bubblewrap xdg-dbus-proxy) +makedepends=(gperf gobject-introspection ruby gtk-doc cmake python geoclue + gst-plugins-bad ninja) +makedepends=(${makedepends[@]/geoclue/}) +optdepends=('gst-plugins-good: media decoding' 'gst-plugins-bad: media decoding' 'gst-libav: nonfree media decoding') source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}) -sha256sums=('b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc68c30bd' +sha256sums=('d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24' 'SKIP') validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3' '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B') -# disable SSE2 on 486 and 686 -if [ "$CARCH" = 'i486' -o "$CARCH" = 'i686' ]; then - source+=('webkitgtk-2.24.2-no-sse2.patch') - sha256sums+=('e95391eceeb29d0ebc57d6b867afd7cd95ed92683edeb28c6a7a5048b5a9b85b') - OPTIONS+=(!debug) - eval "$( - declare -f prepare | \ - sed ' - /cd.*/a patch -p1 < ../webkitgtk-2.24.2-no-sse2.patch - ' - )" -fi - -# work around broken generated makefiles resulting in -# "make[2]: *** No rule to make target 'JavaScriptCore-4.0.gir', needed by 'WebKit2-4.0.gir'. Stop." -eval "$( - declare -f build | \ - sed ' - /cmake --build build/a \ - cd build && make JavaScriptCore-4-gir && cd .. \ - cmake --build build - s/\(cmake --build build\)/\1 || true/g - ' -)" - - - prepare() { cd webkitgtk-$pkgver -# patch -Np1 -i ../icu65.patch # from PLD Linux + case "$CARCH" in + i686) + # disable SSE2 on 486 and 686 + source+=('webkitgtk-2.24.2-no-sse2.patch') + sha256sums+=('e95391eceeb29d0ebc57d6b867afd7cd95ed92683edeb28c6a7a5048b5a9b85b') + options+=(!debug) + patch -p1 < ../webkitgtk-2.24.2-no-sse2.patch + ;; + esac } build() { - cmake -Hwebkitgtk-$pkgver -Bbuild \ + CFLAGS+=" $CPPFLAGS" + CXXFLAGS+=" $CPPFLAGS" + cmake -S webkitgtk-$pkgver -B build -G Ninja \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ -DENABLE_GTKDOC=ON \ + -DENABLE_MINIBROWSER=ON \ + -DENABLE_GEOLOCATION=OFF \ -DLIBEXEC_INSTALL_DIR=/usr/lib \ - -DLIB_INSTALL_DIR=/usr/lib \ - -DENABLE_GEOLOCATION=OFF + -DLIB_INSTALL_DIR=/usr/lib cmake --build build } @@ -85,9 +73,10 @@ check() { package() { depends+=(libwpe-1.0.so libWPEBackend-fdo-1.0.so) + depends+=(libicui18n.so libicuuc.so) provides+=(libjavascriptcoregtk-4.0.so libwebkit2gtk-4.0.so) - DESTDIR="$pkgdir" cmake --build build --target install + DESTDIR="$pkgdir" cmake --install build cd webkitgtk-$pkgver find Source -name 'COPYING*' -or -name 'LICENSE*' -print0 | sort -z | diff --git a/nonprism/webkit2gtk/icu65.patch b/nonprism/webkit2gtk/icu65.patch deleted file mode 100644 index e1d7f8a2d..000000000 --- a/nonprism/webkit2gtk/icu65.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -urN webkitgtk-2.26.1.orig/Source/WebCore/dom/Document.cpp webkitgtk-2.26.1/Source/WebCore/dom/Document.cpp ---- webkitgtk-2.26.1.orig/Source/WebCore/dom/Document.cpp 2019-09-02 11:41:47.000000000 +0200 -+++ webkitgtk-2.26.1/Source/WebCore/dom/Document.cpp 2019-10-08 16:24:57.649551493 +0200 -@@ -4944,12 +4944,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; - } -@@ -5009,7 +5009,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 }; -diff -urN webkitgtk-2.26.1.orig/Source/WTF/wtf/URLHelpers.cpp webkitgtk-2.26.1/Source/WTF/wtf/URLHelpers.cpp ---- webkitgtk-2.26.1.orig/Source/WTF/wtf/URLHelpers.cpp 2019-08-28 13:46:29.000000000 +0200 -+++ webkitgtk-2.26.1/Source/WTF/wtf/URLHelpers.cpp 2019-10-08 16:24:50.619850993 +0200 -@@ -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) { |