Re: [PR PATCH] [Updated] New Package: Qt6ct

[CabrioletDiskette <CabrioletDiskette@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

There is an updated pull request by CabrioletDiskette against master on the void-packages repository

https://github.com/CabrioletDiskette/void-packages qt6ct
https://github.com/void-linux/void-packages/pull/36265

New Package: Qt6ct
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
- I cross compiled this PR for:
  - x86_64-musl
  - armv6l-musl
  - armv7l-musl
  - aarch64-musl
  - i686
  - armv7l
  - armv6l
  - aarch64 

All cross compile issues where fixed


A patch file from https://github.com/void-linux/void-packages/pull/36265.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6ct-36265.patch --]
[-- Type: text/x-diff, Size: 7890 bytes --]

From 1c44cc661f84c36e39a880ec2d2a768b5287706a Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Sun, 20 Mar 2022 19:44:45 -0600
Subject: [PATCH 1/7] New package: BAND-1.10.9

---
 srcpkgs/BAND/template | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/BAND/template

diff --git a/srcpkgs/BAND/template b/srcpkgs/BAND/template
new file mode 100644
index 000000000000..e749580c782e
--- /dev/null
+++ b/srcpkgs/BAND/template
@@ -0,0 +1,35 @@
+# Template file for 'BAND'
+pkgname=BAND
+version=1.10.9
+revision=1
+archs="x86_64"
+hostmakedepends="binutils tar xz gzip"
+depends="gtk+3 libnotify nss libXScrnSaver libXtst xdg-utils at-spi2-core libuuid libappindicator libsecret"
+short_desc="Group Chat Client for Sports, School, Campus Groups, and more"
+maintainer="Adam Pschorr <adampschorr13@aol.com>"
+license="custom:Proprietary"
+homepage="https://band.us/home"
+distfiles="https://ssl.pstatic.net/cmstatic/desktop/v${version}/BAND-${version}-amd64.deb"
+checksum=88bbc33c1d831e51abad81cb43d4622382e3cb40de38f35d549effc979ea1f8c
+repository=nonfree
+restricted=yes
+do_extract() {
+	ar x ${XBPS_SRCDISTDIR}/BAND-${version}/BAND-${version}-amd64.deb
+	tar -xf data.tar.xz
+	gzip -d usr/share/doc/band/changelog.gz
+}
+do_install() {
+	vmkdir /opt/BAND
+	vcopy opt/BAND/* /opt/BAND
+	vinstall usr/share/applications/band.desktop 644 usr/share/applications
+	#install icons
+	for size in 16 32 48 64 128 256 512; do
+		#Insure containing directory
+		mkdir -p ${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps
+		vinstall usr/share/icons/hicolor/${size}x${size}/apps/band.png 644 /usr/share/icons/hicolor/${size}x${size}/apps
+	done
+}
+post_install() {
+	vdoc usr/share/doc/band/changelog
+	vlicense opt/BAND/resources/LICENSE
+}

From e4a543f1e5e6e9ac0f3e4050c5915d1acb43f843 Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Mon, 21 Mar 2022 18:33:42 -0600
Subject: [PATCH 2/7] Added REMOVE to prevent xbps from removing /opt directory

---
 srcpkgs/BAND/REMOVE | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 srcpkgs/BAND/REMOVE

diff --git a/srcpkgs/BAND/REMOVE b/srcpkgs/BAND/REMOVE
new file mode 100644
index 000000000000..a3cc77de2c41
--- /dev/null
+++ b/srcpkgs/BAND/REMOVE
@@ -0,0 +1,6 @@
+#Prevent xbps from deleting /opt after uninstall
+
+case "$ACTION" in
+post)
+	mkdir -p opt;;
+esac

From 27747e91bf7053b88555d78ae18b46f407786dc5 Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Mon, 21 Mar 2022 18:41:42 -0600
Subject: [PATCH 3/7] corrected template for BAND

---
 srcpkgs/BAND/template | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/BAND/template b/srcpkgs/BAND/template
index e749580c782e..2a03a4ade427 100644
--- a/srcpkgs/BAND/template
+++ b/srcpkgs/BAND/template
@@ -19,17 +19,16 @@ do_extract() {
 	gzip -d usr/share/doc/band/changelog.gz
 }
 do_install() {
-	vmkdir /opt/BAND
-	vcopy opt/BAND/* /opt/BAND
-	vinstall usr/share/applications/band.desktop 644 usr/share/applications
-	#install icons
-	for size in 16 32 48 64 128 256 512; do
-		#Insure containing directory
-		mkdir -p ${DESTDIR}/usr/share/icons/hicolor/${size}x${size}/apps
-		vinstall usr/share/icons/hicolor/${size}x${size}/apps/band.png 644 /usr/share/icons/hicolor/${size}x${size}/apps
-	done
+    vmkdir opt
+	vcopy opt/BAND opt
+
+	vinstall usr/share/applications/band.desktop 0644 usr/share/applications
+	vcopy usr/share/icons usr/share
+
+	vmkdir usr/bin
+	ln -s /opt/BAND/band ${DESTDIR}/usr/bin/band
 }
+
 post_install() {
-	vdoc usr/share/doc/band/changelog
 	vlicense opt/BAND/resources/LICENSE
 }

From d9cacc0ed4ed5c38495e8288f6335e580e728880 Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Tue, 22 Mar 2022 00:31:49 -0600
Subject: [PATCH 4/7] added update file for BAND for version checking

---
 srcpkgs/BAND/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/BAND/update

diff --git a/srcpkgs/BAND/update b/srcpkgs/BAND/update
new file mode 100644
index 000000000000..a1f9bc335530
--- /dev/null
+++ b/srcpkgs/BAND/update
@@ -0,0 +1 @@
+pattern='(\d+\.)+\d+'

From e9a6ee52ae932959eb792d5d4d063f269c744845 Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Mon, 21 Mar 2022 12:19:12 -0600
Subject: [PATCH 5/7] New package: qt6ct-0.5

---
 srcpkgs/qt6ct/INSTALL.msg    |  2 ++
 srcpkgs/qt6ct/files/qt6ct.sh |  6 ++++++
 srcpkgs/qt6ct/template       | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/qt6ct/INSTALL.msg
 create mode 100644 srcpkgs/qt6ct/files/qt6ct.sh
 create mode 100644 srcpkgs/qt6ct/template

diff --git a/srcpkgs/qt6ct/INSTALL.msg b/srcpkgs/qt6ct/INSTALL.msg
new file mode 100644
index 000000000000..8485434a339f
--- /dev/null
+++ b/srcpkgs/qt6ct/INSTALL.msg
@@ -0,0 +1,2 @@
+NOTE: You may have to logout and log back in or reboot to apply qt6ct
+theme environment variables properly
diff --git a/srcpkgs/qt6ct/files/qt6ct.sh b/srcpkgs/qt6ct/files/qt6ct.sh
new file mode 100644
index 000000000000..b36c5b523174
--- /dev/null
+++ b/srcpkgs/qt6ct/files/qt6ct.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+export QT_QPA_PLATFORMTHEME=qt6ct
+if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+	export QT_QPA_PLATFORM=wayland
+fi
diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
new file mode 100644
index 000000000000..7ad14a312392
--- /dev/null
+++ b/srcpkgs/qt6ct/template
@@ -0,0 +1,18 @@
+# Template file for 'qt6ct'
+pkgname=qt6ct
+version=0.5
+revision=1
+build_style=cmake
+hostmakedepends="qt6-tools-devel"
+depends="qt6-base qt6-svg"
+short_desc="Qt6 Configuration Tool"
+maintainer="Adam Pschorr <adampschorr13@aol.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/trialuser02/qt6ct"
+distfiles="https://github.com/trialuser02/qt6ct/archive/refs/tags/${version}.tar.gz"
+checksum=0fea8e5295e4ebebfae36f4862aaa67859238312d7a055b252cc53b281d69e0d
+
+post_install() {
+	vlicense COPYING
+	vinstall ${FILESDIR}/qt6ct.sh 644 etc/profile.d
+}

From 7854d5c70fa8cdd223c0a648b9f3cc9e8bcf6678 Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Mon, 21 Mar 2022 20:18:13 -0600
Subject: [PATCH 6/7] revised qt6ct template and removed INSTALL.msg

---
 srcpkgs/qt6ct/INSTALL.msg    | 2 --
 srcpkgs/qt6ct/files/qt6ct.sh | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 srcpkgs/qt6ct/INSTALL.msg

diff --git a/srcpkgs/qt6ct/INSTALL.msg b/srcpkgs/qt6ct/INSTALL.msg
deleted file mode 100644
index 8485434a339f..000000000000
--- a/srcpkgs/qt6ct/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-NOTE: You may have to logout and log back in or reboot to apply qt6ct
-theme environment variables properly
diff --git a/srcpkgs/qt6ct/files/qt6ct.sh b/srcpkgs/qt6ct/files/qt6ct.sh
index b36c5b523174..e4e7708d8a29 100644
--- a/srcpkgs/qt6ct/files/qt6ct.sh
+++ b/srcpkgs/qt6ct/files/qt6ct.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-export QT_QPA_PLATFORMTHEME=qt6ct
+export QT_QPA_PLATFORMTHEME=qt5ct
 if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
 	export QT_QPA_PLATFORM=wayland
 fi

From aa0c93535cf8ea3e63339b6a3c056243ea1c6d89 Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Tue, 22 Mar 2022 18:24:43 -0600
Subject: [PATCH 7/7] fixed template for qt6ct, supports all archs

---
 srcpkgs/qt6ct/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
index 7ad14a312392..1e443df1dc20 100644
--- a/srcpkgs/qt6ct/template
+++ b/srcpkgs/qt6ct/template
@@ -3,7 +3,9 @@ pkgname=qt6ct
 version=0.5
 revision=1
 build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
 depends="qt6-base qt6-svg"
 short_desc="Qt6 Configuration Tool"
 maintainer="Adam Pschorr <adampschorr13@aol.com>"