Date: Friday, February 27, 2015 @ 12:10:06
Author: jgc
Revision: 232059
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
glib-networking/repos/extra-i686/PKGBUILD
(from rev 232058, glib-networking/trunk/PKGBUILD)
glib-networking/repos/extra-i686/glib-networking.install
(from rev 232058, glib-networking/trunk/glib-networking.install)
glib-networking/repos/extra-i686/skip-test-needs-glib-243.patch
(from rev 232058, glib-networking/trunk/skip-test-needs-glib-243.patch)
glib-networking/repos/extra-x86_64/PKGBUILD
(from rev 232058, glib-networking/trunk/PKGBUILD)
glib-networking/repos/extra-x86_64/glib-networking.install
(from rev 232058, glib-networking/trunk/glib-networking.install)
glib-networking/repos/extra-x86_64/skip-test-needs-glib-243.patch
(from rev 232058, glib-networking/trunk/skip-test-needs-glib-243.patch)
Deleted:
glib-networking/repos/extra-i686/PKGBUILD
glib-networking/repos/extra-i686/glib-networking.install
glib-networking/repos/extra-x86_64/PKGBUILD
glib-networking/repos/extra-x86_64/glib-networking.install
---------------------------------------------+
/PKGBUILD | 84 ++++++++++++++++++++++++++
/glib-networking.install | 22 ++++++
extra-i686/PKGBUILD | 35 ----------
extra-i686/glib-networking.install | 11 ---
extra-i686/skip-test-needs-glib-243.patch | 28 ++++++++
extra-x86_64/PKGBUILD | 35 ----------
extra-x86_64/glib-networking.install | 11 ---
extra-x86_64/skip-test-needs-glib-243.patch | 28 ++++++++
8 files changed, 162 insertions(+), 92 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-02-27 11:09:56 UTC (rev 232058)
+++ extra-i686/PKGBUILD 2015-02-27 11:10:06 UTC (rev 232059)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-
-pkgname=glib-networking
-pkgver=2.42.0
-pkgrel=1
-pkgdesc="Network-related giomodules for glib"
-arch=(i686 x86_64)
-url="http://www.gtk.org/";
-license=(GPL2)
-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')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/$pkgname --disable-static \
- --disable-installed-tests
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make -k check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install testfiles_DATA=
-}
-
-# vim:set ts=2 sw=2 et:
Copied: glib-networking/repos/extra-i686/PKGBUILD (from rev 232058,
glib-networking/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-02-27 11:10:06 UTC (rev 232059)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+
+pkgname=glib-networking
+pkgver=2.42.1
+pkgrel=1
+pkgdesc="Network-related giomodules for glib"
+arch=(i686 x86_64)
+url="http://www.gtk.org/";
+license=(GPL2)
+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
+ 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 \
+ --libexecdir=/usr/lib/$pkgname --disable-static \
+ --disable-installed-tests
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -j1 -k check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install testfiles_DATA=
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/glib-networking.install
===================================================================
--- extra-i686/glib-networking.install 2015-02-27 11:09:56 UTC (rev 232058)
+++ extra-i686/glib-networking.install 2015-02-27 11:10:06 UTC (rev 232059)
@@ -1,11 +0,0 @@
-post_install() {
- gio-querymodules /usr/lib/gio/modules
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: glib-networking/repos/extra-i686/glib-networking.install (from rev
232058, glib-networking/trunk/glib-networking.install)
===================================================================
--- extra-i686/glib-networking.install (rev 0)
+++ extra-i686/glib-networking.install 2015-02-27 11:10:06 UTC (rev 232059)
@@ -0,0 +1,11 @@
+post_install() {
+ gio-querymodules /usr/lib/gio/modules
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: glib-networking/repos/extra-i686/skip-test-needs-glib-243.patch (from
rev 232058, glib-networking/trunk/skip-test-needs-glib-243.patch)
===================================================================
--- extra-i686/skip-test-needs-glib-243.patch (rev 0)
+++ extra-i686/skip-test-needs-glib-243.patch 2015-02-27 11:10:06 UTC (rev
232059)
@@ -0,0 +1,28 @@
+From 17613e50901c50fedcfe3542f0dc93630c9b2884 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain.l...@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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-02-27 11:09:56 UTC (rev 232058)
+++ extra-x86_64/PKGBUILD 2015-02-27 11:10:06 UTC (rev 232059)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
-
-pkgname=glib-networking
-pkgver=2.42.0
-pkgrel=1
-pkgdesc="Network-related giomodules for glib"
-arch=(i686 x86_64)
-url="http://www.gtk.org/";
-license=(GPL2)
-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')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/$pkgname --disable-static \
- --disable-installed-tests
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make -k check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install testfiles_DATA=
-}
-
-# vim:set ts=2 sw=2 et:
Copied: glib-networking/repos/extra-x86_64/PKGBUILD (from rev 232058,
glib-networking/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-02-27 11:10:06 UTC (rev 232059)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com>
+
+pkgname=glib-networking
+pkgver=2.42.1
+pkgrel=1
+pkgdesc="Network-related giomodules for glib"
+arch=(i686 x86_64)
+url="http://www.gtk.org/";
+license=(GPL2)
+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
+ 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 \
+ --libexecdir=/usr/lib/$pkgname --disable-static \
+ --disable-installed-tests
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -j1 -k check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install testfiles_DATA=
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/glib-networking.install
===================================================================
--- extra-x86_64/glib-networking.install 2015-02-27 11:09:56 UTC (rev
232058)
+++ extra-x86_64/glib-networking.install 2015-02-27 11:10:06 UTC (rev
232059)
@@ -1,11 +0,0 @@
-post_install() {
- gio-querymodules /usr/lib/gio/modules
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: glib-networking/repos/extra-x86_64/glib-networking.install (from rev
232058, glib-networking/trunk/glib-networking.install)
===================================================================
--- extra-x86_64/glib-networking.install (rev 0)
+++ extra-x86_64/glib-networking.install 2015-02-27 11:10:06 UTC (rev
232059)
@@ -0,0 +1,11 @@
+post_install() {
+ gio-querymodules /usr/lib/gio/modules
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: glib-networking/repos/extra-x86_64/skip-test-needs-glib-243.patch (from
rev 232058, glib-networking/trunk/skip-test-needs-glib-243.patch)
===================================================================
--- extra-x86_64/skip-test-needs-glib-243.patch (rev 0)
+++ extra-x86_64/skip-test-needs-glib-243.patch 2015-02-27 11:10:06 UTC (rev
232059)
@@ -0,0 +1,28 @@
+From 17613e50901c50fedcfe3542f0dc93630c9b2884 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain.l...@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
+
