[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-qt/qtstyleplugins/files/, dev-qt/qtstyleplugins/

[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-qt/qtstyleplugins/files/, dev-qt/qtstyleplugins/

[Andreas Sturmlechner]

commit:     758100facde875ca6ea0218c8f5ec507e720d362
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 16:55:39 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 16:12:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758100fa

dev-qt/qtstyleplugins: treeclean

Closes: https://bugs.gentoo.org/947787 (pkgremoved)
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtstyleplugins/Manifest                     |  1 -
 dev-qt/qtstyleplugins/files/fix-build-qt5.15.patch | 47 ----------------------
 dev-qt/qtstyleplugins/metadata.xml                 | 11 -----
 .../qtstyleplugins-5.0.0_p20170311-r1.ebuild       | 46 ---------------------
 profiles/package.mask                              |  6 ---
 5 files changed, 111 deletions(-)

diff --git a/dev-qt/qtstyleplugins/Manifest b/dev-qt/qtstyleplugins/Manifest
deleted file mode 100644
index 2e8f46bed53d..000000000000
--- a/dev-qt/qtstyleplugins/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST qtstyleplugins-5.0.0_p20170311.tar.gz 306394 BLAKE2B a59343602062ec1d0f215acf568322a5be874552b0c03dec75f268cec2123b1baa30bee524e36c9d522a8c935a58f204b5362feaf028df87ca10ea01dd29b3fb SHA512 e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d

diff --git a/dev-qt/qtstyleplugins/files/fix-build-qt5.15.patch b/dev-qt/qtstyleplugins/files/fix-build-qt5.15.patch
deleted file mode 100644
index caedd05baa83..000000000000
--- a/dev-qt/qtstyleplugins/files/fix-build-qt5.15.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Fabian Vogt <fvogt@suse.de>
-Subject: Fix build against Qt 5.15
-
-With 0a93db4d82c051164923a10e4382b12de9049b45
-("Unify application palette handling between QGuiApplication and QApplication")
-QApplicationPrivate::setSystemPalette does no longer exist.
-
-This style does explictly not support "system colors" defined by the platform
-theme, which have priority over the style provided palette. To prevent the
-theme from overriding the colors, it previously used the system palette
-mechanism (which has priority over the theme), but that way does not work
-anymore. Instead, simply use QApplication::setPalette. While that has
-different behaviour and might break in some applications, it's better than
-having a completely messed up palette with certain themes.
-This is the same change as suggested by gamezelda on
-https://aur.archlinux.org/packages/qt5-styleplugins/#comment-749190.
-
-Index: qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle.cpp
-===================================================================
---- qtstyleplugins-opensource-src-5.0.0+git20170311.orig/src/plugins/styles/gtk2/qgtkstyle.cpp
-+++ qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle.cpp
-@@ -440,7 +440,11 @@ void QGtkStyle::polish(QApplication *app
-     // not supported as these should be entirely determined by
-     // current Gtk settings
-     if (app->desktopSettingsAware() && d->isThemeAvailable()) {
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-         QApplicationPrivate::setSystemPalette(standardPalette());
-+#else
-+        QApplication::setPalette(standardPalette());
-+#endif
-         QApplicationPrivate::setSystemFont(d->getThemeFont());
-         d->applyCustomPaletteHash();
-         if (!d->isKDE4Session())
-Index: qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-===================================================================
---- qtstyleplugins-opensource-src-5.0.0+git20170311.orig/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-+++ qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle_p.cpp
-@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateThe
-       if (oldTheme != QGtkStylePrivate::getThemeName()) {
-           oldTheme = QGtkStylePrivate::getThemeName();
-           QPalette newPalette = qApp->style()->standardPalette();
-+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-           QApplicationPrivate::setSystemPalette(newPalette);
-+#endif
-           QApplication::setPalette(newPalette);
-           if (!QGtkStylePrivate::instances.isEmpty()) {
-               QGtkStylePrivate::instances.last()->initGtkWidgets();

diff --git a/dev-qt/qtstyleplugins/metadata.xml b/dev-qt/qtstyleplugins/metadata.xml
deleted file mode 100644
index 6498a5bbb7e6..000000000000
--- a/dev-qt/qtstyleplugins/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chewi@gentoo.org</email>
-		<name>James Le Cuirot</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">qt/qtstyleplugins</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311-r1.ebuild b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311-r1.ebuild
deleted file mode 100644
index e22f656abe1d..000000000000
--- a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-COMMIT="335dbece103e2cbf6c7cf819ab6672c2956b17b3"
-DESCRIPTION="Additional style plugins for Qt5 (gtk2, cleanlook, plastic, motif)"
-HOMEPAGE="https://code.qt.io/cgit/qt/qtstyleplugins.git/"
-SRC_URI="https://github.com/qt/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64"
-
-DEPEND="
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5=[dbus]
-	dev-qt/qtwidgets:5=
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/pango
-"
-
-RDEPEND="
-	${DEPEND}
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-PATCHES=(
-	"${FILESDIR}"/fix-build-qt5.15.patch
-)
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	elog "To make Qt5 use the gtk2 style, set this in your environment:"
-	elog "  QT_QPA_PLATFORMTHEME=gtk2"
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index b1ac9047e7d6..d9cd2dc81381 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -234,12 +234,6 @@ net-im/dianara
 # Removal on 2025-02-09.  Bugs #947810, #856319, #844730, #771048, #679078.
 sys-cluster/zetcd
 
-# James Le Cuirot <chewi@gentoo.org> (2025-01-09)
-# Obsolete and needs to be dropped along with Qt5. The GTK theme has been
-# superseded by dev-qt/qtbase[gtk], which uses GTK 3 rather than GTK 2.
-# Removal on 2025-02-09. See bug #947787.
-dev-qt/qtstyleplugins
-
 # Conrad Kostecki <conikost@gentoo.org> (2025-01-09)
 # New version, which dropps support for legacy devices.
 # Will be unmasked, when split to legacy-branch is done.