webkitgtk: 2.40.1 -> 2.40.2
This commit is contained in:
parent
9642390774
commit
b3193f4b8e
@ -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.10
|
||||
-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.0.so.18.22.10
|
||||
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/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.2
|
||||
-rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.0.so.37.63.2
|
||||
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
|
||||
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
|
||||
|
@ -1,5 +1,6 @@
|
||||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/fqbvTduH21IK3lDZv38HNLKT4Z2yTzAFU4DEquQWaVPXT3BMPYfPrWgMjMUpbtW5WpMMTDBzPnrshqmiBe9RQ8=
|
||||
SHA256 (Pkgfile) = 70ef65279e3269395b62ffdd5793e2a568c5c51b7de78480f5522b1ca95538b3
|
||||
SHA256 (.footprint) = 90c728c0f0a2b1ae0b373e86d475f2afa5af41fbcb776e8b3c8f716bc35847f3
|
||||
SHA256 (webkitgtk-2.40.1.tar.xz) = 64e526984f8cd2161ef03ae949af99c002ff333d615e6386b460164a3c1b7ef6
|
||||
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
|
||||
|
@ -0,0 +1,47 @@
|
||||
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
|
||||
|
@ -5,9 +5,10 @@
|
||||
# Optional: bubblewrap enchant geoclue gst-plugins-bad libavif libmanette libnotify openjpeg2 wpebackend-fdo xdg-dbus-proxy
|
||||
|
||||
name=webkitgtk
|
||||
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
|
||||
2.40.2-Cherry-pick-264395-main-4977290ab4ab-.-https-bugs.we.patch)
|
||||
|
||||
build() {
|
||||
# fail the build if dependencies are not met
|
||||
@ -27,10 +28,12 @@ build() {
|
||||
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:PATH=/usr \
|
||||
-D CMAKE_INSTALL_LIBDIR:PATH=/usr/lib \
|
||||
-D CMAKE_INSTALL_LIBEXECDIR:PATH=/usr/lib \
|
||||
-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" \
|
||||
|
Loading…
x
Reference in New Issue
Block a user