Remove the workaround for bug #168168, and depend on a fixed librsvg

(Portage version: 2.1.2.3)

4 files changed, 10 insertions, 30 deletions

diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index cf747c6c5b07..5376dd85141b 100644
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/lazarus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.14 2007/04/06 00:14:25 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.15 2007/04/06 19:03:58 truedfx Exp $
+
+*lazarus-0.9.22-r1 (06 Apr 2007)
+
+  06 Apr 2007; <harald@gentoo.org> -files/lazarus-iconcrash.patch,
+  -lazarus-0.9.22.ebuild, +lazarus-0.9.22-r1.ebuild:
+  Remove the workaround for bug #168168, and depend on a fixed librsvg
 
 *lazarus-0.9.22 (06 Apr 2007)
 
diff --git a/dev-lang/lazarus/files/digest-lazarus-0.9.22 b/dev-lang/lazarus/files/digest-lazarus-0.9.22-r1
index 747b4cf69048..747b4cf69048 100644
--- a/dev-lang/lazarus/files/digest-lazarus-0.9.22
+++ b/dev-lang/lazarus/files/digest-lazarus-0.9.22-r1
diff --git a/dev-lang/lazarus/files/lazarus-iconcrash.patch b/dev-lang/lazarus/files/lazarus-iconcrash.patch
deleted file mode 100644
index 4b7267edb201..000000000000
--- a/dev-lang/lazarus/files/lazarus-iconcrash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-This patch avoids a crash on amd64. It should be removed
-once the actual bug is fixed.
-
---- lazarus/lcl/interfaces/gtk2/gtk2object.inc
-+++ lazarus/lcl/interfaces/gtk2/gtk2object.inc
-@@ -491,6 +491,7 @@
-   StockName : PChar;
-   IconSet : PGtkIconSet;
-   Pixbuf : PGDKPixbuf;
-+  Style : TLazGtkStyle;
- begin
-   Case StockID Of
-     idButtonOk : StockName := GTK_STOCK_OK;
-@@ -522,9 +523,11 @@
-   end;
- 
-   if (StockID >= idButtonBase) and (StockID <= idDialogBase) then
--    pixbuf := gtk_icon_set_render_icon(IconSet, GetStyle(lgsbutton), GTK_TEXT_DIR_NONE, GTK_STATE_NORMAL, GTK_ICON_SIZE_BUTTON, GetStyleWidget(lgsbutton), nil)
-+    Style := lgsbutton
-   else
--    pixbuf := gtk_icon_set_render_icon(IconSet, GetStyle(lgswindow), GTK_TEXT_DIR_NONE, GTK_STATE_NORMAL, GTK_ICON_SIZE_DIALOG, GetStyleWidget(lgswindow), nil);
-+    Style := lgswindow;
-+
-+  pixbuf := gtk_icon_set_render_icon(IconSet, GetStyle(Style), GTK_TEXT_DIR_NONE, GTK_STATE_NORMAL, GTK_ICON_SIZE_BUTTON, GetStyleWidget(Style), nil);
- 
-   Pixmap := NewGDIObject(gdiBitmap);
-   With Pixmap^ do begin
diff --git a/dev-lang/lazarus/lazarus-0.9.22.ebuild b/dev-lang/lazarus/lazarus-0.9.22-r1.ebuild
index 9bc0f95886e7..035f10ba53f0 100644
--- a/dev-lang/lazarus/lazarus-0.9.22.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.22.ebuild,v 1.1 2007/04/06 00:14:25 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.22-r1.ebuild,v 1.1 2007/04/06 19:03:58 truedfx Exp $
 
 inherit eutils
 
@@ -17,6 +17,8 @@ SRC_URI="mirror://sourceforge/lazarus/${P}-0.tar.gz"
 DEPEND="~dev-lang/fpc-${FPCVER}
 	net-misc/rsync
 	>=x11-libs/gtk+-2.0"
+RDEPEND="${RDEPEND}
+	!=gnome-base/librsvg-2.16.1"
 
 S=${WORKDIR}/${PN}
 
@@ -45,7 +47,6 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${T}"/fpcsrc.patch
-	epatch "${FILESDIR}"/${PN}-iconcrash.patch
 }
 
 src_compile() {