testdisk, bump to latest release, add icon (#9127)

app-admin/testdisk/additional-files/qphotorec.rdef.in

@@ -0,0 +1,84 @@
+resource app_flags B_SINGLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "@APP_NAME@",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon {
+	$"6E6369660505FF0500020006053D06620000000000003D066249FEBE4B829000"
+	$"FF00007FF2FF009086FF00F502A2FFFF6D36FF020112040000003CD376BCD376"
+	$"00000049FEBE49FEBD000000A5FF00F3FFB2FFFF00020112030000003D0E20BD"
+	$"0E2000000049FEBE49FEBD00FF00E26600FF33FF2D0608FF7FCC77BFBBCC77BF"
+	$"BBCC77C448C619CAC3CA0AC87CC229CD09B95DCAC3BD4ECD09B56DC87C20BFBB"
+	$"20C4481FBB2FB95DB4B4B56DB6FBBD4EB26EC619B4B4C229B26ECA0AB6FBCC77"
+	$"BFBBCC77BB2FCC77BFBBBFBB0608FF7FCBA9BFBBCBA9BFBBCBA9C3FEC5B2CA10"
+	$"C963C7EEC201CC31B9C5CA10BD76CC31B614C7EEB3CEBFBBB3CEC3FEB3CEBB79"
+	$"B9C5B567B614B789BD76B346C5B2B567C201B346C963B789CBA9BFBBCBA9BB79"
+	$"CBA9BFBBBFBB0608FF7FC960BFBBC960BFBBC960C32DC48EC815C789C65CC192"
+	$"C9CEBAE9C815BDE5C9CEB7EEC65CB617BFBBB617C32DB617BC4ABAE92BB7EEB9"
+	$"1BBDE5B5A9C48E2BC192B5A9C789B91BC960BFBBC960BC4AC960BFBBBFBB0608"
+	$"FF7FC49EBFBBC49EBFBBC49EC17AC22DC3F6C3B0C317C0AAC4D6BD4AC3F6BECD"
+	$"C4D6BBC7C317BAD9BFBBBAD9C17ABAD9BDFDBD4ABB81BBC7BC60BECDBAA1C22D"
+	$"BB81C0AABAA1C3B0BC60C49EBFBBC49EBDFDC49EBFBBBFBB0804C172BFBBC172"
+	$"BFBBC172BFBBC172BFBB0608FF7FC0BBBFBBC0BBBFBBC0BBC017C03BC099C08A"
+	$"C06BBFECC0C6BF3CC099BF8BC0C6BEEDC06BBEBCBFBBBEBCC017BEBCBF60BF3C"
+	$"BEDEBEEDBF0CBF8BBEB1C03BBEDEBFECBEB1C08ABF0CC0BBBFBBC0BBBF60C0BB"
+	$"BFBBBFBB0608FF3FC397BD96C397BD96C397BE32C2BCBF11C344BEC3C235BF60"
+	$"C106BF11C18EBF60C07EBEC3C02BBD96C02BBE32C02BBCF9C106BC1AC07FBC69"
+	$"C18EBBCCC2BCBC1AC235BBCCC344BC69C397BD96C397BCF9C397BD96C3970002"
+	$"BB48C2D3BB48C2D3BA6CC36BB8B3C49CB98FC404B8B3C49C0002BB48C2D3BB48"
+	$"C2D3BA6CC36BB8B3C49CB98FC404B8B3C49C0002BB48C2D3BB48C2D3BA6CC36B"
+	$"B8B3C49CB98FC404B8B3C49C0002BB48C2D3BB48C2D3BA6CC36BB8B3C49CB98F"
+	$"C404B8B3C49C0002BBA1C346BBA1C346BAD6C3F4B93FC551BA0AC4A3B93FC551"
+	$"0002BB48C2D3BB48C2D3BA6CC36BB8B3C49CB98FC404B8B3C49C0002BAFCC257"
+	$"BAFCC257BA10C2D8B83AC3D9B925C358B83AC3D90002BABDC1D5BABDC1D5B9C5"
+	$"C23CB7D6C30AB8CEC2A3B7D6C30A0002BA8BC14CBA8BC14CB98BC199B789C232"
+	$"B88AC1E6B789C2320002BA69C0BFBA69C0BFB961C0F0B752C154B85AC122B752"
+	$"C1540002BA55C02FBA55C02FB94AC045B734C070B83FC05BB734C0700002BA51"
+	$"BF9EBA51BF9EB945BF98B72DBF8BB839BF91B72DBF8B0002BA5BBF0DBA5BBF0D"
+	$"B951BEEBB73EBEA6B848BEC9B73EBEA60002BA75BE7EBA75BE7EB970BE40B767"
+	$"BDC5B86BBE02B767BDC50002BA9EBDF3BA9EBDF3B9A1BD9AB7A7BCE8B8A4BD41"
+	$"B7A7BCE80002BAD5BD6CBAD5BD6CB9E2BCFAB7FEBC14B8F0BC87B7FEBC140002"
+	$"BB19BCECBB19BCECBA34BC61B86ABB4AB94FBBD6B86ABB4A0002BB6BBC74BB6B"
+	$"BC74BA96BBD2B8ECBA8DB9C1BB2FB8ECBA8D0002BBC9BC06BBC9BC06BB06BB4E"
+	$"B980B9DDBA43BA96B980B9DD0002C261BB01C261BB01C2E4BA17C3EBB844C367"
+	$"B92DC3EBB8440002C2DCBB4EC2DCBB4EC377BA74C4ADB8BEC412B999C4ADB8BE"
+	$"0002C404BC6AC404BC6AC4D8BBC6C681BA7EC5ACBB22C681BA7E0002C457BCE1"
+	$"C457BCE1C53BBC54C703BB3BC61FBBC8C703BB3B0002C49DBD60C49DBD60C58E"
+	$"BCECC772BC04C680BC78C772BC040002C4D5BDE6C4D5BDE6C5D1BD8CC7CABCD8"
+	$"C6CEBD32C7CABCD80002C4FFBE71C4FFBE71C603BE32C80CBDB3C708BDF3C80C"
+	$"BDB30002C51ABF00C51ABF00C624BEDCC837BE95C72DBEB8C837BE950002C3BF"
+	$"C360C3BFC360C485C414C611C57DC54BC4C9C611C57D0002C413C2F9C413C2F9"
+	$"C4EAC39AC697C4DBC5C0C43AC697C4DB0002C45E47C45E47C543C316C70DC42D"
+	$"C628C3A1C70DC42D0002C49DC216C49DC216C58E47C771C374C680C2FFC771C3"
+	$"740002C4D1C19BC4D1C19BC5CDC1F8C7C3C2B3C6C8C255C7C3C2B30002C4F9C1"
+	$"1CC4F9C11CC5FCC161C803C1EAC6FFC1A5C803C1EA0002C515C09AC515C09AC6"
+	$"1DC0C5C82EC11CC726C0F1C82EC11C0002C524C016C524C016C62FC028C846C0"
+	$"4BC73BC039C846C04B0002C526BF90C526BF90C632BF89C84ABF79C73EBF81C8"
+	$"4ABF790204B95DB95DB95DB95DBCE1B5D8C61AB95DC296B5D8C3FBBB7CBFBBBF"
+	$"BBC1DBBD9CBD9CBD9CB95DB95DBB7CBB7CB95DB95D0608FF7FC979BFBBC979BF"
+	$"BBC979C336C49AC82BC79DC66DC197C9E8BADDC82BBDE0C9E8B7DAC66DB5FEBF"
+	$"BBB5FEC336B5FEBC41BADDB74CB7DAB90ABDE0B58FC49AB74CC197B58FC79DB9"
+	$"0AC979BFBBC979BC41C979BFBBBFBB280A000100000A010101000A020102000A"
+	$"010103000A00020405000A000106000A00050708090A0B1001178000040A0001"
+	$"0C1001178000040A00010D1001178000040A00010E1001178000040A00010F10"
+	$"01178000040A0001101001178000040A0001111001178000040A000112100117"
+	$"8000040A0001131001178000040A0001141001178000040A0001151001178000"
+	$"040A0001161001178000040A0001171001178000040A0001181001178000040A"
+	$"0001191001178000040A00011A1001178000040A00011B1001178000040A0001"
+	$"1C1001178000040A00011D1001178000040A00011E1001178000040A00011F10"
+	$"01178000040A0001201001178000040A0001211001178000040A000122100117"
+	$"8000040A0001231001178000040A0001241001178000040A0001251001178000"
+	$"040A0001261001178000040A0001271001178000040A0001281001178000040A"
+	$"0001291001178000040A00012A1001178000040A03012B000A04012C00"
+};

app-admin/testdisk/testdisk-7.2~wip.recipe

@@ -26,11 +26,13 @@ non-booting drive which can then be sent to a tech for further analysis. \
 Those more familiar with such procedures should find TestDisk a handy \
 tool in performing onsite recovery."
 HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
-COPYRIGHT="1998-2018 Christophe GRENIER"
+COPYRIGHT="1998-2023 Christophe GRENIER"
 LICENSE="GNU GPL v2"
-REVISION="3"
-SOURCE_URI="https://www.cgsecurity.org/testdisk-$portVersion.tar.bz2"
-CHECKSUM_SHA256="1413c47569e48c5b22653b943d48136cb228abcbd6f03da109c4df63382190fe"
+REVISION="1"
+SOURCE_URI="https://www.cgsecurity.org/testdisk-${portVersion/\~wip/-WIP}.tar.bz2"
+CHECKSUM_SHA256="26fdc1822dfa886d8f0bcc960a0f213250b81844f517868281497f9f9d38ce1b"
+SOURCE_DIR="testdisk-${portVersion/\~wip/-WIP}"
+ADDITIONAL_FILES="qphotorec.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -42,8 +44,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-#TODO: add SVG icon to qphotorec
-#TODO: require libntfs3g, ext2fs, reiserfs
+#TODO: require libntfs3g, reiserfs
 
 PROVIDES="
 	testdisk$secondaryArchSuffix = $portVersion
@@ -53,6 +54,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libext2fs$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
@@ -68,6 +70,7 @@ PROVIDES_qt="
 REQUIRES_qt="
 	haiku$secondaryArchSuffix
 	testdisk$secondaryArchSuffix == $portVersion base
+	lib:libext2fs$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
@@ -81,6 +84,7 @@ REQUIRES_qt="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libext2fs$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
@@ -96,6 +100,7 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
 	cmd:gcc$secondaryArchSuffix
+	cmd:gtk_update_icon_cache
 	cmd:make
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:pkg_config$secondaryArchSuffix
@@ -115,14 +120,34 @@ INSTALL()
 {
 	make install
 
-	addAppDeskbarSymlink $prefix/bin/qphotorec "QPhotoRec"
+	mkdir -p $appsDir
+	mv $commandBinDir/qphotorec $appsDir/QPhotoRec
 
 	# cleanup XDG stuff we do not need
 	rm -R $dataDir/applications
 	rm -R $dataDir/icons
 
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2 | cut -d~ -f1`"
+	local MINOR="0"
+	local APP_NAME="QPhotoRec"
+	local LONG_INFO="$SUMMARY"
+	local APP_SIGNATURE="application/x-vnd.qphotorec"
+	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/qphotorec.rdef.in > qphotorec.rdef
+
+	addResourcesToBinaries qphotorec.rdef $appsDir/QPhotoRec
+
+	addAppDeskbarSymlink $appsDir/QPhotoRec
+
 	packageEntries qt \
-		$prefix/bin/qphotorec \
+		$appsDir/QPhotoRec \
 		$manDir/*/qphotorec.* \
 		$manDir/*/*/qphotorec.* \
 		$dataDir/deskbar/menu/Applications/QPhotoRec