gentoo auto-resync : 20:12:2023 - 13:50:54

3 files changed, 0 insertions, 58 deletions

diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index a146bd994151..37558c3baf05 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index 15fcb63a2919..dda3bd669a28 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1,5 +1,4 @@
 AUX 90-qgnomeplatform 106 BLAKE2B 5fb5d7ea2b2c6812f5fc0c0243d3bd33bb275e0669f6de0822d9296e7b22695afa139461b1a970de1a51ea31dbc731d63ec47b573c345a598e56ae84b9eefaf1 SHA512 9eb77ce72bde6d0fe48e943c3a2c97dc8b353b4884a96c515a51a94cd1dfc5b4a1b7571f939d6f50ac367a6dd5191ead2dc19065738376bdb6a4a38f3261606b
-AUX QGnomePlatform-0.9.2-gtk3-conflict.patch 2316 BLAKE2B 36d4409a58f820187a58812767253d75c12729a080acc04d62222121dd61a67824ea8994a5a8d5d0f633f86dd9046efab0ec40c518374faecf8ecf6e15b72688 SHA512 ae8b90673f5a05bfe60e393086e336e2968dcb3f74684a3b6de7277c0047df462aee23126ae805f62b491c8889807cdebd389523ae6f994be2fa4ef69b304846
 DIST QGnomePlatform-0.9.1.tar.gz 46387 BLAKE2B b62e6c6ca70e7e5a1a611d0a4af022aae0cf4096db51e00b2b45cf6ea655b703cd936336233c71038b82708ec79a202f436f5a29680ada6b4026958604c83670 SHA512 1b8f5d3241bbaa830858dc256285f91023a6e9f664c9920ebfdaf8bdc759e3c958a22bc52eb3559a86d96007118b8ce5efa900167feb491a60232b365c00784c
 DIST QGnomePlatform-0.9.2.tar.gz 46346 BLAKE2B a71a2c159d279e08929d2b1e1c5a7026d576d423b0dae40191e5e60d093c56a2cdcb7ade836566679903751435cb1923f5faea51e7c177bcdb0c1eaff30cf9c3 SHA512 a90caf521eca3d3213b10367b49226e594bd81c78be1198e4d590d44b2026e773319f6784cf1eb9528eee3214ed108ab49d1b85d263a26732873c859fa6e7bc6
 EBUILD QGnomePlatform-0.9.1-r1.ebuild 911 BLAKE2B 8704fb056809782dfc8ed36c86a713da2a9a1dba5d1b416d623a98c87c16347e1a456cb149541d7e06589e7dc48d955ad7ee0f7dab4a39891b8397a0a01f5682 SHA512 a3d87150e7356a450ac3608c7c8d0157f44d45a17a2fdabda00bb337867a1249723b183b54bd404b35c951c4568b4b072eb079f0013c6e3bc9e737a540a26601
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 <jgrulich@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 &paramList)
- {
-     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 &paramList)
- {
-     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" ]
- }