commit: 4ee3a978fa63024ea4e48633beb81efbb0c8de4f Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Dec 19 18:51:13 2023 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Wed Dec 20 10:00:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee3a978
x11-themes/QGnomePlatform: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/34371 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> .../files/QGnomePlatform-0.9.2-gtk3-conflict.patch | 57 ---------------------- 1 file changed, 57 deletions(-) diff --git a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.9.2-gtk3-conflict.patch b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.9.2-gtk3-conflict.patch deleted file mode 100644 index 29a87aee6f61..000000000000 --- a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.9.2-gtk3-conflict.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d86d6baab74c3e69094083715ffef4aef2e516dd Mon Sep 17 00:00:00 2001 -From: Jan Grulich <jgrul...@redhat.com> -Date: Fri, 11 Aug 2023 13:45:41 +0200 -Subject: [PATCH] Do not use "gtk3" key to avoid conflict with QGtkStyle from - Qt upstream (#150) - ---- - src/decoration/decorationplugin.cpp | 2 +- - src/decoration/qgnomeplatformdecoration.json | 2 +- - src/theme/platformplugin.cpp | 2 +- - src/theme/qgnomeplatformtheme.json | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/decoration/decorationplugin.cpp b/src/decoration/decorationplugin.cpp -index 40737e4..fb367df 100644 ---- a/src/decoration/decorationplugin.cpp -+++ b/src/decoration/decorationplugin.cpp -@@ -23,7 +23,7 @@ - QWaylandAbstractDecoration *QGnomePlatformDecorationPlugin::create(const QString &key, const QStringList ¶mList) - { - Q_UNUSED(paramList) -- if (key == "gnome" || key == "gtk3" || key == "qgnomeplatform") -+ if (key == "gnome" || key == "qgnomeplatform") - return new QGnomePlatformDecoration(); - return nullptr; - } -diff --git a/src/decoration/qgnomeplatformdecoration.json b/src/decoration/qgnomeplatformdecoration.json -index 891c3e4..a4a854d 100644 ---- a/src/decoration/qgnomeplatformdecoration.json -+++ b/src/decoration/qgnomeplatformdecoration.json -@@ -1,3 +1,3 @@ - { -- "Keys": [ "gnome", "gtk3", "qgnomeplatform" ] -+ "Keys": [ "gnome", "qgnomeplatform" ] - } -diff --git a/src/theme/platformplugin.cpp b/src/theme/platformplugin.cpp -index 9908bee..f43ff4e 100644 ---- a/src/theme/platformplugin.cpp -+++ b/src/theme/platformplugin.cpp -@@ -27,7 +27,7 @@ QGnomePlatformThemePlugin::QGnomePlatformThemePlugin(QObject *parent) - QPlatformTheme *QGnomePlatformThemePlugin::create(const QString &key, const QStringList ¶mList) - { - Q_UNUSED(paramList) -- if (key == "gnome" || key == "gtk3" || key == "qgnomeplatform") -+ if (key == "gnome" || key == "qgnomeplatform") - return new QGnomePlatformTheme(); - return nullptr; - } -diff --git a/src/theme/qgnomeplatformtheme.json b/src/theme/qgnomeplatformtheme.json -index 891c3e4..a4a854d 100644 ---- a/src/theme/qgnomeplatformtheme.json -+++ b/src/theme/qgnomeplatformtheme.json -@@ -1,3 +1,3 @@ - { -- "Keys": [ "gnome", "gtk3", "qgnomeplatform" ] -+ "Keys": [ "gnome", "qgnomeplatform" ] - }
