[arch-commits] Commit in folks/trunk (2 files)

[Jan Steffens]

    Date: Monday, November 8, 2021 @ 20:25:07
  Author: heftig
Revision: 427599

0.15.3+6+gdb1de866-1

Modified:
  folks/trunk/PKGBUILD
Deleted:
  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 |   29 ----------
 PKGBUILD                                                        |   15 ++---
 2 files changed, 6 insertions(+), 38 deletions(-)

Deleted: 0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch
===================================================================
--- 0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch	2021-11-08 20:20:44 UTC (rev 427598)
+++ 0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch	2021-11-08 20:25:07 UTC (rev 427599)
@@ -1,29 +0,0 @@
-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-11-08 20:20:44 UTC (rev 427598)
+++ PKGBUILD	2021-11-08 20:25:07 UTC (rev 427599)
@@ -2,8 +2,8 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=folks
-pkgver=0.14
-pkgrel=5
+pkgver=0.15.3+6+gdb1de866
+pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(x86_64)
 url="https://wiki.gnome.org/Projects/Folks"
@@ -11,11 +11,9 @@
 depends=(libgee libxml2 evolution-data-server)
 makedepends=(gobject-introspection gtk-doc vala git meson 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')
+_commit=db1de866217d98f6b25edc92ca54d82c4dc082a8  # master
+source=("git+https://gitlab.gnome.org/GNOME/folks.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -24,7 +22,6 @@
 
 prepare() {
   cd $pkgname
-  git apply -3 ../0001-eds-add-persona-Test-fails-when-eds-is-compiled-with.patch
 }
 
 build() {
@@ -42,7 +39,7 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" meson install -C build
+  meson install -C build --destdir "$pkgdir"
 }
 
 # vim:set sw=2 et: