Connectagram: Update to Qt 6, switch to release version (#10315)

* Connectagram: Update to Qt 6, switch to release version * Connectagram: Trim trailing whitespace * Connectagram: Add space before BUILD_REQUIRES Co-authored-by: Jérôme Duval <jerome.duval@gmail.com> * Connectagram: Remove SOURCE_DIR, rm dir arrangement fix --------- Co-authored-by: Julius Enriquez <win8linux@github.com> Co-authored-by: Jérôme Duval <jerome.duval@gmail.com>
2026-04-09 05:10:05 +02:00 · 2024-04-10 20:29:09 +08:00
parent 52a8245113
commit c74996dca9
2 changed files with 93 additions and 86 deletions
--- a/games-board/connectagram/connectagram-1.2.11_20200514.recipe
+++ b/games-board/connectagram/connectagram-1.2.11_20200514.recipe
@@ -1,86 +0,0 @@
-SUMMARY="A Word unscrambling game"
-DESCRIPTION="Connectagram is a word unscrambling game. The board consists of several \
-scrambled words that are joined together. You can choose the length of \
-the words, the amount of words, and the pattern that the words are arranged \
-in. The game provides a hint option for times when you are stuck, and \
-features an online word lookup that fetches the definitions of each word \
-from Wiktionary. Your current progress is automatically saved."
-COPYRIGHT="2018-2020 Graeme gott"
-HOMEPAGE="https://github.com/gottcode/connectagram"
-LICENSE="GNU GPL v3"
-REVISION="1"
-srcGitRev="a6f3557e6728f2d3b7cd6dc40c0616f165f456a7"
-SOURCE_URI="https://github.com/gottcode/connectagram/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a1e5b76ec91b319d51c6dcf284604c6081dab308604a248129767d7cf8c3c17e"
-SOURCE_FILENAME="connectagram-${portVersion/_/-}$srcGitRev.tar.gz"
-SOURCE_DIR="connectagram-$srcGitRev"
-ADDITIONAL_FILES="connectagram.rdef.in"
-
-ARCHITECTURES="all ?x86_gcc2"
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	SECONDARY_ARCHITECTURES="x86"
-fi
-
-PROVIDES="
-	connectagram$secondaryArchSuffix = $portVersion
-	app:Connectagram = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libGL$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5PrintSupport$secondaryArchSuffix
-	lib:libQt5Svg$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Network$secondaryArchSuffix
-	devel:libQt5PrintSupport$secondaryArchSuffix
-	devel:libQt5Svg$secondaryArchSuffix
-	devel:libQt5Xml$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:qmake$secondaryArchSuffix >= 5
-	cmd:unzip
-	"
-
-BUILD()
-{
-	qmake
-	make $jobArgs
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/Connectagram
-	install -T ./connectagram $appsDir/Connectagram/Connectagram
-	cp -rf translations $appsDir/Connectagram/
-	cp -rf data $appsDir/Connectagram/
-	local APP_SIGNATURE="application/x-vnd.Cong"
-	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/connectagram.rdef.in > Connectagram.rdef
-
-	addResourcesToBinaries Connectagram.rdef $appsDir/Connectagram/Connectagram
-	addAppDeskbarSymlink $appsDir/Connectagram/Connectagram
-}
--- a/games-board/connectagram/connectagram-1.3.5.recipe
+++ b/games-board/connectagram/connectagram-1.3.5.recipe
@@ -0,0 +1,93 @@
+SUMMARY="A Word unscrambling game"
+DESCRIPTION="Connectagram is a word unscrambling game. The board consists of several \
+scrambled words that are joined together. You can choose the length of \
+the words, the amount of words, and the pattern that the words are arranged \
+in. The game provides a hint option for times when you are stuck, and \
+features an online word lookup that fetches the definitions of each word \
+from Wiktionary. Your current progress is automatically saved."
+COPYRIGHT="2018-2024 Graeme Gott"
+HOMEPAGE="https://gottcode.org/connectagram/"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="https://gottcode.org/connectagram/connectagram-$portVersion.tar.bz2"
+CHECKSUM_SHA256="313598200733fd5c8080eb176d58cae407818825e7746030d4af00b3613ee454"
+SOURCE_FILENAME="connectagram-$portVersion.tar.gz"
+ADDITIONAL_FILES="connectagram.rdef.in"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	connectagram$secondaryArchSuffix = $portVersion
+	app:Connectagram = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Network$secondaryArchSuffix
+	lib:libQt6PrintSupport$secondaryArchSuffix
+	lib:libQt6Svg$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
+	lib:libQt6Xml$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Gui$secondaryArchSuffix
+	devel:libQt6Network$secondaryArchSuffix
+	devel:libQt6PrintSupport$secondaryArchSuffix
+	devel:libQt6Svg$secondaryArchSuffix
+	devel:libQt6UiTools$secondaryArchSuffix
+	devel:libQt6Xml$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:linguist6$secondaryArchSuffix
+	cmd:make
+	cmd:unzip
+	"
+
+BUILD()
+{
+	cmake -B build -S . \
+		-DCMAKE_BUILD_TYPE='None' \
+		-DCMAKE_INSTALL_BINDIR=$appsDir \
+		-DCMAKE_INSTALL_DATADIR=$dataDir/Connectagram/ \
+		-DCMAKE_INSTALL_MANDIR=$manDir
+
+	cmake --build build $jobArgs
+}
+
+INSTALL()
+{
+	cmake --install build
+	mv $appsDir/connectagram $appsDir/Connectagram
+	rm -rf $dataDir/Connectagram/{applications,icons,metainfo}
+
+	local APP_SIGNATURE="application/x-vnd.Cong"
+	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/connectagram.rdef.in > connectagram.rdef
+
+	addResourcesToBinaries  $sourceDir/connectagram.rdef \
+		$appsDir/Connectagram
+
+	mimeset -f $appsDir/Connectagram
+
+	addAppDeskbarSymlink $appsDir/Connectagram
+}