From 8c079781339777b3175a886eca0200fcb76ec0b0 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 17 Oct 2019 22:40:00 +1000 Subject: [PATCH] ChessX: bump version --- .../chessx/additional-files/chessx.rdef.in | 77 +++++++++++++++ ...hessx-1.4.6.recipe => chessx-1.5.0.recipe} | 29 +++++- .../chessx/patches/chessx-1.4.6.patchset | 93 ------------------- .../chessx/patches/chessx-1.5.0.patchset | 33 +++++++ 4 files changed, 134 insertions(+), 98 deletions(-) create mode 100644 games-board/chessx/additional-files/chessx.rdef.in rename games-board/chessx/{chessx-1.4.6.recipe => chessx-1.5.0.recipe} (73%) delete mode 100644 games-board/chessx/patches/chessx-1.4.6.patchset create mode 100644 games-board/chessx/patches/chessx-1.5.0.patchset diff --git a/games-board/chessx/additional-files/chessx.rdef.in b/games-board/chessx/additional-files/chessx.rdef.in new file mode 100644 index 000000000..92c92406c --- /dev/null +++ b/games-board/chessx/additional-files/chessx.rdef.in @@ -0,0 +1,77 @@ +resource app_flags B_SINGLE_LAUNCH; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "ChessX", + long_info = "@LONG_INFO@" +}; + +resource app_signature "@APP_SIGNATURE@"; + +resource vector_icon array { + $"6E6369660305FF05000400540B0014BE81B569BE81B569BEFBB4CCBFE3B389BF" + $"6DB428C05EB4A1C155B6D2C0DDB5B8C1A0B74FC2A9B7C7C234B77BC4BAB903C7" + $"6CBD19C69BBAC9C86FBFD2C80AC5A2C84EC2CAC7CBC7A7C928CB85C855C9AEC4" + $"7BCB86BB22CB85BFCFCB85B9CECB87B727CB84B87BCB84B6EFC93AB8C24DB752" + $"C6C9B958C438BADCC324B9F7C379BB6CC2F4BC1CC20136C275BB64C1FEB9F2C2" + $"3BBA9DC1E7B922C2BBB862C479B8E7C3BBB737C3D5B4E3C287B60EC32DB4A1C2" + $"5DB406C25CB454C247B3F9C0ABB3D2BD4BB3E3BEFBB56FBC39B8AABA17B70ABB" + $"24B934B9C2BA08B8D1B98CB936BB73B795BE81B569BD5FB6F7BE81B5690213BE" + $"3BB68DBEC9B5E7BCAFB7C3B981BA14BAC0B884B7CDBB43B453BD8AB60CBC61B4" + $"61BEE1B47CC18FB46FC038B509C12BB622C065B596C0C8B65DC09EB6D3C111B6" + $"98C0D8B64FC171B545C22FB5C9C1D0B640C2BAB835C3D1B73AC346B89BC323B9" + $"8DC1DBB8E3C255BA95C14CBCEAC1A0BBCEC17DBC78C249BB54C372BC18C319BA" + $"20C3E0B8A2C5FCB953C4F7B7AAC77BB79CCB06B79FC94EBD35CB07C867CB06C2" + $"CECB06C7BBC951C78BC5A0C74DC778C7DCC291C6A6BC7BC7E9BF58C5E8BAD5C3" + $"0FB89BC481B9A1C26AB82BC1112BC1ACB7E1C099B672BFC7B483C039B577BF41" + $"B52F0018BEA8B78BBEA8B78BBF0DB748BF8EB679BF45B6D7BFD1B712C059B844" + $"C016B7ABC1BFB8EDC40CBB0CC326B9BFC4DEBC3CC5ECBEF0C5A8BD80C6D2C297" + $"C665CA06C553C664C1CCCA06B89ACA06BD33CA07B871C7EABB32C4AFB9A7C602" + $"BBCDC45CBCFAC3A7BC86C434BD8C48BE95C16CBDE2C209BF44C126C0AAC0AFC0" + $"1DC141C1A0BFBEC1ADBCEFC230BE3CC157BE01C023BFF1C10ABF31BF7AC084BD" + $"CAC0D5BE81C05BBCA1C035BA0DC0B7BB46C077B914C0F0B7B7C264B852C1A3B7" + $"81C245B715C205B74BC225B76FC1BAB823C124B7C9C16FB784C07EB646BF31B6" + $"E5BFD7B5FCBF61B56940B5B2BF90B563BF2EB55BBE0CB55EBE9DB6DFBD10B9E2" + $"BB13B85FBC10BA6DBAC2BB36B9CDBAB5BA2ABC4CB8F5BEA8B78BBD82B84DBEA8" + $"B78B0004BB64BB2DBB64BB2DBC6DBB2BBE82BB28BD78BB3DBE30BA9BBD1DB9BE" + $"BDCFB9D1BC7CBA27BB64BB2DBBF7BAB3BB64BB2D0204B617BEA0B651BE49B65A" + $"BEC1B6E1BF01B69DBEE1B716BEC2B77FBE42B74ABE82B75DBE25B6F5BDCBB718" + $"BDE9B681BDDD0014BE3BB68DBE3BB68DBEC9B5E7BFC7B483BF41B52FC039B577" + $"C1112BC099B672C1ACB7E1C30FB89BC26AB82BC481B9A1C6A6BC7BC5E8BAD5C7" + $"E9BF58C78BC5A0C7DCC291C74DC778C867CB06C7BBC951C2CECB06B79CCB06BD" + $"35CB07B79FC94EB8A2C5FCB7AAC77BB953C4F7BB54C372BA20C3E0BC18C319BC" + $"EAC1A0BC78C249BBCEC17DB98DC1DBBA95C14CB8E3C255B835C3D1B89BC323B7" + $"3AC346B545C22FB640C2BAB5C9C1D0B6D3C111B64FC171B698C0D8B622C065B6" + $"5DC09EB596C0C8B47CC18FB509C12BB46FC038B453BD8AB461BEE1B60CBC61B9" + $"81BA14B7CDBB43BAC0B884BE3BB68DBCAFB7C3BE3BB68D0217BEA8B78BBF0DB7" + $"48BD82B84DBB36B9CDBC4CB8F5BAB5BA2AB9E2BB13BA6DBAC2B85FBC10B55BBE" + $"0CB6DFBD10B55EBE9DB56940B563BF2EB5B2BF90B646BF31B5FCBF61B6E5BFD7" + $"B823C124B784C07EB7C9C16FB715C205B76FC1BAB74BC225B7B7C264B781C245" + $"B852C1A3BA0DC0B7B914C0F0BB46C077BDCAC0D5BCA1C035BE81C05BC023BFF1" + $"BF7AC084C10ABF31C1ADBCEFC157BE01C230BE3CC0AAC0AFC1A0BFBEC01DC141" + $"BE95C16CBF44C126BDE2C209BCFAC3A7BD8C48BC86C434BB32C4AFBBCDC45CB9" + $"A7C602B89ACA06B871C7EABD33CA07C665CA06C1CCCA06C553C664C5ECBEF0C6" + $"D2C297C5A8BD80C40CBB0CC4DEBC3CC326B9BFC059B844C1BFB8EDC016B7ABBF" + $"8EB679BFD1B712BF45B6D70203BB64BB2DBC6DBB2BBBF7BAB3BD1DB9BEBC7CBA" + $"27BDCFB9D1BE82BB28BE30BA9BBD78BB3D0204B617BEA0B65ABEC1B651BE49B6" + $"F5BDCBB681BDDDB718BDE9B77FBE42B75DBE25B74ABE82B6E1BF01B716BEC2B6" + $"9DBEE1020FC155B6D2C1A0B74FC1E4B6C7C305B704C292B690C3BDB7A9C500B9" + $"1DC431B890C65BBA16C8C9BC64C7CFBB01CA73BE9CCAC9C431CACCC17FCAD8C5" + $"9FCA95C874CA6EC707CAA0C98ACADACBB2CB00CA9DCAAACCACC8A9CD01C986CD" + $"01C47CCCFEBC24CD00C050CD01BB40CD07BA04CBBFBA71CC84BA63CBA8BB22CB" + $"85BAC1CB8BBFCFCB85C928CB85C47BCB86C855C9AEC80AC5A2C7CBC7A7C84EC2" + $"CAC76CBD19C86FBFD2C69BBAC9C2A9B7C7C4BAB903C234B77B0205B9F2C23BB9" + $"22C2BBBA9DC1E7BC1CC201BB64C1FE36C275BADCC324BB6CC2F4B9F7C379B8C2" + $"4DB958C438B8A2C4C7B862C479B882C4A0B8E7C3BB070A00020001023FEE5100" + $"00000000003FEFFA40123ABFEA5A0A0003020304023FEE510000000000003FEF" + $"FA40123ABFEA5A0A01020506023FEE510000000000003FEFFA40123ABFEA5A0A" + $"010107023FEE510000000000003FEFFA40123ABFEA5A0A010108023FEE510000" + $"000000003FEFFA40123ABFEA5A0A020109023FEE510000000000003FEFFA4012" + $"3ABFEA5A0A02010A023FEE510000000000003FEFFA40123ABFEA5A" +}; diff --git a/games-board/chessx/chessx-1.4.6.recipe b/games-board/chessx/chessx-1.5.0.recipe similarity index 73% rename from games-board/chessx/chessx-1.4.6.recipe rename to games-board/chessx/chessx-1.5.0.recipe index e80a88bab..ee34c9f3f 100644 --- a/games-board/chessx/chessx-1.4.6.recipe +++ b/games-board/chessx/chessx-1.5.0.recipe @@ -2,7 +2,7 @@ SUMMARY="A free and open source chess database application" DESCRIPTION="With ChessX you can operate your collection of chess games \ in many ways: browse, edit, add, organize, analyze, etc." HOMEPAGE="https://sourceforge.net/projects/chessx/" -COPYRIGHT="2005-2016 ChessX developers +COPYRIGHT="2005-2019 ChessX developers 1990-2000 Info-ZIP 1998-2005 Gilles Vollant 1999-2004 Shane Hudson @@ -28,10 +28,11 @@ LICENSE="GNU GPL v2 GNU LGPL v2 GNU LGPL v2.1 Digia Qt LGPL Exception v1.1" -REVISION="2" +REVISION="1" SOURCE_URI="https://downloads.sourceforge.net/chessx/chessx-$portVersion.tgz" -CHECKSUM_SHA256="ad951910a3bd53f5655f9e85101e7969b536078473e09a2a7dded6ef171a68ed" +CHECKSUM_SHA256="d130ad3220821da9ea19e7228222a5528fabca3ca06bc41b4d7f702454f63827" PATCHES="chessx-$portVersion.patchset" +ADDITIONAL_FILES="chessx.rdef.in" ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -66,13 +67,14 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:g++$secondaryArchSuffix cmd:linguist$secondaryArchSuffix >= 5 cmd:make cmd:qmake$secondaryArchSuffix >= 5 " defineDebugInfoPackage chessx$secondaryArchSuffix \ - $appsDir/chessx + $appsDir/ChessX BUILD() { @@ -85,5 +87,22 @@ INSTALL() install -d $appsDir $docDir install -t $appsDir -m755 release/chessx install -t $docDir -m644 ChangeLog TODO - addAppDeskbarSymlink $appsDir/chessx ChessX + + mv $appsDir/chessx $appsDir/ChessX + + local APP_SIGNATURE="application/x-vnd.chessx" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local LONG_INFO="$SUMMARY" + sed \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + $portDir/additional-files/chessx.rdef.in > $sourceDir/chessx.rdef + + addResourcesToBinaries $sourceDir/chessx.rdef $appsDir/ChessX + addAppDeskbarSymlink $appsDir/ChessX } diff --git a/games-board/chessx/patches/chessx-1.4.6.patchset b/games-board/chessx/patches/chessx-1.4.6.patchset deleted file mode 100644 index 83588ea9c..000000000 --- a/games-board/chessx/patches/chessx-1.4.6.patchset +++ /dev/null @@ -1,93 +0,0 @@ -From d435095bd205f69a1b844e0ad9189809ad974f5a Mon Sep 17 00:00:00 2001 -From: hognose -Date: Thu, 21 Jun 2018 8:31:29 +0000 -Subject: [PATCH] Fixed includes - ---- - src/dialogs/preferences.cpp | 7 ++++--- - src/dialogs/savedialog.cpp | 3 ++- - src/gui/ficsconsole.cpp | 1 - - src/gui/ficsconsole.h | 1 - - src/gui/gamewindow.cpp | 1 + - 5 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/src/dialogs/preferences.cpp b/src/dialogs/preferences.cpp -index bcc670b..76b2be7 100644 ---- a/src/dialogs/preferences.cpp -+++ b/src/dialogs/preferences.cpp -@@ -21,17 +21,18 @@ - #include "engineoptiondialog.h" - #include "downloadmanager.h" - -+#include - #include - #include - #include -+#include -+#include -+#include - #include - #include - #include --#include - #include - #include --#include --#include - #include - - #if defined(_MSC_VER) && defined(_DEBUG) -diff --git a/src/dialogs/savedialog.cpp b/src/dialogs/savedialog.cpp -index 95b7f88..fb7092f 100644 ---- a/src/dialogs/savedialog.cpp -+++ b/src/dialogs/savedialog.cpp -@@ -22,8 +22,9 @@ - #include "settings.h" - #include "tags.h" - --#include -+#include - #include -+#include - - #if defined(_MSC_VER) && defined(_DEBUG) - #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ ) -diff --git a/src/gui/ficsconsole.cpp b/src/gui/ficsconsole.cpp -index 1911a7a..20c3f11 100644 ---- a/src/gui/ficsconsole.cpp -+++ b/src/gui/ficsconsole.cpp -@@ -18,7 +18,6 @@ - #include - #include - #include --#include - - #if defined(_MSC_VER) && defined(_DEBUG) - #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ ) -diff --git a/src/gui/ficsconsole.h b/src/gui/ficsconsole.h -index 94d98e2..9cdc696 100644 ---- a/src/gui/ficsconsole.h -+++ b/src/gui/ficsconsole.h -@@ -20,7 +20,6 @@ class QButtonGroup; - class QTimer; - class QTableWidgetItem; - class SimpleLabel; --class QSound; - - enum - { -diff --git a/src/gui/gamewindow.cpp b/src/gui/gamewindow.cpp -index 354eff2..60d1976 100644 ---- a/src/gui/gamewindow.cpp -+++ b/src/gui/gamewindow.cpp -@@ -8,6 +8,7 @@ - #include "nag.h" - #include "settings.h" - -+#include - #include - - #if defined(_MSC_VER) && defined(_DEBUG) --- -2.17.1 - diff --git a/games-board/chessx/patches/chessx-1.5.0.patchset b/games-board/chessx/patches/chessx-1.5.0.patchset new file mode 100644 index 000000000..a300985fd --- /dev/null +++ b/games-board/chessx/patches/chessx-1.5.0.patchset @@ -0,0 +1,33 @@ +From c1f34d613ab9269ae0686b7d5c2cd9d2a09252b2 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 17 Oct 2019 22:31:38 +1000 +Subject: Use default interface style + + +diff --git a/src/gui/main.cpp b/src/gui/main.cpp +index f6c42dd..d6d1857 100644 +--- a/src/gui/main.cpp ++++ b/src/gui/main.cpp +@@ -140,7 +140,9 @@ prevHook = _CrtSetReportHook(customReportHook); + if (AppSettings->getValue("/MainWindow/DarkTheme").toBool()) + { + // set style ++#ifndef Q_OS_HAIKU + app.setStyle(QStyleFactory::create("Fusion")); ++#endif + // modify palette to dark + QPalette darkPalette; + darkPalette.setColor(QPalette::Window,QColor(53,53,53)); +@@ -169,7 +171,9 @@ prevHook = _CrtSetReportHook(customReportHook); + } + else + { ++#ifndef Q_OS_HAIKU + app.setStyle("plastique"); ++#endif + QPalette lightPalette = qApp->palette(); + lightPalette.setColor(QPalette::BrightText,Qt::red); + app.setPalette(lightPalette); +-- +2.23.0 +