Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-astronomy/celestia/files: celestia-1.6.0-kde-3.5.patch
Date: Sun, 06 Sep 2009 18:24:08
Message-Id: E1MkMPF-0006dB-KU@stork.gentoo.org
1 bicatali 09/09/06 18:24:05
2
3 Added: celestia-1.6.0-kde-3.5.patch
4 Log:
5 Fixed when kde 3 when kde4 is installed, thanks to johannis, closing bug #282829
6 (Portage version: 2.2_rc40/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sci-astronomy/celestia/files/celestia-1.6.0-kde-3.5.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.0-kde-3.5.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/celestia/files/celestia-1.6.0-kde-3.5.patch?rev=1.1&content-type=text/plain
13
14 Index: celestia-1.6.0-kde-3.5.patch
15 ===================================================================
16 --- acinclude.m4 2009-09-05 10:30:34.000000000 +0200
17 +++ newacinclude.m4 2009-09-05 20:47:53.000000000 +0200
18 @@ -1792,9 +1792,9 @@
19 AC_MSG_CHECKING([for KDE])
20
21 if test "${prefix}" != NONE; then
22 - kde_includes=${includedir}
23 - KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
24 -
25 + kde_includes=${prefix}/kde/3.5/include
26 + ac_kde_includes=$prefix/kde/3.5/include
27 +
28 kde_libraries=${libdir}
29 KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
30
31 @@ -1818,7 +1818,7 @@
32
33 if test -z "$1"; then
34
35 -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
36 +kde_incdirs="/usr/kde/3.5/include $x_includes $qt_includes"
37 test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
38 kde_incdirs="$ac_kde_includes $kde_incdirs"
39 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)