[arch-commits] Commit in folks/trunk (2 files)
Jan Steffens
heftig at archlinux.org
Mon Mar 8 19:43:13 UTC 2021
Date: Monday, March 8, 2021 @ 19:43:13
Author: heftig
Revision: 409502
0.14-3: disable telepathy backend (reduces deps)
Added:
folks/trunk/0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch
Modified:
folks/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch | 29 ++++++++++
PKGBUILD | 23 +++++--
2 files changed, 44 insertions(+), 8 deletions(-)
Added: 0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch
===================================================================
--- 0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch (rev 0)
+++ 0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch 2021-03-08 19:43:13 UTC (rev 409502)
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at redhat.com>
+Date: Tue, 7 Jul 2020 11:29:48 +0200
+Subject: [PATCH] eds:add-persona: Test fails when eds is compiled with
+ libphonenumber
+
+When eds is built with libphonenumber support it also returns "X-EVOLUTION-E164"
+parameter on TEL attributes, which breaks the eds:add-persona test, because it
+expects exact parameters being returned from eds.
+
+Closes https://gitlab.gnome.org/GNOME/folks/-/merge_requests/40
+---
+ tests/eds/add-persona.vala | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/eds/add-persona.vala b/tests/eds/add-persona.vala
+index ce64ce19..4483133d 100644
+--- a/tests/eds/add-persona.vala
++++ b/tests/eds/add-persona.vala
+@@ -400,6 +400,9 @@ public class AddPersonaTests : EdsTest.TestCase
+
+ foreach (var phone_fd in i.phone_numbers)
+ {
++ /* Can be returned, when the evolution-data-server is compiled with the libphonenumber support */
++ phone_fd.remove_parameter_all ("x-evolution-e164");
++
+ var phone_1 = new PhoneFieldDetails (this._phone_1);
+ phone_1.set_parameter (AbstractFieldDetails.PARAM_TYPE,
+ this._phone_1_type);
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-08 19:26:31 UTC (rev 409501)
+++ PKGBUILD 2021-03-08 19:43:13 UTC (rev 409502)
@@ -3,18 +3,20 @@
pkgname=folks
pkgver=0.14
-pkgrel=2
+pkgrel=3
pkgdesc="Library to aggregates people into metacontacts"
arch=(x86_64)
url="https://wiki.gnome.org/Projects/Folks"
license=(LGPL2.1)
-depends=(telepathy-glib libgee libxml2 evolution-data-server)
+depends=(libgee libxml2 evolution-data-server)
makedepends=(gobject-introspection gtk-doc vala git meson)
checkdepends=(python-dbusmock)
-provides=(libfolks.so libfolks-{dummy,eds,telepathy}.so)
+provides=(libfolks.so libfolks-{dummy,eds}.so)
_commit=58ff25aebfdcda5ba75758444b852f42273f4d1a # tags/0.14^0
-source=("git+https://gitlab.gnome.org/GNOME/folks.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/folks.git#commit=$_commit"
+ 0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch)
+sha256sums=('SKIP'
+ 'd4bfa9723a42f1417f17452025561af2d77b570fca448e155c05ea8c9d8cb1db')
pkgver() {
cd $pkgname
@@ -23,16 +25,21 @@
prepare() {
cd $pkgname
+ git apply -3 ../0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch
}
build() {
- # LTO copies some GType constructors
- arch-meson $pkgname build -D b_lto=false -D docs=true
+ local meson_args=(
+ -D b_lto=false # LTO copies some GType constructors
+ -D docs=true
+ -D telepathy_backend=false
+ )
+ arch-meson $pkgname build "${meson_args[@]}"
meson compile -C build
}
check() {
- meson test -C build --print-errorlogs || :
+ meson test -C build --print-errorlogs -t 4
}
package() {
More information about the arch-commits
mailing list