Bug 778542 – games-puzzle/enigma-1.30 version bump

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Khumba 2021-03-27 03:02:28 UTC]

enigma-1.21-r3 has a bug that affects gameplay, where pausing a level and clicking "Abort Level" to go back to the main menu causes the menu to enter a weird state where no further input is possible, and the game has to be killed by closing its window.  It's probably this upstream bug: [1].

The project tagged a 1.30-alpha release in 2020-Dec[2], which fixes this issue, updates from SDL1 to SDL2, and incorporates some patches that Gentoo's been carrying, so it would be great if we could bump to this version.  I've been running this for most of a month and it's been problem-free for me on amd64/stable.

I've taken the opportunity to bump to EAPI 7 and update from gnome2-utils to xdg-utils.

[1] https://github.com/Enigma-Game/Enigma/issues/13
[2] https://github.com/Enigma-Game/Enigma/tags

[Comment 1 Khumba 2021-03-27 03:04:46 UTC]

Created attachment 694602 [details]
enigma-1.30_alpha.ebuild

[Comment 2 Sam James 2021-03-27 03:05:18 UTC]

Would you mind attaching it in git format-patch format (with GCO sign off) or a GitHub PR?

[Comment 3 Khumba 2021-03-27 03:05:52 UTC]

Created attachment 694605 [details, diff]
Updated build patch

enigma-1.30_alpha-build.patch replaces enigma-1.21-build.patch.

enigma-1.21-gcc6.patch is now upstream and can be dropped.

[Comment 4 Khumba 2021-03-27 03:07:26 UTC]

(In reply to Sam James from comment #2)
> Would you mind attaching it in git format-patch format (with GCO sign off)
> or a GitHub PR?

Sure.  Please give me a moment to read up on the process for that :).

[Comment 5 Khumba 2021-03-27 08:48:46 UTC]

Created attachment 694812 [details, diff]
Patch adding enigma-1.30-alpha to the gentoo tree

Repackaged with git-format-patch.  Compared to the previous upload, there's one QA fix, repoman pointed out that dosym's first argument shouldn't be an absolute path.

[Comment 6 Khumba 2023-04-22 02:32:47 UTC]

Created attachment 860502 [details]
enigma-1.30.ebuild

[Comment 7 Khumba 2023-04-22 02:33:24 UTC]

Created attachment 860503 [details, diff]
enigma-1.30-build.patch

[Comment 8 Khumba 2023-04-22 02:33:35 UTC]

Created attachment 860504 [details, diff]
enigma-1.30-remove-menu-music.patch

[Comment 9 Khumba 2023-04-22 02:34:02 UTC]

Created attachment 860505 [details]
License file for pentagonal_dreams.s3m

[Comment 10 Khumba 2023-04-22 02:47:19 UTC]

Enigma 1.30 released back in 2021.  Here is an updated ebuild and related files.  Notable changes:

- The gettext dependency has been replaced with a bundled copy of tinygettext.  I'm not sure how necessary this is for Gentoo's use case, so it might be possible to unbundle, but I haven't attempted this yet.  Upstream documents why they bundle it[1].

- One of the Enigma menu music tracks, which also happens to be "the" iconic one, is under a non-libre license that only allows redistribution with Enigma.  For this reason, Debian removes this particular track[2].  Personally I think the song is really good, so I've put it's installation behind USE=non-free with a custom license file, but I'm not sure if this is acceptable for Gentoo.  If not, let's patch it out unconditionally.

- Updated to EAPI 8, without changes.  Minor SRC_URI adjustment.

Previously a patch for gentoo.git was requested, I'd be happy to do that again if the ebuild looks okay.

[1] https://github.com/Enigma-Game/Enigma/blob/1.30/lib-src/tinygettext/README.enigma

[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=321669#20

[Comment 11 Larry the Git Cow 2025-06-07 22:05:08 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4361e2f15db8f3f934e9d1497d350faf62f77a96

commit 4361e2f15db8f3f934e9d1497d350faf62f77a96
Author:     James Le Cuirot <[e-mail]>
AuthorDate: 2025-06-07 22:03:24 +0000
Commit:     James Le Cuirot <[e-mail]>
CommitDate: 2025-06-07 22:03:24 +0000

    games-puzzle/enigma: Version bump to 1.30, fixes musl, EAPI 8
    
    The non-free menu music track is now conditionally removed. A patch to
    remove references to it was submitted, but simply deleting the file has
    the same effect.
    
    Closes: https://bugs.gentoo.org/739292
    Closes: https://bugs.gentoo.org/778542
    Closes: https://bugs.gentoo.org/868720
    Signed-off-by: James Le Cuirot <[e-mail]>

 games-puzzle/enigma/Manifest                       |   1 +
 games-puzzle/enigma/enigma-1.30.ebuild             |  83 +++++++++++
 games-puzzle/enigma/files/enigma-1.30-build.patch  |  98 ++++++++++++
 .../enigma/files/enigma-1.30-no-gettext.patch      | 164 +++++++++++++++++++++
 games-puzzle/enigma/metadata.xml                   |   4 +
 5 files changed, 350 insertions(+)