From patchwork Sat Nov 25 16:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: spacecadet X-Patchwork-Id: 56820 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 3C23427BBE9; Sat, 25 Nov 2023 16:03:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 58C4827BBE2 for ; Sat, 25 Nov 2023 16:03:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6v7U-00055q-KJ; Sat, 25 Nov 2023 11:03:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6v7R-000536-Kg for guix-patches@gnu.org; Sat, 25 Nov 2023 11:02:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r6v7R-00066y-Cm for guix-patches@gnu.org; Sat, 25 Nov 2023 11:02:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6v7W-0004Gs-Ck for guix-patches@gnu.org; Sat, 25 Nov 2023 11:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67446] [PATCH] gnu: drawpile: Update drawpile to 2.1.20. Resent-From: spacecadet@purge.sh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Nov 2023 16:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67446@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.170092814616357 (code B ref -1); Sat, 25 Nov 2023 16:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Nov 2023 16:02:26 +0000 Received: from localhost ([127.0.0.1]:40069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6v6v-0004Fl-S6 for submit@debbugs.gnu.org; Sat, 25 Nov 2023 11:02:26 -0500 Received: from lists.gnu.org ([2001:470:142::17]:50042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6v6t-0004FU-Gm for submit@debbugs.gnu.org; Sat, 25 Nov 2023 11:02:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6v6i-0004zC-QX for guix-patches@gnu.org; Sat, 25 Nov 2023 11:02:12 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r6v6g-00063a-Pb for guix-patches@gnu.org; Sat, 25 Nov 2023 11:02:12 -0500 Received: by mail.gandi.net (Postfix) with ESMTPA id A29A2E0006 for ; Sat, 25 Nov 2023 16:02:04 +0000 (UTC) MIME-Version: 1.0 Date: Sat, 25 Nov 2023 16:02:04 +0000 From: spacecadet@purge.sh Message-ID: X-Sender: spacecadet@purge.sh X-GND-Sasl: spacecadet@purge.sh Received-SPF: pass client-ip=217.70.183.196; envelope-from=spacecadet@purge.sh; helo=relay4-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Update drawpile to 2.1.20 and remove let that was needed for specific commit after drawpile 2.1.17 to fix building with libmicrohttpd>=0.9.71. --- gnu/packages/graphics.scm | 75 +++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 39 deletions(-) + (description "Drawpile is a drawing program that allows share the canvas with other users in real time. Some feature highlights: @@ -2341,7 +2338,7 @@ (define-public drawpile @item Encrypted connections using SSL @item Automatic port forwarding with UPnP @end itemize\n") - (license license:gpl3+)))) + (license license:gpl3+)))) (define-public openxr (package + (package + (name "drawpile") + (version "2.1.20") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/drawpile/Drawpile") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r250yv1ks36yxdgn2vjl0h6ai86gg37pz83d5qi6qc1mmlsqc8y")))) + (build-system qt-build-system) + (arguments + '(#:configure-flags + (list "-DTESTS=ON" "-DTOOLS=ON" "-DKIS_TABLET=ON"))) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list giflib + karchive + kdnssd + libmicrohttpd + libsodium + libvpx + libxi + ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason + qtbase-5 + qtkeychain + qtmultimedia-5 + qtsvg-5 + qtx11extras)) + (home-page "https://drawpile.net") + (synopsis "Collaborative drawing program") + (description "Drawpile is a drawing program that allows share the canvas with other users in real time. Some feature highlights: @@ -2341,7 +2338,7 @@ (define-public drawpile @item Encrypted connections using SSL @item Automatic port forwarding with UPnP @end itemize\n") - (license license:gpl3+)))) + (license license:gpl3+)))) (define-public openxr (package base-commit: 13bc0633e77c73389e530a4c45e2de5a823f106b diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 00e273b853..c3c58085bf 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2288,44 +2288,41 @@ (define-public superfamiconv (license license:expat))) (define-public drawpile - ;; This commit fix building with libmicrohttpd>=0.71. - (let ((commit "ed1a75deb113da2d1df91a28f557509c4897130e") - (revision "1")) - (package - (name "drawpile") - (version (string-append "2.1.17-" revision "." (string-take commit 9))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/drawpile/Drawpile") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1y21h1hk9ipkjvhjgas0c5hkjyan92vsxbxrn60c906hzqln2fr1")))) - (build-system qt-build-system) - (arguments - '(#:configure-flags - (list "-DTESTS=ON" "-DTOOLS=ON" "-DKIS_TABLET=ON"))) - (native-inputs - (list extra-cmake-modules pkg-config)) - (inputs - (list giflib - karchive - kdnssd - libmicrohttpd - libsodium - libvpx - libxi - ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason - qtbase-5 - qtkeychain - qtmultimedia-5 - qtsvg-5 - qtx11extras)) - (home-page "https://drawpile.net") - (synopsis "Collaborative drawing program") - (description "Drawpile is a drawing program that allows share the canvas + (package + (name "drawpile") + (version "2.1.20") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/drawpile/Drawpile") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r250yv1ks36yxdgn2vjl0h6ai86gg37pz83d5qi6qc1mmlsqc8y")))) + (build-system qt-build-system) + (arguments + '(#:configure-flags + (list "-DTESTS=ON" "-DTOOLS=ON" "-DKIS_TABLET=ON"))) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list giflib + karchive + kdnssd + libmicrohttpd + libsodium + libvpx + libxi + ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason + qtbase-5 + qtkeychain + qtmultimedia-5 + qtsvg-5 + qtx11extras)) + (home-page "https://drawpile.net") + (synopsis "Collaborative drawing program")