Remove old.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

9 files changed, 9 insertions, 593 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 9655029c3750..552e91f52951 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.826 2012/02/21 12:52:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.827 2012/02/21 14:03:03 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/kdelibs-4.6.2-nonepomuk.patch, -files/kdelibs-4.6.3-doublepost.patch,
+  -files/kdelibs-4.6.3-use_QWeakPointer.patch,
+  -files/kdelibs-4.6.5-cardinality.patch, -files/kdelibs-4.6.5-qlabel-1.patch,
+  -files/kdelibs-4.6.5-qlabel-2.patch, -files/kdelibs-4.7.1-libpng15.patch,
+  -files/kdelibs-4.7.3-customcont.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -kdelibs-4.6.3-r3.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.2-nonepomuk.patch b/kde-base/kdelibs/files/kdelibs-4.6.2-nonepomuk.patch
deleted file mode 100644
index 2e34050b1413..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.2-nonepomuk.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urNp kdelibs-4.6.1.org/kparts/CMakeLists.txt kdelibs-4.6.1/kparts/CMakeLists.txt
---- kdelibs-4.6.1.org/kparts/CMakeLists.txt	2011-02-25 23:53:31.000000000 +0200
-+++ kdelibs-4.6.1/kparts/CMakeLists.txt	2011-04-02 00:41:54.884508059 +0300
-@@ -2,7 +2,10 @@ project(kparts)
- 
- add_subdirectory( tests )
- 
--include_directories(${KDE4_KIO_INCLUDES} ${kparts_BINARY_DIR} ${nepomuk_SOURCE_DIR} ${nepomuk_SOURCE_DIR}/core ${nepomuk_SOURCE_DIR}/types)
-+include_directories(${KDE4_KIO_INCLUDES} ${kparts_BINARY_DIR})
-+if(HAVE_NEPOMUK)
-+include_directories(${nepomuk_SOURCE_DIR} ${nepomuk_SOURCE_DIR}/core ${nepomuk_SOURCE_DIR}/types)
-+endif(HAVE_NEPOMUK)
- if(Soprano_FOUND)
- include_directories(${SOPRANO_INCLUDE_DIR})
- endif(Soprano_FOUND)
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-doublepost.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-doublepost.patch
deleted file mode 100644
index 2672d65db138..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.3-doublepost.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 92db24adfa941003db1d885df01157056617f30b
-Author: Maks Orlovich <maksim@kde.org>
-Date:   Sun May 8 14:39:03 2011 -0400
-
-    Fix the job-on-hold reuse logic, which caused the double-POST problem)
-    
-    adawit, could you please at least READ what you're backporting if you are
-    going to be this aggressive? Or better yet, please don't backport anything
-    that's not fixing a critical bug or is trivial, as per:
-    http://techbase.kde.org/Policies/Minor_Point_Release_Policy
-    
-    CCMAIL: adawit@kde.org
-    BUG: 272466
-
-diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
-index 55da053..9f5607e 100644
---- a/kio/kio/scheduler.cpp
-+++ b/kio/kio/scheduler.cpp
-@@ -1151,7 +1151,7 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job)
-         bool canJobReuse = (cmd == CMD_GET || cmd == CMD_MULTI_GET);
- 
-         if (KIO::TransferJob *tJob = qobject_cast<KIO::TransferJob *>(job)) {
--            canJobReuse = cmd == (canJobReuse || cmd == CMD_SPECIAL);
-+            canJobReuse = (canJobReuse || cmd == CMD_SPECIAL);
-             if (canJobReuse) {
-                 KIO::MetaData outgoing = tJob->outgoingMetaData();
-                 const QString resume = outgoing.value("resume");
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.3-use_QWeakPointer.patch b/kde-base/kdelibs/files/kdelibs-4.6.3-use_QWeakPointer.patch
deleted file mode 100644
index 718c466bb48c..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.3-use_QWeakPointer.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From: Aaron Seigo <aseigo@kde.org>
-Date: Fri, 06 May 2011 13:19:09 +0000
-Subject: use a QWeakPointer on the KIconLoader passed in as there are no lifetime guarantees
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=a8d16682c31ef523ffebba6e19283a19cd5f5627
----
-use a QWeakPointer on the KIconLoader passed in as there are no lifetime guarantees
-
-usually KGlobal::iconLoader() is used, so this isn't an issue seen very often.
-however, when a local KIconLoader is created, it is easy to get QIcons with a
-KIconEngine that has a bad KIconLoader pointer in them. particularly as QIcon
-is implicitly shared and easily passed around. the StatusNotifier Plasma DataEngine
-was triggering this, though it would be trivial to run into this problem again
-anytime a KIconLoader is created locally
-
-thankfully, QWeakPointer does the job and is very fast and light. (confirmed
-both with my own testing and confirmation from Thiago).
-
-massive thanks to Michael Pyne for detecting the cause of the problem via Valgrind.
-
-BUG:258706
----
-
-
---- a/kdeui/icons/kiconengine.cpp
-+++ b/kdeui/icons/kiconengine.cpp
-@@ -27,16 +27,16 @@
- 
- 
- KIconEngine::KIconEngine(const QString& iconName, KIconLoader* iconLoader, const QStringList& overlays)
-+    : mIconName(iconName),
-+      mIconLoader(iconLoader),
-+      mOverlays(overlays)
- {
--    mIconName = iconName;
--    mIconLoader = iconLoader;
--    mOverlays = overlays;
- }
- 
- KIconEngine::KIconEngine(const QString& iconName, KIconLoader* iconLoader)
-+    : mIconName(iconName),
-+      mIconLoader(iconLoader)
- {
--    mIconName = iconName;
--    mIconLoader = iconLoader;
- }
- 
- static inline int qIconModeToKIconState( QIcon::Mode mode )
-@@ -65,8 +65,12 @@ QSize KIconEngine::actualSize( const QSi
-     return QSize(iconSize, iconSize);
- }
- 
--void KIconEngine::paint( QPainter * painter, const QRect & rect, QIcon::Mode mode, QIcon::State state )
-+void KIconEngine::paint(QPainter * painter, const QRect & rect, QIcon::Mode mode, QIcon::State state)
- {
-+    if (!mIconLoader) {
-+        return;
-+    }
-+
-     Q_UNUSED(state)
- 
-     const int kstate = qIconModeToKIconState(mode);
-@@ -80,20 +84,27 @@ void KIconEngine::paint( QPainter * pain
-     }
- 
-     const int iconSize = qMin(rect.width(), rect.height());
--    const QPixmap pix = mIconLoader->loadIcon(mIconName, group, iconSize, kstate, mOverlays);
-+    const QPixmap pix = mIconLoader.data()->loadIcon(mIconName, group, iconSize, kstate, mOverlays);
-     painter->drawPixmap(rect, pix);
- }
- 
--QPixmap KIconEngine::pixmap( const QSize & size, QIcon::Mode mode, QIcon::State state )
-+QPixmap KIconEngine::pixmap(const QSize & size, QIcon::Mode mode, QIcon::State state)
- {
-     Q_UNUSED(state)
- 
-+    if (!mIconLoader) {
-+        QPixmap pm(size);
-+        pm.fill(Qt::transparent);
-+        return pm;
-+    }
-+
-     const int kstate = qIconModeToKIconState(mode);
-     const int iconSize = qMin(size.width(), size.height());
--    QPixmap pix = mIconLoader->loadIcon(mIconName, KIconLoader::Desktop, iconSize, kstate, mOverlays);
-+    QPixmap pix = mIconLoader.data()->loadIcon(mIconName, KIconLoader::Desktop, iconSize, kstate, mOverlays);
- 
--    if(pix.size() == size)
-+    if (pix.size() == size) {
-         return pix;
-+    }
- 
-     QPixmap pix2(size);
-     pix2.fill(QColor(0,0,0,0));
-@@ -111,7 +122,7 @@ QString KIconEngine::key() const
- 
- QIconEngineV2 *KIconEngine::clone() const
- {
--    return new KIconEngine(mIconName, mIconLoader, mOverlays);
-+    return new KIconEngine(mIconName, mIconLoader.data(), mOverlays);
- }
- 
- bool KIconEngine::read(QDataStream &in)
-
---- a/kdeui/icons/kiconengine_p.h
-+++ b/kdeui/icons/kiconengine_p.h
-@@ -75,7 +75,7 @@ class KIconEngine : public QIconEngineV2
-   private:
-     QString mIconName;
-     QStringList mOverlays;
--    KIconLoader* mIconLoader;
-+    QWeakPointer<KIconLoader> mIconLoader;
- };
- 
- inline KIconEngine::~KIconEngine()
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.5-cardinality.patch b/kde-base/kdelibs/files/kdelibs-4.6.5-cardinality.patch
deleted file mode 100644
index cb892aec6a87..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.5-cardinality.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-commit 1f796983aa8385da77f30813041b40e208c17391
-Author: Vishesh Handa <handa.vish@gmail.com>
-Date:   Thu May 19 20:52:30 2011 +0530
-
-    Make KDEPIM 4.6 compile with master
-    
-    This makes the rcgen produce add/setProperty( QList<T> ) functions for
-    properties with nrl:maxCardinality and nrl:cardinality = 1. This was
-    required because with SDO 0.7 the cardinalities of many properties
-    have been set.
-    
-    BUG: 268595
-
-diff --git a/nepomuk/rcgen/codegenerator.cpp b/nepomuk/rcgen/codegenerator.cpp
-index bc670e6..1bb2736 100644
---- a/nepomuk/rcgen/codegenerator.cpp
-+++ b/nepomuk/rcgen/codegenerator.cpp
-@@ -194,33 +194,28 @@ bool CodeGenerator::writeHeader( const ResourceClass *resourceClass, QTextStream
-     while( it.hasNext() ) {
-         const Property* p = it.next();
- 
--        if( p->literalRange().isEmpty() &&
--            !p->range() ) {
--            if ( !quiet )
--                qDebug() << "(CodeGenerator::writeSource) type not defined for property: " << p->name() << endl;
--            continue;
--        }
--
--        if ( m_mode == SafeMode ) {
--            ms << writeComment( QString("Get property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl;
--            ms << "        " << m_code->propertyGetterDeclaration( p, resourceClass ) << ";" << endl;
--            ms << endl;
-+        if( p->maxCardinality() == 1 || p->cardinality() == 1 ) {
-+            Property * prop = const_cast<Property *>(p);
-+            bool isList = prop->isList();
-+            
-+            prop->setIsList( true );
-+            if( !writePropertyHeader( prop, resourceClass, ms ) )
-+                continue;
-+            
-+            prop->setIsList( false );
-+            if( !writePropertyHeader( prop, resourceClass, ms ) )
-+                continue;
-+            
-+            writePropertyUriHeader( prop, ms );
-+            
-+            prop->setIsList( isList );
-         }
--
--        ms << writeComment( QString("Set property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl;
--        ms << "        " << m_code->propertySetterDeclaration( p, resourceClass ) << ";" << endl;
--        ms << endl;
--
--        if( p->isList() ) {
--            ms << writeComment( QString("Add a value to property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl;
--            ms << "        " << m_code->propertyAdderDeclaration( p, resourceClass ) << ";" << endl;
--            ms << endl;
-+        else {
-+            if( !writePropertyHeader( p, resourceClass, ms ) )
-+                continue;
-+            writePropertyUriHeader( p, ms );
-         }
--
--        ms << writeComment( QString( "\\return The URI of the property '%1'." ).arg( p->name() ), 2*4 ) << endl;
--        ms << "        " << "static QUrl " << p->name()[0].toLower() << p->name().mid(1) << "Uri();" << endl;
--        ms << endl;
--
-+        
-         if( !p->hasSimpleType() )
-             includes.insert( p->typeString( true ) );
-     }
-@@ -299,6 +294,42 @@ bool CodeGenerator::writeHeader( const ResourceClass *resourceClass, QTextStream
-     return true;
- }
- 
-+bool CodeGenerator::writePropertyHeader(const Property* p, const ResourceClass* resourceClass, QTextStream& ms) const
-+{
-+    if( p->literalRange().isEmpty() &&
-+        !p->range() ) {
-+        if ( !quiet )
-+            qDebug() << "(CodeGenerator::writeSource) type not defined for property: " << p->name() << endl;
-+        return false;
-+    }
-+        
-+    if ( m_mode == SafeMode ) {
-+        ms << writeComment( QString("Get property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl;
-+        ms << "        " << m_code->propertyGetterDeclaration( p, resourceClass ) << ";" << endl;
-+        ms << endl;
-+    }
-+    
-+    ms << writeComment( QString("Set property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl;
-+    ms << "        " << m_code->propertySetterDeclaration( p, resourceClass ) << ";" << endl;
-+    ms << endl;
-+    
-+    if( p->isList() ) {
-+        ms << writeComment( QString("Add a value to property '%1'. ").arg(p->name()) + p->comment(), 2*4 ) << endl;
-+        ms << "        " << m_code->propertyAdderDeclaration( p, resourceClass ) << ";" << endl;
-+        ms << endl;
-+    }
-+    
-+    return true;
-+}
-+
-+void CodeGenerator::writePropertyUriHeader(const Property* p, QTextStream& ts) const
-+{
-+    ts << writeComment( QString( "\\return The URI of the property '%1'." ).arg( p->name() ), 2*4 ) << endl;
-+    ts << "        " << "static QUrl " << p->name()[0].toLower() << p->name().mid(1) << "Uri();" << endl;
-+    ts << endl;
-+}
-+
-+
- bool CodeGenerator::writeSource( const ResourceClass* resourceClass, QTextStream& stream ) const
- {
-     QString s = sourceTemplate( m_mode );
-@@ -318,29 +349,31 @@ bool CodeGenerator::writeSource( const ResourceClass* resourceClass, QTextStream
-     while( it.hasNext() ) {
-         const Property* p = it.next();
- 
--        if( p->literalRange().isEmpty() &&
--            !p->range() ) {
--            if ( !quiet )
--                qDebug() << "(CodeGenerator::writeSource) type not defined for property: " << p->name() << endl;
--            continue;
-+        if( p->maxCardinality() == 1 || p->cardinality() == 1 ) {
-+            Property * prop = const_cast<Property *>(p);
-+            bool isList = prop->isList();
-+            
-+            prop->setIsList( true );
-+            if( !writePropertySource( prop, resourceClass, ms ) )
-+                continue;
-+            
-+            prop->setIsList( false );
-+            if( !writePropertySource( prop, resourceClass, ms ) )
-+                continue;
-+            
-+            writePropertyUriSource( prop, resourceClass, ms );
-+            
-+            prop->setIsList( isList );
-         }
--
-+        else {
-+            if( !writePropertySource( p, resourceClass, ms ) )
-+                continue;
-+            writePropertyUriSource( p, resourceClass, ms );
-+        }
-+        
-         if ( !p->hasSimpleType() ) {
-             includes.append( QString( "#include \"%1.h\"" ).arg( p->typeString( true ).toLower() ) );
-         }
--
--        if ( m_mode == SafeMode )
--            ms << m_code->propertyGetterDefinition( p, resourceClass ) << endl;
--
--        ms << m_code->propertySetterDefinition( p, resourceClass ) << endl;
--        if( p->isList() )
--            ms << m_code->propertyAdderDefinition( p, resourceClass ) << endl;
--
--        // write the static method that returns the property's Uri
--        ms << "QUrl " << resourceClass->name( m_nameSpace ) << "::" << p->name()[0].toLower() << p->name().mid(1) << "Uri()" << endl
--           << "{" << endl
--           << "    return QUrl::fromEncoded(\"" << p->uri().toString() << "\");" << endl
--           << "}" << endl << endl;
-     }
- 
-     it = resourceClass->allReverseProperties();
-@@ -395,6 +428,32 @@ bool CodeGenerator::writeSource( const ResourceClass* resourceClass, QTextStream
-     return true;
- }
- 
-+bool CodeGenerator::writePropertySource(const Property* p, const ResourceClass* resourceClass, QTextStream& ms) const
-+{
-+    if( p->literalRange().isEmpty() && !p->range() ) {
-+        if ( !quiet )
-+            qDebug() << "(CodeGenerator::writeSource) type not defined for property: " << p->name() << endl;
-+        return false;
-+    }
-+
-+    if ( m_mode == SafeMode )
-+        ms << m_code->propertyGetterDefinition( p, resourceClass ) << endl;
-+
-+    ms << m_code->propertySetterDefinition( p, resourceClass ) << endl;
-+    if( p->isList() )
-+        ms << m_code->propertyAdderDefinition( p, resourceClass ) << endl;
-+
-+    return true;
-+}
-+
-+void CodeGenerator::writePropertyUriSource(const Property* p, const ResourceClass* resourceClass, QTextStream& ts) const
-+{
-+    // write the static method that returns the property's Uri
-+    ts << "QUrl " << resourceClass->name( m_nameSpace ) << "::" << p->name()[0].toLower() << p->name().mid(1) << "Uri()" << endl
-+       << "{" << endl
-+       << "    return QUrl::fromEncoded(\"" << p->uri().toString() << "\");" << endl
-+       << "}" << endl << endl;
-+}
- 
- bool CodeGenerator::writeSources( const QString& dir )
- {
-diff --git a/nepomuk/rcgen/codegenerator.h b/nepomuk/rcgen/codegenerator.h
-index dc786a4..f26a875 100644
---- a/nepomuk/rcgen/codegenerator.h
-+++ b/nepomuk/rcgen/codegenerator.h
-@@ -22,6 +22,7 @@ class AbstractCode;
- class ResourceClass;
- class QString;
- class QTextStream;
-+class Property;
- 
- class CodeGenerator
- {
-@@ -47,7 +48,13 @@ private:
-     bool writeHeader( const ResourceClass* resourceClass, QTextStream& ) const;
-     bool writeSource( const ResourceClass* resourceClass, QTextStream& ) const;
-     bool writeDummyClasses( const QString &folder ) const;
-+    
-+    bool writePropertyHeader( const Property* p, const ResourceClass* resourceClass, QTextStream& ms ) const;
-+    bool writePropertySource( const Property* p, const ResourceClass* resourceClass, QTextStream& ms ) const;
- 
-+    void writePropertyUriHeader( const Property* p, QTextStream& ts ) const;
-+    void writePropertyUriSource( const Property* p, const ResourceClass* resourceClass, QTextStream& ts ) const;
-+    
-     QString visibilityHeader() const;
-     QString visibilityExportMacro() const;
- 
-diff --git a/nepomuk/rcgen/ontologyparser.cpp b/nepomuk/rcgen/ontologyparser.cpp
-index 50e3397..f9f8673 100644
---- a/nepomuk/rcgen/ontologyparser.cpp
-+++ b/nepomuk/rcgen/ontologyparser.cpp
-@@ -164,7 +164,14 @@ bool OntologyParser::parse( const QString& filename, const QString& serializatio
-         }
-         else if( s.predicate().uri() == Soprano::Vocabulary::NRL::maxCardinality() ||
-                  s.predicate().uri() == Soprano::Vocabulary::NRL::cardinality() ) {
--            d->getProperty(s.subject().uri())->setIsList( s.object().literal().toInt() > 1 );
-+            Property * p = d->getProperty(s.subject().uri());
-+            int cValue = s.object().literal().toInt();
-+            
-+            p->setIsList( cValue > 1 );
-+            if( s.predicate().uri() == Soprano::Vocabulary::NRL::maxCardinality() )
-+                p->setMaxCardinality( cValue );
-+            else
-+                p->setCardinality( cValue );
-         }
-         else if( s.predicate().uri() == Soprano::Vocabulary::RDFS::comment() ) {
-             d->comments[s.subject().uri()] = s.object().literal().toString();
-diff --git a/nepomuk/rcgen/property.cpp b/nepomuk/rcgen/property.cpp
-index 1baa04c..51d9c07 100644
---- a/nepomuk/rcgen/property.cpp
-+++ b/nepomuk/rcgen/property.cpp
-@@ -27,7 +27,9 @@ Property::Property()
-     : m_range( 0 ),
-       m_isList( true ),
-       m_domain( 0 ),
--      m_inverseProperty( 0 )
-+      m_inverseProperty( 0 ),
-+      m_maxCardinality( -1 ),
-+      m_cardinality( -1 )
- {
- }
- 
-@@ -204,3 +206,24 @@ QString Property::literalTypeConversionMethod() const
- 
-     return QString();
- }
-+
-+void Property::setMaxCardinality(int value)
-+{
-+    m_maxCardinality = value;
-+}
-+
-+int Property::maxCardinality() const
-+{
-+    return m_maxCardinality;
-+}
-+
-+int Property::cardinality() const
-+{
-+    return m_cardinality;
-+}
-+
-+void Property::setCardinality(int value)
-+{
-+    m_cardinality = value;
-+}
-+
-diff --git a/nepomuk/rcgen/property.h b/nepomuk/rcgen/property.h
-index a72ab5d..a09006d 100644
---- a/nepomuk/rcgen/property.h
-+++ b/nepomuk/rcgen/property.h
-@@ -139,6 +139,25 @@ public:
-      */
-     bool hasSimpleType() const;
- 
-+    /**
-+     * Sets the max cardinality of the property
-+     */
-+    void setMaxCardinality( int value );
-+
-+    /**
-+     * Returns the max cardinality of the property
-+     */
-+    int maxCardinality() const;
-+
-+    /**
-+     * Sets the cardinality of the property
-+     */
-+    void setCardinality( int value );
-+
-+    /**
-+     * Returns the cardinality of the property
-+     */
-+    int cardinality() const;
- private:
-     QUrl m_uri;
-     ResourceClass* m_range;
-@@ -147,6 +166,8 @@ private:
-     bool m_isList;
-     ResourceClass* m_domain;
-     Property* m_inverseProperty;
-+    int m_maxCardinality;
-+    int m_cardinality;
- };
- 
- #endif
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.5-qlabel-1.patch b/kde-base/kdelibs/files/kdelibs-4.6.5-qlabel-1.patch
deleted file mode 100644
index 6d45bfb75b51..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.5-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.6.5-qlabel-2.patch b/kde-base/kdelibs/files/kdelibs-4.6.5-qlabel-2.patch
deleted file mode 100644
index f0d5ac9ea371..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.5-qlabel-2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
-index 33f4cb1..6447a02 100644
---- a/kioslave/http/http.cpp
-+++ b/kioslave/http/http.cpp
-@@ -99,6 +99,27 @@
- //authentication handlers
- #include "httpauthentication.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
-@@ -3410,7 +3431,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()) {
-@@ -5122,7 +5143,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.1-libpng15.patch b/kde-base/kdelibs/files/kdelibs-4.7.1-libpng15.patch
deleted file mode 100644
index 7fd52d9cc321..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.7.1-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-4.7.1/khtml/imload/decoders/pngloader.cpp
-+++ kdelibs-4.7.1/khtml/imload/decoders/pngloader.cpp
-@@ -198,7 +198,7 @@
-     {
-         if (interlaced)
-         {
--            Q_ASSERT(pngReadStruct->row_info.pixel_depth <= depth * 8);
-+            //Q_ASSERT(pngReadStruct->row_info.pixel_depth <= depth * 8);
-             requestScanline(rowNum, scanlineBuf);
-             png_progressive_combine_row(pngReadStruct, scanlineBuf, data);
-             notifyScanline(pass + 1, scanlineBuf);
diff --git a/kde-base/kdelibs/files/kdelibs-4.7.3-customcont.patch b/kde-base/kdelibs/files/kdelibs-4.7.3-customcont.patch
deleted file mode 100644
index 74a1a93c6b48..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.7.3-customcont.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 5aad39dbb324aad4cac3f44967ee1fc1b3d2a168
-Author: Aaron Seigo <aseigo@kde.org>
-Date:   Sun Nov 20 18:50:41 2011 +0100
-
-    don't count custom panel contaiments (e.g. the grouping desktop) the same as a desktop containment
-    
-    from the "useful things missing from bug reports" and "wondering wtf is wrong with people
-    while trying to get the useful bits out of a bug report" files ...
-    
-    BUG:260360
-
-diff --git a/plasma/containment.cpp b/plasma/containment.cpp
-index 00a8a77..9e3a505 100644
---- a/plasma/containment.cpp
-+++ b/plasma/containment.cpp
-@@ -987,7 +987,9 @@ void ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventIn
-     //kDebug() << activity() << "setting screen to " << newScreen << newDesktop << "and type is" << type;
- 
-     Containment *swapScreensWith(0);
--    if (type == Containment::DesktopContainment || type >= Containment::CustomContainment) {
-+    const bool isDesktopContainment = type == Containment::DesktopContainment ||
-+                                      type == Containment::CustomContainment;
-+    if (isDesktopContainment) {
-         // we want to listen to changes in work area if our screen changes
-         if (toolBox) {
-             if (screen < 0 && newScreen > -1) {
-@@ -1011,8 +1013,7 @@ void ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventIn
-         }
-     }
- 
--    if (newScreen < numScreens && newScreen > -1 &&
--        (type == Containment::DesktopContainment || type >= Containment::CustomContainment)) {
-+    if (newScreen < numScreens && newScreen > -1 && isDesktopContainment) {
-         q->resize(corona->screenGeometry(newScreen).size());
-     }
-