Merge branch 'master' into staging

1 files changed, 48 insertions, 12 deletions

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index f0df44528e..812f63cb45 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -236,15 +236,16 @@ plugins, as well as code to create plugins, or complete applications.")
 (define-public krita
   (package
     (name "krita")
-    (version "3.3.2.1")
+    (version "3.3.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
                     "mirror://kde/stable/krita/"
-                    "3.3.2/" name "-" version ".tar.xz"))
+                    (version-prefix version 3)
+                    "/" name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5"))))
+                "0pc6hnakkqy81x5b5ncivaps6hqv43i50sjwgi3i3cz9j8rlxh5y"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f
@@ -328,19 +329,54 @@ illustrators, matte and texture artists, and the VFX industry.  Notable
 features include brush stabilizers, brush engines and wrap-around mode.")
     (license license:gpl2+)))
 
+(define-public kholidays
+  (package
+    (name "kholidays")
+    (version "17.12.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://kde/stable/applications/" version "/src/"
+             name "-" version ".tar.xz"))
+       (sha256
+        (base32 "0595d7wbnz8kyq1bnivdrp20lwdp8ykvdll1fmb0fgm4q24z0cl8"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'check-setup
+           (lambda _
+             ;; blacklist a failing test function TODO: make it pass
+             (with-output-to-file "autotests/BLACKLIST"
+               (lambda _
+                 (display "[testDefaultRegions]\n*\n")))
+             #t)))))
+    (native-inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)
+       ("qttools" ,qttools)))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))
+    (home-page "https://cgit.kde.org/kholidays.git")
+    (synopsis "Library for regional holiday information")
+    (description "This library provides a C++ API that determines holiday and
+other special events for a geographical region.")
+    (license license:lgpl2.0+)))
+
 (define-public libkomparediff2
   (package
     (name "libkomparediff2")
-    (version "16.08.2")
+    (version "17.12.1")
     (source
       (origin
         (method url-fetch)
-        (uri (string-append "https://github.com/KDE/libkomparediff2/archive/v"
-                            version ".tar.gz"))
+        (uri (string-append "mirror://kde/stable/applications"
+                            "/" version "/src/" name "-" version ".tar.xz"))
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1lafifrwfxvn0jwhz67kwv7m38lm4syips3fq77rwcvfhmkiijmh"))))
+          "0jd700pjw51vyan5d22k6j60jgb95pfn2nvwz2nfs2f4xlsly1hz"))))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)))
@@ -365,7 +401,7 @@ used in KDE development tools Kompare and KDevelop.")
 (define-public libksysguard
   (package
     (name "libksysguard")
-    (version "5.11.4")
+    (version "5.11.5")
     (source
      (origin
        (method url-fetch)
@@ -373,7 +409,7 @@ used in KDE development tools Kompare and KDevelop.")
                            "/libksysguard-" version ".tar.xz"))
        (sha256
         (base32
-         "1ry4478fv7blp80zyhz0xr3qragsddrkzjzmxkdarh01f4p987aq"))))
+         "0f2py4zkqzpxxf3mqaij0q8ka0v3nschj17dv6rbzzmr5mjv825f"))))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)))
@@ -415,7 +451,7 @@ used in KDE development tools Kompare and KDevelop.")
            (lambda _
              ;; TODO: Fix this failing test-case
              (zero? (system* "ctest" "-E" "processtest")))))))
-    (home-page "https://www.kde.org/info/plasma-5.11.4.php")
+    (home-page "https://www.kde.org/info/plasma-5.11.5.php")
     (synopsis "Network enabled task and system monitoring")
     (description "KSysGuard can obtain information on system load and
 manage running processes.  It obtains this information by interacting
@@ -429,7 +465,7 @@ with a ksysguardd daemon, which may also run on a remote system.")
     (source
       (origin
         (method url-fetch)
-        (uri (string-append "http://download.kde.org/stable/qca/" version
+        (uri (string-append "mirror://kde/stable/qca/" version
                             "/src/qca-" version ".tar.xz"))
         (sha256
          (base32
@@ -455,7 +491,7 @@ cards.")
     (source
       (origin
         (method url-fetch)
-        (uri (string-append "http://download.kde.org/stable/snorenotify/"
+        (uri (string-append "mirror://kde/stable/snorenotify/"
                             version "/src/snorenotify-" version ".tar.xz"))
         (sha256
          (base32