Avoid storing pointers in 32-bit variables on amd64

Package-Manager: portage-2.1.2.2

4 files changed, 47 insertions, 13 deletions

diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index f8e0a52a94aa..75ab42469125 100644
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2007/03/10 08:44:37 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.13 2007/03/22 20:49:32 truedfx Exp $
+
+  22 Mar 2007; Harald van Dijk <truedfx@gentoo.org>
+  +files/lazarus-0.9.20-lcl-handle.patch, lazarus-0.9.20-r1.ebuild:
+  Avoid storing pointers in 32-bit variables on amd64
 
 *lazarus-0.9.20-r1 (10 Mar 2007)
 
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index d881304b115b..7fad63e3a4cb 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -5,19 +5,23 @@ AUX lazarus-0.9.20-fpcsrc.patch 333 RMD160 2afa08d4a5e11c38dd3e6b6907c117b00c5b5
 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 2055 RMD160 3ad069e9b050edc66743449f1b8f12bb1a01bee4 SHA1 3ae5c20ae64e137d7dfcae1c5b6e3aa2fab0441f SHA256 e3ac2388894ac4fbad48868ce298a7327bad04f0ae1257ad6d2efc56ca6b00a0
-MD5 9db9e915311c5d11f55f963da4411693 lazarus-0.9.20-r1.ebuild 2055
-RMD160 3ad069e9b050edc66743449f1b8f12bb1a01bee4 lazarus-0.9.20-r1.ebuild 2055
-SHA256 e3ac2388894ac4fbad48868ce298a7327bad04f0ae1257ad6d2efc56ca6b00a0 lazarus-0.9.20-r1.ebuild 2055
-MISC ChangeLog 2140 RMD160 ac76d31e7c8b87947859f09dd5faa722ade81f33 SHA1 5d73bed123d63354212b8d15eaf8c6f4fb35ab5f SHA256 063db0d0b87520e745cf7ca49090b86b62a46d389acf2fbca1268e4feaaed0a3
-MD5 47335487b5b23e882899a6dede16da16 ChangeLog 2140
-RMD160 ac76d31e7c8b87947859f09dd5faa722ade81f33 ChangeLog 2140
-SHA256 063db0d0b87520e745cf7ca49090b86b62a46d389acf2fbca1268e4feaaed0a3 ChangeLog 2140
+EBUILD lazarus-0.9.20-r1.ebuild 2099 RMD160 47d7e5a8b5e874ba2456c3f6584d2797c62c00d4 SHA1 92642336bf0d0427c6af580662354fe753f31718 SHA256 fdb72a167dffdff85acd15d1ce08933f05f9cc37309d59d6a52ff1dab137b2ba
+MD5 7059db350b7eb5bde9e5394c2c8347bb lazarus-0.9.20-r1.ebuild 2099
+RMD160 47d7e5a8b5e874ba2456c3f6584d2797c62c00d4 lazarus-0.9.20-r1.ebuild 2099
+SHA256 fdb72a167dffdff85acd15d1ce08933f05f9cc37309d59d6a52ff1dab137b2ba lazarus-0.9.20-r1.ebuild 2099
+MISC ChangeLog 2315 RMD160 6ee29209987f8d952cb0587ad2a0798e8cf60693 SHA1 002b4ee6b3f8e4b48fa6a77cb25a72d5d45ab788 SHA256 dc35eb0570e5c2e48df29261463e4a1986f6af55eb07862421788e0e4cadfdad
+MD5 95db940b66ec4fbaefb5841f3d676695 ChangeLog 2315
+RMD160 6ee29209987f8d952cb0587ad2a0798e8cf60693 ChangeLog 2315
+SHA256 dc35eb0570e5c2e48df29261463e4a1986f6af55eb07862421788e0e4cadfdad ChangeLog 2315
 MISC metadata.xml 281 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 SHA1 c861318fcfa3725a45dd0deb55fbfc26a49245b6 SHA256 d0d50fc65f6bc2ce65700e4ea995148f15c4e7a0eca5d0f86e3f4b9a73a4aae6
 MD5 8773813255798a06aad7b06e083a1a55 metadata.xml 281
 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 metadata.xml 281
@@ -28,7 +32,7 @@ SHA256 49f58ce799154ff503040c5f74a333cbf4e2b2eac6005a1516a466aa8f597c96 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF8m8UwnQyISwouHwRAj5HAKDCkqwwYl6km7f18Y+RvGL+PsiySACfcIja
-pMT+kHp6jrb7ZmhrvKft74E=
-=lFzS
+iD8DBQFGAuvbwnQyISwouHwRAo6qAKCK+zGxWvSs2NnOrUARyNvXFl/tzwCfTZHC
+DKp2jsCaCDDridg7Yg2u7lU=
+=z/mA
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..772face4a88c
--- /dev/null
+++ b/dev-lang/lazarus/files/lazarus-0.9.20-lcl-handle.patch
@@ -0,0 +1,25 @@
+ 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/lazarus-0.9.20-r1.ebuild b/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild
index 458546d1aaf5..594949908681 100644
--- a/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.20-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.20-r1.ebuild,v 1.1 2007/03/10 08:44:37 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.20-r1.ebuild,v 1.2 2007/03/22 20:49:32 truedfx Exp $
 
 inherit eutils
 
@@ -35,6 +35,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-lclintf.patch
+	epatch "${FILESDIR}"/${P}-lcl-handle.patch
 	epatch "${T}"/fpcsrc.patch
 }