mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
webkitgtk: 2.42.5 → 2.44.0
https://webkitgtk.org/2024/03/16/webkitgtk2.44.0-released.html https://webkitgtk.org/security/WSA-2024-0002.html https://webkitgtk.org/2024/02/02/webkitgtk2.43.4-released.html https://webkitgtk.org/2023/12/21/webkitgtk2.43.3-released.html https://webkitgtk.org/2023/12/04/webkitgtk2.43.2-released.html https://webkitgtk.org/2023/11/17/webkitgtk2.43.1-released.html https://github.com/WebKit/WebKit/compare/webkitgtk-2.42.5...webkitgtk-2.43.4 https://github.com/WebKit/WebKit/compare/webkitgtk-2.43.4...webkitgtk-2.44.0 https://github.com/WebKit/WebKit/commits/webkitgtk-2.44.0/Source/WebCore/PlatformGTK.cmake https://github.com/WebKit/WebKit/commits/webkitgtk-2.44.0/Source/cmake/OptionsGTK.cmake - GTK 4 is the default:80028d2732
- Remove WPE renderer:3d09772ab4
- Remove X11 renderer:8b0ce36830
“Package 'xdmcp', required by 'xcb', not found” is just a side effect of CMake over-eagerly looking for static flags – it is only listed in `Requires.private` so it can be safely ignored. - Remove JPEG2000 support:78cb9d96aa
Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
parent
57e6b3a9e4
commit
19f22b217c
|
@ -20,8 +20,6 @@
|
|||
, wayland
|
||||
, wayland-protocols
|
||||
, libwebp
|
||||
, libwpe
|
||||
, libwpe-fdo
|
||||
, enchant2
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
|
@ -48,7 +46,6 @@
|
|||
, libintl
|
||||
, lcms2
|
||||
, libmanette
|
||||
, openjpeg
|
||||
, geoclue2
|
||||
, sqlite
|
||||
, gst-plugins-base
|
||||
|
@ -56,6 +53,7 @@
|
|||
, woff2
|
||||
, bubblewrap
|
||||
, libseccomp
|
||||
, libbacktrace
|
||||
, systemd
|
||||
, xdg-dbus-proxy
|
||||
, substituteAll
|
||||
|
@ -70,7 +68,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.42.5";
|
||||
version = "2.44.0";
|
||||
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" ];
|
||||
|
@ -81,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-tkJ4wfILjP2/tf9XPDfYcaunSh2ybZs5906JU/5h50k=";
|
||||
hash = "sha256-xmUw5Bulmx7bpO6J7yCyGI4nO+0El+lQhHKePPvjDIc=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
@ -90,13 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
inherit (builtins) storeDir;
|
||||
inherit (addOpenGLRunpath) driverLink;
|
||||
})
|
||||
|
||||
# Hardcode path to WPE backend
|
||||
# https://github.com/NixOS/nixpkgs/issues/110468
|
||||
(substituteAll {
|
||||
src = ./fdo-backend-path.patch;
|
||||
wpebackend_fdo = libwpe-fdo;
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
|
@ -150,17 +141,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libxkbcommon
|
||||
libxml2
|
||||
libxslt
|
||||
libbacktrace
|
||||
nettle
|
||||
openjpeg
|
||||
p11-kit
|
||||
sqlite
|
||||
woff2
|
||||
] ++ (with xorg; [
|
||||
libXdamage
|
||||
libXdmcp
|
||||
libXt
|
||||
libXtst
|
||||
]) ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libedit
|
||||
readline
|
||||
] ++ lib.optional (stdenv.isDarwin && !stdenv.isAarch64) (
|
||||
|
@ -175,8 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
libseccomp
|
||||
libmanette
|
||||
wayland
|
||||
libwpe
|
||||
libwpe-fdo
|
||||
xorg.libX11
|
||||
] ++ lib.optionals systemdSupport [
|
||||
systemd
|
||||
] ++ lib.optionals enableGeoLocation [
|
||||
|
@ -184,7 +169,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
] ++ lib.optionals withLibsecret [
|
||||
libsecret
|
||||
] ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [
|
||||
xorg.libXcomposite
|
||||
wayland-protocols
|
||||
];
|
||||
|
||||
|
@ -214,8 +198,8 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
"-DENABLE_X11_TARGET=OFF"
|
||||
"-DUSE_APPLE_ICU=OFF"
|
||||
"-DUSE_OPENGL_OR_ES=OFF"
|
||||
] ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [
|
||||
"-DUSE_GTK4=ON"
|
||||
] ++ lib.optionals (lib.versionOlder gtk3.version "4.0") [
|
||||
"-DUSE_GTK4=OFF"
|
||||
] ++ lib.optionals (!systemdSupport) [
|
||||
"-DENABLE_JOURNALD_LOG=OFF"
|
||||
];
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
@@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process
|
||||
|
||||
#if PLATFORM(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()) {
|
||||
parameters.hostClientFileDescriptor = UnixFileDescriptor { wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt };
|
||||
parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(String::fromLatin1(wpe_loader_get_loaded_implementation_library_name()));
|
Loading…
Reference in a new issue