Hi,

Here is update for chessx to 1.5.6. A 1.5.8 version is around, but
upstream made no formal release. You can find the changelog there [0].

Port-wise, that update allows to drop almost all patches. Sadly,
there is still no easy way to use our system quazip. 

It builds and works fine on amd64 (it's not built on macppc because
of rust being in the dependency chain).

Comments/feedback are welcome,

Charlène.


[0] https://github.com/Isarhamster/chessx/blob/master/ChangeLog#L20


Index: Makefile
===================================================================
RCS file: /cvs/ports/games/chessx/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile    26 Feb 2020 06:14:43 -0000      1.10
+++ Makefile    10 Jun 2021 12:02:17 -0000
@@ -1,17 +1,16 @@
 # $OpenBSD: Makefile,v 1.10 2020/02/26 06:14:43 rsadowski Exp $
 
 COMMENT =              free chess database and analyzer
-DISTNAME =             chessx-1.4.6
+DISTNAME =             chessx-1.5.6
 CATEGORIES =           games
 HOMEPAGE =             http://chessx.sourceforge.net/
-REVISION =             5
 
 # GPLv2+
 PERMIT_PACKAGE =       Yes
 
-WANTLIB =  GL Qt5Core Qt5Gui Qt5Multimedia Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m pthread quazip5 z
 WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += GL Qt5Core Qt5Gui Qt5Multimedia Qt5Network Qt5PrintSupport
+WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m quazip5 z
 
 MASTER_SITES =         ${MASTER_SITE_SOURCEFORGE:=chessx/}
 EXTRACT_SUFX =         .tgz
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/chessx/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo    2 Jul 2017 00:51:50 -0000       1.2
+++ distinfo    10 Jun 2021 12:02:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (chessx-1.4.6.tgz) = rZUZEKO9U/VlX56FEB55abU2B4Rz4Joqfd7W7xcaaO0=
-SIZE (chessx-1.4.6.tgz) = 4223076
+SHA256 (chessx-1.5.6.tgz) = 0JpLU0qQnF8aOYxkBlBJov3zBJe8gcy98NlAQSNk0gU=
+SIZE (chessx-1.5.6.tgz) = 3853395
Index: patches/patch-chessx_pro
===================================================================
RCS file: /cvs/ports/games/chessx/patches/patch-chessx_pro,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-chessx_pro
--- patches/patch-chessx_pro    2 Jul 2017 00:51:50 -0000       1.2
+++ patches/patch-chessx_pro    10 Jun 2021 12:02:17 -0000
@@ -3,52 +3,46 @@ 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
+@@ -293,22 +293,6 @@ HEADERS += src/database/board.h \
+   src/gui/textedit.h \
+   src/gui/toolmainwindow.h \
+   src/gui/translatingslider.h \
+-  src/quazip/JlCompress.h \
+-  src/quazip/crypt.h \
+-  src/quazip/ioapi.h \
+-  src/quazip/quaadler32.h \
+-  src/quazip/quachecksum32.h \
+-  src/quazip/quacrc32.h \
+-  src/quazip/quagzipfile.h \
+-  src/quazip/quaziodevice.h \
+-  src/quazip/quazip.h \
+-  src/quazip/quazip_global.h \
+-  src/quazip/quazipdir.h \
+-  src/quazip/quazipfile.h \
+-  src/quazip/quazipfileinfo.h \
+-  src/quazip/quazipnewinfo.h \
+-  src/quazip/unzip.h \
+-  src/quazip/zip.h
  
+ SOURCES += \
+   src/database/analysis.cpp \
+@@ -452,25 +436,49 @@ SOURCES += \
+   src/gui/textedit.cpp \
+   src/gui/toolmainwindow.cpp \
+   src/gui/translatingslider.cpp \
+-  src/quazip/JlCompress.cpp \
+-  src/quazip/qioapi.cpp \
+-  src/quazip/quaadler32.cpp \
+-  src/quazip/quacrc32.cpp \
+-  src/quazip/quagzipfile.cpp \
+-  src/quazip/quaziodevice.cpp \
+-  src/quazip/quazip.cpp \
+-  src/quazip/quazipdir.cpp \
+-  src/quazip/quazipfile.cpp \
+-  src/quazip/quazipnewinfo.cpp \
+-  src/quazip/unzip.cpp \
+-  src/quazip/zip.cpp
++ 
 +!openbsd {
 +HEADERS += \
 +    src/quazip/zip.h \
@@ -67,7 +61,7 @@ Index: chessx.pro
 +    src/quazip/JlCompress.h \
 +    src/quazip/ioapi.h \
 +    src/quazip/crypt.h
-+
+ 
 +SOURCES += \
 +    src/quazip/quazipnewinfo.cpp \
 +    src/quazip/quazipfile.cpp \
@@ -95,14 +89,14 @@ Index: chessx.pro
  INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
  
  win32 {
-@@ -425,6 +433,10 @@ static {
-     CONFIG(release, debug|release) {
-         LIBS += -lz
-     }
+@@ -478,6 +486,10 @@ win32 {
+   # LIBS += -lz
+   INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
+   win32-g++:LIBS += -lz
 +}
 +
 +openbsd {
 +    LIBS += -lquazip5
  }
  
- TARGET = chessx
+ UI_DIR = src/generated
Index: patches/patch-src_dialogs_preferences_cpp
===================================================================
RCS file: patches/patch-src_dialogs_preferences_cpp
diff -N patches/patch-src_dialogs_preferences_cpp
--- patches/patch-src_dialogs_preferences_cpp   26 Feb 2020 06:14:43 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_dialogs_preferences_cpp,v 1.1 2020/02/26 06:14:43 
rsadowski Exp $
-
-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>
Index: patches/patch-src_dialogs_savedialog_cpp
===================================================================
RCS file: patches/patch-src_dialogs_savedialog_cpp
diff -N patches/patch-src_dialogs_savedialog_cpp
--- patches/patch-src_dialogs_savedialog_cpp    26 Feb 2020 06:14:43 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_dialogs_savedialog_cpp,v 1.1 2020/02/26 06:14:43 rsadowski 
Exp $
-
-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>
- 
Index: patches/patch-src_gui_gamewindow_cpp
===================================================================
RCS file: patches/patch-src_gui_gamewindow_cpp
diff -N patches/patch-src_gui_gamewindow_cpp
--- patches/patch-src_gui_gamewindow_cpp        26 Feb 2020 06:14:43 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_gui_gamewindow_cpp,v 1.1 2020/02/26 06:14:43 rsadowski Exp 
$
-
-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)

Reply via email to