diff options
| author |   Lennart Kolmodin <kolmodin@gentoo.org> | 2009-02-10 19:32:40 +0000 |
|---|---|---|
| committer | Lennart Kolmodin <kolmodin@gentoo.org> | 2009-02-10 19:32:40 +0000 |
| commit | 03b517669bfe842871f2c5f276895ca55a2e4abf (patch) | |
| tree | f0d7c3a668ab58579886a16a112eb327880fdec6 /dev-haskell | |
| parent | Stable on alpha, bug # (diff) | |
| download | gentoo-2-03b517669bfe842871f2c5f276895ca55a2e4abf.tar.gz gentoo-2-03b517669bfe842871f2c5f276895ca55a2e4abf.tar.bz2 gentoo-2-03b517669bfe842871f2c5f276895ca55a2e4abf.zip | |
Fix dev-haskell/gtk2hs-0.9.12.1 with >=gnome-base/librsvg-2.22.3
(Portage version: 2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64)
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/gtk2hs/ChangeLog | 11 | ||||
| -rw-r--r-- | dev-haskell/gtk2hs/files/gtk2hs-0.9.12.1-librsvg-2.22.3.patch | 10 | ||||
| -rw-r--r-- | dev-haskell/gtk2hs/gtk2hs-0.9.12.1.ebuild | 7 |
3 files changed, 24 insertions, 4 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/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() { |