From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PxHhC-0003Cf-EK for garchives@archives.gentoo.org; Wed, 09 Mar 2011 11:36:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 957BFE04C1; Wed, 9 Mar 2011 11:34:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4D988E04BA for ; Wed, 9 Mar 2011 11:34:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66AA11B4235 for ; Wed, 9 Mar 2011 11:34:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AD4048006A for ; Wed, 9 Mar 2011 11:34:36 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch x11-libs/gtk+/gtk+-3.0.1-r1.ebuild x11-libs/gtk+/gtk+-3.0.2.ebuild x11-libs/gtk+/gtk+-9999.ebuild X-VCS-Directories: x11-libs/gtk+/files/ x11-libs/gtk+/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: dd7856b1d4a7b3de932cc33ae3d844d9dd684002 Date: Wed, 9 Mar 2011 11:34:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 38cd4df490845e01c3093f26829881df commit: dd7856b1d4a7b3de932cc33ae3d844d9dd684002 Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Mar 8 11:30:07 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue Mar 8 11:30:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Ddd7856b1 x11-libs/gtk+: 3.0.1 =E2=86=92 3.0.2, don't use -j1 with introspection --- x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch | 24 --------------= ------ .../{gtk+-3.0.1-r1.ebuild =3D> gtk+-3.0.2.ebuild} | 10 +------- x11-libs/gtk+/gtk+-9999.ebuild | 8 +----- 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch b/x11-libs/= gtk+/files/gtk+-3.0.1-double-free.patch deleted file mode 100644 index 31c30d4..0000000 --- a/x11-libs/gtk+/files/gtk+-3.0.1-double-free.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 651410fa2a2c9c1e390ecbe384ea259f9bd319c8 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos -Date: Thu, 24 Feb 2011 16:38:40 +0000 -Subject: Copy event axes for double/triple click events in gdk_event_cop= y() - -Button event axes for double/triple click events are freed by -gdk_event_free(), so copy them to avoid an invalid free when releasing a -copied event. ---- -diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c -index 5188e1e..25853da 100644 ---- a/gdk/gdkevents.c -+++ b/gdk/gdkevents.c -@@ -555,6 +555,8 @@ gdk_event_copy (const GdkEvent *event) - break; -=20 - case GDK_BUTTON_PRESS: -+ case GDK_2BUTTON_PRESS: -+ case GDK_3BUTTON_PRESS: - case GDK_BUTTON_RELEASE: - if (event->button.axes) - new_event->button.axes =3D g_memdup (event->button.axes, --- -cgit v0.8.3.4 diff --git a/x11-libs/gtk+/gtk+-3.0.1-r1.ebuild b/x11-libs/gtk+/gtk+-3.0.= 2.ebuild similarity index 96% rename from x11-libs/gtk+/gtk+-3.0.1-r1.ebuild rename to x11-libs/gtk+/gtk+-3.0.2.ebuild index 17e0249..7090c8e 100644 --- a/x11-libs/gtk+/gtk+-3.0.1-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.0.2.ebuild @@ -48,7 +48,7 @@ RDEPEND=3D"!aqua? ( ) xinerama? ( x11-libs/libXinerama ) >=3Ddev-libs/glib-2.28.0 - >=3Dx11-libs/pango-1.20[introspection?] + >=3Dx11-libs/pango-1.24.0[introspection?] >=3Ddev-libs/atk-1.30[introspection?] media-libs/fontconfig x11-libs/gtk+:2 @@ -91,8 +91,6 @@ src_prepare() { replace-flags -O3 -O2 strip-flags =20 - epatch "${FILESDIR}/${P}-double-free.patch" - # Non-working test in gentoo's env sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ -i gtk/tests/testing.c || die "sed 1 failed" @@ -146,12 +144,6 @@ src_configure() { econf --libdir=3D"${EPREFIX}/usr/$(get_libdir)" ${myconf} } =20 -src_compile() { - # Unfortunately, the parellel make breaks if USE=3Dintrospection - use introspection && export MAKEOPTS=3D"${MAKEOPTS} -j1" - default -} - src_test() { unset DBUS_SESSION_BUS_ADDRESS # Exporting HOME fixes tests using XDG directories spec since all defau= lts diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebu= ild index 55473c2..7090c8e 100644 --- a/x11-libs/gtk+/gtk+-9999.ebuild +++ b/x11-libs/gtk+/gtk+-9999.ebuild @@ -48,7 +48,7 @@ RDEPEND=3D"!aqua? ( ) xinerama? ( x11-libs/libXinerama ) >=3Ddev-libs/glib-2.28.0 - >=3Dx11-libs/pango-1.20[introspection?] + >=3Dx11-libs/pango-1.24.0[introspection?] >=3Ddev-libs/atk-1.30[introspection?] media-libs/fontconfig x11-libs/gtk+:2 @@ -144,12 +144,6 @@ src_configure() { econf --libdir=3D"${EPREFIX}/usr/$(get_libdir)" ${myconf} } =20 -src_compile() { - # Unfortunately, the parellel make breaks if USE=3Dintrospection - use introspection && export MAKEOPTS=3D"${MAKEOPTS} -j1" - default -} - src_test() { unset DBUS_SESSION_BUS_ADDRESS # Exporting HOME fixes tests using XDG directories spec since all defau= lts