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.
diff --git games/pokerth/Makefile games/pokerth/Makefile index d37c5e3c001..3535809d406 100644 --- games/pokerth/Makefile +++ games/pokerth/Makefile @@ -1,8 +1,7 @@ -BROKEN-i386 = protobuf/abseil problems +COMMENT = texas holdem poker client, local or internet games +COMMENT-legacy = WxWidgets client only, required for i386 -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} @@ -12,7 +11,6 @@ MAINTAINER = Josh Grosse <josh@jggimi.net> # AGPLv3+ 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 @@ -25,8 +23,16 @@ MODULES = devel/cmake \ x11/qt6 SUBST_VARS += MODQT_QTDIR V +FLAVORS = legacy + ALL_TARGET = pokerth_client pokerth_qml-client +FLAVOR?= +.if ${MACHINE_ARCH:Mi386} || ${FLAVOR:Mlegacy} +FLAVOR = legacy +ALL_TARGET = pokerth_client +.endif + MODCMAKE_LDFLAGS += -L${LOCALBASE}/lib -liconv DEBUG_PACKAGES = ${BUILD_PACKAGES} diff --git games/pokerth/distinfo games/pokerth/distinfo index cc4b2b809ce..76484d65051 100644 --- games/pokerth/distinfo +++ games/pokerth/distinfo @@ -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 diff --git games/pokerth/patches/patch-src_net_tlspinning_cpp games/pokerth/patches/patch-src_net_tlspinning_cpp deleted file mode 100644 index be4b86d4c6f..00000000000 --- games/pokerth/patches/patch-src_net_tlspinning_cpp +++ /dev/null @@ -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); -+
No comments:
Post a Comment