On Tue, Mar 03, 2026 at 06:21:58AM -0500, Josh Grosse wrote:
> 
> And another bugfix release: 2.0.6.  Changelog at:
> https://github.com/pokerth/pokerth/releases/tag/v2.0.6
> 
> Tested on amd64.
diff --git games/pokerth/Makefile games/pokerth/Makefile
index 45f83e29675..f608a1a33eb 100644
--- games/pokerth/Makefile
+++ games/pokerth/Makefile
@@ -2,10 +2,9 @@ BROKEN-i386 =  protobuf/abseil problems
 
 COMMENT =      texas holdem poker client, local or internet games
 
-DIST_TUPLE =   github jggimi pokerth-openbsd 2025.09.04 .
-V =            1.1.2pl20250904
+V =            2.0.6
+DIST_TUPLE =   github pokerth pokerth v${V} .
 PKGNAME =      pokerth-${V}
-REVISION =     0
 
 CATEGORIES =   games
 
@@ -19,30 +18,28 @@ SUBST_VARS +=       MODQT_QTDIR V
 
 ALL_TARGET =   pokerth_client
 
-CONFIGURE_ARGS +=              -DCMAKE_BUILD_TYPE=RelWithDebInfo
-DEBUG_PACKAGES =               ${BUILD_PACKAGES}
+CONFIGURE_ARGS +=      -DCMAKE_BUILD_TYPE=RelWithDebInfo
+MODCMAKE_LDFLAGS +=    -L${LOCALBASE}/lib -liconv
+
+DEBUG_PACKAGES =       ${BUILD_PACKAGES}
 
 BUILD_DEPENDS +=       x11/qt6/qtwebsockets
 
 LIB_DEPENDS += devel/boost,-main
 LIB_DEPENDS += devel/protobuf
-LIB_DEPENDS += devel/sdl
-LIB_DEPENDS += devel/sdl-mixer
-LIB_DEPENDS += security/libgsasl
+LIB_DEPENDS += x11/qt6/qtmultimedia
 
 RUN_DEPENDS += devel/desktop-file-utils
 
-WANTLIB +=     ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Network
-WANTLIB +=     Qt6Sql Qt6Widgets Qt6Xml SDL SDL_mixer boost_atomic-mt
-WANTLIB +=     boost_filesystem-mt boost_iostreams-mt boost_program_options-mt
-WANTLIB +=     boost_random-mt boost_regex-mt
-WANTLIB +=     boost_thread-mt boost_thread-mt c crypto curl gsasl m protobuf
-WANTLIB +=     sqlite3 ssl
-
-pre-configure:
-       cd ${WRKSRC} && \
-       protoc --cpp_out=src/third_party/protobuf chatcleaner.proto && \
-       protoc --cpp_out=src/third_party/protobuf pokerth.proto && \
-       ${SUBST_CMD} pokerth.desktop src/game_defs.h
+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
+
+
+pre-build:
+       ${SUBST_CMD} ${WRKSRC}/pokerth.desktop
 
 .include <bsd.port.mk>
diff --git games/pokerth/distinfo games/pokerth/distinfo
index 9c3b9078f67..09b64344f8b 100644
--- games/pokerth/distinfo
+++ games/pokerth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jggimi-pokerth-openbsd-2025.09.04.tar.gz) = 
njlbeGY9KJUAIX/yTtUsWaP4hEwftZlLHoFi2+JE5Oo=
-SIZE (jggimi-pokerth-openbsd-2025.09.04.tar.gz) = 27752902
+SHA256 (pokerth-pokerth-v2.0.6.tar.gz) = 
BUJ3TU2/ZGN16Anqubgd9uzLDFKnXmlenwIQ13LnUWw=
+SIZE (pokerth-pokerth-v2.0.6.tar.gz) = 27518352
diff --git games/pokerth/patches/patch-CMakeLists_txt 
games/pokerth/patches/patch-CMakeLists_txt
deleted file mode 100644
index f0645eefb29..00000000000
--- games/pokerth/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,104 +0,0 @@
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -324,92 +324,8 @@ target_link_libraries(pokerth_client PUBLIC pokerth_pr
- install(TARGETS pokerth_client DESTINATION bin OPTIONAL COMPONENT 
pokerth_client)
- install(DIRECTORY data DESTINATION share/pokerth COMPONENT pokerth_client)
- install(FILES pokerth.desktop DESTINATION share/applications COMPONENT 
pokerth_client)
--install(FILES pokerth.desktop DESTINATION 
$ENV{HOME}/.local/share/applications COMPONENT pokerth_client)
- install(FILES pokerth.png DESTINATION share/pixmaps COMPONENT pokerth_client)
- 
--
--# POKERTH.qml-client ... unfinisihed
--
--set(POKERTH_QML_CLIENT_SRC src/pokerth.cpp
--    src/core/common/loghelper_client.cpp
--    src/core/common/qttools/qthelper/qthelper.cpp
--    src/core/common/qttools/qttoolswrapper.cpp
--    src/core/common/qttoolsinterface.cpp
--    src/gui/qt6-qml/cpp/retranslate.cpp
--    src/gui/qt6-qml/cpp/settingsxmlhandler.cpp)
--
--qt_add_resources(POKERTH_QML_CLIENT_SRC src/gui/qt6-qml/qml.qrc)
--
--set(QML_FILES
--    src/gui/qt6-qml/pokerth.qml
--    src/gui/qt6-qml/components/CustomCheckBox.qml
--    src/gui/qt6-qml/components/CustomComboBox.qml
--    src/gui/qt6-qml/components/CustomTabBar.qml
--    src/gui/qt6-qml/components/CustomToggle.qml
--    src/gui/qt6-qml/components/GamePlayerBox.qml
--    src/gui/qt6-qml/components/GamePlayerSelfBox.qml
--    src/gui/qt6-qml/components/GuiSettings.qml
--    src/gui/qt6-qml/components/InternetGameSettings.qml
--    src/gui/qt6-qml/components/LocalGameSettings.qml
--    src/gui/qt6-qml/components/LogsSettings.qml
--    src/gui/qt6-qml/components/NetworkGameSettings.qml
--    src/gui/qt6-qml/components/NicknameAvatarSettings.qml
--    src/gui/qt6-qml/components/ResetSettings.qml
--    src/gui/qt6-qml/components/SideMenu.qml
--    src/gui/qt6-qml/components/SoundSettings.qml
--    src/gui/qt6-qml/components/CustomButton.qml
--    src/gui/qt6-qml/components/StyleSettings.qml
--    src/gui/qt6-qml/pages/AboutPage.qml
--    src/gui/qt6-qml/pages/GamePage.qml
--    src/gui/qt6-qml/pages/InternetGamePage.qml
--    src/gui/qt6-qml/pages/LocalGamePage.qml
--    src/gui/qt6-qml/pages/LogsPage.qml
--    src/gui/qt6-qml/pages/NetworkGameCreatePage.qml
--    src/gui/qt6-qml/pages/NetworkGameEnterPage.qml
--    src/gui/qt6-qml/pages/PreLoader.qml
--    src/gui/qt6-qml/pages/SettingsPage.qml
--    src/gui/qt6-qml/pages/StartPage.qml
--    src/gui/qt6-qml/config/StaticData.qml
--    src/gui/qt6-qml/config/Parameters.qml)
--
--set(TS_FILES
--    src/gui/qt6-qml/i18n/pokerth_de_DE.ts
--    src/gui/qt6-qml/i18n/pokerth_fr_FR.ts
--    src/gui/qt6-qml/i18n/pokerth_en_US.ts
--)
--
--qt_add_translations(pokerth_qml-client
--    TS_FILES        ${TS_FILES}
--    SOURCES         ${POKERTH_QML_CLIENT_SRC} ${QML_FILES}
--    RESOURCE_PREFIX "/i18n"
--)
--
--add_executable(pokerth_qml-client "${POKERTH_QML_CLIENT_SRC}")
--
--target_include_directories(pokerth_qml-client PUBLIC
--    src
--    src/config
--    src/core
--    src/core/common
--    src/core/common/qttools
--    src/core/common/qttools/qthelper
--    src/gui
--    src/gui/qt6-qml/cpp)
--
--target_link_libraries(pokerth_qml-client PUBLIC pokerth_lib)
--target_link_libraries(pokerth_qml-client PUBLIC pokerth_protocol)
--target_link_libraries(pokerth_qml-client PUBLIC LibCurl)
--target_link_libraries(pokerth_qml-client PRIVATE Qt6::Core Qt6::Gui 
Qt6::Quick Qt6::Qml Qt6::Sql Qt6::Xml Qt6::Svg Qt6::QuickControls2 Qt6::Widgets)
--
--target_compile_definitions(pokerth_qml-client PUBLIC QML_CLIENT)
--
--install(TARGETS pokerth_qml-client DESTINATION bin OPTIONAL COMPONENT 
pokerth_qml-client)
--install(DIRECTORY data DESTINATION share/pokerth COMPONENT pokerth_qml-client)
--install(FILES pokerth_qml.desktop DESTINATION 
$ENV{HOME}/.local/share/applications COMPONENT pokerth_qml-client)
--install(FILES pokerth_qml.desktop DESTINATION share/applications COMPONENT 
pokerth_qml-client)
--install(FILES pokerth.png DESTINATION share/pixmaps COMPONENT 
pokerth_qml-client)
--
--
- # POKERTH.dedicated_server
- 
- set(POKERTH_SERVER_SRC src/pokerth_server.cpp
-@@ -498,7 +414,6 @@ target_include_directories(pokerth_official_server PUB
- 
- target_link_libraries(pokerth_official_server PUBLIC LibCurl)
- target_link_libraries(pokerth_official_server PUBLIC -lircclient)
--target_link_libraries(pokerth_official_server PUBLIC "${MYSQLPP_LIBRARIES}")
- target_link_libraries(pokerth_official_server PUBLIC pokerth_dbofficial)
- target_link_libraries(pokerth_official_server PUBLIC pokerth_lib)
- target_link_libraries(pokerth_official_server PUBLIC pokerth_db)
diff --git games/pokerth/patches/patch-src_game_defs_h 
games/pokerth/patches/patch-src_game_defs_h
deleted file mode 100644
index c96d26e40bb..00000000000
--- games/pokerth/patches/patch-src_game_defs_h
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/game_defs.h
---- src/game_defs.h.orig
-+++ src/game_defs.h
-@@ -46,7 +46,7 @@
- #define POKERTH_VERSION                       ((POKERTH_VERSION_MAJOR << 8) | 
POKERTH_VERSION_MINOR)
- 
- #define POKERTH_BETA_REVISION 0
--#define POKERTH_BETA_RELEASE_STRING    "1.1.2"
-+#define POKERTH_BETA_RELEASE_STRING    "${V}"
- 
- #define SQLITE_LOG_VERSION            1
- 
diff --git games/pokerth/patches/patch-src_gui_qt6-qml_CMakeLists_txt 
games/pokerth/patches/patch-src_gui_qt6-qml_CMakeLists_txt
new file mode 100644
index 00000000000..5bec9a310de
--- /dev/null
+++ games/pokerth/patches/patch-src_gui_qt6-qml_CMakeLists_txt
@@ -0,0 +1,9 @@
+Index: src/gui/qt6-qml/CMakeLists.txt
+--- src/gui/qt6-qml/CMakeLists.txt.orig
++++ src/gui/qt6-qml/CMakeLists.txt
+@@ -132,5 +132,4 @@ endif()
+ 
+ install(TARGETS pokerth_qml-client DESTINATION bin OPTIONAL)
+ install(DIRECTORY ../../../data DESTINATION share/pokerth)
+-install(FILES ../../../pokerth_qml.desktop DESTINATION share/applications)
+ install(FILES ../../../pokerth.png DESTINATION share/pixmaps)
diff --git games/pokerth/patches/patch-src_net_clientstate_cpp 
games/pokerth/patches/patch-src_net_clientstate_cpp
new file mode 100644
index 00000000000..43085b46808
--- /dev/null
+++ games/pokerth/patches/patch-src_net_clientstate_cpp
@@ -0,0 +1,14 @@
+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/pkg/PLIST games/pokerth/pkg/PLIST
index 4dc8720dab6..c93473395a8 100644
--- games/pokerth/pkg/PLIST
+++ games/pokerth/pkg/PLIST
@@ -290,6 +290,7 @@ share/pokerth/data/gfx/gui/misc/startwindowbg10_mobile.png
 share/pokerth/data/gfx/gui/misc/welcomepokerth10_desktop.png
 share/pokerth/data/gfx/gui/misc/welcomepokerth10_mobile.png
 share/pokerth/data/gfx/gui/misc/windowicon.png
+share/pokerth/data/gfx/gui/misc/windowicon_transparent.png
 share/pokerth/data/gfx/gui/table/
 share/pokerth/data/gfx/gui/table/danuxi1/
 share/pokerth/data/gfx/gui/table/danuxi1/bigblindPuck.png
@@ -438,6 +439,7 @@ share/pokerth/data/sounds/default/playerconnected.wav
 share/pokerth/data/sounds/default/raise.wav
 share/pokerth/data/sounds/default/yourturn.wav
 share/pokerth/data/translations/
+share/pokerth/data/translations/pokerth_START_HERE.qm
 share/pokerth/data/translations/pokerth_af.qm
 share/pokerth/data/translations/pokerth_bg.qm
 share/pokerth/data/translations/pokerth_ca.qm
@@ -476,6 +478,7 @@ share/pokerth/data/translations/qt_gl.qm
 share/pokerth/data/translations/qt_he.qm
 share/pokerth/data/translations/qt_hu.qm
 share/pokerth/data/translations/qt_ja.qm
+share/pokerth/data/translations/qt_lt.qm
 share/pokerth/data/translations/qt_nl.qm
 share/pokerth/data/translations/qt_pl.qm
 share/pokerth/data/translations/qt_pt.qm
@@ -484,6 +487,7 @@ share/pokerth/data/translations/qt_sk.qm
 share/pokerth/data/translations/qt_sl.qm
 share/pokerth/data/translations/qt_sv.qm
 share/pokerth/data/translations/qt_uk.qm
+share/pokerth/data/translations/qt_untranslated.qm
 share/pokerth/data/translations/qt_zh_CN.qm
 share/pokerth/data/translations/qt_zh_TW.qm
 @tag update-desktop-database

Reply via email to