From b7364f40097f01d91b00750e6494ddef35ec8038 Mon Sep 17 00:00:00 2001
From: John Kehayias <john@guixotic.coop>
Date: Tue, 9 Sep 2025 17:24:32 -0400
Subject: [PATCH] gnu: pixman: Update to 0.46.4.

Upstream no longer uses autotools so we build with meon-build-system now.  The
configure flag to not build a static output is no longer supported and even
though it was used previously, there was still a static library built.
Finally, the gnuplot configure flag is also removed, per
<https://issues.guix.gnu.org/69962>.

* gnu/packages/xdisorg.scm (pixman): Update to 0.46.4.
[build-system]: Switch to meson-build-system.
[arguments]<#:configure-flags>: Rewrite with gexp and for meson.  Remove
"--disable-static" as it is not a supported flag.  Remove "--enable-gnuplot"
flag.
[inputs, native-inputs]: Remove.
[home-page]: Use https URL.

Change-Id: I6bc17761ce96de9ef17bb8b420b8570d1ea11e07
---
 gnu/packages/xdisorg.scm | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 88d06c98f8c..8a00ba8498d 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -53,7 +53,7 @@
 ;;; Copyright © 2021 ikasero <ahmed@ikasero.com>
 ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
 ;;; Copyright © 2021, 2025 jgart <jgart@dismail.de>
-;;; Copyright © 2022, 2024 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2022, 2024, 2025 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
 ;;; Copyright © 2022 Derek Chuank <derekchuank@outlook.com>
 ;;; Copyright © 2022, 2023 Wamm K. D. <jaft.r@outlook.com>
@@ -902,31 +902,29 @@ typing tool (@code{wtype}, @code{xdotool}, etc.), or via standard output.")
 (define-public pixman
   (package
     (name "pixman")
-    (version "0.42.2")
+    (version "0.46.4")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.cairographics.org/releases/pixman-"
                            version ".tar.gz"))
        (sha256
-        (base32 "0pk298iqxqr64vk3z6nhjwr6vjg1971zfrjkqy5r9zd2mppq057a"))
+        (base32 "072rd8sd454rzybmxx90fdzvabzvx0pr57y745qfwnxxqgml976h"))
        (patches (search-patches "pixman-CVE-2016-5296.patch"))))
-    (build-system gnu-build-system)
+    (build-system meson-build-system)
     (arguments
-     `(#:configure-flags
-       (list "--disable-static"
-             "--enable-timers"
-             "--enable-gnuplot"
-             ,@(if (target-arm32?)
-                   `("--disable-arm-simd")
-                   '()))))
-    (native-inputs (list pkg-config))
-    (inputs (list libpng zlib))
+     (list
+      #:configure-flags
+      #~(list "-Dtimers=true"
+              "-Dgnuplot=true"
+              #$@(if (target-arm32?)
+                     '("-Darm-simd=false")
+                     '()))))
     (synopsis "Low-level pixel manipulation library")
     (description "Pixman is a low-level software library for pixel
 manipulation, providing features such as image compositing and trapezoid
 rasterisation.")
-    (home-page "http://www.pixman.org/")
+    (home-page "https://www.pixman.org/")
     (license license:expat)))
 
 (define-public libdrm