Download raw body.
[update] games/pokerth 2.0.7 -> 2.0.8
Hey there, ports@!
The attached diff is an update to games/pokerth. Changes to the port:
* dropped two patches for TCP_KEEPALIVE, Brad's improved patches were
accepted upstream.
* added a new binary to the PLIST for the "preview" QML client mentioned
below, and added a README to explain the new binary.
* WANTLIBs revised per port-lib-depends-check
Upstream change log:
Server: AFK timeout for Lobby game admin increased to 30 minutes
Widget-Client: Audio beep for AFK timeout now
Widget-Client: emoji-picker and emoji-reactions now
Widget-Client: bugfix truncated usernames
Widget-Client: GUI timer for Stack update at the end of the hand adjusted
macOS: minor bugfixes
better android & win and appimage deploy scripts
functional QML Client 2.1.0preview
Both client programs have been tested on amd64.
OKs? Comments? Thanks!
diff --git games/pokerth/Makefile games/pokerth/Makefile
index 4dc80924c92..1d8277f2163 100644
--- games/pokerth/Makefile
+++ games/pokerth/Makefile
@@ -2,7 +2,7 @@ BROKEN-i386 = protobuf/abseil problems
COMMENT = texas holdem poker client, local or internet games
-V = 2.0.7
+V = 2.0.8
DIST_TUPLE = github pokerth pokerth v${V} .
PKGNAME = pokerth-${V}
@@ -14,17 +14,18 @@ MAINTAINER = Josh Grosse <josh@jggimi.net>
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Multimedia
-WANTLIB += Qt6Network Qt6Sql Qt6Widgets Qt6Xml boost_atomic-mt
-WANTLIB += boost_chrono-mt boost_container-mt boost_date_time-mt
-WANTLIB += boost_filesystem-mt boost_iostreams-mt boost_program_options-mt
-WANTLIB += boost_random-mt boost_regex-mt boost_thread-mt c crypto
-WANTLIB += iconv m protobuf ssl
+WANTLIB += Qt6Network Qt6OpenGL Qt6Qml Qt6Quick Qt6QuickControls2
+WANTLIB += Qt6Sql Qt6Svg Qt6Widgets Qt6Xml boost_atomic-mt boost_chrono-mt
+WANTLIB += boost_container-mt boost_date_time-mt boost_filesystem-mt
+WANTLIB += boost_iostreams-mt boost_program_options-mt boost_random-mt
+WANTLIB += boost_regex-mt boost_thread-mt c crypto iconv m protobuf
+WANTLIB += ssl
MODULES = devel/cmake \
x11/qt6
SUBST_VARS += MODQT_QTDIR V
-ALL_TARGET = pokerth_client
+ALL_TARGET = pokerth_client pokerth_qml-client
MODCMAKE_LDFLAGS += -L${LOCALBASE}/lib -liconv
DEBUG_PACKAGES = ${BUILD_PACKAGES}
diff --git games/pokerth/distinfo games/pokerth/distinfo
index dd8a7718252..513204cbcec 100644
--- games/pokerth/distinfo
+++ games/pokerth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pokerth-pokerth-v2.0.7.tar.gz) = ju2GsFNwNTxWUUcbyYhW76jw9harIMZbsoDXu3Mv0Lo=
-SIZE (pokerth-pokerth-v2.0.7.tar.gz) = 27530236
+SHA256 (pokerth-pokerth-v2.0.8.tar.gz) = iYK052+uTYp8e3PwqYQ9Y7GQxfFeYpP5S+CD5nF3iWw=
+SIZE (pokerth-pokerth-v2.0.8.tar.gz) = 40952462
diff --git games/pokerth/patches/patch-src_gui_qt6-qml_CMakeLists_txt games/pokerth/patches/patch-src_gui_qt6-qml_CMakeLists_txt
index 4e5ce091ebc..3b38ccba084 100644
--- games/pokerth/patches/patch-src_gui_qt6-qml_CMakeLists_txt
+++ games/pokerth/patches/patch-src_gui_qt6-qml_CMakeLists_txt
@@ -1,7 +1,7 @@
Index: src/gui/qt6-qml/CMakeLists.txt
--- src/gui/qt6-qml/CMakeLists.txt.orig
+++ src/gui/qt6-qml/CMakeLists.txt
-@@ -147,5 +147,4 @@ endif()
+@@ -166,5 +166,4 @@ endif()
install(TARGETS pokerth_qml-client DESTINATION bin OPTIONAL)
install(DIRECTORY ../../../data DESTINATION share/pokerth)
diff --git games/pokerth/patches/patch-src_net_clientstate_cpp games/pokerth/patches/patch-src_net_clientstate_cpp
deleted file mode 100644
index 43085b46808..00000000000
--- games/pokerth/patches/patch-src_net_clientstate_cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-TCP_KEEPALIVE not supported
-
-Index: src/net/clientstate.cpp
---- src/net/clientstate.cpp.orig
-+++ src/net/clientstate.cpp
-@@ -625,7 +625,7 @@ ClientStateStartConnect::HandleConnect(const boost::sy
- setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &keepidle, sizeof(keepidle));
- setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &keepintvl, sizeof(keepintvl));
- setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &keepcnt, sizeof(keepcnt));
--#else
-+#elif !defined(__OpenBSD__)
- setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &keepidle, sizeof(keepidle));
- setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &keepintvl, sizeof(keepintvl));
- setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &keepcnt, sizeof(keepcnt));
diff --git games/pokerth/patches/patch-src_net_serveraccepthelper_h games/pokerth/patches/patch-src_net_serveraccepthelper_h
deleted file mode 100644
index c32b983767a..00000000000
--- games/pokerth/patches/patch-src_net_serveraccepthelper_h
+++ /dev/null
@@ -1,21 +0,0 @@
-TCP_KEEPALIVE not supported
-
-Index: src/net/serveraccepthelper.h
---- src/net/serveraccepthelper.h.orig
-+++ src/net/serveraccepthelper.h
-@@ -245,6 +245,7 @@ class ServerAcceptHelper : public ServerAcceptInterfac
- int keepidle = 30; // seconds until first keepalive probe
- int keepintvl = 10; // seconds between subsequent probes
- int keepcnt = 6; // number of failed probes before disconnect
-+#if !defined(__OpenBSD__)
- #if defined(__APPLE__)
- setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &keepidle, sizeof(keepidle));
- #else
-@@ -252,6 +253,7 @@ class ServerAcceptHelper : public ServerAcceptInterfac
- #endif
- setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &keepintvl, sizeof(keepintvl));
- setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &keepcnt, sizeof(keepcnt));
-+#endif
- // TCP_USER_TIMEOUT: abort connection if data remains
- // unacknowledged for 90s (matches keepalive detection).
- // Without this, a dead client can keep the server
diff --git games/pokerth/pkg/PLIST games/pokerth/pkg/PLIST
index c93473395a8..c002841c13d 100644
--- games/pokerth/pkg/PLIST
+++ games/pokerth/pkg/PLIST
@@ -1,4 +1,5 @@
@bin bin/pokerth_client
+@bin bin/pokerth_qml-client
share/applications/pokerth.desktop
share/pixmaps/
share/pixmaps/pokerth.png
diff --git games/pokerth/pkg/README games/pokerth/pkg/README
new file mode 100644
index 00000000000..dca1b5f51c2
--- /dev/null
+++ games/pokerth/pkg/README
@@ -0,0 +1,17 @@
++-------------------------------------------------------------------------------
+| Running ${PKGSTEM} on OpenBSD
++-------------------------------------------------------------------------------
+
+There are two binaries included with this package:
+
+ * pokerth_client:
+
+ This is the standard client program, version 2.0.8
+
+ * pokerth_qml-client
+
+ This is a "preview" of the QML client being prepared
+ for future version 2.1.0. It's operational, but still
+ considered experimental rather than production-ready.
+ It provides a very different user interface and user
+ experience.
[update] games/pokerth 2.0.7 -> 2.0.8