gentoo auto-resync : 23:08:2023 - 15:49:20

3 files changed, 101 insertions, 0 deletions

diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index f40478bbc58b..a116ae8b7c89 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1,5 +1,7 @@
+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
+EBUILD QGnomePlatform-0.9.2-r1.ebuild 1080 BLAKE2B bf35f7bca621c3a00a2156ac078a2ac84fdbfb70ed5de3f486de0ce0698f6be964a05c2c8010d2442a56b4d4f8b89feca50aad9c3a9019c475339a32ea6d33cb SHA512 9139f1841e41626286de150e3f81882ccc3d3674976981b97bf61c09bc0b50d492be688f06a81b65d42bdb7d729eb7f74ac603f45c3e37073087b1cff8ae6420
 EBUILD QGnomePlatform-0.9.2.ebuild 913 BLAKE2B 44c9d0019535535d1028b8230b09f4e1e810d1d0fba6bbad6eeaaab0c0c6d6b4eb695473f9a6bb4122227170b169cd8472ebf01c5f5dde26482479c350be32a2 SHA512 80590bad36015d753aceb564c78769f2e94f430948d91aebbd37fcd4ea7a8f35fc30b2dfaafdc741b62b1b48ee75146293e14d7c9757a675aaa5dca864c75b03
 MISC metadata.xml 447 BLAKE2B 817ea2f2862d9ac53abe7898093922dc03781175f358d2890fb3deeae9bbdab2cf679d835561be2f3892101ee98bc0ba644f08a6de3de4b35fc902256a388ec6 SHA512 be780fadb65adfa01fa0f94cf81c121f0bc9dcc42f41e4c1a4a7a504145a43cf6cb800f9d69a4fd065642b9e8edc7b87581edd007b631483a10e942e2a48e42d
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.9.2-r1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..8fc6b823f8b8
--- /dev/null
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.9.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="A Qt Platform Theme aimed to accommodate GNOME settings"
+HOMEPAGE="https://github.com/FedoraQt/QGnomePlatform"
+SRC_URI="https://github.com/FedoraQt/QGnomePlatform/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="minimal wayland"
+
+RDEPEND="
+	dev-qt/qtdbus:5=
+	>=dev-qt/qtquickcontrols2-5.15.2:5=
+	>=dev-qt/qtwidgets-5.15.2:5=
+	!minimal? ( kde-frameworks/qqc2-desktop-style:5= )
+	wayland? ( dev-qt/qtwayland:5= )
+	gnome-base/gsettings-desktop-schemas
+	sys-apps/xdg-desktop-portal
+	x11-libs/gtk+:3
+	>=x11-themes/adwaita-qt-1.4.2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+src_prepare() {
+	# https://github.com/FedoraQt/QGnomePlatform/pull/150#issuecomment-1689693729
+	eapply -R "${FILESDIR}/${P}-gtk3-conflict.patch"
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT6=false
+		-DDISABLE_DECORATION_SUPPORT="$(usex wayland false true)"
+	)
+	cmake_src_configure
+}
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
new file mode 100644
index 000000000000..29a87aee6f61
--- /dev/null
+++ b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.9.2-gtk3-conflict.patch
@@ -0,0 +1,57 @@
+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" ]
+ }