Unverified Commit f65d89a0 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

webkitgtk: 2.44.3 → 2.46.0 (#342812)

parents 086c2c44 093f67c9
Loading
Loading
Loading
Loading
+14 −3
Original line number Diff line number Diff line
@@ -29,11 +29,14 @@
, libepoxy
, libjxl
, at-spi2-core
, cairo
, libxml2
, libsoup
, libsecret
, libxslt
, harfbuzz
, hyphen
, libsysprof-capture
, libpthreadstubs
, nettle
, libtasn1
@@ -50,6 +53,8 @@
, libmanette
, geoclue2
, flite
, fontconfig
, freetype
, openssl
, sqlite
, gst-plugins-base
@@ -73,7 +78,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 +89,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 +129,7 @@ stdenv.mkDerivation (finalAttrs: {

  buildInputs = [
    at-spi2-core
    cairo # required even when using skia
    enchant2
    libavif
    libepoxy
@@ -132,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
    gst-plugins-bad
    gst-plugins-base
    harfbuzz
    hyphen
    libGL
    libGLU
    mesa # for libEGL headers
@@ -141,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
    libintl
    lcms2
    libpthreadstubs
    libsysprof-capture
    libtasn1
    libwebp
    libxkbcommon
@@ -151,6 +159,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
@@ -196,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}"