gdk-pixbuf: 2.42.12 → 2.43.5

https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/compare/2.42.12...2.43.5

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>

pkgs/development/libraries/gdk-pixbuf/default.nix

@@ -28,7 +28,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdk-pixbuf";
-  version = "2.42.12";
+  version = "2.43.5";
 
   outputs = [
     "out"
@@ -44,14 +44,12 @@ stdenv.mkDerivation (finalAttrs: {
     in
     fetchurl {
       url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-      hash = "sha256-uVBbNEW5p+SM7TR2DDvLc+lm3zrJTJWhSMtmmrdI48c=";
+      hash = "sha256-pyPsJChCf4V7hyffu+nat3FCoT+20MR/lSIiUa42/xU=";
     };
 
   patches = [
     # Move installed tests to a separate output
     ./installed-tests-path.patch
-
-    ./static-deps.patch
   ];
 
   # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work
@@ -90,7 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [
     "-Dgio_sniffing=false"
-    (lib.mesonBool "gtk_doc" withIntrospection)
+    "-Dandroid=disabled"
+    "-Dglycin=disabled"
+    (lib.mesonBool "documentation" withIntrospection)
     (lib.mesonEnable "introspection" withIntrospection)
     (lib.mesonEnable "others" true)
   ]
@@ -108,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: {
     # it should be a build-time dep for build
     # TODO: send upstream
     substituteInPlace docs/meson.build \
-      --replace "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \
-      --replace "'gi-docgen', req" "'gi-docgen', native:true, req"
+      --replace-fail "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \
+      --replace-fail "'gi-docgen', req" "'gi-docgen', native:true, req"
 
     # Remove 'ani' loader until proper fix for CVE-2022-48622
     substituteInPlace meson.build --replace-fail "'ani'," ""

pkgs/development/libraries/gdk-pixbuf/static-deps.patch

@@ -1,31 +0,0 @@
-From 1b7cac1cbdb7078f575a3222be451a9bf1ac35ec Mon Sep 17 00:00:00 2001
-From: Alyssa Ross <hi@alyssa.is>
-Date: Wed, 31 Jan 2024 15:33:02 +0100
-Subject: [PATCH] build: add missing dependency to gdkpixbuf_dep
-
-This should match the dependencies passed to the library() call that
-creates gdkpixbuf.  Otherwise, linking the gdkpixbuf_bin executables
-will fail if -Ddefault_library=static, because static libraries don't
-carry dependency information themselves.
----
-Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/161
-
- gdk-pixbuf/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index a11926eee..450484d68 100644
---- a/gdk-pixbuf/meson.build
-+++ b/gdk-pixbuf/meson.build
-@@ -269,7 +269,7 @@ endif
- gdkpixbuf_dep = declare_dependency(
-   link_with: gdkpixbuf,
-   include_directories: root_inc,
--  dependencies: gdk_pixbuf_deps,
-+  dependencies: [ gdk_pixbuf_deps, included_loaders_deps ],
-   sources: [ gdkpixbuf_enum_h, built_girs ],
- )
- meson.override_dependency('gdk-pixbuf-2.0', gdkpixbuf_dep)
--- 
-GitLab
-