Date: Monday, May 10, 2021 @ 13:13:40 Author: heftig Revision: 414916
archrelease: copy trunk to extra-x86_64 Added: webkit2gtk/repos/extra-x86_64/PKGBUILD (from rev 414914, webkit2gtk/trunk/PKGBUILD) Deleted: webkit2gtk/repos/extra-x86_64/PKGBUILD webkit2gtk/repos/extra-x86_64/unhide-deprecated-api.patch -----------------------------+ PKGBUILD | 129 ++++++++++++++++++++---------------------- unhide-deprecated-api.patch | 12 --- 2 files changed, 62 insertions(+), 79 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-05-10 13:13:40 UTC (rev 414915) +++ PKGBUILD 2021-05-10 13:13:40 UTC (rev 414916) @@ -1,67 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> -# Contributor: Eric Bélanger <e...@archlinux.org> - -pkgname=webkit2gtk -pkgver=2.32.0 -pkgrel=2 -pkgdesc="Web content engine for GTK" -url="https://webkitgtk.org" -arch=(x86_64) -license=(custom) -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) -optdepends=('geoclue: Geolocation support' - 'gst-plugins-good: media decoding' - 'gst-plugins-bad: media decoding' - 'gst-libav: nonfree media decoding') -source=($url/releases/webkitgtk-$pkgver.tar.xz{,.asc} - unhide-deprecated-api.patch) -sha256sums=('9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0' - 'SKIP' - '48ee7bee0b50776c8153c20b96854bd5086e0a7d04e621fd57ea7fc6c690c3a2') -validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3' # Carlos Garcia Campos <cgar...@igalia.com> - '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B') # Adrián Pérez de Castro <ape...@igalia.com> - -prepare() { - cd webkitgtk-$pkgver - - # Use deprecated API for ubrk_safeClone until ICU 69 is officially supported - patch -Np1 -i ../unhide-deprecated-api.patch -} - -build() { - cmake -S webkitgtk-$pkgver -B build -G Ninja \ - -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 - cmake --build build -} - -package() { - depends+=(libwpe-1.0.so libWPEBackend-fdo-1.0.so) - provides+=(libjavascriptcoregtk-4.0.so libwebkit2gtk-4.0.so) - - DESTDIR="$pkgdir" cmake --install build - - cd webkitgtk-$pkgver - find Source -name 'COPYING*' -or -name 'LICENSE*' -print0 | sort -z | - while IFS= read -d $'\0' -r _f; do - echo "### $_f ###" - cat "$_f" - echo - done | - install -Dm644 /dev/stdin "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set sw=2 et: Copied: webkit2gtk/repos/extra-x86_64/PKGBUILD (from rev 414914, webkit2gtk/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-05-10 13:13:40 UTC (rev 414916) @@ -0,0 +1,62 @@ +# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> +# Contributor: Eric Bélanger <e...@archlinux.org> + +pkgname=webkit2gtk +pkgver=2.32.1 +pkgrel=1 +pkgdesc="Web content engine for GTK" +url="https://webkitgtk.org" +arch=(x86_64) +license=(custom) +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) +optdepends=('geoclue: Geolocation support' + 'gst-plugins-good: media decoding' + 'gst-plugins-bad: media decoding' + 'gst-libav: nonfree media decoding') +source=($url/releases/webkitgtk-$pkgver.tar.xz{,.asc}) +sha256sums=('136117317f70f66486f71b8edf5e46f8776403c5d8a296e914b11a36ef836917' + 'SKIP') +validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3' # Carlos Garcia Campos <cgar...@igalia.com> + '5AA3BC334FD7E3369E7C77B291C559DBE4C9123B') # Adrián Pérez de Castro <ape...@igalia.com> + +prepare() { + cd webkitgtk-$pkgver +} + +build() { + cmake -S webkitgtk-$pkgver -B build -G Ninja \ + -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 + cmake --build build +} + +package() { + depends+=(libwpe-1.0.so libWPEBackend-fdo-1.0.so) + provides+=(libjavascriptcoregtk-4.0.so libwebkit2gtk-4.0.so) + + DESTDIR="$pkgdir" cmake --install build + + cd webkitgtk-$pkgver + find Source -name 'COPYING*' -or -name 'LICENSE*' -print0 | sort -z | + while IFS= read -d $'\0' -r _f; do + echo "### $_f ###" + cat "$_f" + echo + done | + install -Dm644 /dev/stdin "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set sw=2 et: Deleted: unhide-deprecated-api.patch =================================================================== --- unhide-deprecated-api.patch 2021-05-10 13:13:40 UTC (rev 414915) +++ unhide-deprecated-api.patch 2021-05-10 13:13:40 UTC (rev 414916) @@ -1,12 +0,0 @@ -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