From 982a6e79a2d674ea905e2c63c2378b9df7d64af6 Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Tue, 21 Jul 2020 12:56:03 -0600 Subject: gnu: chroma: Configure with inline attribute. * gnu/packages/games.scm (chroma)[configure-flags]: Add flag to properly support inline attribute of STD C89. Signed-off-by: Brett Gilio --- gnu/packages/games.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 213acc6b9f..1a6c569fa7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -40,7 +40,7 @@ ;;; Copyright © 2019, 2020 Oleg Pykhalov ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Julien Lepiller -;;; Copyright © 2019 Jesse Gibbons +;;; Copyright © 2019, 2020 Jesse Gibbons ;;; Copyright © 2019 Dan Frumin ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Timotej Lazar @@ -5903,7 +5903,8 @@ (define-public chroma "047sf00x71xbmi8bqrhfbmr9bk89l2gbykkqsfpw4wz6yfjscs6y")))) (build-system gnu-build-system) (arguments - `(#:tests? #f)) ; no tests included + `(#:tests? #f ; no tests included + #:configure-flags '("CFLAGS=-fgnu89-inline"))) ; fix inlines (inputs `(("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer sdl-ttf))) ("freetype" ,freetype) -- cgit v1.2.3 From fb38560c82a86f6340a608653efb0db4bcf47b98 Mon Sep 17 00:00:00 2001 From: Trevor Hass Date: Fri, 24 Jul 2020 18:22:56 -0500 Subject: gnu: Add azimuth. * gnu/packages/games.scm (azimuth): New variable. Signed-off-by: Oleg Pykhalov --- gnu/packages/games.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1a6c569fa7..91e4861680 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020 Trevor Hass ;;; ;;; This file is part of GNU Guix. ;;; @@ -11668,3 +11669,40 @@ (define-public pokerth "With PokerTH you can play the Texas holdem poker game, either against computer opponents or against real players online.") (license license:agpl3+))) + +(define-public azimuth + (package + (name "azimuth") + ;; Not marked as latest release, but it fixes a compiling issue + ;; and adds the install target. + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mdsteele/azimuth") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1znfvpmqiixd977jv748glk5zc4cmhw5813zp81waj07r9b0828r")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + ;; Build release version instead of debug version. + (add-after 'unpack 'set-release + (lambda _ + (setenv "BUILDTYPE" "release") #t)) + (add-after 'unpack 'fix-install ; set install directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" (("/usr") (assoc-ref outputs "out"))) #t))))) + (inputs `(("sdl" ,sdl))) + (home-page "https://mdsteele.games/azimuth/") + (synopsis "Metroidvania game with vector graphics") + (description + "Pilot your ship inside a planet to find and rescue the colonists trapped +inside the Zenith Colony.") + (license license:gpl3+))) -- cgit v1.2.3 From 6fba1f4ded933134afb9ef1d0c03848ce6cabceb Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Sun, 5 Apr 2020 20:47:02 -0600 Subject: gnu: knights: Fix build. * gnu/packages/games.scm (knights)[arguments]<#:make-flags>: Add "CXXFLAGS=-lpthread". Signed-off-by: Oleg Pykhalov --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 91e4861680..f7753352d6 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1367,7 +1367,8 @@ (define-public knights (build-system gnu-build-system) (arguments '(#:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "CXXFLAGS=-lpthread") #:phases (modify-phases %standard-phases ;; No configure script. -- cgit v1.2.3 From 0a00d157e69bc5a514b1a46791c7e8727a2d1855 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 28 Jul 2020 20:36:17 +0200 Subject: gnu: freeorion: Update to 0.4.10. * gnu/packages/games.scm (freeorion): Update to 0.4.10. [inputs]: Use Python 3 and default boost. --- gnu/packages/games.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f7753352d6..26c2c7d231 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9436,15 +9436,15 @@ (define-public ri-li (define-public freeorion (package (name "freeorion") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/freeorion/freeorion/releases/" "download/v" version "/FreeOrion_v" version - "_2020-02-02.db53471_Source.tar.gz")) + "_2020-07-10.f3d403e_Source.tar.gz")) (sha256 - (base32 "1qfnqkysagh8dw26plk229qh17mv4prjxs6qhfyczrmrrakb72an")) + (base32 "12xspixrkx6mmmsdqjha0hg02r4y73pk229l0wjq9s0yp8nb8ap7")) (modules '((guix build utils))) (snippet '(begin @@ -9466,7 +9466,7 @@ (define-public freeorion (string-append "\"" roboto-dir "Roboto-" type ".ttf\");"))) #t)))))) (inputs - `(("boost" ,boost-with-python2) + `(("boost" ,boost) ("boost_signals" ,boost-signals2) ("font-dejavu" ,font-dejavu) ("font-roboto" ,font-google-roboto) @@ -9477,7 +9477,7 @@ (define-public freeorion ("libpng" ,libpng) ("libvorbis" ,libvorbis) ("openal" ,openal) - ("python2" ,python-2.7) + ("python" ,python) ("sdl2" ,sdl2) ("zlib" ,zlib))) (home-page "https://www.freeorion.org/index.php/Main_Page") -- cgit v1.2.3 From dcb74405e185ed71b3d0640de85edc5ba865a839 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 1 Aug 2020 09:54:28 -0400 Subject: gnu: starfighter: Update to 2.3.1. * gnu/packages/games.scm (starfighter): Update to 2.3.1. --- 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 26c2c7d231..0f79f5eeba 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4743,7 +4743,7 @@ (define-public widelands (define-public starfighter (package (name "starfighter") - (version "2.3") + (version "2.3.1") (source (origin (method url-fetch) (uri (string-append @@ -4752,7 +4752,7 @@ (define-public starfighter version "-src.tar.gz")) (sha256 (base32 - "156ivi8cqqv9gxi8kj393av1s2sj7bblabm1b3kibla1s8l090n9")))) + "13396hvsj4cswlrw52kwqn37dadxps00vhr0hrqgm87fl4ih5yyx")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 062448f35917fe26553c8e2c7aa1b35f95ae4f1a Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 4 Aug 2020 11:05:07 +0300 Subject: gnu: Add paperview. * gnu/packages/games.scm (paperview): New variable. --- gnu/packages/games.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0f79f5eeba..9c415bc174 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11707,3 +11707,35 @@ (define-public azimuth "Pilot your ship inside a planet to find and rescue the colonists trapped inside the Zenith Colony.") (license license:gpl3+))) + +(define-public paperview + (let ((commit "9f8538eb6734c76877b878b8f1e52587f2ae19e6") + (revision "1")) + (package + (name "paperview") + (version (git-version "0.0.1" revision commit)) ;no upstream release + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/glouw/paperview") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "09sb9sg44fvkgfdyycrm1ndpx7cnkrglxhci41y8f3gpagnvi7jk")))) + (build-system gnu-build-system) + (inputs + `(("sdl2" ,sdl2))) + (arguments + '(#:tests? #f ;no tests + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/glouw/paperview/") + (synopsis "High performance X11 animated wallpaper setter") + (description "High performance animated desktop background setter for +X11 that won't set your CPU on fire, drain your laptop battery, or lower video +game FPS.") + (license license:unlicense)))) -- cgit v1.2.3 From d8fcde01b43e94d692e50cb34c37f83100c7ab64 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Thu, 6 Aug 2020 15:20:34 +0200 Subject: gnu: Add minetest-mineclone. * gnu/packages/games.scm (minetest-mineclone): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/games.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9c415bc174..b7064ce18c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -53,6 +53,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Trevor Hass +;;; Copyright © 2020 Leo Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -3131,6 +3132,30 @@ (define minetest-data (home-page "https://www.minetest.net/") (license license:lgpl2.1+))) +(define-public minetest-mineclone + (package + (name "minetest-mineclone") + (version "0.66.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.minetest.land/Wuzzy/MineClone2") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0miszzlzplpvaj0j1yii9867ydr42wsaqa9g6grxdrci75p05g00")))) + (build-system copy-build-system) + (arguments + `(#:install-plan + '(("." "share/minetest/games/mineclone")))) + (synopsis "Minecraft clone based on Minetest engine") + (description + "MineClone is a Minetest subgame, that aims to recreate Minecraft as +closely as the engine allows.") + (home-page "https://content.minetest.net/packages/Wuzzy/mineclone2/") + (license license:gpl3+))) + (define glkterm (package (name "glkterm") -- cgit v1.2.3 From f2922d9ea1f46efc70bf16e2e6e540575548a8c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Aug 2020 16:06:08 +0200 Subject: gnu: pioneers: Update to 15.6. * gnu/packages/games.scm (pioneers): Update to 15.6. --- 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 b7064ce18c..9329e34c32 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4193,14 +4193,14 @@ (define-public pinball (define-public pioneers (package (name "pioneers") - (version "15.5") + (version "15.6") (source (origin (method url-fetch) (uri (string-append "http://downloads.sourceforge.net/pio/" "pioneers-" version ".tar.gz")) (sha256 (base32 - "037gdiiw690jw3wd1s9lxmkqx0caxyk0b4drpm7i9p28gig43q9y")))) + "07b3xdd81n8ybsb4fzc5lx0813y9crzp1hj69khncf4faj48sdcs")))) (build-system gnu-build-system) (inputs `(("avahi" ,avahi) ("gtk+" ,gtk+) -- cgit v1.2.3 From 505ceff606ef8d468c07101bb986d148efd6f7ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 11 Aug 2020 16:09:11 +0200 Subject: gnu: pioneers: Download over HTTPS. * gnu/packages/games.scm (pioneers)[source]: Use HTTPS. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9329e34c32..82a9660b2a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4196,7 +4196,7 @@ (define-public pioneers (version "15.6") (source (origin (method url-fetch) - (uri (string-append "http://downloads.sourceforge.net/pio/" + (uri (string-append "https://downloads.sourceforge.net/pio/" "pioneers-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From e7e69e56f59546efce6ffd8e7d3cbee70970930c Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Fri, 3 Jul 2020 16:54:21 -0600 Subject: gnu: freedink-engine: Call autoreconf. * gnu/packages/games.scm: freedink-engine (phases): add 'autoreconf Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 82a9660b2a..e8cb012fba 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2745,6 +2745,14 @@ (define freedink-engine ;; These tests require a graphical interface. (substitute* "src/Makefile.am" (("test_gfx_fonts TestIOGfxDisplay") "")) + #t)) + (add-before 'bootstrap 'autoreconf + (lambda _ + ;; automake is out of date in the source + ;; autoreconf updates the automake scripts + (invoke "autoreconf") + ;; Build fails when autom4te.cache exists. + (delete-file-recursively "autom4te.cache") #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From 8677e8699a0a882efb579de385d020f3aebf0127 Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Mon, 10 Feb 2020 10:18:57 -0700 Subject: gnu: freedink-engine: Fix SDL hints. * gnu/packages/games.scm: freedink: [patches]: Add fix. * gnu/packages/patches/freedink-engine-fix-sdl-hints.patch: New file. * gnu/local.mk: Add it. Signed-off-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/games.scm | 1 + .../patches/freedink-engine-fix-sdl-hints.patch | 33 ++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 gnu/packages/patches/freedink-engine-fix-sdl-hints.patch (limited to 'gnu/packages/games.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 746f5c5779..66ad65cb15 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -960,6 +960,7 @@ dist_patch_DATA = \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ %D%/packages/patches/fontconfig-hurd-path-max.patch \ + %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ %D%/packages/patches/ganeti-deterministic-manual.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index e8cb012fba..8e4aa0742b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2732,6 +2732,7 @@ (define freedink-engine (method url-fetch) (uri (string-append "mirror://gnu/freedink/freedink-" version ".tar.gz")) + (patches (search-patches "freedink-engine-fix-sdl-hints.patch")) (sha256 (base32 "00hhk1bjdrc1np2qz44sa5n1mb62qzwxbvsnws3vpms6iyn3a2sy")))) diff --git a/gnu/packages/patches/freedink-engine-fix-sdl-hints.patch b/gnu/packages/patches/freedink-engine-fix-sdl-hints.patch new file mode 100644 index 0000000000..ce37ab4870 --- /dev/null +++ b/gnu/packages/patches/freedink-engine-fix-sdl-hints.patch @@ -0,0 +1,33 @@ +From 85f8dda6de28ef86e58f26c8aa863a26524f6ce0 Mon Sep 17 00:00:00 2001 +From: Jesse Gibbons +Date: Sun, 9 Feb 2020 21:46:26 -0700 +Subject: [PATCH] Fix mouse/touch event hints for SDL 2.0.10. + +This fixes the bug reported at +. + +It should remain backwards compatible with releases of SDL prior to 2.0.10. +--- + src/input.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/input.cpp b/src/input.cpp +index b5ae21e..153d349 100644 +--- a/src/input.cpp ++++ b/src/input.cpp +@@ -91,7 +91,12 @@ void input_init(void) + + // TODO: don't attempt to simulate mouse events from touch events - + // fake mouse events often are de-centered ++#ifdef SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH + SDL_SetHint(SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH, "0"); ++#elif defined SDL_HINT_MOUSE_TOUCH_EVENTS && defined SDL_HINT_TOUCH_MOUSE_EVENTS ++ SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "0"); ++ SDL_SetHint(SDL_HINT_TOUCH_MOUSE_EVENTS, "0"); ++#endif + + /* Touch devices */ + { +-- +2.25.0 + -- cgit v1.2.3 From ec6cf66c2808c16d866975607f08303cadab6445 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Aug 2020 02:49:58 +0200 Subject: gnu: ltris: Update to 1.2.1. * gnu/packages/games.scm (ltris): Update to 1.2.1. --- 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 8e4aa0742b..9df42febd5 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1558,14 +1558,14 @@ (define-public gnushogi (define-public ltris (package (name "ltris") - (version "1.2") + (version "1.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lgames/ltris/" "ltris-" version ".tar.gz")) (sha256 - (base32 "15b18p7id55xiz2jkf56w2f1g6yw1rcb98bpa188i6skqrgnrg57")))) + (base32 "0959vvxh5xnxzpdv7i67lpd2b6ghx69z65ldnclj1z6llyfzfs7q")))) (build-system gnu-build-system) (arguments '(;; The code in LTris uses traditional GNU semantics for inline functions -- cgit v1.2.3 From 50dee556f54851287b5671991d5f5ec0f22afa9a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Aug 2020 12:15:48 +0200 Subject: gnu: ola: Build with protobuf@3. * gnu/packages/lighting.scm (ola)[propagated-inputs]: Use default protobuf version. --- gnu/packages/games.scm | 2 +- gnu/packages/lighting.scm | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9df42febd5..94832b357e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11659,7 +11659,7 @@ (define-public pokerth ("gsasl" ,gsasl) ("libgcrypt" ,libgcrypt) ("libircclient" ,libircclient) - ("protobuf" ,protobuf-2) + ("protobuf" ,protobuf-2) ; remove package when no longer needed ("qtbase" ,qtbase) ("sdl" ,(sdl-union (list sdl sdl-mixer))) ("sqlite" ,sqlite) diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm index 027c08b4e9..4718795a8a 100644 --- a/gnu/packages/lighting.scm +++ b/gnu/packages/lighting.scm @@ -70,9 +70,7 @@ (define-public ola ("libuuid" ,util-linux "lib") ("zlib" ,zlib))) (propagated-inputs - ;; Ola 0.10.5 only supports protobuf 2.x, and building it with 3.x breaks. - ;; XXX Remove protobuf-2 when it is no longer needed. - `(("protobuf" ,protobuf-2))) ;; for pkg-config --libs libola + `(("protobuf" ,protobuf))) ; for pkg-config --libs libola (arguments `( ;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing ;; build to fail on low memory systems. We disable that with the -- cgit v1.2.3 From 5c83e8ec111f30c3754107ac0ec6fa4db5411fb8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Aug 2020 22:56:09 +0200 Subject: gnu: unknown-horizons: Return #t from all phases. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (unknown-horizons)[arguments]: Return #t from ‘set-HOME’. --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 94832b357e..a789fced63 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3548,7 +3548,8 @@ (define-public unknown-horizons (modify-phases %standard-phases (add-before 'build 'set-HOME (lambda _ - (setenv "HOME" "/tmp"))) + (setenv "HOME" "/tmp") + #t)) (add-after 'build 'build-extra (lambda _ (invoke "python3" "./setup.py" "build_i18n") -- cgit v1.2.3 From 4c7d16c5516211f73cef06b39ade8022acb96f23 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 19 Aug 2020 23:01:56 +0200 Subject: gnu: unknown-horizons: Fix build with python@3.8 and python-pytest@5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (unknown-horizons)[source]: Add patch. [arguments]: Add a ‘fix-tests-with-pytest>=4’ phase. [native-inputs]: Add python-distro. * gnu/packages/patches/unknown-horizons-python-3.8-distro.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/games.scm | 12 ++++- .../unknown-horizons-python-3.8-distro.patch | 52 ++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/unknown-horizons-python-3.8-distro.patch (limited to 'gnu/packages/games.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 44680da70b..4d1c7f366b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1616,6 +1616,7 @@ dist_patch_DATA = \ %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/ungoogled-chromium-system-nspr.patch \ + %D%/packages/patches/unknown-horizons-python-3.8-distro.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ %D%/packages/patches/unzip-CVE-2014-8140.patch \ %D%/packages/patches/unzip-CVE-2014-8141.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a789fced63..0f01267827 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3541,7 +3541,8 @@ (define-public unknown-horizons (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1n747p7h0qp48szgp262swg0xh8kxy1bw8ag1qczs4i26hyzs5x4")))) + "1n747p7h0qp48szgp262swg0xh8kxy1bw8ag1qczs4i26hyzs5x4")) + (patches (search-patches "unknown-horizons-python-3.8-distro.patch")))) (build-system python-build-system) (arguments '(#:phases @@ -3564,6 +3565,14 @@ (define-public unknown-horizons (assoc-ref outputs "out") "/share/unknown-horizons\")")))) #t)) + (add-before 'check 'fix-tests-with-pytest>=4 + (lambda _ + (substitute* "tests/conftest.py" + (("pytest_namespace") + "pytest_configure") + (("get_marker") + "get_closest_marker")) + #t)) ;; TODO: Run GUI tests as well (replace 'check (lambda _ @@ -3582,6 +3591,7 @@ (define-public unknown-horizons ("python-pyyaml" ,python-pyyaml))) (native-inputs `(("intltool" ,intltool) + ("python-distro" ,python-distro) ;; Required for tests ("python-greenlet" ,python-greenlet) diff --git a/gnu/packages/patches/unknown-horizons-python-3.8-distro.patch b/gnu/packages/patches/unknown-horizons-python-3.8-distro.patch new file mode 100644 index 0000000000..d43a4f3e4a --- /dev/null +++ b/gnu/packages/patches/unknown-horizons-python-3.8-distro.patch @@ -0,0 +1,52 @@ +From: Tobias Geerinckx-Rice +Date: Wed, 19 Aug 2020 22:58:32 +0200 +Subject: [PATCH] gnu: unknown-horizons: Replace ‘dist’ with ‘distro’. + +This fixes builds with Python >= 3.8. Taken verbatim from upstream[0]. + +[0]: https://github.com/unknown-horizons/unknown-horizons/commit/c40fb866f3f72ac1049d6fa7859b17d8a48fe9e1 + +From c40fb866f3f72ac1049d6fa7859b17d8a48fe9e1 Mon Sep 17 00:00:00 2001 +From: MarkusHackspacher +Date: Thu, 18 Jul 2019 11:46:39 +0200 +Subject: [PATCH] replace deprecated to distro package + +--- + requirements.txt | 1 + + setup.py | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/requirements.txt b/requirements.txt +index a5edf794fb..b58179bfa8 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,6 +1,7 @@ + coverage==4.4.1 + coveralls==1.1 + crayons==0.1.2 ++distro + future==0.16.0 + greenlet==0.4.15 + isort==4.3.4 +diff --git a/setup.py b/setup.py +index 6d63a5ce15..6a237a8749 100755 +--- a/setup.py ++++ b/setup.py +@@ -32,6 +32,8 @@ + from distutils.spawn import find_executable + from shutil import copytree, rmtree + ++import distro ++ + import horizons + from horizons.constants import VERSION + from horizons.ext import polib +@@ -39,7 +41,7 @@ + # Ensure we are in the correct directory + os.chdir(os.path.realpath(os.path.dirname(__file__))) + +-if platform.dist()[0].lower() in ('debian', 'ubuntu'): ++if distro.linux_distribution(full_distribution_name=False)[0] in ('debian', 'mint', 'ubuntu'): + executable_path = 'games' + else: + executable_path = 'bin' -- cgit v1.2.3 From 2612ec80d0a9522901e3e739627a4c6607f903cb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 25 Aug 2020 16:11:42 +0300 Subject: gnu: stepmania: Fix typo. * gnu/packages/games.scm (stepmania)[arguments]: Check for the 'x86_64' architecture. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 0f01267827..9eb11eda50 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7942,7 +7942,7 @@ (define-public stepmania ;; SSE instructions are available on Intel systems only. ,@(if (any (cute string-prefix? <> (or (%current-target-system) (%current-system))) - '("x64_64" "i686")) + '("x86_64" "i686")) '() '("-DWITH_SSE2=NO")) ;; Configuration cannot find GTK2 without the two following -- cgit v1.2.3 From a41b8c9a09186b9e176daa20ad2c46a9ff0fb009 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Wed, 26 Aug 2020 05:34:42 +0200 Subject: gnu: gnome-chess: Update to 3.37.3. * gnu/packages/games.scm (gnome-chess): Update to 3.37.3. Signed-off-by: Brett Gilio --- 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 9eb11eda50..7f6c238f51 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1401,7 +1401,7 @@ (define-public knights (define-public gnome-chess (package (name "gnome-chess") - (version "3.36.1") + (version "3.37.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-chess/" @@ -1409,7 +1409,7 @@ (define-public gnome-chess "gnome-chess-" version ".tar.xz")) (sha256 (base32 - "165bk8s3nngyqbikggspj4rff5nxxfkfcmgzjb4grmsrgbqwk5di")))) + "09axf0q1mp13sv8cs0syfg8ahcd9r2qb26278r09j6s4njxmkfv4")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From d6a454addfc54104bca9ec4f4a56251bf4a0ad46 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 26 Aug 2020 00:15:03 +0200 Subject: gnu: quadrapassel: Update to 3.36.05. * gnu/packages/games.scm (quadrapassel): Update to 3.36.05. --- 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 7f6c238f51..af20bc508f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7799,7 +7799,7 @@ (define-public libmanette (define-public quadrapassel (package (name "quadrapassel") - (version "3.36.02") + (version "3.36.05") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/quadrapassel/" @@ -7807,7 +7807,7 @@ (define-public quadrapassel "quadrapassel-" version ".tar.xz")) (sha256 (base32 - "0c80pzipxricyh4wydffsc94wj6ymnanqr9bg6wdx51hz1mmmilb")))) + "04abxmimh5npw8rhz1sfi6wxilgc6i1wka9mlnfwp8v1p1cb00cv")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 70e741720a675991380da5c963f92bd1077e823c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 28 Aug 2020 09:35:38 +0200 Subject: gnu: odamex: Update to 0.8.3. * gnu/packages/games.scm (odamex): Update to 0.8.3. --- 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 af20bc508f..479ae52ab0 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7048,7 +7048,7 @@ (define-public gzdoom (define-public odamex (package (name "odamex") - (version "0.8.1") + (version "0.8.3") (source (origin (method url-fetch) @@ -7056,7 +7056,7 @@ (define-public odamex "mirror://sourceforge/odamex/Odamex/" version "/" "odamex-src-" version ".tar.gz")) (sha256 - (base32 "1ywbqkfacc9fc5di3dn95y5ah2ys9i241j64q3f37a73x92llw1i")))) + (base32 "0f887g87bmcq4dpcga7xc2mpxs947dkbc934ir9xs55gz6z13q96")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests (inputs -- cgit v1.2.3 From f14e808aeae7b2fa7536f5fe62dae66b788fea84 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Wed, 2 Sep 2020 13:44:12 -0400 Subject: gnu: hedgewars: Fix build with shared libraries. Fixes: . * gnu/packages/games.scm (hedgewars)[arguments]: Set "haskell_flags" in #:configure-flags to enable dynamic linking. --- gnu/packages/games.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 479ae52ab0..1cd0df0dd0 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8848,7 +8848,8 @@ (define-public hedgewars ;; XXX: Engine is built as Pascal source code, requiring Free Pascal ;; Compiler, which we haven't packaged yet. With the flag below, we use ;; a Pascal to C translator and Clang instead. - `(#:configure-flags (list "-DBUILD_ENGINE_C=ON") + `(#:configure-flags (list "-DBUILD_ENGINE_C=ON" + "-Dhaskell_flags=-dynamic;-fPIC") #:phases (modify-phases %standard-phases (replace 'check -- cgit v1.2.3