commit:     91d983740041a978dbd5d8592013f33fb7c1bf00
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 23 21:25:32 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 21:06:49 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=91d98374

net-libs/glib-networking: 2.40.0 → 2.40.1

---
 .../files/glib-networking-2.40.1-unittests.patch   | 45 ++++++++++++++++++++++
 ...2.40.0.ebuild => glib-networking-2.40.1.ebuild} |  9 ++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git 
a/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch 
b/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch
new file mode 100644
index 0000000..4301b84
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.40.1-unittests.patch
@@ -0,0 +1,45 @@
+From 8867e6a0b3b84b41b5a61c5194fa1300c5c39d8c Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <[email protected]>
+Date: Fri, 25 Apr 2014 22:59:01 +0200
+Subject: [PATCH] test connection is not PKCS#11 related
+
+Avoids silly test failure:
+
+CCLD     connection
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../lib64/Scrt1.o: In
+function `_start':
+(.text+0x20): undefined reference to `main'
+collect2: error: ld returned 1 exit status
+Makefile:897: recipe for target 'connection' failed
+make[4]: *** [connection] Error 1
+---
+ tls/tests/Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
+index 6287b9c..009b388 100644
+--- a/tls/tests/Makefile.am
++++ b/tls/tests/Makefile.am
+@@ -15,6 +15,9 @@ test_programs =       \
+       connection    \
+       $(NULL)
+ 
++connection_SOURCES = connection.c \
++      mock-interaction.c mock-interaction.h
++
+ if HAVE_PKCS11
+ 
+ test_programs +=           \
+@@ -33,9 +36,6 @@ pkcs11_slot_SOURCES = pkcs11-slot.c \
+       mock-pkcs11.c mock-pkcs11.h \
+       mock-interaction.c mock-interaction.h
+ 
+-connection_SOURCES = connection.c \
+-      mock-interaction.c mock-interaction.h
+-
+ endif
+ 
+ testfiles_data =                              \
+-- 
+1.9.0
+

diff --git a/net-libs/glib-networking/glib-networking-2.40.0.ebuild 
b/net-libs/glib-networking/glib-networking-2.40.1.ebuild
similarity index 90%
rename from net-libs/glib-networking/glib-networking-2.40.0.ebuild
rename to net-libs/glib-networking/glib-networking-2.40.1.ebuild
index a76e962..ed2b92f 100644
--- a/net-libs/glib-networking/glib-networking-2.40.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.40.1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
 
 DESCRIPTION="Network-related giomodules for glib"
 HOMEPAGE="http://git.gnome.org/browse/glib-networking/";
@@ -35,6 +35,13 @@ DEPEND="${RDEPEND}
 "
 # eautoreconf needs >=sys-devel/autoconf-2.65:2.5
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-unittests.patch
+       eautoreconf
+       gnome2_src_prepare
+}
+
+
 src_configure() {
        gnome2_src_configure \
                --disable-static \

Reply via email to