(address . guix-patches@gnu.org)
On Tue, Dec 5, 2017, at 02:26, Mark Meyer wrote:
Toggle quote (17 lines)
> Second try.
>
> I disabled all tests, since these required an X11 display to be present.
> It's running now. I created a new file and saved the output. Looks good.
>
> Please find the patch attached.
>
> Lints fine, but I didn't test if this is reproducible, since the build
> is taking a very long time (even with all tests disabled).
>
> Cheers, Mark
>
> --
> Mark Meyer
> mark@ofosos.org
--
Mark Meyer
mark@ofosos.org
From ed263ddc7b084c362165688bc1d1012e3978d9b8 Mon Sep 17 00:00:00 2001
From: Mark Meyer <mark@ofosos.org>
Date: Tue, 5 Dec 2017 00:52:42 +0100
Subject: [PATCH] * gnu/packages/kde.scm (krita): Add new variable.
---
gnu/packages/kde.scm | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 89 insertions(+), 1 deletion(-)
Toggle diff (128 lines)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 59271ebee..af182a033 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2017 Mark Meyer <mark@ofosos.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,18 +24,29 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (gnu packages algebra)
#:use-module (gnu packages apr)
#:use-module (gnu packages boost)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages gettext)
+ #:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages graphics)
+ #:use-module (gnu packages image)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages llvm)
+ #:use-module (gnu packages maths)
+ #:use-module (gnu packages pdf)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls)
#:use-module (gnu packages qt)
- #:use-module (gnu packages version-control))
+ #:use-module (gnu packages version-control)
+ #:use-module (gnu packages xorg))
(define-public kdevelop
(package
@@ -220,6 +232,82 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
plugins, as well as code to create plugins, or complete applications.")
(license license:gpl3+)))
+(define-public krita
+ (package
+ (name "krita")
+ (version "3.3.2.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/krita/"
+ "3.3.2/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f
+ #:configure-flags
+ (list "-DBUILD_TESTING=OFF" "-DKDE4_BUILD_TESTS=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_JPEG="
+ (assoc-ref %build-inputs "openjpeg"))
+ (string-append "-DWITH_Poppler="
+ (assoc-ref %build-inputs "poppler"))
+ (string-append "-DWITH_TIFF="
+ (assoc-ref %build-inputs "libtiff")))))
+ (native-inputs
+ `(("extra-cmake-modules" ,extra-cmake-modules)))
+ (inputs
+ `(("qtbase" ,qtbase)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtmultimedia" ,qtmultimedia)
+ ("qtx11extras" ,qtx11extras)
+ ("qtsvg" ,qtsvg)
+ ("qwt" ,qwt)
+ ("karchive" ,karchive)
+ ("kcompletion" ,kcompletion)
+ ("kconfig" ,kconfig)
+ ("kcoreaddons" ,kcoreaddons)
+ ("kcrash" ,kcrash)
+ ("kguiaddons" ,kguiaddons)
+ ("ki18n" ,ki18n)
+ ("kiconthemes" ,kiconthemes)
+ ("kio" ,kio)
+ ("kitemmodels" ,kitemmodels)
+ ("kitemviews" ,kitemviews)
+ ("kwidgetsaddons" ,kwidgetsaddons)
+ ("kwindowsystem" ,kwindowsystem)
+ ("kxmlgui" ,kxmlgui)
+ ("boost" ,boost)
+ ("exiv2" ,exiv2)
+ ("lcms" ,lcms)
+ ("libpng" ,libpng)
+ ("curl" ,curl)
+ ("zlib" ,zlib)
+ ("libx11" ,libx11)
+ ("libxcb" ,libxcb)
+ ("libxi" ,libxi)
+ ("fftw" ,fftw)
+ ("gsl" ,gsl)
+ ("openjpeg" ,openjpeg)
+ ("poppler" ,poppler)
+ ("libraw" ,libraw)
+ ("libtiff" ,libtiff)
+ ("eigen" ,eigen)
+ ("perl" ,perl)
+ ("gettext-minimal" ,gettext-minimal)))
+ (home-page "https://krita.org")
+ (synopsis "Digital painting application")
+ (description
+ "A digital image editor, primarily aimed at digital painting and animation.")
+ (license license:gpl2+)))
+
(define-public libkomparediff2
(package
(name "libkomparediff2")
--
2.15.0