X-Loop: help-debbugs@HIDDEN Subject: [bug#78622] [PATCH 0/2] gnu: Update tuxpaint. Resent-From: Eric Bavier <bavier@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN Resent-Date: Thu, 29 May 2025 04:10:02 +0000 Resent-Message-ID: <handler.78622.B.174849175113924 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 78622 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78622 <at> debbugs.gnu.org Cc: Eric Bavier <bavier@HIDDEN>, Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN X-Debbugs-Original-Xcc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@HIDDEN> Received: via spool by submit <at> debbugs.gnu.org id=B.174849175113924 (code B ref -1); Thu, 29 May 2025 04:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 May 2025 04:09:11 +0000 Received: from localhost ([127.0.0.1]:60060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uKUZq-0003cW-P3 for submit <at> debbugs.gnu.org; Thu, 29 May 2025 00:09:11 -0400 Received: from lists.gnu.org ([2001:470:142::17]:50254) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <bavier@HIDDEN>) id 1uKUZo-0003c9-Hr for submit <at> debbugs.gnu.org; Thu, 29 May 2025 00:09:08 -0400 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 <bavier@HIDDEN>) id 1uKUZi-0005Uz-Ry for guix-patches@HIDDEN; Thu, 29 May 2025 00:09:02 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <bavier@HIDDEN>) id 1uKUZf-0000xq-SP for guix-patches@HIDDEN; Thu, 29 May 2025 00:09:02 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id BC42D240027 for <guix-patches@HIDDEN>; Thu, 29 May 2025 06:08:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1748491733; bh=8OdhRTVn2OzomMRHfXeihBnWVvseyW+jAE8dIqMB3no=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=KoBRxPPpt3OWjElmTP2XHpcgCmF3n5eBOlMxtsATSsg5KyK3Uw9jzE3qtTdZK9Haq 2aSjzl+35bEfoU15DxdsKSFrJLLwYkORdC76ZG4FXdKDOgkfSfvDsyZZHsTGbeblgr zZKbamv+AN/tjU5Dxh81aHUUExoeeRTVCdKxD3Ok16Jma/aXKgDYnqONls1cm/Dv6z PQjNYZPtQP6iVqWU8xAg62X37ibiXdA24hSLdcrZdk3JLsHnJv/b3DXK65O4Iy36GC 3QOdXA//XiHif/OUfDxYp8IL+evLhn0aNy/14ZYFx9LEC0vtPieyicTQNn2zCpzM1h f42wlQx44Pb/w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4b7CY06hChz9rxD; Thu, 29 May 2025 06:08:52 +0200 (CEST) From: Eric Bavier <bavier@HIDDEN> Date: Thu, 29 May 2025 04:08:13 +0000 Message-ID: <cover.1748490347.git.bavier@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=bavier@HIDDEN; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) This patch series updates our tuxpaint, tuxpaint-config, and tuxpaint-stamps packages to their latest. A prerequisite is adding the `sdl2-pango` package, which is evidently not being used by other packages yet. Eric Bavier (2): gnu: Add sdl2-pango. gnu: Update tuxpaint. gnu/packages/games.scm | 158 +++++++++--------- .../patches/tuxpaint-stamps-path.patch | 18 +- gnu/packages/sdl.scm | 28 ++++ 3 files changed, 116 insertions(+), 88 deletions(-) base-commit: 5bcd765f95e1c6acf64a58aab539db0e019c8bd8 -- 2.49.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Eric Bavier <bavier@HIDDEN> Subject: bug#78622: Acknowledgement ([PATCH 0/2] gnu: Update tuxpaint.) Message-ID: <handler.78622.B.174849175113924.ack <at> debbugs.gnu.org> References: <cover.1748490347.git.bavier@HIDDEN> X-Gnu-PR-Message: ack 78622 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 78622 <at> debbugs.gnu.org Date: Thu, 29 May 2025 04:10:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. As you requested using X-Debbugs-CC, your message was also forwarded to Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler= @gmail.com>, =E5=AE=8B=E6=96=87=E6=AD=A6 <iyzsong@HIDDEN> (after having been given a bug report number, if it did not have one). Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 78622 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 78622: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78622 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN Subject: [bug#78622] [PATCH 1/2] gnu: Add sdl2-pango. Resent-From: Eric Bavier <bavier@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 29 May 2025 04:12:01 +0000 Resent-Message-ID: <handler.78622.B78622.174849190714771 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 78622 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78622 <at> debbugs.gnu.org Cc: Eric Bavier <bavier@HIDDEN> Received: via spool by 78622-submit <at> debbugs.gnu.org id=B78622.174849190714771 (code B ref 78622); Thu, 29 May 2025 04:12:01 +0000 Received: (at 78622) by debbugs.gnu.org; 29 May 2025 04:11:47 +0000 Received: from localhost ([127.0.0.1]:60081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uKUcM-0003q6-5a for submit <at> debbugs.gnu.org; Thu, 29 May 2025 00:11:46 -0400 Received: from mout01.posteo.de ([185.67.36.65]:51083) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <bavier@HIDDEN>) id 1uKUcG-0003pk-JW for 78622 <at> debbugs.gnu.org; Thu, 29 May 2025 00:11:43 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 72FE5240027 for <78622 <at> debbugs.gnu.org>; Thu, 29 May 2025 06:11:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1748491893; bh=e+Ec+o9rMYqeELW4+p1lAuaREzaVEPqnzYz0EVMlv04=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=bISuL3VD6aqjkSTJWaIERN5b9ZjSFv411aXnxwJn4HWNbMPJTDHKf5XNSe9orpgfr QEk7ay+hzjPN2TjdogHnUSXjeIg+mbRvUPingtP42jAs6f662mnjPrHJpsyyNeoV80 F06KlwecKRDEcDTSMn/2dldzOnTvBYvJ4pKEWCyh/yjlzXcIT8/gCPFB10YM+AN8S/ /enCXR4GhqHgSTwKciAaX2U1dlIvkW+U/23jPB5nui555hxWZSLmfIde6Pq3MNd/Aa yH1mxkjRf1liX9tB7rx0kD0NUMV4kC0tZhIsZ5r9ikudKRl2cQ8RrdalnAUF8seuNs A2uSWpccwBrzA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4b7Cc43qKnz6v09; Thu, 29 May 2025 06:11:32 +0200 (CEST) From: Eric Bavier <bavier@HIDDEN> Date: Thu, 29 May 2025 04:10:54 +0000 Message-ID: <ac5c67c5784354ed47185cada8c036180310d454.1748490347.git.bavier@HIDDEN> In-Reply-To: <cover.1748490347.git.bavier@HIDDEN> References: <cover.1748490347.git.bavier@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) * gnu/packages/sdl.scm (sdl2-pango): New variable. Change-Id: I87a2fe0c0fefea7c39e9494acc5cc2bd5c782bb3 --- gnu/packages/sdl.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index ee6c1d11fd..da16c1b973 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2023 Evgeny Pisemsky <mail@HIDDEN> ;;; Copyright © 2023, 2024 dan <i@HIDDEN> ;;; Copyright © 2025 Zheng Junjie <873216071@HIDDEN> +;;; Copyright © 2025 Eric Bavier <bavier@HIDDEN> ;;; ;;; This file is part of GNU Guix. ;;; @@ -519,6 +520,33 @@ (define-public sdl-pango tagged text in SDL applications.") (license license:lgpl2.1))) +(define-public sdl2-pango + (package + (name "sdl2-pango") + (version "2.1.5") + (home-page "https://github.com/markuskimius/SDL2_Pango") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ivngl3bsy2aq8pqdh96nzrfnln6linz50mp5bpb9wv2bk5gj8pi")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags (list "--disable-static"))) + (native-inputs + (list autoconf automake libtool pkg-config)) + (inputs + (list freetype pango sdl2)) + (synopsis "Pango SDL2 binding") + (description "This library is a wrapper around the Pango library. +It allows you to use TrueType fonts to render internationalized and +tagged text in SDL2 applications.") + (license license:lgpl2.1))) + (define-public sdl-ttf (package (name "sdl-ttf") -- 2.49.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#78622] [PATCH 2/2] gnu: Update tuxpaint. Resent-From: Eric Bavier <bavier@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN Resent-Date: Thu, 29 May 2025 04:12:02 +0000 Resent-Message-ID: <handler.78622.B78622.174849191914818 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 78622 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78622 <at> debbugs.gnu.org Cc: Eric Bavier <bavier@HIDDEN>, Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@HIDDEN> X-Debbugs-Original-Xcc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@HIDDEN> Received: via spool by 78622-submit <at> debbugs.gnu.org id=B78622.174849191914818 (code B ref 78622); Thu, 29 May 2025 04:12:02 +0000 Received: (at 78622) by debbugs.gnu.org; 29 May 2025 04:11:59 +0000 Received: from localhost ([127.0.0.1]:60086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uKUcY-0003qt-88 for submit <at> debbugs.gnu.org; Thu, 29 May 2025 00:11:58 -0400 Received: from mout02.posteo.de ([185.67.36.66]:33783) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <bavier@HIDDEN>) id 1uKUcO-0003ps-MF for 78622 <at> debbugs.gnu.org; Thu, 29 May 2025 00:11:56 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 88554240101 for <78622 <at> debbugs.gnu.org>; Thu, 29 May 2025 06:11:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1748491900; bh=SSRISELPJfgw93mf+RGVlgFLLbvRltuC8s/FJzhlWJw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=MUwtHeE/jy7lTZ6fVMIaMxxkN6DM06c/L++fdTKBttD22l760cf0HD/PMKTmRyxXB 9pEYJJrqvcntSDP+KkGGZtbTNtvUzvhuI7MMIilSkxQwUEtsje9S3oKq2POtpY2A5D U45i2fEnRbbKfzeM4LYZi09IsYZ29xFOHoYo2z4Ye1N8jFqz2mCsvAAz+Jfou49fa5 4ANl1SQJhkHBzSE4ejFTy59y6xIuaofPKWYMjew+jZ9DHIxuQFOwVMnrqPm9L4Jegu fRaCm7xTuqNcak36VYQw0ISevA4zdtjd9kiWWT347CLK13FTdVozR3IcrQXZ7GJuPQ UQd6/dJjTT5aw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4b7CcC46pBz6twr; Thu, 29 May 2025 06:11:39 +0200 (CEST) From: Eric Bavier <bavier@HIDDEN> Date: Thu, 29 May 2025 04:10:55 +0000 Message-ID: <4afc416d08d62d43ae35bca9fa3fe102ca6408c9.1748490347.git.bavier@HIDDEN> In-Reply-To: <cover.1748490347.git.bavier@HIDDEN> References: <cover.1748490347.git.bavier@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) And related packages tuxpaint-stamps and tuxpaint-config. * gnu/packages/games.scm (tuxpaint): Update to 0.9.34. [native-inputs]: Add imagemagick. [inputs]: Add libimagequant and pango. Use SDL2. [arguments]: Use gexps. [home-page]: Replace with redirection. (tuxpaint-stamps): Update to 2024.10.25. Use copy-build-system. (tuxpaint-config): Update to 0.0.25. [native-inputs]: Add pkg-config. [inputs]: Add libunibreak and pango. * gnu/packages/patches/tuxpaint-stamps-path.patch: Adapt to latest source. Change-Id: I815b4982226bc6533c45074869d6bac1d0b4fbf9 --- gnu/packages/games.scm | 158 +++++++++--------- .../patches/tuxpaint-stamps-path.patch | 18 +- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 97bc34e5be..0c165ce602 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6606,76 +6606,86 @@ (define-public tuxemon (define-public tuxpaint (package (name "tuxpaint") - (version "0.9.23") ;keep VER_DATE below in sync + (version "0.9.34") ;keep VER_DATE below in sync (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/tuxpaint/tuxpaint/" - version "/tuxpaint-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/tuxpaint/tuxpaint/" version + "/tuxpaint-" version ".tar.gz")) (sha256 - (base32 - "09k9pxi88r3dx6dyjwf9h85d4qpva4i29qz63dc558hg9v21k69l")) + (base32 "00zdf3iza3qrbwmwn9q5fw5z29i1pw63xaq9d15f1ac6sdgdyqdp")) (modules '((guix build utils))) - (snippet - '(begin - ;; Remove win32 directory which contains binary dll's and the - ;; deprecated visualc directory. - (for-each delete-file-recursively '("win32" "visualc")) - (substitute* "Makefile" - ;; Do not rely on $(GPERF) being an absolute file name - (("\\[ -x \\$\\(GPERF\\) \\]") - "$(GPERF) --version >/dev/null 2>&1")) - #t)) + (snippet '(begin + ;; Remove win32 directory which contains binary dll's and the + ;; deprecated visualc directory. + (for-each delete-file-recursively + '("win32" "visualc")) + (substitute* "Makefile" + ;; Do not rely on $(GPERF) being an absolute file name + (("\\[ -x \\$\\(GPERF\\) \\]") + "$(GPERF) --version >/dev/null 2>&1")) #t)) (patches (search-patches "tuxpaint-stamps-path.patch")))) (build-system gnu-build-system) - (native-inputs - (list gperf pkg-config)) - (inputs - (list bash-minimal - cairo - fribidi - gettext-minimal - libpng - (librsvg-for-system) - libpaper - netpbm - (sdl-union (list sdl sdl-mixer sdl-ttf sdl-image)))) + (native-inputs (list gperf imagemagick pkg-config)) + (inputs (list bash-minimal + cairo + fribidi + gettext-minimal + libimagequant + libpng + (librsvg-for-system) + libpaper + netpbm + pango + sdl2 + sdl2-gfx + sdl2-image + sdl2-mixer + sdl2-pango + sdl2-ttf)) ;; TODO: Use system fonts rather than those in data/fonts (arguments - `(#:make-flags `("VER_DATE=2018-09-02" - "GPERF=gperf" "CC=gcc" - "SDL_PCNAME=sdl SDL_image SDL_mixer SDL_ttf" - ,(string-append "PREFIX=" %output) - "KDE_PREFIX=$(PREFIX)/share/applications" - "KDE_ICON_PREFIX=$(PREFIX)/share/icons/" - "COMPLETIONDIR=$(PREFIX)/etc/bash_completion.d") - #:parallel-build? #f ;fails on some systems - #:tests? #f ;No tests - #:phases (modify-phases %standard-phases - (delete 'configure) ;no configure phase - (add-before 'install 'no-sys-cache - (lambda _ ;do not rebuild system conf cache - (substitute* "Makefile" - (("kbuildsycoca4") "")))) - (add-after 'install 'fix-import - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (net (assoc-ref inputs "netpbm")) - (tpi (string-append out "/bin/tuxpaint-import"))) - (substitute* tpi - ;; Point to installation prefix so that the default - ;; configure file is found. - (("/usr/local") out)) - ;; tuxpaint-import uses a bunch of programs from - ;; netpbm, so make sure it knows where those are - (wrap-program tpi - `("PATH" ":" prefix - (,(string-append net "/bin")))))))))) + (list + #:make-flags + #~(list "VER_DATE=2024-10-25" + "GPERF=gperf" + (string-append "CC=" + #$(cc-for-target)) + "SDL_PCNAME=sdl2 SDL2_image SDL2_mixer SDL2_ttf SDL2_gfx" + (string-append "PREFIX=" + #$output) + "KDE_PREFIX=$(PREFIX)/share/applications" + "KDE_ICON_PREFIX=$(PREFIX)/share/icons/" + "COMPLETIONDIR=$(PREFIX)/etc/bash_completion.d") + #:parallel-build? #f ;fails on some systems + #:tests? #f ;No tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ;no configure phase + (add-before 'install 'no-sys-cache + (lambda _ + ;do not rebuild system conf cache + (substitute* "Makefile" + (("kbuildsycoca4") + "")))) + (add-after 'install 'fix-import + (lambda _ + (let* ((tpi (string-append #$output "/bin/tuxpaint-import"))) + (substitute* tpi + ;; Point to installation prefix so that the default + ;; configure file is found. + (("/usr/local") + #$output)) + ;; tuxpaint-import uses a bunch of programs from + ;; netpbm, so make sure it knows where those are + (wrap-program tpi + `("PATH" ":" prefix + (,(string-append #$(this-package-input "netpbm") "/bin")))))))))) (native-search-paths (list (search-path-specification (variable "TUXPAINT_STAMPS_PATH") (files '("share/tuxpaint/stamps"))))) - (home-page "http://www.tuxpaint.org") + (home-page "https://tuxpaint.org") (synopsis "Drawing software for children") (description "Tux Paint is a free drawing program designed for young children (kids @@ -6688,7 +6698,7 @@ (define-public tuxpaint (define-public tuxpaint-stamps (package (name "tuxpaint-stamps") - (version "2018.09.01") + (version "2024.10.25") (source (origin (method url-fetch) @@ -6697,24 +6707,9 @@ (define-public tuxpaint-stamps "/tuxpaint-stamps-" version ".tar.gz")) (sha256 (base32 - "1skr23k27yj3vgwfazpzxp90lb2a278gxrkr3bxw7az6zpkmb3yp")))) - (build-system trivial-build-system) - (native-inputs - (list tar gzip)) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (setenv "PATH" - (string-append - (assoc-ref %build-inputs "tar") "/bin" ":" - (assoc-ref %build-inputs "gzip") "/bin")) - (invoke "tar" "xvf" (assoc-ref %build-inputs "source")) - (chdir (string-append ,name "-" ,version)) - (let ((dir (string-append %output "/share/tuxpaint/stamps"))) - (mkdir-p dir) - (copy-recursively "stamps" dir)) - #t))) + "19vng3h6icd7zs2arfmkcg4w7snsw5syx956ww05xgvwll9s2hal")))) + (build-system copy-build-system) + (arguments (list #:install-plan #~'(("stamps" "share/tuxpaint/")))) (home-page (package-home-page tuxpaint)) (synopsis "Stamp images for Tux Paint") (description @@ -6725,7 +6720,7 @@ (define-public tuxpaint-stamps (define-public tuxpaint-config (package (name "tuxpaint-config") - (version "0.0.14") ;keep VER_DATE below in sync + (version "0.0.25") ;keep VER_DATE below in sync (source (origin (method url-fetch) @@ -6733,19 +6728,20 @@ (define-public tuxpaint-config version "/tuxpaint-config-" version ".tar.gz")) (sha256 (base32 - "0zkgxk436nqcp43zghkfmh397c7dvh5bwn2as7gwvv208bzyij6g")))) + "16awjwxr2wf6v05wr2z01kgnah2nwwk9k5y25fb3lawnzy0aqild")))) (build-system gnu-build-system) - (native-inputs - `(("gettext" ,gettext-minimal))) + (native-inputs (list gettext-minimal pkg-config)) (inputs (list fltk libpaper + libunibreak + pango ;; TODO: Should the following be propagated by fltk? libx11 libxft mesa)) (arguments - `(#:make-flags `("VER_DATE=2018-09-01" + `(#:make-flags `("VER_DATE=2024-11-15" "CONFDIR=/etc/tuxpaint" ;don't write to store ,(string-append "PREFIX=" %output) "GNOME_PREFIX=$(PREFIX)") diff --git a/gnu/packages/patches/tuxpaint-stamps-path.patch b/gnu/packages/patches/tuxpaint-stamps-path.patch index 599a33c458..65ab826ae4 100644 --- a/gnu/packages/patches/tuxpaint-stamps-path.patch +++ b/gnu/packages/patches/tuxpaint-stamps-path.patch @@ -1,7 +1,10 @@ ---- tuxpaint-0.9.22/src/tuxpaint.c -+++ tuxpaint-0.9.22/src/tuxpaint.c -@@ -7474,11 +7474,21 @@ - static void load_stamps(SDL_Surface * screen) +This patch allows tuxpaint to load stamps from multiple sources, and allows +Guix's packages to remain loosely coupled. + +--- tuxpaint-0.9.34/src/tuxpaint.c ++++ tuxpaint-0.9.34/src/tuxpaint.c +@@ -9426,12 +9426,22 @@ + static void load_stamps(SDL_Surface *screen) { char *homedirdir = get_fname("stamps", DIR_DATA); + char *stamps_path = getenv("TUXPAINT_STAMPS_PATH"); @@ -9,6 +12,7 @@ default_stamp_size = compute_default_scale_factor(1.0); load_stamp_dir(screen, homedirdir); + #ifndef __ANDROID__ load_stamp_dir(screen, DATA_PREFIX "stamps"); + /* Load any stamps in TUXPAINT_STAMPS_PATH */ + if (stamps_path) { @@ -19,6 +23,6 @@ + token = strtok(NULL, ":"); + } + } - #ifdef __APPLE__ - load_stamp_dir(screen, "/Library/Application Support/TuxPaint/stamps"); - #endif + #else + load_stamp_dir(screen, "stamps/animals"); + load_stamp_dir(screen, "stamps/cartoon/tux"); -- 2.49.0
X-Loop: help-debbugs@HIDDEN Subject: [bug#78622] [PATCH 0/2] gnu: Update tuxpaint. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Thu, 12 Jun 2025 12:41:03 +0000 Resent-Message-ID: <handler.78622.B78622.174973204112250 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: followup 78622 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Eric Bavier <bavier@HIDDEN> Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@HIDDEN>, Adam Faiz <adam.faiz@HIDDEN>, 78622 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler@HIDDEN> Received: via spool by 78622-submit <at> debbugs.gnu.org id=B78622.174973204112250 (code B ref 78622); Thu, 12 Jun 2025 12:41:03 +0000 Received: (at 78622) by debbugs.gnu.org; 12 Jun 2025 12:40:41 +0000 Received: from localhost ([127.0.0.1]:57223 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uPhEX-0003BW-AM for submit <at> debbugs.gnu.org; Thu, 12 Jun 2025 08:40:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49208) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1uPhEQ-0003AV-TZ for 78622 <at> debbugs.gnu.org; Thu, 12 Jun 2025 08:40:38 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1uPhEJ-0000LE-MN; Thu, 12 Jun 2025 08:40:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=zSEojxVkCuU7vlljTM2sX2bRqS2Tng60+E1XqLdG3PU=; b=mekfcYHFnLJS4KpwcJTB rVJxFHzdWpHQ7HZRBfXNmO9swumwVkWIAzHwZVYBcgpc9+giLaUL5r2PTxYgcauCp8fN9Nz50kxrb H58KVJjChrtZ6oLcE/HLsTkpX2XEauZjAjqdcWUpEvEeNsqWkAltpT/h3oJXdd5Fzpv+rd1mV8Wh3 OVxdEktIq18k8V79ZxP/t5l+8BqLytQGcN15UbNqN0EarQ4zGY0RT3IfUHv90oMF5a/PZZOD2g120 NaGG7ZKg21mkdYNnmX3X9IoVG7VCGGX70rKKVr0x6P62hYW301Muu7uSds5noWtuG3CxBtNVlF0li khw7orC1dMnKfQ==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN> In-Reply-To: <cover.1748490347.git.bavier@HIDDEN> (Eric Bavier's message of "Thu, 29 May 2025 04:08:13 +0000") References: <cover.1748490347.git.bavier@HIDDEN> Date: Thu, 12 Jun 2025 10:00:28 +0200 Message-ID: <87zfede6eb.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.2 (-) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.2 (--) Hi Eric, Eric Bavier <bavier@HIDDEN> writes: > This patch series updates our tuxpaint, tuxpaint-config, and > tuxpaint-stamps packages to their latest. A prerequisite is > adding the `sdl2-pango` package, which is evidently not being > used by other packages yet. > > Eric Bavier (2): > gnu: Add sdl2-pango. > gnu: Update tuxpaint. LGTM, I think you can push! Ludo=E2=80=99.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.