| 1 |
commit: 20994322e0407c6423f249debbe98a21e7d941fd |
| 2 |
Author: Matthew Dawson <matthew <AT> mjdsystems <DOT> ca> |
| 3 |
AuthorDate: Sun Aug 30 14:18:06 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 24 19:19:08 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=20994322 |
| 7 |
|
| 8 |
kde-apps/kimap: Remove dependency on kde-frameworks/kdelibs4support |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
.../kimap-15.08.0-remove-kdelibs4support.patch | 78 ++++++++++++++++++++++ |
| 13 |
kde-apps/kimap/kimap-15.08.1.ebuild | 4 ++ |
| 14 |
kde-apps/kimap/kimap-15.08.49.9999.ebuild | 4 ++ |
| 15 |
3 files changed, 86 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..821f38d |
| 20 |
--- /dev/null |
| 21 |
+++ b/kde-apps/kimap/files/kimap-15.08.0-remove-kdelibs4support.patch |
| 22 |
@@ -0,0 +1,78 @@ |
| 23 |
+commit bf73c02636b55197e7c7ff870739c98cb200ef1a |
| 24 |
+Author: Volker Krause <vkrause@×××.org> |
| 25 |
+Date: Fri Sep 4 15:45:29 2015 +0200 |
| 26 |
+ |
| 27 |
+ Remove KDELibs4Support dependency. |
| 28 |
+ |
| 29 |
+commit ce575030415015c38d3e035b9bc507b9d4ae5a72 |
| 30 |
+Author: Volker Krause <vkrause@×××.org> |
| 31 |
+Date: Fri Sep 4 15:44:41 2015 +0200 |
| 32 |
+ |
| 33 |
+ Port away from deprecated Qt methods. |
| 34 |
+ |
| 35 |
+ Those are not available once we remove the KDELibs4Support dependency. |
| 36 |
+ |
| 37 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 38 |
+index d2beff4..c4af8c8 100644 |
| 39 |
+--- a/CMakeLists.txt |
| 40 |
++++ b/CMakeLists.txt |
| 41 |
+@@ -28,7 +28,8 @@ ecm_setup_version(${KIMAP_LIB_VERSION} VARIABLE_PREFIX KIMAP |
| 42 |
+ |
| 43 |
+ ########### Find packages ########### |
| 44 |
+ find_package(KF5CoreAddons ${KF5_VERSION} CONFIG REQUIRED) |
| 45 |
+-find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED) |
| 46 |
++find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) |
| 47 |
++find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) |
| 48 |
+ |
| 49 |
+ find_package(KF5Mime ${KMIME_LIBS_VERSION} CONFIG REQUIRED) |
| 50 |
+ |
| 51 |
+diff --git a/autotests/kimaptest/sslserver.cpp b/autotests/kimaptest/sslserver.cpp |
| 52 |
+index b4bd7d0..98e83d5 100644 |
| 53 |
+--- a/autotests/kimaptest/sslserver.cpp |
| 54 |
++++ b/autotests/kimaptest/sslserver.cpp |
| 55 |
+@@ -77,7 +77,9 @@ void SslServer::incomingConnection(qintptr handle) |
| 56 |
+ |
| 57 |
+ QSslKey ssl_key(staticKey(), QSsl::Rsa); |
| 58 |
+ QSslCertificate ssl_cert(staticCert()); |
| 59 |
+- Q_ASSERT(ssl_cert.isValid()); |
| 60 |
++ Q_ASSERT(QDateTime::currentDateTime() >= ssl_cert.effectiveDate()); |
| 61 |
++ Q_ASSERT(QDateTime::currentDateTime() <= ssl_cert.expiryDate()); |
| 62 |
++ Q_ASSERT(!ssl_cert.isBlacklisted()); |
| 63 |
+ |
| 64 |
+ socket->setPrivateKey(ssl_key); |
| 65 |
+ socket->setLocalCertificate(ssl_cert); |
| 66 |
+@@ -86,7 +88,7 @@ void SslServer::incomingConnection(qintptr handle) |
| 67 |
+ socket->ignoreSslErrors(); |
| 68 |
+ connect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(sslErrors(QList<QSslError>))); |
| 69 |
+ connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(error(QAbstractSocket::SocketError))); |
| 70 |
+- if (mProtocol != QSsl::TlsV1) { |
| 71 |
++ if (mProtocol != QSsl::TlsV1_0) { |
| 72 |
+ socket->startServerEncryption(); |
| 73 |
+ } |
| 74 |
+ addPendingConnection(socket); |
| 75 |
+diff --git a/autotests/kimaptest/sslserver.h b/autotests/kimaptest/sslserver.h |
| 76 |
+index 0ecd9fd..e714f38 100644 |
| 77 |
+--- a/autotests/kimaptest/sslserver.h |
| 78 |
++++ b/autotests/kimaptest/sslserver.h |
| 79 |
+@@ -29,7 +29,7 @@ public: |
| 80 |
+ SslServer(QSsl::SslProtocol); |
| 81 |
+ virtual void incomingConnection(qintptr handle) Q_DECL_OVERRIDE; |
| 82 |
+ |
| 83 |
+-private slots: |
| 84 |
++private Q_SLOTS: |
| 85 |
+ void sslErrors(const QList<QSslError> &errors); |
| 86 |
+ void error(QAbstractSocket::SocketError); |
| 87 |
+ |
| 88 |
+diff --git a/src/appendjob.cpp b/src/appendjob.cpp |
| 89 |
+index 4d72903..8584c0e 100644 |
| 90 |
+--- a/src/appendjob.cpp |
| 91 |
++++ b/src/appendjob.cpp |
| 92 |
+@@ -124,7 +124,7 @@ void AppendJob::doStart() |
| 93 |
+ |
| 94 |
+ if (!d->internalDate.isNull()) { |
| 95 |
+ const QDateTime utcDateTime = d->internalDate.toUTC(); |
| 96 |
+- parameters += " \"" + utcDateTime.toString(QString::fromAscii("dd-MMM-yyyy hh:mm:ss")).toLatin1() + " +0000" + '\"'; |
| 97 |
++ parameters += " \"" + utcDateTime.toString(QStringLiteral("dd-MMM-yyyy hh:mm:ss")).toLatin1() + " +0000" + '\"'; |
| 98 |
+ } |
| 99 |
+ |
| 100 |
+ parameters += " {" + QByteArray::number(d->content.size()) + '}'; |
| 101 |
|
| 102 |
diff --git a/kde-apps/kimap/kimap-15.08.1.ebuild b/kde-apps/kimap/kimap-15.08.1.ebuild |
| 103 |
index 1992321..bc74396 100644 |
| 104 |
--- a/kde-apps/kimap/kimap-15.08.1.ebuild |
| 105 |
+++ b/kde-apps/kimap/kimap-15.08.1.ebuild |
| 106 |
@@ -13,6 +13,10 @@ LICENSE="LGPL-2+" |
| 107 |
KEYWORDS="~amd64 ~x86" |
| 108 |
IUSE="" |
| 109 |
|
| 110 |
+PATCHES=( |
| 111 |
+ "${FILESDIR}"/kimap-15.08.0-remove-kdelibs4support.patch |
| 112 |
+) |
| 113 |
+ |
| 114 |
RDEPEND=" |
| 115 |
$(add_frameworks_dep kcodecs) |
| 116 |
$(add_frameworks_dep kcoreaddons) |
| 117 |
|
| 118 |
diff --git a/kde-apps/kimap/kimap-15.08.49.9999.ebuild b/kde-apps/kimap/kimap-15.08.49.9999.ebuild |
| 119 |
index 3c365bd..0fb4cfc 100644 |
| 120 |
--- a/kde-apps/kimap/kimap-15.08.49.9999.ebuild |
| 121 |
+++ b/kde-apps/kimap/kimap-15.08.49.9999.ebuild |
| 122 |
@@ -13,6 +13,10 @@ LICENSE="LGPL-2+" |
| 123 |
KEYWORDS="" |
| 124 |
IUSE="" |
| 125 |
|
| 126 |
+PATCHES=( |
| 127 |
+ "${FILESDIR}"/kimap-15.08.0-remove-kdelibs4support.patch |
| 128 |
+) |
| 129 |
+ |
| 130 |
RDEPEND=" |
| 131 |
$(add_frameworks_dep kcodecs) |
| 132 |
$(add_frameworks_dep kcoreaddons) |
Archives