diff --git a/REPO b/REPO index 722f894..20c4a6e 100644 --- a/REPO +++ b/REPO @@ -123,9 +123,10 @@ f:0ef5de38b7caa0ba88aead2cf71ff771:maelstrom/Pkgfile f:9e19f6160558cb713c892443221e304e:maelstrom/include-time_h.patch f:07f044cd6d38e412e36dcb593c3d37b1:maelstrom/.footprint f:2c37ae04e4c04412aa2f1f1e7c043e75:webkitgtk-41/README -f:82271de6999baf3d9e94e95d0b39a91a:webkitgtk-41/.signature -f:66718e9d7925215a5bf13ec41b1c79cc:webkitgtk-41/Pkgfile -f:79733259cec4f4f1cac81db083f7b9e2:webkitgtk-41/.footprint +f:5b6ce0eda767786cb8ef427e888f7f8c:webkitgtk-41/.signature +f:7bddf355cdaff4cf841f016f21f8f427:webkitgtk-41/Pkgfile +f:54b8573c9d8d8691610e3f5dddd6c7e6:webkitgtk-41/.footprint +f:cc5d5de8a77548432fc25080eea6399d:webkitgtk-41/264395-sandbox-bwrap.patch f:7e2e1fbe5247bb9e9ec795c280585705:wildmidi/.signature f:907865719069b041caabab770caf65d6:wildmidi/Pkgfile f:c1d50dffa63b8b9b704da2922a49aac4:wildmidi/.footprint diff --git a/webkitgtk-41/.footprint b/webkitgtk-41/.footprint index 45f97b6..c5645ac 100644 --- a/webkitgtk-41/.footprint +++ b/webkitgtk-41/.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.1.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/WebKit2WebExtension-4.1.typelib lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.1.so -> libjavascriptcoregtk-4.1.so.0 -lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.1.so.0 -> libjavascriptcoregtk-4.1.so.0.3.10 --rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.1.so.0.3.10 +lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.1.so.0 -> libjavascriptcoregtk-4.1.so.0.3.11 +-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.1.so.0.3.11 lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.1.so -> libwebkit2gtk-4.1.so.0 -lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.1.so.0 -> libwebkit2gtk-4.1.so.0.8.2 --rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.1.so.0.8.2 +lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.1.so.0 -> libwebkit2gtk-4.1.so.0.8.3 +-rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.1.so.0.8.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/javascriptcoregtk-4.1.pc -rw-r--r-- root/root usr/lib/pkgconfig/webkit2gtk-4.1.pc diff --git a/webkitgtk-41/.signature b/webkitgtk-41/.signature index d486b74..56e7ad3 100644 --- a/webkitgtk-41/.signature +++ b/webkitgtk-41/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/jmq.pub -RWTTPlFarK9CxJN5qh0F7V+JCLc/SNF6BhzqAW+BSyj6EhaNsuyLfkT005/A7+65gnt57xU5QTx+VMs6AdpsZU22UlmZmJcrMAg= -SHA256 (Pkgfile) = d491e7c9645d6c2b3335fc308465d844d2704f9e439b62029cf003a2c3f8b735 -SHA256 (.footprint) = 8aeda2ba6220889567ee242ed3d26c2d4ca7428be19300dd21392d2ff4a722e7 -SHA256 (webkitgtk-2.40.1.tar.xz) = 64e526984f8cd2161ef03ae949af99c002ff333d615e6386b460164a3c1b7ef6 +RWTTPlFarK9CxFlS7k55yipxk1m0N51QIsbTjZewdhlyA8pHdOIgx3SyQEL7m7EgcIFXhQpERG42YrG6dWSAqz6Iy4Tv6NNQWwc= +SHA256 (Pkgfile) = f73fe5d570ab89b900a6be97638fcf9aab0d1c81150c0821793cff2058722ff3 +SHA256 (.footprint) = 9824d31d2bf5eb28835e395ffc769d343bbb23caa28dd4f5c703f9f82b9756f0 +SHA256 (webkitgtk-2.40.2.tar.xz) = 96898870d994da406ee7a632816dcde9a3bb395ee5f344fcb3f3b8cc8a77e000 +SHA256 (264395-sandbox-bwrap.patch) = 8777b351cf403d2eb0e7498a74fd260d59316d8a210afcf55b4f3a14ca77ccc4 diff --git a/webkitgtk-41/264395-sandbox-bwrap.patch b/webkitgtk-41/264395-sandbox-bwrap.patch new file mode 100644 index 0000000..c16fa33 --- /dev/null +++ b/webkitgtk-41/264395-sandbox-bwrap.patch @@ -0,0 +1,47 @@ +From 9df022bd38f7eea9b7a693ea1101611d19127189 Mon Sep 17 00:00:00 2001 +From: Diego Pino Garcia +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-41/Pkgfile b/webkitgtk-41/Pkgfile index 56bcd8c..8c653e6 100644 --- a/webkitgtk-41/Pkgfile +++ b/webkitgtk-41/Pkgfile @@ -5,22 +5,22 @@ # Optional: enchant libnotify geoclue openjpeg2 xdg-dbus-proxy bubblewrap wpebackend-fdo libmanette name=webkitgtk-41 -version=2.40.1 +version=2.40.2 release=1 -source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz) +source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz + 264395-sandbox-bwrap.patch) 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) + [ -e /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 bubblewrap xdg-dbus-proxy && PKGMK_WEBKITGTK+=' -DENABLE_BUBBLEWRAP_SANDBOX=ON' \ + || { PKGMK_WEBKITGTK+=' -DENABLE_BUBBLEWRAP_SANDBOX=OFF'; + patch -Np1 -d webkitgtk-$version -i $SRC/264395-sandbox-bwrap.patch; } prt-get isinst openjpeg2 || PKGMK_WEBKITGTK+=' -DUSE_OPENJPEG=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 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'