From nobody Thu May 11 23:26:37 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHShZ1pzdz4BBZD; Thu, 11 May 2023 23:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHShZ0DZdz3LQ2; Thu, 11 May 2023 23:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683847598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H6l7H8cFI+f9kkf8FsJ9oDhiJadjiIXIS2FLj8valtA=; b=nS1vhy7ccfjzGI0vN3Duc0osotyUEj3mIuQLm/8cB1UnsxAPqTg19uD5PROQyHyHHlGV6L 6VitWbQuIxScFslf+895cjdmGCzFevnG2mzuvZ3z43uvPhsGYwspAH/KfkxCrXF/3HbEfu 4HY4Tq7KhkMyj8dqvhJGEqQJSUzV8MjBIAP98VsxYlx2RT1umbapLxEiNicDlaQ5F1umqO ieHBk3xBEpadO4aQqiBPfEvZooSGqZ+gu5Lt8ms7qbpZ0rSNNdGT6mycusErqqTFPNlsF0 2JNqPjEeK9SdbEzXJt+DZdcGU++egy1HPjBctn2IVdxKjJPUGmgvvaBZTr8ssQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683847598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H6l7H8cFI+f9kkf8FsJ9oDhiJadjiIXIS2FLj8valtA=; b=lhkkNTYdZOPhjZM83lYE3AFLnrihyEdfF2m0KDZ4lUd0A0JtNIkut2+RmaS9kjtBOoYb3R GgnM+v1p67Cc2h+3wAL/hZ24/WJU0/l8Nu7gv0ZvuRQcgljH0ZV4OxNj8BxPIus+GjZg5o nrblsqiA5Jvl2PpBRehmdlo5kUdCfCFiFD80Ac5TbWdvc+oyAB9+o/MCuZ3Wwp1gdIFcJr L+VTEQNNc/NRyDeelwOivMKu2gkH/NMaYyE7/T/FemjX0YaZFMPUg0z66f1dJwfa8tinnS gUDAcW+6na/+nSNh2qS/BApsEOktCGI9g6nttaKW8O4ArImIoxrbb1ebuOmE4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683847598; a=rsa-sha256; cv=none; b=AVeN+9H7g6g+Om7vABpYcxm8MiCNJON6RS40l+oxkVton3SNZQ5MZrOui5L2NkXBVLY5Ew fz7cUgOwnr9Oqhu5kPj6e+6wFL5dXjPIdFk57NIS5H0xyq0ZISVtNZfdz69eReN3wfuEJs epOlEK7JNVKLRKSenRQg397onTpKwhTRCzbwqpHi+v+ZVhGjaYKjqCOxNc8K6+A3gu9PRm mrqxSkzW5xKZSLbnCzapLXg2V4DLdEpJxiSV/9odszj4etz5styd4TSZlMh/kzJbBcg2O4 N/rZ+N0z724Z2nwoJJ4zL1WiWqbVkr2U613243d86dR3OdRf1AQhb3D6pD0wCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHShY6Mlwz1C4h; Thu, 11 May 2023 23:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34BNQb38048645; Thu, 11 May 2023 23:26:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BNQbWf048644; Thu, 11 May 2023 23:26:37 GMT (envelope-from git) Date: Thu, 11 May 2023 23:26:37 GMT Message-Id: <202305112326.34BNQbWf048644@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: d40f8cab97eb - main - games/chessx: Update to 1.6.0. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d40f8cab97ebcb5687ddf5a7744581a999bbd23d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=d40f8cab97ebcb5687ddf5a7744581a999bbd23d commit d40f8cab97ebcb5687ddf5a7744581a999bbd23d Author: Alexey Vyskubov AuthorDate: 2023-05-10 11:27:45 +0000 Commit: Robert Clausecker CommitDate: 2023-05-11 23:23:30 +0000 games/chessx: Update to 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 Changelog: https://github.com/Isarhamster/chessx/blob/master/ChangeLog.md#may-2023-version-160 PR: 271348 --- games/chessx/Makefile | 21 ++++-- games/chessx/distinfo | 6 +- games/chessx/files/patch-chessx.pro | 80 ++++++++++------------ .../chessx/files/patch-src_gui_chessxsettings.cpp | 16 +++++ games/chessx/files/patch-src_gui_chessxsettings.h | 19 +++++ 5 files changed, 90 insertions(+), 52 deletions(-) diff --git a/games/chessx/Makefile b/games/chessx/Makefile index 591637558301..7ea3139d624b 100644 --- a/games/chessx/Makefile +++ b/games/chessx/Makefile @@ -1,15 +1,14 @@ PORTNAME= chessx -PORTVERSION= 1.5.7 -PORTREVISION= 1 +DISTVERSION= 1.6.0 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/beta +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} -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 @@ -18,7 +17,11 @@ USE_QT= concurrent core gui multimedia network opengl printsupport svg \ PLIST_FILES= bin/chessx \ share/applications/chessx.desktop \ - share/pixmaps/chessx.png + 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 @@ -31,4 +34,10 @@ STOCKFISH_RUN_DEPENDS= stockfish:games/stockfish post-configure: ( cd ${BUILD_WRKSRC} && ${LRELEASE} ${WRKSRC}/${PORTNAME}.pro ) +# the FIND command works around a bug in FreeBSD 12.4 strip(1) which +# leaves junk files when attempting to strip a file of unrecognised format. +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chessx + ${FIND} ${STAGEDIR}${PREFIX} -name 'ecp.????????' -delete + .include 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..2e7e4c999dce 100644 --- a/games/chessx/files/patch-chessx.pro +++ b/games/chessx/files/patch-chessx.pro @@ -1,48 +1,42 @@ ---- 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 - } +@@ -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 -+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 -+} + appdata.files = unix/io.sourceforge.ChessX.metainfo.xml + appdata.path = $$DATADIR/metainfo + - RESOURCES = \ - resources.qrc translations.qrc + 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 --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 ++ 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 + } ++ - isEmpty(QMAKE_LRELEASE) { - win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe + UI_DIR = src/generated + MOC_DIR = src/generated 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 + #include + #include ++#ifdef USE_SPEECH + #include ++#endif + #include +- + 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& map) const; + };