webkitgtk: 2.40.5 → 2.42.1
https://github.com/WebKit/WebKit/commits/webkitgtk-2.42.1/Source/cmake/OptionsGTK.cmake https://webkitgtk.org/security/WSA-2023-0009.html JPEG XL is enabled by default. Remove support for OpenGL API in the web process; Remove GLX support:cfe917fec4
320560f9e5
Other than ENABLE_GLES2 option can be dropped, it is unclear to me what can actually be dropped so keeping everything around. I assume we keep libGL mainly for egl. But we don't really need to worry about https://bugzilla.redhat.com/show_bug.cgi?id=2240428 and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050777 here, we are applying libgl-path.patch to libepoxy which should load the libGLESv2 thing in a hardcoded path. Tested yelp, newsflash and the bundled minibrowser and does not experience crash so far. Dropped pcre as mentioned in https://bugzilla.redhat.com/show_bug.cgi?id=2212686.
This commit is contained in:
parent
fdd898f8f7
commit
21c06e3507
|
@ -27,6 +27,7 @@
|
|||
, libxkbcommon
|
||||
, libavif
|
||||
, libepoxy
|
||||
, libjxl
|
||||
, at-spi2-core
|
||||
, libxml2
|
||||
, libsoup
|
||||
|
@ -34,7 +35,6 @@
|
|||
, libxslt
|
||||
, harfbuzz
|
||||
, libpthreadstubs
|
||||
, pcre
|
||||
, nettle
|
||||
, libtasn1
|
||||
, p11-kit
|
||||
|
@ -51,7 +51,6 @@
|
|||
, openjpeg
|
||||
, geoclue2
|
||||
, sqlite
|
||||
, enableGLES ? true
|
||||
, gst-plugins-base
|
||||
, gst-plugins-bad
|
||||
, woff2
|
||||
|
@ -71,7 +70,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.40.5";
|
||||
version = "2.42.1";
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
@ -82,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-feBRomNmhiHZGmGl6xw3cdGnzskABD1K/vBsMmwWA38=";
|
||||
hash = "sha256-b0H6yZidPuUcCMSN4dQ5ze3ey8dX40thgJh9mbFtJJk=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
@ -132,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
enchant2
|
||||
libavif
|
||||
libepoxy
|
||||
libjxl
|
||||
gnutls
|
||||
gst-plugins-bad
|
||||
gst-plugins-base
|
||||
|
@ -153,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nettle
|
||||
openjpeg
|
||||
p11-kit
|
||||
pcre
|
||||
sqlite
|
||||
woff2
|
||||
] ++ (with xorg; [
|
||||
|
@ -219,8 +218,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"-DUSE_GTK4=ON"
|
||||
] ++ lib.optionals (!systemdSupport) [
|
||||
"-DENABLE_JOURNALD_LOG=OFF"
|
||||
] ++ lib.optionals (stdenv.isLinux && enableGLES) [
|
||||
"-DENABLE_GLES2=ON"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
@@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process
|
||||
|
||||
#if PLATFORM(WAYLAND)
|
||||
if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) {
|
||||
if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland && parameters.dmaBufRendererBufferMode.isEmpty()) {
|
||||
- wpe_loader_init("libWPEBackend-fdo-1.0.so.1");
|
||||
+ wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1");
|
||||
if (AcceleratedBackingStoreWayland::checkRequirements()) {
|
||||
|
|
Loading…
Reference in a new issue