From c29e16e7f5228e968890b33b5a842461974313ff Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 23 Jan 2026 17:40:09 +0100
Subject: [PATCH] qgit, bump to version 2.13 (#13663)

switch to Qt6/cmake build
---
 dev-vcs/qgit/additional-files/qgit.rdef.in | 33 +++++++++
 dev-vcs/qgit/qgit-2.13.recipe              | 80 ++++++++++++++++++++++
 dev-vcs/qgit/qgit-2.9.recipe               | 56 ---------------
 3 files changed, 113 insertions(+), 56 deletions(-)
 create mode 100644 dev-vcs/qgit/additional-files/qgit.rdef.in
 create mode 100644 dev-vcs/qgit/qgit-2.13.recipe
 delete mode 100644 dev-vcs/qgit/qgit-2.9.recipe

diff --git a/dev-vcs/qgit/additional-files/qgit.rdef.in b/dev-vcs/qgit/additional-files/qgit.rdef.in
new file mode 100644
index 000000000..fd4e3f8d0
--- /dev/null
+++ b/dev-vcs/qgit/additional-files/qgit.rdef.in
@@ -0,0 +1,33 @@
+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 {
+	$"6E636966030300800003D400000533040205B98FB6BEB98FB6BEBDAFB6BEC5F0"
+	$"B6BEC1D0B6BEC5F0B774C5F0B8E1C5F0B82BC1D0B8E1B98FB8E1BDAFB8E1B98F"
+	$"B82BB98FB6BEB98FB774B98FB6BE0205B98FBDA5B98FBDA5BDAFBDA5C5F0BDA5"
+	$"C1D0BDA5C5F0BE5BC5F0BFC8C5F0BF11C1D0BFC8B98FBFC8BDAFBFC8B98FBF11"
+	$"B98FBDA5B98FBE5BB98FBDA50205C0D1B378C0D1B378C0D1B66FC0D1BC5DC0D1"
+	$"B966C01BBC5DBEAEBC5DBF64BC5DBEAEB966BEAEB378BEAEB66FBF64B378C0D1"
+	$"B378C01BB378C0D1B3780215C017C136C017C136C017C1BBC017C2C5C017C240"
+	$"C017C2F3C017C351C017C322C017C464C017C68AC017C577C0BBC68AC203C68A"
+	$"C15FC68AC203C5ADC203C3F3C203C4D0C2FEC493C394C6A1C393C592C394C783"
+	$"C275C8FBC32DC85BC1BDC99BBFBFC9F4C0C3C9F4BEBBC9F4BD0AC8FB3BC99BBC"
+	$"52C85BBBEBC6A1BBEBC783BBECC559BE19C3A1BCC4C42FBE19C2E3BE19C167BE"
+	$"19C225BB66C20CB986C69CB986C42EB986C999BFBFCC04BC4FCC04C330CC04C5"
+	$"F9C69CC5F9C999C5F9C52BC420C2C5C54EC3C8C4B9C2C5C5EBC2C5C552C2C5C5"
+	$"EBC240C5EBC136C5EBC1BBC49EC136C203C136C350C136C15FC136C017C136C0"
+	$"BBC136C017C136040A000100000A010101000A000102000A02010300"
+};
diff --git a/dev-vcs/qgit/qgit-2.13.recipe b/dev-vcs/qgit/qgit-2.13.recipe
new file mode 100644
index 000000000..84fb19f62
--- /dev/null
+++ b/dev-vcs/qgit/qgit-2.13.recipe
@@ -0,0 +1,80 @@
+SUMMARY="A Qt-based git GUI viewer"
+DESCRIPTION="With qgit you will be able to browse revisions history,\
+view patch content and changed files, graphically following different \
+development branches."
+HOMEPAGE="https://github.com/tibirna/qgit"
+COPYRIGHT="2005-2008 Marco Costalba
+	2011-2019 Cristian Tibirna"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://github.com/tibirna/qgit/archive/qgit-$portVersion.tar.gz"
+CHECKSUM_SHA256="9fa64b011963b7b876b8634b140ec5339a81a422317df71b619fcee5740a364a"
+SOURCE_DIR="qgit-qgit-$portVersion"
+ADDITIONAL_FILES="qgit.rdef.in"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	qgit$secondaryArchSuffix = $portVersion
+	app:QGit = $portVersion
+	cmd:qgit = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	cmd:git
+	lib:libGL$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Core5Compat$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Core5Compat$secondaryArchSuffix
+	devel:libQt6Gui$secondaryArchSuffix
+	devel:libQt6Widgets$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs
+
+	make -C build $jobArgs
+}
+
+INSTALL()
+{
+	make -C build install
+
+	mkdir $appsDir
+	mv $prefix/bin/qgit $appsDir/QGit
+	ln -s $appsDir/QGit $prefix/bin/qgit
+
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="0"
+	local APP_NAME="QGit"
+	local LONG_INFO="$SUMMARY"
+	local APP_SIGNATURE="application/x-vnd.qgit"
+	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/qgit.rdef.in > qgit.rdef
+
+	addResourcesToBinaries qgit.rdef $appsDir/QGit
+
+	addAppDeskbarSymlink $appsDir/QGit
+}
diff --git a/dev-vcs/qgit/qgit-2.9.recipe b/dev-vcs/qgit/qgit-2.9.recipe
deleted file mode 100644
index 14c258b3e..000000000
--- a/dev-vcs/qgit/qgit-2.9.recipe
+++ /dev/null
@@ -1,56 +0,0 @@
-SUMMARY="A Qt-based git GUI viewer"
-DESCRIPTION="With qgit you will be able to browse revisions history,\
-view patch content and changed files, graphically following different \
-development branches."
-HOMEPAGE="https://github.com/tibirna/qgit"
-COPYRIGHT="2005-2008 Marco Costalba
-	2011-2019 Cristian Tibirna"
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://github.com/tibirna/qgit/archive/qgit-$portVersion.tar.gz"
-CHECKSUM_SHA256="69788efda7d434d1bc094bb414bd92c269dc7894326320634500b05d63c008e8"
-SOURCE_DIR="qgit-qgit-$portVersion"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	qgit$secondaryArchSuffix = $portVersion
-	app:QGit
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	cmd:git
-	lib:libGL$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:qmake$secondaryArchSuffix >= 5
-	"
-
-defineDebugInfoPackage qgit$secondaryArchSuffix \
-	$appsDir/QGit
-
-BUILD()
-{
-	qmake qgit.pro
-	make $jobArgs
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir
-	cp bin/qgit $appsDir/QGit
-	addAppDeskbarSymlink $appsDir/QGit
-}