55 files changed, 0 insertions, 316 deletions
diff --git a/testing/source/vtown/kde/patch/baloo.patch b/source/kde/kde/patch/baloo.patch
index bcca5d5bb..bcca5d5bb 100644
--- a/testing/source/vtown/kde/patch/baloo.patch
+++ b/source/kde/kde/patch/baloo.patch
diff --git a/testing/source/vtown/kde/patch/baloo/baloo_def_indexing_disabled.patch b/source/kde/kde/patch/baloo/baloo_def_indexing_disabled.patch
index 8a12e45f2..8a12e45f2 100644
--- a/testing/source/vtown/kde/patch/baloo/baloo_def_indexing_disabled.patch
+++ b/source/kde/kde/patch/baloo/baloo_def_indexing_disabled.patch
diff --git a/testing/source/vtown/kde/patch/calendarsupport.patch b/source/kde/kde/patch/calendarsupport.patch
index d856e5f53..d856e5f53 100644
--- a/testing/source/vtown/kde/patch/calendarsupport.patch
+++ b/source/kde/kde/patch/calendarsupport.patch
diff --git a/testing/source/vtown/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff b/source/kde/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff
index 7dc0b8689..7dc0b8689 100644
--- a/testing/source/vtown/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff
+++ b/source/kde/kde/patch/calendarsupport/calendarsupport.qt-5.15.2.diff
diff --git a/testing/source/vtown/kde/patch/calligraplan.patch b/source/kde/kde/patch/calligraplan.patch
index 5895d0cea..5895d0cea 100644
--- a/testing/source/vtown/kde/patch/calligraplan.patch
+++ b/source/kde/kde/patch/calligraplan.patch
diff --git a/testing/source/vtown/kde/patch/calligraplan/calligraplan.qt-5.15.patch b/source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch
index c8962a1b5..c8962a1b5 100644
--- a/testing/source/vtown/kde/patch/calligraplan/calligraplan.qt-5.15.patch
+++ b/source/kde/kde/patch/calligraplan/calligraplan.qt-5.15.patch
diff --git a/testing/source/vtown/kde/patch/dolphin.patch b/source/kde/kde/patch/dolphin.patch
index 02a7950c8..02a7950c8 100644
--- a/testing/source/vtown/kde/patch/dolphin.patch
+++ b/source/kde/kde/patch/dolphin.patch
diff --git a/testing/source/vtown/kde/patch/dolphin/dolphin_revert_noroot.patch b/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch
index 423e17074..423e17074 100644
--- a/testing/source/vtown/kde/patch/dolphin/dolphin_revert_noroot.patch
+++ b/source/kde/kde/patch/dolphin/dolphin_revert_noroot.patch
diff --git a/testing/source/vtown/kde/patch/falkon.patch b/source/kde/kde/patch/falkon.patch
index 27a466836..27a466836 100644
--- a/testing/source/vtown/kde/patch/falkon.patch
+++ b/source/kde/kde/patch/falkon.patch
diff --git a/testing/source/vtown/kde/patch/falkon/falkon.qt-5.15.diff b/source/kde/kde/patch/falkon/falkon.qt-5.15.diff
index 60f1699e8..60f1699e8 100644
--- a/testing/source/vtown/kde/patch/falkon/falkon.qt-5.15.diff
+++ b/source/kde/kde/patch/falkon/falkon.qt-5.15.diff
diff --git a/testing/source/vtown/kde/patch/kaddressbook.patch b/source/kde/kde/patch/kaddressbook.patch
index f5479069d..f5479069d 100644
--- a/testing/source/vtown/kde/patch/kaddressbook.patch
+++ b/source/kde/kde/patch/kaddressbook.patch
diff --git a/testing/source/vtown/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff b/source/kde/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff
index 6460b30d4..6460b30d4 100644
--- a/testing/source/vtown/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff
+++ b/source/kde/kde/patch/kaddressbook/kaddressbook.qt-5.15.2.diff
diff --git a/testing/source/vtown/kde/patch/kalgebra.patch b/source/kde/kde/patch/kalgebra.patch
index d17f4822d..d17f4822d 100644
--- a/testing/source/vtown/kde/patch/kalgebra.patch
+++ b/source/kde/kde/patch/kalgebra.patch
diff --git a/testing/source/vtown/kde/patch/kalgebra/kalgebra_ncurses_linking.diff b/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
index 3d78fa30b..3d78fa30b 100644
--- a/testing/source/vtown/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
+++ b/source/kde/kde/patch/kalgebra/kalgebra_ncurses_linking.diff
diff --git a/testing/source/vtown/kde/patch/kate.patch b/source/kde/kde/patch/kate.patch
index 59df062a0..59df062a0 100644
--- a/testing/source/vtown/kde/patch/kate.patch
+++ b/source/kde/kde/patch/kate.patch
diff --git a/testing/source/vtown/kde/patch/kate/kate_runasroot.patch b/source/kde/kde/patch/kate/kate_runasroot.patch
index f549fc342..f549fc342 100644
--- a/testing/source/vtown/kde/patch/kate/kate_runasroot.patch
+++ b/source/kde/kde/patch/kate/kate_runasroot.patch
diff --git a/testing/source/vtown/kde/patch/kdeconnect-kde.patch b/source/kde/kde/patch/kdeconnect-kde.patch
index 122440d2a..122440d2a 100644
--- a/testing/source/vtown/kde/patch/kdeconnect-kde.patch
+++ b/source/kde/kde/patch/kdeconnect-kde.patch
diff --git a/testing/source/vtown/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff b/source/kde/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff
index ff067aa8e..ff067aa8e 100644
--- a/testing/source/vtown/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff
+++ b/source/kde/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff
diff --git a/testing/source/vtown/kde/patch/kdelibs.patch b/source/kde/kde/patch/kdelibs.patch
index 0cdcc9ca4..0cdcc9ca4 100644
--- a/testing/source/vtown/kde/patch/kdelibs.patch
+++ b/source/kde/kde/patch/kdelibs.patch
diff --git a/testing/source/vtown/kde/patch/kdelibs/kdelibs-openssl-1.1.patch b/source/kde/kde/patch/kdelibs/kdelibs-openssl-1.1.patch
index 1f6b7fcb0..1f6b7fcb0 100644
--- a/testing/source/vtown/kde/patch/kdelibs/kdelibs-openssl-1.1.patch
+++ b/source/kde/kde/patch/kdelibs/kdelibs-openssl-1.1.patch
diff --git a/testing/source/vtown/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch b/source/kde/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch
index fd7375f9f..fd7375f9f 100644
--- a/testing/source/vtown/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch
+++ b/source/kde/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch
diff --git a/testing/source/vtown/kde/patch/kdelibs4support.patch b/source/kde/kde/patch/kdelibs4support.patch
index 7d6626ed1..7d6626ed1 100644
--- a/testing/source/vtown/kde/patch/kdelibs4support.patch
+++ b/source/kde/kde/patch/kdelibs4support.patch
diff --git a/testing/source/vtown/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff b/source/kde/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff
index 1b393287a..1b393287a 100644
--- a/testing/source/vtown/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff
+++ b/source/kde/kde/patch/kdelibs4support/FindDocBookXML4.cmake.diff
diff --git a/testing/source/vtown/kde/patch/kgpg.patch b/source/kde/kde/patch/kgpg.patch
index f2248dfb5..f2248dfb5 100644
--- a/testing/source/vtown/kde/patch/kgpg.patch
+++ b/source/kde/kde/patch/kgpg.patch
diff --git a/testing/source/vtown/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff b/source/kde/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff
index 86a732dd1..86a732dd1 100644
--- a/testing/source/vtown/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff
+++ b/source/kde/kde/patch/kgpg/kgpg.only.autostart.in.plasma.diff
diff --git a/testing/source/vtown/kde/patch/kinfocenter.patch b/source/kde/kde/patch/kinfocenter.patch
index b57d434fc..b57d434fc 100644
--- a/testing/source/vtown/kde/patch/kinfocenter.patch
+++ b/source/kde/kde/patch/kinfocenter.patch
diff --git a/testing/source/vtown/kde/patch/kinfocenter/kinfocenter_libpci.patch b/source/kde/kde/patch/kinfocenter/kinfocenter_libpci.patch
index a2bc00796..a2bc00796 100644
--- a/testing/source/vtown/kde/patch/kinfocenter/kinfocenter_libpci.patch
+++ b/source/kde/kde/patch/kinfocenter/kinfocenter_libpci.patch
diff --git a/testing/source/vtown/kde/patch/kompare.patch b/source/kde/kde/patch/kompare.patch
index dee6dee1c..dee6dee1c 100644
--- a/testing/source/vtown/kde/patch/kompare.patch
+++ b/source/kde/kde/patch/kompare.patch
diff --git a/testing/source/vtown/kde/patch/kompare/kompare.qt-5.15.2.diff b/source/kde/kde/patch/kompare/kompare.qt-5.15.2.diff
index fae1d772f..fae1d772f 100644
--- a/testing/source/vtown/kde/patch/kompare/kompare.qt-5.15.2.diff
+++ b/source/kde/kde/patch/kompare/kompare.qt-5.15.2.diff
diff --git a/testing/source/vtown/kde/patch/krename.patch b/source/kde/kde/patch/krename.patch
index 6e79ecb66..6e79ecb66 100644
--- a/testing/source/vtown/kde/patch/krename.patch
+++ b/source/kde/kde/patch/krename.patch
diff --git a/testing/source/vtown/kde/patch/krename/krename.taglib.diff b/source/kde/kde/patch/krename/krename.taglib.diff
index a1b8a11db..a1b8a11db 100644
--- a/testing/source/vtown/kde/patch/krename/krename.taglib.diff
+++ b/source/kde/kde/patch/krename/krename.taglib.diff
diff --git a/testing/source/vtown/kde/patch/ktorrent.patch b/source/kde/kde/patch/ktorrent.patch
index 0fdb4aacb..0fdb4aacb 100644
--- a/testing/source/vtown/kde/patch/ktorrent.patch
+++ b/source/kde/kde/patch/ktorrent.patch
diff --git a/testing/source/vtown/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
index e55e5ceea..e55e5ceea 100644
--- a/testing/source/vtown/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
+++ b/source/kde/kde/patch/ktorrent/ktorrent.use.package.geoip.database.diff
diff --git a/testing/source/vtown/kde/patch/ktorrent/ktorrent_systray.patch b/source/kde/kde/patch/ktorrent/ktorrent_systray.patch
index 50049afae..50049afae 100644
--- a/testing/source/vtown/kde/patch/ktorrent/ktorrent_systray.patch
+++ b/source/kde/kde/patch/ktorrent/ktorrent_systray.patch
diff --git a/testing/source/vtown/kde/patch/ktorrent/ktorrent_taglib_linking.patch b/source/kde/kde/patch/ktorrent/ktorrent_taglib_linking.patch
index 7f612c8fc..7f612c8fc 100644
--- a/testing/source/vtown/kde/patch/ktorrent/ktorrent_taglib_linking.patch
+++ b/source/kde/kde/patch/ktorrent/ktorrent_taglib_linking.patch
diff --git a/testing/source/vtown/kde/patch/milou.patch b/source/kde/kde/patch/milou.patch
index 2caee005f..2caee005f 100644
--- a/testing/source/vtown/kde/patch/milou.patch
+++ b/source/kde/kde/patch/milou.patch
diff --git a/testing/source/vtown/kde/patch/milou/milou_krunner_include.diff b/source/kde/kde/patch/milou/milou_krunner_include.diff
index ffd075cad..ffd075cad 100644
--- a/testing/source/vtown/kde/patch/milou/milou_krunner_include.diff
+++ b/source/kde/kde/patch/milou/milou_krunner_include.diff
diff --git a/testing/source/vtown/kde/patch/oxygen-gtk2.patch b/source/kde/kde/patch/oxygen-gtk2.patch
index a2dd03e7f..a2dd03e7f 100644
--- a/testing/source/vtown/kde/patch/oxygen-gtk2.patch
+++ b/source/kde/kde/patch/oxygen-gtk2.patch
diff --git a/testing/source/vtown/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch b/source/kde/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch
index b6a1e557e..b6a1e557e 100644
--- a/testing/source/vtown/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch
+++ b/source/kde/kde/patch/oxygen-gtk2/oxygen-gtk2_KDEBUG_341181.patch
diff --git a/testing/source/vtown/kde/patch/plasma-browser-integration.patch b/source/kde/kde/patch/plasma-browser-integration.patch
index 38642df29..38642df29 100644
--- a/testing/source/vtown/kde/patch/plasma-browser-integration.patch
+++ b/source/kde/kde/patch/plasma-browser-integration.patch
diff --git a/testing/source/vtown/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch b/source/kde/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch
index c881edf42..c881edf42 100644
--- a/testing/source/vtown/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch
+++ b/source/kde/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch
diff --git a/testing/source/vtown/kde/patch/plasma-desktop.patch b/source/kde/kde/patch/plasma-desktop.patch
index fddf562e8..fddf562e8 100644
--- a/testing/source/vtown/kde/patch/plasma-desktop.patch
+++ b/source/kde/kde/patch/plasma-desktop.patch
diff --git a/testing/source/vtown/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff b/source/kde/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff
index f3400d2ea..f3400d2ea 100644
--- a/testing/source/vtown/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff
+++ b/source/kde/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff
diff --git a/testing/source/vtown/kde/patch/sddm.patch b/source/kde/kde/patch/sddm.patch
index a77c521f6..a77c521f6 100644
--- a/testing/source/vtown/kde/patch/sddm.patch
+++ b/source/kde/kde/patch/sddm.patch
diff --git a/testing/source/vtown/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch b/source/kde/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch
index bf3bfd255..bf3bfd255 100644
--- a/testing/source/vtown/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch
+++ b/source/kde/kde/patch/sddm/sddm_honor-PAM-supplemental-groups-v2.patch
diff --git a/testing/source/vtown/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch b/source/kde/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch
index 2391c80ce..2391c80ce 100644
--- a/testing/source/vtown/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch
+++ b/source/kde/kde/patch/sddm/sddm_revert-honor-PAM-supplemental-groups.patch
diff --git a/testing/source/vtown/kde/patch/README b/testing/source/vtown/kde/patch/README
deleted file mode 100644
index 2478e45f9..000000000
--- a/testing/source/vtown/kde/patch/README
+++ /dev/null
@@ -1,18 +0,0 @@
-
-IMPORTANT!
-
-To fail/exit a script, use this:
-
-[command that fails] || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-DO NOT USE THIS:
-
-[command that fails] || exit 1
-
-as it will cause the parent script to exit in the wrong location and possibly
-silently skip building some packages.
-
-Thanks,
-
-The Management
-
diff --git a/testing/source/vtown/kde/patch/kdelibs/coding-style-fixes.patch b/testing/source/vtown/kde/patch/kdelibs/coding-style-fixes.patch
deleted file mode 100644
index 11108f0a4..000000000
--- a/testing/source/vtown/kde/patch/kdelibs/coding-style-fixes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 2173580f070e806d4715e13048c697c49ec262e2 Mon Sep 17 00:00:00 2001
-From: Aaron Seigo <aseigo@kde.org>
-Date: Thu, 21 Feb 2013 17:59:58 +0100
-Subject: [PATCH 047/111] coding style fixes
-
----
- kdeui/icons/kiconloader.cpp | 27 ++++++++++++---------------
- 1 file changed, 12 insertions(+), 15 deletions(-)
-
-diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
-index 6fed667..dba474d 100644
---- a/kdeui/icons/kiconloader.cpp
-+++ b/kdeui/icons/kiconloader.cpp
-@@ -938,32 +938,29 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const
-         }
-     }
- 
--    foreach (KIconThemeNode *themeNode, links)
--    {
-+    foreach (KIconThemeNode *themeNode, links) {
-         QString currentName = name;
- 
--        while (!currentName.isEmpty())
--        {
--
-+        while (!currentName.isEmpty()) {
-             //kDebug(264) << "Looking up" << currentName;
- 
--// The following code has been commented out because the Qt SVG renderer needs
--// to be improved. If you are going to change/remove some code from this part,
--// please contact me before (ereslibre@kde.org), or kde-core-devel@kde.org. (ereslibre)
--            for (int i = 0 ; i < 4 ; i++)
--            {
-+            for (int i = 0 ; i < 4 ; i++) {
-                 icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact);
--                if (icon.isValid())
--                    return icon;
-+                if (icon.isValid()) {
-+                    break;
-+                }
- 
-                 icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest);
--                if (icon.isValid())
--                    return icon;
-+                if (icon.isValid()) {
-+                    break;
-+                }
-             }
-+            //kDebug(264) << "Looking up" << currentName;
- 
--            if (genericFallback)
-+            if (genericFallback) {
-                 // we already tested the base name
-                 break;
-+            }
- 
-             int rindex = currentName.lastIndexOf('-');
-             if (rindex > 1) { // > 1 so that we don't split x-content or x-epoc
--- 
-1.8.1.4
-
-
diff --git a/testing/source/vtown/kde/patch/kdelibs/kde4libs-4.14.26.diff b/testing/source/vtown/kde/patch/kdelibs/kde4libs-4.14.26.diff
deleted file mode 100644
index 2bc275ac7..000000000
--- a/testing/source/vtown/kde/patch/kdelibs/kde4libs-4.14.26.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/kio/kio/tcpslavebase.cpp
-+++ b/kio/kio/tcpslavebase.cpp
-@@ -499,7 +499,7 @@
- {
-     if (d->usingSSL)
-         return false;
--    return d->startTLSInternal(KTcpSocket::TlsV1) & ResultOk;
-+    return d->startTLSInternal(KTcpSocket::SecureProtocols) & ResultOk;
- }
- 
- TCPSlaveBase::SslResult TCPSlaveBase::TcpSlaveBasePrivate::startTLSInternal (KTcpSocket::SslVersion version,
diff --git a/testing/source/vtown/kde/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch b/testing/source/vtown/kde/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch
deleted file mode 100644
index 58afcaaed..000000000
--- a/testing/source/vtown/kde/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 2c3762feddf7e66cf6b64d9058f625a715694a00 Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Wed, 7 Aug 2019 09:47:46 +0200
-Subject: Security: remove support for $(...) in config keys with [$e] marker.
-
-It is very unclear at this point what a valid use case for this feature
-would possibly be. The old documentation only mentions $(hostname) as
-an example, which can be done with $HOSTNAME instead.
-
-Note that $(...) is still supported in Exec lines of desktop files,
-this does not require [$e] anyway (and actually works better without it,
-otherwise the $ signs need to be doubled to obey kconfig $e escaping rules...).
-
-Thanks to Fabian Vogt for testing.
-
-(This is a backport of KDE Frameworks 5 kconfig patch to kdelibs)
-
-Differential Revision: https://phabricator.kde.org/D22989
----
- kdecore/config/kconfig.cpp    | 32 +-------------------------------
- kdecore/doc/README.kiosk      | 12 ------------
- kdecore/tests/kconfigtest.cpp |  6 +-----
- 3 files changed, 2 insertions(+), 48 deletions(-)
-
-diff --git a/kdecore/config/kconfig.cpp b/kdecore/config/kconfig.cpp
-index 7ea26a5..b30584b 100644
---- a/kdecore/config/kconfig.cpp
-+++ b/kdecore/config/kconfig.cpp
-@@ -160,37 +160,7 @@ QString KConfigPrivate::expandString(const QString& value)
-     int nDollarPos = aValue.indexOf( QLatin1Char('$') );
-     while( nDollarPos != -1 && nDollarPos+1 < aValue.length()) {
-         // there is at least one $
--        if( aValue[nDollarPos+1] == QLatin1Char('(') ) {
--            int nEndPos = nDollarPos+1;
--            // the next character is not $
--            while ( (nEndPos <= aValue.length()) && (aValue[nEndPos]!=QLatin1Char(')')) )
--                nEndPos++;
--            nEndPos++;
--            QString cmd = aValue.mid( nDollarPos+2, nEndPos-nDollarPos-3 );
--
--            QString result;
--            QByteArray oldpath = qgetenv( "PATH" );
--            QByteArray newpath;
--            if (KGlobal::hasMainComponent()) {
--                newpath = QFile::encodeName(KGlobal::dirs()->resourceDirs("exe").join(QChar::fromLatin1(KPATH_SEPARATOR)));
--                if (!newpath.isEmpty() && !oldpath.isEmpty())
--                    newpath += KPATH_SEPARATOR;
--            }
--            newpath += oldpath;
--            setenv( "PATH", newpath, 1/*overwrite*/ );
--// FIXME: wince does not have pipes
--#ifndef _WIN32_WCE
--            FILE *fs = popen(QFile::encodeName(cmd).data(), "r");
--            if (fs) {
--                QTextStream ts(fs, QIODevice::ReadOnly);
--                result = ts.readAll().trimmed();
--                pclose(fs);
--            }
--#endif
--            setenv( "PATH", oldpath, 1/*overwrite*/ );
--            aValue.replace( nDollarPos, nEndPos-nDollarPos, result );
--            nDollarPos += result.length();
--        } else if( aValue[nDollarPos+1] != QLatin1Char('$') ) {
-+        if( aValue[nDollarPos+1] != QLatin1Char('$') ) {
-             int nEndPos = nDollarPos+1;
-             // the next character is not $
-             QString aVarName;
-diff --git a/kdecore/doc/README.kiosk b/kdecore/doc/README.kiosk
-index b95002d..d902c61 100644
---- a/kdecore/doc/README.kiosk
-+++ b/kdecore/doc/README.kiosk
-@@ -640,18 +640,6 @@ The following syntax is also supported:
- Name[$ei]=${USER}
- 
- 
--Shell Commands in KDE config files.
--===================================
--
--Since KDE-3.1 arbitrary entries in configuration files can contain shell 
--commands. This way the value of a configuration entry can be determined
--dynamically at runtime. In order to use this the entry must be marked 
--with [$e]. 
--
--Example:
--Host[$e]=$(hostname)
--
--
- KDE Kiosk Application API
- ==========================
- 
-diff --git a/kdecore/tests/kconfigtest.cpp b/kdecore/tests/kconfigtest.cpp
-index 78e6ad1..37ea3c2 100644
---- a/kdecore/tests/kconfigtest.cpp
-+++ b/kdecore/tests/kconfigtest.cpp
-@@ -479,12 +479,8 @@ void KConfigTest::testPath()
-   QCOMPARE(group.readPathEntry("withBraces", QString()), QString("file://" + HOMEPATH) );
-   QVERIFY(group.hasKey("URL"));
-   QCOMPARE(group.readEntry("URL", QString()), QString("file://" + HOMEPATH) );
--#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC)
--  // I don't know if this will work on windows
--  // This test hangs on OS X
-   QVERIFY(group.hasKey("hostname"));
--  QCOMPARE(group.readEntry("hostname", QString()), QHostInfo::localHostName());
--#endif
-+  QCOMPARE(group.readEntry("hostname", QString()), QString("(hostname)")); // the $ got removed because empty var name
-   QVERIFY(group.hasKey("noeol"));
-   QCOMPARE(group.readEntry("noeol", QString()), QString("foo"));
- }
--- 
-cgit v1.1
-
-
diff --git a/testing/source/vtown/kde/patch/kdelibs/kdelibs.docbook.patch b/testing/source/vtown/kde/patch/kdelibs/kdelibs.docbook.patch
deleted file mode 100644
index 6a20cd279..000000000
--- a/testing/source/vtown/kde/patch/kdelibs/kdelibs.docbook.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake.orig	2010-05-27 19:25:00.000000000 +0200
-+++ kdelibs-4.4.85/cmake/modules/FindDocBookXML.cmake	2010-06-07 16:18:35.000000000 +0200
-@@ -12,7 +12,7 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
--set (DOCBOOKXML_CURRENTDTD_VERSION "4.2"
-+set (DOCBOOKXML_CURRENTDTD_VERSION "4.5"
-      CACHE INTERNAL "Required version of XML DTDs")
- 
- set (DTD_PATH_LIST
diff --git a/testing/source/vtown/kde/patch/kdelibs/kdelibs.upnp_conditional.patch b/testing/source/vtown/kde/patch/kdelibs/kdelibs.upnp_conditional.patch
deleted file mode 100644
index 3a1944774..000000000
--- a/testing/source/vtown/kde/patch/kdelibs/kdelibs.upnp_conditional.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- kdelibs-4.8.0/solid/solid/managerbase.cpp.orig	2011-07-27 20:34:39.000000000 +0200
-+++ kdelibs-4.8.0/solid/solid/managerbase.cpp	2012-01-26 09:17:49.409993419 +0100
-@@ -90,7 +90,11 @@
- #        endif
- 
- #        if defined (HUPNP_FOUND)
--            m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
-+            bool solidUpnpEnabled
-+                = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1;
-+            if (solidUpnpEnabled) {
-+                m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
-+            }
- #        endif
-     }
- }
diff --git a/testing/source/vtown/kde/patch/kdelibs/return-application-icons-properly.patch b/testing/source/vtown/kde/patch/kdelibs/return-application-icons-properly.patch
deleted file mode 100644
index 2bdb53adf..000000000
--- a/testing/source/vtown/kde/patch/kdelibs/return-application-icons-properly.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 613c951a1157df0d8a907a155a5eaa706816d5f9 Mon Sep 17 00:00:00 2001
-From: Aaron Seigo <aseigo@kde.org>
-Date: Thu, 21 Feb 2013 17:58:11 +0100
-Subject: return application icons properly
-
-BUG:315578
----
- kdeui/icons/kiconloader.cpp | 31 ++++++++++++++++++++++++++++++-
- 1 file changed, 30 insertions(+), 1 deletion(-)
-
-diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
-index f65e941..6fed667 100644
---- a/kdeui/icons/kiconloader.cpp
-+++ b/kdeui/icons/kiconloader.cpp
-@@ -909,7 +909,36 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const
-     const char * const ext[4] = { ".png", ".svgz", ".svg", ".xpm" };
-     bool genericFallback = name.endsWith(QLatin1String("-x-generic"));
- 
--    foreach(KIconThemeNode *themeNode, links)
-+    // Do two passes through themeNodes.
-+    //
-+    // The first pass looks for an exact match in each themeNode one after the other.
-+    // If one is found and it is an app icon then return that icon.
-+    //
-+    // In the next pass (assuming the first pass failed), it looks for exact matches
-+    // and then generic fallbacks in each themeNode one after the other
-+    //
-+    // The reasoning is that application icons should always match exactly, all other
-+    // icons may fallback. Since we do not know what the context is here when we start
-+    // looking for it, we can only go by the path found.
-+    foreach (KIconThemeNode *themeNode, links) {
-+        for (int i = 0 ; i < 4 ; i++) {
-+            icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchExact);
-+            if (icon.isValid()) {
-+                break;
-+            }
-+
-+            icon = themeNode->theme->iconPath(name + ext[i], size, KIconLoader::MatchBest);
-+            if (icon.isValid()) {
-+                break;
-+            }
-+        }
-+
-+        if (icon.isValid() && icon.path.contains("/apps/")) {
-+            return icon;
-+        }
-+    }
-+
-+    foreach (KIconThemeNode *themeNode, links)
-     {
-         QString currentName = name;
- 
--- 
-1.8.1.4
-
-
diff --git a/testing/source/vtown/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch b/testing/source/vtown/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch
deleted file mode 100644
index b62818ed6..000000000
--- a/testing/source/vtown/kde/patch/kdelibs/return-not-break.-copy-paste-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0edfd42151ad57322a10a24ab4971b638e220e6e Mon Sep 17 00:00:00 2001
-From: Aaron Seigo <aseigo@kde.org>
-Date: Thu, 21 Feb 2013 18:14:54 +0100
-Subject: [PATCH 049/111] return, not break. copy/paste error
-
----
- kdeui/icons/kiconloader.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
-index dba474d..ce6aeea 100644
---- a/kdeui/icons/kiconloader.cpp
-+++ b/kdeui/icons/kiconloader.cpp
-@@ -947,12 +947,12 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const
-             for (int i = 0 ; i < 4 ; i++) {
-                 icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchExact);
-                 if (icon.isValid()) {
--                    break;
-+                    return icon;
-                 }
- 
-                 icon = themeNode->theme->iconPath(currentName + ext[i], size, KIconLoader::MatchBest);
-                 if (icon.isValid()) {
--                    break;
-+                    return icon;
-                 }
-             }
-             //kDebug(264) << "Looking up" << currentName;
--- 
-1.8.1.4
-
diff --git a/testing/source/vtown/kde/patch/ktorrent/geoip.dat b/testing/source/vtown/kde/patch/ktorrent/geoip.dat
deleted file mode 100644
index be8b031f7..000000000
--- a/testing/source/vtown/kde/patch/ktorrent/geoip.dat
+++ /dev/null