Subject: [bug#42958] [PATCH core-updates 08/29] gnu: pixman: Update package definition.

From: Raghav Gururajan <[email-masked]>
Date: Thu, 24 Sep 2020 10:33:59 -0400

@Danny

Please find the attached split patches.

Regards,
RG.
>From 4d2b26892bcb2be8aaea78e860ed64a06dc533d6 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Thu, 24 Sep 2020 10:25:06 -0400
Subject: [PATCH 17/20] gnu: pixman: Make some cosmetic changes.

* gnu/packages/xdisorg.org (pixman): Make some cosmetic changes.
---
 gnu/packages/xdisorg.scm | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 44f903ccb0..fdb92f9b4c 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -471,28 +471,31 @@ following the mouse.")
   (package
     (name "pixman")
     (version "0.38.4")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://www.cairographics.org/releases/pixman-"
-                    version ".tar.gz"))
-              (sha256
-               (base32
-                "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns"))
-              (patches (search-patches "pixman-CVE-2016-5296.patch"))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://www.cairographics.org/releases/pixman-"
+         version ".tar.gz"))
+       (sha256
+        (base32 "1ryxzdf048x7wsx4dlvrr1p00gzwfs7lybnhgc7ygbj0dvyxcrns"))
+       (patches
+        (search-patches
+         "pixman-CVE-2016-5296.patch"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--disable-static")))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
     (inputs
      `(("libpng" ,libpng)
        ("zlib" ,zlib)))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (home-page "http://www.pixman.org/")
     (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/")
     (license license:x11)))
 
 (define-public libdrm
-- 
2.28.0

>From 0cbf6f42497baca4e799199362ff0fdfed908d95 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Thu, 24 Sep 2020 10:26:59 -0400
Subject: [PATCH 18/20] gnu: pixman: Update to 0.40.0.

* gnu/packages/xdisorg.scm (pixman) [version]: Update to 0.40.0.
[source]<origin>[sha256]: Modify base32.
[license]: Change from X11 to expat.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index fdb92f9b4c..337c787ad0 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -470,7 +470,7 @@ following the mouse.")
 (define-public pixman
   (package
     (name "pixman")
-    (version "0.38.4")
+    (version "0.40.0")
     (source
      (origin
        (method url-fetch)
@@ -496,7 +496,7 @@ following the mouse.")
 manipulation, providing features such as image compositing and trapezoid
 rasterisation.")
     (home-page "http://www.pixman.org/")
-    (license license:x11)))
+    (license license:expat)))
 
 (define-public libdrm
   (package
-- 
2.28.0

>From 71095ce9261ebfbe90fcfaf22d5e24b54a9ec758 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Thu, 24 Sep 2020 10:29:13 -0400
Subject: [PATCH 19/20] gnu: pixman: Enable some features.

* gnu/packages/xdisorg.scm (pixman) [arguments]<#:configure-flags>[--enable-timers]: New flag.
[--enable-gnuplot]: New flag.
---
 gnu/packages/xdisorg.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 337c787ad0..2dc999d19a 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -484,19 +484,22 @@ following the mouse.")
         (search-patches
          "pixman-CVE-2016-5296.patch"))))
     (build-system gnu-build-system)
-    (arguments
-     '(#:configure-flags '("--disable-static")))
-    (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (inputs
-     `(("libpng" ,libpng)
-       ("zlib" ,zlib)))
-    (synopsis "Low-level pixel manipulation library")
-    (description "Pixman is a low-level software library for pixel
+    `(#:configure-flags
+      (list
+       "--disable-static"
+       "--enable-timers"
+       "--enable-gnuplot")))
+  (native-inputs
+   `(("pkg-config" ,pkg-config)))
+  (inputs
+   `(("libpng" ,libpng)
+     ("zlib" ,zlib)))
+  (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/")
-    (license license:expat)))
+  (home-page "http://www.pixman.org/")
+  (license license:expat)))
 
 (define-public libdrm
   (package
-- 
2.28.0

>From e6064f2f4bb116b893869d8813548b87f77bec95 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <[email-masked]>
Date: Thu, 24 Sep 2020 10:31:34 -0400
Subject: [PATCH 20/20] gnu: pixman: Update synopsis and description.

* gnu/packages/xdisorg.scm (pixman) [synopsis]: Modify.
[description]: Modify.
---
 gnu/packages/xdisorg.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 2dc999d19a..09bd4428bf 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -494,10 +494,9 @@ following the mouse.")
   (inputs
    `(("libpng" ,libpng)
      ("zlib" ,zlib)))
-  (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.")
+  (synopsis "Image processing and manipulation library")
+  (description "Pixman is a library that provides low-level pixel manipulation
+features such as image compositing and trapezoid rasterization.")
   (home-page "http://www.pixman.org/")
   (license license:expat)))
 
-- 
2.28.0