unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Adam Faiz via Guix-patches via <guix-patches@gnu.org>
To: Adam Faiz <liliana.prikler@gmail.com>
Cc: 60153@debbugs.gnu.org
Subject: [bug#60153] [PATCH v2 1/3] gnu: python-pygame: Update to 2.1.2.
Date: Sat, 24 Dec 2022 07:20:04 +0800	[thread overview]
Message-ID: <61b652bc-7769-4cc7-43e2-fd08e73313ed@disroot.org> (raw)
In-Reply-To: <8c518a46ea2d8332ccbb55cb00574b75db982558.camel@disroot.org>

On 12/18/22 23:51, Adam Faiz wrote:
> +         (add-after 'unpack 'fix-build-config
> +           (lambda _
> +             (substitute* "buildconfig/config_unix.py"
> +               (("origincdirs = \\[.*\\]")
> +                "origincdirs = os.environ['C_INCLUDE_PATH'].split(\":\")")
> +               (("ORIGLIBDIRS") "LIBRARY_PATH")
> +               (("incdirs = \\[\\]") "incdirs = origincdirs")
> +               (("libdirs = \\[\\]") "libdirs = origlibdirs"))))
> +         (add-after 'unpack 'fix-sdl2-headers
> +           (lambda _
> +             (substitute* "buildconfig/config_unix.py"
> +               (("SDL_ttf.h") "SDL2/SDL_ttf.h")
> +               (("SDL_image.h") "SDL2/SDL_image.h")
> +               (("SDL_mixer.h") "SDL2/SDL_mixer.h"))
> +             (substitute* "src_c/imageext.c"
> +               (("SDL_image.h") "SDL2/SDL_image.h"))
> +             (substitute* "src_c/font.h"
> +               (("SDL_ttf.h") "SDL2/SDL_ttf.h"))
> +             (substitute* "src_c/mixer.h"
> +               (("SDL_mixer.h") "SDL2/SDL_mixer.h"))
> +             (substitute* "src_c/_sdl2/mixer.c"
> +               (("SDL_mixer.h") "SDL2/SDL_mixer.h")))))))
I don't see why these should go in phases, when I think going in a 
snippet would be better. From "Snippets and Phases" in the Guix manual:

> The source derived
> from an origin should produce a source that can be used to build the
> package on any system that the upstream package supports (i.e., act as
> the corresponding source).  In particular, origin snippets must not
> embed store items in the sources; such patching should rather be done
> using build phases.
The 'fix-build-config is what I consider to be a serious bugfix, it 
doesn't matter that it was originally fixed as part of guix packaging.

The 'fix-sld2-headers phase might stay in a build phase, if most systems 
that pygame supports doesn't keep these headers where guix would locate 
them. But I would consider that a bug in other systems for not storing 
the headers in the file path upstream places them.

The 'fix-sdl2-headers doesn't embed store items, so there's no other 
justification other than the reason given above.





  reply	other threads:[~2022-12-23 23:21 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-17 10:01 [bug#60153] [PATCH] gnu: python-pygame: Update to 2.1.2 Adam Faiz via Guix-patches via
     [not found] ` <93aa8b09-cc29-4030-3c76-458158ea0c0f@disroot.org>
2022-12-17 10:52   ` [bug#60153] Fwd: " Liliana Marie Prikler
2022-12-18 14:15     ` Adam Faiz via Guix-patches via
2022-12-18 15:02       ` Liliana Marie Prikler
2022-12-18 15:51 ` [bug#60153] [PATCH v2 1/3] " Adam Faiz
2022-12-23 23:20   ` Adam Faiz via Guix-patches via [this message]
2022-12-23 23:43     ` Adam Faiz via Guix-patches via
2022-12-23 23:54       ` Adam Faiz via Guix-patches via
2022-12-24  5:51       ` Liliana Marie Prikler
2022-12-24 13:19         ` Adam Faiz via Guix-patches via
2022-12-24  5:39     ` Liliana Marie Prikler
2022-12-18 15:51 ` [bug#60153] [PATCH v1 " Adam Faiz via Guix-patches via
2022-12-18 15:54   ` [bug#60153] [PATCH v1 2/3] gnu: python-pygame: Use gexps and new style inputs Adam Faiz via Guix-patches via
2022-12-18 15:57     ` [bug#60153] [PATCH v1 3/3] gnu: python-pygame: Fix description Adam Faiz via Guix-patches via
2022-12-18 15:54 ` [bug#60153] [PATCH v2 2/3] gnu: python-pygame: Use G-Expressions and new-style inputs Adam Faiz
2022-12-22 20:45 ` [bug#60153] [PATCH v2 3/3] gnu: python-pygame: Reword description Liliana Marie Prikler
2022-12-22 21:09 ` [bug#60153] [PATCH v2 0/3] Update python-pygame to 2.1.2 Liliana Marie Prikler
2022-12-31  7:34   ` bug#60153: " Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=61b652bc-7769-4cc7-43e2-fd08e73313ed@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=60153@debbugs.gnu.org \
    --cc=adam.faiz@disroot.org \
    --cc=liliana.prikler@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).