summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>2017-04-30 01:20:47 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-05-01 09:48:59 +0200
commit1565c2d62b4dd7f7e87c3063e83b472def2c8c88 (patch)
treef748a5130f1092a6fb3d45fc5f4c008edd00a527 /kde-apps/kdepimlibs/files
parentkde-apps: Add necessary blockers against incompatible kdepimlibs (diff)
downloadgentoo-1565c2d62b4dd7f7e87c3063e83b472def2c8c88.tar.gz
gentoo-1565c2d62b4dd7f7e87c3063e83b472def2c8c88.tar.bz2
gentoo-1565c2d62b4dd7f7e87c3063e83b472def2c8c88.zip
kde-apps/kdepimlibs: Fix compatibility with app-crypt/gpgme[cxx,qt5]
Avoid file collisions by renaming the affected files. Maintainer comments: - 4.14.{11_pre,10_p}20160611 are two incarnations of the same tarball 4.14.10_p20160611 reverts one commit that breaks POP3 w/ kmail-4.4 - Applied ebuild sed,mv and patch magic to sources. - Applied Gentoo patches to sources to obsolete $FILESDIR Gentoo-bug: 611818 Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'kde-apps/kdepimlibs/files')
-rw-r--r--kde-apps/kdepimlibs/files/kdepimlibs-4.14.10_p20160611-revert-544410c90.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10_p20160611-revert-544410c90.patch b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10_p20160611-revert-544410c90.patch
new file mode 100644
index 000000000000..94f1494a3ddd
--- /dev/null
+++ b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10_p20160611-revert-544410c90.patch
@@ -0,0 +1,25 @@
+diff --git a/kioslave/pop3/pop3.cpp b/kioslave/pop3/pop3.cpp
+index 8238a5fca..20730950d 100644
+--- a/kioslave/pop3/pop3.cpp
++++ b/kioslave/pop3/pop3.cpp
+@@ -812,7 +812,6 @@ void POP3Protocol::get(const KUrl & url)
+ .
+ */
+ if (result) {
+- mimeType("text/plain");
+ while (true /* !AtEOF() */ ) {
+ memset(buf, 0, sizeof(buf));
+ myReadLine(buf, sizeof(buf) - 1);
+@@ -849,12 +848,6 @@ void POP3Protocol::get(const KUrl & url)
+ m_cmd = CMD_NONE;
+ } else if (cmd == "download" || cmd == "headers") {
+ const QStringList waitingCommands = path.split(',', QString::SkipEmptyParts);
+- if ( waitingCommands.isEmpty() ) {
+- kDebug(7105) << "tried to request" << cmd << "for" << path << "with no specific item to get";
+- closeConnection();
+- error(ERR_INTERNAL, m_sServer);
+- return;
+- }
+ bool noProgress = (metaData("progress") == "off"
+ || waitingCommands.count() > 1);
+ int p_size = 0;