mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-13 17:23:08 +00:00
webkitgtk: 2.38.5 → 2.39.90
https://webkitgtk.org/2022/11/11/webkitgtk2.39.1-released.html https://webkitgtk.org/2022/11/28/webkitgtk2.39.2-released.html https://webkitgtk.org/2022/12/14/webkitgtk2.39.3-released.html https://webkitgtk.org/2023/01/16/webkitgtk2.39.4-released.html https://webkitgtk.org/2023/01/19/webkitgtk2.39.5-released.html https://webkitgtk.org/2023/01/30/webkitgtk2.39.6-released.html https://webkitgtk.org/2023/01/31/webkitgtk2.39.7-released.html https://webkitgtk.org/2023/02/20/webkitgtk2.39.90-released.html Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Bobby Rong
Jan Tojnar
parent
971dd3a752
commit
ee55ba505d
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, runCommand
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, perl
|
||||
, python3
|
||||
, ruby
|
||||
@ -25,6 +26,7 @@
|
||||
, enchant2
|
||||
, xorg
|
||||
, libxkbcommon
|
||||
, libavif
|
||||
, libepoxy
|
||||
, at-spi2-core
|
||||
, libxml2
|
||||
@ -60,6 +62,7 @@
|
||||
, xdg-dbus-proxy
|
||||
, substituteAll
|
||||
, glib
|
||||
, unifdef
|
||||
, addOpenGLRunpath
|
||||
, enableGeoLocation ? true
|
||||
, withLibsecret ? true
|
||||
@ -69,8 +72,8 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "webkitgtk";
|
||||
version = "2.38.5";
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
|
||||
version = "2.39.90";
|
||||
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" ];
|
||||
|
||||
@ -80,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-QMIMQwIidN9Yk/IrEFT6iUw+6gVzibsIruCMWwuwwac=";
|
||||
hash = "sha256-gnWGbDUppxXCPK442/Lt0xDYGIVGpHxaL3CdGT96X8A=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
@ -90,14 +93,27 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (addOpenGLRunpath) driverLink;
|
||||
})
|
||||
|
||||
./libglvnd-headers.patch
|
||||
|
||||
# Hardcode path to WPE backend
|
||||
# https://github.com/NixOS/nixpkgs/issues/110468
|
||||
(substituteAll {
|
||||
src = ./fdo-backend-path.patch;
|
||||
wpebackend_fdo = libwpe-fdo;
|
||||
})
|
||||
|
||||
# Various build fixes for 2.39.90, should be part of final release
|
||||
# https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1445126808
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WebKit/WebKit/commit/5f8dc9d4cc01a31e53670acdcf7a9c4ea4626f58.patch";
|
||||
hash = "sha256-dTok1QK93Fp8RFED4wgbVdLErUnmIB4Xsm/VPutmQuw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WebKit/WebKit/commit/f51987a0f316621a0ab324696c9a576bbaf1e686.patch";
|
||||
hash = "sha256-TZVrrH4+JS2I/ist7MdMLsuk9X/Nyx62AcODvzGkdx8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WebKit/WebKit/commit/fe4fdc28cd214d36425d861791d05d1afaee60f5.patch";
|
||||
hash = "sha256-p1LNyvc6kGRhptov6AKVl2Rc+rrRnzHEtpF/AhqbA+E=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
@ -122,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ruby
|
||||
gi-docgen
|
||||
glib # for gdbus-codegen
|
||||
unifdef
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
wayland # for wayland-scanner
|
||||
];
|
||||
@ -129,6 +146,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
at-spi2-core
|
||||
enchant2
|
||||
libavif
|
||||
libepoxy
|
||||
gnutls
|
||||
gst-plugins-bad
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
@@ -89,7 +89,7 @@
|
||||
@@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process
|
||||
|
||||
#if PLATFORM(WAYLAND)
|
||||
if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) {
|
||||
#if USE(WPE_RENDERER)
|
||||
- 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 = IPC::Attachment(UnixFileDescriptor(wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt));
|
||||
parameters.hostClientFileDescriptor = UnixFileDescriptor { wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt };
|
||||
parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(String::fromLatin1(wpe_loader_get_loaded_implementation_library_name()));
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp b/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
|
||||
index 8d848ce4..46d42c11 100644
|
||||
--- a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
|
||||
+++ b/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "WebKitWaylandServerProtocol.h"
|
||||
#include <EGL/egl.h>
|
||||
#include <EGL/eglext.h>
|
||||
+#include <EGL/eglmesaext.h>
|
||||
#include <WebCore/GLContext.h>
|
||||
#include <WebCore/PlatformDisplayWayland.h>
|
||||
#include <WebCore/Region.h>
|
||||
Loading…
Reference in New Issue
Block a user