Date: Thursday, October 20, 2022 @ 23:45:47
Author: heftig
Revision: 1333026
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libsoup/repos/multilib-x86_64/PKGBUILD
(from rev 1333025, lib32-libsoup/trunk/PKGBUILD)
lib32-libsoup/repos/multilib-x86_64/disable-flaky-test.diff
(from rev 1333025, lib32-libsoup/trunk/disable-flaky-test.diff)
Deleted:
lib32-libsoup/repos/multilib-x86_64/PKGBUILD
-------------------------+
PKGBUILD | 156 +++++++++++++++++++++++++---------------------
disable-flaky-test.diff | 13 +++
2 files changed, 99 insertions(+), 70 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-20 23:45:20 UTC (rev 1333025)
+++ PKGBUILD 2022-10-20 23:45:47 UTC (rev 1333026)
@@ -1,70 +0,0 @@
-# Maintainer: Maxime Gauduin <[email protected]>
-# Contributor: Maximilian Stein <[email protected]>
-# Contributor: josephgbr <[email protected]>
-
-pkgname=lib32-libsoup
-pkgver=2.74.2
-pkgrel=1
-pkgdesc='HTTP client/server library for GNOME'
-url=https://wiki.gnome.org/Projects/libsoup
-arch=(x86_64)
-license=(LGPL)
-depends=(
- lib32-brotli
- lib32-glib-networking
- lib32-krb5
- lib32-libxml2
- lib32-sqlite
- lib32-libpsl
- libsoup
-)
-makedepends=(
- git
- 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#tag=${_commit})
-sha256sums=('SKIP')
-
-pkgver() {
- cd libsoup
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-build() {
- export CC='gcc -m32'
- export CXX='g++ -m32'
- export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
-
- arch-meson libsoup build \
- --libdir=/usr/lib32 \
- -D introspection=disabled \
- -D sysprof=disabled \
- -D vapi=disabled
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package() {
- depends+=(
- libbrotlidec.so
- libgssapi_krb5.so
- libg{lib,object,io}-2.0.so
- libpsl.so
- )
- provides+=(libsoup{,-gnome}-2.4.so)
-
- meson install -C build --destdir "${pkgdir}"
- rm -rf "${pkgdir}"/usr/{include,share}
-}
-
-# vim:set sw=2 et:
Copied: lib32-libsoup/repos/multilib-x86_64/PKGBUILD (from rev 1333025,
lib32-libsoup/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-10-20 23:45:47 UTC (rev 1333026)
@@ -0,0 +1,86 @@
+# Maintainer: Maxime Gauduin <[email protected]>
+# Contributor: Maximilian Stein <[email protected]>
+# Contributor: josephgbr <[email protected]>
+
+pkgbase=lib32-libsoup
+pkgname=(lib32-libsoup)
+pkgver=2.74.3
+pkgrel=1
+pkgdesc="HTTP client/server library for GNOME (32-bit)"
+url="https://wiki.gnome.org/Projects/libsoup";
+arch=(x86_64)
+license=(LGPL)
+depends=(
+ lib32-brotli
+ lib32-glib-networking
+ lib32-glib2
+ lib32-krb5
+ lib32-libpsl
+ lib32-libxml2
+ lib32-sqlite
+ libsoup
+)
+makedepends=(
+ git
+ meson
+ samba
+)
+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
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd libsoup
+
+ # https://gitlab.gnome.org/GNOME/libsoup/-/issues/120
+ git apply -3 ../disable-flaky-test.diff
+}
+
+build() {
+ local meson_options=(
+ --libdir=/usr/lib32
+ -D introspection=disabled
+ -D sysprof=disabled
+ -D vapi=disabled
+ )
+
+ export CC='gcc -m32'
+ export CXX='g++ -m32'
+ export PKG_CONFIG='i686-pc-linux-gnu-pkg-config'
+
+ arch-meson libsoup build "${meson_options[@]}"
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package_lib32-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"
+
+ rm -r "$pkgdir"/usr/{include,share}
+}
+
+# vim:set sw=2 sts=-1 et:
Copied: lib32-libsoup/repos/multilib-x86_64/disable-flaky-test.diff (from rev
1333025, lib32-libsoup/trunk/disable-flaky-test.diff)
===================================================================
--- disable-flaky-test.diff (rev 0)
+++ disable-flaky-test.diff 2022-10-20 23:45:47 UTC (rev 1333026)
@@ -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,
