From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QB97Kky9zGBcKgAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 17:35:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id SBw5Jky9zGDBeQAA1q6Kng (envelope-from ) for ; Fri, 18 Jun 2021 15:35:40 +0000 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 264101BC9F for ; Fri, 18 Jun 2021 17:35:40 +0200 (CEST) Received: from localhost ([::1]:45674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luGWw-00066s-Ju for larch@yhetil.org; Fri, 18 Jun 2021 11:35:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luGWM-0005dc-2i for guix-patches@gnu.org; Fri, 18 Jun 2021 11:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46107) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luGWL-0004NO-Pz for guix-patches@gnu.org; Fri, 18 Jun 2021 11:35:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luGWL-0001vz-NG for guix-patches@gnu.org; Fri, 18 Jun 2021 11:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49095] [PATCH] gnu: widelands: Update to 1.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 15:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49095 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49095@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16240304787386 (code B ref -1); Fri, 18 Jun 2021 15:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Jun 2021 15:34:38 +0000 Received: from localhost ([127.0.0.1]:57648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luGVx-0001v3-JE for submit@debbugs.gnu.org; Fri, 18 Jun 2021 11:34:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:58928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luGVv-0001uq-JM for submit@debbugs.gnu.org; Fri, 18 Jun 2021 11:34:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luGVv-0004O0-9i for guix-patches@gnu.org; Fri, 18 Jun 2021 11:34:35 -0400 Received: from mout01.posteo.de ([185.67.36.65]:38593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luGVq-0003xY-14 for guix-patches@gnu.org; Fri, 18 Jun 2021 11:34:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 4CAE4240028 for ; Fri, 18 Jun 2021 17:34:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1624030465; bh=QLdh/ZACYea0na7p7+/iEktkOawm8t/yjoewDRDS9TQ=; h=From:To:Cc:Subject:Date:From; b=jGFmdIfYrw64yV8U9m20PkI9Bhpm1NtoHNTVKSmeRBW/aj2hzXHqnnr0cn0YbOS9T cWTmJoKq0q7XQfZX99WjWEt0LzN6c/quTSMMLCtEr5hEsUQjJhwmJCrOr9HOs6CCt5 3vmpaxvbyA58AwvOAYPW2pl1EyjggPgFWv/PuPKW7inv1e3cnlERrQvxtObAFhMW3t r0CGTPpZp3je6CvPGK74nwcfXpdaSQ1LoNzkEsXJ8ob2sJpjChY6oAbmNdCf0tzrYU 5rl7KagMesasuYnsL7qhIDp7N4XckLdh1r8eWZE4Ui88llg/Ncgs9GUYkDOzHUv2/9 unq2o4xijqHBg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4G62z44HLwz6tmG; Fri, 18 Jun 2021 17:34:24 +0200 (CEST) From: Felix Gruber Date: Fri, 18 Jun 2021 15:33:59 +0000 Message-Id: <20210618153359.2104-1-felgru@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=felgru@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624030540; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Cb0sKIN2Nh668lVZK/a/qbd6LEaC0cZhCchroGVibKk=; b=OnVWtQkIwBT5Cds5UBIKBFKGbHgljihQqvQlCV4PMQvkby81BcRRTb7/5AcxYdYA5JPIf7 vLCB+XhKA7RaQMavKas2uOgx64xhRi19lkJ9Dv/J580aLqxtt7i6mSOW8mwDJxlXaWf70B TcQZeZytjjFpVyqhYSBAV6kt6guq7St2hL93/vN2BCneWqN4secUzrKYOwM6wDkT61rKnx FcCRfaQWqrLfeKuZKbALsGdYqaO2REaW0hB5y+6W0jjN7VYOD6iiBIRnaXUHfcxkXCnOvk QkWs6INEGaIwC5wwhLGu2QJBliPcnrovOGM1LadDpNAL23x3VMgrwus/UcHG+Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624030540; a=rsa-sha256; cv=none; b=p/aBVqaIuZBhKEjpcP2dMBvqVUlxEx0kBkOk6UvEUpqLodcV1ZXi7aM1OSMiBPrmz9uzMU eaMKKqEE6GBvMxEL9E66fKCZqEcxA0/IiUWNe5rwxB4xy6srAJRYsUIvvS+iOwaDETHgL5 E4bmleXdhOppiWXhkzd5wUglOym9JvngkhhJsjfSrOYnD5KhWsZynDldF9vP/oaBOGmxI3 FN8PSYgZAhhmyZftbmnkmVN+wq1SvNXLI3gW2XCAcgjQPF/gU3+/BwSTAm7VcKCUybTGOp LZExdidld37YhvOilqOJ0EgTLRmjmiU+tjARNz0KxutHW0jiPpmrNPZqy+tniQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=jGFmdIfY; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 1.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=jGFmdIfY; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 264101BC9F X-Spam-Score: 1.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: 99AGOAubitMN * gnu/packages/games.scm (widelands): Update to 1.0. [source]: Download from github as there is no tarball for v1.0 on their website. [inputs]: Add curl. * gnu/packages/patches/widelands-system-wide_minizip.patch: Adjust for 1.0. CmakeLists.txt now already defines CMAKE_MODULE_PATH, so I've moved FindMinizip.cmake to this path. --- gnu/packages/games.scm | 16 ++++--- .../widelands-system-wide_minizip.patch | 44 +++++++------------ 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6b3a6f0e1f..a07bb4cda2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5215,15 +5215,16 @@ tactics.") (define-public widelands (package (name "widelands") - (version "21") + (version "1.0") (source (origin - (method url-fetch) - (uri (string-append "https://launchpad.net/widelands/" - "build" version "/build" version "/+download/" - "widelands-build" version "-source.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/widelands/widelands") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0mz3jily0w1zxxqbnkqrp6hl88xhrwzbil9crq7gpcwidx60w7k0")) + (base32 "1hw51binnbia15mj1gzx1cbk3cw9r91sisqci2qzcy4ahxiadnw0")) (modules '((guix build utils))) (snippet '(begin @@ -5263,7 +5264,8 @@ tactics.") `(("gettext" ,gettext-minimal) ("python" ,python-wrapper))) (inputs - `(("boost" ,boost) + `(("curl" ,curl) + ("boost" ,boost) ("glew" ,glew) ("icu4c" ,icu4c) ("libpng" ,libpng) diff --git a/gnu/packages/patches/widelands-system-wide_minizip.patch b/gnu/packages/patches/widelands-system-wide_minizip.patch index 1fac0d5396..b59fed7531 100644 --- a/gnu/packages/patches/widelands-system-wide_minizip.patch +++ b/gnu/packages/patches/widelands-system-wide_minizip.patch @@ -2,41 +2,29 @@ Description: use the system-wide minizip instead of the embeeded one if found. Forwarded-Upstream: It was provided by upstream: http://bazaar.launchpad.net/~widelands-dev/widelands/b19-debian/revision/8147 . Thanks to Fòram na Gàidhlig for the patch. - -I just added this line to make its use easier: - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/Modules) === modified file 'CMakeLists.txt' --- - CMakeLists.txt | 3 +++ - Modules/FindMinizip.cmake | 37 +++++++++++++++++++++++++++++++++++++ - cmake/WlFunctions.cmake | 7 +++++++ - src/io/CMakeLists.txt | 2 +- - src/third_party/CMakeLists.txt | 20 +++++++++++--------- - src/third_party/minizip/README.txt | 4 ++++ - 6 files changed, 63 insertions(+), 10 deletions(-) + CMakeLists.txt | 1 + + cmake/Modules/FindMinizip.cmake | 37 +++++++++++++++++++++++++++++++++++++ + cmake/WlFunctions.cmake | 8 ++++++++ + src/io/filesystem/CMakeLists.txt | 2 +- + src/io/filesystem/zip_filesystem.h | 6 ++++++ + src/third_party/CMakeLists.txt | 20 +++++++++++--------- + 6 files changed, 64 insertions(+), 10 deletions(-) --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -43,6 +43,7 @@ - endif(POLICY CMP0074) - - include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake") -+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_HOME_DIRECTORY}/Modules) - - option(OPTION_USE_GLBINDING "Use glbinding instead of GLEW" OFF) - option(OPTION_GLEW_STATIC "Use static GLEW Library" OFF) -@@ -105,6 +106,8 @@ +@@ -142,6 +142,7 @@ + find_package(SDL2_mixer REQUIRED) find_package(SDL2_ttf REQUIRED) find_package(ZLIB REQUIRED) - find_package(ICU REQUIRED) +find_package(Minizip) -+ - if(OPTION_USE_GLBINDING) - find_package(glbinding REQUIRED) + if(${CMAKE_VERSION} VERSION_LESS 3.9.0) + find_package(ICU_old REQUIRED) else() --- /dev/null -+++ b/Modules/FindMinizip.cmake ++++ b/cmake/Modules/FindMinizip.cmake @@ -0,0 +1,37 @@ +# - Try to find Minizip +# Once done this will define @@ -77,10 +65,10 @@ I just added this line to make its use easier: + --- a/cmake/WlFunctions.cmake +++ b/cmake/WlFunctions.cmake -@@ -81,6 +81,14 @@ +@@ -84,6 +84,14 @@ + if(ARG_USES_ZLIB) - wl_include_system_directories(${NAME} ${ZLIB_INCLUDE_DIRS}) - target_link_libraries(${NAME} ${ZLIB_LIBRARY}) + target_link_libraries(${NAME} ZLIB::ZLIB) + if (MINIZIP_FOUND) + wl_include_system_directories(${NAME} ${MINIZIP_INCLUDE_DIR}) + target_link_libraries(${NAME} ${MINIZIP_LIBRARY}) @@ -136,7 +124,7 @@ I just added this line to make its use easier: ) --- a/src/io/filesystem/zip_filesystem.h +++ b/src/io/filesystem/zip_filesystem.h -@@ -28,8 +28,14 @@ +@@ -25,8 +25,14 @@ #include "io/filesystem/filesystem.h" #include "io/streamread.h" #include "io/streamwrite.h" -- 2.30.2