1 |
jurek 08/05/31 12:51:11 |
2 |
|
3 |
Added: mono-tools-1.9-html-renderer-fixes.patch |
4 |
Log: |
5 |
dev-util/mono-tools: version bump (bug #213381) |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-util/mono-tools/files/mono-tools-1.9-html-renderer-fixes.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/files/mono-tools-1.9-html-renderer-fixes.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/files/mono-tools-1.9-html-renderer-fixes.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: mono-tools-1.9-html-renderer-fixes.patch |
15 |
=================================================================== |
16 |
--- configure.in 2008-02-06 19:12:17.000000000 +0100 |
17 |
+++ configure.in.new 2008-03-20 14:37:13.000000000 +0100 |
18 |
@@ -43,26 +43,39 @@ |
19 |
AC_SUBST(GTK_SHARP_LIBS) |
20 |
|
21 |
PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no) |
22 |
-if test "x$enable_gtkhtml" = "xyes"; then |
23 |
-CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14" |
24 |
-else |
25 |
-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no) |
26 |
-CSHARP_FLAGS= |
27 |
+dnl PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no) |
28 |
+dnl if test "x$enable_gtkhtml" = "xyes"; then |
29 |
+dnl CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14" |
30 |
+dnl else |
31 |
+AC_ARG_ENABLE(gtkhtml, |
32 |
+ AC_HELP_STRING([--enable-gtkhtml], [Use GTKHTML Browser]),, |
33 |
+ enable_gtkhtml=yes) |
34 |
+ |
35 |
+if test "x$enable_gtkhtml" = "xyes" ; then |
36 |
+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0) |
37 |
+ |
38 |
+ AC_SUBST(GTKHTML_SHARP_LIBS) |
39 |
+ AC_SUBST(CSHARP_FLAGS) |
40 |
fi |
41 |
-AC_SUBST(GTKHTML_SHARP_LIBS) |
42 |
-AC_SUBST(CSHARP_FLAGS) |
43 |
-AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") |
44 |
+dnl fi |
45 |
|
46 |
-PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0, enable_gecko=yes, enable_gecko=no) |
47 |
-AC_SUBST(GECKO_SHARP_LIBS) |
48 |
-AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes") |
49 |
+AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") |
50 |
|
51 |
-if test "x$enable_gecko" = "xyes"; then |
52 |
- # get the mozilla home directory |
53 |
- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" |
54 |
- AC_SUBST(MOZILLA_HOME) |
55 |
+AC_ARG_ENABLE(mozilla, |
56 |
+ AC_HELP_STRING([--enable-mozilla], [Use Gecko Browser]),, |
57 |
+ enable_gecko=yes) |
58 |
+ |
59 |
+if test "x$enable_gecko"= "xyes" ; then |
60 |
+ PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0) |
61 |
+ |
62 |
+ AC_SUBST(GECKO_SHARP_LIBS) |
63 |
+ |
64 |
+ # get the mozilla home directory |
65 |
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" |
66 |
+ AC_SUBST(MOZILLA_HOME) |
67 |
fi |
68 |
|
69 |
+AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes") |
70 |
|
71 |
if test "x$enable_gtkhtml$enable_gecko" = "xnono" ; then |
72 |
AC_MSG_ERROR([no HTML display found. You need either gtkhtml or gecko]) |
73 |
|
74 |
--- docbrowser/monodoc.in 2008-03-10 23:34:01.000000000 +0100 |
75 |
+++ docbrowser/monodoc.in.new 2008-03-20 14:27:26.000000000 +0100 |
76 |
@@ -85,8 +85,10 @@ |
77 |
MOZILLA_HOME=$MOZILLA_FIVE_HOME |
78 |
elif [ $(which mozilla 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then |
79 |
MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2) |
80 |
-elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then |
81 |
- MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2) |
82 |
+elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_LIBDIR= "$(which firefox)" > /dev/null ; then |
83 |
+ MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which firefox) | cut -d '=' -f 2) |
84 |
+elif [ $(which seamonkey 2> /dev/null) ] && grep MOZILLA_LIBDIR= "$(which seamonkey)" > /dev/null ; then |
85 |
+ MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which seamonkey) | cut -d '=' -f 2) |
86 |
fi |
87 |
|
88 |
if [ -n $LD_LIBRARY_PATH ]; then |
89 |
|
90 |
|
91 |
|
92 |
-- |
93 |
gentoo-commits@l.g.o mailing list |