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

[Jan Steffens]

    Date: Friday, August 5, 2022 @ 08:39:52
  Author: heftig
Revision: 452071

3.44.4-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-05 08:13:04 UTC (rev 452070)
+++ PKGBUILD	2022-08-05 08:39:52 UTC (rev 452071)
@@ -2,7 +2,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.44.3
+pkgver=3.44.4
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 url="https://wiki.gnome.org/Apps/Evolution"
@@ -15,11 +15,9 @@
           libedataserverui-1.2.so)
 license=(GPL)
 options=(debug)
-_commit=68265e2723489a1854a393800dbfbc563a9f9054  # tags/3.44.3^0
-source=("git+https://gitlab.gnome.org/GNOME/evolution-data-server.git#commit=$_commit"
-        fix-tests.diff)
-sha256sums=('SKIP'
-            '435ee829d1f821c5adc3163024057d9fdea6184d35eae87c4bd502b661f10148')
+_commit=4a526c5363c9c46b200e7fae019c4911c968673f  # tags/3.44.4^0
+source=("git+https://gitlab.gnome.org/GNOME/evolution-data-server.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -28,10 +26,6 @@
 
 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() {

Deleted: fix-tests.diff
===================================================================
--- fix-tests.diff	2022-08-05 08:13:04 UTC (rev 452070)
+++ fix-tests.diff	2022-08-05 08:39:52 UTC (rev 452071)
@@ -1,26 +0,0 @@
-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);