[arch-commits] Commit in evolution-data-server/repos/extra-x86_64 (3 files)
Jan Steffens
heftig at gemini.archlinux.org
Fri May 27 16:08:31 UTC 2022
Date: Friday, May 27, 2022 @ 16:08:31
Author: heftig
Revision: 446580
archrelease: copy trunk to extra-x86_64
Added:
evolution-data-server/repos/extra-x86_64/PKGBUILD
(from rev 446578, evolution-data-server/trunk/PKGBUILD)
evolution-data-server/repos/extra-x86_64/fix-tests.diff
(from rev 446578, evolution-data-server/trunk/fix-tests.diff)
Deleted:
evolution-data-server/repos/extra-x86_64/PKGBUILD
----------------+
PKGBUILD | 108 +++++++++++++++++++++++++++++--------------------------
fix-tests.diff | 26 +++++++++++++
2 files changed, 83 insertions(+), 51 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-05-27 16:08:30 UTC (rev 446579)
+++ PKGBUILD 2022-05-27 16:08:31 UTC (rev 446580)
@@ -1,51 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.44.1
-pkgrel=1
-pkgdesc="Centralized access to appointments and contacts"
-url="https://wiki.gnome.org/Apps/Evolution"
-arch=(x86_64)
-depends=(gnome-online-accounts nss krb5 libgweather-4 libical db libgdata libphonenumber
- libcanberra)
-makedepends=(intltool gperf gobject-introspection vala gtk-doc boost git cmake ninja)
-provides=(libcamel-1.2.so libebackend-1.2.so libebook-1.2.so libebook-contacts-1.2.so
- libecal-2.0.so libedata-book-1.2.so libedata-cal-2.0.so libedataserver-1.2.so
- 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')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^EVOLUTION_DATA_SERVER_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-}
-
-build() {
- cmake -S $pkgname -B build -G Ninja \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIBEXEC_INSTALL_DIR=/usr/lib \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DENABLE_INTROSPECTION=ON \
- -DENABLE_VALA_BINDINGS=ON \
- -DENABLE_GTK_DOC=ON \
- -DWITH_PHONENUMBER=ON \
- -DWITH_GWEATHER4=ON
- cmake --build build
-}
-
-check() {
- cd build
- ctest --output-on-failure --stop-on-failure
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
Copied: evolution-data-server/repos/extra-x86_64/PKGBUILD (from rev 446578, evolution-data-server/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-05-27 16:08:31 UTC (rev 446580)
@@ -0,0 +1,57 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=evolution-data-server
+pkgver=3.44.2
+pkgrel=1
+pkgdesc="Centralized access to appointments and contacts"
+url="https://wiki.gnome.org/Apps/Evolution"
+arch=(x86_64)
+depends=(gnome-online-accounts nss krb5 libgweather-4 libical db libgdata libphonenumber
+ libcanberra)
+makedepends=(intltool gperf gobject-introspection vala gtk-doc boost git cmake ninja)
+provides=(libcamel-1.2.so libebackend-1.2.so libebook-1.2.so libebook-contacts-1.2.so
+ libecal-2.0.so libedata-book-1.2.so libedata-cal-2.0.so libedataserver-1.2.so
+ libedataserverui-1.2.so)
+license=(GPL)
+options=(debug)
+_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
+ git describe --tags | sed 's/^EVOLUTION_DATA_SERVER_//;s/_/./g;s/-/+/g'
+}
+
+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() {
+ cmake -S $pkgname -B build -G Ninja \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIBEXEC_INSTALL_DIR=/usr/lib \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DENABLE_INTROSPECTION=ON \
+ -DENABLE_VALA_BINDINGS=ON \
+ -DENABLE_GTK_DOC=ON \
+ -DWITH_PHONENUMBER=ON \
+ -DWITH_GWEATHER4=ON
+ cmake --build build
+}
+
+check() {
+ cd build
+ ctest --output-on-failure --stop-on-failure
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
Copied: evolution-data-server/repos/extra-x86_64/fix-tests.diff (from rev 446578, evolution-data-server/trunk/fix-tests.diff)
===================================================================
--- fix-tests.diff (rev 0)
+++ fix-tests.diff 2022-05-27 16:08:31 UTC (rev 446580)
@@ -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);
More information about the arch-commits
mailing list