From patchwork Thu May 29 04:10:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 42946 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 AABF727BC4B; Thu, 29 May 2025 05:12:32 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 D218327BC49 for ; Thu, 29 May 2025 05:12:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKUcg-0005rm-VN; Thu, 29 May 2025 00:12:07 -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 ) id 1uKUce-0005rO-VJ for guix-patches@gnu.org; Thu, 29 May 2025 00:12:05 -0400 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 1uKUce-0001LK-Li for guix-patches@gnu.org; Thu, 29 May 2025 00:12:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=p03qXGYZin9ufkrpuFUln/+Zjzva6U6DKMPU3In6mlY=; b=dvIv45puDla3ERM1/7JNvcdHnGGHgLYPMV6A0t2QBuigHDY+vlB1lC4lSjmUn4zmNeUDXo52q3Lldf1HHDXUrtgD3fFdqQZ8JX8C4sfaEvzhNJu0zZOeuW8Sz4a7TGhiIJEVDyeXLiPoTY89I+J5yOlQ3V1RSJM/bTHdCNfVs5Y2nr63IIfkrihgjwxxxri51Ax1tuXbvw+XzhsFjuUD2qqRhmrNPptdVOCf2yUQ8I4lb21pa7QMF3No4HaXl011tREMl+R7UeATQUgO3OXGw3s4slt30JSKc10vIdToZKzEWybnb/JKGpukqDeAW92G2yHjbCFCvVG3OLlZ/2BM+Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uKUcc-0003rS-E5; Thu, 29 May 2025 00:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78622] [PATCH 2/2] gnu: Update tuxpaint. Resent-From: Eric Bavier Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Thu, 29 May 2025 04:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78622 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78622@debbugs.gnu.org Cc: Eric Bavier , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 78622-submit@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 ) id 1uKUcY-0003qt-88 for submit@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 ) id 1uKUcO-0003ps-MF for 78622@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@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 Date: Thu, 29 May 2025 04:10:55 +0000 Message-ID: <4afc416d08d62d43ae35bca9fa3fe102ca6408c9.1748490347.git.bavier@posteo.net> In-Reply-To: References: MIME-Version: 1.0 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 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");