Attachment 242105 Details for Bug 271348 – New version of the patch, updating chessx to 1.6.0

[patch] New version of the patch, updating chessx to 1.6.0

0001-Update-ChessX-to-1.6.0.patch (text/plain), 5.74 KB, created by Alexey Vyskubov on 2023-05-10 13:41:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Vyskubov

Created: 2023-05-10 13:41:51 UTC

Size: 5.74 KB

patch

obsolete

>From ba414d51644705d43e0235a612182fb62e2e3314 Mon Sep 17 00:00:00 2001
>From: Alexey Vyskubov <alexey@pentode.fi>
>Date: Wed, 10 May 2023 14:27:45 +0300
>Subject: [PATCH] Update ChessX to 1.6.0.
>
>* Update to version 1.6.0
>* Volunteer to be a maintainer
>* Do not include obsolete i18n: see
>  https://sourceforge.net/p/chessx/wiki/HOWTO%20Translate/
>* Point to the proper license file
>* Fix bug preventing compilation if USE_SPEECH is not defined
>---
> games/chessx/Makefile                         | 10 +--
> games/chessx/distinfo                         |  6 +-
> games/chessx/files/patch-chessx.pro           | 66 +++++++------------
> .../files/patch-src_gui_chessxsettings.cpp    | 16 +++++
> .../files/patch-src_gui_chessxsettings.h      | 19 ++++++
> 5 files changed, 68 insertions(+), 49 deletions(-)
> create mode 100644 games/chessx/files/patch-src_gui_chessxsettings.cpp
> create mode 100644 games/chessx/files/patch-src_gui_chessxsettings.h
>
>diff --git a/games/chessx/Makefile b/games/chessx/Makefile
>index 591637558301..f513d7b4e095 100644
>--- a/games/chessx/Makefile
>+++ b/games/chessx/Makefile
>@@ -1,15 +1,15 @@
> PORTNAME=	chessx
>-PORTVERSION=	1.5.7
>-PORTREVISION=	1
>+DISTVERSION=	1.6.0
>+PORTREVISION=
> CATEGORIES=	games
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/beta
>+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.6.0
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	alexey@pentode.fi
> COMMENT=	Qt 5 chess database application
> WWW=		https://chessx.sourceforge.io/
> 
> LICENSE=	GPLv2+
>-LICENSE_FILE=	${WRKSRC}/COPYING
>+LICENSE_FILE=	${WRKSRC}/COPYING.md
> 
> USES=		compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5 tar:tgz
> USE_GL=		gl
>diff --git a/games/chessx/distinfo b/games/chessx/distinfo
>index c5a664df4d0d..ab25b27c3c65 100644
>--- a/games/chessx/distinfo
>+++ b/games/chessx/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1641324910
>-SHA256 (chessx-1.5.7.tgz) = c1a7483b788dbe3f0b808cc4c474e6797c579d6388f9588badd84097367bf49c
>-SIZE (chessx-1.5.7.tgz) = 3861310
>+TIMESTAMP = 1683708876
>+SHA256 (chessx-1.6.0.tgz) = efa60e7b55a907ebdd12810a1931de69624ba42544e11a3262ed562f2dc3c618
>+SIZE (chessx-1.6.0.tgz) = 8252976
>diff --git a/games/chessx/files/patch-chessx.pro b/games/chessx/files/patch-chessx.pro
>index 90c216bf46da..e4732ea291a5 100644
>--- a/games/chessx/files/patch-chessx.pro
>+++ b/games/chessx/files/patch-chessx.pro
>@@ -1,48 +1,32 @@
>---- chessx.pro.orig	2021-09-17 10:33:08 UTC
>+--- chessx.pro.orig	2023-05-08 20:22:12 UTC
> +++ chessx.pro
>-@@ -534,24 +534,30 @@ lc0 {
>-   QMAKE_BUNDLE_DATA += LC0_ENGINE_LIB
>+@@ -57,7 +57,7 @@ macx {
>  }
>  
>+ 
>+-unix|!macx {
> +unix:!macx {
>-+ target.path = $$PREFIX/bin
>-+ 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
>+     isEmpty(PREFIX) {
>+         bsd {
>+             PREFIX = /usr/local
>+@@ -533,6 +533,7 @@ win32 {
>+   win32-g++:LIBS += -lz
>+ }
>+ 
>++
>+ UI_DIR = src/generated
>+ MOC_DIR = src/generated
>+ RCC_DIR = src/generated
>+@@ -571,6 +572,12 @@ macx {
>+   TIMESEAL_DATA.path = Contents/MacOS/data/timeseal/mac
>+   QMAKE_BUNDLE_DATA += TIMESEAL_DATA
>+   QMAKE_INFO_PLIST = mac_osx/Info.plist
> +}
> +
>- RESOURCES = \
>-   resources.qrc translations.qrc
>- 
>--TRANSLATIONS = i18n/chessx_de.ts
>--
>--#\
>--#        i18n/chessx_da.ts \
>--#        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
>-+TRANSLATIONS = i18n/chessx_de.ts \
>-+        i18n/chessx_da.ts \
>-+        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
>++unix:!macx {
>++  pixmaps.path = $$PREFIX/share/pixmaps
>++  pixmaps.files = data/images/chessx.png
>++  INSTALLS += pixmaps
>+ }
>  
>- isEmpty(QMAKE_LRELEASE) {
>-   win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
>+ RESOURCES = \
>diff --git a/games/chessx/files/patch-src_gui_chessxsettings.cpp b/games/chessx/files/patch-src_gui_chessxsettings.cpp
>new file mode 100644
>index 000000000000..a02a2ce2eb06
>--- /dev/null
>+++ b/games/chessx/files/patch-src_gui_chessxsettings.cpp
>@@ -0,0 +1,16 @@
>+--- 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
>diff --git a/games/chessx/files/patch-src_gui_chessxsettings.h b/games/chessx/files/patch-src_gui_chessxsettings.h
>new file mode 100644
>index 000000000000..2a8ce48f9913
>--- /dev/null
>+++ b/games/chessx/files/patch-src_gui_chessxsettings.h
>@@ -0,0 +1,19 @@
>+--- 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;
>+ };
>-- 
>2.40.1
>

Actions: View | Diff

Attachments on bug 271348: 242103 | 242105 | 242106 | 242119