From f968afe9f453f712d1833c10045de3622fab42b0 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 16 Sep 2024 09:27:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?webkitgtk:=202.44.3=20=E2=86=92=202.46.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/WebKit/WebKit/blob/webkitgtk-2.46.0/Source/WebKit/gtk/NEWS
https://github.com/WebKit/WebKit/commits/webkitgtk-2.46.0/Source/cmake

Explicitly add cairo, fontconfig and freetype.
---
 pkgs/development/libraries/webkitgtk/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 5ad079e133ca6..710509e436edd 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -29,11 +29,13 @@
 , libepoxy
 , libjxl
 , at-spi2-core
+, cairo
 , libxml2
 , libsoup
 , libsecret
 , libxslt
 , harfbuzz
+, libsysprof-capture
 , libpthreadstubs
 , nettle
 , libtasn1
@@ -50,6 +52,8 @@
 , libmanette
 , geoclue2
 , flite
+, fontconfig
+, freetype
 , openssl
 , sqlite
 , gst-plugins-base
@@ -73,7 +77,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
-  version = "2.44.3";
+  version = "2.46.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" ];
@@ -84,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3ILQQuysqYGkhSNXwG5SNXQzGc8QqUzTatQbl4g6C1Q=";
+    hash = "sha256-1NQzBA8ZAVFWDFC96ECFAIn4e61P76nr20quhWo99Do=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isLinux [
@@ -124,6 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     at-spi2-core
+    cairo # required even when using skia
     enchant2
     libavif
     libepoxy
@@ -141,6 +146,7 @@ stdenv.mkDerivation (finalAttrs: {
     libintl
     lcms2
     libpthreadstubs
+    libsysprof-capture
     libtasn1
     libwebp
     libxkbcommon
@@ -151,6 +157,10 @@ stdenv.mkDerivation (finalAttrs: {
     p11-kit
     sqlite
     woff2
+  ] ++ lib.optionals stdenv.hostPlatform.isBigEndian [
+    # https://bugs.webkit.org/show_bug.cgi?id=274032
+    fontconfig
+    freetype
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libedit
     readline

From 093f67c9a9162304f4363b99a2ce0438203f514c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 18 Sep 2024 22:08:20 +0800
Subject: [PATCH 2/2] webkitgtk: Enable hyphen again

This is enabled in mostly all distros and from what I saw when this
option is disabled hyphen is not packaged yet.

ref: b82874e6dc78cfc3efe7a8a8f0453de152d05ff0
ref: 86a760948b9066535265cfb1724fcbb87534259f
---
 pkgs/development/libraries/webkitgtk/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 710509e436edd..ee4af8214a379 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -35,6 +35,7 @@
 , libsecret
 , libxslt
 , harfbuzz
+, hyphen
 , libsysprof-capture
 , libpthreadstubs
 , nettle
@@ -137,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
     gst-plugins-bad
     gst-plugins-base
     harfbuzz
+    hyphen
     libGL
     libGLU
     mesa # for libEGL headers
@@ -206,7 +208,6 @@ stdenv.mkDerivation (finalAttrs: {
     [
       "-DENABLE_INTROSPECTION=ON"
       "-DPORT=GTK"
-      "-DUSE_LIBHYPHEN=OFF"
       "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}"
       "-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
       "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"