[arch-commits] Commit in evolution-data-server/trunk (PKGBUILD fix-tests.diff)

[Jan Steffens]

    Date: Friday, May 27, 2022 @ 15:41:51
  Author: heftig
Revision: 446576

3.44.2-1

Added:
  evolution-data-server/trunk/fix-tests.diff
Modified:
  evolution-data-server/trunk/PKGBUILD

----------------+
 PKGBUILD       |   14 ++++++++++----
 fix-tests.diff |   26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-27 15:01:45 UTC (rev 446575)
+++ PKGBUILD	2022-05-27 15:41:51 UTC (rev 446576)
@@ -2,7 +2,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.44.1
+pkgver=3.44.2
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 url="https://wiki.gnome.org/Apps/Evolution"
@@ -15,9 +15,11 @@
           libedataserverui-1.2.so)
 license=(GPL)
 options=(debug)
-_commit=3f9d74ba18bb752877887579243eb3b7af98f211  # tags/3.44.1^0
-source=("git+https://gitlab.gnome.org/GNOME/evolution-data-server.git#commit=$_commit")
-sha256sums=('SKIP')
+_commit=e01c792d9a1e0d2a798efdbe108a8057c141e001  # tags/3.44.2^0
+source=("git+https://gitlab.gnome.org/GNOME/evolution-data-server.git#commit=$_commit"
+        fix-tests.diff)
+sha256sums=('SKIP'
+            '435ee829d1f821c5adc3163024057d9fdea6184d35eae87c4bd502b661f10148')
 
 pkgver() {
   cd $pkgname
@@ -26,6 +28,10 @@
 
 prepare() {
   cd $pkgname
+
+  # Disable tests broken by libphonenumber update. Same reason
+  # as the already-disabled tests in the same files.
+  git apply -3 ../fix-tests.diff
 }
 
 build() {

Added: fix-tests.diff
===================================================================
--- fix-tests.diff	                        (rev 0)
+++ fix-tests.diff	2022-05-27 15:41:51 UTC (rev 446576)
@@ -0,0 +1,26 @@
+diff --git i/tests/libedata-book/test-book-cache-cursor-change-locale.c w/tests/libedata-book/test-book-cache-cursor-change-locale.c
+index c98ecba38..9fe8f14da 100644
+--- i/tests/libedata-book/test-book-cache-cursor-change-locale.c
++++ w/tests/libedata-book/test-book-cache-cursor-change-locale.c
+@@ -69,7 +69,7 @@ main (gint argc,
+ 		tcu_step_test_add_assertion (data, 5, 17, 16, 18, 10, 14);
+ 		tcu_step_test_add_assertion (data, 5, 12, 13, 9,  19, 20);
+ 
+-		tcu_step_test_change_locale (data, "fr_CA.UTF-8", 0);
++		tcu_step_test_change_locale (data, "fr_CA.UTF-8", -1);
+ 		tcu_step_test_add_assertion (data, 5, 11, 1,  2,  5,  6);
+ 		tcu_step_test_add_assertion (data, 5, 4,  3,  7,  8,  15);
+ 		tcu_step_test_add_assertion (data, 5, 17, 16, 18, 10, 14);
+diff --git i/tests/libedata-book/test-sqlite-cursor-change-locale.c w/tests/libedata-book/test-sqlite-cursor-change-locale.c
+index 65671d1df..866f2ce93 100644
+--- i/tests/libedata-book/test-sqlite-cursor-change-locale.c
++++ w/tests/libedata-book/test-sqlite-cursor-change-locale.c
+@@ -72,7 +72,7 @@ main (gint argc,
+ 		step_test_add_assertion (data, 5, 17, 16, 18, 10, 14);
+ 		step_test_add_assertion (data, 5, 12, 13, 9,  19, 20);
+ 
+-		step_test_change_locale (data, "fr_CA.UTF-8", 0);
++		step_test_change_locale (data, "fr_CA.UTF-8", -1);
+ 		step_test_add_assertion (data, 5, 11, 1,  2,  5,  6);
+ 		step_test_add_assertion (data, 5, 4,  3,  7,  8,  15);
+ 		step_test_add_assertion (data, 5, 17, 16, 18, 10, 14);