From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:53631) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx5RT-0002xZ-4x for guix-patches@gnu.org; Fri, 22 Feb 2019 02:40:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gx5GY-00082X-Lf for guix-patches@gnu.org; Fri, 22 Feb 2019 02:29:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34001) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gx5GY-00080L-31 for guix-patches@gnu.org; Fri, 22 Feb 2019 02:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gx5GX-0001py-LE for guix-patches@gnu.org; Fri, 22 Feb 2019 02:29:01 -0500 Subject: [bug#34572] Add Drawpile References: Resent-Message-ID: MIME-Version: 1.0 From: Date: Fri, 22 Feb 2019 07:28:24 +0000 (GMT) In-Reply-To: <87va1dutti.fsf@nckx> Content-Type: multipart/mixed; boundary="----------=_1550820504-23349-25" 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: Tobias Geerinckx-Rice Cc: 34572 <34572@debbugs.gnu.org> This is a multi-part message in MIME format... ------------=_1550820504-23349-25 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks Tobias, I removed those inline comments and removed the full stops a= fter the other inline comments. Haven't changed the qtcolorwidgets library config flag for now, I think dra= wpile upstream needs to improve the code that looks for qtcolorwidgets (htt= ps://github.com/drawpile/Drawpile/blob/master/config/FindQtColorWidgets.cma= ke) but I don't know how. Hardcoding the path isn't ideal but I'll leave it= for now. On Thu, 21 Feb 2019 14:58:33 +0100, Tobias Geerinckx-Rice wr= ote: > Pkill -9, >=20 > Thanks for this patch, and your many others. >=20 > pkill9 wrote: > > + #:use-module (gnu packages crypto) ; libsodium > > + #:use-module (gnu packages gnunet) ; libmicrohttpd >=20 > In my experience, what little value such comments add is quickly=20 > lost. Anyone adding new inputs will not update (or even notice)=20 > them. >=20 > > + ("giflib" ,giflib) ; optional > > + ("kdnssd" ,kdnssd) ; optional > > + ("miniupnpc" ,miniupnpc) ; optional > > + ("libmicrohttpd" ,libmicrohttpd) ; optional > > + ("libsodium" ,libsodium))) ; optional >=20 > Same here: nothing wrong with these, I guess, but *many* package=20 > dependencies are optionally detected at build time and this isn't=20 > usually pointed out unless there's something more interesting=20 > going on. >=20 > > + (arguments > > + `(#:configure-flags > > + (list "-DTESTS=3Don" ; build unit tests. >=20 > General remark: no full stop after inline comments. >=20 > ;; Foo bar. > (foo bar) ; foo bar >=20 > > + "-DTOOLS=3Don" ; build dprec2txt command line tool. > > + (string-append "-DLIBQTCOLORWIDGETS_LIBRARY=3D" > > + (assoc-ref %build-inputs=20 > > "qtcolorwidgets") > > +=20 > > "/lib/libQtColorWidgets-Qt52.so")))) >=20 > What about using FIND-FILES "\*.so$" here instead of hard-coding=20 > "52"? Overkill? >=20 > Kind regards, >=20 > T G-R ------------=_1550820504-23349-25 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: <128d120f5c5027eeda250744bc1d6279> RnJvbSA5MTY5NjhlNWY0MTllMzM5YWFjZDNiOTFkOWUxNWEzOWFlODdmOWRi IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQa2lsbCAtOSA8cGtp bGw5QHJ1bmJveC5jb20+CkRhdGU6IEZyaSwgMjIgRmViIDIwMTkgMDc6MjM6 MzkgKzAwMDAKU3ViamVjdDogW1BBVENIXSBnbnU6IEFkZCBkcmF3cGlsZS4K CiogZ251L3BhY2thZ2VzL2dyYXBoaWNzLnNjbSAoZHJhd3BpbGUpOiBOZXcg dmFyaWFibGUuCi0tLQogZ251L3BhY2thZ2VzL2dyYXBoaWNzLnNjbSB8IDQ1 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBm aWxlIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9n bnUvcGFja2FnZXMvZ3JhcGhpY3Muc2NtIGIvZ251L3BhY2thZ2VzL2dyYXBo aWNzLnNjbQppbmRleCBiZjRjYzg5YjAuLmFlMzA2MDdjYiAxMDA2NDQKLS0t IGEvZ251L3BhY2thZ2VzL2dyYXBoaWNzLnNjbQorKysgYi9nbnUvcGFja2Fn ZXMvZ3JhcGhpY3Muc2NtCkBAIC0xMSw2ICsxMSw3IEBACiA7OzsgQ29weXJp Z2h0IMKpIDIwMTggTWF0aGlldSBPdGhhY2VoZSA8bS5vdGhhY2VoZUBnbWFp bC5jb20+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMTggQWxleCBLb3N0IDxhbGV6 b3N0QGdtYWlsLmNvbT4KIDs7OyBDb3B5cmlnaHQgwqkgMjAxOCBLZWkgS2Vi cmVhdSA8a2tlYnJlYXVAcG9zdGVvLm5ldD4KKzs7OyBDb3B5cmlnaHQgwqkg MjAxOSBQa2lsbCAtOSA8cGtpbGw5QHJ1bmJveC5jb20+CiA7OzsKIDs7OyBU aGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgR3VpeC4KIDs7OwpAQCAtMzcsNiAr MzgsNyBAQAogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBib29zdCkK ICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgY2hlY2spCiAgICM6dXNl LW1vZHVsZSAoZ251IHBhY2thZ2VzIGNvbXByZXNzaW9uKQorICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBjcnlwdG8pCiAgICM6dXNlLW1vZHVsZSAo Z251IHBhY2thZ2VzIGRvY3VtZW50YXRpb24pCiAgICM6dXNlLW1vZHVsZSAo Z251IHBhY2thZ2VzIGZsZXgpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIGZvbnRzKQpAQCAtNDUsMTIgKzQ3LDE0IEBACiAgICM6dXNlLW1vZHVs ZSAoZ251IHBhY2thZ2VzIGdsKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBnbGliKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBnbm9t ZSkKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ251bmV0KQogICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBncmFwaHZpeikKICAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgZ3RrKQogICAjOnVzZS1tb2R1bGUgKGdu dSBwYWNrYWdlcyBoYXNrZWxsKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBpbWFnZSkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgaW1h Z2VtYWdpY2spCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGplbWFs bG9jKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBrZGUtZnJhbWV3 b3JrcykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbXVsdGlwcmVj aXNpb24pCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHBkZikKICAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcGVybCkKQEAgLTY0LDYgKzY4 LDcgQEAKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcmVhZGxpbmUp CiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHNkbCkKICAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgc3dpZykKKyAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgdXBucCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2Fn ZXMgdmlkZW8pCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHhtbCkK ICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgeG9yZykKQEAgLTg1Niwz ICs4NjEsNDMgQEAgeW91ciB0ZXJtaW5hbC4gIEl0IGNvbWVzIGJ1bmRsZWQg d2l0aCBwcmVkZWZpbmVkIHN0eWxlczoKIGxvb2suICBUaGUgcmVzdWx0IGNh biBiZSB1cGxvYWRlZCBvbiBhbnkgd2ViIHNlcnZlciB3aXRob3V0IGFkZGl0 aW9uYWwKIHJlcXVpcmVtZW50cy4iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6 Z3BsMispKSkKKworKGRlZmluZS1wdWJsaWMgZHJhd3BpbGUKKyAgKHBhY2th Z2UKKyAgICAobmFtZSAiZHJhd3BpbGUiKQorICAgICh2ZXJzaW9uICIyLjAu MTEiKQorICAgIChzb3VyY2UKKyAgICAgKG9yaWdpbgorICAgICAgIChtZXRo b2QgdXJsLWZldGNoKQorICAgICAgICh1cmkgKHN0cmluZy1hcHBlbmQgImh0 dHBzOi8vZHJhd3BpbGUubmV0L2ZpbGVzL3NyYy8iCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAiZHJhd3BpbGUtIiB2ZXJzaW9uICIudGFyLmd6Iikp CisgICAgICAgKHNoYTI1NgorICAgICAgICAoYmFzZTMyCisgICAgICAgICAi MGgwMThyeGhjMGx3cHF3bWxpaGFsejYzNG5kMHhhYWZrNHAyYjc4MmRqamQ4 N2lybmpwayIpKSkpCisgICAgKGJ1aWxkLXN5c3RlbSBjbWFrZS1idWlsZC1z eXN0ZW0pCisgICAgKG5hdGl2ZS1pbnB1dHMKKyAgICAgYCgoInBrZy1jb25m aWciICxwa2ctY29uZmlnKQorICAgICAgICgicXR0b29scyIgLHF0dG9vbHMp KSkKKyAgICAoaW5wdXRzCisgICAgIGAoKCJxdGJhc2UiICxxdGJhc2UpCisg ICAgICAgKCJxdHN2ZyIgLHF0c3ZnKQorICAgICAgICgicXRtdWx0aW1lZGlh IiAscXRtdWx0aW1lZGlhKQorICAgICAgICgicXRjb2xvcndpZGdldHMiICxx dGNvbG9yd2lkZ2V0cykKKyAgICAgICAoImthcmNoaXZlIiAsa2FyY2hpdmUp CisgICAgICAgKCJnaWZsaWIiICxnaWZsaWIpCisgICAgICAgKCJrZG5zc2Qi ICxrZG5zc2QpCisgICAgICAgKCJtaW5pdXBucGMiICxtaW5pdXBucGMpCisg ICAgICAgKCJsaWJtaWNyb2h0dHBkIiAsbGlibWljcm9odHRwZCkKKyAgICAg ICAoImxpYnNvZGl1bSIgLGxpYnNvZGl1bSkpKQorICAgIChhcmd1bWVudHMK KyAgICAgYCgjOmNvbmZpZ3VyZS1mbGFncworICAgICAgIChsaXN0ICItRFRF U1RTPW9uIiA7IGJ1aWxkIHVuaXQgdGVzdHMKKyAgICAgICAgICAgICAiLURU T09MUz1vbiIgOyBidWlsZCBkcHJlYzJ0eHQgY29tbWFuZCBsaW5lIHRvb2wK KyAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAiLURMSUJRVENPTE9SV0lE R0VUU19MSUJSQVJZPSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAo YXNzb2MtcmVmICVidWlsZC1pbnB1dHMgInF0Y29sb3J3aWRnZXRzIikKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiL2xpYi9saWJRdENvbG9yV2lk Z2V0cy1RdDUyLnNvIikpKSkKKyAgICAoaG9tZS1wYWdlICJodHRwczovL2Ry YXdwaWxlLm5ldCIpCisgICAgKHN5bm9wc2lzICJDb2xsYWJvcmF0aXZlIGRy YXdpbmcgcHJvZ3JhbSIpCisgICAgKGRlc2NyaXB0aW9uICJEcmF3cGlsZSBp cyBhIGNvbGxhYm9yYXRpdmUgZHJhd2luZyBwcm9ncmFtIHRoYXQgYWxsb3dz CittdWx0aXBsZSB1c2VycyB0byBza2V0Y2ggb24gdGhlIHNhbWUgY2FudmFz IHNpbXVsdGFuZW91c2x5LiIpCisgICAgKGxpY2Vuc2UgbGljZW5zZTpncGwz KykpKQotLSAKMi4yMC4xCgo= ------------=_1550820504-23349-25--