Fix dev-haskell/gtk2hs-0.9.12.1 with >=gnome-base/librsvg-2.22.3

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64

4 files changed, 31 insertions, 10 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index a6ff0c65530c..108bc5bf2162 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/gtk2hs
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.48 2008/08/05 19:17:02 ulm Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.49 2009/02/10 19:32:40 kolmodin Exp $
+
+  10 Feb 2009; Lennart Kolmodin <kolmodin@gentoo.org>
+  +files/gtk2hs-0.9.12.1-librsvg-2.22.3.patch, gtk2hs-0.9.12.1.ebuild:
+  Support >=gnome-base/librsvg-2.22.3 with its slightly changed API.
+  Patch from upstream, unconditionally patching, see bug #240704.
+  Reported by Paulo Jorge de Oliveira Cantante de Matos <pocmatos@gmail.com>,
+  handled by Sebastian Magrí <sebasmagri@gmail.com>.
 
   05 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index 2c5ec551f5ad..551452e1cafa 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gtk2hs-0.9.12.1-librsvg-2.22.3.patch 335 RMD160 cf96ef312fda9388a3d4cf28058ffa004ebd2b77 SHA1 2908e21aa9bc8e28d61d410f8b8570ad30a59f7f SHA256 e8e4adb06d915a0c1300a3b4bf597930bd20ba5fd7bd7f9121fc999ccf855577
 DIST gtk2hs-0.9.11.tar.gz 980618 RMD160 c745020329fab493752d9055c4c8bca798b5d3e1 SHA1 6150312809e99ca3bcfc9f1f851d48a5253022ce SHA256 5da4c1fd7f0b66834e2aaf919d243928f63c15411e6289b2f31dfafb50848691
 DIST gtk2hs-0.9.12.1.tar.gz 1004661 RMD160 cd658027ed91b9550915e686d546e36b1b371c10 SHA1 a85f8568aa072e0c55da5889b2aabff92b8da3ae SHA256 4278078b786202fc64f86881c2b2517bdd589d5248bff2e9b7e6c1ffd2361f84
 DIST gtk2hs-0.9.12.tar.gz 997153 RMD160 bfc3ad81be80fdbbf1694493d93ddf863efbf6d8 SHA1 401638c5abfc357b648e4aa4b234874c116a52bb SHA256 b7427fca5d1958a829b2623715a9b16d4b08d67820df0b46ad32e5bd6e1f44d2
 EBUILD gtk2hs-0.9.11.ebuild 3136 RMD160 f51e59298f166ea30909bab330f143598e52b7b8 SHA1 7e91b2a5bba0e50da02b69f3def764ef4146670f SHA256 60b7dd249123c392e7ef04bb2bffd1e02129155dab09727a8fec62375a145217
-EBUILD gtk2hs-0.9.12.1.ebuild 3349 RMD160 1e7186ed50c38ad07ec494fe3ed40c35bda5182a SHA1 2e4d05bc2a6c1de0d468ccc87de94cb8c3f2b828 SHA256 1f0c320db370559a1ae89db8feaf5bb13bfe36657b0341e85bcbd859125f4e6e
+EBUILD gtk2hs-0.9.12.1.ebuild 3410 RMD160 afd83e41ab49d4011461d48d3c33886af168274e SHA1 1d50ed99ecdff6015e03f1ba8253cc99558a73eb SHA256 b26de8c4afc810de62d50f18af12e2141f8413bde652279d89969f95c265f29b
 EBUILD gtk2hs-0.9.12.ebuild 3364 RMD160 cb88f9f989cdd6583dd8b41209d932b5dd9fbb6a SHA1 1d6a055cca846d516524f42e88c3390558a506e7 SHA256 bf64e2f772a7cd754c16cae0ce075761bb00c648857542450310d90b4bd3ed88
-MISC ChangeLog 6769 RMD160 d124bdc9726470d8d17369cf4edbfe6266bedfbb SHA1 bf498cec943425ccef438bac8e3d09b4dd7c1b91 SHA256 a8ea93004d4165942ffd6089c981ea8bb85a660f2487d83f4f1d36e2ae8ba07e
+MISC ChangeLog 7167 RMD160 d392d3375767297038379653cb82669c051f54f9 SHA1 c3a47c6d0a5db1a42a2a42cf9cb61573eb44b961 SHA256 d4bfcb2c7c9be999c4f0ee98f381b9e491c06ba9d8d80d1da34480a8cd77098d
 MISC metadata.xml 264 RMD160 d289d41d1d04ed1c3e574a29f53999457dbdc52c SHA1 475c909ed389f5e0508b5cd8e1373db2b96ce75b SHA256 743889dc0a1fac66b79afe2bbc2e61338d1d467aabc7b29977885d61c94a2a82
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiYp0AACgkQOeoy/oIi7uy9nACePylw/MnkV4uHeSLgqwHhIbSQ
-hE4Anj9/sMwKM3p4I2/nGSDLtrAxME+W
-=zTdX
+iEYEARECAAYFAkmR1mQACgkQ1n/CYbXjntIyBgCfSEWa8NdcXLj34XR3BU2vhZcA
+YXQAniQiglj8JzhV2rKwbe1byBVP33TH
+=kpJ8
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/gtk2hs/files/gtk2hs-0.9.12.1-librsvg-2.22.3.patch b/dev-haskell/gtk2hs/files/gtk2hs-0.9.12.1-librsvg-2.22.3.patch
new file mode 100644
index 000000000000..da7d531c97ec
--- /dev/null
+++ b/dev-haskell/gtk2hs/files/gtk2hs-0.9.12.1-librsvg-2.22.3.patch
@@ -0,0 +1,10 @@
+--- svgcairo/Graphics/Rendering/Cairo/SVG.chs	2008-10-01 00:11:02.000000000 -0430
++++ svgcairo/Graphics/Rendering/Cairo/SVG.chs	2008-10-09 08:37:50.000000000 -0430
+@@ -200,6 +200,7 @@
+ svgRender svg = do
+   cr <- ask
+   liftIO $ {# call unsafe render_cairo #} svg cr
++  return ()
+ 
+ -- | Get the width and height of the SVG image.
+ --
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
index d7a1dba77d96..5adc33ed07a3 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.8 2008/07/16 11:47:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild,v 1.9 2009/02/10 19:32:40 kolmodin Exp $
 
 inherit base eutils ghc-package multilib toolchain-funcs versionator
 
@@ -38,6 +38,9 @@ src_unpack() {
 		   -e '/$(foreach LETTER,/,+1 d' \
 		   -e '\|\tdocs/reference/gtk2hs.haddock| s/\\//' \
 		   "${S}/Makefile.in"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-librsvg-2.22.3.patch"
 }
 
 src_compile() {