From patchwork Tue Mar 7 13:33:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kjartan Oli Agustsson X-Patchwork-Id: 47774 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 F418F16DD7; Tue, 7 Mar 2023 14:09:36 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 DDD8E16DD6 for ; Tue, 7 Mar 2023 14:09:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZY0C-0005tD-HM; Tue, 07 Mar 2023 09:09:16 -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 1pZXWw-0004Oo-GI for guix-patches@gnu.org; Tue, 07 Mar 2023 08:39:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZXWw-0005hX-8d for guix-patches@gnu.org; Tue, 07 Mar 2023 08:39:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZXWw-0003dm-4E for guix-patches@gnu.org; Tue, 07 Mar 2023 08:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62035] [PATCH] gnu: warzone2100: Update to 4.3.3. Resent-From: Kjartan Oli Agustsson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Mar 2023 13:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62035@debbugs.gnu.org Cc: Kjartan Oli Agustsson X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167819632713972 (code B ref -1); Tue, 07 Mar 2023 13:39:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 Mar 2023 13:38:47 +0000 Received: from localhost ([127.0.0.1]:44832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZXWh-0003dH-2U for submit@debbugs.gnu.org; Tue, 07 Mar 2023 08:38:47 -0500 Received: from lists.gnu.org ([209.51.188.17]:45840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZXWe-0003d9-QS for submit@debbugs.gnu.org; Tue, 07 Mar 2023 08:38:45 -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 1pZXWe-0004Fk-GN for guix-patches@gnu.org; Tue, 07 Mar 2023 08:38:44 -0500 Received: from mail-db3eur04olkn0803.outbound.protection.outlook.com ([2a01:111:f400:fe0c::803] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZXWc-0005eZ-Sd for guix-patches@gnu.org; Tue, 07 Mar 2023 08:38:44 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m8IBwL2/V8SM7CmUsS0bL2Vm+8RimjtqCkvhW4XPWimObvaV/X6vpELcZlpLeR/IUT8ER8fPhRfEpF1wpMYyIoYJVMNxDwNmPp0Ut/sHLeeTW+vWv2x9whndbb64NRNRvzwPPEiqpeifG3quKl18parHA7JL+eMntRSG3u3sfYbHCTk5ATbVlW0QxmsZY646CbGeCkkem6GMjJUWfKATBfjjAEHn4mUO3m8rL82CQ/ly5SxjiOJdKpWvErUEzyqrpvAZGLJf126eULmeASpeIcdlBu6lZqk8yfDBmX6/riMsNTTxK8zNCjLdx4PVRozIJTQ0gsNxaW6B+tM/zh0Pcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aiKH+DZ1Mt8oska9Lhng8EaXFIfSVq+kN1QfqGV2zCE=; b=b4h7Z5aQX0OMlzQIYCh6+b+s2JpPojJz5nZebFKRUQ0gz9NP5b4mKpfVzD7vHZ7kpDlhTmQ7Gu+simEQNsK4Sz1SD0OApST5enflD75roXQC3O7DddMExbGrYJ7pv9JKLe22sNCGKgxPpneh6ArTwtUNsyDvOJ1R4qLMc+1dBA+lApTq8JR6mtj2dIxEtocwaSpRuUgs+lN2un96kiRtQeHyKvovNDifaXPaWu5WvYntVi6Y2SR1D1yqEtNj5ggpGcY9zH+DNHAMz1ER00McK/z4CQyIn8VbI6cnHCtGZcf/almuVaKGf7Sdb6L+wIZTc9SQF2S7pvVUs6dMmoIbKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aiKH+DZ1Mt8oska9Lhng8EaXFIfSVq+kN1QfqGV2zCE=; b=rw8tWUKCmihIm7ON5corR4TD4Ef8S7+AWYKu3W+M8rcWZiaEyzloHO8R5iIcCiN6WTPlO72pkdIX0mykAWETuUe9Ribw3Dkp09Ck09XTG1Kg8kuitG8B9/VAJuAC3HsmO+5hsBGoVeYAASb5rXsRJKcADm8b1nSMF1E+kljdeq+GyB9BdpoSt9b97Xe+iOrP5fLKADe8dDXaLUlAzYyWCWNt0pUJ21ipF1NFowcg1cSQb/+KYvV/c4tkUWAunoIV2+/2gKcf1/Jpy04ns3tpVIWJj3Vm60ZiRHViKICAomAz5GR1AidfB5l5PKiNNotJzYbo9C7bL04kRYYn7Kzyzw== Received: from GV1P193MB2310.EURP193.PROD.OUTLOOK.COM (2603:10a6:150:2a::20) by DB8P193MB0728.EURP193.PROD.OUTLOOK.COM (2603:10a6:10:152::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.29; Tue, 7 Mar 2023 13:33:39 +0000 Received: from GV1P193MB2310.EURP193.PROD.OUTLOOK.COM ([fe80::2141:d38d:580d:5b0d]) by GV1P193MB2310.EURP193.PROD.OUTLOOK.COM ([fe80::2141:d38d:580d:5b0d%8]) with mapi id 15.20.6156.029; Tue, 7 Mar 2023 13:33:39 +0000 From: Kjartan Oli Agustsson Date: Tue, 7 Mar 2023 13:33:07 +0000 Message-ID: X-Mailer: git-send-email 2.39.2 X-TMN: [FmVD6F+Aev0lilZaQItE3fyIRTRkjZDearME8N0ikrCxL6p9kI6qW8LcEgtl0WlJ] X-ClientProxiedBy: LO6P265CA0014.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:339::12) To GV1P193MB2310.EURP193.PROD.OUTLOOK.COM (2603:10a6:150:2a::20) X-Microsoft-Original-Message-ID: <20230307133307.32663-1-kjartanoli@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P193MB2310:EE_|DB8P193MB0728:EE_ X-MS-Office365-Filtering-Correlation-Id: 98117e05-2e2f-4573-b0d0-08db1f108f4d X-MS-Exchange-SLBlob-MailProps: V85gaVfRD496S4nFig/hK+GPraLbWtCuBAai9LaKP72Mb+OgtBXbxpBlif8kYPlKvVxtEU4AxaBZi6383Z/WCpfwmWB/u4gUgKJtmdb64NaYNWVule45k673zYWCxnoZxiqyFOMYCMy7fcxGhOxLJvCcZPUUQsjwuM94UoeQobLn6fjKbVga3C5avk51biszvCcQKHjOuwNz4wjekG5KjbYaLRXeLL0TBGSiPCKI23qTQgwC8dKkfE3qV6uB4waSphJQMaSMm21SQgk1xnIwtdcWyCKzLwxtdXRb1hpNT4vXu7fLeHdt3ei7ZFx5Mr61a3tQWwNfl0F8FHQETyXwGEnt9Tc/0CvRShfaLGNwItZg2wk5rCPxyGdk0Gf5Tb6tRgFCtMx9t0iRChM36Rv32jWWAiPSv/BAwsuxJFnXT4OxyQ6uN+78oywV1dI/IioLsN45WTqtLxgvMLhlDNCcAE+qUWtJpqbSP/fEayIadudq9TApsWPNHobFealsWzhT1DAcU9ekltmEf2iIQlyanV8GIWqqXW/7UBkwcsL9Zq4JrJDzX8bDw8GFRgegEkTenbLo2B5yCj8rNwQ5/MTz6NHAAxumZFmed/CPci/qdEeDqLN0gaDTwktJuYCEc+LBDLRM9FPuBaq6EP3js59EmrqYmTCbBpGU6xTZ8ysKen9wLEPefxdetA5h0RED6GPI6O35fZkHHysiKQ6/iDOHnrvj6gRN+2wee4YViu7NR1ndThcErE12fEopMAQu1CostddxqVE3e4z/79IXGUz1CSbLbsELUQirRBQso0DpEE0rUJopcP4RRVOow6W04Cc9XcS/xrzxlyhV7c7VQH7IZw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AETfbPrhrDbbeGp+Y71Wl3L7dVV/awYrRCwRqyG0lPStLWKrZygXsukm/CzVM1KtfwhVQxcWZupz5McbL+mK5UiTr6ue4J/F0Ep8W0yELpPebn0X3OOuwBJxHLMpQ5ZyebCPdyv8nqakjROoUq51C288Rrd7LTNBonKP9qjFDfcZ69QUCKmoqXXa2e9ocYKnhGjr3oGwhhY3MNUpq8659XEgadymKEc8ZQPKVyRE/CB2SeXUNav2iys0rsGaKh+/Y3w1btL849IhABp82GLdVqlvba/rdPeyRNe8SQkeLaSUXCpBSogQm6E4e9Jalw3a7gRyL7WW1WiKkr5lFh9nUT+Gea9MCfihPJBKNSXHGZVDUlzFarPy+ZwygPt5en8wYl0vrSqrrqxQ/WeVsfMdHWydzMnq9BmP9VPkY3SBM/aiKXZFPOryS37mWwBvPbvhF0bPxLuxlHj12gU2Hah8h9sAHRbJptgXyGcKVBFOefZLqn2g6V7HDOOcpvQhQkxQcfQMJWDtvWK5YzIEycVAmmqqK4R9UB5ydkbzvhogWlmNyiGA4sUhsOTVlQp7cIZCCU6CqAx1ipk5vPq2FcZUonYg4vrpdYVy7moN44r8g5k= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: B573PwnHENEqLtU/5CRn9npEhIvZzws0tSazlz0DZvhw39yb5m1Mk3RzqYmCW7Y0qwxOcmOtQ79t9jTnm4RPd2NtLh/zf2AsDbio64Bepvgw1dsQIERqhCbCk9mZtyhPkVZuqWHjPv5j0m5uRw42inmrYeSsca/hSsrZbIuKbpwyRazQNDzePaUlar31zcxYmFHa98eFOuONqtT5i1isNwgHhW/Q+xigwugfIeCz+G1jMNMiCRAPutKqgxommjUhymGLA69QAbdYbci/NCR+E0IDxUoZnMD0KFw0PEWjM7C6Erc9IjFqZTauwoPPAu7IPWByugzFPZeEH9ZqdjEI8PTgLnSmLCFqS8p1eSSoiA8oR0nxW39kB40m7+Wje5W/G5yAFDcdnGCV2qceLqCx1rcSTvBaSBjazkxPM+XzaI1chJl17kpEz79jPlb2HWNUHRmOx2715VYJujSwDj0oANuzKb0hYExq/RFnR7J80QWg8XMHt7/aBlfRVmh4nNC2utFnJUNqye2dH01vzFtEaZinVZ2BFzIe8tqPwDl7lrFCKfI3M7a9Fhb5LloAlGBf+17z/ihQB7e0CqRfrEhHR7tcrFdY1KcSQg4Wer5synIhXJMXJQCTzGS6RCAS1c08lEcY4UeS8pNZIiokVaKm685dq7v98IWVsWKarJILSIUhW1+6MsiGnHVPITOgdBoi/dk2muWOLUZsv7GwDUDvScgKfFuBgXuRySpPWBlvjovLDANBTaPuqUCppIX0C5RnFRzv9gUZbQydG3SBM8T96Yyebya+iXEwDbihZL3IQWaulvcaMeFdIq9ZUTiW5ICo+uV6s9AJb7m6nLKwzvXzBunatg0+bJIPeI5WpuoJzhYgajsVPPNyqFgiGVAWYy8fDg8OeWYs79WxPFUXOPlp8+n4wS60n96Egy1pOLBzr5WvtocZKleLNEalr1bKNBbXAC2C23Tf4MeulEoQ/Vp3jqi9al6DMqLsl13T957/Dtn9bVbAFj3lrs2is6agZD/i7eANdjKmbjRNTtuXCKQWS7EHLS3y2lSOCuhAQ98iyfBi0tdMoVbXw5beW/iO0sYAlTmuML/FjT2Ucp/zoOcMGi2w+8kgSa1Q+9ixwKnD9MMINa021HJNWf3V/KxL3Jdz56j9ZmH9s09a9u0FRGBLPAToj4dEW5zWOmDfUE3WiwmMvef1+Y8wJmnZ8KyYn/9bPl8qsXecah6jJBx0Yfs/egXUyQQnK5j8+96XEkIoj1Y6GdjzeqMYz9tu/4osntR4AvF+CLlj+yYa5LDOu48zqd5GWJMJUNp5V8JMN1SCK5hQdYlDa79HjGleU2KBgB+f8lyKad5S+I0IN7z68Sux6g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98117e05-2e2f-4573-b0d0-08db1f108f4d X-MS-Exchange-CrossTenant-AuthSource: GV1P193MB2310.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2023 13:33:39.0665 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8P193MB0728 Received-SPF: pass client-ip=2a01:111:f400:fe0c::803; envelope-from=kjartanoli@outlook.com; helo=EUR04-DB3-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 07 Mar 2023 09:09:11 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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/games.scm (warzone2100): Update to 4.3.3. [native-inputs]: Drop labels. [inputs]: Add opus. Drop labels. --- gnu/packages/games.scm | 53 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 26 deletions(-) base-commit: aa0b1c97f2bb8fff0c993b6326bb1227ca330f7f diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 605a23a405..2946c787af 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5267,7 +5267,7 @@ (define-public tennix (define-public warzone2100 (package (name "warzone2100") - (version "4.0.1") + (version "4.3.3") (source (origin (method url-fetch) @@ -5275,7 +5275,7 @@ (define-public warzone2100 version "/warzone2100_src.tar.xz")) (sha256 - (base32 "1f8a4kflslsjl8jrryhwg034h1yc9y3y1zmllgww3fqkz3aj4xik")) + (base32 "17p58wxwva0qp267hm1alas52jd9h74494wh01ahz880hscbjg1w")) (modules '((guix build utils))) (snippet '(begin @@ -5312,31 +5312,32 @@ (define-public warzone2100 (string-append "iV_DrawTextRotated(\"Press ESC to exit.\", " "100, 100, 0.0f, font_regular);"))) #t))))) - (native-inputs `(("asciidoc" ,asciidoc) - ("asciidoctor" ,ruby-asciidoctor) - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("unzip" ,unzip) + (native-inputs (list asciidoc + ruby-asciidoctor + gettext-minimal + pkg-config + unzip ;; 7z is used to create .zip archive, not `zip' as in version 3.2.*. - ("p7zip" ,p7zip))) - (inputs `(("curl" ,curl) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glew" ,glew) - ("harfbuzz" ,harfbuzz) - ("libtheora" ,libtheora) - ("libvorbis" ,libvorbis) - ("libxrandr" ,libxrandr) - ("libsodium" ,libsodium) - ("miniupnpc" ,miniupnpc) - ("openal" ,openal) - ("physfs" ,physfs) - ("qtbase" ,qtbase-5) - ("qtscript" ,qtscript) - ("openssl" ,openssl) - ("sdl2" ,sdl2) - ("sqlite" ,sqlite) - ("utfcpp" ,utfcpp))) + p7zip)) + (inputs (list opus + curl + fontconfig + freetype + glew + harfbuzz + libtheora + libvorbis + libxrandr + libsodium + miniupnpc + openal + physfs + qtbase-5 + qtscript + openssl + sdl2 + sqlite + utfcpp)) (home-page "https://wz2100.net") (synopsis "3D Real-time strategy and real-time tactics game") (description