[gentoo-commits] repo/gentoo:master commit in: x11-themes/QGnomePlatform/files/
commit: 4ee3a978fa63024ea4e48633beb81efbb0c8de4f
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Tue Dec 19 18:51:13 2023 +
Commit: Pacho Ramos gentoo org>
CommitDate: Wed Dec 20 10:00:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee3a978
x11-themes/QGnomePlatform: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34371
Signed-off-by: Pacho Ramos 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..
--- 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
-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 , const QStringList )
- {
- 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 , const
QStringList )
- {
- 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/files/
commit: b5175e3f8ba07c5a2adcf75909d4e8d8cd2ecdc5
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri Apr 21 14:34:30 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Apr 22 00:10:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5175e3f
x11-themes/QGnomePlatform: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30683
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/QGnomePlatform-0.8.4-xdg-desktop-portal-id.patch| 11 ---
1 file changed, 11 deletions(-)
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
deleted file mode 100644
index 292088bd1f84..
---
a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.8.4-xdg-desktop-portal-id.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/src/theme/qxdgdesktopportalfiledialog.cpp~ 2022-01-11
10:46:15.0 +0100
-+++ b/src/theme/qxdgdesktopportalfiledialog.cpp2022-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/files/, x11-themes/QGnomePlatform/
commit: 182189485f8343a0429c11a9969d585e1efda320
Author: Pacho Ramos gentoo org>
AuthorDate: Thu May 20 13:13:17 2021 +
Commit: Pacho Ramos gentoo org>
CommitDate: Thu May 20 13:13:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18218948
x11-themes/QGnomePlatform: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Pacho Ramos gentoo.org>
x11-themes/QGnomePlatform/Manifest | 1 -
.../QGnomePlatform/QGnomePlatform-0.7.0.ebuild | 39 --
...latform-0.7.0-qxdgdesktopfiledialog-fixes.patch | 63 --
3 files changed, 103 deletions(-)
diff --git a/x11-themes/QGnomePlatform/Manifest
b/x11-themes/QGnomePlatform/Manifest
index 4c504064322..58960150657 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.0.tar.gz 33398 BLAKE2B
28cd8c070465074f137c669c6bf5835ced26e53ebb2ae4fe96f5bf9ddabd5df6adf947499d51fa8700d5a77a35f5715711f4ccc117fe1613ec70cbfacde501fd
SHA512
9bca42a79e536ec2ff03ff2ed89dac572ea15d8a1a7fc72ac564208a82dd5ac442f1a3eb4ef54ac466a754fbc66f078105ef9bea5b0206d20be63c0f942da243
DIST QGnomePlatform-0.7.1.tar.gz 33633 BLAKE2B
167039a7de4bbd3cae163022adb94a2bd4764f5a862b8334600f2bc5b7cfe09b6a5facfe656438d05bbf150e10caab9f1aeb910d0aa8d55fbe8995393e89b0d8
SHA512
7e3ba774ee1387604f4c66bd75f9fb4c5305f4553886132e8e3991a3e42564844a7eafb1361e0e8c64743746e315c07b22c11c133be95c1c53afb62c062bfc6e
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.7.0.ebuild
b/x11-themes/QGnomePlatform/QGnomePlatform-0.7.0.ebuild
deleted file mode 100644
index 26e756b1b51..000
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 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.12:5=
- dev-qt/qtwayland:5=
- dev-qt/qtx11extras:5=
- sys-apps/xdg-desktop-portal
- x11-libs/gtk+:3[X]
- >=x11-themes/adwaita-qt-1.2.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
- # From Fedora, fixed in next version
- "${FILESDIR}/${P}-qxdgdesktopfiledialog-fixes.patch"
-)
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- INSTALL_ROOT="${D}" default
-}
diff --git
a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch
b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch
deleted file mode 100644
index db43a69d0b1..000
---
a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From e244e003b68f660dbb0795d18ad70e8a11689712 Mon Sep 17 00:00:00 2001
-From: Jan Grulich
-Date: Mon, 4 Jan 2021 11:43:36 +0100
-Subject: QXdgDesktopPortalFileDialog: backport upstream fixes
-
-
-diff --git a/common/qxdgdesktopportalfiledialog.cpp
b/common/qxdgdesktopportalfiledialog.cpp
-index 7502a6e..c4dc2da 100644
a/common/qxdgdesktopportalfiledialog.cpp
-+++ b/common/qxdgdesktopportalfiledialog.cpp
-@@ -210,7 +210,7 @@ void QXdgDesktopPortalFileDialog::openPortal()
- qDBusRegisterMetaType();
-
- FilterList filterList;
--Filter* selectedFilter = nullptr;
-+auto selectedFilterIndex = filterList.size() - 1;
-
- d->userVisibleToNameFilter.clear();
-
-@@ -236,7 +236,7 @@ void QXdgDesktopPortalFileDialog::openPortal()
- filterList << filter;
-
- if (!d->selectedMimeTypeFilter.isEmpty() &&
d->selectedMimeTypeFilter == mimeTypefilter)
--selectedFilter = ();
-+selectedFilterIndex = filterList.size() - 1;
- }
- } else if (!d->nameFilters.isEmpty()) {
- for (const QString : d->nameFilters) {
-@@ -246,7 +246,12 @@ void QXdgDesktopPortalFileDialog::openPortal()
- QRegularExpressionMatch match = regexp.match(nameFilter);
- if (match.hasMatch()) {
- QString userVisibleName = match.captured(1);
--QStringList filterStrings =
match.captured(2).split(QLatin1Char(' '), QString::SkipEmptyParts);
-+QStringList filterStrings =
match.captured(2).split(QLatin1Char(' '), Qt::SkipEmptyParts);
-+
-+
[gentoo-commits] repo/gentoo:master commit in: x11-themes/QGnomePlatform/files/, x11-themes/QGnomePlatform/
commit: f46707b2f8a0afe28b9dc64091b592b8158222e6
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Feb 14 16:21:30 2021 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Feb 14 16:23:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46707b2
x11-themes/QGnomePlatform: Bump to 0.7.0
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Pacho Ramos gentoo.org>
x11-themes/QGnomePlatform/Manifest | 1 +
.../QGnomePlatform/QGnomePlatform-0.7.0.ebuild | 39 ++
...latform-0.7.0-qxdgdesktopfiledialog-fixes.patch | 63 ++
3 files changed, 103 insertions(+)
diff --git a/x11-themes/QGnomePlatform/Manifest
b/x11-themes/QGnomePlatform/Manifest
index 04d6d68baaf..09244b813bc 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1 +1,2 @@
DIST QGnomePlatform-0.6.1.tar.gz 28996 BLAKE2B
3d0da37fcc8e85bd59263dffb19865666d25dd50d2c1e00b4d6358d745eb7079f415058ffb75a8228c9c7ed956003a656b3e10a3467d9fc9dcd5eee2c14bf7cd
SHA512
5e0bab45a8ff4c56e6e34d636ed719ce1a087f116942dd356253403d4be40aac348ccbdbfc917f65f6cc4df8619e1031734f0a46a36d4d9b7bb4838ded61570c
+DIST QGnomePlatform-0.7.0.tar.gz 33398 BLAKE2B
28cd8c070465074f137c669c6bf5835ced26e53ebb2ae4fe96f5bf9ddabd5df6adf947499d51fa8700d5a77a35f5715711f4ccc117fe1613ec70cbfacde501fd
SHA512
9bca42a79e536ec2ff03ff2ed89dac572ea15d8a1a7fc72ac564208a82dd5ac442f1a3eb4ef54ac466a754fbc66f078105ef9bea5b0206d20be63c0f942da243
diff --git a/x11-themes/QGnomePlatform/QGnomePlatform-0.7.0.ebuild
b/x11-themes/QGnomePlatform/QGnomePlatform-0.7.0.ebuild
new file mode 100644
index 000..26e756b1b51
--- /dev/null
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 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.12:5=
+ dev-qt/qtwayland:5=
+ dev-qt/qtx11extras:5=
+ sys-apps/xdg-desktop-portal
+ x11-libs/gtk+:3[X]
+ >=x11-themes/adwaita-qt-1.2.0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
+
+PATCHES=(
+ # From Fedora, fixed in next version
+ "${FILESDIR}/${P}-qxdgdesktopfiledialog-fixes.patch"
+)
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ INSTALL_ROOT="${D}" default
+}
diff --git
a/x11-themes/QGnomePlatform/files/QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch
b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch
new file mode 100644
index 000..db43a69d0b1
--- /dev/null
+++
b/x11-themes/QGnomePlatform/files/QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch
@@ -0,0 +1,63 @@
+From e244e003b68f660dbb0795d18ad70e8a11689712 Mon Sep 17 00:00:00 2001
+From: Jan Grulich
+Date: Mon, 4 Jan 2021 11:43:36 +0100
+Subject: QXdgDesktopPortalFileDialog: backport upstream fixes
+
+
+diff --git a/common/qxdgdesktopportalfiledialog.cpp
b/common/qxdgdesktopportalfiledialog.cpp
+index 7502a6e..c4dc2da 100644
+--- a/common/qxdgdesktopportalfiledialog.cpp
b/common/qxdgdesktopportalfiledialog.cpp
+@@ -210,7 +210,7 @@ void QXdgDesktopPortalFileDialog::openPortal()
+ qDBusRegisterMetaType();
+
+ FilterList filterList;
+-Filter* selectedFilter = nullptr;
++auto selectedFilterIndex = filterList.size() - 1;
+
+ d->userVisibleToNameFilter.clear();
+
+@@ -236,7 +236,7 @@ void QXdgDesktopPortalFileDialog::openPortal()
+ filterList << filter;
+
+ if (!d->selectedMimeTypeFilter.isEmpty() &&
d->selectedMimeTypeFilter == mimeTypefilter)
+-selectedFilter = ();
++selectedFilterIndex = filterList.size() - 1;
+ }
+ } else if (!d->nameFilters.isEmpty()) {
+ for (const QString : d->nameFilters) {
+@@ -246,7 +246,12 @@ void QXdgDesktopPortalFileDialog::openPortal()
+ QRegularExpressionMatch match = regexp.match(nameFilter);
+ if (match.hasMatch()) {
+ QString userVisibleName = match.captured(1);
+-QStringList filterStrings =
match.captured(2).split(QLatin1Char(' '), QString::SkipEmptyParts);
++QStringList filterStrings =
match.captured(2).split(QLatin1Char(' '), Qt::SkipEmptyParts);
++
++if (filterStrings.isEmpty()) {
++qWarning() << "Filter " << userVisibleName << " is empty
and will be ignored.";
++continue;
++}
+
+ FilterConditionList filterConditions;
+ for (const QString : filterStrings) {
+@@ -265,7
