summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald van Dijk <truedfx@gentoo.org>2010-08-21 18:29:39 +0000
committerHarald van Dijk <truedfx@gentoo.org>2010-08-21 18:29:39 +0000
commit95ca6047161f27814c2b1527161ee67cd59b7e7d (patch)
treeadbd16fc164b6c7a325b29db8cf04b3bb2cdff9d /dev-lang/lazarus
parentsupport ESCM_OFFLINE #307743 by Martin Väth (diff)
downloadgentoo-2-95ca6047161f27814c2b1527161ee67cd59b7e7d.tar.gz
gentoo-2-95ca6047161f27814c2b1527161ee67cd59b7e7d.tar.bz2
gentoo-2-95ca6047161f27814c2b1527161ee67cd59b7e7d.zip
Fix access violation in TGtk2WSCustomListBox with some GTK+ versions (#333761 by suilenroc1183@yahoo.de)
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/lazarus')
-rw-r--r--dev-lang/lazarus/ChangeLog16
-rw-r--r--dev-lang/lazarus/files/lazarus-0.9.28.2-bug0015627.patch30
-rw-r--r--dev-lang/lazarus/lazarus-0.9.28.2-r1.ebuild (renamed from dev-lang/lazarus/lazarus-0.9.28.2.ebuild)3
3 files changed, 47 insertions, 2 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/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