summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2014-01-05 07:21:33 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2014-01-05 07:21:33 +0000
commit4e189e220dc9bd036fb8c8891ab1bae3d5b6efc5 (patch)
treea9df7fded1bd40cd32c6226a8bb9195b001c127b
parentFix for bug #497100 (diff)
downloadgentoo-2-4e189e220dc9bd036fb8c8891ab1bae3d5b6efc5.tar.gz
gentoo-2-4e189e220dc9bd036fb8c8891ab1bae3d5b6efc5.tar.bz2
gentoo-2-4e189e220dc9bd036fb8c8891ab1bae3d5b6efc5.zip
Fix underlinking failure (bug #497106, thanks to d_dart).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
-rw-r--r--gnome-extra/yelp/ChangeLog8
-rw-r--r--gnome-extra/yelp/files/yelp-2.30.2-gthread.patch12
-rw-r--r--gnome-extra/yelp/yelp-2.30.2-r200.ebuild7
3 files changed, 22 insertions, 5 deletions
diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 2a25a24f0dea..b679a0a8456d 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnome-extra/yelp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.306 2013/12/24 17:15:46 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.307 2014/01/05 07:21:33 tetromino Exp $
+
+ 05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+ yelp-2.30.2-r200.ebuild, +files/yelp-2.30.2-gthread.patch:
+ Fix underlinking failure (bug #497106, thanks to d_dart).
*yelp-3.10.1 (24 Dec 2013)
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-gthread.patch b/gnome-extra/yelp/files/yelp-2.30.2-gthread.patch
new file mode 100644
index 000000000000..bd84d7795ff2
--- /dev/null
+++ b/gnome-extra/yelp/files/yelp-2.30.2-gthread.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.in b/configure.in
+index 9b5fd48..6c2fd89 100644
+--- a/configure.in
++++ b/configure.in
+@@ -68,6 +68,7 @@ AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
+ PKG_CHECK_MODULES(YELP,
+ [
+ gio-2.0
++ gthread-2.0
+ gconf-2.0
+ gnome-doc-utils >= 0.19.1
+ gtk+-unix-print-2.0
diff --git a/gnome-extra/yelp/yelp-2.30.2-r200.ebuild b/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
index 8bf6950d7ab8..0208d90c42e4 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-r200.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r200.ebuild,v 1.10 2012/12/19 02:12:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r200.ebuild,v 1.11 2014/01/05 07:21:33 tetromino Exp $
# git clone git://git.gnome.org/yelp
# cd yelp
@@ -56,7 +56,8 @@ src_prepare() {
"${FILESDIR}"/${P}-uri-handler.patch \
"${FILESDIR}"/${P}-print-crash.patch \
"${FILESDIR}"/${P}-freeze-move.patch \
- "${FILESDIR}"/${P}-xz-support.patch
+ "${FILESDIR}"/${P}-xz-support.patch \
+ "${FILESDIR}"/${P}-gthread.patch
sed -i -e '/CFLAGS/s:-pedantic -ansi::' configure.in || die #196621