[arch-commits] Commit in folks/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Monday, March 8, 2021 @ 19:43:25
  Author: heftig
Revision: 409503

archrelease: copy trunk to extra-x86_64

Added:
  folks/repos/extra-x86_64/0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch
    (from rev 409502, folks/trunk/0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch)
  folks/repos/extra-x86_64/PKGBUILD
    (from rev 409502, folks/trunk/PKGBUILD)
Deleted:
  folks/repos/extra-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch |   29 +++
 PKGBUILD                                                        |   91 +++++-----
 2 files changed, 78 insertions(+), 42 deletions(-)

Copied: folks/repos/extra-x86_64/0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch (from rev 409502, folks/trunk/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:25 UTC (rev 409503)
@@ -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);

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-08 19:43:13 UTC (rev 409502)
+++ PKGBUILD	2021-03-08 19:43:25 UTC (rev 409503)
@@ -1,42 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgname=folks
-pkgver=0.14
-pkgrel=2
-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)
-makedepends=(gobject-introspection gtk-doc vala git meson)
-checkdepends=(python-dbusmock)
-provides=(libfolks.so libfolks-{dummy,eds,telepathy}.so)
-_commit=58ff25aebfdcda5ba75758444b852f42273f4d1a  # tags/0.14^0
-source=("git+https://gitlab.gnome.org/GNOME/folks.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-}
-
-build() {
-  # LTO copies some GType constructors
-  arch-meson $pkgname build -D b_lto=false -D docs=true
-  meson compile -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs || :
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}
-
-# vim:set sw=2 et:

Copied: folks/repos/extra-x86_64/PKGBUILD (from rev 409502, folks/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-03-08 19:43:25 UTC (rev 409503)
@@ -0,0 +1,49 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgname=folks
+pkgver=0.14
+pkgrel=3
+pkgdesc="Library to aggregates people into metacontacts"
+arch=(x86_64)
+url="https://wiki.gnome.org/Projects/Folks"
+license=(LGPL2.1)
+depends=(libgee libxml2 evolution-data-server)
+makedepends=(gobject-introspection gtk-doc vala git meson)
+checkdepends=(python-dbusmock)
+provides=(libfolks.so libfolks-{dummy,eds}.so)
+_commit=58ff25aebfdcda5ba75758444b852f42273f4d1a  # tags/0.14^0
+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
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+  git apply -3 ../0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch
+}
+
+build() {
+  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 -t 4
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}
+
+# vim:set sw=2 et: