Update chessx to 1.5.6 and use archivers/quazip 1.3

Tweaks and OK sdk
2022-08-29 13:32:38 +00:00 · 2022-08-29 13:32:38 +00:00 · 979d5406bb
parent e3ac217b56
commit 979d5406bb
8 changed files with 61 additions and 160 deletions
--- a/games/chessx/Makefile
+++ b/games/chessx/Makefile
@ -1,35 +1,43 @@
-COMMENT =		free chess database and analyzer
-DISTNAME =		chessx-1.4.6
-CATEGORIES =		games
-HOMEPAGE =		http://chessx.sourceforge.net/
-REVISION =		5
+COMMENT =	free chess database and analyzer
+
+V =		1.5.6
+GH_ACCOUNT =	Isarhamster
+GH_PROJECT =	chessx
+GH_TAGNAME =	v${V}-lw
+
+DISTNAME =	chessx-${V}
+
+CATEGORIES =	games
+
+HOMEPAGE =	https://chessx.sourceforge.net/

 # GPLv2+
 PERMIT_PACKAGE =	Yes

-WANTLIB =  GL Qt5Core Qt5Gui Qt5Multimedia Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m pthread quazip5 z
-WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Multimedia Qt5Network
+WANTLIB += Qt5PrintSupport Qt5Svg Qt5TextToSpeech Qt5Widgets Qt5Xml
+WANTLIB += c m pulse pulse-mainloop-glib quazip1-qt5 z

-MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=chessx/}
-EXTRACT_SUFX =		.tgz
+MODULES =	x11/qt5 \
+		devel/cmake

-MODULES =		x11/qt5 devel/qmake
-RUN_DEPENDS =		devel/desktop-file-utils
-LIB_DEPENDS =		archivers/quazip \
-			x11/qt5/qtmultimedia \
-			x11/qt5/qtsvg
+RUN_DEPENDS =	devel/desktop-file-utils

-NO_TEST =		Yes
+LIB_DEPENDS =	archivers/quazip>=1.3 \
+		x11/qt5/qtmultimedia \
+		x11/qt5/qtspeech \
+		x11/qt5/qtsvg

-CXXFLAGS +=		-I${LOCALBASE}/include/quazip5
+NO_TEST =	Yes
+
+CXXFLAGS +=	-I${LOCALBASE}/include/QuaZip-Qt5/quazip/

 # make sure bundled quazip is not picked up
 post-extract:
 	rm -R ${WRKDIST}/src/quazip

 do-install:
-	${INSTALL_PROGRAM} ${WRKBUILD}/release/chessx ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKBUILD}/chessx ${PREFIX}/bin/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/unix/chessx.desktop ${PREFIX}/share/applications/

--- a/games/chessx/distinfo
+++ b/games/chessx/distinfo
@ -1,2 +1,2 @@
-SHA256 (chessx-1.4.6.tgz) = rZUZEKO9U/VlX56FEB55abU2B4Rz4Joqfd7W7xcaaO0=
-SIZE (chessx-1.4.6.tgz) = 4223076
+SHA256 (chessx-1.5.6.tar.gz) = NKOv9azN6Szn6UC5E68Du4KWIwYdaswjfL5aBLpkIoE=
+SIZE (chessx-1.5.6.tar.gz) = 22796472
--- a/games/chessx/patches/patch-CMakeLists_txt
+++ b/games/chessx/patches/patch-CMakeLists_txt
@ -0,0 +1,15 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
+++ CMakeLists.txt
+@@ -103,9 +103,10 @@ add_executable(chessx WIN32
+   ${OTHER_FILES}
+ )
+ 
+find_package(QuaZip-Qt5 REQUIRED)
+ target_link_libraries(chessx PRIVATE
+   qt_config
+-  quazip
+  QuaZip::QuaZip
+   bitboard
+   board
+   eco
--- a/games/chessx/patches/patch-chessx_pro
+++ b/games/chessx/patches/patch-chessx_pro
@ -1,107 +0,0 @@
-Use system quazip.
-Index: chessx.pro
--- chessx.pro.orig
-+++ chessx.pro
-@@ -141,22 +141,6 @@ HEADERS += src/database/board.h \
-     src/gui/engineoptionlist.h \
-     src/gui/helpbrowser.h \
-     src/database/downloadmanager.h \
-    src/quazip/zip.h \
-    src/quazip/unzip.h \
-    src/quazip/quazipnewinfo.h \
-    src/quazip/quazipfileinfo.h \
-    src/quazip/quazipfile.h \
-    src/quazip/quazipdir.h \
-    src/quazip/quazip.h \
-    src/quazip/quazip_global.h \
-    src/quazip/quaziodevice.h \
-    src/quazip/quagzipfile.h \
-    src/quazip/quacrc32.h \
-    src/quazip/quachecksum32.h \
-    src/quazip/quaadler32.h \
-    src/quazip/JlCompress.h \
-    src/quazip/ioapi.h \
-    src/quazip/crypt.h \
-     src/gui/toolmainwindow.h \
-     src/gui/playerlistwidget.h \
-     src/gui/qled.h \
-@@ -299,18 +283,6 @@ SOURCES += src/database/board.cpp \
-     src/gui/engineoptionlist.cpp \
-     src/gui/helpbrowser.cpp \
-     src/database/downloadmanager.cpp \
-    src/quazip/quazipnewinfo.cpp \
-    src/quazip/quazipfile.cpp \
-    src/quazip/quazipdir.cpp \
-    src/quazip/quazip.cpp \
-    src/quazip/quaziodevice.cpp \
-    src/quazip/quagzipfile.cpp \
-    src/quazip/quacrc32.cpp \
-    src/quazip/quaadler32.cpp \
-    src/quazip/qioapi.cpp \
-    src/quazip/JlCompress.cpp \
-    src/quazip/zip.c \
-    src/quazip/unzip.c \
-     src/gui/toolmainwindow.cpp \
-     src/gui/playerlistwidget.cpp \
-     src/gui/qled.cpp \
-@@ -382,12 +354,48 @@ SOURCES += src/database/board.cpp \
-     src/database/streamdatabase.cpp \
-     src/database/refcount.cpp
- 
-+!openbsd {
-+HEADERS += \
-+    src/quazip/zip.h \
-+    src/quazip/unzip.h \
-+    src/quazip/quazipnewinfo.h \
-+    src/quazip/quazipfileinfo.h \
-+    src/quazip/quazipfile.h \
-+    src/quazip/quazipdir.h \
-+    src/quazip/quazip.h \
-+    src/quazip/quazip_global.h \
-+    src/quazip/quaziodevice.h \
-+    src/quazip/quagzipfile.h \
-+    src/quazip/quacrc32.h \
-+    src/quazip/quachecksum32.h \
-+    src/quazip/quaadler32.h \
-+    src/quazip/JlCompress.h \
-+    src/quazip/ioapi.h \
-+    src/quazip/crypt.h
-+
-+SOURCES += \
-+    src/quazip/quazipnewinfo.cpp \
-+    src/quazip/quazipfile.cpp \
-+    src/quazip/quazipdir.cpp \
-+    src/quazip/quazip.cpp \
-+    src/quazip/quaziodevice.cpp \
-+    src/quazip/quagzipfile.cpp \
-+    src/quazip/quacrc32.cpp \
-+    src/quazip/quaadler32.cpp \
-+    src/quazip/qioapi.cpp \
-+    src/quazip/JlCompress.cpp \
-+    src/quazip/zip.c \
-+    src/quazip/unzip.c
-+}
-+
- TEMPLATE = app
- INCLUDEPATH += src/database
- INCLUDEPATH += src/guess
- INCLUDEPATH += src/gui
- INCLUDEPATH += src/dialogs
-INCLUDEPATH += src/quazip
-+!openbsd {
-+    INCLUDEPATH += src/quazip
-+}
- INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
- 
- win32 {
-@@ -425,6 +433,10 @@ static {
-     CONFIG(release, debug|release) {
-         LIBS += -lz
-     }
-+}
-+
-+openbsd {
-+    LIBS += -lquazip5
- }
- 
- TARGET = chessx
--- a/games/chessx/patches/patch-src_CMakeLists_txt
+++ b/games/chessx/patches/patch-src_CMakeLists_txt
@ -0,0 +1,18 @@
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
+@@ -1,5 +1,3 @@
+-add_subdirectory(quazip)
+-
+ add_library(bitboard STATIC
+   database/bitboard.cpp
+   database/bitboard.h
+@@ -437,7 +435,7 @@ target_link_libraries(gui
+   PRIVATE
+     qt_config
+     eco
+-    quazip
+    QuaZip::QuaZip
+     Qt5::PrintSupport
+     Qt5::Svg
+   PUBLIC
--- a/games/chessx/patches/patch-src_dialogs_preferences_cpp
+++ b/games/chessx/patches/patch-src_dialogs_preferences_cpp
@ -1,11 +0,0 @@
-Index: src/dialogs/preferences.cpp
--- src/dialogs/preferences.cpp.orig
-+++ src/dialogs/preferences.cpp
-@@ -21,6 +21,7 @@
- #include "engineoptiondialog.h"
- #include "downloadmanager.h"
- 
-+#include <QAction>
- #include <QCheckBox>
- #include <QColorDialog>
- #include <QComboBox>
--- a/games/chessx/patches/patch-src_dialogs_savedialog_cpp
+++ b/games/chessx/patches/patch-src_dialogs_savedialog_cpp
@ -1,11 +0,0 @@
-Index: src/dialogs/savedialog.cpp
--- src/dialogs/savedialog.cpp.orig
-+++ src/dialogs/savedialog.cpp
-@@ -22,6 +22,7 @@
- #include "settings.h"
- #include "tags.h"
- 
-+#include <QButtonGroup>
- #include <QLineEdit>
- #include <QCompleter>
- 
--- a/games/chessx/patches/patch-src_gui_gamewindow_cpp
+++ b/games/chessx/patches/patch-src_gui_gamewindow_cpp
@ -1,11 +0,0 @@
-Index: src/gui/gamewindow.cpp
--- src/gui/gamewindow.cpp.orig
-+++ src/gui/gamewindow.cpp
-@@ -8,6 +8,7 @@
- #include "nag.h"
- #include "settings.h"
- 
-+#include <QAction>
- #include <QToolButton>
- 
- #if defined(_MSC_VER) && defined(_DEBUG)