gentoo resync : 21.05.2019

1 files changed, 0 insertions, 52 deletions

diff --git a/kde-plasma/kinfocenter/files/kinfocenter-5.14.5-hwids.patch b/kde-plasma/kinfocenter/files/kinfocenter-5.14.5-hwids.patch
deleted file mode 100644
index a29f71f7786b..000000000000
--- a/kde-plasma/kinfocenter/files/kinfocenter-5.14.5-hwids.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From e556c25c888a6e16e818945ac5bc81e455ddd4bc Mon Sep 17 00:00:00 2001
-From: Alexandre Ferreira <alexandref75@gmail.com>
-Date: Tue, 15 Jan 2019 13:29:25 +0000
-Subject: Fix USB view
-
-Summary:
-Fix
-BUG: 402949
-
-Reviewers: #plasma, cfeck, davidedmundson
-
-Reviewed By: #plasma, davidedmundson
-
-Subscribers: asturmlechner, davidedmundson, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D18032
----
- Modules/usbview/usbdb.cpp      | 3 +++
- Modules/usbview/usbdevices.cpp | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Modules/usbview/usbdb.cpp b/Modules/usbview/usbdb.cpp
-index 2c62f16..e68d5c0 100644
---- a/Modules/usbview/usbdb.cpp
-+++ b/Modules/usbview/usbdb.cpp
-@@ -21,6 +21,9 @@
- USBDB::USBDB() {
- 	QString db = QStringLiteral("/usr/share/hwdata/usb.ids"); /* on Fedora and Arch*/
- 	if (!QFile::exists(db)) {
-+		db = QStringLiteral("/usr/share/misc/usb.ids"); /* on Gentoo */
-+	}
-+	if (!QFile::exists(db)) {
-                 //cannot use locate(AppDataLocation) as the app is kinfocenter
- 		db = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kcmusb"), QStandardPaths::LocateDirectory);
-                 if (!db.isEmpty())
-diff --git a/Modules/usbview/usbdevices.cpp b/Modules/usbview/usbdevices.cpp
-index 1fb32e7..7b6fe1c 100644
---- a/Modules/usbview/usbdevices.cpp
-+++ b/Modules/usbview/usbdevices.cpp
-@@ -103,7 +103,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, const QString& dname
- 			continue;
- 
- 		USBDevice* dev = new USBDevice();
--        dev->parseSysDir(bus, ++level, _device, dname + QLatin1Char('/') + *it);
-+        dev->parseSysDir(bus, _device, ++level, dname + QLatin1Char('/') + *it);
- 	}
- }
- 
--- 
-cgit v1.1