gnu: krita: Update to 4.2.2.

* gnu/packages/kde.scm (krita): Update to 4.2.2.
[source]: Don't use NAME in source URI.
[arguments]: Remove obsolete configure flags.
[native-inputs]: Add pkg-config.
[inputs]: Add quazip, reorder alphabetically.
This commit is contained in:
Nicolas Goaziou 2019-06-28 09:29:13 +02:00
parent 09debcf5aa
commit 2668e06efd
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D

View file

@ -4,6 +4,7 @@
;;; Copyright © 2017, 2018 Mark Meyer <mark@ofosos.org> ;;; Copyright © 2017, 2018 Mark Meyer <mark@ofosos.org>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com> ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -319,29 +320,21 @@ (define-public kdevplatform
(define-public krita (define-public krita
(package (package
(name "krita") (name "krita")
(version "4.1.7.101") (version "4.2.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://kde/stable/krita/" "mirror://kde/stable/krita/"
(version-prefix version 3) (version-prefix version 3)
"/" name "-" version ".tar.gz")) "/krita-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0pvghb17vj3y19wa1n1zfg3yl5206ir3y45znrgdgdw076m5pjav")))) "1pzk5bqp3kh22djhvsvmsc7ybirs4hsnkpg1y9677m2gxwbqnnps"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:configure-flags #:configure-flags
(list "-DBUILD_TESTING=OFF" "-DKDE4_BUILD_TESTS=OFF" (list "-DBUILD_TESTING=OFF"
(string-append "-DWITH_FFTW3="
(assoc-ref %build-inputs "fftw"))
(string-append "-DWITH_GSL="
(assoc-ref %build-inputs "gsl"))
(string-append "-DWITH_LibRaw="
(assoc-ref %build-inputs "libraw"))
(string-append "-DWITH_TIFF="
(assoc-ref %build-inputs "libtiff"))
(string-append "-DCMAKE_CXX_FLAGS=-I" (string-append "-DCMAKE_CXX_FLAGS=-I"
(assoc-ref %build-inputs "ilmbase") (assoc-ref %build-inputs "ilmbase")
"/include/OpenEXR")) "/include/OpenEXR"))
@ -366,14 +359,15 @@ (define-public krita
("extra-cmake-modules" ,extra-cmake-modules) ("extra-cmake-modules" ,extra-cmake-modules)
("gettext-minimal" ,gettext-minimal) ("gettext-minimal" ,gettext-minimal)
("kitemmodels" ,kitemmodels) ("kitemmodels" ,kitemmodels)
("pkg-config" ,pkg-config)
("qwt" ,qwt) ("qwt" ,qwt)
("vc" ,vc))) ("vc" ,vc)))
(inputs (inputs
`(("qtbase" ,qtbase) `(("boost" ,boost)
("qtdeclarative" ,qtdeclarative) ("exiv2" ,exiv2)
("qtmultimedia" ,qtmultimedia) ("fftw" ,fftw)
("qtx11extras" ,qtx11extras) ("gsl" ,gsl)
("qtsvg" ,qtsvg) ("ilmbase" ,ilmbase)
("karchive" ,karchive) ("karchive" ,karchive)
("kcompletion" ,kcompletion) ("kcompletion" ,kcompletion)
("kconfig" ,kconfig) ("kconfig" ,kconfig)
@ -387,23 +381,24 @@ (define-public krita
("kwidgetsaddons" ,kwidgetsaddons) ("kwidgetsaddons" ,kwidgetsaddons)
("kwindowsystem" ,kwindowsystem) ("kwindowsystem" ,kwindowsystem)
("kxmlgui" ,kxmlgui) ("kxmlgui" ,kxmlgui)
("boost" ,boost)
("exiv2" ,exiv2)
("lcms" ,lcms) ("lcms" ,lcms)
("libpng" ,libpng)
("libjpeg-turbo" ,libjpeg-turbo) ("libjpeg-turbo" ,libjpeg-turbo)
("zlib" ,zlib) ("libpng" ,libpng)
("libraw" ,libraw-0.18)
("libtiff" ,libtiff)
("libx11" ,libx11) ("libx11" ,libx11)
("libxcb" ,libxcb) ("libxcb" ,libxcb)
("libxi" ,libxi) ("libxi" ,libxi)
("fftw" ,fftw) ("openexr" ,openexr)
("gsl" ,gsl)
("poppler-qt5" ,poppler-qt5)
("libraw" ,libraw-0.18)
("libtiff" ,libtiff)
("perl" ,perl) ("perl" ,perl)
("ilmbase" ,ilmbase) ("poppler-qt5" ,poppler-qt5)
("openexr" ,openexr))) ("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg)
("qtx11extras" ,qtx11extras)
("quazip" ,quazip)
("zlib" ,zlib)))
(home-page "https://krita.org") (home-page "https://krita.org")
(synopsis "Digital painting application") (synopsis "Digital painting application")
(description (description