From ae7302e5231bc255ed892faa0bfa1c74b3d9c412 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Mon, 27 Jun 2022 18:51:10 +0200 Subject: gnu: corsix-th: Update to 0.66. * gnu/packages/games.scm (corsix-th): Update to 0.66. Signed-off-by: Efraim Flashner --- 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 8e6ab03530..910635c900 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1009,7 +1009,7 @@ (define-public cockatrice (define-public corsix-th (package (name "corsix-th") - (version "0.65.1") + (version "0.66") (source (origin (method git-fetch) @@ -1018,7 +1018,7 @@ (define-public corsix-th (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hw92ln9jm9v55drmbfqjng58yshgwfpv7fqynryrg3gvg8zhbvh")))) + (base32 "0sgsvhqgiq6v1v5am7ghja8blhlrj0y1arvq6xq1j5fwa7c59ihs")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From aa565e7a10a3d8690a4296f8edf12abaa3c215c5 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sat, 25 Jun 2022 22:02:07 +0200 Subject: gnu: naev: Update to 0.9.3. * gnu/packages/games.scm (naev): Update to 0.9.3. Fix lonely parens. [source]: Switch to git-fetch. Signed-off-by: Christopher Baines --- gnu/packages/games.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 910635c900..c6ed6eed00 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8033,14 +8033,17 @@ (define-public frotz (define-public naev (package (name "naev") - (version "0.9.2") + (version "0.9.3") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/naev/naev/releases/download/v" - version "/naev-" version "-source.tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/naev/naev") + (commit (string-append "v" version)) + (recursive? #t))) ; for game data + (file-name (git-file-name name version)) (sha256 - (base32 "1p6424n2rgrlb0h71gvww40vxs1h583d9im8bzgmv6dhgclbg0nl")))) + (base32 "0hvgxzvph9s5gdzlj5kjnz2d2j7bi8s11k7i6540837mnppah18j")))) (build-system meson-build-system) (arguments ;; XXX: Do not add debugging symbols, which cause the build to fail. @@ -8079,8 +8082,7 @@ (define-public naev license:public-domain license:expat ;edtaa3func.c license:bsd-2 ;distance_field.c - license:bsd-3 ;perlin.c - )))) + license:bsd-3)))) ;perlin.c (define-public frotz-dumb-terminal (package -- cgit v1.2.3 From f0c8abe85787a0018c0adeb0bc4a6672d46686e4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Jul 2022 11:08:42 -0400 Subject: gnu: pokerth: Fix build and modernize package. Fixes . * gnu/packages/games.scm (pokerth) [source]: Apply patch [inputs]: Use new style. [phases]: Delete trailing #t. Use gexps. {fix-paths}: Remove the gsasl and libircclient related substitutions. --- gnu/local.mk | 1 + gnu/packages/games.scm | 84 +++++++++++++++----------------- gnu/packages/patches/pokerth-boost.patch | 38 +++++++++++++++ 3 files changed, 79 insertions(+), 44 deletions(-) create mode 100644 gnu/packages/patches/pokerth-boost.patch (limited to 'gnu/packages/games.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 6d30109a35..c567c3d519 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1598,6 +1598,7 @@ dist_patch_DATA = \ %D%/packages/patches/pciutils-hurd-fix.patch \ %D%/packages/patches/pjproject-install-libpjsua2.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ + %D%/packages/patches/pokerth-boost.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-chai-drop-python2.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c6ed6eed00..713f9339b2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -72,6 +72,7 @@ ;;; Copyright © 2022 Roman Riabenko ;;; Copyright © 2022 zamfofex ;;; Copyright © 2022 Gabriel Arazas +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -12248,53 +12249,48 @@ (define-public pokerth (delete-file-recursively "src/third_party/websocketpp") (substitute* "pokerth_lib.pro" (("src/third_party/websocketpp") - "")) - #t)))) + "")))) + (patches (search-patches "pokerth-boost.patch")))) (build-system qt-build-system) (inputs - `(("boost" ,boost) - ("curl" ,curl) - ("gsasl" ,gsasl) - ("libgcrypt" ,libgcrypt) - ("libircclient" ,libircclient) - ("protobuf" ,protobuf-2) ; remove package when no longer needed - ("qtbase" ,qtbase-5) - ("sdl" ,(sdl-union (list sdl sdl-mixer))) - ("sqlite" ,sqlite) - ("tinyxml" ,tinyxml) - ("websocketpp" ,websocketpp) - ("zlib" ,zlib))) + (list boost + curl + gsasl + libgcrypt + libircclient + protobuf-2 ;remove package when no longer needed + qtbase-5 + (sdl-union (list sdl sdl-mixer)) + sqlite + tinyxml + websocketpp + zlib)) (arguments - `(#:tests? #f ; No test suite - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "." "\\.pro$") - (("/opt/gsasl") - (assoc-ref inputs "gsasl")) - (("\\$\\$\\{PREFIX\\}/include/libircclient") - (search-input-directory inputs "/include/libircclient")) - (("LIB_DIRS =") - (string-append "LIB_DIRS = " - (assoc-ref inputs "boost") "/lib"))) - #t)) - (add-after 'unpack 'fix-build - (lambda _ - ;; Fixes for Boost versions >= 1.66. - (substitute* '("src/net/common/clientthread.cpp" - "src/net/serveraccepthelper.h") - (("boost::asio::socket_base::non_blocking_io command\\(true\\);") - "") - (("newSock->io_control\\(command\\);") - "newSock->non_blocking(true);") - (("acceptedSocket->io_control\\(command\\);") - "acceptedSocket->non_blocking(true);")) - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (invoke "qmake" "pokerth.pro" "CONFIG+=client" - (string-append "PREFIX=" (assoc-ref outputs "out")))))))) + (list + #:tests? #f ; No test suite + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "." "\\.pro$") + (("LIB_DIRS =") + (string-append "LIB_DIRS = " + #$(this-package-input "boost") "/lib"))))) + (add-after 'unpack 'fix-build + (lambda _ + ;; Fixes for Boost versions >= 1.66. + (substitute* '("src/net/common/clientthread.cpp" + "src/net/serveraccepthelper.h") + (("boost::asio::socket_base::non_blocking_io command\\(true\\);") + "") + (("newSock->io_control\\(command\\);") + "newSock->non_blocking(true);") + (("acceptedSocket->io_control\\(command\\);") + "acceptedSocket->non_blocking(true);")))) + (replace 'configure + (lambda _ + (invoke "qmake" "pokerth.pro" "CONFIG+=client" + (string-append "PREFIX=" #$output))))))) (home-page "https://www.pokerth.net") (synopsis "Texas holdem poker game") (description diff --git a/gnu/packages/patches/pokerth-boost.patch b/gnu/packages/patches/pokerth-boost.patch new file mode 100644 index 0000000000..85d32df299 --- /dev/null +++ b/gnu/packages/patches/pokerth-boost.patch @@ -0,0 +1,38 @@ +Retrieved from https://patch-diff.githubusercontent.com/raw/pokerth/pokerth/pull/396.patch + +From a769887330a317d55e7f64c71a32ad130ffb9307 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin +Date: Mon, 18 May 2020 03:30:53 +0300 +Subject: [PATCH] Fix using boost placeholders (#395) + +--- + src/net/common/serveracceptwebhelper.cpp | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/net/common/serveracceptwebhelper.cpp b/src/net/common/serveracceptwebhelper.cpp +index f61d4d779..8701e1e99 100644 +--- a/src/net/common/serveracceptwebhelper.cpp ++++ b/src/net/common/serveracceptwebhelper.cpp +@@ -29,6 +29,7 @@ + * as that of the covered work. * + *****************************************************************************/ + ++#include + #include + #include + #include +@@ -58,10 +59,10 @@ ServerAcceptWebHelper::Listen(unsigned serverPort, bool /*ipv6*/, const std::str + + m_webSocketServer->init_asio(m_ioService.get()); + +- m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::validate), this, _1)); +- m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_open), this, _1)); +- m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_close), this, _1)); +- m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_message), this, _1, _2)); ++ m_webSocketServer->set_validate_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::validate), this, boost::placeholders::_1)); ++ m_webSocketServer->set_open_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_open), this, boost::placeholders::_1)); ++ m_webSocketServer->set_close_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_close), this, boost::placeholders::_1)); ++ m_webSocketServer->set_message_handler(boost::bind(boost::mem_fn(&ServerAcceptWebHelper::on_message), this, boost::placeholders::_1, boost::placeholders::_2)); + + m_webSocketServer->listen(serverPort); + m_webSocketServer->start_accept(); -- cgit v1.2.3 From c2aecd6738860450c995d77fa1fa240ede2ab46d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jun 2022 02:00:00 +0200 Subject: gnu: lolcat: Move to (gnu packages toys). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As fun as this is, the gameplay is disappointing. Also add a missing 2019 copyright for Liliana Marie. * gnu/packages/games.scm (lolcat): Move from here… * gnu/packages/toys.scm (lolcat): …to here. --- gnu/packages/games.scm | 40 ---------------------------------------- gnu/packages/toys.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 40 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 713f9339b2..d55a2ee867 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1103,46 +1103,6 @@ (define-public cowsay tired of cows, a variety of other ASCII-art messengers are available.") (license license:gpl3+))) -(define-public lolcat - (let ((commit "35dca3d0a381496d7195cd78f5b24aa7b62f2154") - (revision "0")) - (package - (name "lolcat") - (version (git-version "1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jaseg/lolcat") - (commit commit))) - (sha256 - (base32 - "0jjbkqcc2ikjxd1xgdyv4rb0vsw218181h89f2ywg29ffs3ypd8g")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; no check target - #:make-flags - (list ,(string-append "CC=" (cc-for-target))) - #:phases - (modify-phases %standard-phases - (delete 'bootstrap) - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dest (string-append out "/bin"))) - (mkdir-p dest) - (install-file "lolcat" dest) - (install-file "censor" dest) - #t)))))) - (home-page "https://github.com/jaseg/lolcat") - (synopsis "Rainbow coloring effect for text console display") - (description "@command{lolcat} concatenates files and streams like -regular @command{cat}, but it also adds terminal escape codes between -characters and lines resulting in a rainbow effect.") - (license license:wtfpl2)))) - (define-public falltergeist (package (name "falltergeist") diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 4fa6966ca9..fb2f367490 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018, 2020–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Jesse Gibbons ;;; Copyright © 2019, 2020, 2021 Timotej Lazar +;;; Copyright © 2019 Liliana Marie Prikler ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 Leo Famulari ;;; @@ -38,6 +39,46 @@ (define-module (gnu packages toys) #:use-module (guix packages) #:use-module (guix utils)) +(define-public lolcat + (let ((commit "35dca3d0a381496d7195cd78f5b24aa7b62f2154") + (revision "0")) + (package + (name "lolcat") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jaseg/lolcat") + (commit commit))) + (sha256 + (base32 + "0jjbkqcc2ikjxd1xgdyv4rb0vsw218181h89f2ywg29ffs3ypd8g")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:make-flags + (list ,(string-append "CC=" (cc-for-target))) + #:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dest (string-append out "/bin"))) + (mkdir-p dest) + (install-file "lolcat" dest) + (install-file "censor" dest) + #t)))))) + (home-page "https://github.com/jaseg/lolcat") + (synopsis "Rainbow coloring effect for text console display") + (description "@command{lolcat} concatenates files and streams like +regular @command{cat}, but it also adds terminal escape codes between +characters and lines resulting in a rainbow effect.") + (license license:wtfpl2)))) + (define-public oneko (package (name "oneko") -- cgit v1.2.3