1 |
loki_val 08/11/23 19:53:17 |
2 |
|
3 |
Modified: mono-tools-2.0-html-renderer-fixes.patch |
4 |
Log: |
5 |
Make xulrunner and webkit backends selectable. |
6 |
(Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: mono-tools-2.0-html-renderer-fixes.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- mono-tools-2.0-html-renderer-fixes.patch 19 Nov 2008 22:36:39 -0000 1.1 |
22 |
+++ mono-tools-2.0-html-renderer-fixes.patch 23 Nov 2008 19:53:17 -0000 1.2 |
23 |
@@ -1,22 +1,21 @@ |
24 |
-diff -urN mono-tools-2.0.old/configure.in mono-tools-2.0/configure.in |
25 |
---- mono-tools-2.0.old/configure.in 2008-10-15 11:48:22.000000000 +0200 |
26 |
-+++ mono-tools-2.0/configure.in 2008-10-15 12:09:00.000000000 +0200 |
27 |
-@@ -46,26 +46,40 @@ |
28 |
+diff -NrU5 mono-tools-2.0.orig/configure.in mono-tools-2.0/configure.in |
29 |
+--- mono-tools-2.0.orig/configure.in 2008-11-23 20:37:03.000000000 +0100 |
30 |
++++ mono-tools-2.0/configure.in 2008-11-23 20:38:00.000000000 +0100 |
31 |
+@@ -43,33 +43,49 @@ |
32 |
+ |
33 |
+ PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0) |
34 |
+ #PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp) |
35 |
AC_SUBST(GTK_SHARP_LIBS) |
36 |
|
37 |
- PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no) |
38 |
+-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no) |
39 |
-if test "x$enable_gtkhtml" = "xyes"; then |
40 |
-CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14" |
41 |
-else |
42 |
-PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no) |
43 |
-CSHARP_FLAGS= |
44 |
-+dnl PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enabl e_gtkhtml=no) |
45 |
-+dnl if test "x$enable_gtkhtml" = "xyes"; then |
46 |
-+dnl CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14" |
47 |
-+dnl else |
48 |
+AC_ARG_ENABLE(gtkhtml, |
49 |
-+ AC_HELP_STRING([--enable-gtkhtml], [Use GTKHTML Browser]),, |
50 |
-+ enable_gtkhtml=yes) |
51 |
++ AC_HELP_STRING([--enable-gtkhtml], [Use GTKHTML Browser]),, |
52 |
++ enable_gtkhtml=yes) |
53 |
+ |
54 |
+if test "x$enable_gtkhtml" = "xyes" ; then |
55 |
+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0) |
56 |
@@ -26,23 +25,23 @@ |
57 |
fi |
58 |
-AC_SUBST(GTKHTML_SHARP_LIBS) |
59 |
-AC_SUBST(CSHARP_FLAGS) |
60 |
--AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") |
61 |
+dnl fi |
62 |
++ |
63 |
+ AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") |
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 |
-+AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") |
69 |
- |
70 |
+- |
71 |
-if test "x$enable_gecko" = "xyes"; then |
72 |
- # get the mozilla home directory |
73 |
- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" |
74 |
- AC_SUBST(MOZILLA_HOME) |
75 |
+AC_ARG_ENABLE(mozilla, |
76 |
-+ AC_HELP_STRING([--enable-mozilla], [Use Gecko Browser]),, |
77 |
-+ enable_gecko=yes) |
78 |
++ AC_HELP_STRING([--enable-mozilla], [Use Mozilla browser]),, |
79 |
++ enable_mozilla=yes) |
80 |
+ |
81 |
-+if test "x$enable_gecko"= "xyes" ; then |
82 |
++if test "x$enable_mozilla" = "xyes" ; then |
83 |
+ PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0) |
84 |
+ |
85 |
+ AC_SUBST(GECKO_SHARP_LIBS) |
86 |
@@ -50,17 +49,60 @@ |
87 |
+ # get the mozilla home directory |
88 |
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" |
89 |
+ AC_SUBST(MOZILLA_HOME) |
90 |
++fi |
91 |
++ |
92 |
++AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_mozilla" = "xyes") |
93 |
++ |
94 |
++AC_ARG_ENABLE(webkit, |
95 |
++ AC_HELP_STRING([--enable-webkit], [Use Webkit browser]),, |
96 |
++ enable_mozilla=yes) |
97 |
++ |
98 |
++if test "x$enable_webkit" = "xyes" ; then |
99 |
++ PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0) |
100 |
++ AC_SUBST(WEBKIT_SHARP_LIBS) |
101 |
fi |
102 |
|
103 |
-+AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes") |
104 |
-+ |
105 |
- PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no) |
106 |
- AC_SUBST(WEBKIT_SHARP_LIBS) |
107 |
+-PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no) |
108 |
+-AC_SUBST(WEBKIT_SHARP_LIBS) |
109 |
AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes") |
110 |
-diff -urN mono-tools-2.0.old/docbrowser/monodoc.in mono-tools-2.0/docbrowser/monodoc.in |
111 |
---- mono-tools-2.0.old/docbrowser/monodoc.in 2008-10-15 12:09:36.000000000 +0200 |
112 |
-+++ mono-tools-2.0/docbrowser/monodoc.in 2008-10-15 12:12:33.000000000 +0200 |
113 |
-@@ -86,8 +86,10 @@ |
114 |
+ |
115 |
+ # PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no) |
116 |
+ # AC_SUBST(MONOWEBBROWSER_LIBS) |
117 |
+ |
118 |
+@@ -89,12 +105,12 @@ |
119 |
+ fi |
120 |
+ fi |
121 |
+ MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser |
122 |
+ AM_CONDITIONAL(ENABLE_MONOWEBBROWSER, test "x$enable_monowebbrowser" = "xyes") |
123 |
+ |
124 |
+-if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then |
125 |
+- AC_MSG_ERROR([no HTML display found. You need either gtkhtml, gecko, WebKit or Mono.WebBrowser]) |
126 |
++if test "x$enable_gtkhtml$enable_mozilla$enable_monowebbrowser$enable_webkit" = "xnononono" ; then |
127 |
++ AC_MSG_ERROR([no HTML display found. You need either gtkhtml, mozilla, WebKit or Mono.WebBrowser]) |
128 |
+ fi |
129 |
+ |
130 |
+ AC_ARG_ENABLE(debug, |
131 |
+ AC_HELP_STRING([--enable-debug], |
132 |
+ [Use 'DEBUG' Configuration [default=YES]]), |
133 |
+@@ -232,11 +248,11 @@ |
134 |
+ |
135 |
+ echo "---" |
136 |
+ echo "Configuration summary" |
137 |
+ echo "" |
138 |
+ echo " * Installation prefix = $prefix" |
139 |
+-echo " * Using Gecko = $enable_gecko" |
140 |
++echo " * Using Mozilla = $enable_mozilla" |
141 |
+ echo " * Using GtkHtml = $enable_gtkhtml" |
142 |
+ echo " * Using Mono.WebBrowser = $enable_monowebbrowser" |
143 |
+ echo " * Using WebKit = $enable_webkit" |
144 |
+ echo "" |
145 |
+ echo " NOTE: if any of the above say 'no' you may install the" |
146 |
+diff -NrU5 mono-tools-2.0.orig/docbrowser/monodoc.in mono-tools-2.0/docbrowser/monodoc.in |
147 |
+--- mono-tools-2.0.orig/docbrowser/monodoc.in 2008-11-23 20:37:03.000000000 +0100 |
148 |
++++ mono-tools-2.0/docbrowser/monodoc.in 2008-11-23 20:35:14.000000000 +0100 |
149 |
+@@ -84,12 +84,14 @@ |
150 |
+ elif [ $(which xulrunner 2> /dev/null) ] > /dev/null ; then |
151 |
+ MOZILLA_FIVE_HOME=`getdirectory xulrunner` |
152 |
MOZILLA_HOME=$MOZILLA_FIVE_HOME |
153 |
elif [ $(which mozilla 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then |
154 |
MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2) |
155 |
@@ -68,8 +110,10 @@ |
156 |
- MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2) |
157 |
+elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_LIBDIR= "$(which firefox)" > /dev/null ; then |
158 |
+ MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which firefox) | cut -d '=' -f 2) |
159 |
-+elif [ $(which seamonkey 2> /dev/null) ] && grep MOZILLA_LIBDIR= "$(which seamonke y)" > /dev/null ; then |
160 |
++elif [ $(which seamonkey 2> /dev/null) ] && grep MOZILLA_LIBDIR= "$(which seamonkey)" > /dev/null ; then |
161 |
+ MOZILLA_HOME=$(grep MOZILLA_LIBDIR= $(which seamonkey) | cut -d '=' -f 2) |
162 |
fi |
163 |
|
164 |
if [ -n $LD_LIBRARY_PATH ]; then |
165 |
+ export LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH |
166 |
+ else |