* [bug#75856] [PATCH] gnu: eureka: Update to 2.0.2.
@ 2025-01-26 10:36 Andrew Wong via Guix-patches via
2025-01-26 17:15 ` James Smith via Guix-patches via
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andrew Wong via Guix-patches via @ 2025-01-26 10:36 UTC (permalink / raw)
To: 75856
Cc: Andrew Wong, Adam Faiz, Liliana Marie Prikler,
宋文武
* gnu/packages/game-development.scm (eureka): Update to 2.0.2.
Change-Id: I3ec6694cfd66056cc0b31e23bb6b237c1e591925
---
gnu/packages/game-development.scm | 67 +++++++++++++------------------
1 file changed, 28 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 899b72d741..e38b0723ec 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2407,47 +2407,36 @@ (define-public entt
(define-public eureka
(package
(name "eureka")
- (version "1.24")
+ (version "2.0.2")
(source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/"
- version "/eureka-"
- ;; version without dots e.g 1.21 => 121
- (string-join (string-split version #\.) "")
- "-source.tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ioan-chera/eureka-editor")
+ (commit (string-append "eureka-" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32
- "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v"))))
- (build-system gnu-build-system)
- (arguments
- '(#:tests? #f
- #:make-flags
- (let ((out (assoc-ref %outputs "out")))
- (list (string-append "PREFIX=" out)))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'prepare-install-directories
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (mkdir-p (string-append out "/bin"))
- (mkdir-p (string-append out "/share"))
-
- (with-fluids ((%default-port-encoding #f))
- (substitute* "./src/main.cc"
- (("/usr/local") out)))
-
- (substitute* "Makefile"
- (("-o root") ""))))))))
- (inputs `(("mesa" ,mesa)
- ("libxft" ,libxft)
- ("libxinerama" ,libxinerama)
- ("libfontconfig" ,fontconfig)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("fltk" ,fltk)
- ("zlib" ,zlib)))
- (native-inputs (list pkg-config xdg-utils))
+ (base32 "10bq7kr7vidrlw5l1mq35x83xsrzb9lhdzqdr07gkj40x0w493a0"))
+ ))
+ (build-system cmake-build-system)
+ (arguments '(#:tests? #f
+ #:configure-flags (list "-DENABLE_UNIT_TESTS=OFF")
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'prepare-install-directories
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (with-fluids ((%default-port-encoding #f))
+ (substitute* "./src/main.cc"
+ (("/usr/local") out)))))))))
+ (native-inputs (list xdg-utils))
+ (inputs (list fltk
+ libxft
+ libxinerama
+ fontconfig
+ libjpeg-turbo
+ libpng
+ libxpm
+ glu
+ zlib))
(synopsis "Doom map editor")
(description "Eureka is a map editor for the classic DOOM games, and a few
related games such as Heretic and Hexen. It comes with a 3d preview mode and
base-commit: 87045f0982bd7aebb07b380cbf322651227546f4
--
2.47.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#75856] [PATCH] gnu: eureka: Update to 2.0.2.
2025-01-26 10:36 [bug#75856] [PATCH] gnu: eureka: Update to 2.0.2 Andrew Wong via Guix-patches via
@ 2025-01-26 17:15 ` James Smith via Guix-patches via
2025-01-27 2:36 ` [bug#75856] [PATCH v2] " Andrew Wong via Guix-patches via
2025-02-05 3:17 ` [bug#75856] [PATCH v3] " Andrew Wong via Guix-patches via
2 siblings, 0 replies; 6+ messages in thread
From: James Smith via Guix-patches via @ 2025-01-26 17:15 UTC (permalink / raw)
To: 75856; +Cc: iyzsong, adam.faiz, wongandj, liliana.prikler
Andrew Wong via Guix-patches via <guix-patches@gnu.org> writes:
Hi,
> * gnu/packages/game-development.scm (eureka): Update to 2.0.2.
>
Changes made below should be documented here.
> Change-Id: I3ec6694cfd66056cc0b31e23bb6b237c1e591925
> ---
> gnu/packages/game-development.scm | 67 +++++++++++++------------------
> 1 file changed, 28 insertions(+), 39 deletions(-)
>
> diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
> index 899b72d741..e38b0723ec 100644
> --- a/gnu/packages/game-development.scm
> +++ b/gnu/packages/game-development.scm
> @@ -2407,47 +2407,36 @@ (define-public entt
> (define-public eureka
> (package
> (name "eureka")
> - (version "1.24")
> + (version "2.0.2")
> (source (origin
^
Nitpick: Should probably add an indention here.
> - (method url-fetch)
> - (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/"
> - version "/eureka-"
> - ;; version without dots e.g 1.21 => 121
> - (string-join (string-split version #\.) "")
> - "-source.tar.gz"))
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/ioan-chera/eureka-editor")
> + (commit (string-append "eureka-" version))))
> + (file-name (git-file-name name version))
Should document switching source from tarballs to git.
> (sha256
> - (base32
> - "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v"))))
> - (build-system gnu-build-system)
> - (arguments
> - '(#:tests? #f
> - #:make-flags
> - (let ((out (assoc-ref %outputs "out")))
> - (list (string-append "PREFIX=" out)))
> - #:phases
> - (modify-phases %standard-phases
> - (delete 'configure)
> - (add-before 'build 'prepare-install-directories
> - (lambda* (#:key outputs #:allow-other-keys)
> - (let ((out (assoc-ref outputs "out")))
> - (mkdir-p (string-append out "/bin"))
> - (mkdir-p (string-append out "/share"))
> -
> - (with-fluids ((%default-port-encoding #f))
> - (substitute* "./src/main.cc"
> - (("/usr/local") out)))
> -
> - (substitute* "Makefile"
> - (("-o root") ""))))))))
> - (inputs `(("mesa" ,mesa)
> - ("libxft" ,libxft)
> - ("libxinerama" ,libxinerama)
> - ("libfontconfig" ,fontconfig)
> - ("libjpeg" ,libjpeg-turbo)
> - ("libpng" ,libpng)
> - ("fltk" ,fltk)
> - ("zlib" ,zlib)))
> - (native-inputs (list pkg-config xdg-utils))
> + (base32 "10bq7kr7vidrlw5l1mq35x83xsrzb9lhdzqdr07gkj40x0w493a0"))
> + ))
^
Please don't leave parenthesises hanging.
> + (build-system cmake-build-system)
> + (arguments '(#:tests? #f
> + #:configure-flags (list "-DENABLE_UNIT_TESTS=OFF")
Question: Can tests be enabled?
> + #:phases (modify-phases %standard-phases
> + (add-after 'unpack 'prepare-install-directories
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let ((out (assoc-ref outputs "out")))
> + (with-fluids ((%default-port-encoding #f))
> + (substitute* "./src/main.cc"
> + (("/usr/local") out)))))))))
If you're reformatting the arguments field, you should go ahead and
switch to G-Exps while you're at it.
> + (native-inputs (list xdg-utils))
> + (inputs (list fltk
^
Nitpick: Quite a bit of whitespace, maybe add an indention after inputs?
> + libxft
> + libxinerama
> + fontconfig
> + libjpeg-turbo
> + libpng
> + libxpm
> + glu
> + zlib))
> (synopsis "Doom map editor")
> (description "Eureka is a map editor for the classic DOOM games, and a few
> related games such as Heretic and Hexen. It comes with a 3d preview mode and
>
> base-commit: 87045f0982bd7aebb07b380cbf322651227546f4
Overall, looking good. Can you send a v2?
James Smith
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#75856] [PATCH v2] gnu: eureka: Update to 2.0.2.
2025-01-26 10:36 [bug#75856] [PATCH] gnu: eureka: Update to 2.0.2 Andrew Wong via Guix-patches via
2025-01-26 17:15 ` James Smith via Guix-patches via
@ 2025-01-27 2:36 ` Andrew Wong via Guix-patches via
2025-01-27 18:00 ` Liliana Marie Prikler
2025-02-05 3:17 ` [bug#75856] [PATCH v3] " Andrew Wong via Guix-patches via
2 siblings, 1 reply; 6+ messages in thread
From: Andrew Wong via Guix-patches via @ 2025-01-27 2:36 UTC (permalink / raw)
To: 75856
Cc: Andrew Wong, Adam Faiz, Liliana Marie Prikler,
宋文武
* gnu/packages/game-development.scm (eureka): Update to 2.0.2.
[source]: Switch source from obsolete tarballs to git.
[arguments] <configure-flags>: Disable unit tests.
<phases>: Revise 'prepare-install-directories for new build system.
Change-Id: I3ec6694cfd66056cc0b31e23bb6b237c1e591925
---
Here is v2. James: I cannot enable tests because doing so causes an attempt to
download and compile googletests, even if it's already present in native-inputs.
gnu/packages/game-development.scm | 76 ++++++++++++++-----------------
1 file changed, 35 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 899b72d741..95816c03d4 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2407,49 +2407,43 @@ (define-public entt
(define-public eureka
(package
(name "eureka")
- (version "1.24")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/"
- version "/eureka-"
- ;; version without dots e.g 1.21 => 121
- (string-join (string-split version #\.) "")
- "-source.tar.gz"))
- (sha256
- (base32
- "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v"))))
- (build-system gnu-build-system)
+ (version "2.0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ioan-chera/eureka-editor")
+ (commit (string-append "eureka-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "10bq7kr7vidrlw5l1mq35x83xsrzb9lhdzqdr07gkj40x0w493a0"))))
+ (build-system cmake-build-system)
(arguments
- '(#:tests? #f
- #:make-flags
- (let ((out (assoc-ref %outputs "out")))
- (list (string-append "PREFIX=" out)))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'prepare-install-directories
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (mkdir-p (string-append out "/bin"))
- (mkdir-p (string-append out "/share"))
-
- (with-fluids ((%default-port-encoding #f))
- (substitute* "./src/main.cc"
- (("/usr/local") out)))
-
- (substitute* "Makefile"
- (("-o root") ""))))))))
- (inputs `(("mesa" ,mesa)
- ("libxft" ,libxft)
- ("libxinerama" ,libxinerama)
- ("libfontconfig" ,fontconfig)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("fltk" ,fltk)
- ("zlib" ,zlib)))
- (native-inputs (list pkg-config xdg-utils))
+ (list
+ #:tests? #f ;tests cause attempted download/build of googletests.
+ #:configure-flags #~(list "-DENABLE_UNIT_TESTS=OFF")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'prepare-install-directories
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (with-fluids ((%default-port-encoding #f))
+ (substitute* "./src/main.cc"
+ (("/usr/local")
+ out)))))))))
+ (native-inputs (list xdg-utils))
+ (inputs
+ (list fltk
+ libxft
+ libxinerama
+ fontconfig
+ libjpeg-turbo
+ libpng
+ libxpm
+ glu
+ zlib))
(synopsis "Doom map editor")
- (description "Eureka is a map editor for the classic DOOM games, and a few
+ (description
+ "Eureka is a map editor for the classic DOOM games, and a few
related games such as Heretic and Hexen. It comes with a 3d preview mode and
a 2D editor view.")
(home-page "https://eureka-editor.sourceforge.net/")
base-commit: 87045f0982bd7aebb07b380cbf322651227546f4
--
2.47.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#75856] [PATCH v2] gnu: eureka: Update to 2.0.2.
2025-01-27 2:36 ` [bug#75856] [PATCH v2] " Andrew Wong via Guix-patches via
@ 2025-01-27 18:00 ` Liliana Marie Prikler
2025-01-27 23:18 ` Andrew Wong via Guix-patches via
0 siblings, 1 reply; 6+ messages in thread
From: Liliana Marie Prikler @ 2025-01-27 18:00 UTC (permalink / raw)
To: Andrew Wong, 75856; +Cc: 宋文武, Adam Faiz
Am Sonntag, dem 26.01.2025 um 21:36 -0500 schrieb Andrew Wong:
> * gnu/packages/game-development.scm (eureka): Update to 2.0.2.
> [source]: Switch source from obsolete tarballs to git.
Prefer less loaded language. "Switch from tarballs to git." suffices.
> [arguments] <configure-flags>: Disable unit tests.
> <phases>: Revise 'prepare-install-directories for new build system.
>
> Change-Id: I3ec6694cfd66056cc0b31e23bb6b237c1e591925
> ---
> Here is v2. James: I cannot enable tests because doing so causes an
> attempt to download and compile googletests, even if it's already
> present in native-inputs.
In other words: there's some unbundling to do :)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#75856] [PATCH v2] gnu: eureka: Update to 2.0.2.
2025-01-27 18:00 ` Liliana Marie Prikler
@ 2025-01-27 23:18 ` Andrew Wong via Guix-patches via
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Wong via Guix-patches via @ 2025-01-27 23:18 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: 75856
> Prefer less loaded language. "Switch from tarballs to git." suffices.
Sorry, I meant to convey that the switch was made from tarballs because
the project doesn't use them for source distribution anymore :)
> In other words: there's some unbundling to do :)
noted, will work on that for v3.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#75856] [PATCH v3] gnu: eureka: Update to 2.0.2.
2025-01-26 10:36 [bug#75856] [PATCH] gnu: eureka: Update to 2.0.2 Andrew Wong via Guix-patches via
2025-01-26 17:15 ` James Smith via Guix-patches via
2025-01-27 2:36 ` [bug#75856] [PATCH v2] " Andrew Wong via Guix-patches via
@ 2025-02-05 3:17 ` Andrew Wong via Guix-patches via
2 siblings, 0 replies; 6+ messages in thread
From: Andrew Wong via Guix-patches via @ 2025-02-05 3:17 UTC (permalink / raw)
To: 75856
Cc: Andrew Wong, Adam Faiz, Liliana Marie Prikler,
宋文武
* gnu/packages/game-development.scm (eureka): Update to 2.0.2.
[source]: Switch source from tarballs to git.
[arguments] <configure-flags>: Disable unit tests.
<phases>: Revise 'prepare-install-directories for new build system.
Change-Id: I6114be8ef3b05ceb6b80efef29e20da9451b3dbc
---
Here's v3. Liliana: I tried to unbundle googletest by replacing the FetchContent block with find_package, but I ran into an issue with ld not finding certain symbols in the googletest package; it seems like it depends on the source itself, somehow.
gnu/packages/game-development.scm | 75 +++++++++++++++----------------
1 file changed, 35 insertions(+), 40 deletions(-)
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index dc642bf052..149962a3e1 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -31,6 +31,7 @@
;;; Copyright © 2023, 2024 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2407,47 +2408,41 @@ (define-public entt
(define-public eureka
(package
(name "eureka")
- (version "1.24")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/"
- version "/eureka-"
- ;; version without dots e.g 1.21 => 121
- (string-join (string-split version #\.) "")
- "-source.tar.gz"))
- (sha256
- (base32
- "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v"))))
- (build-system gnu-build-system)
+ (version "2.0.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ioan-chera/eureka-editor")
+ (commit (string-append "eureka-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "10bq7kr7vidrlw5l1mq35x83xsrzb9lhdzqdr07gkj40x0w493a0"))
+ (patches (search-patches "eureka-unbundle-googletest.patch"))))
+ (build-system cmake-build-system)
(arguments
- '(#:tests? #f
- #:make-flags
- (let ((out (assoc-ref %outputs "out")))
- (list (string-append "PREFIX=" out)))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'prepare-install-directories
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (mkdir-p (string-append out "/bin"))
- (mkdir-p (string-append out "/share"))
-
- (with-fluids ((%default-port-encoding #f))
- (substitute* "./src/main.cc"
- (("/usr/local") out)))
-
- (substitute* "Makefile"
- (("-o root") ""))))))))
- (inputs `(("mesa" ,mesa)
- ("libxft" ,libxft)
- ("libxinerama" ,libxinerama)
- ("libfontconfig" ,fontconfig)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("fltk" ,fltk)
- ("zlib" ,zlib)))
- (native-inputs (list pkg-config xdg-utils))
+ (list
+ #:tests? #f ;tests cause attempted download/build of googletests.
+ #:configure-flags #~(list "-DENABLE_UNIT_TESTS=OFF")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'prepare-install-directories
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (with-fluids ((%default-port-encoding #f))
+ (substitute* "./src/main.cc"
+ (("/usr/local")
+ out)))))))))
+ (native-inputs (list xdg-utils))
+ (inputs
+ (list fltk
+ libxft
+ libxinerama
+ fontconfig
+ libjpeg-turbo
+ libpng
+ libxpm
+ glu
+ zlib))
(synopsis "Doom map editor")
(description "Eureka is a map editor for the classic DOOM games, and a few
related games such as Heretic and Hexen. It comes with a 3d preview mode and
base-commit: 5a897c5c95a81278b044c18d962d3bd83131ba06
--
2.48.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-02-05 3:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-26 10:36 [bug#75856] [PATCH] gnu: eureka: Update to 2.0.2 Andrew Wong via Guix-patches via
2025-01-26 17:15 ` James Smith via Guix-patches via
2025-01-27 2:36 ` [bug#75856] [PATCH v2] " Andrew Wong via Guix-patches via
2025-01-27 18:00 ` Liliana Marie Prikler
2025-01-27 23:18 ` Andrew Wong via Guix-patches via
2025-02-05 3:17 ` [bug#75856] [PATCH v3] " Andrew Wong via Guix-patches via
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).