Re: [PATCH] Include Krita

2017-12-04 Thread Kei Kebreau
Mark Meyer  writes:

> I retract this patch, it is buggy :( Be right back.
>
> On Tue, Dec 5, 2017, at 00:55, Mark Meyer wrote:
>> Hi,
>> please find attached a patch to include Krita in Guix.
>> 
>> Please CC me, as I'm not a list member.
>> 
>> Cheers, Mark
>> 
>> -- 
>>   Mark Meyer
>>   m...@ofosos.org
>> Email had 1 attachment:
>> + 0001-gnu-packages-kde.scm-krita-Add-new-variable.patch
>>   7k (text/x-patch)

Hi Mark!

Thank you for your work on this patch. I ask that when you finish fixing
the bugs you found in it, please send the patch to guix-patc...@gnu.org
so patch reviewers are less likely to lose track of it.

Thanks again,
Kei


signature.asc
Description: PGP signature


Re: [PATCH] Include Krita

2017-12-04 Thread Mark Meyer
I retract this patch, it is buggy :( Be right back.

On Tue, Dec 5, 2017, at 00:55, Mark Meyer wrote:
> Hi,
> please find attached a patch to include Krita in Guix.
> 
> Please CC me, as I'm not a list member.
> 
> Cheers, Mark
> 
> -- 
>   Mark Meyer
>   m...@ofosos.org
> Email had 1 attachment:
> + 0001-gnu-packages-kde.scm-krita-Add-new-variable.patch
>   7k (text/x-patch)


-- 
  Mark Meyer
  m...@ofosos.org



[PATCH] Include Krita

2017-12-04 Thread Mark Meyer
Hi,
please find attached a patch to include Krita in Guix.

Please CC me, as I'm not a list member.

Cheers, Mark

-- 
  Mark Meyer
  m...@ofosos.org
From 319fd4fb9d2b11d09a6122476b779f625c5fa8ea Mon Sep 17 00:00:00 2001
From: Mark Meyer 
Date: Tue, 5 Dec 2017 00:52:42 +0100
Subject: [PATCH] * gnu/packages/kde.scm (krita): Add new variable.

---
 gnu/packages/kde.scm | 88 +++-
 1 file changed, 87 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 59271ebee..79edd5c81 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 
 ;;; Copyright © 2016, 2017 Thomas Danckaert 
+;;; Copyright © 2017 Mark Meyer 
 ;;;
 ;;; 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,80 @@ 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
+ `(#:configure-flags
+   (list (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