diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-05-24 22:23:33 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-05-24 22:24:22 +0200 |
commit | f8e3f9a83b957405c6ea66930254a4a0bde5ec02 (patch) | |
tree | 522f0bdd8ee1eae4020ceb4f7ffd6c577e2dc1a3 /kde-frameworks/kconfig | |
parent | kde-frameworks/kcoreaddons: Add kdirwatch fix (diff) | |
download | gentoo-f8e3f9a83b957405c6ea66930254a4a0bde5ec02.tar.gz gentoo-f8e3f9a83b957405c6ea66930254a4a0bde5ec02.tar.bz2 gentoo-f8e3f9a83b957405c6ea66930254a4a0bde5ec02.zip |
kde-frameworks: Remove KDE Frameworks 5.33.0
Package-Manager: Portage-2.3.5, Repoman-2.3.1
Diffstat (limited to 'kde-frameworks/kconfig')
-rw-r--r-- | kde-frameworks/kconfig/Manifest | 1 | ||||
-rw-r--r-- | kde-frameworks/kconfig/files/kconfig-5.33.0-relativePath.patch | 88 | ||||
-rw-r--r-- | kde-frameworks/kconfig/kconfig-5.33.0-r1.ebuild | 28 |
3 files changed, 0 insertions, 117 deletions
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest index 4dac039be7b6..61b470e68c5c 100644 --- a/kde-frameworks/kconfig/Manifest +++ b/kde-frameworks/kconfig/Manifest @@ -1,3 +1,2 @@ DIST kconfig-5.29.0.tar.xz 233408 SHA256 d6c12e0908de1b91529de15e75a52c9974685c91b423d5b5abeb06f261d0fa47 SHA512 e9b8432e8952808b7ce163cebfd5e9140692a06c47d7e2e33051e906f8053c4f70471f957f99c56b823f2e027f8a34acab885f65cd57d5cb02aefd9a81e7273f WHIRLPOOL c8447e38424f087a076b5ae0cfce8ebb82237d0ef6b41c44038bfe8cbdb9570ff961d3f05fb5ec115cd6c881a04e5ed9cf85075eace63fcece0edbb96bda6951 -DIST kconfig-5.33.0.tar.xz 231872 SHA256 aefe6f88ff65f61f2e083236db638c2cd863c62b8efc7a9c9463df1468bcd0c6 SHA512 e04fa2b30b16d3514ce9420a81111efef6216e8f0fd0619a71e4e527a82cf56c5209b185468bfe5cd71c437ecb5bb9d7a7a1be854e3f37f62f53b1bccbf819f6 WHIRLPOOL 6e31f558e007d3652c93fede85aa0369b273d2401d4d1b07987dc90d01ab238584eb3e534b9c596f491bf22bbd821d0d001a8f190702fcad813dc4ff372d9472 DIST kconfig-5.34.0.tar.xz 232084 SHA256 1da114407c2f2953c8e6bc3cb0560824f064b71293fb283643d74c3796e98b2e SHA512 d5684fee949081e5bbb96f25fed77996d6f64aeb4fcb4113b44358a16ff63578269115dab156891e96c414740a85779b0f3585a31a37e3f34b9f629f4c3988ea WHIRLPOOL f780124fa9f516d8f1b4fb06f1d87d58ea93c18068f624f8e0e41de8b74866ee02b55a98496b73d9891263ef9affdd9c6b55d3079186c9739335572f84ccc977 diff --git a/kde-frameworks/kconfig/files/kconfig-5.33.0-relativePath.patch b/kde-frameworks/kconfig/files/kconfig-5.33.0-relativePath.patch deleted file mode 100644 index 80bffc15a29d..000000000000 --- a/kde-frameworks/kconfig/files/kconfig-5.33.0-relativePath.patch +++ /dev/null @@ -1,88 +0,0 @@ -commit 3ad00c4e56eb9fe6ea7386f8ca1db6e15c26ac11 -Author: Wolfgang Bauer <wbauer@tmo.at> -Date: Tue Apr 25 23:37:11 2017 +0200 - - Fix relativePath calculation in KDesktopFile::locateLocal() - - The "dir" and "path" variables were obviously swapped here by mistake. - This resulted in the relativePath always being empty, and made the - function return "~/.local/share/" (or "~/.config/") instead of the - correct path. - - BUG: 345100 - FIXED-IN: 5.34.0 - Differential Revision: https://phabricator.kde.org/D5502 - -diff --git a/autotests/kdesktopfiletest.cpp b/autotests/kdesktopfiletest.cpp -index 393a6a0..a046196 100644 ---- a/autotests/kdesktopfiletest.cpp -+++ b/autotests/kdesktopfiletest.cpp -@@ -255,3 +255,34 @@ void KDesktopFileTest::testTryExecWithAuthorizeAction() - QVERIFY(!desktopFile.tryExec()); - } - } -+ -+void KDesktopFileTest::testLocateLocal_data() -+{ -+ QString systemConfigLocation = QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation).last(); -+ QString writableConfigLocation = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation); -+ QString systemDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).last(); -+ QString writableDataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); -+ -+ QTest::addColumn<QString>("path"); -+ QTest::addColumn<QString>("result"); -+ -+ QTest::newRow("configLocation, system-wide") << systemConfigLocation + "/test.desktop" << writableConfigLocation + "/test.desktop"; -+ QTest::newRow("autostart, system-wide") << systemConfigLocation + "/autostart/test.desktop" << writableConfigLocation + "/autostart/test.desktop"; -+ QTest::newRow("dataLocation, system-wide") << systemDataLocation + "/test.desktop" << writableDataLocation + "/test.desktop"; -+ QTest::newRow("applications, system-wide") << systemDataLocation + "/applications/test.desktop" << writableDataLocation + "/applications/test.desktop"; -+ QTest::newRow("desktop-directories, system-wide") << systemDataLocation + "/desktop-directories/test.directory" << writableDataLocation + "/desktop-directories/test.directory"; -+ QTest::newRow("configLocation, writable") << writableConfigLocation + "/test.desktop" << writableConfigLocation + "/test.desktop"; -+ QTest::newRow("autostart, writable") << writableConfigLocation + "/autostart/test.desktop" << writableConfigLocation + "/autostart/test.desktop"; -+ QTest::newRow("dataLocation, writable") << writableDataLocation + "/test.desktop" << writableDataLocation + "/test.desktop"; -+ QTest::newRow("applications, writable") << writableDataLocation + "/applications/test.desktop" << writableDataLocation + "/applications/test.desktop"; -+ QTest::newRow("desktop-directories, writable") << writableDataLocation + "/desktop-directories/test.directory" << writableDataLocation + "/desktop-directories/test.directory"; -+ QTest::newRow("unknown location") << "/test.desktop" << writableDataLocation + "/test.desktop"; -+} -+ -+void KDesktopFileTest::testLocateLocal() -+{ -+ QFETCH(QString, path); -+ QFETCH(QString, result); -+ -+ QCOMPARE(KDesktopFile::locateLocal(path), result); -+} -diff --git a/autotests/kdesktopfiletest.h b/autotests/kdesktopfiletest.h -index eb0bd1d..ed6679a 100644 ---- a/autotests/kdesktopfiletest.h -+++ b/autotests/kdesktopfiletest.h -@@ -34,6 +34,8 @@ private Q_SLOTS: - void testActionGroup(); - void testIsAuthorizedDesktopFile(); - void testTryExecWithAuthorizeAction(); -+ void testLocateLocal_data(); -+ void testLocateLocal(); - - }; - -diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp -index 4a55030..52a97ec 100644 ---- a/src/core/kdesktopfile.cpp -+++ b/src/core/kdesktopfile.cpp -@@ -83,14 +83,14 @@ QString KDesktopFile::locateLocal(const QString &path) - // Relative to config? (e.g. for autostart) - Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation)) { - if (path.startsWith(dir + plus)) { -- relativePath = dir.mid(path.length() + 1); -+ relativePath = path.mid(dir.length() + 1); - return QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + relativePath; - } - } - // Relative to xdg data dir? (much more common) - Q_FOREACH (const QString &dir, QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation)) { - if (path.startsWith(dir + plus)) { -- relativePath = dir.mid(path.length() + 1); -+ relativePath = path.mid(dir.length() + 1); - } - } - if (relativePath.isEmpty()) { diff --git a/kde-frameworks/kconfig/kconfig-5.33.0-r1.ebuild b/kde-frameworks/kconfig/kconfig-5.33.0-r1.ebuild deleted file mode 100644 index 14e605e5b1c2..000000000000 --- a/kde-frameworks/kconfig/kconfig-5.33.0-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Framework for reading and writing configuration" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="nls" - -RDEPEND=" - $(add_qt_dep qtgui) - $(add_qt_dep qtxml) -" -DEPEND="${RDEPEND} - nls? ( $(add_qt_dep linguist-tools) ) - test? ( $(add_qt_dep qtconcurrent) ) -" - -# bug 560086 -RESTRICT+=" test" - -DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md ) - -PATCHES=( "${FILESDIR}/${P}-relativePath.patch" ) |