Attachment #242119 for bug #271348




PORTNAME=	chessx
DISTVERSION=	1.6.0
PORTREVISION=
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.6.0

MAINTAINER=	alexey@pentode.fi
COMMENT=	Qt 5 chess database application
WWW=		https://chessx.sourceforge.io/

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING.md

USES=		compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5 tar:tgz
USE_GL=		gl


PLIST_FILES=	bin/chessx \
		share/applications/chessx.desktop \
		share/pixmaps/chessx.png \
		share/metainfo/io.sourceforge.ChessX.metainfo.xml \
		share/icons/hicolor/128x128/apps/chessx.png \
		share/icons/hicolor/32x32/apps/chessx-32.png \
		share/icons/hicolor/64x64/apps/chessx-64.png

OPTIONS_DEFINE=	CRAFTY STOCKFISH


Lines 1-3 Link Here

(-)b/games/chessx/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1641324910	1	TIMESTAMP = 1683708876
2	SHA256 (chessx-1.5.7.tgz) = c1a7483b788dbe3f0b808cc4c474e6797c579d6388f9588badd84097367bf49c	2	SHA256 (chessx-1.6.0.tgz) = efa60e7b55a907ebdd12810a1931de69624ba42544e11a3262ed562f2dc3c618
3	SIZE (chessx-1.5.7.tgz) = 3861310	3	SIZE (chessx-1.6.0.tgz) = 8252976




--- chessx.pro.orig	2023-05-08 20:22:12 UTC
+++ chessx.pro
@@ -67,18 +67,26 @@ unix|!macx {
     BINDIR = $$PREFIX/bin
     DATADIR = $$PREFIX/share
 
-    INSTALLS += appdata desktop icons binfiles
+    INSTALLS += appdata desktop icons32 icons64 icons128 pixmaps binfiles
 
     appdata.files = unix/io.sourceforge.ChessX.metainfo.xml
     appdata.path = $$DATADIR/metainfo
+ pixmaps.path = $$PREFIX/share/pixmaps
+ pixmaps.files = data/images/chessx.png
+ desktop.path = $$PREFIX/share/applications
+ desktop.files = unix/chessx.desktop
+ INSTALLS += target desktop pixmaps
+}
+
     desktop.files = unix/chessx.desktop
     desktop.path = $$DATADIR/applications
 
-    icons.path = $$DATADIR/icons/hicolor
-    icons.commands = install -Dm644 data/images/chessx.png    $${icons.path}/128x128/apps/chessx.png; \
-                     install -Dm644 data/images/chessx-32.png $${icons.path}/32x32/apps/chessx.png; \
-                     install -Dm644 data/images/chessx-64.png $${icons.path}/64x64/apps/chessx.png;
+    icons32.files = data/images/chessx-32.png
+    icons32.path = $$DATADIR/icons/hicolor/32x32/apps
 
+    icons64.path = $$DATADIR/icons/hicolor/64x64/apps
+    icons64.files = data/images/chessx-64.png
+
+    icons128.path = $$DATADIR/icons/hicolor/128x128/apps
+    icons128.files = data/images/chessx.png
+
+    pixmaps.path = $$PREFIX/share/pixmaps
+    pixmaps.files = data/images/chessx.png
+
     binfiles.files = release/chessx
     binfiles.path = $$BINDIR
 }
@@ -532,6 +540,7 @@ win32 {
   INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
   win32-g++:LIBS += -lz
 }
+
+        i18n/chessx_fr.ts \
+        i18n/chessx_it.ts \
+        i18n/chessx_cz.ts \
+        i18n/chessx_ru.ts \
+        i18n/chessx_es.ts \
+        i18n/chessx_nl.ts \
+        i18n/chessx_pl.ts \
+        i18n/chessx_pt_BR.ts \
+        i18n/chessx_ro.ts \
+        i18n/chessx_zh.ts
 
 UI_DIR = src/generated
 MOC_DIR = src/generated




--- src/gui/chessxsettings.cpp.orig	2023-05-08 20:22:12 UTC
+++ src/gui/chessxsettings.cpp
@@ -19,11 +19,11 @@
 #include <QWidget>
 #include <QMainWindow>
 #include <QSplitter>
+#ifdef USE_SPEECH
 #include <QTextToSpeech>
+#endif
 #include <QLayout>
-
 using namespace chessx;
-
 #if defined(_MSC_VER) && defined(_DEBUG)
 #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
 #define new DEBUG_NEW




--- src/gui/chessxsettings.h.orig	2023-05-08 20:22:12 UTC
+++ src/gui/chessxsettings.h
@@ -13,16 +13,11 @@ class ChessXSettings : public Settings
 public:
     ChessXSettings();
     ChessXSettings(const QString &fileName);
-
     virtual bool layout(QWidget* w);
     virtual void setLayout(const QWidget* w);
-
     static QLocale locale(); // Get the locale based upon current settings
-#ifdef USE_SPEECH
     static QStringList availableVoices(QString lang); // Get the list of voices based upon selected locale
     static void configureSpeech(QTextToSpeech* speech);
-#endif
-
 protected:
     virtual void initWidgetValues(QMap<QString, QVariant>& map) const;
 };

Return to bug 271348

Lines 1-15 Link Here

(-)b/games/chessx/Makefile (-6 / +10 lines)
1	PORTNAME= chessx	1	PORTNAME= chessx
2	PORTVERSION= 1.5.7	2	DISTVERSION= 1.6.0
3	PORTREVISION= 1	3	PORTREVISION=
4	CATEGORIES= games	4	CATEGORIES= games
5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/beta	5	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.6.0
6		6
7	MAINTAINER= ports@FreeBSD.org	7	MAINTAINER= alexey@pentode.fi
8	COMMENT= Qt 5 chess database application	8	COMMENT= Qt 5 chess database application
9	WWW= https://chessx.sourceforge.io/	9	WWW= https://chessx.sourceforge.io/
10		10
11	LICENSE= GPLv2+	11	LICENSE= GPLv2+
12	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING.md
13		13
14	USES= compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5 tar:tgz	14	USES= compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5 tar:tgz
15	USE_GL= gl	15	USE_GL= gl
Lines 18-24 USE_QT= concurrent core gui multimedia network opengl printsupport svg \ Link Here
18		18
19	PLIST_FILES= bin/chessx \	19	PLIST_FILES= bin/chessx \
20	share/applications/chessx.desktop \	20	share/applications/chessx.desktop \
21	share/pixmaps/chessx.png	21	share/pixmaps/chessx.png \
		22	share/metainfo/io.sourceforge.ChessX.metainfo.xml \
		23	share/icons/hicolor/128x128/apps/chessx.png \
		24	share/icons/hicolor/32x32/apps/chessx-32.png \
		25	share/icons/hicolor/64x64/apps/chessx-64.png
22		26
23	OPTIONS_DEFINE= CRAFTY STOCKFISH	27	OPTIONS_DEFINE= CRAFTY STOCKFISH
24		28

Lines 1-48 Link Here

(-)b/games/chessx/files/patch-chessx.pro (-43 / +37 lines)
1	--- chessx.pro.orig 2021-09-17 10:33:08 UTC	1	--- chessx.pro.orig 2023-05-08 20:22:12 UTC
2	+++ chessx.pro	2	+++ chessx.pro
3	@@ -534,24 +534,30 @@ lc0 {	3	@@ -67,18 +67,26 @@ unix\|!macx {
4	QMAKE_BUNDLE_DATA += LC0_ENGINE_LIB	4	BINDIR = $$PREFIX/bin
5	}	5	DATADIR = $$PREFIX/share
		6
		7	- INSTALLS += appdata desktop icons binfiles
		8	+ INSTALLS += appdata desktop icons32 icons64 icons128 pixmaps binfiles
6		9
7	+unix:!macx {	10	appdata.files = unix/io.sourceforge.ChessX.metainfo.xml
8	+ target.path = $$PREFIX/bin	11	appdata.path = $$DATADIR/metainfo
9	+ pixmaps.path = $$PREFIX/share/pixmaps
10	+ pixmaps.files = data/images/chessx.png
11	+ desktop.path = $$PREFIX/share/applications
12	+ desktop.files = unix/chessx.desktop
13	+ INSTALLS += target desktop pixmaps
14	+}
15	+	12	+
16	RESOURCES = \	13	desktop.files = unix/chessx.desktop
17	resources.qrc translations.qrc	14	desktop.path = $$DATADIR/applications
		15
		16	- icons.path = $$DATADIR/icons/hicolor
		17	- icons.commands = install -Dm644 data/images/chessx.png $${icons.path}/128x128/apps/chessx.png; \
		18	- install -Dm644 data/images/chessx-32.png $${icons.path}/32x32/apps/chessx.png; \
		19	- install -Dm644 data/images/chessx-64.png $${icons.path}/64x64/apps/chessx.png;
		20	+ icons32.files = data/images/chessx-32.png
		21	+ icons32.path = $$DATADIR/icons/hicolor/32x32/apps
18		22
19	-TRANSLATIONS = i18n/chessx_de.ts	23	+ icons64.path = $$DATADIR/icons/hicolor/64x64/apps
20	-	24	+ icons64.files = data/images/chessx-64.png
21	-#\	25	+
22	-# i18n/chessx_da.ts \	26	+ icons128.path = $$DATADIR/icons/hicolor/128x128/apps
23	-# i18n/chessx_fr.ts \	27	+ icons128.files = data/images/chessx.png
24	-# i18n/chessx_it.ts \	28	+
25	-# i18n/chessx_cz.ts \	29	+ pixmaps.path = $$PREFIX/share/pixmaps
26	-# i18n/chessx_ru.ts \	30	+ pixmaps.files = data/images/chessx.png
27	-# i18n/chessx_es.ts	31	+
28	-	32	binfiles.files = release/chessx
29	-# i18n/chessx_nl.ts \	33	binfiles.path = $$BINDIR
30	-# i18n/chessx_pl.ts \	34	}
31	-# i18n/chessx_pt_BR.ts \	35	@@ -532,6 +540,7 @@ win32 {
32	-# i18n/chessx_ro.ts \	36	INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
33	-# i18n/chessx_zh.ts	37	win32-g++:LIBS += -lz
34	+TRANSLATIONS = i18n/chessx_de.ts \	38	}
35	+ i18n/chessx_da.ts \	39	+
36	+ i18n/chessx_fr.ts \
37	+ i18n/chessx_it.ts \
38	+ i18n/chessx_cz.ts \
39	+ i18n/chessx_ru.ts \
40	+ i18n/chessx_es.ts \
41	+ i18n/chessx_nl.ts \
42	+ i18n/chessx_pl.ts \
43	+ i18n/chessx_pt_BR.ts \
44	+ i18n/chessx_ro.ts \
45	+ i18n/chessx_zh.ts
46		40
47	isEmpty(QMAKE_LRELEASE) {	41	UI_DIR = src/generated
48	win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe	42	MOC_DIR = src/generated

Added Link Here

(-)b/games/chessx/files/patch-src_gui_chessxsettings.cpp (+16 lines)
1	--- src/gui/chessxsettings.cpp.orig 2023-05-08 20:22:12 UTC
2	+++ src/gui/chessxsettings.cpp
3	@@ -19,11 +19,11 @@
4	#include <QWidget>
5	#include <QMainWindow>
6	#include <QSplitter>
7	+#ifdef USE_SPEECH
8	#include <QTextToSpeech>
9	+#endif
10	#include <QLayout>
11	-
12	using namespace chessx;
13	-
14	#if defined(_MSC_VER) && defined(_DEBUG)
15	#define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
16	#define new DEBUG_NEW

Added Link Here

(-)b/games/chessx/files/patch-src_gui_chessxsettings.h (-1 / +19 lines)
0	-	1	--- src/gui/chessxsettings.h.orig 2023-05-08 20:22:12 UTC
		2	+++ src/gui/chessxsettings.h
		3	@@ -13,16 +13,11 @@ class ChessXSettings : public Settings
		4	public:
		5	ChessXSettings();
		6	ChessXSettings(const QString &fileName);
		7	-
		8	virtual bool layout(QWidget* w);
		9	virtual void setLayout(const QWidget* w);
		10	-
		11	static QLocale locale(); // Get the locale based upon current settings
		12	-#ifdef USE_SPEECH
		13	static QStringList availableVoices(QString lang); // Get the list of voices based upon selected locale
		14	static void configureSpeech(QTextToSpeech* speech);
		15	-#endif
		16	-
		17	protected:
		18	virtual void initWidgetValues(QMap<QString, QVariant>& map) const;
		19	};