From: <pkill9@runbox.com>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: 34572 <34572@debbugs.gnu.org>
Subject: [bug#34572] Add Drawpile
Date: Thu, 21 Feb 2019 12:51:36 +0000 (GMT) [thread overview]
Message-ID: <E1gwnpA-0005aL-Mm@rmmprod05.runbox> (raw)
In-Reply-To: <878sya5g45.fsf@elephly.net>
[-- Attachment #1: Type: text/plain, Size: 2768 bytes --]
Hi Rekado, thanks for looking at this patch. I've updated it.
> Please don’t use these inline module references.
Sorry, I forgot to remove them (I'm moving my package definitions to Guix upstream which have the modules inline).
> Please check the licenses more carefully.
Will do.
On Wed, 20 Feb 2019 22:01:30 +0100, Ricardo Wurmus <rekado@elephly.net> wrote:
>
> Hi pkill9,
>
> > * gnu/packages/graphics.scm (drawpile): New variable.
>
> Thank you for your patch.
>
> […]
> > +(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"))
>
> Please break this line.
>
> > + (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)) ; optional
> > + ("libsodium" ,(@ (gnu packages crypto) libsodium)))) ; optional
>
> Please don’t use these inline module references.
>
> > + (arguments
> > + `(#:configure-flags (list "-DTESTS=on" "-DCMAKE_BUILD_TYPE=Release" "-DTOOLS=on"
> > + (string-append "-DLIBQTCOLORWIDGETS_LIBRARY="
> > + (assoc-ref %build-inputs "qtcolorwidgets")
> > + "/lib/libQtColorWidgets-Qt52.so"))))
>
> Please put “(list” on a new line and then break after every item, so
> that you can add comments as to why these flags are required.
>
> I don’t think you need "-DCMAKE_BUILD_TYPE=Release" as we’re building
> with “RelWithDebInfo” by default.
>
> > + (home-page "https://drawpile.net")
> > + (synopsis "Collaborative drawing")
>
> “Collaborative drawing program” would be better.
>
> > + (license license:gpl3)))
>
> This looks like gpl3+. See for example:
>
> https://github.com/drawpile/Drawpile/blob/master/src/server/initsys_systemd.cpp#L9
>
> Please check the licenses more carefully.
>
> Could you please send an updated patch?
>
> --
> Ricardo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-drawpile.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-drawpile.patch", Size: 3657 bytes --]
From 3003c82cf97e129e177011e34b5a208cf6bbf188 Mon Sep 17 00:00:00 2001
From: Pkill -9 <pkill9@runbox.com>
Date: Thu, 21 Feb 2019 12:47:37 +0000
Subject: [PATCH] gnu: Add drawpile.
* gnu/packages/graphics.scm (drawpile): New variable.
---
gnu/packages/graphics.scm | 45 +++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index bf4cc89b0..07f801ef0 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018 Alex Kost <alezost@gmail.com>
;;; Copyright © 2018 Kei Kebreau <kkebreau@posteo.net>
+;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -37,6 +38,7 @@
#:use-module (gnu packages boost)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto) ; libsodium
#:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
#:use-module (gnu packages fonts)
@@ -45,12 +47,14 @@
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages gnunet) ; libmicrohttpd
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
#:use-module (gnu packages haskell)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages jemalloc)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
@@ -64,6 +68,7 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages sdl)
#:use-module (gnu packages swig)
+ #:use-module (gnu packages upnp)
#:use-module (gnu packages video)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
@@ -856,3 +861,43 @@ your terminal. It comes bundled with predefined styles:
look. The result can be uploaded on any web server without additional
requirements.")
(license license:gpl2+)))
+
+(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"))
+ (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" ,miniupnpc) ; optional
+ ("libmicrohttpd" ,libmicrohttpd) ; optional
+ ("libsodium" ,libsodium))) ; optional
+ (arguments
+ `(#:configure-flags
+ (list "-DTESTS=on" ; build unit tests.
+ "-DTOOLS=on" ; build dprec2txt command line tool.
+ (string-append "-DLIBQTCOLORWIDGETS_LIBRARY="
+ (assoc-ref %build-inputs "qtcolorwidgets")
+ "/lib/libQtColorWidgets-Qt52.so"))))
+ (home-page "https://drawpile.net")
+ (synopsis "Collaborative drawing program")
+ (description "Drawpile is a collaborative drawing program that allows
+multiple users to sketch on the same canvas simultaneously.")
+ (license license:gpl3+)))
--
2.20.1
next prev parent reply other threads:[~2019-02-21 12:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-19 11:59 [bug#34572] Add Drawpile pkill9
2019-02-20 21:01 ` Ricardo Wurmus
2019-02-21 12:51 ` pkill9 [this message]
2019-02-21 13:58 ` Tobias Geerinckx-Rice
2019-02-22 7:28 ` pkill9
2021-08-06 4:20 ` bug#34572: " Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1gwnpA-0005aL-Mm@rmmprod05.runbox \
--to=pkill9@runbox.com \
--cc=34572@debbugs.gnu.org \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).