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