From 8185fc6aedbb3ef88f9b0e5129c5357876852841 Mon Sep 17 00:00:00 2001 From: John McQuah Date: Sun, 22 Oct 2023 14:09:44 +0000 Subject: [PATCH] webkitgtk-60: update to 2.42.1 --- webkitgtk-60/.footprint | 8 ++-- webkitgtk-60/.signature | 8 ++-- webkitgtk-60/Pkgfile | 82 ++++++++++++++++++++--------------------- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/webkitgtk-60/.footprint b/webkitgtk-60/.footprint index da13dd7..770c76e 100644 --- a/webkitgtk-60/.footprint +++ b/webkitgtk-60/.footprint @@ -103,11 +103,11 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/WebKit-6.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/WebKitWebProcessExtension-6.0.typelib lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so -> libjavascriptcoregtk-6.0.so.1 -lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so.1 -> libjavascriptcoregtk-6.0.so.1.1.4 --rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-6.0.so.1.1.4 +lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-6.0.so.1 -> libjavascriptcoregtk-6.0.so.1.1.10 +-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-6.0.so.1.1.10 lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so -> libwebkitgtk-6.0.so.4 -lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so.4 -> libwebkitgtk-6.0.so.4.2.1 --rwxr-xr-x root/root usr/lib/libwebkitgtk-6.0.so.4.2.1 +lrwxrwxrwx root/root usr/lib/libwebkitgtk-6.0.so.4 -> libwebkitgtk-6.0.so.4.4.4 +-rwxr-xr-x root/root usr/lib/libwebkitgtk-6.0.so.4.4.4 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/javascriptcoregtk-6.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/webkitgtk-6.0.pc diff --git a/webkitgtk-60/.signature b/webkitgtk-60/.signature index 5e91f7f..3f41270 100644 --- a/webkitgtk-60/.signature +++ b/webkitgtk-60/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/jmq.pub -RWTTPlFarK9CxEIcehWfjn1JQVz86S/uiTN16OgVi2975iSPNK4AHvc8qNoJ4ytkEgM22IA6sljLt49RSkYUMALQvbEmNVT1Pw0= -SHA256 (Pkgfile) = 1a5447bfae06a7051a605024233c842f83c6553cbbad8336be264b80b6b0bdcd -SHA256 (.footprint) = 993536b53dc099be547a80cc33157d158ccd8931e4d86df2dae4ca70bb387207 -SHA256 (webkitgtk-2.41.5.tar.xz) = b6289dfc1c46a0ff94fea3872dd2955f659a26a891af41796504c6ac87be7473 +RWTTPlFarK9CxEuNPQ98DlyECapGm2s8kJTUlESU31l3aSMZ7D1J5KxvQcmWThJSeAbL+Q6UPzGvmlFiJZtiV8cn4VXvL0ixeAc= +SHA256 (Pkgfile) = 4d6d82198d1e8f847e0ffef5ff8f23691ea5b146d2537c45c72f70181241e9c6 +SHA256 (.footprint) = 3a444b0e5bab4c2e39b62a0306076b76cbc0bf764a4a73f986af5a3a06cb52c1 +SHA256 (webkitgtk-2.42.1.tar.xz) = 6f41fac9989d3ee51c08c48de1d439cdeddecbc757e34b6180987d99b16d2499 SHA256 (bwrap-pipewire.patch) = ca4a27c4edd3099d0c8b99ef91796feb00038d1daba0055328597c54e952e56b diff --git a/webkitgtk-60/Pkgfile b/webkitgtk-60/Pkgfile index 70b25be..cf062ed 100644 --- a/webkitgtk-60/Pkgfile +++ b/webkitgtk-60/Pkgfile @@ -5,57 +5,57 @@ # Optional: enchant libnotify geoclue openjpeg2 xdg-dbus-proxy bubblewrap wpebackend-fdo libmanette name=webkitgtk-60 -version=2.41.5 +version=2.42.1 release=1 source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz bwrap-pipewire.patch) build() { - # fail the build if dependencies are not met - [ -e /usr/include/harfbuzz/hb-icu.h ] || \ - { echo "Rebuild harfbuzz with icu present; otherwise webkitgtk will not work."; exit 1; } + # fail the build if dependencies are not met + [ -e /usr/include/harfbuzz/hb-icu.h ] || \ + { echo "Rebuild harfbuzz with icu present; otherwise webkitgtk will not work."; exit 1; } - PKGMK_WEBKITGTK=(-G Ninja -D CMAKE_BUILD_TYPE=Release - -Wno-dev -D CMAKE_INSTALL_PREFIX:PATH=/usr - -D CMAKE_INSTALL_LIBEXECDIR:PATH=/usr/lib - -D CMAKE_INSTALL_LIBDIR:PATH=/usr/lib - -D CMAKE_SKIP_RPATH=ON - -D PORT=GTK - -D USE_GTK4=ON - -D USE_SOUP2=OFF - -D ENABLE_MINIBROWSER=ON - -D ENABLE_JOURNALD_LOG=OFF - -D ENABLE_DOCUMENTATION=OFF - -D ENABLE_QUARTZ_TARGET=OFF - -D USER_AGENT_BRANDING=CRUX-3.7) + PKGMK_WEBKITGTK=(-G Ninja -D CMAKE_BUILD_TYPE=Release + -Wno-dev -D CMAKE_INSTALL_PREFIX:PATH=/usr + -D CMAKE_INSTALL_LIBEXECDIR:PATH=/usr/lib + -D CMAKE_INSTALL_LIBDIR:PATH=/usr/lib + -D CMAKE_SKIP_RPATH=ON + -D PORT=GTK + -D USE_GTK4=ON + -D USE_SOUP2=OFF + -D ENABLE_MINIBROWSER=ON + -D ENABLE_JOURNALD_LOG=OFF + -D ENABLE_DOCUMENTATION=OFF + -D ENABLE_QUARTZ_TARGET=OFF + -D USE_GSTREAMER_TRANSCODER=OFF + -D USER_AGENT_BRANDING=CRUX-3.7) - if prt-get isinst bubblewrap xdg-dbus-proxy; then - PKGMK_WEBKITGTK+=(-DENABLE_BUBBLEWRAP_SANDBOX=ON) - patch -i bwrap-pipewire.patch \ + if prt-get isinst bubblewrap xdg-dbus-proxy; then + PKGMK_WEBKITGTK+=(-DENABLE_BUBBLEWRAP_SANDBOX=ON) + patch -i bwrap-pipewire.patch \ ${name%-*}-$version/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp - else - PKGMK_WEBKITGTK+=(-DENABLE_BUBBLEWRAP_SANDBOX=OFF) - fi + else + PKGMK_WEBKITGTK+=(-DENABLE_BUBBLEWRAP_SANDBOX=OFF) + fi - prt-get isinst lld && LDFLAGS+=" -Wl,-fuse-ld=gold" - prt-get isinst openjpeg2 || PKGMK_WEBKITGTK+=(-DUSE_OPENJPEG=OFF) - [ -e /usr/lib/libjxl.so ] || PKGMK_WEBKITGTK+=(-DUSE_JPEGXL=OFF) - prt-get isinst enchant || PKGMK_WEBKITGTK+=(-DENABLE_SPELLCHECK=OFF) - prt-get isinst geoclue && PKGMK_WEBKITGTK+=(-DENABLE_GEOLOCATION=ON) || PKGMK_WEBKITGTK+=(-DENABLE_GEOLOCATION=OFF) - prt-get isinst wpebackend-fdo || PKGMK_WEBKITGTK+=(-DUSE_WPE_RENDERER=OFF) - prt-get isinst libmanette || PKGMK_WEBKITGTK+=(-DENABLE_GAMEPAD=OFF) - prt-get isinst libavif || PKGMK_WEBKITGTK+=(-DUSE_AVIF=OFF) - prt-get isinst gst-plugins-bad || PKGMK_WEBKITGTK+=(-DUSE_GSTREAMER_TRANSCODER=OFF) + prt-get isinst lld && LDFLAGS+=" -Wl,-fuse-ld=gold" + prt-get isinst openjpeg2 || PKGMK_WEBKITGTK+=(-DUSE_OPENJPEG=OFF) + [ -e /usr/lib/libjxl.so ] || PKGMK_WEBKITGTK+=(-DUSE_JPEGXL=OFF) + prt-get isinst enchant || PKGMK_WEBKITGTK+=(-DENABLE_SPELLCHECK=OFF) + prt-get isinst geoclue && PKGMK_WEBKITGTK+=(-DENABLE_GEOLOCATION=ON) || PKGMK_WEBKITGTK+=(-DENABLE_GEOLOCATION=OFF) + prt-get isinst wpebackend-fdo || PKGMK_WEBKITGTK+=(-DUSE_WPE_RENDERER=OFF) + prt-get isinst libmanette || PKGMK_WEBKITGTK+=(-DENABLE_GAMEPAD=OFF) + prt-get isinst libavif || PKGMK_WEBKITGTK+=(-DUSE_AVIF=OFF) - cmake -S ${name%-*}-$version -B build "${PKGMK_WEBKITGTK[@]}" \ - -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -DNDEBUG -ffat-lto-objects" \ - -D CMAKE_C_FLAGS_RELEASE="${CFLAGS} -DNDEBUG -ffat-lto-objects" \ - -D CMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" + cmake -S ${name%-*}-$version -B build "${PKGMK_WEBKITGTK[@]}" \ + -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS} -DNDEBUG -ffat-lto-objects" \ + -D CMAKE_C_FLAGS_RELEASE="${CFLAGS} -DNDEBUG -ffat-lto-objects" \ + -D CMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" - ninja -C build -j ${JOBS:-1} - DESTDIR=$PKG ninja -C build install + ninja -C build -j ${JOBS:-1} + DESTDIR=$PKG ninja -C build install - rm -r $PKG/usr/share/locale + rm -r $PKG/usr/share/locale - # avoid a conflict with the webkitgtk footprint - mv $PKG/usr/bin/WebKitWebDriver{,-60} + # avoid a conflict with the webkitgtk footprint + mv $PKG/usr/bin/WebKitWebDriver{,-60} }