This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new f0f5fd2210 gnu: pokerth: Update to 2.0.8.
f0f5fd2210 is described below
commit f0f5fd22107cff68eee0eaddfd86c7dbf62a8eb2
Author: bdunahu <[email protected]>
AuthorDate: Fri Jun 19 12:36:11 2026 -0400
gnu: pokerth: Update to 2.0.8.
* gnu/packages/patches/pokerth-boost.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Deregister it.
* gnu/packages/games.scm (pokerth): Update to 2.0.8.
[source]<origin>: Switch to git-fetch.
<snippet>: Unbundle sqlite. Rebundle websockets.
<patches>: Remove field.
[arguments]<#:phases>: Remove field.
[inputs]: Remove boost-1.83, curl, gsasl, libgcrypt, libircclient,
protobuf-2,
qtbase-5, qtwayland-5, sdl, sdl-mixer, tinyxml,
websocketpp, and zlib; add boost, openssl, protobuf, qtbase,
qtdeclarative, qtmultimedia, qtsvg, and qtwayland.
[native-inputs]: Add qttools and qtwebsockets.
Fixes: guix/guix#9188
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/games.scm | 89 ++++++++++++--------------------
gnu/packages/patches/pokerth-boost.patch | 38 --------------
3 files changed, 32 insertions(+), 96 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 851a0cf78f..0f920bdc49 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2103,7 +2103,6 @@ dist_patch_DATA =
\
%D%/packages/patches/plasp-include-iostream.patch \
%D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch
\
%D%/packages/patches/podofo-gcc-14.patch \
- %D%/packages/patches/pokerth-boost.patch \
%D%/packages/patches/pounce-readable-checks.patch \
%D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \
%D%/packages/patches/procps-strtod-test.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 10c45d22d8..bf01f35a03 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -12758,72 +12758,47 @@ earn extra balls. Also included is Neverputt, which
is a 3D miniature golf
game.") ;thanks to Debian for description
(license license:gpl2+))))
+;; TODO: We may wish to package the server and client separately.
(define-public pokerth
(package
(name "pokerth")
- (version "1.1.2")
+ (version "2.0.8")
(source
(origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/pokerth/pokerth/"
- version "/pokerth-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/pokerth/pokerth";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0yi9bj3k8yc1gkwmaf14zbbvvn13n54n1dli8k6j1pkph3p3vjq2"))
- (modules '((guix build utils)))
+ (base32 "1hwnywqq5c05j1qym5q82r9inyps3p1fsjd7c819575vvqcdwqx8"))
+ (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1)))
(snippet
- '(begin
- ;; Remove bundled websocketpp.
- (delete-file-recursively "src/third_party/websocketpp")
- (substitute* "pokerth_lib.pro"
- (("src/third_party/websocketpp")
- ""))))
- (patches (search-patches "pokerth-boost.patch"))))
+ #~(begin
+ ;; XXX: We must use the ancient bundled websocketpp because the new
+ ;; one is not compatible with newer versions of boost asio:
+ ;; https://github.com/zaphoyd/websocketpp/issues/721
+ ;; One alternative is to use boost-1.83 as an input.
+ ;; XXX: Can we copy the third party boost headers in from
somewhere?
+ (let ((keep '("boost" "websocketpp")))
+ (with-directory-excursion "src/third_party"
+ (for-each delete-file-recursively
+ (lset-difference string=?
+ (scandir ".")
+ (cons* "." ".." keep)))))))))
(build-system qt-build-system)
(inputs
- (list boost-1.83
- curl
- gsasl
- libgcrypt
- libircclient
- protobuf-2 ;remove package when no longer needed
- qtbase-5
- qtwayland-5
- (sdl-union (list sdl sdl-mixer))
- sqlite
- tinyxml
- websocketpp
- zlib))
- (arguments
- (list
- #:tests? #f ; No test suite
- #:modules '((guix build qt-build-system)
- ((guix build gnu-build-system) #:prefix gnu:)
- (guix build utils))
- #: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))))
- (replace 'build (assoc-ref gnu:%standard-phases 'build))
- (replace 'install (assoc-ref gnu:%standard-phases 'install)))))
+ (list boost
+ openssl
+ protobuf
+ qtbase
+ qtdeclarative
+ qtmultimedia
+ qtsvg
+ qtwayland
+ sqlite))
+ (native-inputs (list qttools qtwebsockets))
+ (arguments (list #:tests? #f)) ;TODO: 'bot client' must be built & run
(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
deleted file mode 100644
index 85d32df299..0000000000
--- a/gnu/packages/patches/pokerth-boost.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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 <[email protected]>
-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 <boost/bind/bind.hpp>
- #include <net/serveracceptwebhelper.h>
- #include <net/sessiondata.h>
- #include <net/webreceivebuffer.h>
-@@ -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();
