From: Firgen <Firgen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] qt6ct: qt6ct.sh should not set QT_QPA_PLATFORMTHEME=qt5ct
Date: Sun, 20 Nov 2022 12:19:45 +0100 [thread overview]
Message-ID: <20221120111945.wyz-kTQE7rP1tjwLWgUm4fSh-bTgW-C5assNLidH3u4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40619@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2022-11-20 11:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-19 17:10 [PR PATCH] " Firgen
2022-11-20 5:20 ` classabbyamp
2022-11-20 5:22 ` [PR REVIEW] " classabbyamp
2022-11-20 11:10 ` [PR PATCH] [Updated] " Firgen
2022-11-20 11:10 ` [PR PATCH] [Closed]: " Firgen
2022-11-20 11:19 ` Firgen
2022-11-20 11:19 ` Firgen [this message]
2022-11-20 15:58 ` classabbyamp
2022-11-21 20:03 ` Firgen
2023-01-06 22:29 ` Firgen
2023-04-07 1:49 ` github-actions
2023-04-21 1:52 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221120111945.wyz-kTQE7rP1tjwLWgUm4fSh-bTgW-C5assNLidH3u4@z \
--to=firgen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).