From patchwork Fri Feb 22 07:28:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pkill9 X-Patchwork-Id: 1215 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 258CE16C9C; Fri, 22 Feb 2019 07:42:19 +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 7D14816C20 for ; Fri, 22 Feb 2019 07:42:18 +0000 (GMT) Received: from localhost ([127.0.0.1]:45763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gx5TN-0004PV-RL for patchwork@mira.cbaines.net; Fri, 22 Feb 2019 02:42:17 -0500 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 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: Fri, 22 Feb 2019 07:29: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: "Tobias Geerinckx-Rice" Received: via spool by 34572-submit@debbugs.gnu.org id=B34572.15508205117026 (code B ref 34572); Fri, 22 Feb 2019 07:29:01 +0000 Received: (at 34572) by debbugs.gnu.org; 22 Feb 2019 07:28:31 +0000 Received: from localhost ([127.0.0.1]:47545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gx5G2-0001pE-4V for submit@debbugs.gnu.org; Fri, 22 Feb 2019 02:28:31 -0500 Received: from aibo.runbox.com ([91.220.196.211]:57786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gx5Fz-0001p3-Kr for 34572@debbugs.gnu.org; Fri, 22 Feb 2019 02:28:29 -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=w20j+ysvJK7E/FN7qPq5zqroBA8z1QNdJB84yM1U0N0=; b=X6HphUZoGcq TUTEnBQ7YhcMZ2S49cNXr69ebtgWYEtxmhVcZX4ULgo4ORXM5aUAyhBqg6ybTH66f0f+o+nrxY3eU pZjwIEzB+I68hEYmpITaFy8L5x2XNIxi36Su07BzdlmYDeVEdMdrCucCVakMXKwsMh18w6X4m2XAs oRy83VASx80f8Ij5O6+g+n0xN8eRwa2CMAc1em8gkeCfICiiGkIj4mOJdqyDCseQdIFxXoVIulk8z MHTM/YG2a4j4d2WLllDIrcRVnak/62LIzFY3Aoa1q5DZ1xZEDS7RFRKbB+54rGiLT+TvPiHP3CxwI J2L0JV3Pj8dYmVm6Yabby5A==; Received: from [10.9.9.127] (helo=rmmprod05.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1gx5Fw-00060W-Nk; Fri, 22 Feb 2019 08:28:24 +0100 Received: from mail by rmmprod05.runbox with local (Exim 4.86_2) (envelope-from ) id 1gx5Fw-0005PI-Mt; Fri, 22 Feb 2019 08:28:24 +0100 MIME-Version: 1.0 Received: from [Authenticated user (850733)] by runbox.com with http (RMM6); Fri, 22 Feb 2019 07:28:24 GMT From: Date: Fri, 22 Feb 2019 07:28:24 +0000 (GMT) X-Mailer: RMM6 In-Reply-To: <87va1dutti.fsf@nckx> 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 Thanks Tobias, I removed those inline comments and removed the full stops after the other inline comments. Haven't changed the qtcolorwidgets library config flag for now, I think drawpile upstream needs to improve the code that looks for qtcolorwidgets (https://github.com/drawpile/Drawpile/blob/master/config/FindQtColorWidgets.cmake) 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 wrote: > Pkill -9, > > Thanks for this patch, and your many others. > > pkill9 wrote: > > + #:use-module (gnu packages crypto) ; libsodium > > + #:use-module (gnu packages gnunet) ; libmicrohttpd > > In my experience, what little value such comments add is quickly > lost. Anyone adding new inputs will not update (or even notice) > them. > > > + ("giflib" ,giflib) ; optional > > + ("kdnssd" ,kdnssd) ; optional > > + ("miniupnpc" ,miniupnpc) ; optional > > + ("libmicrohttpd" ,libmicrohttpd) ; optional > > + ("libsodium" ,libsodium))) ; optional > > Same here: nothing wrong with these, I guess, but *many* package > dependencies are optionally detected at build time and this isn't > usually pointed out unless there's something more interesting > going on. > > > + (arguments > > + `(#:configure-flags > > + (list "-DTESTS=on" ; build unit tests. > > General remark: no full stop after inline comments. > > ;; Foo bar. > (foo bar) ; foo bar > > > + "-DTOOLS=on" ; build dprec2txt command line tool. > > + (string-append "-DLIBQTCOLORWIDGETS_LIBRARY=" > > + (assoc-ref %build-inputs > > "qtcolorwidgets") > > + > > "/lib/libQtColorWidgets-Qt52.so")))) > > What about using FIND-FILES "\*.so$" here instead of hard-coding > "52"? Overkill? > > Kind regards, > > T G-R From 916968e5f419e339aacd3b91d9e15a39ae87f9db Mon Sep 17 00:00:00 2001 From: Pkill -9 Date: Fri, 22 Feb 2019 07:23:39 +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..ae30607cb 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) #: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) #: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) + ("kdnssd" ,kdnssd) + ("miniupnpc" ,miniupnpc) + ("libmicrohttpd" ,libmicrohttpd) + ("libsodium" ,libsodium))) + (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