From patchwork Thu Feb 21 12:51:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pkill9 X-Patchwork-Id: 1212 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 55D8D16C96; Thu, 21 Feb 2019 12:52:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B939A16C01 for ; Thu, 21 Feb 2019 12:52:20 +0000 (GMT) Received: from localhost ([127.0.0.1]:59632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwnpq-0000G5-N4 for patchwork@mira.cbaines.net; Thu, 21 Feb 2019 07:52:20 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#34572] Add Drawpile References: Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Feb 2019 12:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: "Ricardo Wurmus" Received: via spool by 34572-submit@debbugs.gnu.org id=B34572.155075350432650 (code B ref 34572); Thu, 21 Feb 2019 12:52:01 +0000 Received: (at 34572) by debbugs.gnu.org; 21 Feb 2019 12:51:44 +0000 Received: from localhost ([127.0.0.1]:59011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gwnpH-0008UY-Dg for submit@debbugs.gnu.org; Thu, 21 Feb 2019 07:51:43 -0500 Received: from aibo.runbox.com ([91.220.196.211]:39620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gwnpD-0008UM-Hy for 34572@debbugs.gnu.org; Thu, 21 Feb 2019 07:51:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=rbselector1; h=Message-Id:Content-Type:In-Reply-To:Date:Subject:CC:To:From :MIME-Version; bh=ZB/jPU5bKfhR+I0eksrV40WG1EvSS3XDsz2n3H1MMgM=; b=KAbRcjdg0d7 +m8EpNek/Rf9qIX4lOcdNXunB0nnNMH79UiuqUbHFoeY7CdNj4BriYe7avlM9QctzU1ogA9ak2cW0 R35a5qUsj6y9vi9kiXVgcdEOYCQxuTz/WGx5gTh1ImwlLAACeoo4I0HM251nTltKeq+/jFxcZ5MPZ UHRZ71TW+MpA27uADsYdZSEIlEQIP3qs/88A9+mSgeG/0Y7KwP5fGfGlPerbexer0ZVr25CJ2OTwY Cq3gGBEWYAWw9ZLS+0WEgz0usa6Fw6QrQSqzGJlKOnrwOwJJ4iU5QD3amxOYqRsYniopk9qQJAfWQ lBf/7Glnz8+SnV73FHGtfVw==; Received: from [10.9.9.127] (helo=rmmprod05.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1gwnpA-0006lf-Ny; Thu, 21 Feb 2019 13:51:36 +0100 Received: from mail by rmmprod05.runbox with local (Exim 4.86_2) (envelope-from ) id 1gwnpA-0005aL-Mm; Thu, 21 Feb 2019 13:51:36 +0100 MIME-Version: 1.0 Received: from [Authenticated user (850733)] by runbox.com with http (RMM6); Thu, 21 Feb 2019 12:51:36 GMT From: Date: Thu, 21 Feb 2019 12:51:36 +0000 (GMT) X-Mailer: RMM6 In-Reply-To: <878sya5g45.fsf@elephly.net> Message-Id: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 34572 <34572@debbugs.gnu.org> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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 From 3003c82cf97e129e177011e34b5a208cf6bbf188 Mon Sep 17 00:00:00 2001 From: Pkill -9 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 ;;; Copyright © 2018 Alex Kost ;;; Copyright © 2018 Kei Kebreau +;;; Copyright © 2019 Pkill -9 ;;; ;;; 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