From d027858e70c4a37aca90b1d4ecb2f0421a95d987 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 20 Jun 2021 16:43:50 +0200 Subject: gnu: corsix-th: Update to 0.65. * gnu/packages/games.scm (corsix-th): Update to 0.65. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6b3a6f0e1f..fca25294db 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -946,7 +946,7 @@ allows users to brew while offline.") (define-public corsix-th (package (name "corsix-th") - (version "0.64") + (version "0.65") (source (origin (method git-fetch) @@ -955,7 +955,7 @@ allows users to brew while offline.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0chh9cv2kdc39sr0x8hclcyzd8dz2y6grgagqzkvr7j570wa5cqh")))) + (base32 "0hp7da7b73dpn1h22rw3h8w6aaj9azn18qnp3ap3lrlqhj4fzcb3")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From b6fc274637c69929e7811b40bf9b99d3e8df8360 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Fri, 18 Jun 2021 15:33:59 +0000 Subject: gnu: widelands: Update to 1.0. * 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. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 16 ++++---- .../patches/widelands-system-wide_minizip.patch | 44 ++++++++-------------- 2 files changed, 25 insertions(+), 35 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fca25294db..9944c0dcc6 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" -- cgit v1.2.3 From 662316b0d6edcb838a4a70fc329660d425f5fe79 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 22 Jun 2021 10:35:58 +0200 Subject: gnu: widelands: Ensure Guix catches versioning scheme switch. * gnu/packages/games.scm (widelands-21): New variable. "21" was the last beta release. Upstream has now switched to a new versioning scheme, with lesser numbers. --- gnu/packages/games.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9944c0dcc6..1da5fa468d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5303,6 +5303,12 @@ of war. Widelands also offers an Artificial Intelligence to challenge you.") license:silofl1.1 ;Widelands.ttf license:cc-by-sa3.0)))) ;some music files +(define-public widelands-21 + (package + (inherit widelands) + (version "21") + (properties `((superseded . ,widelands))))) + (define-public starfighter (package (name "starfighter") -- cgit v1.2.3 From 61a9ba398f39258e603ba7eaf107ecf051d4f462 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 22 Jun 2021 10:39:40 +0200 Subject: gnu: widelands: Update description. * gnu/packages/games.scm (widelands)[description]: Update to mirror changes in the stable release. --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1da5fa468d..d365301534 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5284,8 +5284,8 @@ nothing but your headquarters, where all your resources are stored. In the course of the game, you will build an ever growing settlement. Every member of your clan will do his or her part to produce more resources---wood, food, iron, gold and more---to further this growth. The economic network is -complex and different in the four tribes (Barbarians, Empire, Atlanteans, and -Frisians). +complex and different in the five tribes (Barbarians, Empire, Atlanteans, +Frisians and Amazons). As you are not alone in the world, you will meet other clans sooner or later. Some of them may be friendly and you may eventually trade with them. However, -- cgit v1.2.3 From 65c9251ef271e5a36fc5fc047e8d4c4964bb409d Mon Sep 17 00:00:00 2001 From: Solene Rapenne via Guix-patches via Date: Tue, 22 Jun 2021 20:12:35 +0200 Subject: gnu: wesnoth: Update to 1.14.17. * gnu/packages/games.scm (wesnoth): Update to 1.14.17. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d365301534..c38011c2e1 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4176,7 +4176,7 @@ falling, themeable graphics and sounds, and replays.") (define-public wesnoth (package (name "wesnoth") - (version "1.14.16") + (version "1.14.17") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" @@ -4185,7 +4185,7 @@ falling, themeable graphics and sounds, and replays.") "wesnoth-" version ".tar.bz2")) (sha256 (base32 - "1d9hq3dcx0sgs2v4400rg2nw98v46m7bwiqqjv8z8n7vw8kx8lhg")))) + "1qc4ylhc4ab51milclzhflpmzw6bg35knwqaj3b157700jkcniin")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no check target -- cgit v1.2.3 From 4cb70e08b2200d0614b3dad8a6ad22c8ac0f6589 Mon Sep 17 00:00:00 2001 From: Solene Rapenne via Guix-patches via Date: Tue, 22 Jun 2021 21:22:35 +0200 Subject: gnu: armagetronad: Update to 0.2.9.1.0. * gnu/packages/games.scm (armagetronad): Update to 0.2.9.1.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c38011c2e1..6ea579a04a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -396,14 +396,14 @@ The game includes a built-in editor so you can design and share your own maps.") (define-public armagetronad (package (name "armagetronad") - (version "0.2.9.0.1") + (version "0.2.9.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/armagetronad/stable/" version "/armagetronad-" version ".tbz")) (sha256 (base32 - "19rfhlg4gp0r7k1j8v4iw20325ciy156nmzax4xikmw22c6nmxcz")))) + "18gn4sg4j5sw38ngb90sl50raliplrsgjcvy8fjwry733k0cgdjr")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 35ae64b3a342de82d7bf1887dbd204aee5d5615e Mon Sep 17 00:00:00 2001 From: Solene Rapenne via Guix-patches via Date: Tue, 22 Jun 2021 22:22:42 +0200 Subject: gnu: odamex: Update to 0.9.3. * gnu/packages/games.scm (odamex): Update to 0.9.3. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6ea579a04a..a4c42af31d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7519,7 +7519,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.") (define-public odamex (package (name "odamex") - (version "0.9.0") + (version "0.9.3") (source (origin (method url-fetch) @@ -7527,7 +7527,7 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.") "mirror://sourceforge/odamex/Odamex/" version "/" "odamex-src-" version ".tar.bz2")) (sha256 - (base32 "0yfrvx8zb3chy47fyz4nik6gbh0y5608yvld4gz4y8l158qk71y1")))) + (base32 "0vmw9ijb6n4wrxjxixakn7l6a6carnvs9wbbzb4vcq1brbzyrb0p")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests (native-inputs -- cgit v1.2.3