* [bug#30406] [PATCH 0/2] gnu: tome4: Add fix to getself.c. @ 2018-02-09 21:21 Oleg Pykhalov 2018-02-09 21:23 ` [bug#30406] [PATCH 1/2] " Oleg Pykhalov 2018-06-22 19:34 ` [bug#30406] " Gábor Boskovits 0 siblings, 2 replies; 8+ messages in thread From: Oleg Pykhalov @ 2018-02-09 21:21 UTC (permalink / raw) To: 30406 Hello Guix, I've noticed tome4 sometimes failes: - https://hydra.gnu.org/build/2488652 - https://hydra.gnu.org/build/2329898 First patch is an attempt to fix a getself.c error. Second patch replaces 'system*' with 'invoke' Guile functions. Oleg Pykhalov (2): gnu: tome4: Add fix to getself.c. gnu: tome4: Replace system* with invoke. gnu/local.mk | 1 + gnu/packages/games.scm | 14 ++++++------- .../patches/tome4-patch-src-getself-c.patch | 24 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/tome4-patch-src-getself-c.patch -- 2.15.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#30406] [PATCH 1/2] gnu: tome4: Add fix to getself.c. 2018-02-09 21:21 [bug#30406] [PATCH 0/2] gnu: tome4: Add fix to getself.c Oleg Pykhalov @ 2018-02-09 21:23 ` Oleg Pykhalov 2018-02-09 21:23 ` [bug#30406] [PATCH 2/2] gnu: tome4: Replace system* with invoke Oleg Pykhalov 2018-04-23 12:59 ` [bug#30406] [PATCH 1/2] gnu: tome4: Add fix to getself.c Ludovic Courtès 2018-06-22 19:34 ` [bug#30406] " Gábor Boskovits 1 sibling, 2 replies; 8+ messages in thread From: Oleg Pykhalov @ 2018-02-09 21:23 UTC (permalink / raw) To: 30406 * gnu/local.mk (dist_patch_DATA): Add this. * gnu/packages/games.scm (tome4)[source]: Add fix to getself.c. * gnu/packages/patches/tome4-patch-src-getself-c.patch: New file. --- gnu/local.mk | 1 + gnu/packages/games.scm | 1 + .../patches/tome4-patch-src-getself-c.patch | 24 ++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 gnu/packages/patches/tome4-patch-src-getself-c.patch diff --git a/gnu/local.mk b/gnu/local.mk index 925057dc7..24b0bf1e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1118,6 +1118,7 @@ dist_patch_DATA = \ %D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ %D%/packages/patches/ttfautohint-source-date-epoch.patch \ + %D%/packages/patches/tome4-patch-src-getself-c.patch \ %D%/packages/patches/tophat-build-with-later-seqan.patch \ %D%/packages/patches/totem-meson-easy-codec.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 286d0feef..a5804a87b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5208,6 +5208,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as (sha256 (base32 "0v2qgdfpvdzd1bcbp9v8pfahj1bgczsq2d4xfhh5wg11jgjcwz03")) + (patches (search-patches "tome4-patch-src-getself-c.patch")) (modules '((guix build utils))) (snippet '(substitute* '("src/music.h" "src/tSDL.h") diff --git a/gnu/packages/patches/tome4-patch-src-getself-c.patch b/gnu/packages/patches/tome4-patch-src-getself-c.patch new file mode 100644 index 000000000..ce4795662 --- /dev/null +++ b/gnu/packages/patches/tome4-patch-src-getself-c.patch @@ -0,0 +1,24 @@ +Copied from OpenBSD. + +Fixes: ../src/getself.c:40:1: fatal error: opening dependency file +../obj/Release/TEngine/getself.d: No such file or directory + +$OpenBSD: patch-src_getself_c,v 1.3 2017/11/11 11:24:42 kirby Exp $ + +--- a/src/getself.c ++++ b/src/getself.c +@@ -47,13 +47,7 @@ int get_number_cpus() + const char *get_self_executable(int argc, char **argv) + { + static char res[PATH_MAX]; +- int mib[4]; +- mib[0] = CTL_KERN; +- mib[1] = KERN_PROC; +- mib[2] = KERN_PROC_PATHNAME; +- mib[3] = -1; +- size_t cb = sizeof(res); +- sysctl(mib,4,res,&cb,NULL,0); ++ realpath("${GAMEDIR}/", res); + return res; + } + -- 2.15.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#30406] [PATCH 2/2] gnu: tome4: Replace system* with invoke. 2018-02-09 21:23 ` [bug#30406] [PATCH 1/2] " Oleg Pykhalov @ 2018-02-09 21:23 ` Oleg Pykhalov 2018-04-23 12:59 ` Ludovic Courtès 2018-04-23 12:59 ` [bug#30406] [PATCH 1/2] gnu: tome4: Add fix to getself.c Ludovic Courtès 1 sibling, 1 reply; 8+ messages in thread From: Oleg Pykhalov @ 2018-02-09 21:23 UTC (permalink / raw) To: 30406 * gnu/packages/games.scm (tome4)[arguments]: Replace 'system*' with 'invoke'. --- gnu/packages/games.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a5804a87b..e327dbc2f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5230,8 +5230,7 @@ Crowther & Woods, its original authors, in 1995. It has been known as #:phases (modify-phases %standard-phases (replace 'configure (lambda _ - (zero? (system* "premake4" "gmake")) - #t)) + (invoke "premake4" "gmake"))) (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" @@ -5257,11 +5256,11 @@ Crowther & Woods, its original authors, in 1995. It has been known as (wrapper (string-append bin "/" ,name))) ;; icon (mkdir-p pixmaps) - (system* unzip "-j" - (string-append - "game/engines/te4-" ,version ".teae") - (string-append - "data/gfx/" icon) "-d" pixmaps) + (invoke unzip "-j" + (string-append "game/engines/te4-" + ,version ".teae") + (string-append "data/gfx/" icon) + "-d" pixmaps) ;; game executable (install-file "t-engine" data) (mkdir-p bin) -- 2.15.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#30406] [PATCH 2/2] gnu: tome4: Replace system* with invoke. 2018-02-09 21:23 ` [bug#30406] [PATCH 2/2] gnu: tome4: Replace system* with invoke Oleg Pykhalov @ 2018-04-23 12:59 ` Ludovic Courtès 0 siblings, 0 replies; 8+ messages in thread From: Ludovic Courtès @ 2018-04-23 12:59 UTC (permalink / raw) To: Oleg Pykhalov; +Cc: 30406 Oleg Pykhalov <go.wigust@gmail.com> skribis: > * gnu/packages/games.scm (tome4)[arguments]: Replace 'system*' with 'invoke'. Unless this has already been done in core-updates, you can definitely push this one. Ludo'. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#30406] [PATCH 1/2] gnu: tome4: Add fix to getself.c. 2018-02-09 21:23 ` [bug#30406] [PATCH 1/2] " Oleg Pykhalov 2018-02-09 21:23 ` [bug#30406] [PATCH 2/2] gnu: tome4: Replace system* with invoke Oleg Pykhalov @ 2018-04-23 12:59 ` Ludovic Courtès 1 sibling, 0 replies; 8+ messages in thread From: Ludovic Courtès @ 2018-04-23 12:59 UTC (permalink / raw) To: Oleg Pykhalov; +Cc: 30406 Hello, Oleg Pykhalov <go.wigust@gmail.com> skribis: > * gnu/local.mk (dist_patch_DATA): Add this. > * gnu/packages/games.scm (tome4)[source]: Add fix to getself.c. > * gnu/packages/patches/tome4-patch-src-getself-c.patch: New file. As noted in HACKING, please feel free to go ahead if this patch fixes something for you. Thanks! Ludo’. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#30406] gnu: tome4: Add fix to getself.c. 2018-02-09 21:21 [bug#30406] [PATCH 0/2] gnu: tome4: Add fix to getself.c Oleg Pykhalov 2018-02-09 21:23 ` [bug#30406] [PATCH 1/2] " Oleg Pykhalov @ 2018-06-22 19:34 ` Gábor Boskovits 2018-06-23 2:06 ` Oleg Pykhalov 1 sibling, 1 reply; 8+ messages in thread From: Gábor Boskovits @ 2018-06-22 19:34 UTC (permalink / raw) To: 30406 [-- Attachment #1: Type: text/plain, Size: 259 bytes --] I'm reviewing patches before guix 0.15.0. This patchset looks like a good candidate for inclusion, but patches do not apply cleanly on current master. Ludo already said that these are ok to push. Can you create updated patches, and push them, or submit them? [-- Attachment #2: Type: text/html, Size: 285 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#30406] gnu: tome4: Add fix to getself.c. 2018-06-22 19:34 ` [bug#30406] " Gábor Boskovits @ 2018-06-23 2:06 ` Oleg Pykhalov 2021-09-13 0:07 ` bug#30406: " Sarah Morgensen 0 siblings, 1 reply; 8+ messages in thread From: Oleg Pykhalov @ 2018-06-23 2:06 UTC (permalink / raw) To: Gábor Boskovits; +Cc: 30406 [-- Attachment #1: Type: text/plain, Size: 637 bytes --] Hello Gábor, Gábor Boskovits <boskovits@gmail.com> writes: > I'm reviewing patches before guix 0.15.0. This patchset looks like a good > candidate for inclusion, but patches do not apply cleanly on current > master. Ludo already said that these are ok to push. Thank you for taking your time on it. > Can you create updated patches, and push them, or submit them? I've updated tome4 to 1.5.10 in 972b87b14ae54bacf2457a4d538c5495bec37176 and I'm not sure whether the patch is necessary now. I've found failed built of the previous version on Hydra, so maybe I'll spot a failure for the new version, too. Oleg. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 832 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* bug#30406: gnu: tome4: Add fix to getself.c. 2018-06-23 2:06 ` Oleg Pykhalov @ 2021-09-13 0:07 ` Sarah Morgensen 0 siblings, 0 replies; 8+ messages in thread From: Sarah Morgensen @ 2021-09-13 0:07 UTC (permalink / raw) To: Oleg Pykhalov; +Cc: Gábor Boskovits, 30406-done Hello, I found this old bug. It looks like it's been building consistently for some time now, so I'm closing it. Feel free to reopen if necessary. Oleg Pykhalov <go.wigust@gmail.com> writes: > I've updated tome4 to 1.5.10 in 972b87b14ae54bacf2457a4d538c5495bec37176 > and I'm not sure whether the patch is necessary now. I've found failed > built of the previous version on Hydra, so maybe I'll spot a failure for > the new version, too. > > Oleg. -- Sarah ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-09-13 0:08 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-02-09 21:21 [bug#30406] [PATCH 0/2] gnu: tome4: Add fix to getself.c Oleg Pykhalov 2018-02-09 21:23 ` [bug#30406] [PATCH 1/2] " Oleg Pykhalov 2018-02-09 21:23 ` [bug#30406] [PATCH 2/2] gnu: tome4: Replace system* with invoke Oleg Pykhalov 2018-04-23 12:59 ` Ludovic Courtès 2018-04-23 12:59 ` [bug#30406] [PATCH 1/2] gnu: tome4: Add fix to getself.c Ludovic Courtès 2018-06-22 19:34 ` [bug#30406] " Gábor Boskovits 2018-06-23 2:06 ` Oleg Pykhalov 2021-09-13 0:07 ` bug#30406: " Sarah Morgensen
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/guix.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.