Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 560376 - kde-base/kdepimlibs-4.14.10, kde-base/kdepim-runtime-4.14.10 - "Multiple merge candidate" upstream fix
Summary: kde-base/kdepimlibs-4.14.10, kde-base/kdepim-runtime-4.14.10 - "Multiple merg...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] KDE (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo KDE team
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-09-13 21:01 UTC by Michael Seifert
Modified: 2016-05-02 12:59 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
kdepimlibs-4.14.10-r1-rid-merge.patch (kdepimlibs-4.14.10-r1-rid-merge.patch,6.37 KB, patch)
2015-09-13 21:02 UTC, Michael Seifert
Details | Diff
kdepimlibs-4.14.10-r1-rid-merge-fixup.patch (kdepimlibs-4.14.10-r1-rid-merge-fixup.patch,831 bytes, patch)
2015-09-13 21:02 UTC, Michael Seifert
Details | Diff
kdepimlibs-4.14.10-r1.ebuild (kdepimlibs-4.14.10-r1.ebuild,1.47 KB, text/plain)
2015-09-13 21:03 UTC, Michael Seifert
Details
kdepim-runtime-4.14.10-r1-rid-merge.patch (kdepim-runtime-4.14.10-r1-rid-merge.patch,5.13 KB, patch)
2015-09-13 21:03 UTC, Michael Seifert
Details | Diff
kdepim-runtime-4.14.10-r1.ebuild (kdepim-runtime-4.14.10-r1.ebuild,1.12 KB, text/plain)
2015-09-13 21:04 UTC, Michael Seifert
Details
kdepimlibs-4.14.10.patch (kdepimlibs-4.14.10.patch,507 bytes, patch)
2015-09-13 22:15 UTC, Michael Seifert
Details | Diff
kdepim-runtime-4.14.10.patch (kdepim-runtime-4.14.10.patch,688 bytes, patch)
2015-09-13 22:16 UTC, Michael Seifert
Details | Diff
kdepim-runtime-4.14.10-r1-rid-merge.patch (kdepim-runtime-4.14.10-r1-rid-merge.patch,4.73 KB, patch)
2015-09-13 22:21 UTC, Michael Seifert
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Seifert 2015-09-13 21:01:32 UTC
The attached ebuilds contain patches that have been provided by the upstream developers [1]. They change the merging strategy for PIM items and essentially get rid of the "Multiple merge candidates, aborting" warning in KMail (see [1]).

The patches were added unmodified.

[1] https://bugs.kde.org/show_bug.cgi?id=338658#c39

Reproducible: Always
Comment 1 Michael Seifert 2015-09-13 21:02:18 UTC
Created attachment 411830 [details, diff]
kdepimlibs-4.14.10-r1-rid-merge.patch
Comment 2 Michael Seifert 2015-09-13 21:02:36 UTC
Created attachment 411832 [details, diff]
kdepimlibs-4.14.10-r1-rid-merge-fixup.patch
Comment 3 Michael Seifert 2015-09-13 21:03:03 UTC
Created attachment 411834 [details]
kdepimlibs-4.14.10-r1.ebuild
Comment 4 Michael Seifert 2015-09-13 21:03:40 UTC
Created attachment 411836 [details, diff]
kdepim-runtime-4.14.10-r1-rid-merge.patch
Comment 5 Michael Seifert 2015-09-13 21:04:02 UTC
Created attachment 411838 [details]
kdepim-runtime-4.14.10-r1.ebuild
Comment 6 Andreas Sturmlechner gentoo-dev 2015-09-13 21:53:27 UTC
Please only add ebuild diffs instead.

The kdepim-runtime patch makes it depend on a kdepimlibs-4.14.11 that does not exist - I would remove the CMakeLists.txt part of the patch and would make the kdepim-runtime ebuild depend on >=kdepimlibs-4.14.10-r1 instead.
Comment 7 Michael Seifert 2015-09-13 22:15:56 UTC
Created attachment 411854 [details, diff]
kdepimlibs-4.14.10.patch
Comment 8 Michael Seifert 2015-09-13 22:16:20 UTC
Created attachment 411856 [details, diff]
kdepim-runtime-4.14.10.patch
Comment 9 Michael Seifert 2015-09-13 22:21:36 UTC
Created attachment 411858 [details, diff]
kdepim-runtime-4.14.10-r1-rid-merge.patch

Here you go. I forgot adding the dependency and thought the find_package was okay as long as it compiles. Thinking of it again, the version bump of the dep on kdepimlibs does not really belong there and should have been done in a separate commit in the upstream repository.
Comment 10 Michael Seifert 2015-09-14 09:09:10 UTC
After some more testing, the patches do not seem to fix the issue as expected.

I will do further investigation on this...
Comment 11 Andreas Sturmlechner gentoo-dev 2015-09-14 14:17:28 UTC
Did it not solve an existing issue caused by the bug, or could you reproduce the bug, coming from an issue-free setup, after having applied the patches?
Comment 12 Michael Seifert 2015-09-15 08:31:04 UTC
It did not solve an issue in my existing set-up.

I already re-added the affected mail accounts and see if it works then. Sadly, I was never able to reproduce the issue reliably, even before the patches.
Comment 13 Michael Seifert 2015-09-16 09:06:08 UTC
After I re-added the IMAP mail accounts affected by the issue, the problems seem to be gone. I no longer see the "Multiple merge candidates, aborting" message and all of the IMAP accounts now fetch mails properly.

I'd say the patched versions of kdepimlibs and kdepim-runtime work as expected.
Comment 14 Andreas Sturmlechner gentoo-dev 2016-02-14 16:12:36 UTC
Maybe you are interested in trying out the 4.14.11 snapshot that was just added to kde overlay? ;)

https://github.com/gentoo/kde/commit/d801ca68f9b30ac2497031387fcdbfd6e38e2694
Comment 15 Michael Seifert 2016-02-22 18:36:01 UTC
I updated to the new version a few days back and didn't experience any issues. The update went smoothly as usual.
Comment 16 Johannes Huber (RETIRED) gentoo-dev 2016-05-02 12:59:13 UTC
Thanks. Snapshot added. Please sync.

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8714337264d82d26e3dc1bcf5d00e86f8d1d799f