kde-apps/kimap: Remove dependency on kde-frameworks/kdelibs4support

Package-Manager: portage-2.2.20.1

3 files changed, 86 insertions, 0 deletions

diff --git a/kde-apps/kimap/files/kimap-15.08.0-remove-kdelibs4support.patch b/kde-apps/kimap/files/kimap-15.08.0-remove-kdelibs4support.patch
new file mode 100644
index 0000000000..821f38d7fb
--- /dev/null
+++ b/kde-apps/kimap/files/kimap-15.08.0-remove-kdelibs4support.patch
@@ -0,0 +1,78 @@
+commit bf73c02636b55197e7c7ff870739c98cb200ef1a
+Author: Volker Krause <vkrause@kde.org>
+Date:   Fri Sep 4 15:45:29 2015 +0200
+
+    Remove KDELibs4Support dependency.
+
+commit ce575030415015c38d3e035b9bc507b9d4ae5a72
+Author: Volker Krause <vkrause@kde.org>
+Date:   Fri Sep 4 15:44:41 2015 +0200
+
+    Port away from deprecated Qt methods.
+    
+    Those are not available once we remove the KDELibs4Support dependency.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d2beff4..c4af8c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,8 @@ ecm_setup_version(${KIMAP_LIB_VERSION} VARIABLE_PREFIX KIMAP
+ 
+ ########### Find packages ###########
+ find_package(KF5CoreAddons ${KF5_VERSION} CONFIG REQUIRED)
+-find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
++find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
++find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
+ 
+ find_package(KF5Mime ${KMIME_LIBS_VERSION} CONFIG REQUIRED)
+ 
+diff --git a/autotests/kimaptest/sslserver.cpp b/autotests/kimaptest/sslserver.cpp
+index b4bd7d0..98e83d5 100644
+--- a/autotests/kimaptest/sslserver.cpp
++++ b/autotests/kimaptest/sslserver.cpp
+@@ -77,7 +77,9 @@ void SslServer::incomingConnection(qintptr handle)
+ 
+     QSslKey ssl_key(staticKey(), QSsl::Rsa);
+     QSslCertificate ssl_cert(staticCert());
+-    Q_ASSERT(ssl_cert.isValid());
++    Q_ASSERT(QDateTime::currentDateTime() >= ssl_cert.effectiveDate());
++    Q_ASSERT(QDateTime::currentDateTime() <= ssl_cert.expiryDate());
++    Q_ASSERT(!ssl_cert.isBlacklisted());
+ 
+     socket->setPrivateKey(ssl_key);
+     socket->setLocalCertificate(ssl_cert);
+@@ -86,7 +88,7 @@ void SslServer::incomingConnection(qintptr handle)
+     socket->ignoreSslErrors();
+     connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(sslErrors(QList<QSslError>)));
+     connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(error(QAbstractSocket::SocketError)));
+-    if (mProtocol != QSsl::TlsV1) {
++    if (mProtocol != QSsl::TlsV1_0) {
+         socket->startServerEncryption();
+     }
+     addPendingConnection(socket);
+diff --git a/autotests/kimaptest/sslserver.h b/autotests/kimaptest/sslserver.h
+index 0ecd9fd..e714f38 100644
+--- a/autotests/kimaptest/sslserver.h
++++ b/autotests/kimaptest/sslserver.h
+@@ -29,7 +29,7 @@ public:
+     SslServer(QSsl::SslProtocol);
+     virtual void incomingConnection(qintptr handle) Q_DECL_OVERRIDE;
+ 
+-private slots:
++private Q_SLOTS:
+     void sslErrors(const QList<QSslError> &errors);
+     void error(QAbstractSocket::SocketError);
+ 
+diff --git a/src/appendjob.cpp b/src/appendjob.cpp
+index 4d72903..8584c0e 100644
+--- a/src/appendjob.cpp
++++ b/src/appendjob.cpp
+@@ -124,7 +124,7 @@ void AppendJob::doStart()
+ 
+     if (!d->internalDate.isNull()) {
+         const QDateTime utcDateTime = d->internalDate.toUTC();
+-        parameters += " \"" + utcDateTime.toString(QString::fromAscii("dd-MMM-yyyy hh:mm:ss")).toLatin1() + " +0000" + '\"';
++        parameters += " \"" + utcDateTime.toString(QStringLiteral("dd-MMM-yyyy hh:mm:ss")).toLatin1() + " +0000" + '\"';
+     }
+ 
+     parameters += " {" + QByteArray::number(d->content.size()) + '}';
diff --git a/kde-apps/kimap/kimap-15.08.1.ebuild b/kde-apps/kimap/kimap-15.08.1.ebuild
index 1992321828..bc74396650 100644
--- a/kde-apps/kimap/kimap-15.08.1.ebuild
+++ b/kde-apps/kimap/kimap-15.08.1.ebuild
@@ -13,6 +13,10 @@ LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/kimap-15.08.0-remove-kdelibs4support.patch
+)
+
 RDEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcoreaddons)
diff --git a/kde-apps/kimap/kimap-15.08.49.9999.ebuild b/kde-apps/kimap/kimap-15.08.49.9999.ebuild
index 3c365bd940..0fb4cfc274 100644
--- a/kde-apps/kimap/kimap-15.08.49.9999.ebuild
+++ b/kde-apps/kimap/kimap-15.08.49.9999.ebuild
@@ -13,6 +13,10 @@ LICENSE="LGPL-2+"
 KEYWORDS=""
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/kimap-15.08.0-remove-kdelibs4support.patch
+)
+
 RDEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcoreaddons)