summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-10-31 20:08:58 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-10-31 20:08:58 +0000
commitd0ce9bc530736bb7a87bf693740b37282d62b257 (patch)
treee67c9629ca6eabf5e86bec01238617c36a5d801e
parentFix docs processing in src_install. Thanks to Arfrever. (diff)
downloadgentoo-2-d0ce9bc530736bb7a87bf693740b37282d62b257.tar.gz
gentoo-2-d0ce9bc530736bb7a87bf693740b37282d62b257.tar.bz2
gentoo-2-d0ce9bc530736bb7a87bf693740b37282d62b257.zip
Another underlinking fix, bug 387609
(Portage version: 2.1.10.32/cvs/Linux x86_64)
-rw-r--r--sci-astronomy/celestia/ChangeLog6
-rw-r--r--sci-astronomy/celestia/celestia-1.6.1.ebuild4
-rw-r--r--sci-astronomy/celestia/files/celestia-1.6.1-underlinking.patch21
3 files changed, 29 insertions, 2 deletions
diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog
index 708ed2d19b89..fed5b2950ff4 100644
--- a/sci-astronomy/celestia/ChangeLog
+++ b/sci-astronomy/celestia/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-astronomy/celestia
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.78 2011/10/23 16:16:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.79 2011/10/31 20:08:58 dilfridge Exp $
+
+ 31 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> celestia-1.6.1.ebuild,
+ +files/celestia-1.6.1-underlinking.patch:
+ Another underlinking fix, bug 387609
23 Oct 2011; Raúl Porcel <armin76@gentoo.org> celestia-1.6.0.ebuild,
celestia-1.6.1.ebuild:
diff --git a/sci-astronomy/celestia/celestia-1.6.1.ebuild b/sci-astronomy/celestia/celestia-1.6.1.ebuild
index b64613c21dbf..281fbd49953c 100644
--- a/sci-astronomy/celestia/celestia-1.6.1.ebuild
+++ b/sci-astronomy/celestia/celestia-1.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.8 2011/10/23 16:16:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.9 2011/10/31 20:08:58 dilfridge Exp $
EAPI=2
@@ -62,6 +62,8 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-gold.patch
# missing zlib.h include with libpng15
epatch "${FILESDIR}"/${P}-libpng15.patch
+ # another underlinking fix, bug 387609
+ epatch "${FILESDIR}"/${P}-underlinking.patch
# remove flags to let the user decide
for cf in -O2 -ffast-math \
diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-underlinking.patch b/sci-astronomy/celestia/files/celestia-1.6.1-underlinking.patch
new file mode 100644
index 000000000000..3cb62f3b8583
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.6.1-underlinking.patch
@@ -0,0 +1,21 @@
+diff -ruN celestia-1.6.1.orig/src/celestia/Makefile.am celestia-1.6.1/src/celestia/Makefile.am
+--- celestia-1.6.1.orig/src/celestia/Makefile.am 2011-06-05 18:11:13.000000000 +0200
++++ celestia-1.6.1/src/celestia/Makefile.am 2011-10-31 21:02:23.000000000 +0100
+@@ -80,7 +80,6 @@
+ celestia_LDADD = \
+ $(celestiaKDELIBS) \
+ $(celestiaGTKLIBS) \
+- $(DL_LIBS) \
+ $(LUA_LIBS) \
+ $(THEORA_LIBS) \
+ ../celengine/libcelengine.a \
+@@ -88,7 +87,8 @@
+ ../cel3ds/libcel3ds.a \
+ ../celmath/libcelmath.a \
+ ../celutil/libcelutil.a \
+- $(SPICE_LIBS)
++ $(SPICE_LIBS) \
++ $(DL_LIBS)
+
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia