From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePU6O-0006QW-HK for guix-patches@gnu.org; Thu, 14 Dec 2017 09:03:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePU6I-0005nN-Fl for guix-patches@gnu.org; Thu, 14 Dec 2017 09:03:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52676) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePU6I-0005mX-5j for guix-patches@gnu.org; Thu, 14 Dec 2017 09:03:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ePU6H-0004a0-OG for guix-patches@gnu.org; Thu, 14 Dec 2017 09:03:01 -0500 Subject: [bug#29703] Improve Krita Resent-Message-ID: Message-Id: <1513260171.940424.1204970752.5399B230@webmail.messagingengine.com> From: Mark Meyer MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_15132601719404241" References: <1513210726.1193324.1204381152.68C7761A@webmail.messagingengine.com> <20171214115531.llwpyqjzjbwepvep@abyayala> Date: Thu, 14 Dec 2017 15:02:51 +0100 In-Reply-To: <20171214115531.llwpyqjzjbwepvep@abyayala> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: ng0 Cc: 29703@debbugs.gnu.org This is a multi-part message in MIME format. --_----------=_15132601719404241 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" 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 --_----------=_15132601719404241 Content-Disposition: attachment; filename="0001-gnu-krita-Enhance-krita.patch" Content-Id: <1513260146.940297.d0bbf06d2c70de8341f0bb034f89333f536b9c00.6644CDCB@content.messagingengine.com> Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0001-gnu-krita-Enhance-krita.patch" RnJvbSAxNTg0OTdhN2JmMWI1NjcyMDE4MTg5MTAxZmE1NDQ4NjIzY2VjYjFi IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIE1leWVyIDxt YXJrQG9mb3Nvcy5vcmc+CkRhdGU6IFdlZCwgMTMgRGVjIDIwMTcgMjM6NDk6 MDkgKzAxMDAKU3ViamVjdDogW1BBVENIXSBnbnU6IGtyaXRhOiBFbmhhbmNl IGtyaXRhCgoqIGdudS9wYWNrYWdlcy9rZGUuc2NtIChraXJ0YSlbaW5wdXRz XTogQWRkIGxpYmpwZWctdHVyYm8gdG8gaW5wdXRzLgoqIGdudS9wYWNrYWdl cy9rZGUuc2NtIChrcml0YSlbaW5wdXRzXTogQWRkIHZjIHRvIG5hdGl2ZS1p bnB1dHMuCiogZ251L3BhY2thZ2VzL2tkZS5zY20gKGtyaXRhKVtpbnB1dHNd OiBBZGQgT3BlbkVYUiBzdXBwb3J0LgotLS0KIGdudS9wYWNrYWdlcy9rZGUu c2NtIHwgMTMgKysrKysrKysrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGlu c2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251 L3BhY2thZ2VzL2tkZS5zY20gYi9nbnUvcGFja2FnZXMva2RlLnNjbQppbmRl eCBiNWEzZGYyY2EuLjg5YWQzMGVjZCAxMDA2NDQKLS0tIGEvZ251L3BhY2th Z2VzL2tkZS5zY20KKysrIGIvZ251L3BhY2thZ2VzL2tkZS5zY20KQEAgLTI1 NiwxNCArMjU2LDE4IEBAIHBsdWdpbnMsIGFzIHdlbGwgYXMgY29kZSB0byBj cmVhdGUgcGx1Z2lucywgb3IgY29tcGxldGUgYXBwbGljYXRpb25zLiIpCiAg ICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgIi1EV0lUSF9MaWJSYXc9Igog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChhc3NvYy1yZWYgJWJ1aWxk LWlucHV0cyAibGlicmF3IikpCiAgICAgICAgICAgICAgKHN0cmluZy1hcHBl bmQgIi1EV0lUSF9USUZGPSIKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoYXNzb2MtcmVmICVidWlsZC1pbnB1dHMgImxpYnRpZmYiKSkpKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVmICVidWlsZC1p bnB1dHMgImxpYnRpZmYiKSkKKyAgICAgICAgICAgICAoc3RyaW5nLWFwcGVu ZCAiLURDTUFLRV9DWFhfRkxBR1M9LUkiCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKGFzc29jLXJlZiAlYnVpbGQtaW5wdXRzICJpbG1iYXNlIikK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL2luY2x1ZGUvT3BlbkVY UiIpKSkpCiAgICAgKG5hdGl2ZS1pbnB1dHMKICAgICAgYCgoImN1cmwiICxj dXJsKQogICAgICAgICgiZWlnZW4iICxlaWdlbikKICAgICAgICAoImV4dHJh LWNtYWtlLW1vZHVsZXMiICxleHRyYS1jbWFrZS1tb2R1bGVzKQogICAgICAg ICgiZ2V0dGV4dC1taW5pbWFsIiAsZ2V0dGV4dC1taW5pbWFsKQogICAgICAg ICgia2l0ZW1tb2RlbHMiICxraXRlbW1vZGVscykKLSAgICAgICAoInF3dCIg LHF3dCkpKQorICAgICAgICgicXd0IiAscXd0KQorICAgICAgICgidmMiICx2 YykpKQogICAgIChpbnB1dHMKICAgICAgYCgoInF0YmFzZSIgLHF0YmFzZSkK ICAgICAgICAoInF0ZGVjbGFyYXRpdmUiICxxdGRlY2xhcmF0aXZlKQpAQCAt Mjg3LDYgKzI5MSw3IEBAIHBsdWdpbnMsIGFzIHdlbGwgYXMgY29kZSB0byBj cmVhdGUgcGx1Z2lucywgb3IgY29tcGxldGUgYXBwbGljYXRpb25zLiIpCiAg ICAgICAgKCJleGl2MiIgLGV4aXYyKQogICAgICAgICgibGNtcyIgLGxjbXMp CiAgICAgICAgKCJsaWJwbmciICxsaWJwbmcpCisgICAgICAgKCJsaWJqcGVn LXR1cmJvIiAsbGlianBlZy10dXJibykKICAgICAgICAoInpsaWIiICx6bGli KQogICAgICAgICgibGlieDExIiAsbGlieDExKQogICAgICAgICgibGlieGNi IiAsbGlieGNiKQpAQCAtMjk2LDcgKzMwMSw5IEBAIHBsdWdpbnMsIGFzIHdl bGwgYXMgY29kZSB0byBjcmVhdGUgcGx1Z2lucywgb3IgY29tcGxldGUgYXBw bGljYXRpb25zLiIpCiAgICAgICAgKCJwb3BwbGVyLXF0NSIgLHBvcHBsZXIt cXQ1KQogICAgICAgICgibGlicmF3IiAsbGlicmF3KQogICAgICAgICgibGli dGlmZiIgLGxpYnRpZmYpCi0gICAgICAgKCJwZXJsIiAscGVybCkpKQorICAg ICAgICgicGVybCIgLHBlcmwpCisgICAgICAgKCJpbG1iYXNlIiAsaWxtYmFz ZSkKKyAgICAgICAoIm9wZW5leHIiICxvcGVuZXhyKSkpCiAgICAgKGhvbWUt cGFnZSAiaHR0cHM6Ly9rcml0YS5vcmciKQogICAgIChzeW5vcHNpcyAiRGln aXRhbCBwYWludGluZyBhcHBsaWNhdGlvbiIpCiAgICAgKGRlc2NyaXB0aW9u Ci0tIAoyLjE1LjAKCg== --_----------=_15132601719404241--