From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C38D13835B for ; Wed, 25 Nov 2020 13:17:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A2ACE0845; Wed, 25 Nov 2020 13:17:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A469E083E for ; Wed, 25 Nov 2020 13:17:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53F86341264 for ; Wed, 25 Nov 2020 13:17:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A395468 for ; Wed, 25 Nov 2020 13:17:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1606310262.421c9da28628083d6c510eed8c963ed025a1cfbe.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/libkgapi/files/, kde-apps/libkgapi/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/libkgapi/files/libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch kde-apps/libkgapi/libkgapi-20.08.3.ebuild X-VCS-Directories: kde-apps/libkgapi/files/ kde-apps/libkgapi/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 421c9da28628083d6c510eed8c963ed025a1cfbe X-VCS-Branch: master Date: Wed, 25 Nov 2020 13:17:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 517fe48c-78db-4e5e-a589-2795f6a4742f X-Archives-Hash: ae992108cf45511a82afec2adb6667b9 commit: 421c9da28628083d6c510eed8c963ed025a1cfbe Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 25 12:22:52 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 iol.it> Closes: https://bugs.gentoo.org/754159 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner 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 +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} !