Version bump with a workaround for bug #168168

Package-Manager: portage-2.1.2.3

8 files changed, 54 insertions, 74 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/Manifest b/dev-lang/lazarus/Manifest
index fbf89de068d1..811562ca1543 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,38 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX lazarus-0.9.20-fpcsrc.patch 333 RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b523f SHA1 3e5c47eac41249dd2c78321be6ae9604b8d55931 SHA256 2ebf6b5a9a5ff2746339c2b6bfe4149c663803fa4dfe98408240b33cdf1f544c
 MD5 728fbd094be35bcec4b8e9b83eea9b6a files/lazarus-0.9.20-fpcsrc.patch 333
 RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b523f files/lazarus-0.9.20-fpcsrc.patch 333
 SHA256 2ebf6b5a9a5ff2746339c2b6bfe4149c663803fa4dfe98408240b33cdf1f544c files/lazarus-0.9.20-fpcsrc.patch 333
-AUX lazarus-0.9.20-lcl-handle.patch 892 RMD160 96177a04128f2c7946feb320427ba8d2e287c9e7 SHA1 211f7c87bab790da12c3b10c5c4e82a111422172 SHA256 ad1f7bffdecbcc7b599463d4cc41fe20c705f34475d0ddbae8941fad2bf79f0a
-MD5 8bdf8590957bf2a6a8253a3bcb85a4bf files/lazarus-0.9.20-lcl-handle.patch 892
-RMD160 96177a04128f2c7946feb320427ba8d2e287c9e7 files/lazarus-0.9.20-lcl-handle.patch 892
-SHA256 ad1f7bffdecbcc7b599463d4cc41fe20c705f34475d0ddbae8941fad2bf79f0a files/lazarus-0.9.20-lcl-handle.patch 892
-AUX lazarus-0.9.20-lclintf.patch 266 RMD160 0e3e711034be39f7cda9375a5df5b7f0dd150a1c SHA1 4fdedeb7a33588e216367de2d3ad3004b4535f00 SHA256 400c2e5bf2183d2e21a930a752701d62a4d75fc552111cf7a5c366f6e745eee5
-MD5 c24d1e618b5b6d3d1a1948b12d40491c files/lazarus-0.9.20-lclintf.patch 266
-RMD160 0e3e711034be39f7cda9375a5df5b7f0dd150a1c files/lazarus-0.9.20-lclintf.patch 266
-SHA256 400c2e5bf2183d2e21a930a752701d62a4d75fc552111cf7a5c366f6e745eee5 files/lazarus-0.9.20-lclintf.patch 266
-DIST lazarus-0.9.20-0.tar.gz 10241274 RMD160 5a2c061e42306008858cf8b3a51ecaa1aa3f0bca SHA1 6f72cda6ed67d4855118c9147d46ff575232bed1 SHA256 c3416c557e510c9fcca5de59f128854eb5605f69fc7472cea11fc09ed5f8285e
-EBUILD lazarus-0.9.20-r1.ebuild 2442 RMD160 eb446d920764cb288b01b09985ca84c74234e201 SHA1 3cad7e32cd67aa19920d7c0353d506631eedb5e2 SHA256 b26c18c6a3c9579c699c2454867797e3db860c13f61b06fee0e4334842af0c14
-MD5 c5de263ff404148ed4b8cdd609b02d76 lazarus-0.9.20-r1.ebuild 2442
-RMD160 eb446d920764cb288b01b09985ca84c74234e201 lazarus-0.9.20-r1.ebuild 2442
-SHA256 b26c18c6a3c9579c699c2454867797e3db860c13f61b06fee0e4334842af0c14 lazarus-0.9.20-r1.ebuild 2442
-MISC ChangeLog 2315 RMD160 6ee29209987f8d952cb0587ad2a0798e8cf60693 SHA1 002b4ee6b3f8e4b48fa6a77cb25a72d5d45ab788 SHA256 dc35eb0570e5c2e48df29261463e4a1986f6af55eb07862421788e0e4cadfdad
-MD5 95db940b66ec4fbaefb5841f3d676695 ChangeLog 2315
-RMD160 6ee29209987f8d952cb0587ad2a0798e8cf60693 ChangeLog 2315
-SHA256 dc35eb0570e5c2e48df29261463e4a1986f6af55eb07862421788e0e4cadfdad ChangeLog 2315
+AUX lazarus-iconcrash.patch 979 RMD160 3546579a0a503574e78b87a4f91ab56fa85983a7 SHA1 5c18023fc35d20cf822485a17d5a4db87b7ebceb SHA256 521ae58a4c1d4f0e7f46b7246f6dcce34225332c45f9cc6f86edd701f060748e
+MD5 3be22eac567a9adbfd9639778ad5db91 files/lazarus-iconcrash.patch 979
+RMD160 3546579a0a503574e78b87a4f91ab56fa85983a7 files/lazarus-iconcrash.patch 979
+SHA256 521ae58a4c1d4f0e7f46b7246f6dcce34225332c45f9cc6f86edd701f060748e files/lazarus-iconcrash.patch 979
+DIST lazarus-0.9.22-0.tar.gz 9264538 RMD160 cd78903b564b84f23a8f403a7324b616a23de116 SHA1 a150d387ac716f7ebd5697bd576c818c0f1a72b7 SHA256 9454e7383ad654fffba2adfc5749662dc3e5d4d7b064c25f8863260819b654f6
+EBUILD lazarus-0.9.22.ebuild 2406 RMD160 2f705671456884c486d547dfe375638fd74dc5ea SHA1 441498c620c835d286226e722aa5260c43af52ae SHA256 eb2f584b90cd05fddabc540ba3906c60578b98fb1221a214d1cdec66195910b7
+MD5 96b17f5a8c3069543e80bcabab66dba8 lazarus-0.9.22.ebuild 2406
+RMD160 2f705671456884c486d547dfe375638fd74dc5ea lazarus-0.9.22.ebuild 2406
+SHA256 eb2f584b90cd05fddabc540ba3906c60578b98fb1221a214d1cdec66195910b7 lazarus-0.9.22.ebuild 2406
+MISC ChangeLog 2595 RMD160 21b98983022c463fb9120c9b2262c77cccd44d43 SHA1 bea42e5a41ce0cf46683ad87b7a930c655f0855d SHA256 acd7a4ada23bcaa856d46dba1a740328f4f6446d8fcbf460d95eee04aa65f684
+MD5 504a1666b93436e7c38c6804e762f4ee ChangeLog 2595
+RMD160 21b98983022c463fb9120c9b2262c77cccd44d43 ChangeLog 2595
+SHA256 acd7a4ada23bcaa856d46dba1a740328f4f6446d8fcbf460d95eee04aa65f684 ChangeLog 2595
 MISC metadata.xml 281 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 SHA1 c861318fcfa3725a45dd0deb55fbfc26a49245b6 SHA256 d0d50fc65f6bc2ce65700e4ea995148f15c4e7a0eca5d0f86e3f4b9a73a4aae6
 MD5 8773813255798a06aad7b06e083a1a55 metadata.xml 281
 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 metadata.xml 281
 SHA256 d0d50fc65f6bc2ce65700e4ea995148f15c4e7a0eca5d0f86e3f4b9a73a4aae6 metadata.xml 281
-MD5 84c87b76f87fa0bdfc738b94b819489e files/digest-lazarus-0.9.20-r1 256
-RMD160 e9a791d6655e4d9143e7e71a20dc3b226a99f744 files/digest-lazarus-0.9.20-r1 256
-SHA256 49f58ce799154ff503040c5f74a333cbf4e2b2eac6005a1516a466aa8f597c96 files/digest-lazarus-0.9.20-r1 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGD5oIwnQyISwouHwRArb3AJ9ZBCa4twuYCzk51ahxiBed9OD7NACfcHRp
-cyflKCqj9+nDQi0uVNkO2Tw=
-=dJjH
------END PGP SIGNATURE-----
+MD5 b8ec9a58f96778e8efa6b3900fe5aa16 files/digest-lazarus-0.9.22 253
+RMD160 e99948ba25430b60b23ea1df82dabe79596dd7ee files/digest-lazarus-0.9.22 253
+SHA256 90ab4e5bb33aabb6dbbba7cdeb12203576b4ba4227ad37b7dbb138137f975cb1 files/digest-lazarus-0.9.22 253
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() {