summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-06-24 17:20:03 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-06-24 17:20:03 +0000
commit8602c49297b4defb83ea62b773d032a028c0ebb7 (patch)
tree7d472931b924c5b0ecd0e656a975133d3efdebb5 /sci-astronomy/celestia/files
parentamd64 stable, bug #229231 (diff)
downloadgentoo-2-8602c49297b4defb83ea62b773d032a028c0ebb7.tar.gz
gentoo-2-8602c49297b4defb83ea62b773d032a028c0ebb7.tar.bz2
gentoo-2-8602c49297b4defb83ea62b773d032a028c0ebb7.zip
Version bump, including fix for libtool-2.2 problems (bug #228865 and #218982).
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-SENTINEL-3 i686)
Diffstat (limited to 'sci-astronomy/celestia/files')
-rw-r--r--sci-astronomy/celestia/files/celestia-1.5.1-arts.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/sci-astronomy/celestia/files/celestia-1.5.1-arts.patch b/sci-astronomy/celestia/files/celestia-1.5.1-arts.patch
new file mode 100644
index 000000000000..2f257a919901
--- /dev/null
+++ b/sci-astronomy/celestia/files/celestia-1.5.1-arts.patch
@@ -0,0 +1,34 @@
+diff -Naur celestia-1.5.1/acinclude.m4 celestia-1.5.1.new/acinclude.m4
+--- celestia-1.5.1/acinclude.m4 2008-04-23 17:18:48.000000000 -0400
++++ celestia-1.5.1.new/acinclude.m4 2008-06-24 10:00:53.000000000 -0400
+@@ -522,6 +522,15 @@
+
+ AC_DEFUN(KDE_SUBST_PROGRAMS,
+ [
++ AC_ARG_WITH(arts,
++ AC_HELP_STRING([--without-arts],[build without aRts [default=no]]),
++ [build_arts=$withval],
++ [build_arts=yes]
++ )
++ AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
++ if test "$build_arts" = "no"; then
++ AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
++ fi
+
+ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+ test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+@@ -536,8 +545,12 @@
+ kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
+ KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
+ KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
+- KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
+- KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
++
++ if test "$build_arts" '!=' "no"; then
++ KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
++ KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
++ fi
++
+ KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
+ KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
+