[PATCH] Add Krita to guix

[PATCH] Add Krita to guix

[Mark Meyer]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-packages-kde.scm-krita-Add-new-variable.patch --]
[-- Type: text/x-patch; name="0001-gnu-packages-kde.scm-krita-Add-new-variable.patch", Size: 4844 bytes --]

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(-)

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

Re: [PATCH] Add Krita to guix

[Danny Milosavljevic]

Hi,

On Tue, 05 Dec 2017 02:26:15 +0100
Mark Meyer <mark@ofosos.org> wrote:

> I disabled all tests, since these required an X11 display to be present.

Does (setenv "QT_QPA_PLATFORM" "offscreen") help?

If not, then it's possible to start an X server (Xvfb) in the container, something like "/bin/Xvfb :1 -screen 0 640x480x24 &".

Re: [PATCH] Add Krita to guix

[Mark Meyer]

Disabling the tests worked for me, and this also brings down the compile
time, which is already in excess of 1h on my system.

On Tue, Dec 5, 2017, at 11:30, Danny Milosavljevic wrote:
> Hi,
> 
> On Tue, 05 Dec 2017 02:26:15 +0100
> Mark Meyer <mark@ofosos.org> wrote:
> 
> > I disabled all tests, since these required an X11 display to be present.
> 
> Does (setenv "QT_QPA_PLATFORM" "offscreen") help?
> 
> If not, then it's possible to start an X server (Xvfb) in the container,
> something like "/bin/Xvfb :1 -screen 0 640x480x24 &".


-- 
  Mark Meyer
  mark@ofosos.org

Re: [PATCH] Add Krita to guix

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]

On Tue, Dec 05, 2017 at 11:33:22AM +0100, Mark Meyer wrote:
> On Tue, Dec 5, 2017, at 11:30, Danny Milosavljevic wrote:
> > Hi,
> > 
> > On Tue, 05 Dec 2017 02:26:15 +0100
> > Mark Meyer <mark@ofosos.org> wrote:
> > 
> > > I disabled all tests, since these required an X11 display to be present.
> > 
> > Does (setenv "QT_QPA_PLATFORM" "offscreen") help?
> > 
> > If not, then it's possible to start an X server (Xvfb) in the container,
> > something like "/bin/Xvfb :1 -screen 0 640x480x24 &".
> 
> 
> Disabling the tests worked for me, and this also brings down the compile
> time, which is already in excess of 1h on my system.
> 

We still prefer to run all the tests as possible, or at least all the
tests which don't require network access. Since there are no packages
which depend on krita we have no way of testing the package without
using it if we don't run the test suite.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] Add Krita to guix

[Mark Meyer]

I tried enabling test, but sometimes it's easiest to just ask, from the
Krita IRC channel:

12:49 < ofosos> hey, I'm trying to package Krita for Guix and I'm
getting a lot 
                errors, when I activate the check phase of the build.
                Are these 
                tests supposed to pass in a release tarball? I have to
                add that 
                I set "QT_QPA_PLATFORM" "offscreen" to facilitate tests
                running 
                at all
12:50 -!- salamanderrake
[~quassel@2605:a000:122a:32:89c6:d481:6fca:1d06] has 
          quit [Remote host closed the connection]
12:52 -!- NullConstant [~quassel@5.172.232.196] has joined #krita
12:55 < scottyp_mobile> a lot of unit tests fail in general right now.
no one 
                        has had time to maintain those ofosos 
12:55 < ofosos> scottyp_mobile: is this true of the release tarballs?
then I 
                would simply disable the check phase
12:56 < scottyp_mobile> this is just true in general
12:56 < scottyp_mobile> you could try to disable them

Looks like tests won't work anyways. So the patch can't be improved in
this regard.

Cheers, Mark

On Tue, Dec 5, 2017, at 11:39, Efraim Flashner wrote:
> On Tue, Dec 05, 2017 at 11:33:22AM +0100, Mark Meyer wrote:
> > On Tue, Dec 5, 2017, at 11:30, Danny Milosavljevic wrote:
> > > Hi,
> > > 
> > > On Tue, 05 Dec 2017 02:26:15 +0100
> > > Mark Meyer <mark@ofosos.org> wrote:
> > > 
> > > > I disabled all tests, since these required an X11 display to be present.
> > > 
> > > Does (setenv "QT_QPA_PLATFORM" "offscreen") help?
> > > 
> > > If not, then it's possible to start an X server (Xvfb) in the container,
> > > something like "/bin/Xvfb :1 -screen 0 640x480x24 &".
> > 
> > 
> > Disabling the tests worked for me, and this also brings down the compile
> > time, which is already in excess of 1h on my system.
> > 
> 
> We still prefer to run all the tests as possible, or at least all the
> tests which don't require network access. Since there are no packages
> which depend on krita we have no way of testing the package without
> using it if we don't run the test suite.
> 
> -- 
> Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received
> unencrypted
> Email had 1 attachment:
> + signature.asc
>   1k (application/pgp-signature)


-- 
  Mark Meyer
  mark@ofosos.org

Re: [PATCH] Add Krita to guix

[Mark Meyer]

But in theory it should work with QT_QPA_PLATFORM, this only yields a
comparatively small number of failed test in my run, likey 20-30 out of
~200.

Cheers, Mark

On Tue, Dec 5, 2017, at 12:57, Mark Meyer wrote:
> I tried enabling test, but sometimes it's easiest to just ask, from the
> Krita IRC channel:
> 
> 12:49 < ofosos> hey, I'm trying to package Krita for Guix and I'm
> getting a lot 
>                 errors, when I activate the check phase of the build.
>                 Are these 
>                 tests supposed to pass in a release tarball? I have to
>                 add that 
>                 I set "QT_QPA_PLATFORM" "offscreen" to facilitate tests
>                 running 
>                 at all
> 12:50 -!- salamanderrake
> [~quassel@2605:a000:122a:32:89c6:d481:6fca:1d06] has 
>           quit [Remote host closed the connection]
> 12:52 -!- NullConstant [~quassel@5.172.232.196] has joined #krita
> 12:55 < scottyp_mobile> a lot of unit tests fail in general right now.
> no one 
>                         has had time to maintain those ofosos 
> 12:55 < ofosos> scottyp_mobile: is this true of the release tarballs?
> then I 
>                 would simply disable the check phase
> 12:56 < scottyp_mobile> this is just true in general
> 12:56 < scottyp_mobile> you could try to disable them
> 
> Looks like tests won't work anyways. So the patch can't be improved in
> this regard.
> 
> Cheers, Mark
> 
> On Tue, Dec 5, 2017, at 11:39, Efraim Flashner wrote:
> > On Tue, Dec 05, 2017 at 11:33:22AM +0100, Mark Meyer wrote:
> > > On Tue, Dec 5, 2017, at 11:30, Danny Milosavljevic wrote:
> > > > Hi,
> > > > 
> > > > On Tue, 05 Dec 2017 02:26:15 +0100
> > > > Mark Meyer <mark@ofosos.org> wrote:
> > > > 
> > > > > I disabled all tests, since these required an X11 display to be present.
> > > > 
> > > > Does (setenv "QT_QPA_PLATFORM" "offscreen") help?
> > > > 
> > > > If not, then it's possible to start an X server (Xvfb) in the container,
> > > > something like "/bin/Xvfb :1 -screen 0 640x480x24 &".
> > > 
> > > 
> > > Disabling the tests worked for me, and this also brings down the compile
> > > time, which is already in excess of 1h on my system.
> > > 
> > 
> > We still prefer to run all the tests as possible, or at least all the
> > tests which don't require network access. Since there are no packages
> > which depend on krita we have no way of testing the package without
> > using it if we don't run the test suite.
> > 
> > -- 
> > Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> > GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> > Confidentiality cannot be guaranteed on emails sent or received
> > unencrypted
> > Email had 1 attachment:
> > + signature.asc
> >   1k (application/pgp-signature)
> 
> 
> -- 
>   Mark Meyer
>   mark@ofosos.org
> 


-- 
  Mark Meyer
  mark@ofosos.org

Re: [PATCH] Add Krita to guix

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1760 bytes --]

On Tue, Dec 05, 2017 at 12:57:59PM +0100, Mark Meyer wrote:
> I tried enabling test, but sometimes it's easiest to just ask, from the
> Krita IRC channel:
> 
> 12:49 < ofosos> hey, I'm trying to package Krita for Guix and I'm
> getting a lot 
>                 errors, when I activate the check phase of the build.
>                 Are these 
>                 tests supposed to pass in a release tarball? I have to
>                 add that 
>                 I set "QT_QPA_PLATFORM" "offscreen" to facilitate tests
>                 running 
>                 at all
> 12:50 -!- salamanderrake
> [~quassel@2605:a000:122a:32:89c6:d481:6fca:1d06] has 
>           quit [Remote host closed the connection]
> 12:52 -!- NullConstant [~quassel@5.172.232.196] has joined #krita
> 12:55 < scottyp_mobile> a lot of unit tests fail in general right now.
> no one 
>                         has had time to maintain those ofosos 
> 12:55 < ofosos> scottyp_mobile: is this true of the release tarballs?
> then I 
>                 would simply disable the check phase
> 12:56 < scottyp_mobile> this is just true in general
> 12:56 < scottyp_mobile> you could try to disable them
> 
> Looks like tests won't work anyways. So the patch can't be improved in
> this regard.
> 
> Cheers, Mark
> 

It looks like Debian disables the tests¹, as does Arch².


¹ https://sources.debian.org/src/krita/1:3.3.2.1+dfsg-1/debian/rules/#L28
² https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/krita#n31
-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]