Update html-render-patch to work with 2.24.0 gtkhtml. Bug 248909.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc4 x86_64

3 files changed, 24 insertions, 13 deletions

diff --git a/dev-util/mono-tools/ChangeLog b/dev-util/mono-tools/ChangeLog
index a4b7e2234d40..5dac723a37ef 100644
--- a/dev-util/mono-tools/ChangeLog
+++ b/dev-util/mono-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/mono-tools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.44 2008/11/24 17:10:33 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/mono-tools/ChangeLog,v 1.45 2008/11/26 17:35:31 loki_val Exp $
+
+  26 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  files/mono-tools-2.0-html-renderer-fixes.patch:
+  Update html-render-patch to work with 2.24.0 gtkhtml. Bug 248909.
 
   24 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> mono-tools-2.0.ebuild:
   gtkhtml is NOT an optional dependency.
diff --git a/dev-util/mono-tools/Manifest b/dev-util/mono-tools/Manifest
index a67435ae803b..c52e4c51767b 100644
--- a/dev-util/mono-tools/Manifest
+++ b/dev-util/mono-tools/Manifest
@@ -2,7 +2,7 @@ AUX mono-tools-1.1.17-html-renderer-fixes.diff 3364 RMD160 48f594c035d9cd395bf4f
 AUX mono-tools-1.2.4-install.patch 288 RMD160 93e0d5d784f293ec3e1834ed44256414fad4056b SHA1 10b6927f3d3c47c44857d5bad424740883e66f5f SHA256 cc36ccbcdb4bc1468704fbe6b656f965dc350f411cf3feea3d2df489968389db
 AUX mono-tools-1.2.6-html-renderer-fixes.patch 3208 RMD160 acc437f2994cf2fa5a88b8798ce53944d7c1dcc0 SHA1 8d6c53ff03132d58f5ac0e7f0f5d7f9769db04cd SHA256 a65a31321b39c547d5c966401fe041e5800f6fb5c7bda87997b7f94f92b7220b
 AUX mono-tools-1.9-html-renderer-fixes.patch 2993 RMD160 f17d5817c77f9b3fc9ac561fae510e89e68c535f SHA1 b70cb44e99f4d0906e77628dd59fd9ce48e7ad0e SHA256 a99d508f6b826cb1979dc9113320182ae395d357a16c299ab4819437867ee7d8
-AUX mono-tools-2.0-html-renderer-fixes.patch 4913 RMD160 1bf383a585d853e520a5c8073c53220588b6e47a SHA1 ad65cdc491abd97b6e665c9dbd7330155883135f SHA256 6c99069899cd98c4774b689c6c025b251b508b6b2935188da33fcbb302c6fa03
+AUX mono-tools-2.0-html-renderer-fixes.patch 5076 RMD160 2f0c6b5c04df27564eed4807859f89c26e1df9ba SHA1 069bfbec88cb82a81b1422342224714183268794 SHA256 643ff6da3032fe33c3c09028411c9b9c935e343752c780e3e7a02786a5825f3a
 DIST mono-tools-1.2.1.tar.gz 281653 RMD160 b96046218262220a931b074724334a31743026a1 SHA1 268c06497f7f914f8a83a62c068c6ae85be10d5e SHA256 3968713b758fa80156de19339f20be102c34aadd2817f955041db8402d76be78
 DIST mono-tools-1.2.4.tar.bz2 301009 RMD160 5af55735b309ffd78e4e515ef53ab08968680c27 SHA1 503ad8e776ea388ee7033bb010328e5d92ddac0f SHA256 9246dad467d4d66f1d8e54d55051ba5e7e788efb8f070ca96d4407c5d9f961dd
 DIST mono-tools-1.2.6.tar.bz2 298147 RMD160 d94bb5229e82c7feb7e5b46ee62391177dabfcdb SHA1 a44b2474b92b074784929f0e8e2c6b153796b54c SHA256 323aafcacd8e8421b28228baad10cef6f3f15013486687add5cb326552684fdc
@@ -13,5 +13,5 @@ EBUILD mono-tools-1.2.4.ebuild 1909 RMD160 29a95a36080f5b402b476de41400cd0cfc3fc
 EBUILD mono-tools-1.2.6.ebuild 1800 RMD160 06a9760442fc16422d0bc2f21e1e33874cdd0fbd SHA1 5b8d4e0ee42fbfa5adde5ca572c42d20cad4e1c0 SHA256 44a9a67df834535155930d37528e2cdf1bacf14c087844411d2f87383572f8d8
 EBUILD mono-tools-1.9.ebuild 1762 RMD160 d2e51729e66ba99b17b28ad18b10ef6d6818b8b2 SHA1 88ee67d2ad500f8753d7775764f4e92fa40057a9 SHA256 5ab2d5cb0f70240332a5d9bfaea09859fa36d6bf8c634159442b27482c3cac93
 EBUILD mono-tools-2.0.ebuild 1198 RMD160 58361272a6f9e8e7f472c44170c24e42f6bcb340 SHA1 678aadff08a53218bb42605336dd63342f2527b6 SHA256 0e80fdbf329550cf744b6976c15da3fff56dbd730feec8b94c396c3546fda99c
-MISC ChangeLog 6363 RMD160 74e2b99751231bf65e7afbdd316ffee69c25b86e SHA1 9e1b13832b49fdb6b1149d3ac6e24a6f48eecd36 SHA256 02d33909a42704fc6abba22273e268608c8b28293f02695662c5507d7cba6436
+MISC ChangeLog 6535 RMD160 26e15ae0742edea8186ec5d8fd20bf91cb0a4575 SHA1 1b206165e59d187f6b64c1bfbfac7f3475b875d3 SHA256 5e9277f215c284e55c90df1afcc417095e93b8617691f66fc5dd31742fa02d23
 MISC metadata.xml 254 RMD160 68c02b69bcd19311b207476b2cf5d474c74db77c SHA1 bd0905a26b1c03706221e75bd46fe88e9dc6a6c6 SHA256 edb26c541b69f6e45042fcfe097ad7b6103f69b5d7c03e90c434f8f6f019a04f
diff --git a/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch b/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch
index bed777f45585..4d963cf9bb3d 100644
--- a/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch
+++ b/dev-util/mono-tools/files/mono-tools-2.0-html-renderer-fixes.patch
@@ -1,7 +1,7 @@
 diff -NrU5 mono-tools-2.0.orig/configure.in mono-tools-2.0/configure.in
---- mono-tools-2.0.orig/configure.in	2008-11-23 20:37:03.000000000 +0100
-+++ mono-tools-2.0/configure.in	2008-11-23 20:38:00.000000000 +0100
-@@ -43,33 +43,49 @@
+--- mono-tools-2.0.orig/configure.in	2008-11-26 18:19:23.000000000 +0100
++++ mono-tools-2.0/configure.in	2008-11-26 18:27:32.000000000 +0100
+@@ -43,33 +43,56 @@
  
  PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 glade-sharp-2.0 gnome-sharp-2.0 gconf-sharp-2.0)
  #PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp glade-sharp gconf-sharp)
@@ -18,14 +18,21 @@ diff -NrU5 mono-tools-2.0.orig/configure.in mono-tools-2.0/configure.in
 +		enable_gtkhtml=yes)
 +
 +if test "x$enable_gtkhtml" = "xyes" ; then
-+       PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0)
-+
++	PKG_CHECK_MODULES([GTKHTML_SHARP],
++			[gtkhtml-sharp-3.14],
++			[CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"],
++				[
++					PKG_CHECK_MODULES([GTKHTML_SHARP],
++						[gtkhtml-sharp-2.0],
++						[CSHARP_FLAGS=""],
++						[])
++				]
++			)
 +       AC_SUBST(GTKHTML_SHARP_LIBS)
 +       AC_SUBST(CSHARP_FLAGS)
  fi
 -AC_SUBST(GTKHTML_SHARP_LIBS)
 -AC_SUBST(CSHARP_FLAGS)
-+dnl fi
 +
  AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
  
@@ -69,7 +76,7 @@ diff -NrU5 mono-tools-2.0.orig/configure.in mono-tools-2.0/configure.in
  # PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no)
  # AC_SUBST(MONOWEBBROWSER_LIBS)
  
-@@ -89,12 +105,12 @@
+@@ -89,12 +112,12 @@
  	fi  
  fi
  MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser
@@ -84,7 +91,7 @@ diff -NrU5 mono-tools-2.0.orig/configure.in mono-tools-2.0/configure.in
  AC_ARG_ENABLE(debug,
  	AC_HELP_STRING([--enable-debug],
  		[Use 'DEBUG' Configuration [default=YES]]),
-@@ -232,11 +248,11 @@
+@@ -232,11 +255,11 @@
  
  echo "---"
  echo "Configuration summary"
@@ -98,8 +105,8 @@ diff -NrU5 mono-tools-2.0.orig/configure.in mono-tools-2.0/configure.in
  echo ""
  echo "      NOTE: if any of the above say 'no' you may install the"
 diff -NrU5 mono-tools-2.0.orig/docbrowser/monodoc.in mono-tools-2.0/docbrowser/monodoc.in
---- mono-tools-2.0.orig/docbrowser/monodoc.in	2008-11-23 20:37:03.000000000 +0100
-+++ mono-tools-2.0/docbrowser/monodoc.in	2008-11-23 20:35:14.000000000 +0100
+--- mono-tools-2.0.orig/docbrowser/monodoc.in	2008-11-26 18:19:23.000000000 +0100
++++ mono-tools-2.0/docbrowser/monodoc.in	2008-11-26 18:19:35.000000000 +0100
 @@ -84,12 +84,14 @@
  elif [ $(which xulrunner 2> /dev/null) ] > /dev/null ; then
      MOZILLA_FIVE_HOME=`getdirectory xulrunner`