commit: 421c9da28628083d6c510eed8c963ed025a1cfbe Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Nov 25 12:22:52 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Nov 25 13:17:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=421c9da2
kde-apps/libkgapi: Fix contactfetchjobtest Upstream commit 570c0fd731af9ca4cead249d1db6133acc21f7c1 KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=419629 Reported-by: Paolo Pedroni <paolo.pedroni <AT> iol.it> Closes: https://bugs.gentoo.org/754159 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch | 31 ++++++++++++++++++++++ kde-apps/libkgapi/libkgapi-20.08.3.ebuild | 4 +++ 2 files changed, 35 insertions(+) diff --git a/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch b/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch new file mode 100644 index 00000000000..42cd78136ad --- /dev/null +++ b/kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch @@ -0,0 +1,31 @@ +From 570c0fd731af9ca4cead249d1db6133acc21f7c1 Mon Sep 17 00:00:00 2001 +From: David Barchiesi <[email protected]> +Date: Mon, 24 Aug 2020 12:04:17 +0200 +Subject: [PATCH] Remove duplicate "gContact$groupMembershipInfo" value in mock + fetch response. + +BUG: 419629 +--- + autotests/contacts/data/contact1_fetch_response.txt | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/autotests/contacts/data/contact1_fetch_response.txt b/autotests/contacts/data/contact1_fetch_response.txt +index 7b22c91..89fc0e1 100644 +--- a/autotests/contacts/data/contact1_fetch_response.txt ++++ b/autotests/contacts/data/contact1_fetch_response.txt +@@ -44,12 +44,6 @@ Content-type: application/json; charset=UTF-8 + "$t": "2018-03-25T16:37:29.565Z" + }, + "xmlns$gd": "http://schemas.google.com/g/2005";, +- "gContact$groupMembershipInfo": [ +- { +- "deleted": "false", +- "href": "http://www.google.com/m8/feeds/groups/MockAccount/base/6"; +- } +- ], + "gd$structuredPostalAddress": [ + { + "gd$country": { +-- +GitLab + diff --git a/kde-apps/libkgapi/libkgapi-20.08.3.ebuild b/kde-apps/libkgapi/libkgapi-20.08.3.ebuild index 20276f79832..9ba86c9d21f 100644 --- a/kde-apps/libkgapi/libkgapi-20.08.3.ebuild +++ b/kde-apps/libkgapi/libkgapi-20.08.3.ebuild @@ -35,3 +35,7 @@ DEPEND=" RDEPEND="${DEPEND} !<kde-apps/kdepim-runtime-18.07.80:5 " + +PATCHES=( + "${FILESDIR}/${P}-fix-contactfetchjobtest-w-qt-5.15.patch" # bug 754159 +)
