commit: df482aab0062cc4cfd13a051b0bdb48707a06d54
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 07:17:39 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 07:43:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df482aab
dev-qt/qtbase: minor style adjustments + add missing bug number
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtbase/qtbase-6.7.9999.ebuild | 5 ++---
dev-qt/qtbase/qtbase-6.8.9999.ebuild | 5 ++---
dev-qt/qtbase/qtbase-6.9999.ebuild | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index cc0ae2b0de2c..b4cd4854a401 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -165,11 +165,10 @@ src_prepare() {
}
src_configure() {
- # The only component that uses gdk backends is the qgtk3 platformtheme
plugin
if use gtk; then
- # defang automagic dependencies
- use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ # defang automagic dependencies (bug #624960)
use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
fi
local mycmakeargs=(
diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
index 7c4afe2f0a19..3c595f73638f 100644
--- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild
@@ -165,11 +165,10 @@ src_prepare() {
}
src_configure() {
- # The only component that uses gdk backends is the qgtk3 platformtheme
plugin
if use gtk; then
- # defang automagic dependencies
- use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ # defang automagic dependencies (bug #624960)
use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
fi
local mycmakeargs=(
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild
b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 7c4afe2f0a19..3c595f73638f 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -165,11 +165,10 @@ src_prepare() {
}
src_configure() {
- # The only component that uses gdk backends is the qgtk3 platformtheme
plugin
if use gtk; then
- # defang automagic dependencies
- use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
+ # defang automagic dependencies (bug #624960)
use X || append-cxxflags -DGENTOO_GTK_HIDE_X11
+ use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND
fi
local mycmakeargs=(