From patchwork Wed Feb 5 03:17:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Wong X-Patchwork-Id: 38218 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 059CC27BBE9; Wed, 5 Feb 2025 03:23:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS 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 D530927BBE2 for ; Wed, 5 Feb 2025 03:23:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tfW0N-0007zs-4F; Tue, 04 Feb 2025 22:23:11 -0500 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 1tfW0G-0007yT-8D for guix-patches@gnu.org; Tue, 04 Feb 2025 22:23:06 -0500 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 1tfW0F-0007W7-V8 for guix-patches@gnu.org; Tue, 04 Feb 2025 22:23:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=8uHP5bRnLHpJ0vmZOaaoNYAGHKooGWZjx7B/CZGrNSw=; b=qAE5ojaoCOpp1OBbxRFbFLQ8jdYmSkjGX55z9HHQG5vPASiMgOLzDXc2RDFPp4nBUT6rc8KFHaA7/feTIHzgW4og7MseGFD2wJ35nWxaEUt/mirCRoeHBaycox5l5AjcVVO7Lv9QVz5wv3/Hi1oQiAHhQbGXgvhCdHtQgr4IoUAdT5iKr4sSh2zYArx0RWzkW0Lz69XHGv8EBKQEL542ypeTzLraTfP1Ed8sYb3jxj0EoQpG2qmbLc5Qo9TuJDd872AAmPxZURtlGvEQcykjWGiST6KrMiJoDtHZkPzr+hqdNZcIYgtYqwx4oclOJFl68IloR49jID+4XyDj5mMayg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tfW0D-0003XT-T9; Tue, 04 Feb 2025 22:23:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75856] [PATCH v3] gnu: eureka: Update to 2.0.2. References: <5a5f68827149799b9b1de94da6d6d14b324ed967.1737887816.git.wongandj@icloud.com> In-Reply-To: <5a5f68827149799b9b1de94da6d6d14b324ed967.1737887816.git.wongandj@icloud.com> Resent-From: Andrew Wong Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 05 Feb 2025 03:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75856 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75856@debbugs.gnu.org Cc: Andrew Wong , 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 75856-submit@debbugs.gnu.org id=B75856.173872572613528 (code B ref 75856); Wed, 05 Feb 2025 03:23:01 +0000 Received: (at 75856) by debbugs.gnu.org; 5 Feb 2025 03:22:06 +0000 Received: from localhost ([127.0.0.1]:47495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tfVzJ-0003W7-FR for submit@debbugs.gnu.org; Tue, 04 Feb 2025 22:22:05 -0500 Received: from qs51p00im-qukt01080302.me.com ([17.57.155.21]:28741) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tfVzE-0003VE-8r for 75856@debbugs.gnu.org; Tue, 04 Feb 2025 22:22:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=8uHP5bRnLHpJ0vmZOaaoNYAGHKooGWZjx7B/CZGrNSw=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=RkjL345Oom9OTUBAvrW/I/yYSdoTPhZiU5VQDR5gEBKInMCNUbZEMWIPsWK6DXWON JxczvE4c5s6Wxe8Hw7a+/o0kemqlYLTFTByra+DPxbq2t3Cu89avj//ZoOGqXoa4DE l32OQBN3EtRf1aDOJ4xd/czdGQH8tG+CE+wOn8Mre46etbxmZ2jZtjfrzGwOPZvHtL CwzPHueDyWJDUUMvOpdEjqZqMDV7YASjWs56hrmpTHDWbz5y+++NUpCDAzg9FYAbCr t+nUyBpMWsSWfaqd7EmbUKvtq0iCyNarmaZDKQ0vel5wWFsrvzjrX4A2OK7DYPdQbi D84wStRRkzVdA== Received: from wongworks.lan (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01080302.me.com (Postfix) with ESMTPSA id 12AA411400BE; Wed, 5 Feb 2025 03:21:49 +0000 (UTC) Date: Tue, 4 Feb 2025 22:17:35 -0500 Message-ID: <032738d899af131ba2d82f03aff6d12d3b1d5779.1738725455.git.wongandj@icloud.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: Bi58I7BJ5_t6BC230IJofy_as6kAZRLq X-Proofpoint-GUID: Bi58I7BJ5_t6BC230IJofy_as6kAZRLq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-05_01,2025-02-04_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 malwarescore=0 clxscore=1015 mlxlogscore=999 mlxscore=0 phishscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2502050022 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 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: , Reply-to: Andrew Wong X-ACL-Warn: , Andrew Wong via Guix-patches X-Patchwork-Original-From: Andrew Wong via Guix-patches via From: Andrew Wong 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 * gnu/packages/game-development.scm (eureka): Update to 2.0.2. [source]: Switch source from tarballs to git. [arguments] : Disable unit tests. : 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(-) base-commit: 5a897c5c95a81278b044c18d962d3bd83131ba06 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 ;;; Copyright © 2024 Nicolas Graves ;;; Copyright © 2024 Maxim Cournoyer +;;; Copyright © 2025 Andrew Wong ;;; ;;; 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