[PR PATCH] qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[PR PATCH] qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[Firgen]

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

There is a new pull request by Firgen against master on the void-packages repository

https://github.com/Firgen/void-packages qt6ct
https://github.com/void-linux/void-packages/pull/40619

qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct
qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct unconditionally because it is already set in qt5ct.sh conditionally.

<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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-glibc)


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

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

From dd4d31a23550cbd54c4d7005c7ec21b7932d7868 Mon Sep 17 00:00:00 2001
From: Firgen <filip.frgelec@disroot.org>
Date: Sat, 19 Nov 2022 18:04:49 +0100
Subject: [PATCH] qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct unconditionally
because it is already set in qt5ct.sh conditionally.
---
 srcpkgs/qt6ct/files/qt6ct.sh | 3 +--
 srcpkgs/qt6ct/template       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6ct/files/qt6ct.sh b/srcpkgs/qt6ct/files/qt6ct.sh
index e4e7708d8a299..d8ee1a3c9a003 100644
--- a/srcpkgs/qt6ct/files/qt6ct.sh
+++ b/srcpkgs/qt6ct/files/qt6ct.sh
@@ -1,6 +1,5 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
-export QT_QPA_PLATFORMTHEME=qt5ct
 if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
 	export QT_QPA_PLATFORM=wayland
 fi
diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
index db5aac26a3648..aed240a398da2 100644
--- a/srcpkgs/qt6ct/template
+++ b/srcpkgs/qt6ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6ct'
 pkgname=qt6ct
 version=0.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-tools-devel"

Re: qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40619#issuecomment-1321042481

Comment:
just removing it is probably wrong because that would break the case of having qt6ct but not qt5ct installed

Re: [PR REVIEW] qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40619#discussion_r1027227274

Comment:
change it to this instead:
```sh
if [ "$XDG_CURRENT_DESKTOP" != "KDE" ]; then
	export QT_QPA_PLATFORMTHEME=qt5ct
fi
```

Re: [PR PATCH] [Closed]: qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[Firgen]

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

There's a closed pull request on the void-packages repository

qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct
https://github.com/void-linux/void-packages/pull/40619

Description:
qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct unconditionally because it is already set in qt5ct.sh conditionally.

<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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-glibc)

Re: [PR PATCH] [Updated] qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[Firgen]

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

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

https://github.com/Firgen/void-packages qt6ct
https://github.com/void-linux/void-packages/pull/40619

qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct
qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct unconditionally because it is already set in qt5ct.sh conditionally.

<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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-glibc)


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

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

Re: [PR PATCH] [Updated] qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[Firgen]

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

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

https://github.com/Firgen/void-packages qt6ct
https://github.com/void-linux/void-packages/pull/40619

qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct
qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct unconditionally because it is already set in qt5ct.sh conditionally.

<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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-glibc)


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

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

From b257948206ba75f9a241fafab346d91a07bca720 Mon Sep 17 00:00:00 2001
From: Firgen <filip.frgelec@disroot.org>
Date: Sun, 20 Nov 2022 12:12:36 +0100
Subject: [PATCH] qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

qt6ct.sh should have the same check as qt5ct.sh
---
 srcpkgs/qt6ct/files/qt6ct.sh | 7 +++++--
 srcpkgs/qt6ct/template       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6ct/files/qt6ct.sh b/srcpkgs/qt6ct/files/qt6ct.sh
index e4e7708d8a29..b2f12f60825d 100644
--- a/srcpkgs/qt6ct/files/qt6ct.sh
+++ b/srcpkgs/qt6ct/files/qt6ct.sh
@@ -1,6 +1,9 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+if [ "$XDG_CURRENT_DESKTOP" != "KDE" ]; then
+	export QT_QPA_PLATFORMTHEME=qt5ct
+fi
 
-export QT_QPA_PLATFORMTHEME=qt5ct
 if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
 	export QT_QPA_PLATFORM=wayland
 fi
diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
index db5aac26a364..aed240a398da 100644
--- a/srcpkgs/qt6ct/template
+++ b/srcpkgs/qt6ct/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6ct'
 pkgname=qt6ct
 version=0.7
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"
 hostmakedepends="qt6-tools-devel"

Re: qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[Firgen]

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

New comment by Firgen on void-packages repository

https://github.com/void-linux/void-packages/pull/40619#issuecomment-1321105081

Comment:
Sorry for closing and reopening, I accidentally force-pushed it without a commit.

> just removing it is probably wrong because that would break the case of having qt6ct but not qt5ct installed

Actually, I think those files aren't needed at all. Wouldn't it be better to just remove them?

Re: qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40619#issuecomment-1321167300

Comment:
why would they not be needed? 

Re: qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[Firgen]

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

New comment by Firgen on void-packages repository

https://github.com/void-linux/void-packages/pull/40619#issuecomment-1322579038

Comment:
> why would they not be needed?

Well the user can just set `QT_QPA_PLATFORMTHEME=qt5ct` themselves and I believe `QT_QPA_PLATFORM=wayland` is not necessary because QT can choose that automatically (I might be wrong about that). But I mean, it can't hurt to keep those files. I had too little sleep to think hard about this.

Re: qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[Firgen]

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

New comment by Firgen on void-packages repository

https://github.com/void-linux/void-packages/pull/40619#issuecomment-1374207917

Comment:
Maybe the wayland part should be in a different script included with something like qt?

Re: qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/40619#issuecomment-1499834020

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct

[github-actions]

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

There's a closed pull request on the void-packages repository

qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct
https://github.com/void-linux/void-packages/pull/40619

Description:
qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct unconditionally because it is already set in qt5ct.sh conditionally.

<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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-glibc)