From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id mIg4M2BKuGboJgEAqHPOHw:P1 (envelope-from ) for ; Sun, 11 Aug 2024 05:21:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id mIg4M2BKuGboJgEAqHPOHw (envelope-from ) for ; Sun, 11 Aug 2024 07:21:36 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=fTE4jf8g; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=QSyKLOlN; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1723353696; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=/pyChboce8rPD4UbtNvHJX+VB2+RifaL7IxD8KnPRK4=; b=LRwHy7xsVK26imcPngU5Ldtq7i9XQQXFu5Zde8Wv4QoqtM6y2lYnuEqvPscnp/1cFR5qMO rzJNN25j1hemRDhFanl+PHZcoDcvPkkKMRz5htiyi5RTchbfO++wMPrgx0YpxGLY7qAkFX z7EwVFni4sJjiLsG+n+irbd9PAEbq6fVGow74tLROLlu912u3UYIT22p5pjfH5sm0u+EWi GCsIlalABr1F7RteRa6y8iY9lvjD77bySYqEMo6voaQSnXZWWlePyTKktlAdexx8Pgxdht Tk5pSd76v9D1iCLq/39YUbC5sB7F8Ndiyustr8diD1FO0spW5CCVKFTP7f+RHw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=fTE4jf8g; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=QSyKLOlN; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1723353696; a=rsa-sha256; cv=none; b=uFg8huDwPojhVA4Jm/0TpQ/xeG1cF9x1W2juhCst/czeKVD4HuHZFGgfh2Cyi9DgxKmnUB tNeos0XKnDoz+NL9egTb9UjtxWBPSaNVDiMl1+V7/DzpXiSAZ9Mm5615g3uEYvclJGG71v ynLfB1TcCwEgYlIBouP962KZIu4jkxNcmzGNtbSxpBpotKb1IEsizJ7nMj0uC3glVAYDpU sdrH5YnTG5dCt5Tj12tYlrcRwRXGYBZ/beLK4h6EogX0ig1n5a/LILg8C2y9QBvZAIJub3 c0jsFgPbSb+oFikooVnlQUIMP1kkFDvXDltnA35psPafyqJEJQb9E/w9gSGJxA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 94C06715A4 for ; Sun, 11 Aug 2024 07:21:36 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sd11J-0004Nu-Jg; Sun, 11 Aug 2024 01:21:33 -0400 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 1sd11I-0004M7-7l for guix-patches@gnu.org; Sun, 11 Aug 2024 01:21:32 -0400 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 1sd11H-0006fU-Js for guix-patches@gnu.org; Sun, 11 Aug 2024 01:21:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:MIME-Version:Date:To:In-Reply-To:References:Subject; bh=/pyChboce8rPD4UbtNvHJX+VB2+RifaL7IxD8KnPRK4=; b=fTE4jf8g6wMxDApXAc77syZMzEnPoQs7/VDuzOabCf2xsOd6ZTrKZCRgdpEKIOEjq6c6OM1qJOqmmcx6dJKwVfo0O0nrPSI9+pdcsSMOOkbG+SL0LJMHIuFunO4LFFWyEMqaNMkkbwQaocT5llplZ8FfVjta2+2MAUneq5URJ3oFymoPRRixxXuAZYYg+6AS4tjNb+SsJdYv8ylYYNiyosS/oJjjEy4nE4PeATBc5kefrCLx+FfuxxvS+aLqsLO7O0qLeeMmQJzchRpoT+sdBGpFsIW5zjLxKjkEQ17zgNTHa72Vc5Y2wwUEu872UnfqrqduQUiRQoVOz0RRwUEJfA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sd11l-00080K-O7 for guix-patches@gnu.org; Sun, 11 Aug 2024 01:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72569] [PATCH 4/4] gnu: openclonk: Use gexps and new input style. References: <59b04394-4737-6da3-cf9e-3f181431afa8@disroot.org> In-Reply-To: <59b04394-4737-6da3-cf9e-3f181431afa8@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Aug 2024 05:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72569 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72569@debbugs.gnu.org Received: via spool by 72569-submit@debbugs.gnu.org id=B72569.172335367230680 (code B ref 72569); Sun, 11 Aug 2024 05:22:01 +0000 Received: (at 72569) by debbugs.gnu.org; 11 Aug 2024 05:21:12 +0000 Received: from localhost ([127.0.0.1]:40580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd10y-0007yl-54 for submit@debbugs.gnu.org; Sun, 11 Aug 2024 01:21:12 -0400 Received: from layka.disroot.org ([178.21.23.139]:43146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd10w-0007yd-7B for 72569@debbugs.gnu.org; Sun, 11 Aug 2024 01:21:10 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6940F41ABE for <72569@debbugs.gnu.org>; Sun, 11 Aug 2024 07:20:39 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7rd-m5YpYYHY for <72569@debbugs.gnu.org>; Sun, 11 Aug 2024 07:20:38 +0200 (CEST) Message-ID: <0b7c8992-c811-a2bb-9229-52c50698b925@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1723353638; bh=M0yUfSfuRE+71QPNT/sd+PMaf2p4eSc2tyVn8ZBXblE=; h=Date:To:From:Subject; b=QSyKLOlNqvoEej3a0wnXbgJ/y+S4Sd8UQvpgADlL93LjRb0m6/8McQnhOu0wNfY/G AOjFd5AOeUVTmGSIM4U4MiOKJrqQ+N3Fqpnx+EFIL+9+ipXDhUgZI7h/RvrJgfxCFN YfXsmyOCnhYmEt+SWLiUptXAjUvBYU6PW7HilikThDJum9VuIKd0KQA2la1gf6RogO s7zqf/nW8Y1LJb7oRFb6N5yMmWFJ8JI6XSEeK1LcWR7fmiv8Ufpo72lI4cbBVecpx7 o+w9K2Cj9I+MZX7Wd+UBJPreRlQCQ9lLDkSalGRp1Wglk9pxiiIm1FsbGmQh1381cl 2ZCoynIRrB8eQ== Date: Sun, 11 Aug 2024 13:20:14 +0800 MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches From: Adam Faiz via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -6.95 X-Migadu-Queue-Id: 94C06715A4 X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.95 X-TUID: zNeg02Zb2weU >From 6059afbbe3f6a841021193775c1bf1d317dafefe Mon Sep 17 00:00:00 2001 Message-ID: <6059afbbe3f6a841021193775c1bf1d317dafefe.1723353069.git.adam.faiz@disroot.org> In-Reply-To: References: From: AwesomeAdam54321 Date: Sun, 11 Aug 2024 12:50:34 +0800 Subject: [PATCH 4/4] gnu: openclonk: Use gexps and new input style. * gnu/packages/games.scm (openclonk)[arguments]: Use gexps. [source]: Reindent. [native-inputs]: Drop labels. [inputs]: Drop labels. --- gnu/packages/games.scm | 177 +++++++++++++++++++++-------------------- 1 file changed, 90 insertions(+), 87 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 504dfe74de..d8e7dc88fa 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9616,97 +9616,100 @@ (define-public openclonk (package (name "openclonk") (version "8.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.openclonk.org/builds/release/" version "/" - "openclonk-" version "-src.tar.bz2")) - (sha256 - (base32 - "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik")) - (modules '((guix build utils))) - (snippet - #~(begin - (delete-file-recursively "thirdparty") - (substitute* "CMakeLists.txt" - (("add_subdirectory\\(thirdparty/.*\\)") "") - (("set_property\\(.*Third-party.*\\)") "") - (("blake2") "b2") - (("thirdparty/timsort/sort\\.h") "") - (("thirdparty/pcg/.*\\.hpp") "")) - (substitute* '("src/lib/C4Random.cpp" - "src/landscape/C4Particles.h") - (("#include ") - "#include ")) - (substitute* "src/script/C4ScriptLibraries.cpp" - (("blake2b.hash_output.get.., raw_output_length, data, data_length, nullptr, 0.") - "blake2b(hash_output.get(), (const void*)raw_output_length, data, data_length, (size_t)(0), 0)")) - (substitute* '("src/script/C4AulParse.cpp" - "src/editor/C4EditCursor.cpp" - "src/gui/C4ScriptGuiWindow.cpp") - (("#include .C4Include\\.h." all) - (string-append "#include \n" all))) - (substitute* "src/lib/StdMesh.cpp" - (("#include .timsort/sort\\.h.") - "#include ")))))) + (source + (origin + (method url-fetch) + (uri (string-append + "https://www.openclonk.org/builds/release/" version "/" + "openclonk-" version "-src.tar.bz2")) + (sha256 + (base32 + "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik")) + (modules '((guix build utils))) + (snippet + #~(begin + (delete-file-recursively "thirdparty") + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(thirdparty/.*\\)") "") + (("set_property\\(.*Third-party.*\\)") "") + (("blake2") "b2") + (("thirdparty/timsort/sort\\.h") "") + (("thirdparty/pcg/.*\\.hpp") "")) + (substitute* '("src/lib/C4Random.cpp" + "src/landscape/C4Particles.h") + (("#include ") + "#include ")) + (substitute* "src/script/C4ScriptLibraries.cpp" + (("blake2b.hash_output.get.., raw_output_length, data, data_length, nullptr, 0.") + "blake2b(hash_output.get(), (const void*)raw_output_length, data, data_length, (size_t)(0), 0)")) + (substitute* '("src/script/C4AulParse.cpp" + "src/editor/C4EditCursor.cpp" + "src/gui/C4ScriptGuiWindow.cpp") + (("#include .C4Include\\.h." all) + (string-append "#include \n" all))) + (substitute* "src/lib/StdMesh.cpp" + (("#include .timsort/sort\\.h.") + "#include ")))))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DAudio_TK=OpenAL") - #:test-target "tests" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'prepare-gmock - (lambda* (#:key inputs #:allow-other-keys) - (mkdir "gmock") - (copy-recursively (assoc-ref inputs "googlemock") "gmock") - (substitute* "tests/CMakeLists.txt" - (("/usr/src/gmock") - (string-append (getcwd) "/gmock/googlemock")) - (("/usr/src/gtest") - (string-append (getcwd) "/gmock/googletest")) - (("PATH_SUFFIXES \"src\" \"gtest\"") - "PATH_SUFFIXES \"src\"")) - #t)) - (add-after 'prepare-gmock 'lax-freealut-requirement - ;; TODO: We provide freealut 1.1.0, but pkg-config somehow detects - ;; it as 1.0.1. Force minimal version. - (lambda _ - (substitute* "cmake/FindAudio.cmake" - (("freealut>=1.1.0") "freealut>=1.0.1")) - #t)) - (add-after 'lax-freealut-requirement 'fix-directories - ;; Prefer "$out/share/openclonk" over - ;; "$out/share/games/openclonk". Also install "openclonk" - ;; binary in "bin/", not "games/". - (lambda _ - (substitute* "CMakeLists.txt" - (("share/games/openclonk") "share/openclonk") - (("TARGETS openclonk DESTINATION games") - "TARGETS openclonk DESTINATION bin")) - #t))))) + (list + #:configure-flags + #~(list "-DAudio_TK=OpenAL") + #:test-target "tests" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-gmock + (lambda* (#:key inputs #:allow-other-keys) + (let ((gmock (search-input-directory inputs "/googlemock")) + (gtest (search-input-directory inputs "/googletest"))) + (mkdir "gmock") + (copy-recursively gmock "gmock/googlemock") + (copy-recursively gtest "gmock/googletest") + (substitute* "tests/CMakeLists.txt" + (("/usr/src/gmock") + (string-append (getcwd) "/gmock/googlemock")) + (("/usr/src/gtest") + (string-append (getcwd) "/gmock/googletest")) + (("PATH_SUFFIXES \"src\" \"gtest\"") + "PATH_SUFFIXES \"src\""))))) + (add-after 'prepare-gmock 'lax-freealut-requirement + ;; TODO: We provide freealut 1.1.0, but pkg-config somehow detects + ;; it as 1.0.1. Force minimal version. + (lambda _ + (substitute* "cmake/FindAudio.cmake" + (("freealut>=1.1.0") "freealut>=1.0.1")))) + (add-after 'lax-freealut-requirement 'fix-directories + ;; Prefer "$out/share/openclonk" over + ;; "$out/share/games/openclonk". Also install "openclonk" + ;; binary in "bin/", not "games/". + (lambda _ + (substitute* "CMakeLists.txt" + (("share/games/openclonk") "share/openclonk") + (("TARGETS openclonk DESTINATION games") + "TARGETS openclonk DESTINATION bin"))))))) (native-inputs - `(("googlemock" ,(package-source googletest)) - ("googletest" ,googletest) - ("pkg-config" ,pkg-config))) + (list (package-source googletest) + googletest + pkg-config)) (inputs - `(("freealut" ,freealut) - ("freetype" ,freetype) - ("glew" ,glew) - ("libb2" ,libb2) - ("libjpeg" ,libjpeg-turbo) - ("libogg" ,libogg) - ("libpng" ,libpng) - ("libvorbis" ,libvorbis) - ("libxrandr" ,libxrandr) - ("mesa" ,mesa) - ("miniupnpc" ,miniupnpc) - ("openal" ,openal) - ("pcg-cpp" ,pcg-cpp) - ("qtbase" ,qtbase-5) - ("readline" ,readline) - ("sdl" ,sdl2) - ("sort-h" ,sort-h) - ("tinyxml" ,tinyxml))) + (list freealut + freetype + glew + libb2 + libjpeg-turbo + libogg + libpng + libvorbis + libxrandr + mesa + miniupnpc + openal + pcg-cpp + qtbase-5 + readline + sdl2 + sort-h + tinyxml)) (home-page "https://www.openclonk.org/") (synopsis "Multiplayer action game where you control small and nimble humanoids") -- 2.41.0