unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#29703] Improve Krita
@ 2017-12-14  0:18 Mark Meyer
  2017-12-14  0:41 ` [bug#29703] Looks good Mark Meyer
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Mark Meyer @ 2017-12-14  0:18 UTC (permalink / raw)
  To: 29703

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

Hi,
I'm currently testing several changes to Krita, I've broken stuff up
into three commits/patches which are attached.

These
  - add a dependency to vc (vectorize Krita)
  - enable OpenEXR
  - enable JPEG (via libjpeg-turbo)

Cheers, Mark

-- 
  Mark Meyer
  mark@ofosos.org

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-gnu-krita-Add-OpenEXR-support.patch --]
[-- Type: text/x-patch; name="0003-gnu-krita-Add-OpenEXR-support.patch", Size: 1459 bytes --]

From 8f631d21210af3c8ec35594f5a99e4259665a7c4 Mon Sep 17 00:00:00 2001
From: Mark Meyer <mark@ofosos.org>
Date: Thu, 14 Dec 2017 00:49:05 +0100
Subject: [PATCH] * gnu: krita: Add OpenEXR support.

---
 gnu/packages/kde.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index d74325c5d..89ad30ecd 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -256,7 +256,10 @@ plugins, as well as code to create plugins, or complete applications.")
              (string-append "-DWITH_LibRaw="
                             (assoc-ref %build-inputs "libraw"))
              (string-append "-DWITH_TIFF="
-                            (assoc-ref %build-inputs "libtiff")))))
+                            (assoc-ref %build-inputs "libtiff"))
+             (string-append "-DCMAKE_CXX_FLAGS=-I"
+                            (assoc-ref %build-inputs "ilmbase")
+                            "/include/OpenEXR"))))
     (native-inputs
      `(("curl" ,curl)
        ("eigen" ,eigen)
@@ -298,7 +301,9 @@ plugins, as well as code to create plugins, or complete applications.")
        ("poppler-qt5" ,poppler-qt5)
        ("libraw" ,libraw)
        ("libtiff" ,libtiff)
-       ("perl" ,perl)))
+       ("perl" ,perl)
+       ("ilmbase" ,ilmbase)
+       ("openexr" ,openexr)))
     (home-page "https://krita.org")
     (synopsis "Digital painting application")
     (description
-- 
2.15.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-krita-Add-vc-to-native-inputs.patch --]
[-- Type: text/x-patch; name="0002-gnu-krita-Add-vc-to-native-inputs.patch", Size: 814 bytes --]

From adea158919123c732ea2a314133188a0c13929e5 Mon Sep 17 00:00:00 2001
From: Mark Meyer <mark@ofosos.org>
Date: Thu, 14 Dec 2017 00:36:26 +0100
Subject: [PATCH] * gnu: krita: Add vc to native-inputs.

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

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index e8f38b920..d74325c5d 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -263,7 +263,8 @@ plugins, as well as code to create plugins, or complete applications.")
        ("extra-cmake-modules" ,extra-cmake-modules)
        ("gettext-minimal" ,gettext-minimal)
        ("kitemmodels" ,kitemmodels)
-       ("qwt" ,qwt)))
+       ("qwt" ,qwt)
+       ("vc" ,vc)))
     (inputs
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)
-- 
2.15.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0001-gnu-krita-Add-libjpeg-turbo-to-inputs.patch --]
[-- Type: text/x-patch; name="0001-gnu-krita-Add-libjpeg-turbo-to-inputs.patch", Size: 712 bytes --]

From 85e672fc58cad18177651f7e8c2af99e12475d88 Mon Sep 17 00:00:00 2001
From: Mark Meyer <mark@ofosos.org>
Date: Wed, 13 Dec 2017 23:49:09 +0100
Subject: [PATCH] * gnu: krita: Add libjpeg-turbo to inputs.

---
 gnu/packages/kde.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index b5a3df2ca..e8f38b920 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -287,6 +287,7 @@ plugins, as well as code to create plugins, or complete applications.")
        ("exiv2" ,exiv2)
        ("lcms" ,lcms)
        ("libpng" ,libpng)
+       ("libjpeg-turbo" ,libjpeg-turbo)
        ("zlib" ,zlib)
        ("libx11" ,libx11)
        ("libxcb" ,libxcb)
-- 
2.15.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [bug#29703] Looks good
  2017-12-14  0:18 [bug#29703] Improve Krita Mark Meyer
@ 2017-12-14  0:41 ` Mark Meyer
  2017-12-14 11:55 ` [bug#29703] Improve Krita ng0
  2017-12-16 23:19 ` bug#29703: Fixed Mark Meyer
  2 siblings, 0 replies; 8+ messages in thread
From: Mark Meyer @ 2017-12-14  0:41 UTC (permalink / raw)
  To: 29703

Ok, I built this changed version and it supports both OpenEXR and JPEG
images. I can't easily test the vectorization.

-- 
  Mark Meyer
  mark@ofosos.org

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#29703] Improve Krita
  2017-12-14  0:18 [bug#29703] Improve Krita Mark Meyer
  2017-12-14  0:41 ` [bug#29703] Looks good Mark Meyer
@ 2017-12-14 11:55 ` ng0
  2017-12-14 14:02   ` Mark Meyer
  2017-12-16 23:19 ` bug#29703: Fixed Mark Meyer
  2 siblings, 1 reply; 8+ messages in thread
From: ng0 @ 2017-12-14 11:55 UTC (permalink / raw)
  To: Mark Meyer; +Cc: 29703

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

Hi Mark,

Mark Meyer transcribed 5.4K bytes:
> Hi,
> I'm currently testing several changes to Krita, I've broken stuff up
> into three commits/patches which are attached.
> 
> These
>   - add a dependency to vc (vectorize Krita)
>   - enable OpenEXR
>   - enable JPEG (via libjpeg-turbo)

Thanks for the work on Krita.
I haven't tested them, but it looks good.
It would be okay to squash these commits into one, we've done this
in the past in similar cases (see `git log gnu/packages/gnunet.scm`
for libextractor for example).

> Cheers, Mark
> 
> -- 
>   Mark Meyer
>   mark@ofosos.org

> From 8f631d21210af3c8ec35594f5a99e4259665a7c4 Mon Sep 17 00:00:00 2001
> From: Mark Meyer <mark@ofosos.org>
> Date: Thu, 14 Dec 2017 00:49:05 +0100
> Subject: [PATCH] * gnu: krita: Add OpenEXR support.
> 
> ---
>  gnu/packages/kde.scm | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
> index d74325c5d..89ad30ecd 100644
> --- a/gnu/packages/kde.scm
> +++ b/gnu/packages/kde.scm
> @@ -256,7 +256,10 @@ plugins, as well as code to create plugins, or complete applications.")
>               (string-append "-DWITH_LibRaw="
>                              (assoc-ref %build-inputs "libraw"))
>               (string-append "-DWITH_TIFF="
> -                            (assoc-ref %build-inputs "libtiff")))))
> +                            (assoc-ref %build-inputs "libtiff"))
> +             (string-append "-DCMAKE_CXX_FLAGS=-I"
> +                            (assoc-ref %build-inputs "ilmbase")
> +                            "/include/OpenEXR"))))
>      (native-inputs
>       `(("curl" ,curl)
>         ("eigen" ,eigen)
> @@ -298,7 +301,9 @@ plugins, as well as code to create plugins, or complete applications.")
>         ("poppler-qt5" ,poppler-qt5)
>         ("libraw" ,libraw)
>         ("libtiff" ,libtiff)
> -       ("perl" ,perl)))
> +       ("perl" ,perl)
> +       ("ilmbase" ,ilmbase)
> +       ("openexr" ,openexr)))
>      (home-page "https://krita.org")
>      (synopsis "Digital painting application")
>      (description
> -- 
> 2.15.0
> 

> From adea158919123c732ea2a314133188a0c13929e5 Mon Sep 17 00:00:00 2001
> From: Mark Meyer <mark@ofosos.org>
> Date: Thu, 14 Dec 2017 00:36:26 +0100
> Subject: [PATCH] * gnu: krita: Add vc to native-inputs.
> 
> ---
>  gnu/packages/kde.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
> index e8f38b920..d74325c5d 100644
> --- a/gnu/packages/kde.scm
> +++ b/gnu/packages/kde.scm
> @@ -263,7 +263,8 @@ plugins, as well as code to create plugins, or complete applications.")
>         ("extra-cmake-modules" ,extra-cmake-modules)
>         ("gettext-minimal" ,gettext-minimal)
>         ("kitemmodels" ,kitemmodels)
> -       ("qwt" ,qwt)))
> +       ("qwt" ,qwt)
> +       ("vc" ,vc)))
>      (inputs
>       `(("qtbase" ,qtbase)
>         ("qtdeclarative" ,qtdeclarative)
> -- 
> 2.15.0
> 

> From 85e672fc58cad18177651f7e8c2af99e12475d88 Mon Sep 17 00:00:00 2001
> From: Mark Meyer <mark@ofosos.org>
> Date: Wed, 13 Dec 2017 23:49:09 +0100
> Subject: [PATCH] * gnu: krita: Add libjpeg-turbo to inputs.
> 
> ---
>  gnu/packages/kde.scm | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
> index b5a3df2ca..e8f38b920 100644
> --- a/gnu/packages/kde.scm
> +++ b/gnu/packages/kde.scm
> @@ -287,6 +287,7 @@ plugins, as well as code to create plugins, or complete applications.")
>         ("exiv2" ,exiv2)
>         ("lcms" ,lcms)
>         ("libpng" ,libpng)
> +       ("libjpeg-turbo" ,libjpeg-turbo)
>         ("zlib" ,zlib)
>         ("libx11" ,libx11)
>         ("libxcb" ,libxcb)
> -- 
> 2.15.0
> 


-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
  WWW: https://n0.is

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#29703] Improve Krita
  2017-12-14 11:55 ` [bug#29703] Improve Krita ng0
@ 2017-12-14 14:02   ` Mark Meyer
  2017-12-14 14:39     ` ng0
  0 siblings, 1 reply; 8+ messages in thread
From: Mark Meyer @ 2017-12-14 14:02 UTC (permalink / raw)
  To: ng0; +Cc: 29703

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

Ok, see the following patch. This should also be aligned with the commit
message conventions.

On Thu, Dec 14, 2017, at 12:55, ng0 wrote:
> Hi Mark,
> 
> Mark Meyer transcribed 5.4K bytes:
> > Hi,
> > I'm currently testing several changes to Krita, I've broken stuff up
> > into three commits/patches which are attached.
> > 
> > These
> >   - add a dependency to vc (vectorize Krita)
> >   - enable OpenEXR
> >   - enable JPEG (via libjpeg-turbo)
> 
> Thanks for the work on Krita.
> I haven't tested them, but it looks good.
> It would be okay to squash these commits into one, we've done this
> in the past in similar cases (see `git log gnu/packages/gnunet.scm`
> for libextractor for example).
> 
> > Cheers, Mark
> > 
> > -- 
> >   Mark Meyer
> >   mark@ofosos.org
> 
> > From 8f631d21210af3c8ec35594f5a99e4259665a7c4 Mon Sep 17 00:00:00 2001
> > From: Mark Meyer <mark@ofosos.org>
> > Date: Thu, 14 Dec 2017 00:49:05 +0100
> > Subject: [PATCH] * gnu: krita: Add OpenEXR support.
> > 
> > ---
> >  gnu/packages/kde.scm | 9 +++++++--
> >  1 file changed, 7 insertions(+), 2 deletions(-)
> > 
> > diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
> > index d74325c5d..89ad30ecd 100644
> > --- a/gnu/packages/kde.scm
> > +++ b/gnu/packages/kde.scm
> > @@ -256,7 +256,10 @@ plugins, as well as code to create plugins, or complete applications.")
> >               (string-append "-DWITH_LibRaw="
> >                              (assoc-ref %build-inputs "libraw"))
> >               (string-append "-DWITH_TIFF="
> > -                            (assoc-ref %build-inputs "libtiff")))))
> > +                            (assoc-ref %build-inputs "libtiff"))
> > +             (string-append "-DCMAKE_CXX_FLAGS=-I"
> > +                            (assoc-ref %build-inputs "ilmbase")
> > +                            "/include/OpenEXR"))))
> >      (native-inputs
> >       `(("curl" ,curl)
> >         ("eigen" ,eigen)
> > @@ -298,7 +301,9 @@ plugins, as well as code to create plugins, or complete applications.")
> >         ("poppler-qt5" ,poppler-qt5)
> >         ("libraw" ,libraw)
> >         ("libtiff" ,libtiff)
> > -       ("perl" ,perl)))
> > +       ("perl" ,perl)
> > +       ("ilmbase" ,ilmbase)
> > +       ("openexr" ,openexr)))
> >      (home-page "https://krita.org")
> >      (synopsis "Digital painting application")
> >      (description
> > -- 
> > 2.15.0
> > 
> 
> > From adea158919123c732ea2a314133188a0c13929e5 Mon Sep 17 00:00:00 2001
> > From: Mark Meyer <mark@ofosos.org>
> > Date: Thu, 14 Dec 2017 00:36:26 +0100
> > Subject: [PATCH] * gnu: krita: Add vc to native-inputs.
> > 
> > ---
> >  gnu/packages/kde.scm | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
> > index e8f38b920..d74325c5d 100644
> > --- a/gnu/packages/kde.scm
> > +++ b/gnu/packages/kde.scm
> > @@ -263,7 +263,8 @@ plugins, as well as code to create plugins, or complete applications.")
> >         ("extra-cmake-modules" ,extra-cmake-modules)
> >         ("gettext-minimal" ,gettext-minimal)
> >         ("kitemmodels" ,kitemmodels)
> > -       ("qwt" ,qwt)))
> > +       ("qwt" ,qwt)
> > +       ("vc" ,vc)))
> >      (inputs
> >       `(("qtbase" ,qtbase)
> >         ("qtdeclarative" ,qtdeclarative)
> > -- 
> > 2.15.0
> > 
> 
> > From 85e672fc58cad18177651f7e8c2af99e12475d88 Mon Sep 17 00:00:00 2001
> > From: Mark Meyer <mark@ofosos.org>
> > Date: Wed, 13 Dec 2017 23:49:09 +0100
> > Subject: [PATCH] * gnu: krita: Add libjpeg-turbo to inputs.
> > 
> > ---
> >  gnu/packages/kde.scm | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
> > index b5a3df2ca..e8f38b920 100644
> > --- a/gnu/packages/kde.scm
> > +++ b/gnu/packages/kde.scm
> > @@ -287,6 +287,7 @@ plugins, as well as code to create plugins, or complete applications.")
> >         ("exiv2" ,exiv2)
> >         ("lcms" ,lcms)
> >         ("libpng" ,libpng)
> > +       ("libjpeg-turbo" ,libjpeg-turbo)
> >         ("zlib" ,zlib)
> >         ("libx11" ,libx11)
> >         ("libxcb" ,libxcb)
> > -- 
> > 2.15.0
> > 
> 
> 
> -- 
> GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
> GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
>   WWW: https://n0.is
> Email had 1 attachment:
> + signature.asc
>   1k (application/pgp-signature)


-- 
  Mark Meyer
  mark@ofosos.org

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-krita-Enhance-krita.patch --]
[-- Type: text/x-patch; name="0001-gnu-krita-Enhance-krita.patch", Size: 2218 bytes --]

From 158497a7bf1b5672018189101fa5448623cecb1b Mon Sep 17 00:00:00 2001
From: Mark Meyer <mark@ofosos.org>
Date: Wed, 13 Dec 2017 23:49:09 +0100
Subject: [PATCH] gnu: krita: Enhance krita

* gnu/packages/kde.scm (kirta)[inputs]: Add libjpeg-turbo to inputs.
* gnu/packages/kde.scm (krita)[inputs]: Add vc to native-inputs.
* gnu/packages/kde.scm (krita)[inputs]: Add OpenEXR support.
---
 gnu/packages/kde.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index b5a3df2ca..89ad30ecd 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -256,14 +256,18 @@ plugins, as well as code to create plugins, or complete applications.")
              (string-append "-DWITH_LibRaw="
                             (assoc-ref %build-inputs "libraw"))
              (string-append "-DWITH_TIFF="
-                            (assoc-ref %build-inputs "libtiff")))))
+                            (assoc-ref %build-inputs "libtiff"))
+             (string-append "-DCMAKE_CXX_FLAGS=-I"
+                            (assoc-ref %build-inputs "ilmbase")
+                            "/include/OpenEXR"))))
     (native-inputs
      `(("curl" ,curl)
        ("eigen" ,eigen)
        ("extra-cmake-modules" ,extra-cmake-modules)
        ("gettext-minimal" ,gettext-minimal)
        ("kitemmodels" ,kitemmodels)
-       ("qwt" ,qwt)))
+       ("qwt" ,qwt)
+       ("vc" ,vc)))
     (inputs
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)
@@ -287,6 +291,7 @@ plugins, as well as code to create plugins, or complete applications.")
        ("exiv2" ,exiv2)
        ("lcms" ,lcms)
        ("libpng" ,libpng)
+       ("libjpeg-turbo" ,libjpeg-turbo)
        ("zlib" ,zlib)
        ("libx11" ,libx11)
        ("libxcb" ,libxcb)
@@ -296,7 +301,9 @@ plugins, as well as code to create plugins, or complete applications.")
        ("poppler-qt5" ,poppler-qt5)
        ("libraw" ,libraw)
        ("libtiff" ,libtiff)
-       ("perl" ,perl)))
+       ("perl" ,perl)
+       ("ilmbase" ,ilmbase)
+       ("openexr" ,openexr)))
     (home-page "https://krita.org")
     (synopsis "Digital painting application")
     (description
-- 
2.15.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [bug#29703] Improve Krita
  2017-12-14 14:02   ` Mark Meyer
@ 2017-12-14 14:39     ` ng0
  2017-12-14 15:12       ` Mark Meyer
  0 siblings, 1 reply; 8+ messages in thread
From: ng0 @ 2017-12-14 14:39 UTC (permalink / raw)
  To: Mark Meyer; +Cc: 29703

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

Hi,

we're almost there. It's just a couple of fixes that need to be applied:

Mark Meyer transcribed 7.7K bytes:
> Ok, see the following patch. This should also be aligned with the commit
> message conventions.
> 
> On Thu, Dec 14, 2017, at 12:55, ng0 wrote:
> > Hi Mark,
> > 
> > Mark Meyer transcribed 5.4K bytes:
> > > Hi,
> > > I'm currently testing several changes to Krita, I've broken stuff up
> > > into three commits/patches which are attached.
> > > 
> > > These
> > >   - add a dependency to vc (vectorize Krita)
> > >   - enable OpenEXR
> > >   - enable JPEG (via libjpeg-turbo)
> > 
> > Thanks for the work on Krita.
> > I haven't tested them, but it looks good.
> > It would be okay to squash these commits into one, we've done this
> > in the past in similar cases (see `git log gnu/packages/gnunet.scm`
> > for libextractor for example).
> > 
> > > Cheers, Mark

> From 158497a7bf1b5672018189101fa5448623cecb1b Mon Sep 17 00:00:00 2001
> From: Mark Meyer <mark@ofosos.org>
> Date: Wed, 13 Dec 2017 23:49:09 +0100
> Subject: [PATCH] gnu: krita: Enhance krita
> 
> * gnu/packages/kde.scm (kirta)[inputs]: Add libjpeg-turbo to inputs.
> * gnu/packages/kde.scm (krita)[inputs]: Add vc to native-inputs.
> * gnu/packages/kde.scm (krita)[inputs]: Add OpenEXR support.

I would write:

gnu: krita: Enhance krita.

* gnu/packages/kde.scm (krita)[inputs]: Add 'libjpeg-turbo', 'ilmbase', 'openexr'.
(native-inputs): Add 'vc'.
(arguments)[configure-flags]: Add 'CMAKE_CXX_FLAGS' for ilmbase.



Or something like that. I'm not sure about the configure-flags wording.
I don't know Krita so I can't really review if your changes work. I'll
build it later tonight and see if it builds for me.

> ---
>  gnu/packages/kde.scm | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
> index b5a3df2ca..89ad30ecd 100644
> --- a/gnu/packages/kde.scm
> +++ b/gnu/packages/kde.scm
> @@ -256,14 +256,18 @@ plugins, as well as code to create plugins, or complete applications.")
>               (string-append "-DWITH_LibRaw="
>                              (assoc-ref %build-inputs "libraw"))
>               (string-append "-DWITH_TIFF="
> -                            (assoc-ref %build-inputs "libtiff")))))
> +                            (assoc-ref %build-inputs "libtiff"))
> +             (string-append "-DCMAKE_CXX_FLAGS=-I"
> +                            (assoc-ref %build-inputs "ilmbase")
> +                            "/include/OpenEXR"))))
>      (native-inputs
>       `(("curl" ,curl)
>         ("eigen" ,eigen)
>         ("extra-cmake-modules" ,extra-cmake-modules)
>         ("gettext-minimal" ,gettext-minimal)
>         ("kitemmodels" ,kitemmodels)
> -       ("qwt" ,qwt)))
> +       ("qwt" ,qwt)
> +       ("vc" ,vc)))
>      (inputs
>       `(("qtbase" ,qtbase)
>         ("qtdeclarative" ,qtdeclarative)
> @@ -287,6 +291,7 @@ plugins, as well as code to create plugins, or complete applications.")
>         ("exiv2" ,exiv2)
>         ("lcms" ,lcms)
>         ("libpng" ,libpng)
> +       ("libjpeg-turbo" ,libjpeg-turbo)
>         ("zlib" ,zlib)
>         ("libx11" ,libx11)
>         ("libxcb" ,libxcb)
> @@ -296,7 +301,9 @@ plugins, as well as code to create plugins, or complete applications.")
>         ("poppler-qt5" ,poppler-qt5)
>         ("libraw" ,libraw)
>         ("libtiff" ,libtiff)
> -       ("perl" ,perl)))
> +       ("perl" ,perl)
> +       ("ilmbase" ,ilmbase)
> +       ("openexr" ,openexr)))
>      (home-page "https://krita.org")
>      (synopsis "Digital painting application")
>      (description
> -- 
> 2.15.0
> 


-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
  WWW: https://n0.is

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#29703] Improve Krita
  2017-12-14 14:39     ` ng0
@ 2017-12-14 15:12       ` Mark Meyer
  2017-12-16 21:53         ` Kei Kebreau
  0 siblings, 1 reply; 8+ messages in thread
From: Mark Meyer @ 2017-12-14 15:12 UTC (permalink / raw)
  To: ng0; +Cc: 29703

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

Thanks for your patience, from the log of gnunet.scm I think it should
be somthing like the appended one.

Cheers, Mark

On Thu, Dec 14, 2017, at 15:39, ng0 wrote:
> Hi,
> 
> we're almost there. It's just a couple of fixes that need to be applied:
> 
> Mark Meyer transcribed 7.7K bytes:
> > Ok, see the following patch. This should also be aligned with the commit
> > message conventions.
> > 
> > On Thu, Dec 14, 2017, at 12:55, ng0 wrote:
> > > Hi Mark,
> > > 
> > > Mark Meyer transcribed 5.4K bytes:
> > > > Hi,
> > > > I'm currently testing several changes to Krita, I've broken stuff up
> > > > into three commits/patches which are attached.
> > > > 
> > > > These
> > > >   - add a dependency to vc (vectorize Krita)
> > > >   - enable OpenEXR
> > > >   - enable JPEG (via libjpeg-turbo)
> > > 
> > > Thanks for the work on Krita.
> > > I haven't tested them, but it looks good.
> > > It would be okay to squash these commits into one, we've done this
> > > in the past in similar cases (see `git log gnu/packages/gnunet.scm`
> > > for libextractor for example).
> > > 
> > > > Cheers, Mark
> 
> > From 158497a7bf1b5672018189101fa5448623cecb1b Mon Sep 17 00:00:00 2001
> > From: Mark Meyer <mark@ofosos.org>
> > Date: Wed, 13 Dec 2017 23:49:09 +0100
> > Subject: [PATCH] gnu: krita: Enhance krita
> > 
> > * gnu/packages/kde.scm (kirta)[inputs]: Add libjpeg-turbo to inputs.
> > * gnu/packages/kde.scm (krita)[inputs]: Add vc to native-inputs.
> > * gnu/packages/kde.scm (krita)[inputs]: Add OpenEXR support.
> 
> I would write:
> 
> gnu: krita: Enhance krita.
> 
> * gnu/packages/kde.scm (krita)[inputs]: Add 'libjpeg-turbo', 'ilmbase',
> 'openexr'.
> (native-inputs): Add 'vc'.
> (arguments)[configure-flags]: Add 'CMAKE_CXX_FLAGS' for ilmbase.
> 
> 
> 
> Or something like that. I'm not sure about the configure-flags wording.
> I don't know Krita so I can't really review if your changes work. I'll
> build it later tonight and see if it builds for me.
> 
> > ---
> >  gnu/packages/kde.scm | 13 ++++++++++---
> >  1 file changed, 10 insertions(+), 3 deletions(-)
> > 
> > diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
> > index b5a3df2ca..89ad30ecd 100644
> > --- a/gnu/packages/kde.scm
> > +++ b/gnu/packages/kde.scm
> > @@ -256,14 +256,18 @@ plugins, as well as code to create plugins, or complete applications.")
> >               (string-append "-DWITH_LibRaw="
> >                              (assoc-ref %build-inputs "libraw"))
> >               (string-append "-DWITH_TIFF="
> > -                            (assoc-ref %build-inputs "libtiff")))))
> > +                            (assoc-ref %build-inputs "libtiff"))
> > +             (string-append "-DCMAKE_CXX_FLAGS=-I"
> > +                            (assoc-ref %build-inputs "ilmbase")
> > +                            "/include/OpenEXR"))))
> >      (native-inputs
> >       `(("curl" ,curl)
> >         ("eigen" ,eigen)
> >         ("extra-cmake-modules" ,extra-cmake-modules)
> >         ("gettext-minimal" ,gettext-minimal)
> >         ("kitemmodels" ,kitemmodels)
> > -       ("qwt" ,qwt)))
> > +       ("qwt" ,qwt)
> > +       ("vc" ,vc)))
> >      (inputs
> >       `(("qtbase" ,qtbase)
> >         ("qtdeclarative" ,qtdeclarative)
> > @@ -287,6 +291,7 @@ plugins, as well as code to create plugins, or complete applications.")
> >         ("exiv2" ,exiv2)
> >         ("lcms" ,lcms)
> >         ("libpng" ,libpng)
> > +       ("libjpeg-turbo" ,libjpeg-turbo)
> >         ("zlib" ,zlib)
> >         ("libx11" ,libx11)
> >         ("libxcb" ,libxcb)
> > @@ -296,7 +301,9 @@ plugins, as well as code to create plugins, or complete applications.")
> >         ("poppler-qt5" ,poppler-qt5)
> >         ("libraw" ,libraw)
> >         ("libtiff" ,libtiff)
> > -       ("perl" ,perl)))
> > +       ("perl" ,perl)
> > +       ("ilmbase" ,ilmbase)
> > +       ("openexr" ,openexr)))
> >      (home-page "https://krita.org")
> >      (synopsis "Digital painting application")
> >      (description
> > -- 
> > 2.15.0
> > 
> 
> 
> -- 
> GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
> GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
>   WWW: https://n0.is
> Email had 1 attachment:
> + signature.asc
>   1k (application/pgp-signature)


-- 
  Mark Meyer
  mark@ofosos.org

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-krita-Enhance-krita.patch --]
[-- Type: text/x-patch; name="0001-gnu-krita-Enhance-krita.patch", Size: 2183 bytes --]

From 37e5519a2b326ff9d03c75440df38e2e5f116709 Mon Sep 17 00:00:00 2001
From: Mark Meyer <mark@ofosos.org>
Date: Wed, 13 Dec 2017 23:49:09 +0100
Subject: [PATCH] gnu: krita: Enhance krita

* gnu/packages/kde.scm (kirta)[inputs]: Add 'libjpeg-turbo', 'ilmbase', 'openexr'.
  [native-inputs]: Add vc.
  [arguments]: Set path to headers for 'ilmbase'.
---
 gnu/packages/kde.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index b5a3df2ca..89ad30ecd 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -256,14 +256,18 @@ plugins, as well as code to create plugins, or complete applications.")
              (string-append "-DWITH_LibRaw="
                             (assoc-ref %build-inputs "libraw"))
              (string-append "-DWITH_TIFF="
-                            (assoc-ref %build-inputs "libtiff")))))
+                            (assoc-ref %build-inputs "libtiff"))
+             (string-append "-DCMAKE_CXX_FLAGS=-I"
+                            (assoc-ref %build-inputs "ilmbase")
+                            "/include/OpenEXR"))))
     (native-inputs
      `(("curl" ,curl)
        ("eigen" ,eigen)
        ("extra-cmake-modules" ,extra-cmake-modules)
        ("gettext-minimal" ,gettext-minimal)
        ("kitemmodels" ,kitemmodels)
-       ("qwt" ,qwt)))
+       ("qwt" ,qwt)
+       ("vc" ,vc)))
     (inputs
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)
@@ -287,6 +291,7 @@ plugins, as well as code to create plugins, or complete applications.")
        ("exiv2" ,exiv2)
        ("lcms" ,lcms)
        ("libpng" ,libpng)
+       ("libjpeg-turbo" ,libjpeg-turbo)
        ("zlib" ,zlib)
        ("libx11" ,libx11)
        ("libxcb" ,libxcb)
@@ -296,7 +301,9 @@ plugins, as well as code to create plugins, or complete applications.")
        ("poppler-qt5" ,poppler-qt5)
        ("libraw" ,libraw)
        ("libtiff" ,libtiff)
-       ("perl" ,perl)))
+       ("perl" ,perl)
+       ("ilmbase" ,ilmbase)
+       ("openexr" ,openexr)))
     (home-page "https://krita.org")
     (synopsis "Digital painting application")
     (description
-- 
2.15.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [bug#29703] Improve Krita
  2017-12-14 15:12       ` Mark Meyer
@ 2017-12-16 21:53         ` Kei Kebreau
  0 siblings, 0 replies; 8+ messages in thread
From: Kei Kebreau @ 2017-12-16 21:53 UTC (permalink / raw)
  To: Mark Meyer; +Cc: 29703

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

Mark Meyer <mark@ofosos.org> writes:

> Thanks for your patience, from the log of gnunet.scm I think it should
> be somthing like the appended one.
>
> Cheers, Mark
>
> On Thu, Dec 14, 2017, at 15:39, ng0 wrote:
>> Hi,
>> 
>> we're almost there. It's just a couple of fixes that need to be applied:
>> 
>> Mark Meyer transcribed 7.7K bytes:
>> > Ok, see the following patch. This should also be aligned with the commit
>> > message conventions.
>> > 
>> > On Thu, Dec 14, 2017, at 12:55, ng0 wrote:
>> > > Hi Mark,
>> > > 
>> > > Mark Meyer transcribed 5.4K bytes:
>> > > > Hi,
>> > > > I'm currently testing several changes to Krita, I've broken stuff up
>> > > > into three commits/patches which are attached.
>> > > > 
>> > > > These
>> > > >   - add a dependency to vc (vectorize Krita)
>> > > >   - enable OpenEXR
>> > > >   - enable JPEG (via libjpeg-turbo)
>> > > 
>> > > Thanks for the work on Krita.
>> > > I haven't tested them, but it looks good.
>> > > It would be okay to squash these commits into one, we've done this
>> > > in the past in similar cases (see `git log gnu/packages/gnunet.scm`
>> > > for libextractor for example).
>> > > 
>> > > > Cheers, Mark
>> 
>> > From 158497a7bf1b5672018189101fa5448623cecb1b Mon Sep 17 00:00:00 2001
>> > From: Mark Meyer <mark@ofosos.org>
>> > Date: Wed, 13 Dec 2017 23:49:09 +0100
>> > Subject: [PATCH] gnu: krita: Enhance krita
>> > 
>> > * gnu/packages/kde.scm (kirta)[inputs]: Add libjpeg-turbo to inputs.
>> > * gnu/packages/kde.scm (krita)[inputs]: Add vc to native-inputs.
>> > * gnu/packages/kde.scm (krita)[inputs]: Add OpenEXR support.
>> 
>> I would write:
>> 
>> gnu: krita: Enhance krita.
>> 
>> * gnu/packages/kde.scm (krita)[inputs]: Add 'libjpeg-turbo', 'ilmbase',
>> 'openexr'.
>> (native-inputs): Add 'vc'.
>> (arguments)[configure-flags]: Add 'CMAKE_CXX_FLAGS' for ilmbase.
>> 
>> 
>> 
>> Or something like that. I'm not sure about the configure-flags wording.
>> I don't know Krita so I can't really review if your changes work. I'll
>> build it later tonight and see if it builds for me.
>> 
>> > ---
>> >  gnu/packages/kde.scm | 13 ++++++++++---
>> >  1 file changed, 10 insertions(+), 3 deletions(-)
>> > 
>> > diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
>> > index b5a3df2ca..89ad30ecd 100644
>> > --- a/gnu/packages/kde.scm
>> > +++ b/gnu/packages/kde.scm
>> > @@ -256,14 +256,18 @@ plugins, as well as code to create plugins, or complete applications.")
>> >               (string-append "-DWITH_LibRaw="
>> >                              (assoc-ref %build-inputs "libraw"))
>> >               (string-append "-DWITH_TIFF="
>> > -                            (assoc-ref %build-inputs "libtiff")))))
>> > +                            (assoc-ref %build-inputs "libtiff"))
>> > +             (string-append "-DCMAKE_CXX_FLAGS=-I"
>> > +                            (assoc-ref %build-inputs "ilmbase")
>> > +                            "/include/OpenEXR"))))
>> >      (native-inputs
>> >       `(("curl" ,curl)
>> >         ("eigen" ,eigen)
>> >         ("extra-cmake-modules" ,extra-cmake-modules)
>> >         ("gettext-minimal" ,gettext-minimal)
>> >         ("kitemmodels" ,kitemmodels)
>> > -       ("qwt" ,qwt)))
>> > +       ("qwt" ,qwt)
>> > +       ("vc" ,vc)))
>> >      (inputs
>> >       `(("qtbase" ,qtbase)
>> >         ("qtdeclarative" ,qtdeclarative)
>> > @@ -287,6 +291,7 @@ plugins, as well as code to create plugins, or complete applications.")
>> >         ("exiv2" ,exiv2)
>> >         ("lcms" ,lcms)
>> >         ("libpng" ,libpng)
>> > +       ("libjpeg-turbo" ,libjpeg-turbo)
>> >         ("zlib" ,zlib)
>> >         ("libx11" ,libx11)
>> >         ("libxcb" ,libxcb)
>> > @@ -296,7 +301,9 @@ plugins, as well as code to create plugins, or complete applications.")
>> >         ("poppler-qt5" ,poppler-qt5)
>> >         ("libraw" ,libraw)
>> >         ("libtiff" ,libtiff)
>> > -       ("perl" ,perl)))
>> > +       ("perl" ,perl)
>> > +       ("ilmbase" ,ilmbase)
>> > +       ("openexr" ,openexr)))
>> >      (home-page "https://krita.org")
>> >      (synopsis "Digital painting application")
>> >      (description
>> > -- 
>> > 2.15.0
>> > 
>> 
>> 
>> -- 
>> GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
>> GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
>>   WWW: https://n0.is
>> Email had 1 attachment:
>> + signature.asc
>>   1k (application/pgp-signature)

I made tiny changes to the commit log and pushed this to master; you can
close this bug.

Thanks for contributing,
Kei

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* bug#29703: Fixed
  2017-12-14  0:18 [bug#29703] Improve Krita Mark Meyer
  2017-12-14  0:41 ` [bug#29703] Looks good Mark Meyer
  2017-12-14 11:55 ` [bug#29703] Improve Krita ng0
@ 2017-12-16 23:19 ` Mark Meyer
  2 siblings, 0 replies; 8+ messages in thread
From: Mark Meyer @ 2017-12-16 23:19 UTC (permalink / raw)
  To: 29703-done

Fixed.

-- 
  Mark Meyer
  mark@ofosos.org

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2017-12-16 23:20 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-14  0:18 [bug#29703] Improve Krita Mark Meyer
2017-12-14  0:41 ` [bug#29703] Looks good Mark Meyer
2017-12-14 11:55 ` [bug#29703] Improve Krita ng0
2017-12-14 14:02   ` Mark Meyer
2017-12-14 14:39     ` ng0
2017-12-14 15:12       ` Mark Meyer
2017-12-16 21:53         ` Kei Kebreau
2017-12-16 23:19 ` bug#29703: Fixed Mark Meyer

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).