From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wD92At/aLV+nBwAA0tVLHw (envelope-from ) for ; Fri, 07 Aug 2020 22:51:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id OHv+Od7aLV9eAwAAB5/wlQ (envelope-from ) for ; Fri, 07 Aug 2020 22:51:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 003FB9404D9 for ; Fri, 7 Aug 2020 22:51:09 +0000 (UTC) Received: from localhost ([::1]:50026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k4BCd-0006QK-DT for larch@yhetil.org; Fri, 07 Aug 2020 18:51:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k4BCY-0006Q5-Jo for guix-patches@gnu.org; Fri, 07 Aug 2020 18:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k4BCY-0002PZ-AM for guix-patches@gnu.org; Fri, 07 Aug 2020 18:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k4BCY-0001t5-6b for guix-patches@gnu.org; Fri, 07 Aug 2020 18:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42725] [PATCH] drawpile package (sans upnp) Resent-From: raingloom Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 Aug 2020 22:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42725 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42725@debbugs.gnu.org Received: via spool by 42725-submit@debbugs.gnu.org id=B42725.15968406297218 (code B ref 42725); Fri, 07 Aug 2020 22:51:02 +0000 Received: (at 42725) by debbugs.gnu.org; 7 Aug 2020 22:50:29 +0000 Received: from localhost ([127.0.0.1]:57715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k4BC1-0001sM-Dx for submit@debbugs.gnu.org; Fri, 07 Aug 2020 18:50:29 -0400 Received: from mx1.riseup.net ([198.252.153.129]:43358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k4BBz-0001sE-9y for 42725@debbugs.gnu.org; Fri, 07 Aug 2020 18:50:28 -0400 Received: from bell.riseup.net (bell-pn.riseup.net [10.0.1.178]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4BNgYL1cJQzFgRZ for <42725@debbugs.gnu.org>; Fri, 7 Aug 2020 15:50:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1596840626; bh=LzCBJt+zpR+tF2Rmr5SUP25z9em1DY8oGDhhpo4/lg8=; h=Date:From:To:Subject:In-Reply-To:References:From; b=XYoQy6zxWpuurpNRt2iCXhVv6goMy9+z6SmObJlVVgebHiLJfH1x30CVS7iLyOKFW ZuxYShLlBlV9VW4BxpCdyyItCvcR28rTlDgPIAz938jELwnJ5Cs4Rx73RghWJSsKxQ Z7vcE8ISoeuKKkQtWHkZlGGzab7Jv/7NNNInaL4g= X-Riseup-User-ID: 8A5A6DCC16B4866BFB44B88070B94CD2F358EEA977A98E9470258D04B6B6781C Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 4BNgYK3TRvzJmmc for <42725@debbugs.gnu.org>; Fri, 7 Aug 2020 15:50:13 -0700 (PDT) Date: Sat, 8 Aug 2020 00:50:08 +0200 From: raingloom Message-ID: <20200808005008.5858e921@riseup.net> In-Reply-To: <87r1sionw1.fsf@gnu.org> References: <20200806002933.1e1996bb@riseup.net> <87r1sionw1.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/06HJAKwEkpt6aNLTG=ZWXLs" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=riseup.net header.s=squak header.b=XYoQy6zx; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: 4qJD/dBh3JSP --MP_/06HJAKwEkpt6aNLTG=ZWXLs Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Fri, 07 Aug 2020 10:34:22 +0200 Mathieu Othacehe wrote: > Hello, > > > + (method url-fetch) > > + (uri (string-append > > "https://github.com/drawpile/Drawpile/archive/" > > + version > > + ".tar.gz")) > > We prefer not to use those github archives that can be re-generated > and prefer to use "git-fetch" method instead. Done! > > + (sha256 > > + (base32 > > + "0brscm95nay31xa1c02n1w144gg9hm8pxwa9sfnis0x5dj2nkrb7")))) > > + (build-system qt-build-system) > > + (arguments '(#:tests? #f)) > > You should explain why tests are not run with a comment. It didn't generate a "test" target, but I figured out how to enable it. Now it runs them! Also enabled some more functionality that could be useful. > > + (native-inputs > > + `(("extra-cmake-modules" ,extra-cmake-modules))) > > + (inputs > > + `(("giflib" ,giflib) > > + ("karchive" ,karchive) > > + ("kdnssd" ,kdnssd) > > + ("libmicrohttpd" ,libmicrohttpd) > > + ("libsodium" ,libsodium) > > + ("libvpx" ,libvpx) > > + ;("miniupnpc" ,miniupnpc) ;; TODO segfaults for some reason > > > > No need to comment twice. Makes it easier to enable the dependency and still keep the TODO note without causing a syntax error. > > + ("qtbase" ,qtbase) > > + ("qtkeychain" ,qtkeychain) > > + ("qtmultimedia" ,qtmultimedia) > > + ("qtsvg" ,qtsvg))) > > + (home-page "https://drawpile.net") > > + (synopsis "Collaborative drawing program") > > + (description > > +"Drawpile is a drawing program that lets you share the canvas with > > other users +in real time. > > + > > +Some feature highlights: > > +Runs on Linux, Windows and OSX > > No need to talk about those operating systems I think. Done. > > +Shared canvas using the built-in server or a dedicated server > > +Record, play back and export drawing sessions > > +Simple animation support > > +Layers and blending modes > > +Text layers > > +Supports pressure sensitive Wacom tablets > > +Built-in chat > > +Supports OpenRaster file format > > +Encrypted connections using SSL > > +Automatic port forwarding with UPnP") > > You could use texinfo to render this list nicely. See "libmemcached" > package for an example. > > Could you send an updated patch? > > Thanks, > > Mathieu Thanks for the quick response! Here it is :D --MP_/06HJAKwEkpt6aNLTG=ZWXLs Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-Added-drawpile-UPnP-support-pending-at-version-2.patch >From 0b0751f31bca2b8861e6ef43e9c5f0fbad43fca7 Mon Sep 17 00:00:00 2001 From: your friendly localhost admin Date: Thu, 6 Aug 2020 00:23:34 +0200 Subject: [PATCH] gnu: Added drawpile (UPnP support pending) at version 2.1.17 * gnu/packages/graphics.scm (drawpile): New variable. --- gnu/packages/graphics.scm | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index cdb13c2619..be66bed479 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages datastructures) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) @@ -59,12 +60,14 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gnunet) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-xyz) #: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 maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pdf) @@ -81,12 +84,14 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages swig) #:use-module (gnu packages tbb) + #:use-module (gnu packages upnp) #:use-module (gnu packages video) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix hg-download) @@ -1431,3 +1436,57 @@ and PC Engine formats") the graphics formats of the SNES, Game Boy Color and PC Engine game consoles. Automated palette selection is supported.") (license license:expat))) + +(define-public drawpile + (package + (name "drawpile") + (version "2.1.17") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/drawpile/Drawpile/archive/" + version + ".tar.gz")) + (sha256 + (base32 + "0brscm95nay31xa1c02n1w144gg9hm8pxwa9sfnis0x5dj2nkrb7")))) + (build-system qt-build-system) + (arguments + '(#:configure-flags (list "-DTESTS=ON" "-DTOOLS=ON" "-DKIS_TABLET=ON"))) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("giflib" ,giflib) + ("karchive" ,karchive) + ("kdnssd" ,kdnssd) + ("libmicrohttpd" ,libmicrohttpd) + ("libsodium" ,libsodium) + ("libvpx" ,libvpx) + ("libxi" ,libxi) + ;("miniupnpc" ,miniupnpc) ;; TODO segfaults for some reason + ("qtbase" ,qtbase) + ("qtkeychain" ,qtkeychain) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras))) + (home-page "https://drawpile.net") + (synopsis "Collaborative drawing program") + (description +"Drawpile is a drawing program that lets you share the canvas with other users +in real time. + +Some feature highlights: +@itemize +@item Shared canvas using the built-in server or a dedicated server +@item Record, play back and export drawing sessions +@item Simple animation support +@item Layers and blending modes +@item Text layers +@item Supports pressure sensitive Wacom tablets +@item Built-in chat +@item Supports OpenRaster file format +@item Encrypted connections using SSL +@item Automatic port forwarding with UPnP +@end itemize") + (license license:gpl3+))) -- 2.28.0 --MP_/06HJAKwEkpt6aNLTG=ZWXLs--