rm old files

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

8 files changed, 9 insertions, 589 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index acdfc8b18678..df8da8ca9d67 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.808 2011/12/11 18:52:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.809 2011/12/12 01:08:49 abcd Exp $
+
+  12 Dec 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/kdelibs-4.3.80-module-suffix.patch,
+  -files/kdelibs-4.4.66-macos-unbundle.patch,
+  -files/kdelibs-4.6.0-kateacc.patch, -files/kdelibs-4.7.1-clearbutton.patch,
+  -files/kdelibs-4.7.1-qlabel-1.patch, -files/kdelibs-4.7.1-qlabel-2.patch,
+  -files/kdelibs-4.7.2-nepomuk-unicode.patch:
+  rm old files
 
 *kdelibs-4.7.4 (11 Dec 2011)
 
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.80-module-suffix.patch b/kde-base/kdelibs/files/kdelibs-4.3.80-module-suffix.patch
deleted file mode 100644
index 395cacbfee50..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.80-module-suffix.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -purN kdelibs-4.3.80.orig/config.h.cmake kdelibs-4.3.80/config.h.cmake
---- kdelibs-4.3.80.orig/config.h.cmake	2009-10-26 05:15:52.000000000 -0400
-+++ kdelibs-4.3.80/config.h.cmake	2009-12-14 16:56:15.667194286 -0500
-@@ -12,6 +12,7 @@
- #define kde_socklen_t socklen_t
- 
- #define KDELIBSUFF "${KDELIBSUFF}"
-+#define KDE_MODULE_SUFFIX "${CMAKE_SHARED_MODULE_SUFFIX}"
- 
- /****************************/
- 
-diff -purN kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp kdelibs-4.3.80/kdecore/util/klibloader.cpp
---- kdelibs-4.3.80.orig/kdecore/util/klibloader.cpp	2008-05-21 07:09:15.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/klibloader.cpp	2009-12-14 16:56:15.668194094 -0500
-@@ -57,7 +57,7 @@ KLibLoader::~KLibLoader()
- {
- }
- 
--extern QString makeLibName( const QString &libname );
-+extern QString makeLibName( const QString &libname, const QString &type );
- 
- extern QString findLibrary(const QString &name, const KComponentData &cData);
- 
-diff -purN kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp kdelibs-4.3.80/kdecore/util/klibrary.cpp
---- kdelibs-4.3.80.orig/kdecore/util/klibrary.cpp	2009-10-02 10:55:11.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/klibrary.cpp	2009-12-14 16:57:24.317056608 -0500
-@@ -27,7 +27,7 @@
- #include <kpluginfactory.h>
- #include <kdebug.h>
- 
--extern QString makeLibName( const QString &libname );
-+extern QString makeLibName( const QString &libname, const QString &type );
- extern QString findLibraryInternal(const QString &name, const KComponentData &cData);
- 
- int kLibraryDebugArea() {
-diff -purN kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp kdelibs-4.3.80/kdecore/util/kpluginloader.cpp
---- kdelibs-4.3.80.orig/kdecore/util/kpluginloader.cpp	2009-10-15 12:35:55.000000000 -0400
-+++ kdelibs-4.3.80/kdecore/util/kpluginloader.cpp	2009-12-14 16:57:58.533877037 -0500
-@@ -27,6 +27,8 @@
- #include "klibrary.h"
- #include <kdebug.h>
- 
-+#include <config.h>
-+
- #include <QtCore/QLibrary>
- #include <QtCore/QDir>
- #include <QtCore/QFileInfo>
-@@ -54,25 +56,37 @@ protected:
-     KLibrary *lib;
- };
- 
--inline QString makeLibName( const QString &libname )
-+inline QString makeLibName( const QString &libname, const QString &type )
- {
- #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
-     if (!libname.endsWith(".dll"))
-         return libname + ".dll";
-     return libname;
--#else
-+#else // Q_OS_WIN
-     int pos = libname.lastIndexOf('/');
-     if (pos < 0)
-       pos = 0;
-     if (libname.indexOf('.', pos) < 0) {
--        const char* const extList[] = { ".so", ".dylib", ".bundle", ".sl" };
-+#ifdef Q_OS_MAC
-+		// Libraries are always .dylib
-+		if (type.compare("lib") == 0) {
-+			return libname + ".dylib";
-+		}
-+		// Modules mostly go .bundle but we'll use CMake smartness
-+		else {
-+			return libname + KDE_MODULE_SUFFIX;
-+		}
-+#else // Q_OS_MAC
-+		// Prefer the value specified by cmake for the target, fall back to standard
-+        const char* const extList[] = { KDE_MODULE_SUFFIX, ".so", ".sl" };
-         for (uint i = 0; i < sizeof(extList) / sizeof(*extList); ++i) {
-            if (QLibrary::isLibrary(libname + extList[i]))
-                return libname + extList[i];
-         }
-+#endif // Q_OS_MAC
-     }
-     return libname;
--#endif
-+#endif // Q_OS_WIN
- }
- 
- #ifdef Q_OS_WIN
-@@ -81,12 +95,13 @@ extern QString fixLibPrefix(const QStrin
- 
- QString findLibraryInternal(const QString &name, const KComponentData &cData)
- {
--    // Convert name to a valid platform libname
--    QString libname = makeLibName(name);
-     QFileInfo fileinfo(name);
-     bool hasPrefix = fileinfo.fileName().startsWith("lib");
-     bool kdeinit = fileinfo.fileName().startsWith("libkdeinit4_");
- 
-+    // Convert name to a valid platform libname depending on requested type.
-+    QString libname = makeLibName(name, kdeinit ? "lib" : "module");
-+
-     if (hasPrefix && !kdeinit)
-         kDebug(kLibraryDebugArea()) << "plugins should not have a 'lib' prefix:" << libname;
- #ifdef Q_CC_MSVC
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.66-macos-unbundle.patch b/kde-base/kdelibs/files/kdelibs-4.4.66-macos-unbundle.patch
deleted file mode 100644
index 614ee87253a6..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.66-macos-unbundle.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-KDE is smart, too smart. We don't want application bundles. And since our Qt is
-configured to not build application bundles, since wouldn't even work. So this
-patch disables KDE's smartness regarding application bundles.
-
-Author: Heiko Przybyl <zuxez@cs.tu-berlin.de>
-
---- kdelibs-4.3.1/kdecore/kernel/kstandarddirs.cpp.orig	2009-09-28 02:05:37 +0200
-+++ kdelibs-4.3.1/kdecore/kernel/kstandarddirs.cpp	2009-09-28 02:22:20 +0200
-@@ -1327,14 +1303,6 @@ int KStandardDirs::findAllExe( QStringLi
-         p = (*it) + '/';
-         p += real_appname;
- 
--#ifdef Q_WS_MAC
--        QString bundle = getBundle( p, (options & IgnoreExecBit) );
--        if ( !bundle.isEmpty() ) {
--            //kDebug(180) << "findExe(): returning " << bundle;
--            list.append( bundle );
--        }
--#endif
--
-         info.setFile( p );
- 
-         if( info.exists() && ( ( options & IgnoreExecBit ) || info.isExecutable())
-@@ -1636,18 +1604,6 @@ void KStandardDirs::addKDEDefaults()
-         addPrefix(localKdeDir);
-     }
- 
--#ifdef Q_WS_MACX
--    // Adds the "Contents" directory of the current application bundle to
--    // the search path. This way bundled resources can be found.
--    QDir bundleDir(mac_app_filename());
--    if (bundleDir.dirName() == "MacOS") { // just to be sure we're in a bundle
--        bundleDir.cdUp();
--        // now dirName should be "Contents". In there we can find our normal
--        // dir-structure, beginning with "share"
--        addPrefix(bundleDir.absolutePath());
--    }
--#endif
--
-     QStringList::ConstIterator end(kdedirList.end());
-     for (QStringList::ConstIterator it = kdedirList.constBegin();
-          it != kdedirList.constEnd(); ++it)
-@@ -1680,11 +1636,7 @@ void KStandardDirs::addKDEDefaults()
-     }
-     else
-     {
--#ifdef Q_WS_MACX
--        localXdgDir =  QDir::homePath() + "/Library/Preferences/XDG/";
--#else
-         localXdgDir =  QDir::homePath() + "/.config/";
--#endif
-     }
- 
-     localXdgDir = KShell::tildeExpand(localXdgDir);
---- ./kinit/kinit.cpp.orig	2009-09-28 12:38:02 +0200
-+++ ./kinit/kinit.cpp	2009-09-28 12:40:02 +0200
-@@ -551,14 +551,7 @@ static pid_t launch(int argc, const char
-        QByteArray procTitle;
-        d.argv = (char **) malloc(sizeof(char *) * (argc+1));
-        d.argv[0] = (char *) _name;
--#ifdef Q_WS_MAC
--       QString argvexe = s_instance->dirs()->findExe(QString::fromLatin1(d.argv[0]));
--       if (!argvexe.isEmpty()) {
--          QByteArray cstr = argvexe.toLocal8Bit();
--          kDebug(7016) << "kdeinit4: launch() setting argv: " << cstr.data();
--          d.argv[0] = strdup(cstr.data());
--       }
--#endif
-+
-        for (int i = 1;  i < argc; i++)
-        {
-           d.argv[i] = (char *) args;
-@@ -627,12 +620,6 @@ static pid_t launch(int argc, const char
-         setup_tty( tty );
- 
-         QByteArray executable = execpath;
--#ifdef Q_WS_MAC
--        QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(executable));
--        if (!bundlepath.isEmpty())
--           executable = QFile::encodeName(bundlepath);
--#endif
--
-         if (!executable.isEmpty())
-            execvp(executable, d.argv);
- 
---- kdelibs-9999/kdecore/kernel/kstandarddirs.cpp.orig	2010-03-06 15:47:40.108111613 +0100
-+++ kdelibs-9999/kdecore/kernel/kstandarddirs.cpp	2010-03-06 23:17:01.853905357 +0100
-@@ -1207,41 +1207,8 @@
-     return exePaths;
- }
- 
--#ifdef Q_WS_MAC
--static QString getBundle( const QString& path, bool ignore )
--{
--    kDebug(180) << "getBundle(" << path << ", " << ignore << ") called";
--    QFileInfo info;
--    QString bundle = path;
--    bundle += ".app/Contents/MacOS/" + bundle.section('/', -1);
--    info.setFile( bundle );
--    FILE *file;
--    if (file = fopen(info.absoluteFilePath().toUtf8().constData(), "r")) {
--        fclose(file);
--        struct stat _stat;
--        if ((stat(info.absoluteFilePath().toUtf8().constData(), &_stat)) < 0) {
--            return QString();
--        }
--        if ( ignore || (_stat.st_mode & S_IXUSR) ) {
--            if ( ((_stat.st_mode & S_IFMT) == S_IFREG) || ((_stat.st_mode & S_IFMT) == S_IFLNK) ) {
--                kDebug(180) << "getBundle(): returning " << bundle;
--                return bundle;
--            }
--        }
--    }
--    return QString();
--}
--#endif
--
- static QString checkExecutable( const QString& path, bool ignoreExecBit )
- {
--#ifdef Q_WS_MAC
--    QString bundle = getBundle( path, ignoreExecBit );
--    if ( !bundle.isEmpty() ) {
--        //kDebug(180) << "findExe(): returning " << bundle;
--        return bundle;
--    }
--#endif
-     QFileInfo info( path );
-     QFileInfo orig = info;
- #if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch b/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch
deleted file mode 100644
index 80bcfc552a7a..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.0-kateacc.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur kdelibs-4.5.96.orig/kate/view/kateviewaccessible.h kdelibs-4.5.95/kate/view/kateviewaccessible.h
---- kdelibs-4.5.96.orig/kate/view/kateviewaccessible.h	2010-11-11 17:41:28.000000000 +0300
-+++ kdelibs-4.5.95/kate/view/kateviewaccessible.h	2011-01-11 11:37:15.288810505 +0300
-@@ -19,6 +19,7 @@
- 
- #ifndef _KATE_VIEW_ACCESSIBLE_
- #define _KATE_VIEW_ACCESSIBLE_
-+#ifndef QT_NO_ACCESSIBILITY
- 
- #include "kateviewinternal.h"
- #include "katetextcursor.h"
-@@ -318,3 +319,4 @@
- }
- 
- #endif
-+#endif
-diff -ur kdelibs-4.5.96.orig/kate/view/kateviewinternal.cpp kdelibs-4.5.95/kate/view/kateviewinternal.cpp
---- kdelibs-4.5.96.orig/kate/view/kateviewinternal.cpp	2010-12-03 17:57:05.000000000 +0300
-+++ kdelibs-4.5.95/kate/view/kateviewinternal.cpp	2011-01-11 11:36:51.968811481 +0300
-@@ -216,7 +216,9 @@
-   connect( m_view, SIGNAL( selectionChanged(KTextEditor::View*) ),
-              this, SLOT( viewSelectionChanged() ) );
- 
-+#ifndef QT_NO_ACCESSIBILITY
-   QAccessible::installFactory(accessibleInterfaceFactory);
-+#endif
- 
-   // update is called in KateView, after construction and layout is over
-   // but before any other kateviewinternal call
-@@ -224,7 +226,9 @@
- 
- KateViewInternal::~KateViewInternal ()
- {
-+#ifndef QT_NO_ACCESSIBILITY
-   QAccessible::removeFactory(accessibleInterfaceFactory);
-+#endif
- 
-   // kill preedit ranges
-   delete m_imPreeditRange;
-@@ -646,7 +650,9 @@
- 
-   m_madeVisible = !force;
- 
-+#ifndef QT_NO_ACCESSIBILITY
-   QAccessible::updateAccessibility( this, KateCursorAccessible::ChildId, QAccessible::Focus );
-+#endif
- }
- 
- void KateViewInternal::slotRegionVisibilityChangedAt(unsigned int,bool clear_cache)
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch b/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch
deleted file mode 100644
index c177b28b4c25..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.7.1-clearbutton.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-commit 07d20a558da67fb9f849e2b20c52cf275ea01794
-Author: Andrea Iacovitti <aiacovitti@libero.it>
-Date:   Sat Sep 17 10:12:04 2011 +0200
-
-    -Do not set WA_OpaquePaintEvent attribute for line edit clearButton
-     (should fix the not transparent background bug)
-    -Optimize a bit the code to enable/disable it
-    
-    BUG: 230024
-    CCBUG: 280226
-    FIXED-IN: 4.7.2
-
-diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
-index 715e182..c919b99 100644
---- a/kdeui/widgets/klineedit.cpp
-+++ b/kdeui/widgets/klineedit.cpp
-@@ -291,6 +291,7 @@ void KLineEdit::setClearButtonShown(bool show)
-         }
- 
-         d->clearButton = new KLineEditButton(this);
-+        d->clearButton->setObjectName("KLineEditButton");
-         d->clearButton->setCursor( Qt::ArrowCursor );
-         d->clearButton->setToolTip( i18nc( "@action:button Clear current text in the line edit", "Clear text" ) );
- 
-diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
-index 1db9b1a..28dbac3 100644
---- a/khtml/khtmlview.cpp
-+++ b/khtml/khtmlview.cpp
-@@ -1363,7 +1363,7 @@ void KHTMLView::mouseMoveEvent( QMouseEvent * _mouse )
-         if (kw && kw->m_kwp->isRedirected())
-             setCursor = false;
-         else if (QLineEdit* le = qobject_cast<QLineEdit*>(rw->widget())) {
--            QList<QWidget*> wl = qFindChildren<QWidget *>( le, "KHTMLLineEditButton" );
-+            QList<QWidget*> wl = qFindChildren<QWidget *>( le, "KLineEditButton" );
-             // force arrow cursor above lineedit clear button
-             foreach (QWidget*w, wl) {
-                 if (w->underMouse()) {
-@@ -1942,7 +1942,10 @@ static void handleWidget(QWidget* w, KHTMLView* view, bool recurse=true)
- 	w->setAttribute( Qt::WA_NoSystemBackground );
- 
-     w->setAttribute(Qt::WA_WState_InPaintEvent);
--    w->setAttribute(Qt::WA_OpaquePaintEvent);
-+
-+    if (!(w->objectName() == "KLineEditButton"))
-+        w->setAttribute(Qt::WA_OpaquePaintEvent);
-+
-     w->installEventFilter(view);
- 
-     if (!recurse)
-diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
-index 845db1a..3302920 100644
---- a/khtml/rendering/render_form.cpp
-+++ b/khtml/rendering/render_form.cpp
-@@ -1044,20 +1044,21 @@ void RenderLineEdit::setStyle(RenderStyle* _style)
-     RenderFormElement::setStyle( _style );
- 
-     widget()->setAlignment(textAlignment());
-+
-     bool showClearButton = (!shouldDisableNativeBorders() && !_style->hasBackgroundImage());
--    widget()->setClearButtonShown( showClearButton );
--    if (showClearButton) {
-+
-+    if (!showClearButton && widget()->isClearButtonShown()) {
-+        widget()->setClearButtonShown(false);
-+    }
-+    else if (showClearButton && !widget()->isClearButtonShown()) {
-+        widget()->setClearButtonShown(true);
-         QObjectList children = widget()->children();
-         foreach (QObject* object, children) {
-             QWidget *w = qobject_cast<QWidget*>(object);
--            if (w && !w->isWindow()) {
-+            if (w && !w->isWindow() && (w->objectName() == "KLineEditButton")) {
-                 // this duplicates KHTMLView's handleWidget but this widget
-                 // is created on demand, so it might not be here at ChildPolished time
--                w->setObjectName("KHTMLLineEditButton");
-                 w->installEventFilter(view());
--                w->setAttribute(Qt::WA_NoSystemBackground);
--                w->setAttribute(Qt::WA_WState_InPaintEvent);
--                w->setAttribute(Qt::WA_OpaquePaintEvent);
-             }
-         }
-     }
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.1-qlabel-1.patch b/kde-base/kdelibs/files/kdelibs-4.7.1-qlabel-1.patch
deleted file mode 100644
index 6d45bfb75b51..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.7.1-qlabel-1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/kio/kssl/ksslcertificatebox.cpp b/kio/kssl/ksslcertificatebox.cpp
-index 4ffc613..094787a 100644
---- a/kio/kssl/ksslcertificatebox.cpp
-+++ b/kio/kssl/ksslcertificatebox.cpp
-@@ -36,6 +36,10 @@ KSslCertificateBox::KSslCertificateBox(QWidget *parent)
-    d(new KSslCertificateBoxPrivate())
- {
-     d->ui.setupUi(this);
-+    // No fooling us with html tags
-+    Q_FOREACH(QLabel* label, qFindChildren<QLabel *>(this)) {
-+        label->setTextFormat(Qt::PlainText);
-+    }
- }
- 
- 
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.1-qlabel-2.patch b/kde-base/kdelibs/files/kdelibs-4.7.1-qlabel-2.patch
deleted file mode 100644
index 624a51eff63c..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.7.1-qlabel-2.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff --git a/kdecore/tests/kservicetest.cpp b/kdecore/tests/kservicetest.cpp
-index 7f3b737..747e11a 100644
---- a/kdecore/tests/kservicetest.cpp
-+++ b/kdecore/tests/kservicetest.cpp
-@@ -31,6 +31,7 @@
- 
- #include <kprotocolinfo.h>
- #include <kdebug.h>
-+#include <kprocess.h>
- #include <kservicegroup.h>
- #include <kservicetypetrader.h>
- #include <kservicetype.h>
-@@ -38,10 +39,23 @@
- 
- #include <QtCore/Q_PID>
- 
-+QTEST_KDEMAIN_CORE( KServiceTest )
-+
-+static void eraseProfiles()
-+{
-+    QString profilerc = KStandardDirs::locateLocal( "config", "profilerc" );
-+    if ( !profilerc.isEmpty() )
-+        QFile::remove( profilerc );
-+
-+    profilerc = KStandardDirs::locateLocal( "config", "servicetype_profilerc" );
-+    if ( !profilerc.isEmpty() )
-+        QFile::remove( profilerc );
-+}
-+
- void KServiceTest::initTestCase()
- {
-     // A non-C locale is necessary for some tests.
--    // This locale must have the follwing properties:
-+    // This locale must have the following properties:
-     //   - some character other than dot as decimal separator
-     // If it cannot be set, locale-dependent tests are skipped.
-     setlocale(LC_ALL, "fr_FR.utf8");
-@@ -50,16 +64,8 @@ void KServiceTest::initTestCase()
-         kDebug() << "Setting locale to fr_FR.utf8 failed";
-     }
- 
--    QString profilerc = KStandardDirs::locateLocal( "config", "profilerc" );
--    if ( !profilerc.isEmpty() )
--        QFile::remove( profilerc );
--
--    profilerc = KStandardDirs::locateLocal( "config", "servicetype_profilerc" );
--    if ( !profilerc.isEmpty() )
--        QFile::remove( profilerc );
--
-     m_hasKde4Konsole = false;
--
-+    eraseProfiles();
- 
-     // Create some fake services for the tests below, and ensure they are in ksycoca.
- 
-@@ -111,10 +117,23 @@ void KServiceTest::initTestCase()
-         QVERIFY(QTest::kWaitForSignal(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), 10000));
-         kDebug() << "got signal";
-     }
--
- }
- 
--QTEST_KDEMAIN_CORE( KServiceTest )
-+void KServiceTest::cleanupTestCase()
-+{
-+    // If I want the konqueror unit tests to work, then I better not have a non-working part
-+    // as the preferred part for text/plain...
-+    QStringList services; services << "fakeservice.desktop" << "fakepart.desktop" << "faketextplugin.desktop";
-+    Q_FOREACH(const QString& service, services) {
-+        const QString fakeService = KStandardDirs::locateLocal("services", service);
-+        QFile::remove(fakeService);
-+    }
-+    //QProcess::execute( KGlobal::dirs()->findExe(KBUILDSYCOCA_EXENAME) );
-+    KProcess proc;
-+    proc << KStandardDirs::findExe(KBUILDSYCOCA_EXENAME);
-+    proc.setOutputChannelMode(KProcess::MergedChannels); // silence kbuildsycoca output
-+    proc.execute();
-+}
- 
- void KServiceTest::testByName()
- {
-diff --git a/kdecore/tests/kservicetest.h b/kdecore/tests/kservicetest.h
-index 18bddd9..ffab302 100644
---- a/kdecore/tests/kservicetest.h
-+++ b/kdecore/tests/kservicetest.h
-@@ -28,6 +28,7 @@ public:
-     KServiceTest() : m_sycocaUpdateDone(0) {}
- private Q_SLOTS:
-     void initTestCase();
-+    void cleanupTestCase();
-     void testByName();
-     void testProperty();
-     void testAllServiceTypes();
-diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
-index 6d41a13..3009ff1 100644
---- a/kioslave/http/http.cpp
-+++ b/kioslave/http/http.cpp
-@@ -86,6 +86,27 @@
- //string parsing helpers and HeaderTokenizer implementation
- #include "parsinghelpers.cpp"
- 
-+// KDE5 TODO (QT5) : use QString::htmlEscape or whatever https://qt.gitorious.org/qt/qtbase/merge_requests/56
-+// ends up with.
-+static QString htmlEscape(const QString &plain)
-+{
-+    QString rich;
-+    rich.reserve(int(plain.length() * 1.1));
-+        for (int i = 0; i < plain.length(); ++i) {
-+        if (plain.at(i) == QLatin1Char('<'))
-+            rich += QLatin1String("&lt;");
-+        else if (plain.at(i) == QLatin1Char('>'))
-+            rich += QLatin1String("&gt;");
-+        else if (plain.at(i) == QLatin1Char('&'))
-+            rich += QLatin1String("&amp;");
-+        else if (plain.at(i) == QLatin1Char('"'))
-+            rich += QLatin1String("&quot;");
-+        else
-+            rich += plain.at(i);
-+    }
-+    rich.squeeze();
-+    return rich;
-+}
- 
- // see filenameFromUrl(): a sha1 hash is 160 bits
- static const int s_hashedUrlBits = 160;   // this number should always be divisible by eight
-@@ -3431,7 +3452,7 @@ endParsing:
-                                 authinfo.url = reqUrl;
-                                 authinfo.keepPassword = true;
-                                 authinfo.comment = i18n("<b>%1</b> at <b>%2</b>",
--                                                        authinfo.realmValue, authinfo.url.host());
-+                                                        htmlEscape(authinfo.realmValue), authinfo.url.host());
- 
-                                 if (!openPasswordDialog(authinfo, errorMsg)) {
-                                     if (sendErrorPageNotification()) {
-@@ -5262,7 +5283,7 @@ void HTTPProtocol::proxyAuthenticationForSocket(const QNetworkProxy &proxy, QAut
-                            "to access any sites.");
-         info.keepPassword = true;
-         info.commentLabel = i18n("Proxy:");
--        info.comment = i18n("<b>%1</b> at <b>%2</b>", info.realmValue, m_request.proxyUrl.host());
-+        info.comment = i18n("<b>%1</b> at <b>%2</b>", htmlEscape(info.realmValue), m_request.proxyUrl.host());
-         const bool dataEntered = openPasswordDialog(info, i18n("Proxy Authentication Failed."));
-         if (!dataEntered) {
-             kDebug(7103) << "looks like the user canceled proxy authentication.";
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.2-nepomuk-unicode.patch b/kde-base/kdelibs/files/kdelibs-4.7.2-nepomuk-unicode.patch
deleted file mode 100644
index 819a429304ee..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.7.2-nepomuk-unicode.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h
-index 055482e..3880e13 100644
---- a/nepomuk/query/querybuilderdata_p.h
-+++ b/nepomuk/query/querybuilderdata_p.h
-@@ -32,6 +32,28 @@
- #include "query_p.h"
- #include "groupterm_p.h"
- 
-+namespace {
-+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle
-+/// utf8 chars which use more than one char, ie. wide chars.
-+/// Thus, we simply truncate each term at the first wide char.
-+QStringList stripExtendedCharsHack(const QStringList& terms) {
-+    QStringList newTerms;
-+    foreach(const QString& term, terms) {
-+        int i = 0;
-+        while(i < term.length()) {
-+            if(term[i].unicode() > 0x7f) {
-+                break;
-+            }
-+            ++i;
-+        }
-+        if(i > 0) {
-+            newTerms.append(term.left(i));
-+        }
-+    }
-+    return newTerms;
-+}
-+}
-+
- namespace Nepomuk {
-     namespace Query {
-         class QueryBuilderData
-@@ -246,16 +268,23 @@ namespace Nepomuk {
-                     for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin();
-                          it != m_fullTextSearchTerms.constEnd(); ++it ) {
-                         const QString& varName = it.key();
--                        const QStringList& terms = it.value();
--                        // bif:search_excerpt wants a vector of all search terms
--                        excerptParts
--                                << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)")
--                            .arg( terms.join(QLatin1String("','")),
--                                  varName );
-+                        const QStringList terms = stripExtendedCharsHack(it.value());
-+                        if(terms.count()) {
-+                            // bif:search_excerpt wants a vector of all search terms
-+                            excerptParts
-+                                    << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)")
-+                                       .arg( terms.join(QLatin1String("','")),
-+                                             varName );
-+                        }
-                     }
- 
--                    return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
--                        .arg(excerptParts.join(QLatin1String(",")));
-+                    if(excerptParts.count()) {
-+                        return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_")
-+                                .arg(excerptParts.join(QLatin1String(",")));
-+                    }
-+                    else {
-+                        return QString();
-+                    }
-                 }
-                 else {
-                     return QString();