[gentoo-commits] repo/gentoo:master commit in: x11-themes/QGnomePlatform/, x11-themes/QGnomePlatform/files/

[gentoo-commits] repo/gentoo:master commit in: x11-themes/QGnomePlatform/, x11-themes/QGnomePlatform/files/

[Pacho Ramos]

commit:     236f0d768af32b552c6df2a2b596de7d0d6dce50
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 10:29:33 2022 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 10:29:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=236f0d76

x11-themes/QGnomePlatform: Fix window id for xdg-desktop-portal file chooser

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../QGnomePlatform/QGnomePlatform-0.8.4-r1.ebuild  | 39 ++++++++++++++++++++++
 ...GnomePlatform-0.8.4-xdg-desktop-portal-id.patch | 11 ++++++
 2 files changed, 50 insertions(+)

diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.8.4-r1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..a39961a0d0df
--- /dev/null
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.8.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 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=""
+
+RDEPEND="
+	dev-qt/qtdbus:5=
+	>=dev-qt/qtwidgets-5.15.2:5=
+	dev-qt/qtwayland:5=
+	dev-qt/qtx11extras:5=
+	gnome-base/gsettings-desktop-schemas
+	sys-apps/xdg-desktop-portal
+	x11-libs/gtk+:3[X]
+	>=x11-themes/adwaita-qt-1.4.1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+	# https://github.com/FedoraQt/QGnomePlatform/issues/101
+	"${FILESDIR}/${P}-xdg-desktop-portal-id.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT6=false
+	)
+	cmake_src_configure
+}

diff --git a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.8.4-xdg-desktop-portal-id.patch b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.8.4-xdg-desktop-portal-id.patch
new file mode 100644
index 000000000000..292088bd1f84
--- /dev/null
+++ b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.8.4-xdg-desktop-portal-id.patch
@@ -0,0 +1,11 @@
+--- a/src/theme/qxdgdesktopportalfiledialog.cpp~	2022-01-11 10:46:15.000000000 +0100
++++ b/src/theme/qxdgdesktopportalfiledialog.cpp	2022-04-26 12:16:07.504955234 +0200
+@@ -165,7 +165,7 @@
+                                                           QLatin1String("/org/freedesktop/portal/desktop"),
+                                                           QLatin1String("org.freedesktop.portal.FileChooser"),
+                                                           d->saveFile ? QLatin1String("SaveFile") : QLatin1String("OpenFile"));
+-    QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId);
++    QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId, 16);
+ 
+     QVariantMap options;
+     if (!d->acceptLabel.isEmpty())

[gentoo-commits] repo/gentoo:master commit in: x11-themes/QGnomePlatform/, x11-themes/QGnomePlatform/files/

[Pacho Ramos]

commit:     d7ef938dd28447d8817392267801784b5987ad77
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 20 12:09:11 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 13:14:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ef938d

x11-themes/QGnomePlatform: Set variable only on GNOME

Closes: https://bugs.gentoo.org/915620
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../QGnomePlatform/QGnomePlatform-0.9.2-r3.ebuild  | 44 ++++++++++++++++++++++
 x11-themes/QGnomePlatform/files/90-qgnomeplatform  |  6 +++
 2 files changed, 50 insertions(+)

diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.9.2-r3.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.9.2-r3.ebuild
new file mode 100644
index 000000000000..116c574669c6
--- /dev/null
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.9.2-r3.ebuild
@@ -0,0 +1,44 @@
+# 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_configure() {
+	local mycmakeargs=(
+		-DUSE_QT6=false
+		-DDISABLE_DECORATION_SUPPORT="$(usex wayland false true)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# https://github.com/FedoraQt/QGnomePlatform/pull/150#issuecomment-1689693729
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/90-qgnomeplatform"
+}

diff --git a/x11-themes/QGnomePlatform/files/90-qgnomeplatform b/x11-themes/QGnomePlatform/files/90-qgnomeplatform
new file mode 100644
index 000000000000..6496e6890e2c
--- /dev/null
+++ b/x11-themes/QGnomePlatform/files/90-qgnomeplatform
@@ -0,0 +1,6 @@
+#!/bin/sh
+case "$XDG_CURRENT_DESKTOP" in
+	*GNOME*)
+		export QT_QPA_PLATFORMTHEME=qgnomeplatform
+		;;
+esac

[gentoo-commits] repo/gentoo:master commit in: x11-themes/QGnomePlatform/, x11-themes/QGnomePlatform/files/

[Pacho Ramos]

commit:     26661ae82f43f6db1e2e5169c14749c2e81e8a94
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 10:18:54 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 10:19:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26661ae8

x11-themes/QGnomePlatform: revert upstream change breaking theming

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../QGnomePlatform/QGnomePlatform-0.9.2-r1.ebuild  | 42 ++++++++++++++++
 .../files/QGnomePlatform-0.9.2-gtk3-conflict.patch | 57 ++++++++++++++++++++++
 2 files changed, 99 insertions(+)

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" ]
+ }

[gentoo-commits] repo/gentoo:master commit in: x11-themes/QGnomePlatform/, x11-themes/QGnomePlatform/files/

[Pacho Ramos]

commit:     49c297a86fee9831984d5f1a881fe2e3bab521fa
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  6 18:12:28 2021 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jun  6 18:12:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c297a8

x11-themes/QGnomePlatform: Drop old

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 x11-themes/QGnomePlatform/Manifest                 |  1 -
 .../QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild  | 34 ----------------------
 .../files/QGnomePlatform-0.6.1-qt5.15.patch        | 21 -------------
 3 files changed, 56 deletions(-)

diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index a0a24094066..1aa564170f7 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1,3 +1,2 @@
-DIST QGnomePlatform-0.6.1.tar.gz 28996 BLAKE2B 3d0da37fcc8e85bd59263dffb19865666d25dd50d2c1e00b4d6358d745eb7079f415058ffb75a8228c9c7ed956003a656b3e10a3467d9fc9dcd5eee2c14bf7cd SHA512 5e0bab45a8ff4c56e6e34d636ed719ce1a087f116942dd356253403d4be40aac348ccbdbfc917f65f6cc4df8619e1031734f0a46a36d4d9b7bb4838ded61570c
 DIST QGnomePlatform-0.7.1.tar.gz 33633 BLAKE2B 167039a7de4bbd3cae163022adb94a2bd4764f5a862b8334600f2bc5b7cfe09b6a5facfe656438d05bbf150e10caab9f1aeb910d0aa8d55fbe8995393e89b0d8 SHA512 7e3ba774ee1387604f4c66bd75f9fb4c5305f4553886132e8e3991a3e42564844a7eafb1361e0e8c64743746e315c07b22c11c133be95c1c53afb62c062bfc6e
 DIST QGnomePlatform-0.8.0.tar.gz 37381 BLAKE2B 04aeb04f08441aa4964ddb7a3f0b6afbceead82abb5399d36731c77c6de6b303a7db188094857c8346381940deeb8bcd9c6d24e0521cb10b649209e1f6b8d0a0 SHA512 e862b84024ad77976b52cbacf1f920acaa60d2bfcb8f261f1215f2e5fb2dbe6d99e10aa425be70fa2dd324ac4d8c5b85958d68fae4fb7f9728caf097aa1bd102

diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
deleted file mode 100644
index b35f4ef865d..00000000000
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qmake-utils
-
-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 ~ppc64 x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtdbus:5=
-	>=dev-qt/qtwidgets-5.6:5=
-	dev-qt/qtwayland:5=
-	dev-qt/qtx11extras:5=
-	x11-libs/gtk+:3[X]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt5.15.patch" )
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	INSTALL_ROOT="${D}" default
-}

diff --git a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch
deleted file mode 100644
index b0927d12e79..00000000000
--- a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c835c9e80cfadd62e01f16591721d2103d28a212 Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich@redhat.com>
-Date: Wed, 27 May 2020 13:38:49 +0200
-Subject: [PATCH] Fix build with Qt 5.15
-
----
- decoration/qgnomeplatformdecoration.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/decoration/qgnomeplatformdecoration.cpp b/decoration/qgnomeplatformdecoration.cpp
-index 61c2af9..c8b381c 100644
---- a/decoration/qgnomeplatformdecoration.cpp
-+++ b/decoration/qgnomeplatformdecoration.cpp
-@@ -46,6 +46,7 @@
- #include <QtGui/QCursor>
- #include <QtGui/QLinearGradient>
- #include <QtGui/QPainter>
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPalette>
- #include <QtGui/QPixmap>
- 

[gentoo-commits] repo/gentoo:master commit in: x11-themes/QGnomePlatform/, x11-themes/QGnomePlatform/files/

[Pacho Ramos]

commit:     00f515c1c6f5d75ecc2b94351f0e133d128060cd
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 11:12:19 2020 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 31 12:42:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00f515c1

x11-themes/QGnomePlatform: Fix build with qt-5.15

Closes: https://bugs.gentoo.org/725830
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../QGnomePlatform/QGnomePlatform-0.6.1.ebuild      |  2 ++
 .../files/QGnomePlatform-0.6.1-qt5.15.patch         | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1.ebuild
index 65c5840ce9d..1ec98282675 100644
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1.ebuild
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.6.1.ebuild
@@ -22,6 +22,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-qt5.15.patch" )
+
 src_configure() {
 	eqmake5
 }

diff --git a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch
new file mode 100644
index 00000000000..b0927d12e79
--- /dev/null
+++ b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.6.1-qt5.15.patch
@@ -0,0 +1,21 @@
+From c835c9e80cfadd62e01f16591721d2103d28a212 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Wed, 27 May 2020 13:38:49 +0200
+Subject: [PATCH] Fix build with Qt 5.15
+
+---
+ decoration/qgnomeplatformdecoration.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/decoration/qgnomeplatformdecoration.cpp b/decoration/qgnomeplatformdecoration.cpp
+index 61c2af9..c8b381c 100644
+--- a/decoration/qgnomeplatformdecoration.cpp
++++ b/decoration/qgnomeplatformdecoration.cpp
+@@ -46,6 +46,7 @@
+ #include <QtGui/QCursor>
+ #include <QtGui/QLinearGradient>
+ #include <QtGui/QPainter>
++#include <QtGui/QPainterPath>
+ #include <QtGui/QPalette>
+ #include <QtGui/QPixmap>
+