Version bump with a workaround for bug #168168

(Portage version: 2.1.2.3)

7 files changed, 38 insertions, 44 deletions

diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index 75ab42469125..cf747c6c5b07 100644
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2007/03/22 20:49:32 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.14 2007/04/06 00:14:25 truedfx Exp $
+
+*lazarus-0.9.22 (06 Apr 2007)
+
+  06 Apr 2007; <harald@gentoo.org> -files/lazarus-0.9.20-lcl-handle.patch,
+  -files/lazarus-0.9.20-lclintf.patch, +files/lazarus-iconcrash.patch,
+  -lazarus-0.9.20-r1.ebuild, +lazarus-0.9.22.ebuild:
+  Version bump with a workaround for bug #168168
 
   22 Mar 2007; Harald van Dijk <truedfx@gentoo.org>
   +files/lazarus-0.9.20-lcl-handle.patch, lazarus-0.9.20-r1.ebuild:
diff --git a/dev-lang/lazarus/files/digest-lazarus-0.9.20-r1 b/dev-lang/lazarus/files/digest-lazarus-0.9.20-r1
deleted file mode 100644
index 0f4e94fdb392..000000000000
--- a/dev-lang/lazarus/files/digest-lazarus-0.9.20-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8c232dc7cd398578049f57cd97d0d263 lazarus-0.9.20-0.tar.gz 10241274
-RMD160 5a2c061e42306008858cf8b3a51ecaa1aa3f0bca lazarus-0.9.20-0.tar.gz 10241274
-SHA256 c3416c557e510c9fcca5de59f128854eb5605f69fc7472cea11fc09ed5f8285e lazarus-0.9.20-0.tar.gz 10241274
diff --git a/dev-lang/lazarus/files/digest-lazarus-0.9.22 b/dev-lang/lazarus/files/digest-lazarus-0.9.22
new file mode 100644
index 000000000000..747b4cf69048
--- /dev/null
+++ b/dev-lang/lazarus/files/digest-lazarus-0.9.22
@@ -0,0 +1,3 @@
+MD5 6d8d5954a0b58960dd723a8c568badcd lazarus-0.9.22-0.tar.gz 9264538
+RMD160 cd78903b564b84f23a8f403a7324b616a23de116 lazarus-0.9.22-0.tar.gz 9264538
+SHA256 9454e7383ad654fffba2adfc5749662dc3e5d4d7b064c25f8863260819b654f6 lazarus-0.9.22-0.tar.gz 9264538
diff --git a/dev-lang/lazarus/files/lazarus-0.9.20-lcl-handle.patch b/dev-lang/lazarus/files/lazarus-0.9.20-lcl-handle.patch
deleted file mode 100644
index 772face4a88c..000000000000
--- a/dev-lang/lazarus/files/lazarus-0.9.20-lcl-handle.patch
+++ /dev/null
@@ -1,25 +0,0 @@
- If LCLType is not included, then THandle is System.THandle
- rather than LCLType.THandle. System.THandle is 32 bits wide.
-
---- lazarus/lcl/interfaces/gtk/gtkwsdialogs.pp
-+++ lazarus/lcl/interfaces/gtk/gtkwsdialogs.pp
-@@ -29,7 +29,7 @@
- uses
-   {$IFDEF GTK2} Gtk2, Glib2, gdk2, {$ELSE} Gtk, gdk, Glib, {$ENDIF}
-   SysUtils, Classes, Controls, LMessages, InterfaceBase, graphics,
--  Dialogs, WSDialogs, WSLCLClasses, gtkint, gtkproc, gtkwscontrols;
-+  LCLType, Dialogs, WSDialogs, WSLCLClasses, gtkint, gtkproc, gtkwscontrols;
- 
- type
- 
---- lazarus/lcl/widgetset/wsdialogs.pp
-+++ lazarus/lcl/widgetset/wsdialogs.pp
-@@ -44,7 +44,7 @@
- // To get as little as posible circles,
- // uncomment only when needed for registration
- ////////////////////////////////////////////////////
--  Dialogs,
-+  LCLType, Dialogs,
- ////////////////////////////////////////////////////
-   WSLCLClasses, WSControls;
- 
diff --git a/dev-lang/lazarus/files/lazarus-0.9.20-lclintf.patch b/dev-lang/lazarus/files/lazarus-0.9.20-lclintf.patch
deleted file mode 100644
index b515efa4e0ee..000000000000
--- a/dev-lang/lazarus/files/lazarus-0.9.20-lclintf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lazarus/ide/include/unix/lazbaseconf.inc
-+++ lazarus/ide/include/unix/lazbaseconf.inc
-@@ -180,7 +180,7 @@
- 
- function GetDefaultLCLWidgetType: string;
- begin
--  Result:='gtk';
-+  Result:='gtk2';
- end;
- 
- procedure GetDefaultBrowser(var Browser, Params: string);
diff --git a/dev-lang/lazarus/files/lazarus-iconcrash.patch b/dev-lang/lazarus/files/lazarus-iconcrash.patch
new file mode 100644
index 000000000000..d7a814bc400a
--- /dev/null
+++ b/dev-lang/lazarus/files/lazarus-iconcrash.patch
@@ -0,0 +1,24 @@
+--- 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.20-r1.ebuild b/dev-lang/lazarus/lazarus-0.9.22.ebuild
index d8c91e428e22..9bc0f95886e7 100644
--- a/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.22.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.20-r1.ebuild,v 1.3 2007/04/01 11:39:48 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.22.ebuild,v 1.1 2007/04/06 00:14:25 truedfx Exp $
 
 inherit eutils
 
@@ -40,13 +40,12 @@ src_unpack() {
 	fi
 
 	unpack ${A}
-	sed -e "s/@FPCVER@/${FPCVER}/" "${FILESDIR}"/${P}-fpcsrc.patch \
+	sed -e "s/@FPCVER@/${FPCVER}/" "${FILESDIR}"/${PN}-0.9.20-fpcsrc.patch \
 		> "${T}"/fpcsrc.patch || die "could not sed fpcsrc patch"
 
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-lclintf.patch
-	epatch "${FILESDIR}"/${P}-lcl-handle.patch
 	epatch "${T}"/fpcsrc.patch
+	epatch "${FILESDIR}"/${PN}-iconcrash.patch
 }
 
 src_compile() {