From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:56286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwnpe-0000DV-SC for guix-patches@gnu.org; Thu, 21 Feb 2019 07:52:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwnpc-0001FM-AF for guix-patches@gnu.org; Thu, 21 Feb 2019 07:52:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58245) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gwnpa-0001EN-77 for guix-patches@gnu.org; Thu, 21 Feb 2019 07:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gwnpZ-0008V6-TN for guix-patches@gnu.org; Thu, 21 Feb 2019 07:52:01 -0500 Subject: [bug#34572] Add Drawpile References: Resent-Message-ID: MIME-Version: 1.0 From: Date: Thu, 21 Feb 2019 12:51:36 +0000 (GMT) In-Reply-To: <878sya5g45.fsf@elephly.net> Content-Type: multipart/mixed; boundary="----------=_1550753496-21275-0" Message-Id: 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: Ricardo Wurmus Cc: 34572 <34572@debbugs.gnu.org> This is a multi-part message in MIME format... ------------=_1550753496-21275-0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Rekado, thanks for looking at this patch. I've updated it. > Please don=E2=80=99t use these inline module references. Sorry, I forgot to remove them (I'm moving my package definitions to Guix u= pstream which have the modules inline). > Please check the licenses more carefully. Will do. On Wed, 20 Feb 2019 22:01:30 +0100, Ricardo Wurmus wro= te: >=20 > Hi pkill9, >=20 > > * gnu/packages/graphics.scm (drawpile): New variable. >=20 > Thank you for your patch. >=20 > [=E2=80=A6] > > +(define-public drawpile > > + (package > > + (name "drawpile") > > + (version "2.0.11") > > + (source > > + (origin > > + (method url-fetch) > > + (uri (string-append "https://drawpile.net/files/src/drawpile-" = version ".tar.gz")) >=20 > Please break this line. >=20 > > + (sha256 > > + (base32 > > + "0h018rxhc0lwpqwmlihalz634nd0xaafk4p2b782djjd87irnjpk")))) > > + (build-system cmake-build-system) > > + (native-inputs > > + `(("pkg-config" ,pkg-config) > > + ("qttools" ,qttools))) > > + (inputs > > + `(("qtbase" ,qtbase) > > + ("qtsvg" ,qtsvg) > > + ("qtmultimedia" ,qtmultimedia) > > + ("qtcolorwidgets" ,qtcolorwidgets) > > + ("karchive" ,karchive) > > + ("giflib" ,giflib) ; optional > > + ("kdnssd" ,kdnssd) ; optional > > + ("miniupnpc" ,(@ (gnu packages upnp) miniupnpc)) ; optional > > + ("libmicrohttpd" ,(@ (gnu packages gnunet) libmicrohttpd)) ; op= tional > > + ("libsodium" ,(@ (gnu packages crypto) libsodium)))) ; optional >=20 > Please don=E2=80=99t use these inline module references. >=20 > > + (arguments > > + `(#:configure-flags (list "-DTESTS=3Don" "-DCMAKE_BUILD_TYPE=3DRe= lease" "-DTOOLS=3Don" > > + (string-append "-DLIBQTCOLORWIDGETS_LIB= RARY=3D" > > + (assoc-ref %build-inputs= "qtcolorwidgets") > > + "/lib/libQtColorWidgets-= Qt52.so")))) >=20 > Please put =E2=80=9C(list=E2=80=9D on a new line and then break after eve= ry item, so > that you can add comments as to why these flags are required. >=20 > I don=E2=80=99t think you need "-DCMAKE_BUILD_TYPE=3DRelease" as we=E2=80= =99re building > with =E2=80=9CRelWithDebInfo=E2=80=9D by default. >=20 > > + (home-page "https://drawpile.net") > > + (synopsis "Collaborative drawing") >=20 > =E2=80=9CCollaborative drawing program=E2=80=9D would be better. >=20 > > + (license license:gpl3))) >=20 > This looks like gpl3+. See for example: >=20 > https://github.com/drawpile/Drawpile/blob/master/src/server/initsys_s= ystemd.cpp#L9 >=20 > Please check the licenses more carefully. >=20 > Could you please send an updated patch? >=20 > --=20 > Ricardo ------------=_1550753496-21275-0 Content-Type: text/x-patch; name="=?UTF-8?Q?0001-gnu-Add-drawpile.patch?=" Content-Disposition: attachment; filename="=?UTF-8?Q?0001-gnu-Add-drawpile.patch?=" Content-Transfer-Encoding: base64 Content-ID: <02976c8a8ea60edb480a7784e29d4105> RnJvbSAzMDAzYzgyY2Y5N2UxMjllMTc3MDExZTM0YjVhMjA4Y2Y2YmJmMTg4 IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQa2lsbCAtOSA8cGtp bGw5QHJ1bmJveC5jb20+CkRhdGU6IFRodSwgMjEgRmViIDIwMTkgMTI6NDc6 MzcgKzAwMDAKU3ViamVjdDogW1BBVENIXSBnbnU6IEFkZCBkcmF3cGlsZS4K CiogZ251L3BhY2thZ2VzL2dyYXBoaWNzLnNjbSAoZHJhd3BpbGUpOiBOZXcg dmFyaWFibGUuCi0tLQogZ251L3BhY2thZ2VzL2dyYXBoaWNzLnNjbSB8IDQ1 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBm aWxlIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9n bnUvcGFja2FnZXMvZ3JhcGhpY3Muc2NtIGIvZ251L3BhY2thZ2VzL2dyYXBo aWNzLnNjbQppbmRleCBiZjRjYzg5YjAuLjA3ZjgwMWVmMCAxMDA2NDQKLS0t IGEvZ251L3BhY2thZ2VzL2dyYXBoaWNzLnNjbQorKysgYi9nbnUvcGFja2Fn ZXMvZ3JhcGhpY3Muc2NtCkBAIC0xMSw2ICsxMSw3IEBACiA7OzsgQ29weXJp Z2h0IMKpIDIwMTggTWF0aGlldSBPdGhhY2VoZSA8bS5vdGhhY2VoZUBnbWFp bC5jb20+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMTggQWxleCBLb3N0IDxhbGV6 b3N0QGdtYWlsLmNvbT4KIDs7OyBDb3B5cmlnaHQgwqkgMjAxOCBLZWkgS2Vi cmVhdSA8a2tlYnJlYXVAcG9zdGVvLm5ldD4KKzs7OyBDb3B5cmlnaHQgwqkg MjAxOSBQa2lsbCAtOSA8cGtpbGw5QHJ1bmJveC5jb20+CiA7OzsKIDs7OyBU aGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3VpeC4KIDs7OwpAQCAtMzcsNiAr MzgsNyBAQAogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBib29zdCkK ICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgY2hlY2spCiAgICM6dXNl LW1vZHVsZSAoZ251IHBhY2thZ2VzIGNvbXByZXNzaW9uKQorICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBjcnlwdG8pIDsgbGlic29kaXVtCiAgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGRvY3VtZW50YXRpb24pCiAgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGZsZXgpCiAgICM6dXNlLW1vZHVs ZSAoZ251IHBhY2thZ2VzIGZvbnRzKQpAQCAtNDUsMTIgKzQ3LDE0IEBACiAg ICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdsKQogICAjOnVzZS1tb2R1 bGUgKGdudSBwYWNrYWdlcyBnbGliKQogICAjOnVzZS1tb2R1bGUgKGdudSBw YWNrYWdlcyBnbm9tZSkKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg Z251bmV0KSA7IGxpYm1pY3JvaHR0cGQKICAgIzp1c2UtbW9kdWxlIChnbnUg cGFja2FnZXMgZ3JhcGh2aXopCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIGd0aykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgaGFza2Vs bCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgaW1hZ2UpCiAgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGltYWdlbWFnaWNrKQogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBqZW1hbGxvYykKKyAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMga2RlLWZyYW1ld29ya3MpCiAgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIG11bHRpcHJlY2lzaW9uKQogICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBwZGYpCiAgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIHBlcmwpCkBAIC02NCw2ICs2OCw3IEBACiAgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIHJlYWRsaW5lKQogICAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcyBzZGwpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIHN3aWcpCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHVwbnAp CiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHZpZGVvKQogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB4bWwpCiAgICM6dXNlLW1vZHVsZSAo Z251IHBhY2thZ2VzIHhvcmcpCkBAIC04NTYsMyArODYxLDQzIEBAIHlvdXIg dGVybWluYWwuICBJdCBjb21lcyBidW5kbGVkIHdpdGggcHJlZGVmaW5lZCBz dHlsZXM6CiBsb29rLiAgVGhlIHJlc3VsdCBjYW4gYmUgdXBsb2FkZWQgb24g YW55IHdlYiBzZXJ2ZXIgd2l0aG91dCBhZGRpdGlvbmFsCiByZXF1aXJlbWVu dHMuIikKICAgICAobGljZW5zZSBsaWNlbnNlOmdwbDIrKSkpCisKKyhkZWZp bmUtcHVibGljIGRyYXdwaWxlCisgIChwYWNrYWdlCisgICAgKG5hbWUgImRy YXdwaWxlIikKKyAgICAodmVyc2lvbiAiMi4wLjExIikKKyAgICAoc291cmNl CisgICAgIChvcmlnaW4KKyAgICAgICAobWV0aG9kIHVybC1mZXRjaCkKKyAg ICAgICAodXJpIChzdHJpbmctYXBwZW5kICJodHRwczovL2RyYXdwaWxlLm5l dC9maWxlcy9zcmMvIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgImRy YXdwaWxlLSIgdmVyc2lvbiAiLnRhci5neiIpKQorICAgICAgIChzaGEyNTYK KyAgICAgICAgKGJhc2UzMgorICAgICAgICAgIjBoMDE4cnhoYzBsd3Bxd21s aWhhbHo2MzRuZDB4YWFmazRwMmI3ODJkampkODdpcm5qcGsiKSkpKQorICAg IChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQorICAgIChuYXRp dmUtaW5wdXRzCisgICAgIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykK KyAgICAgICAoInF0dG9vbHMiICxxdHRvb2xzKSkpCisgICAgKGlucHV0cwor ICAgICBgKCgicXRiYXNlIiAscXRiYXNlKQorICAgICAgICgicXRzdmciICxx dHN2ZykKKyAgICAgICAoInF0bXVsdGltZWRpYSIgLHF0bXVsdGltZWRpYSkK KyAgICAgICAoInF0Y29sb3J3aWRnZXRzIiAscXRjb2xvcndpZGdldHMpCisg ICAgICAgKCJrYXJjaGl2ZSIgLGthcmNoaXZlKQorICAgICAgICgiZ2lmbGli IiAsZ2lmbGliKSA7IG9wdGlvbmFsCisgICAgICAgKCJrZG5zc2QiICxrZG5z c2QpIDsgb3B0aW9uYWwKKyAgICAgICAoIm1pbml1cG5wYyIgLG1pbml1cG5w YykgOyBvcHRpb25hbAorICAgICAgICgibGlibWljcm9odHRwZCIgLGxpYm1p Y3JvaHR0cGQpIDsgb3B0aW9uYWwKKyAgICAgICAoImxpYnNvZGl1bSIgLGxp YnNvZGl1bSkpKSA7IG9wdGlvbmFsCisgICAgKGFyZ3VtZW50cworICAgICBg KCM6Y29uZmlndXJlLWZsYWdzCisgICAgICAgKGxpc3QgIi1EVEVTVFM9b24i IDsgYnVpbGQgdW5pdCB0ZXN0cy4KKyAgICAgICAgICAgICAiLURUT09MUz1v biIgOyBidWlsZCBkcHJlYzJ0eHQgY29tbWFuZCBsaW5lIHRvb2wuCisgICAg ICAgICAgICAgKHN0cmluZy1hcHBlbmQgIi1ETElCUVRDT0xPUldJREdFVFNf TElCUkFSWT0iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFzc29j LXJlZiAlYnVpbGQtaW5wdXRzICJxdGNvbG9yd2lkZ2V0cyIpCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIi9saWIvbGliUXRDb2xvcldpZGdldHMt UXQ1Mi5zbyIpKSkpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9kcmF3cGls ZS5uZXQiKQorICAgIChzeW5vcHNpcyAiQ29sbGFib3JhdGl2ZSBkcmF3aW5n IHByb2dyYW0iKQorICAgIChkZXNjcmlwdGlvbiAiRHJhd3BpbGUgaXMgYSBj b2xsYWJvcmF0aXZlIGRyYXdpbmcgcHJvZ3JhbSB0aGF0IGFsbG93cworbXVs dGlwbGUgdXNlcnMgdG8gc2tldGNoIG9uIHRoZSBzYW1lIGNhbnZhcyBzaW11 bHRhbmVvdXNseS4iKQorICAgIChsaWNlbnNlIGxpY2Vuc2U6Z3BsMyspKSkK LS0gCjIuMjAuMQoK ------------=_1550753496-21275-0--