Date: Thursday, October 20, 2022 @ 23:45:22 Author: heftig Revision: 458480
2.74.3-1 Added: libsoup/trunk/disable-flaky-test.diff Modified: libsoup/trunk/PKGBUILD -------------------------+ PKGBUILD | 74 ++++++++++++++++++++++++++++++++++++---------- disable-flaky-test.diff | 13 ++++++++ 2 files changed, 71 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-20 21:42:04 UTC (rev 458479) +++ PKGBUILD 2022-10-20 23:45:22 UTC (rev 458480) @@ -1,21 +1,42 @@ # Maintainer: Jan Alexander Steffens (heftig) <[email protected]> # Contributor: Jan de Groot <[email protected]> -pkgname=libsoup -pkgver=2.74.2 -pkgrel=2 +pkgbase=libsoup +pkgname=(libsoup libsoup-docs) +pkgver=2.74.3 +pkgrel=1 pkgdesc="HTTP client/server library for GNOME" url="https://wiki.gnome.org/Projects/libsoup"; arch=(x86_64) license=(LGPL) -depends=(glib2 libxml2 glib-networking sqlite krb5 libpsl brotli - libsysprof-capture) -makedepends=(gobject-introspection python vala git gtk-doc meson samba) -checkdepends=(apache php-apache) -optdepends=('samba: Windows Domain SSO') -_commit=2add3502a7de754f4aed61571f6cb45094e8f443 # tags/2.74.2^0 -source=("git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=$_commit";) -sha256sums=('SKIP') +depends=( + brotli + glib-networking + glib2 + krb5 + libpsl + libsysprof-capture + libxml2 + sqlite +) +makedepends=( + git + gobject-introspection + gtk-doc + meson + samba + vala +) +checkdepends=( + apache + php-apache +) +options=(debug) +_commit=4a6b9178ded85e269872ffedfb2b18f2754a75d9 # tags/2.74.3^0 +source=("git+https://gitlab.gnome.org/GNOME/libsoup.git#commit=$_commit"; + disable-flaky-test.diff) +b2sums=('SKIP' + '4d71171b26ed107884a22696f9df1609c45c377e27baaaeb4ec5d890f9fbd62f09607ba3da0acdb42b4f86b9e828014471e6731437ec80de3b6ad98d7f0a2f60') pkgver() { cd libsoup @@ -24,10 +45,16 @@ prepare() { cd libsoup + + # https://gitlab.gnome.org/GNOME/libsoup/-/issues/120 + git apply -3 ../disable-flaky-test.diff } build() { - arch-meson libsoup build -D gtk_doc=true + local meson_options=( + -D gtk_doc=true + ) + arch-meson libsoup build "${meson_options[@]}" meson compile -C build } @@ -35,12 +62,27 @@ meson test -C build --print-errorlogs } -package() { - depends+=(libg{lib,object,io}-2.0.so libgssapi_krb5.so libpsl.so - libbrotlidec.so) +package_libsoup() { + depends+=( + libbrotlidec.so + libgssapi_krb5.so + libg{lib,object,io}-2.0.so + libpsl.so + ) + optdepends=('samba: Windows Domain SSO') provides+=(libsoup{,-gnome}-2.4.so) meson install -C build --destdir "$pkgdir" + + mkdir -p doc/usr/share + mv {"$pkgdir",doc}/usr/share/gtk-doc } -# vim:set sw=2 et: +package_libsoup-docs() { + pkgdesc+=" (documentation)" + depends=() + + mv doc/* "$pkgdir" +} + +# vim:set sw=2 sts=-1 et: Added: disable-flaky-test.diff =================================================================== --- disable-flaky-test.diff (rev 0) +++ disable-flaky-test.diff 2022-10-20 23:45:22 UTC (rev 458480) @@ -0,0 +1,13 @@ +diff --git i/tests/ssl-test.c w/tests/ssl-test.c +index 501c3479..b29f45f2 100644 +--- i/tests/ssl-test.c ++++ w/tests/ssl-test.c +@@ -445,7 +445,7 @@ main (int argc, char **argv) + g_test_add_func ("/ssl/session-properties", do_session_property_tests); + g_test_add_func ("/ssl/message-properties/async", do_async_properties_tests); + g_test_add_func ("/ssl/message-properties/sync", do_sync_properties_tests); +- g_test_add_func ("/ssl/tls-interaction", do_tls_interaction_test); ++ //g_test_add_func ("/ssl/tls-interaction", do_tls_interaction_test); + + for (i = 0; i < G_N_ELEMENTS (strictness_tests); i++) { + g_test_add_data_func (strictness_tests[i].name,
