gentoo resync : 22.05.2021

4 files changed, 2 insertions, 107 deletions

diff --git a/x11-themes/QGnomePlatform/Manifest b/x11-themes/QGnomePlatform/Manifest
index 258a33eaad7a..bcfcaea4bb20 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1,9 +1,6 @@
 AUX QGnomePlatform-0.6.1-qt5.15.patch 682 BLAKE2B 418b0c478d191e58186625cd2a307daa8f3771ee284283d84b25be2af797116f991ceac819a9e5f0258a6c3f6933c13ae66bd6912979f8d8bd847c5b7aa8d873 SHA512 c0f364f9aae6d268b410a9aa97d9442f9ec949b0dedb19836146ba9c600e2fde9bd645613c7a2bd35c960746986172258bf3fbe315e42c37be9dc14f2df8b3cb
-AUX QGnomePlatform-0.7.0-qxdgdesktopfiledialog-fixes.patch 2915 BLAKE2B d485fafae9f15abeb79a44cf30a4926972aa3f1fc7bc69d1ea007ce97c30901eecbead9667b4f78619ae2d1d45a2bc6c70adbeece61ca7fcbd4b775fa896ecdc SHA512 a062330fb6ecc26e2c9d75dc8f11d1de207832fe0d15559aeccec79c4e62e4f866d848648f632595e6dfed4f8024a16dbb14d76d53815e000b064bd6b2bf24f7
 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
 EBUILD QGnomePlatform-0.6.1-r1.ebuild 697 BLAKE2B ea7d467da40c27d288cb803bcad0146cc10d4564f87e267d59af94716cc9fedab98b84e23cc77010310c8240a6af5679934053f4776c28e059bcd6c15dbe4b8c SHA512 4a7c1e0559ca73ca961fc00e8b68663b37e62bec019875ce4e4b921fb7730e935dce5b2dad77198d6c6b6e607d4e7d0dba1421322a15222aceccac3128a190fa
-EBUILD QGnomePlatform-0.7.0.ebuild 820 BLAKE2B 23d1c18c80f7552727cff8b2d0f4a8aa601137c41abc4fda17c3252bf1a1cb9a3ec17db89debb2b30ac8fc9e0755577e6591c3c26dda4cba6be596469bb0d929 SHA512 b24b7b1f2c36b97ee219ce9e359fcc98e1315ea67722c45b420ba13b148ff5a65de5fc7e502df410de66e1a105e0d62687af6f172e2bb9fd53a19845ccac9431
-EBUILD QGnomePlatform-0.7.1.ebuild 715 BLAKE2B ae1364d697daf42bc4a820332ae57e8f3eadc5b71dd7d83bf281a7b98fc932dfc1e930ea1ba8cb84333a0e63937806ca9ad044a93eb22e640b21eb799ef657a7 SHA512 5e70455c9b7b18b05548de30294a0ed6d8eab3070dc359c1923c1d424b611dc89f4167856967e2b31e94e67f9b7ef9ee31d1acebf0f6eba0776582daaf25df39
+EBUILD QGnomePlatform-0.7.1.ebuild 713 BLAKE2B 3b78b95ac2542193532a5d8c913ed15ad225f10bc9454cb8e4504205d19a8cd54fd6bfb5fc79646ff4d43f9f6ac3f18d675bba0677311495d49c5239afddb7dc SHA512 95323882c5941ab6ff30aeabdc212ea7e8a344622f5b46b618ce3041532d463122becdbcf50df757f37d786a97c43b0e4fa55e3b7ff53ca13066cde3464e87c9
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
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 26e756b1b51e..000000000000
--- 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/QGnomePlatform-0.7.1.ebuild b/x11-themes/QGnomePlatform/QGnomePlatform-0.7.1.ebuild
index fc28ebf2a22a..cb4a841bc793 100644
--- a/x11-themes/QGnomePlatform/QGnomePlatform-0.7.1.ebuild
+++ b/x11-themes/QGnomePlatform/QGnomePlatform-0.7.1.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~ppc64 x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
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 db43a69d0b17..000000000000
--- 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 <jgrulich@redhat.com>
-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 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 = &filterList.last();
-+                selectedFilterIndex = filterList.size() - 1;
-         }
-     } else if (!d->nameFilters.isEmpty()) {
-         for (const QString &nameFilter : 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 &filterString : filterStrings) {
-@@ -265,7 +270,7 @@ void QXdgDesktopPortalFileDialog::openPortal()
-                 d->userVisibleToNameFilter.insert(userVisibleName, nameFilter);
- 
-                 if (!d->selectedNameFilter.isEmpty() && d->selectedNameFilter == nameFilter)
--                    selectedFilter = &filterList.last();
-+                    selectedFilterIndex = filterList.size() - 1;
-             }
-         }
-     }
-@@ -273,9 +278,8 @@ void QXdgDesktopPortalFileDialog::openPortal()
-     if (!filterList.isEmpty())
-         options.insert(QLatin1String("filters"), QVariant::fromValue(filterList));
- 
--    if (selectedFilter) {
--        options.insert(QLatin1String("current_filter"), QVariant::fromValue(*selectedFilter));
--    }
-+    if (selectedFilterIndex != -1)
-+        options.insert(QLatin1String("current_filter"), QVariant::fromValue(filterList[selectedFilterIndex]));
- 
-     options.insert(QLatin1String("handle_token"), QStringLiteral("qt%1").arg(QRandomGenerator::global()->generate()));
-