diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2021-04-18 11:32:09 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2021-04-25 13:26:15 -0400 |
| commit | 987ec19aa8ca3dcc91882bf8ce52c86070d39597 (patch) | |
| tree | 7b6fe0f3935b1f5a4118a283d4d850ab81da48c6 /nonprism | |
| parent | 04c332d29f362070a883baa3eab40df4a6f701d3 (diff) | |
| download | abslibre-987ec19aa8ca3dcc91882bf8ce52c86070d39597.tar.gz abslibre-987ec19aa8ca3dcc91882bf8ce52c86070d39597.tar.bz2 abslibre-987ec19aa8ca3dcc91882bf8ce52c86070d39597.zip | |
[webkit2gtk]: upgrade to v2.32.0
Diffstat (limited to 'nonprism')
| -rw-r--r-- | nonprism/webkit2gtk/PKGBUILD | 58 | ||||
| -rw-r--r-- | nonprism/webkit2gtk/unhide-deprecated-api.patch | 12 |
2 files changed, 45 insertions, 25 deletions
diff --git a/nonprism/webkit2gtk/PKGBUILD b/nonprism/webkit2gtk/PKGBUILD index 67cd6c8c0..b90927799 100644 --- a/nonprism/webkit2gtk/PKGBUILD +++ b/nonprism/webkit2gtk/PKGBUILD @@ -14,29 +14,36 @@ pkgname=webkit2gtk -pkgver=2.30.4 +pkgver=2.32.0 pkgrel=2 -pkgrel+=.nonprism2 -pkgdesc="GTK+ Web content engine library" +pkgrel+=.nonprism1 +pkgdesc="Web content engine for GTK" pkgdesc+=", without geoclue2 support" +url="https://webkitgtk.org" arch=(x86_64) 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 geoclue - gst-plugins-bad ninja) -makedepends=(${makedepends[@]/geoclue/}) +depends=(cairo fontconfig freetype2 libgcrypt glib2 gtk3 harfbuzz harfbuzz-icu + icu libjpeg libsoup libxml2 zlib libpng sqlite atk libwebp at-spi2-core + libegl libgl libgles libwpe wpebackend-fdo libxslt libsecret libtasn1 + enchant libx11 libxext libice libxt wayland libnotify hyphen openjpeg2 + woff2 libsystemd bubblewrap libseccomp xdg-dbus-proxy gstreamer + gst-plugins-base-libs libmanette) +makedepends=(cmake ninja gtk-doc python ruby gobject-introspection + wayland-protocols systemd gst-plugins-bad gperf) +#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=('d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24' - 'SKIP') -validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3' - '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B') +source=($url/releases/webkitgtk-$pkgver.tar.xz{,.asc} + unhide-deprecated-api.patch) +source_i686=(webkitgtk-2.24.2-no-sse2.patch) +sha256sums=('9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0' + 'SKIP' + '48ee7bee0b50776c8153c20b96854bd5086e0a7d04e621fd57ea7fc6c690c3a2') +sha256sums_i686=('e95391eceeb29d0ebc57d6b867afd7cd95ed92683edeb28c6a7a5048b5a9b85b') +validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3' # Carlos Garcia Campos <cgarcia@igalia.com> + '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B') # Adrián Pérez de Castro <aperez@igalia.com> prepare() { cd webkitgtk-$pkgver @@ -49,28 +56,29 @@ prepare() { patch -p1 < ../webkitgtk-2.24.2-no-sse2.patch ;; esac + + # Use deprecated API for ubrk_safeClone until ICU 69 is officially supported + patch -Np1 -i ../unhide-deprecated-api.patch } build() { - CFLAGS+=" $CPPFLAGS" - CXXFLAGS+=" $CPPFLAGS" +# CFLAGS+=" $CPPFLAGS" +# CXXFLAGS+=" $CPPFLAGS" + local parabola_options=( -DENABLE_GEOLOCATION=OFF ) + cmake -S webkitgtk-$pkgver -B build -G Ninja \ + ${parabola_options[@]} \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_LIBEXECDIR=lib \ -DCMAKE_SKIP_RPATH=ON \ -DENABLE_GTKDOC=ON \ - -DENABLE_MINIBROWSER=ON \ - -DENABLE_GEOLOCATION=OFF \ - -DLIBEXEC_INSTALL_DIR=/usr/lib \ - -DLIB_INSTALL_DIR=/usr/lib + -DENABLE_MINIBROWSER=ON cmake --build build } -check() { - : cmake --build build --target tests -} - package() { depends+=(libwpe-1.0.so libWPEBackend-fdo-1.0.so) depends+=(libicui18n.so libicuuc.so) diff --git a/nonprism/webkit2gtk/unhide-deprecated-api.patch b/nonprism/webkit2gtk/unhide-deprecated-api.patch new file mode 100644 index 000000000..1133632b2 --- /dev/null +++ b/nonprism/webkit2gtk/unhide-deprecated-api.patch @@ -0,0 +1,12 @@ +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +index 6fa104c82992..8c8640c3dee7 100644 +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -113,7 +113,6 @@ + + /* FIXME: This does not belong in Platform.h and should instead be included in another mechanism (compiler option, prefix header, config.h, etc) */ + /* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */ +-#define U_HIDE_DEPRECATED_API 1 + #define U_SHOW_CPLUSPLUS_API 0 + #ifdef __cplusplus + #define UCHAR_TYPE char16_t |