From ff3375251d6a316e3ee05589d70a8bb135ec47a6 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 27 Nov 2019 22:19:13 +0100
Subject: gnu: Use the test-only Xorg variant for tests.

* gnu/packages/education.scm (gcompris-qt)[native-inputs]: Change XORG-SERVER
to XORG-SERVER-FOR-TESTS.
* gnu/packages/engineering.scm (pcb, qucs, openscad)[native-inputs]: Likewise.
* gnu/packages/gnome.scm (libbonoboui, d-feet, gspell, libdazzle, libhandy)[native-inputs]: Likewise.
* gnu/packages/gnupg.scm (parcimonie)[native-inputs]: Likewise.
* gnu/packages/graphics.scm (opensubdiv, rapicorn)[native-inputs]: Likewise.
* gnu/packages/gtk.scm (gtksourceview-2, gtksourceview)[native-inputs]: Likewise.
* gnu/packages/image-processing.scm (opencv)[native-inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (kconfig, kcoreaddons, kwidgetsaddons,
kwindowsystem, kdeclarative)[native-inputs]: Likewise.
* gnu/packages/kde-plasma.scm (kscreenlocker)[native-inputs]: Likewise.
* gnu/packages/messaging.scm (gajim)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-seaborn)[native-inputs]: Likewise.
---
 gnu/packages/image-processing.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages/image-processing.scm')

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 2579da3d6a..1961b47361 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -373,7 +373,7 @@ (define-public opencv
              (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp)))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("xorg-server" ,xorg-server) ; For running the tests
+       ("xorg-server" ,xorg-server-for-tests) ; For running the tests
        ("opencv-extra"
         ,(origin
            (method git-fetch)
-- 
cgit v1.2.3


From 6a04c8ff36ac5b0daa45f238ceddb782a654bc45 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 30 Nov 2019 23:01:06 +0100
Subject: gnu: dcmtk: Update to 3.6.5.

* gnu/packages/image-processing.scm (dcmtk): Update to 3.6.5.
---
 gnu/packages/image-processing.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/image-processing.scm')

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 1961b47361..f5d67c8917 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -75,7 +75,7 @@ (define-module (gnu packages image-processing)
 (define-public dcmtk
   (package
     (name "dcmtk")
-    (version "3.6.4")
+    (version "3.6.5")
     (source
      (origin
        (method url-fetch)
@@ -84,7 +84,7 @@ (define-public dcmtk
                        "dcmtk" (string-join (string-split version #\.) "")
                        "/dcmtk-" version ".tar.gz"))
        (sha256
-        (base32 "1h22z8g0kmvhg8lgkbikyzyphhvxvq6018a00yd6i4g0z9ag6gx9"))))
+        (base32 "1fdyz5wwjp4grys61mxb2ia9fi6i3ax6s43l16xnv291bxk7hld0"))))
     (build-system cmake-build-system)
     (inputs
      `(;; Our ICU is too recent: “error: ‘UChar’ does not name a type“.
-- 
cgit v1.2.3