| 1 |
loki_val 08/11/26 17:35:31 |
| 2 |
|
| 3 |
Modified: mono-tools-2.0-html-renderer-fixes.patch |
| 4 |
Log: |
| 5 |
Update html-render-patch to work with 2.24.0 gtkhtml. Bug 248909. |
| 6 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 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.3&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.3&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.2&r2=1.3 |
| 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.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- mono-tools-2.0-html-renderer-fixes.patch 23 Nov 2008 19:53:17 -0000 1.2 |
| 22 |
+++ mono-tools-2.0-html-renderer-fixes.patch 26 Nov 2008 17:35:31 -0000 1.3 |
| 23 |
@@ -1,7 +1,7 @@ |
| 24 |
diff -NrU5 mono-tools-2.0.orig/configure.in mono-tools-2.0/configure.in |
| 25 |
---- mono-tools-2.0.orig/configure.in 2008-11-23 20:37:03.000000000 +0100 |
| 26 |
-+++ mono-tools-2.0/configure.in 2008-11-23 20:38:00.000000000 +0100 |
| 27 |
-@@ -43,33 +43,49 @@ |
| 28 |
+--- mono-tools-2.0.orig/configure.in 2008-11-26 18:19:23.000000000 +0100 |
| 29 |
++++ mono-tools-2.0/configure.in 2008-11-26 18:27:32.000000000 +0100 |
| 30 |
+@@ -43,33 +43,56 @@ |
| 31 |
|
| 32 |
PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0) |
| 33 |
#PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp) |
| 34 |
@@ -18,14 +18,21 @@ |
| 35 |
+ enable_gtkhtml=yes) |
| 36 |
+ |
| 37 |
+if test "x$enable_gtkhtml" = "xyes" ; then |
| 38 |
-+ PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0) |
| 39 |
-+ |
| 40 |
++ PKG_CHECK_MODULES([GTKHTML_SHARP], |
| 41 |
++ [gtkhtml-sharp-3.14], |
| 42 |
++ [CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"], |
| 43 |
++ [ |
| 44 |
++ PKG_CHECK_MODULES([GTKHTML_SHARP], |
| 45 |
++ [gtkhtml-sharp-2.0], |
| 46 |
++ [CSHARP_FLAGS=""], |
| 47 |
++ []) |
| 48 |
++ ] |
| 49 |
++ ) |
| 50 |
+ AC_SUBST(GTKHTML_SHARP_LIBS) |
| 51 |
+ AC_SUBST(CSHARP_FLAGS) |
| 52 |
fi |
| 53 |
-AC_SUBST(GTKHTML_SHARP_LIBS) |
| 54 |
-AC_SUBST(CSHARP_FLAGS) |
| 55 |
-+dnl fi |
| 56 |
+ |
| 57 |
AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") |
| 58 |
|
| 59 |
@@ -69,7 +76,7 @@ |
| 60 |
# PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no) |
| 61 |
# AC_SUBST(MONOWEBBROWSER_LIBS) |
| 62 |
|
| 63 |
-@@ -89,12 +105,12 @@ |
| 64 |
+@@ -89,12 +112,12 @@ |
| 65 |
fi |
| 66 |
fi |
| 67 |
MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser |
| 68 |
@@ -84,7 +91,7 @@ |
| 69 |
AC_ARG_ENABLE(debug, |
| 70 |
AC_HELP_STRING([--enable-debug], |
| 71 |
[Use 'DEBUG' Configuration [default=YES]]), |
| 72 |
-@@ -232,11 +248,11 @@ |
| 73 |
+@@ -232,11 +255,11 @@ |
| 74 |
|
| 75 |
echo "---" |
| 76 |
echo "Configuration summary" |
| 77 |
@@ -98,8 +105,8 @@ |
| 78 |
echo "" |
| 79 |
echo " NOTE: if any of the above say 'no' you may install the" |
| 80 |
diff -NrU5 mono-tools-2.0.orig/docbrowser/monodoc.in mono-tools-2.0/docbrowser/monodoc.in |
| 81 |
---- mono-tools-2.0.orig/docbrowser/monodoc.in 2008-11-23 20:37:03.000000000 +0100 |
| 82 |
-+++ mono-tools-2.0/docbrowser/monodoc.in 2008-11-23 20:35:14.000000000 +0100 |
| 83 |
+--- mono-tools-2.0.orig/docbrowser/monodoc.in 2008-11-26 18:19:23.000000000 +0100 |
| 84 |
++++ mono-tools-2.0/docbrowser/monodoc.in 2008-11-26 18:19:35.000000000 +0100 |
| 85 |
@@ -84,12 +84,14 @@ |
| 86 |
elif [ $(which xulrunner 2> /dev/null) ] > /dev/null ; then |
| 87 |
MOZILLA_FIVE_HOME=`getdirectory xulrunner` |
Archives