0001-Update-Qt-6.8.0-icons-and-desktop-entries.patch

From fdda7202cb24eaa2ed5c41e1a3631c9b14484400 Mon Sep 17 00:00:00 2001
From: asalde_le1 <[email protected]>
Date: Fri, 25 Oct 2024 10:42:40 +0200
Subject: [PATCH] Update: Qt 6.8.0, icons and desktop entries

This commit updates the package to Qt 6.8.0 and makes changes to icons and desktop entries:

 * Icons:
     * Import icons from the qttools source to provide them even when qt5-tools is not installed.
     * Append "6" to the end of icon names to ensure compatibility with qt5-tools when both are installed on the system.
 * Desktop entries:
     * Rename desktop entries to match the qt5-tools format.
---
 .SRCINFO             | 16 ++++++++------
 PKGBUILD             | 51 +++++++++++++++++++++++++++++++-------------
 assistant6.desktop   |  6 +++---
 designer6.desktop    |  6 +++---
 linguist6.desktop    |  6 +++---
 qdbusviewer6.desktop |  6 +++---
 6 files changed, 57 insertions(+), 34 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index fd6ae98..959b065 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
 pkgbase = qt6-tools-desktop
 	pkgdesc = Adds desktop integration files for qt6-tools (assistent, designer, linguist and qdbusviewer)
-	pkgver = 6.6.1
-	pkgrel = 1
+	pkgver = 6.8.0
+	pkgrel = 2
 	url = https://www.qt.io
 	arch = any
 	groups = qt6
 	license = GPL3
-	depends = qt6-tools>=6.6.1
+	depends = qt6-tools>=6.8.0
+	source = git+https://code.qt.io/qt/qttools#tag=v6.8.0
 	source = assistant6.desktop
 	source = designer6.desktop
 	source = linguist6.desktop
 	source = qdbusviewer6.desktop
-	sha256sums = 72677ebbe6904b119b68e4dbefd21198fe8941332e0ce489c7c4b9ad50d97a79
-	sha256sums = a28c63b0e77944b7182eda7dfa31120cb9e5919ffa0d9cbd56a98d53a905a328
-	sha256sums = eb0b3c887825ca21c812e0431fa61087497d84f26d9fb27b5c30b19dd556aee6
-	sha256sums = 8d2c9e9642afb8cd4ab491cb877c8c7fae3af1128b14af58fbfd3550d0c0791e
+	sha256sums = 74659933b95b94a78b9ec24e6f24633473c4dfa180b34531abf847768ccd8822
+	sha256sums = 17cf9fe9c3612f7993fb2dba37b984ee49e25edaed5e9a134c431eb7e033e428
+	sha256sums = 13ec7f608da2c19ce8c69eae761ea836229bedc5b929bb963518e41dc9bf4c0f
+	sha256sums = 6c43926c4c379f0918ffbfd952a54cea887e7394eda90ec44ad8e8a193c3c361
+	sha256sums = de91af3a52541e6d0aa8ea5c6fd958a734ea4b507ff04a3149aac2a7969a8f0d

 pkgname = qt6-tools-desktop
diff --git a/PKGBUILD b/PKGBUILD
index b91a827..cb06796 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: nomisge <nomisge @ live . de>
 pkgname=qt6-tools-desktop
-pkgver=6.6.1
-pkgrel=1
+pkgver=6.8.0
+pkgrel=2
 pkgdesc="Adds desktop integration files for qt6-tools
  (assistent, designer, linguist and qdbusviewer)"
 arch=('any')
@@ -12,20 +12,41 @@ depends=("qt6-tools>=${pkgver}")
 makedepends=()
 options=()
 #install=
-source=("assistant6.desktop"
-	"designer6.desktop"
-	"linguist6.desktop"
-	"qdbusviewer6.desktop")
-sha256sums=('72677ebbe6904b119b68e4dbefd21198fe8941332e0ce489c7c4b9ad50d97a79'
-            'a28c63b0e77944b7182eda7dfa31120cb9e5919ffa0d9cbd56a98d53a905a328'
-            'eb0b3c887825ca21c812e0431fa61087497d84f26d9fb27b5c30b19dd556aee6'
-            '8d2c9e9642afb8cd4ab491cb877c8c7fae3af1128b14af58fbfd3550d0c0791e')
+_pkgfn=qttools
+source=("git+https://code.qt.io/qt/$_pkgfn#tag=v$pkgver"
+		"assistant6.desktop"
+		"designer6.desktop"
+		"linguist6.desktop"
+		"qdbusviewer6.desktop")
+sha256sums=('74659933b95b94a78b9ec24e6f24633473c4dfa180b34531abf847768ccd8822'
+            '17cf9fe9c3612f7993fb2dba37b984ee49e25edaed5e9a134c431eb7e033e428'
+            '13ec7f608da2c19ce8c69eae761ea836229bedc5b929bb963518e41dc9bf4c0f'
+            '6c43926c4c379f0918ffbfd952a54cea887e7394eda90ec44ad8e8a193c3c361'
+            'de91af3a52541e6d0aa8ea5c6fd958a734ea4b507ff04a3149aac2a7969a8f0d')

 package() {
-	# install .desktop file
+	# install icons
+	cd $srcdir/$_pkgfn
+	for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
+		size=$(echo $(basename ${icon}) | cut -d- -f2)
+		install -p -D -m644 ${icon} \
+		"${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist6.png"
+	done
+
+	install -D -m644 src/assistant/assistant/images/assistant.png \
+		"${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant6.png"
+	install -D -m644 src/assistant/assistant/images/assistant-128.png \
+		"${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant6.png"
+	install -D -m644 src/designer/src/designer/images/designer.png \
+		"${pkgdir}/usr/share/icons/hicolor/128x128/apps/QtProject-designer6.png"
+	install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer.png \
+		"${pkgdir}/usr/share/icons/hicolor/32x32/apps/qdbusviewer6.png"
+	install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
+		"${pkgdir}/usr/share/icons/hicolor/128x128/apps/qdbusviewer6.png"
+
+	# install .desktop file
 	cd $srcdir
-	install -Dm644 "assistant6.desktop" "$pkgdir/usr/share/applications/assistant6.desktop"
-	install -Dm644 "designer6.desktop" "$pkgdir/usr/share/applications/designer6.desktop"
-	install -Dm644 "linguist6.desktop" "$pkgdir/usr/share/applications/linguist6.desktop"
-	install -Dm644 "qdbusviewer6.desktop" "$pkgdir/usr/share/applications/qdbusviewer6.desktop"
+  	install -d "${pkgdir}/usr/share/applications"
+	install -m644 "${srcdir}"/{linguist,designer,assistant,qdbusviewer}6.desktop \
+    "${pkgdir}/usr/share/applications/"
 }
diff --git a/assistant6.desktop b/assistant6.desktop
index 7e13bf4..67c9694 100644
--- a/assistant6.desktop
+++ b/assistant6.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Qt6 Assistant
+Name=Qt Assistant (Qt 6)
 Comment=Shows Qt documentation and examples
-Exec=/usr/lib/qt6/bin/assistant
-Icon=assistant
+Exec=assistant6
+Icon=assistant6
 Terminal=false
 Type=Application
 Categories=Qt;Development;Documentation;
diff --git a/designer6.desktop b/designer6.desktop
index abd3e56..4f2107e 100644
--- a/designer6.desktop
+++ b/designer6.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Qt6 Designer
+Name=Qt Designer (Qt 6)
 GenericName=Interface Designer
 Comment=Design GUIs for Qt applications
-Exec=/usr/lib/qt6/bin/designer %F
-Icon=QtProject-designer
+Exec=designer6 %F
+Icon=QtProject-designer6
 MimeType=application/x-designer;
 Terminal=false
 Type=Application
diff --git a/linguist6.desktop b/linguist6.desktop
index ea0a608..5234372 100644
--- a/linguist6.desktop
+++ b/linguist6.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Qt6 Linguist
+Name=Qt Linguist (Qt 6)
 Comment=Add translations to Qt applications
-Exec=/usr/lib/qt6/bin/linguist %F
-Icon=linguist
+Exec=linguist6 %F
+Icon=linguist6
 MimeType=text/vnd.trolltech.linguist;application/x-linguist;
 Terminal=false
 Type=Application
diff --git a/qdbusviewer6.desktop b/qdbusviewer6.desktop
index b7f0250..4c269ae 100644
--- a/qdbusviewer6.desktop
+++ b/qdbusviewer6.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Qt6 QDBusViewer
+Name=Qt QDBusViewer (Qt 6)
 GenericName=D-Bus Debugger
 Comment=Debug D-Bus applications
-Exec=/usr/lib/qt6/bin/qdbusviewer
-Icon=qdbusviewer
+Exec=qdbusviewer6
+Icon=qdbusviewer6
 Terminal=false
 Type=Application
 Categories=Qt;Development;Debugger;
--
2.47.0