[arch-commits] Commit in glib-networking/trunk (2 files)

[Jan de Groot]

    Date: Friday, February 27, 2015 @ 12:09:56
  Author: jgc
Revision: 232058

upgpkg: glib-networking 2.42.1-1

Added:
  glib-networking/trunk/skip-test-needs-glib-243.patch
Modified:
  glib-networking/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   15 +++++++++++----
 skip-test-needs-glib-243.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-27 10:04:53 UTC (rev 232057)
+++ PKGBUILD	2015-02-27 11:09:56 UTC (rev 232058)
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
 pkgname=glib-networking
-pkgver=2.42.0
+pkgver=2.42.1
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=(i686 x86_64)
@@ -11,9 +11,16 @@
 depends=(glib2 libproxy gnutls ca-certificates gsettings-desktop-schemas)
 makedepends=(intltool)
 install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('304dd9e4c0ced69094300e0b9e66cd2eaae7161b9fc3186536d11458677d820d')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        skip-test-needs-glib-243.patch)
+sha256sums=('c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0'
+            'afa882168bcb1f8abed27c63455c3ac177787e305ddb76744d7936a121866410')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../skip-test-needs-glib-243.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
@@ -24,7 +31,7 @@
 
 check() {
   cd $pkgname-$pkgver
-  make -k check
+  make -j1 -k check
 }
 
 package() {

Added: skip-test-needs-glib-243.patch
===================================================================
--- skip-test-needs-glib-243.patch	                        (rev 0)
+++ skip-test-needs-glib-243.patch	2015-02-27 11:09:56 UTC (rev 232058)
@@ -0,0 +1,28 @@
+From 17613e50901c50fedcfe3542f0dc93630c9b2884 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain.lane at canonical.com>
+Date: Wed, 10 Dec 2014 12:05:19 +0000
+Subject: tls/tests: skip test_create_certificate_chain if not running against
+ glib 2.43
+
+https://bugzilla.gnome.org/show_bug.cgi?id=741331
+
+diff --git a/tls/tests/certificate.c b/tls/tests/certificate.c
+index 97c1793..7d3f031 100644
+--- a/tls/tests/certificate.c
++++ b/tls/tests/certificate.c
+@@ -226,6 +226,12 @@ test_create_certificate_chain (void)
+   GTlsCertificate *cert, *intermediate, *root;
+   GError *error = NULL;
+ 
++  if (glib_check_version (2, 43, 0))
++    {
++      g_test_skip ("This test requires glib 2.43");
++      return;
++    }
++
+   cert = g_tls_certificate_new_from_file (tls_test_file_path ("chain.pem"), &error);
+   g_assert_no_error (error);
+   g_assert (G_IS_TLS_CERTIFICATE (cert));
+-- 
+cgit v0.10.2
+