quassel, revbump srcGitRev (version), use rdef instead of rsrc file (#8905)

2026-04-09 05:10:05 +02:00 · 2023-07-01 08:57:33 +02:00
parent d47920e1e9
commit 7815c91c1e
4 changed files with 222 additions and 160 deletions
--- a/net-irc/quassel/additional-files/quassel.rdef.in
+++ b/net-irc/quassel/additional-files/quassel.rdef.in
@@ -0,0 +1,42 @@
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+
+	variety = B_APPV_DEVELOPMENT,
+	internal = 0,
+
+	short_info = "@APP_NAME@",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon {
+	$"6E6369660B0500020006023CB9D63D1DE3BF02CA3EA2224AFA2F4412C400FFDB"
+	$"97FFFCAF29020006023A6496BA3F153EBCDD3EEA9147D96A4458AB00FFF7EAFF"
+	$"FDD17B02000602387EF6B08BED3809543FFDEC48BEE63B138A00FFBA37FFC552"
+	$"05020006023AB3673751B2BC59783FD2D74AF3F147385900C85805FFF0630602"
+	$"0106023ABB740000000000003AB5E049D1B1471E5B00F2F2F2AB7D7A7A020106"
+	$"023ABB740000000000003AB5E047A363453CB600F2F2F2AB7D7A7A04016C03A3"
+	$"290402000602388A280000000000004000004A3000C2000000C85804FFDC952F"
+	$"020006020000003B0000C000000000004C00004A000000D9FF75FF91C5050D06"
+	$"1666922669F60B262F40284253B7C9552E5632583852593C5B3E5C425E48584A"
+	$"4A48373F323F323D313B333D343932372F3930372F2D2B061666927F92D10F26"
+	$"2F3F2842532C552E563258324832483449354433433745384B364A384B593C5B"
+	$"3E5C425E4D443B3A373A3738363539373A33383033323430330A063A37443B4A"
+	$"374036C157BAF74133020630333033323435393338373A3A3738363A37413341"
+	$"333F323B333D343932372F3930372F0A08444D424D425E4858484A4A484A3744"
+	$"3B06059F03354433433745384B364A384B5232583248324834490005362E362E"
+	$"392F40343C344334462E4631462B402843283C28362839293628000536283628"
+	$"33272F2432242D242A292A262A2C2F2E2D2E322E362E332D362E0606FE064260"
+	$"456045604A60505E4B5FC93ECB135458575AC658C8664A54580A04424D425348"
+	$"4A444D0A0340364A3744340A043C5B3E5B3E4D3C4C0A032234224C2E40130A07"
+	$"01082028200A00010030282001178400040A0101012028200A0201022028200A"
+	$"0201022014190A0301032028200A0401042028200A080209052028200A09010A"
+	$"2028200A00010630282001178400040A0501062028200A000107302820011784"
+	$"00040A0601072028200A04010B28181A15FF0A04010B28282015FF0A00010C12"
+	$"C000000000000000004000004C000000000001178400040A0A010C02C0000000"
+	$"00000000004000004C00000000000A00010C1001178400040A0A010C00"
+};
--- a/net-irc/quassel/patches/quassel-0.14~git.patchset
+++ b/net-irc/quassel/patches/quassel-0.14~git.patchset
@@ -1,49 +1,3 @@
-From 4a2c5a78b2b088eb8754224059de7c93cd9b8f0e Mon Sep 17 00:00:00 2001
-From: "Arfonzo J. Coward" <art@poorcoding.com>
-Date: Thu, 5 Dec 2013 17:47:21 +0000
-Subject: Updated recipe to add .rsrc file and MIME settings. Added resource
- file with icon and file information. Resource contributed by Giovanni M..
-
-
-diff --git a/Haiku/Quassel.rsrc b/Haiku/Quassel.rsrc
-new file mode 100644
-index 0000000000000000000000000000000000000000..cf921f1d416a178ecf10780faf4f4382b67844b3
-GIT binary patch
-literal 3728
-zcmeHJZERCz6h61Tz1uDumM>XJMy_PeJ78^hZ`XF+Si7}dKUkrx+h`eqk+I3hGA0{l
-zmWb8(gG>#u1Xz|BjrfBI5&S~MMGFc+{Ie0GE@D_>FoBc=F#!X`dd|J;oJeA#;ona4
-z_C3!z=XuWQ?c3fP-0|EKJ3IP1)B0FAHE(n>#hmg38sag47vE0nTXPZSfqt!rMaM&n
-z!?*un#0BJD)2bTV7}ck6294s6!XGOD7)D{zKb`}yL~R4-(LbtDK@ShGbgKWWSg*`F
-zRre@oqZYIJ>V=-Y4zt%`_6*FPf!Q<g|IWac-rnx6_AUKgJ9<n5WzY6(HLlyWrLV7}
-zTanGf_o<tnf~RuAx_%+h=oZ}FT^&9BV2I<*5r!8ZFBFo7_?{d00NM@~62XjkB6Sa<
-z$#>uf^s{^<uN1`gQb97CE6OBuxmoDn)*)om;hj6SceM8#p%*!?KRKxIX^zpehWN%}
-z72^W|?8m%e>7b%b`fuX8TQmrx&lE6(C&xz$-<^SlGlqDZoUi0ak8m?$(xrO#OGEsS
-zgc$kci@2`c9|7{!8@?glk{&_kzZ=z?QUCYye5UuM;X=|%Xp8Y_X+1tYO<YaozScyi
-zH?7~$ozO~(V1l`F5?At{cpngVioZWKPk>bJ-u=W+=|0>`m@J_wT8R2dd?GtKqkfF?
-z58~9^zR3hLbXnz3T-~%YSwni%Kdp}<pL)7Loo64;9UZ0^?s}#FTtk@VB|gRml>Uh6
-z^H6_`C5exFn^Ir!?d0Ea`V-J{dny_omz4R~BoNN>NskQqiMo7%)Z7#4gl1?A@lA@;
-zEMz_HU7d4ucuYA>^{3yhD*E{g&BdCxmId#cJoCST%#VjN=@X@tb!<I!+PSD^^rxEZ
-z2YeITJ<(&3xpO^pe|$G(?R##YeC38cugQ5o<^TMbss)3PIc>|FYt$*+51zKIdw(=G
-z;JoyG@V8%m_844<>M}RmISqr#pY<!Ffa9ad!1#N<rLA!5)~#dD$KwxXeMj28)u*yq
-zmg&|WDP@)RgQ6<o0tlMnEP@MBHgox)iL!{Q0Ft-?G++U46PaC^1Lt%F+~b`iC0)1Y
-zl$cy%UF747&Bo>yDQa(wRkzk`tlQ*|27`W^Q*uhH%B$p6mP*NHsx;e7Wh;<4^uo~i
-zV<jdh5?3}GktX>iza>!Nk=-`0eYG`cUp*xg@>Dr&4x8OtQE79?cC##5%reh8Y@Vv1
-z&1F5a{`8$%S;LuS%2ZU!cAJB$9kyDzR(47=JM+1oP+f>7^W$hiRN!=PXlM3p%nkxN
-ztI=w#G`TF*7PqC|SYKYh!X>)JYSAiImRd#3qbEOQDwc}NikFuzFIm3QWGpjE$db#f
-zMvnV~t84S(E7%s^w0iT`&TkepMb~dQAG^>QY>M(M&JpnkJt1D}vf?Bbp2e%yS`(^n
-z;I+#v%NmTX1$+*ZD~JLQ446fMS^P4vJi{;)(lDCrw$Q+987(1}VQI_N<mqV7V|dzt
-z;ilO-hEqd1(;<$@p%BZ=5et_r$|#N~paV?){3LzrWG>~)M@OB4XYw^kM2fkxIil#N
-z3&0<$FQ)?fx1?Y9!;JD|I$RISM?!%R@o5!6op)`-Q5z0#js$$u<t^cGEv4zC&ikvR
-z#oHJOtX(r*w#FT3>A({DZ{*dofO|&X=Zh$vSj_9ye0`w7ySXVA_C}^vuIyeC!vgpd
-Dzbg#b
-
-literal 0
-HcmV?d00001
-
-- 
-2.21.0
-
-
 From f53bcb8688e6eab42401af440cc97efcdd9f2448 Mon Sep 17 00:00:00 2001
 From: kikadf <kikadf.01@gmail.com>
 Date: Sat, 13 Jul 2019 15:55:59 +0200
--- a/net-irc/quassel/quassel-0.14~git.recipe
+++ b/net-irc/quassel/quassel-0.14~git.recipe
@@ -1,114 +0,0 @@
-SUMMARY="A distributed IRC client"
-DESCRIPTION="Quassel IRC is a modern, cross-platform, distributed IRC client, \
-meaning that one (or multiple) client(s) can attach to and detach from a \
-central core -- much like the popular combination of screen and a text-based \
-IRC client such as WeeChat, but graphical.
-
-In addition to this unique feature, it aims to bring a pleasurable, \
-comfortable chatting experience to all major platforms (including Linux, \
-Windows, and Mac OS X as well as Android smartphones), making communication \
-with your peers not only convenient, but also easily available."
-HOMEPAGE="https://quassel-irc.org"
-COPYRIGHT="2005-2019 The Quassel IRC Team"
-LICENSE="GNU GPL v2
-	GNU GPL v3"
-REVISION="2"
-srcGitRev="d46e1e86c9869996285ac3f88970cf0e9e23e128"
-SOURCE_URI="https://github.com/quassel/quassel/archive/$srcGitRev.zip"
-CHECKSUM_SHA256="f56ef034ed703d37415aface01e756692f50425af3ff7f14b4e7389c2d55fe3e"
-SOURCE_DIR="quassel-$srcGitRev"
-PATCHES="quassel-0.14~git.patchset"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	quassel${secondaryArchSuffix} = $portVersion
-	cmd:quassel$secondaryArchSuffix
-	cmd:quasselclient$secondaryArchSuffix
-	cmd:quasselcore$secondaryArchSuffix
-	lib:libquassel_client$secondaryArchSuffix
-	lib:libquassel_common$secondaryArchSuffix
-	lib:libquassel_core$secondaryArchSuffix
-	lib:libquassel_qtui$secondaryArchSuffix
-	lib:libquassel_uisupport$secondaryArchSuffix
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5Sql$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	qt5${secondaryArchSuffix}_tools
-	devel:libboost_system$secondaryArchSuffix
-	devel:libGl$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Network$secondaryArchSuffix
-	devel:libQt5Sql$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:g++$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
-	"
-
-BUILD()
-{
-	mkdir -p build
-	cd build
-	cmake -DCMAKE_INSTALL_PREFIX=$prefix \
-		-DCMAKE_C_COMPILER="gcc" \
-		-DCMAKE_CXX_COMPILER="g++" \
-		-DCMAKE_CXX_FLAGS="-fno-stack-protector" \
-		-DWITH_WEBENGINE=OFF \
-		-DWITH_OXYGEN_ICONS=ON \
-		-DEMBED_DATA=ON ..
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd build
-
-	# Optional: strip the binaries before installing.
-	# To be updated/removed whenever resources are added.
-	echo "Stripping binaries ..."
-	strip quassel
-	strip quasselcore
-	strip quasselclient
-
-	# Add Haiku resources.
-	xres -o quassel ../Haiku/Quassel.rsrc
-	xres -o quasselclient ../Haiku/Quassel.rsrc
-	xres -o quasselcore ../Haiku/Quassel.rsrc
-	mimeset -f quassel
-	mimeset -f quasselclient
-	mimeset -f quasselcore
-
-	echo "Copying binaries to ${appsDir} ..."
-	mkdir -p ${appsDir}/Quassel
-	cp quassel ${appsDir}/Quassel
-	cp quasselcore ${appsDir}/Quassel
-	cp quasselclient ${appsDir}/Quassel
-	echo "Copying libraries to ${libDir} ..."
-	mkdir -p ${libDir}
-	cp lib/libquassel-*.so* ${libDir}
-
-	DIR_QUASSEL_DESKBAR="${dataDir}/deskbar/menu/Applications/Quassel"
-	mkdir -p ${DIR_QUASSEL_DESKBAR}
-	echo "Making links for Deskbar in ${DIR_QUASSEL_DESKBAR} ..."
-	addAppDeskbarSymlink ${appsDir}/Quassel/quassel "Quassel/Quassel"
-	addAppDeskbarSymlink ${appsDir}/Quassel/quasselcore "Quassel/Quassel Core"
-	addAppDeskbarSymlink ${appsDir}/Quassel/quasselclient "Quassel/Quassel Client"
-}
--- a/net-irc/quassel/quassel-0.15~pre.recipe
+++ b/net-irc/quassel/quassel-0.15~pre.recipe
@@ -0,0 +1,180 @@
+SUMMARY="A distributed IRC client"
+DESCRIPTION="Quassel IRC is a modern, cross-platform, distributed IRC client, \
+meaning that one (or multiple) client(s) can attach to and detach from a \
+central core -- much like the popular combination of screen and a text-based \
+IRC client such as WeeChat, but graphical.
+
+In addition to this unique feature, it aims to bring a pleasurable, \
+comfortable chatting experience to all major platforms (including Linux, \
+Windows, and Mac OS X as well as Android smartphones), making communication \
+with your peers not only convenient, but also easily available."
+HOMEPAGE="https://quassel-irc.org"
+COPYRIGHT="2005-2019 The Quassel IRC Team"
+LICENSE="GNU GPL v2
+	GNU GPL v3"
+REVISION="1"
+srcGitRev="b2deed91ef0275ec42aec717294dad01b33e8ded"
+SOURCE_URI="https://github.com/quassel/quassel/archive/$srcGitRev.zip"
+CHECKSUM_SHA256="39e5dda0e66ee77a43f27de466735d494cb73ddd7e5d8712cadb97b5c267aa9c"
+SOURCE_DIR="quassel-$srcGitRev"
+srcGitRev_2="abed52e9409aba784fe405f13bd652f19edd3426"
+SOURCE_URI_2="https://github.com/quassel/quassel-i18n/archive/$srcGitRev_2.tar.gz"
+CHECKSUM_SHA256_2="200f77034a004be0c502a9adc72b2e69f9d3cb60b2a52f5aa7583591140f537e"
+SOURCE_DIR_2="quassel-i18n-$srcGitRev_2"
+PATCHES="quassel-0.14~git.patchset"
+ADDITIONAL_FILES="quassel.rdef.in"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="0.14.50"
+
+PROVIDES="
+	quassel${secondaryArchSuffix} = $portVersion
+	app:Quassel = $portVersion
+	lib:libquassel_client$secondaryArchSuffix = $libVersion
+	lib:libquassel_common$secondaryArchSuffix = $libVersion
+	lib:libquassel_core$secondaryArchSuffix = $libVersion
+	lib:libquassel_qtui$secondaryArchSuffix = $libVersion
+	lib:libquassel_uisupport$secondaryArchSuffix = $libVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libdbus_1$secondaryArchSuffix
+	lib:libexecinfo$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5Sql$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+SUMMARY_core="The daemon process for the Quassel IRC client"
+DESCRIPTION_core="quasselcore provides the daemon which connects to IRC networks, allowing any \
+number of Quassel clients to connect, including the official desktop client, the quasselclient \
+program."
+PROVIDES_core="
+	quassel${secondaryArchSuffix}_core = $portVersion
+	cmd:quasselcore = $portVersion
+	"
+REQUIRES_core="
+	quassel$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	"
+
+SUMMARY_client="GUI of the Quassel IRC client, client only"
+DESCRIPTION_client="quasselclient connects to and manages a running quasselcore and will not work \
+on its own. For a standalone IRC client experience, use the quassel monolithic program."
+PROVIDES_client="
+	quassel${secondaryArchSuffix}_client = $portVersion
+	app:QuasselClient = $portVersion
+	"
+REQUIRES_client="
+	quassel${secondaryArchSuffix}_core == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libquassel_common$secondaryArchSuffix
+	lib:libquassel_qtui$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libboost_system$secondaryArchSuffix >= 1.69.0
+	devel:libdbus_1$secondaryArchSuffix
+	devel:libGl$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Network$secondaryArchSuffix
+	devel:libQt5Sql$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
+	"
+
+BUILD()
+{
+	cp -rf $sourceDir2/* po
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
+		-DCMAKE_INSTALL_BINDIR=$appsDir \
+		-DCMAKE_C_COMPILER="gcc" \
+		-DCMAKE_CXX_COMPILER="g++" \
+		-DCMAKE_CXX_FLAGS="-fno-stack-protector" \
+		-DWITH_WEBENGINE=OFF \
+		-DWITH_OXYGEN_ICONS=OFF \
+		-DEMBED_DATA=ON
+	make -C build $jobArgs
+}
+
+INSTALL()
+{
+	make -C build install
+
+	echo "Moving binaries to AppNames ..."
+	mkdir -p $appsDir $prefix/bin
+	mv $appsDir/quassel $appsDir/Quassel
+	mv $appsDir/quasselclient $appsDir/QuasselClient
+
+	echo "Move core to $prefix/bin"
+	mv $appsDir/quasselcore $prefix/bin
+
+	# Install some stylesheets
+	cp -rf data/stylesheets $dataDir/quassel
+
+	# We are not linux
+	rm -rf $dataDir/{applications,icons}
+
+	# Add Haiku resources.
+	# quassel monolithic application
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2 | cut -d~ -f1`"
+	local APP_NAME="Quassel Qt IRC Client"
+	local LONG_INFO="Quassel IRC, a next-generation distributed IRC Client"
+	local APP_SIGNATURE="application/x-vnd.quassel"
+	sed \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		-e "s|@APP_NAME@|$APP_NAME|" \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		$portDir/additional-files/quassel.rdef.in > quassel.rdef
+	addResourcesToBinaries quassel.rdef $appsDir/Quassel
+	# client, needs a core deamon to connect
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2 | cut -d~ -f1`"
+	local APP_NAME="QuasselClient Qt IRC Client"
+	local LONG_INFO="$SUMMARY_client"
+	local APP_SIGNATURE="application/x-vnd.quasselclient"
+	sed \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		-e "s|@APP_NAME@|$APP_NAME|" \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		$portDir/additional-files/quassel.rdef.in > quasselclient.rdef
+	addResourcesToBinaries quasselclient.rdef $appsDir/QuasselClient
+
+	# Add Deskbar links
+	echo "Making links for Deskbar"
+	addAppDeskbarSymlink ${appsDir}/Quassel
+	addAppDeskbarSymlink ${appsDir}/QuasselClient
+
+	packageEntries core \
+		$prefix/bin
+
+	packageEntries client \
+		$appsDir/QuasselClient \
+		$dataDir/deskbar/menu/Applications/QuasselClient
+}