On 2026/09/21 20:34, Josh Grosse wrote:
> On Mon, Sep 14, 2026 at 01:31:58PM -0400, Josh Grosse wrote:
> > Changelog: https://github.com/pokerth/pokerth/releases/tag/v2.1.9
> >
> > 1. BROKEN-i386 is removed. i386 can now build the legacy client
> > based on WxWidgets, but not the newer QML-based client, as
> > memory is too limited.
> >
> > 2. There is now a "legacy" FLAVOR to build the WxWidget-based
> > client.
> >
> > 3. This diff adds a PFRAG file to manage flavor packaging,
> > and removes the recent patch for LibreSSL, which was accepted
> > upstream.
> >
> > Tested on amd64 and i386. Comments? Corrections? OKs?
>
> Ping. Diff re-attached for convenience.
here with a few fixes/tweaks. haven't tested runtime.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/pokerth/Makefile,v
diff -u -p -r1.65 Makefile
--- Makefile 8 Sep 2026 13:00:26 -0000 1.65
+++ Makefile 22 Sep 2026 15:16:11 -0000
@@ -1,8 +1,6 @@
-BROKEN-i386 = protobuf/abseil problems
-
COMMENT = texas holdem poker client, local or internet games
-V = 2.1.8
+V = 2.1.9
DIST_TUPLE = github pokerth pokerth v${V} .
PKGNAME = pokerth-${V}
@@ -14,18 +12,30 @@ MAINTAINER = Josh Grosse <[email protected]
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui Qt6Multimedia
-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
+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
+WANTLIB += boost_program_options-mt boost_random-mt boost_regex-mt
+WANTLIB += boost_thread-mt c crypto iconv m protobuf ssl
MODULES = devel/cmake \
x11/qt6
-SUBST_VARS += MODQT_QTDIR V
+SUBST_VARS += MODQT_QTDIR
+FLAVORS = legacy
+FLAVOR?=
+.if ${MACHINE_ARCH:Mi386}
+# memory is too limited for the QML-based client
+FLAVOR = legacy
+.endif
+
+.if ${FLAVOR:Mlegacy}
+FLAVOR = legacy
+ALL_TARGET = pokerth_client
+.else
+WANTLIB += Qt6OpenGL Qt6Qml Qt6Quick Qt6QuickControls2 Qt6Svg
ALL_TARGET = pokerth_client pokerth_qml-client
+.endif
MODCMAKE_LDFLAGS += -L${LOCALBASE}/lib -liconv
DEBUG_PACKAGES = ${BUILD_PACKAGES}
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/pokerth/distinfo,v
diff -u -p -r1.18 distinfo
--- distinfo 8 Sep 2026 13:00:26 -0000 1.18
+++ distinfo 22 Sep 2026 15:16:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (pokerth-pokerth-v2.1.8.tar.gz) =
r8xvZXEW9tA+tj3WeyzPhxoe5gAfvEhFKenGmLIUrOE=
-SIZE (pokerth-pokerth-v2.1.8.tar.gz) = 128313001
+SHA256 (pokerth-pokerth-v2.1.9.tar.gz) =
Uk/z6sKd9ZahctskcivIn9Wzw7pH+zbrIDthmJJ04lQ=
+SIZE (pokerth-pokerth-v2.1.9.tar.gz) = 128926838
Index: patches/patch-src_net_tlspinning_cpp
===================================================================
RCS file: patches/patch-src_net_tlspinning_cpp
diff -N patches/patch-src_net_tlspinning_cpp
--- patches/patch-src_net_tlspinning_cpp 8 Sep 2026 13:00:26 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-Index: src/net/tlspinning.cpp
---- src/net/tlspinning.cpp.orig
-+++ src/net/tlspinning.cpp
-@@ -123,12 +123,22 @@ TlsPinning::ComputeSpkiPin(X509 *cert)
- if (!cert)
- return pin;
-
-+#ifdef LIBRESSL_VERSION_NUMBER
-+ X509_PUBKEY *pubKey = X509_get_X509_PUBKEY(cert);
-+ if (!pubKey)
-+ return pin;
-+
-+ unsigned char *der = NULL;
-+ int derSize = i2d_X509_PUBKEY(pubKey, &der);
-+#else
- const X509_PUBKEY *pubKey = X509_get_X509_PUBKEY(cert);
- if (!pubKey)
- return pin;
-
- unsigned char *der = NULL;
- const int derSize = i2d_X509_PUBKEY(pubKey, &der);
-+#endif
-+
- if (der) {
- if (derSize > 0) {
- unsigned char digest[SHA256_DIGEST_LENGTH];
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/games/pokerth/pkg/DESCR,v
diff -u -p -r1.5 DESCR
--- pkg/DESCR 23 Sep 2025 11:59:33 -0000 1.5
+++ pkg/DESCR 22 Sep 2026 15:16:11 -0000
@@ -1,3 +1,7 @@
This is the client package for pokerth, written in C++/Qt.
Play with bots, or play online with public or private
servers.
+
+Flavour: legacy - only include the old wxWidgets-based client.
+This is used by default on i386 where the newer QML-based client
+uses too much memory.
Index: pkg/PFRAG.no-legacy
===================================================================
RCS file: pkg/PFRAG.no-legacy
diff -N pkg/PFRAG.no-legacy
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.no-legacy 22 Sep 2026 15:16:11 -0000
@@ -0,0 +1,2 @@
+@bin bin/pokerth_qml-client
+share/applications/pokerth_qml.desktop
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/pokerth/pkg/PLIST,v
diff -u -p -r1.20 PLIST
--- pkg/PLIST 8 Sep 2026 13:00:26 -0000 1.20
+++ pkg/PLIST 22 Sep 2026 15:16:11 -0000
@@ -1,7 +1,6 @@
@bin bin/pokerth_client
-@bin bin/pokerth_qml-client
+!%%legacy%%
share/applications/pokerth.desktop
-share/applications/pokerth_qml.desktop
share/pixmaps/
share/pixmaps/pokerth.png
share/pokerth/
@@ -1465,6 +1464,8 @@ share/pokerth/data/misc/
share/pokerth/data/misc/ChangeLog
share/pokerth/data/misc/agpl.html
share/pokerth/data/misc/cacert.pem
+share/pokerth/data/misc/gpl-3.0.txt
+share/pokerth/data/misc/lgpl-3.0.txt
share/pokerth/data/misc/third_party_libs.txt
share/pokerth/data/sounds/
share/pokerth/data/sounds/default/
