| 1 |
ali_bush 10/10/10 05:04:47 |
| 2 |
|
| 3 |
Added: mono-tools-2.8-html-renderer-fixes.patch |
| 4 |
Log: |
| 5 |
Version Bump. |
| 6 |
|
| 7 |
(Portage version: 2.1.9.14/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/mono-tools/files/mono-tools-2.8-html-renderer-fixes.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/mono-tools/files/mono-tools-2.8-html-renderer-fixes.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/mono-tools/files/mono-tools-2.8-html-renderer-fixes.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: mono-tools-2.8-html-renderer-fixes.patch |
| 16 |
=================================================================== |
| 17 |
--- configure.in.old 2010-10-09 16:52:09.859675267 +0200 |
| 18 |
+++ configure.in 2010-10-09 17:01:01.043434596 +0200 |
| 19 |
@@ -62,50 +62,80 @@ |
| 20 |
AC_SUBST(GNOME_SHARP_LIBS) |
| 21 |
AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes") |
| 22 |
|
| 23 |
-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no) |
| 24 |
-if test "x$enable_gtkhtml" = "xyes"; then |
| 25 |
- CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14 $CSHARP_FLAGS" |
| 26 |
-else |
| 27 |
- PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no) |
| 28 |
+AC_ARG_ENABLE(gtkhtml, |
| 29 |
+ AC_HELP_STRING([--enable-gtkhtml], [Use GTKHTML Browser]),, |
| 30 |
+ enable_gtkhtml=yes) |
| 31 |
+ |
| 32 |
+if test "x$enable_gtkhtml" = "xyes" ; then |
| 33 |
+ PKG_CHECK_MODULES([GTKHTML_SHARP], |
| 34 |
+ [gtkhtml-sharp-3.14], |
| 35 |
+ [CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"], |
| 36 |
+ [ |
| 37 |
+ PKG_CHECK_MODULES([GTKHTML_SHARP], |
| 38 |
+ [gtkhtml-sharp-2.0], |
| 39 |
+ [CSHARP_FLAGS=""], |
| 40 |
+ []) |
| 41 |
+ ] |
| 42 |
+ ) |
| 43 |
+ AC_SUBST(GTKHTML_SHARP_LIBS) |
| 44 |
+ AC_SUBST(CSHARP_FLAGS) |
| 45 |
fi |
| 46 |
-AC_SUBST(GTKHTML_SHARP_LIBS) |
| 47 |
+ |
| 48 |
AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") |
| 49 |
|
| 50 |
-AC_SUBST(CSHARP_FLAGS) |
| 51 |
+AC_ARG_ENABLE(gecko, |
| 52 |
+ AC_HELP_STRING([--enable-gecko], [Use Gecko / Xulrunner-1.8 browser libs]),, |
| 53 |
+ enable_gecko=yes) |
| 54 |
+ |
| 55 |
+if test "x$enable_gecko" = "xyes" ; then |
| 56 |
+ PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0) |
| 57 |
+ |
| 58 |
+ AC_SUBST(GECKO_SHARP_LIBS) |
| 59 |
+ |
| 60 |
+ # get the mozilla home directory |
| 61 |
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" |
| 62 |
+ AC_SUBST(MOZILLA_HOME) |
| 63 |
+fi |
| 64 |
|
| 65 |
-PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0, enable_gecko=yes, enable_gecko=no) |
| 66 |
-AC_SUBST(GECKO_SHARP_LIBS) |
| 67 |
AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes") |
| 68 |
|
| 69 |
-if test "x$enable_gecko" = "xyes"; then |
| 70 |
- # get the mozilla home directory |
| 71 |
- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" |
| 72 |
- AC_SUBST(MOZILLA_HOME) |
| 73 |
+AC_ARG_ENABLE(webkit, |
| 74 |
+ AC_HELP_STRING([--enable-webkit], [Use Webkit browser]),, |
| 75 |
+ enable_webkit=yes) |
| 76 |
+ |
| 77 |
+if test "x$enable_webkit" = "xyes" ; then |
| 78 |
+ PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0) |
| 79 |
+ AC_SUBST(WEBKIT_SHARP_LIBS) |
| 80 |
fi |
| 81 |
|
| 82 |
-PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no) |
| 83 |
-AC_SUBST(WEBKIT_SHARP_LIBS) |
| 84 |
AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes") |
| 85 |
|
| 86 |
# PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no) |
| 87 |
# AC_SUBST(MONOWEBBROWSER_LIBS) |
| 88 |
|
| 89 |
-AC_MSG_CHECKING([for Mono.WebBrowser]) |
| 90 |
-if test "x$GACUTIL" = "xno" |
| 91 |
-then |
| 92 |
- AC_MSG_RESULT([no]) |
| 93 |
- if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi |
| 94 |
-else |
| 95 |
- if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser" |
| 96 |
+AC_ARG_ENABLE(monowebbrowser, |
| 97 |
+ AC_HELP_STRING([--enable-monowebbrowser], [Use Mono.Webbrowser]),, |
| 98 |
+ enable_monowebbrowser=yes) |
| 99 |
+ |
| 100 |
+if test "x$enable_monowebbrowser" = "xyes" ; then |
| 101 |
+ AC_MSG_CHECKING([for Mono.WebBrowser]) |
| 102 |
+ if test "x$GACUTIL" = "xno" |
| 103 |
then |
| 104 |
- AC_MSG_RESULT([yes]) |
| 105 |
- enable_monowebbrowser=yes |
| 106 |
- else |
| 107 |
AC_MSG_RESULT([no]) |
| 108 |
- enable_monowebbrowser=no |
| 109 |
- fi |
| 110 |
+ if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi |
| 111 |
+ else |
| 112 |
+ if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser" |
| 113 |
+ then |
| 114 |
+ AC_MSG_RESULT([yes]) |
| 115 |
+ enable_monowebbrowser=yes |
| 116 |
+ MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser |
| 117 |
+ else |
| 118 |
+ AC_MSG_RESULT([no]) |
| 119 |
+ enable_monowebbrowser=no |
| 120 |
+ fi |
| 121 |
+ fi |
| 122 |
fi |
| 123 |
-MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser |
| 124 |
+ |
| 125 |
AM_CONDITIONAL(ENABLE_MONOWEBBROWSER, test "x$enable_monowebbrowser" = "xyes") |
| 126 |
|
| 127 |
if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then |
Archives