Fix access violation in TGtk2WSCustomListBox with some GTK+ versions (#333761 by suilenroc1183@yahoo.de)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 54 insertions, 8 deletions

diff --git a/dev-lang/lazarus/ChangeLog b/dev-lang/lazarus/ChangeLog
index 3951ca24a702..058d4e5d7220 100644
--- a/dev-lang/lazarus/ChangeLog
+++ b/dev-lang/lazarus/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-lang/lazarus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.31 2010/02/06 09:15:14 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/ChangeLog,v 1.32 2010/08/21 18:29:39 truedfx Exp $
+
+  21 Aug 2010; Harald van Dijk <truedfx@gentoo.org>
+  -lazarus-0.9.28.2.ebuild, +lazarus-0.9.28.2-r1.ebuild,
+  +files/lazarus-0.9.28.2-bug0015627.patch:
+  Fix access violation in TGtk2WSCustomListBox with some GTK+ versions
+  (#333761 by suilenroc1183@yahoo.de)
+
+*lazarus-0.9.28.2-r1 (21 Aug 2010)
+
+  21 Aug 2010; Harald van Dijk <truedfx@gentoo.org>
+  -lazarus-0.9.28.2.ebuild, +lazarus-0.9.28.2-r1.ebuild,
+  +files/lazarus-0.9.28.2-bug0015627.patch:
+  Fix access violation in TGtk2WSCustomListBox with recent GTK+ (#333761 by
+  suilenroc1183@yahoo.de)
 
 *lazarus-0.9.28.2 (06 Feb 2010)
 
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index f1273a082f60..19d55e51c42e 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 AUX lazarus-0.9.26-clipboard-crash.patch 1974 RMD160 530a66fca7d0ca103c11005c017908e21ae5ab6e SHA1 710a63eca44acdee72912e8448dd679271351c1b SHA256 d246d123a80bef3764473e0e5726ad0133d042c9d762cff4a53810681425aa2c
 AUX lazarus-0.9.26-fpcsrc.patch 407 RMD160 b37a3ee5f1d4f5a7887dce621542513fed49d86b SHA1 976860962e2c9b3f9f4063f764ab9c85139bfdb6 SHA256 bff38dbaf47dd07bf91ae12c7babe0a9254dcb9ad360829649ac2df056e88730
+AUX lazarus-0.9.28.2-bug0015627.patch 918 RMD160 238d85d32dddbc6c38843ea66bea4c3845273fdc SHA1 9900089bec736b3b61a212b46129ddab5128daa3 SHA256 2f79d01b79dd1cb49d45ea27c850728502fdad92f9c49af2b691e63accc81538
 DIST lazarus-0.9.26-0.tgz 12641854 RMD160 b8f4f1a558263f9978d7d980c59f06d102316657 SHA1 759fa0cc8410034f42b7e53df12007c66004d3aa SHA256 d4c2dc8e8c797049d45d0c01aff51ea94fcae489efab7d4529afb6aeca8066dd
 DIST lazarus-0.9.28.2-src.tar.bz2 12933724 RMD160 5ed9edc163efa4c391a52f6a7641d57e044d802b SHA1 708400192633e51dec4120412340f06d5b9d3b35 SHA256 5711372c6724d19624be6cb8f6c397d789f3ac6fd7f70f825817ee47bd0e4dfd
 EBUILD lazarus-0.9.26-r4.ebuild 2255 RMD160 d299a1b64fb90131f539dcb477836023d8d8ba90 SHA1 85ed478d8ae5d25ce20510c97abf0c867819f087 SHA256 998fa5ad4b306d2a002faf628dabdff6ebc34ab611b7f7056806398c0c08a6d0
-EBUILD lazarus-0.9.28.2.ebuild 2316 RMD160 11424104dcd3060d8d870ab9ce1869ce341a92ad SHA1 a2da4c28a6fc00bc1591c78712a6cae92a762d65 SHA256 7c22d9cc1be1f6f80efa9a622a3b9af6573b269308e2093045a3974ef6d9dcb7
-MISC ChangeLog 5263 RMD160 5cd5765607c481d19778cd4b6628eb6f61027ad3 SHA1 2a99be0879461f464b0ae0b59c188e581fffcd00 SHA256 ba38715401ca48f2600e63648985a8e9d815a4e0446d02dc0f953867c250875e
+EBUILD lazarus-0.9.28.2-r1.ebuild 2373 RMD160 f4cbff63d41961319708a00b3abcc76c31683b1c SHA1 c5dee5a77dda3d1a785eaf483ee5436fd36067f7 SHA256 0d5dbc5255571149646dbc1d10a8aca50fbcbb6c3c86ed3378e30089f80f1aed
+MISC ChangeLog 5818 RMD160 055c5508d94baefc938b86e3238caf587ed766aa SHA1 d9a8d9e5b807446c27e70776489b4f29689a21dc SHA256 da42d0292bd593ec9e1e225364bc73f56cdeb502048c1507cd404a1b84545319
 MISC metadata.xml 281 RMD160 423ab877620b713044c2d08753af1fa18a3adce4 SHA1 c861318fcfa3725a45dd0deb55fbfc26a49245b6 SHA256 d0d50fc65f6bc2ce65700e4ea995148f15c4e7a0eca5d0f86e3f4b9a73a4aae6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEUEARECAAYFAkttM0EACgkQwnQyISwouHyHEACgpNXf3K/5zi2NfvikMzHmfTgs
-2ugAmKut1ddM2ycSR3YV5dkP9sEDvRE=
-=wVwg
+iEYEARECAAYFAkxwG48ACgkQwnQyISwouHxTyQCdE5qfFNihk14+n2gxkoZF3l3z
+n8cAn3ERCNYLPJPAdHAm2V77l8hMB6Bg
+=Qxwq
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/lazarus/files/lazarus-0.9.28.2-bug0015627.patch b/dev-lang/lazarus/files/lazarus-0.9.28.2-bug0015627.patch
new file mode 100644
index 000000000000..8e3a05496726
--- /dev/null
+++ b/dev-lang/lazarus/files/lazarus-0.9.28.2-bug0015627.patch
@@ -0,0 +1,30 @@
+--- trunk/lcl/interfaces/gtk2/gtk2wsstdctrls.pp	2009/12/08 12:38:50	23028
++++ trunk/lcl/interfaces/gtk2/gtk2wsstdctrls.pp	2010/02/12 02:22:04	23695
+@@ -477,16 +477,6 @@
+   WidgetInfo: PWidgetInfo;
+   Selection: PGtkTreeSelection;
+   Path: PGtkTreePath;
+-
+-  procedure ClearCursor; inline;
+-  begin
+-    if gtk_tree_row_reference_valid(PGtkTreeView(Widget)^.priv^.cursor) then
+-    begin
+-      gtk_tree_row_reference_free(PGtkTreeView(Widget)^.priv^.cursor);
+-      PGtkTreeView(Widget)^.priv^.cursor := nil;
+-    end;
+-  end;
+-  
+ begin
+   if not WSCheckHandleAllocated(ACustomListBox, 'SetItemIndex') then
+     Exit;
+@@ -512,7 +502,9 @@
+   end
+   else
+   begin
+-    ClearCursor;
++    Path := gtk_tree_path_new_from_indices(0, -1);
++    if PGtkTreeView(Widget)^.priv^.tree <> nil then
++      gtk_tree_view_set_cursor(PGtkTreeView(Widget), Path, nil, False);
+     gtk_tree_selection_unselect_all(Selection);
+   end;
+ 
diff --git a/dev-lang/lazarus/lazarus-0.9.28.2.ebuild b/dev-lang/lazarus/lazarus-0.9.28.2-r1.ebuild
index 8ac17254d82e..3f7c8aee7ac9 100644
--- a/dev-lang/lazarus/lazarus-0.9.28.2.ebuild
+++ b/dev-lang/lazarus/lazarus-0.9.28.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.28.2.ebuild,v 1.1 2010/02/06 09:15:14 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lazarus/lazarus-0.9.28.2-r1.ebuild,v 1.1 2010/08/21 18:29:39 truedfx Exp $
 
 EAPI=2
 
@@ -30,6 +30,7 @@ S=${WORKDIR}/${PN}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch
+	epatch "${FILESDIR}"/${PN}-0.9.28.2-bug0015627.patch
 
 	# Use default configuration (minus stripping) unless specifically requested otherwise
 	if ! test ${PPC_CONFIG_PATH+set} ; then