commit 581d44d5de7e16b46ce0a8f1669e685c7185085a Author: Tim Biermann <tbier@posteo.de> Date: Fri Jun 30 17:25:12 2023 +0200 webkitgtk: 2.40.2 -> 2.40.3 diff --git a/webkitgtk/.footprint b/webkitgtk/.footprint index dee72278d..370316ebc 100644 --- a/webkitgtk/.footprint +++ b/webkitgtk/.footprint @@ -231,11 +231,11 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/WebKit2-4.0.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/WebKit2WebExtension-4.0.typelib lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.0.so -> libjavascriptcoregtk-4.0.so.18 -lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.22.11 --rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.0.so.18.22.11 +lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.0.so.18 -> libjavascriptcoregtk-4.0.so.18.22.12 +-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.0.so.18.22.12 lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.0.so -> libwebkit2gtk-4.0.so.37 -lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.63.3 --rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.0.so.37.63.3 +lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.0.so.37 -> libwebkit2gtk-4.0.so.37.63.4 +-rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.0.so.37.63.4 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/javascriptcoregtk-4.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/webkit2gtk-4.0.pc diff --git a/webkitgtk/.signature b/webkitgtk/.signature index dd54eb23c..10c6a5286 100644 --- a/webkitgtk/.signature +++ b/webkitgtk/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZCHtozVhHzizs5F0jkG01MGjXRUA9AJ3Iuhl494B0LIl8V/p6x0gkbvPH6m/2j3d1AmmACW4WxFFBAUPlMrnAc= -SHA256 (Pkgfile) = 8fb9f0d29dbea5667fdfb3ab03317aa83732fa1ef1983a8f62ad9a7d76b95832 -SHA256 (.footprint) = 589ae04e45859c55f14ef76b3ca60bf5f680db4d5680951654d4ae853bd8f9f6 -SHA256 (webkitgtk-2.40.2.tar.xz) = 96898870d994da406ee7a632816dcde9a3bb395ee5f344fcb3f3b8cc8a77e000 -SHA256 (2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch) = 8777b351cf403d2eb0e7498a74fd260d59316d8a210afcf55b4f3a14ca77ccc4 +RWSE3ohX2g5d/Rs5fvm7fPkEec+zmWgXYijtwdgOnXiOP7xsgH8Kr9v081GKEHJYBjf2k0wNS5VEKef3vUlTnbL5n4USnD2oRwk= +SHA256 (Pkgfile) = dc918be2549a1ce3907e5bbe9c63d1ef1b62ad76d99b7335efc4278e5ad013f8 +SHA256 (.footprint) = 270472dc9e15d4357d7d2bc85c00072d2ea2cd3a1cb05e930c9d41ec84b06c40 +SHA256 (webkitgtk-2.40.3.tar.xz) = cc0aa83f40dbc64c1c6ae42ec6b85af4be2a9dbf524cfcb95f89a367fb5098dd diff --git a/webkitgtk/2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch b/webkitgtk/2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch deleted file mode 100644 index c16fa3322..000000000 --- a/webkitgtk/2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9df022bd38f7eea9b7a693ea1101611d19127189 Mon Sep 17 00:00:00 2001 -From: Diego Pino Garcia <dpino@igalia.com> -Date: Mon, 22 May 2023 19:58:50 -0700 -Subject: [PATCH] Cherry-pick 264395@main (4977290ab4ab). - https://bugs.webkit.org/show_bug.cgi?id=256917 - - [GLIB] Fix build error after 264196@main - https://bugs.webkit.org/show_bug.cgi?id=256917 - - Reviewed by Michael Catanzaro. - - Variable BWRAP_EXECUTABLE is only defined when BUBBLEWRAP_SANDBOX is - enabled. - - * Source/WTF/wtf/glib/Sandbox.cpp: - (WTF::isInsideUnsupportedContainer): - - Canonical link: https://commits.webkit.org/264395@main - -Canonical link: https://commits.webkit.org/260527.371@webkitglib/2.40 ---- - Source/WTF/wtf/glib/Sandbox.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/WTF/wtf/glib/Sandbox.cpp b/Source/WTF/wtf/glib/Sandbox.cpp -index 7d84e830ab33..9b07bb8cb5a9 100644 ---- a/Source/WTF/wtf/glib/Sandbox.cpp -+++ b/Source/WTF/wtf/glib/Sandbox.cpp -@@ -36,6 +36,7 @@ bool isInsideFlatpak() - return returnValue; - } - -+#if ENABLE(BUBBLEWRAP_SANDBOX) - bool isInsideUnsupportedContainer() - { - static bool inContainer = g_file_test("/run/.containerenv", G_FILE_TEST_EXISTS); -@@ -64,6 +65,7 @@ bool isInsideUnsupportedContainer() - - return inContainer && !supportedContainer; - } -+#endif - - bool isInsideSnap() - { --- -2.39.3 - diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile index e92b04ce2..f4ba6251e 100644 --- a/webkitgtk/Pkgfile +++ b/webkitgtk/Pkgfile @@ -1,53 +1,50 @@ # Description: Small, efficient and fast rendering engine for Web Browsers. # URL: https://www.webkitgtk.org/ -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: Tim Biermann, tbier at posteo dot de # Depends on: gst-plugins-base gtk3 hyphen icu lcms2 libseccomp libsecret libsoup libwebp libxslt ruby unifdef woff2 xorg-libxcomposite xorg-libxt # Optional: bubblewrap enchant geoclue gst-plugins-bad libavif libmanette libnotify openjpeg2 wpebackend-fdo xdg-dbus-proxy name=webkitgtk -version=2.40.2 +version=2.40.3 release=1 -source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz - 2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch) +source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz) build() { - # fail the build if dependencies are not met - ls /usr/include/harfbuzz/hb-icu.h || (printf '\e[1;31m%-6s\e[m\n' "You need to install icu, then rebuild harfbuzz for webkitgtk to work, quitting..." ; exit 1) - - # Make sure we do not have ccache masquerade directory in PATH. - #[ -e '/usr/bin/ccache' ] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" - - prt-get isinst openjpeg2 || PKGMK_WEBKITGTK+=' -DUSE_OPENJPEG=OFF' - prt-get isinst enchant || PKGMK_WEBKITGTK+=' -DENABLE_SPELLCHECK=OFF' - prt-get isinst libnotify && PKGMK_WEBKITGTK+=' -DUSE_LIBNOTIFY=ON' || PKGMK_WEBKITGTK+=' -DUSE_LIBNOTIFY=OFF' - prt-get isinst geoclue && PKGMK_WEBKITGTK+=' -DENABLE_GEOLOCATION=ON' || PKGMK_WEBKITGTK+=' -DENABLE_GEOLOCATION=OFF' - prt-get isinst bubblewrap xdg-dbus-proxy && PKGMK_WEBKITGTK+=' -DENABLE_BUBBLEWRAP_SANDBOX=ON' \ - || PKGMK_WEBKITGTK+=' -DENABLE_BUBBLEWRAP_SANDBOX=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' - - patch -Np1 -d webkitgtk-$version -i $SRC/2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch - - cmake -S webkitgtk-$version -B build -G Ninja ${PKGMK_WEBKITGTK} \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_INSTALL_LIBDIR=/usr/lib \ - -D CMAKE_INSTALL_LIBEXECDIR=/usr/lib \ - -D CMAKE_BUILD_TYPE=Release \ - -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} -Wl,-fuse-ld=gold" \ - -D CMAKE_SKIP_RPATH=ON \ - -D PORT=GTK \ - -D USE_SOUP2=ON \ - -D ENABLE_MINIBROWSER=ON \ - -D ENABLE_JOURNALD_LOG=OFF \ - -D ENABLE_DOCUMENTATION=OFF \ - -Wno-dev - - cmake --build build - DESTDIR=$PKG cmake --install build - - rm -r $PKG/usr/share/locale + # fail the build if dependencies are not met + ls /usr/include/harfbuzz/hb-icu.h || (printf '\e[1;31m%-6s\e[m\n' "You need to install icu, then rebuild harfbuzz for webkitgtk to work, quitting..." ; exit 1) + + # Make sure we do not have ccache masquerade directory in PATH. + #[ -e '/usr/bin/ccache' ] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" + + prt-get isinst openjpeg2 || PKGMK_WEBKITGTK+=' -DUSE_OPENJPEG=OFF' + prt-get isinst enchant || PKGMK_WEBKITGTK+=' -DENABLE_SPELLCHECK=OFF' + prt-get isinst libnotify && PKGMK_WEBKITGTK+=' -DUSE_LIBNOTIFY=ON' || PKGMK_WEBKITGTK+=' -DUSE_LIBNOTIFY=OFF' + prt-get isinst geoclue && PKGMK_WEBKITGTK+=' -DENABLE_GEOLOCATION=ON' || PKGMK_WEBKITGTK+=' -DENABLE_GEOLOCATION=OFF' + prt-get isinst bubblewrap xdg-dbus-proxy && PKGMK_WEBKITGTK+=' -DENABLE_BUBBLEWRAP_SANDBOX=ON' \ + || PKGMK_WEBKITGTK+=' -DENABLE_BUBBLEWRAP_SANDBOX=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' + + cmake -S webkitgtk-$version -B build -G Ninja ${PKGMK_WEBKITGTK} \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=/usr/lib \ + -D CMAKE_INSTALL_LIBEXECDIR=/usr/lib \ + -D CMAKE_BUILD_TYPE=Release \ + -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} -Wl,-fuse-ld=gold" \ + -D CMAKE_SKIP_RPATH=ON \ + -D PORT=GTK \ + -D USE_SOUP2=ON \ + -D ENABLE_MINIBROWSER=ON \ + -D ENABLE_JOURNALD_LOG=OFF \ + -D ENABLE_DOCUMENTATION=OFF \ + -Wno-dev + + cmake --build build + DESTDIR=$PKG cmake --install build + + rm -r $PKG/usr/share/locale }