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 1R83Nx-0003UT-L8 for garchives@archives.gentoo.org; Mon, 26 Sep 2011 05:05:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A514021C300; Mon, 26 Sep 2011 05:05:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5AC6921C301 for ; Mon, 26 Sep 2011 05:05:08 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BF221B414E for ; Mon, 26 Sep 2011 04:46:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9E5C880042 for ; Mon, 26 Sep 2011 04:46:00 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:gnome-next commit in: x11-libs/gtk+/files/, x11-libs/gtk+/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-libs/gtk+/files/gtk+-3.1.90-gtk_application_startup-chain.patch x11-libs/gtk+/files/gtk+-3.1.90-gtk_icon_view_draw-return.patch x11-libs/gtk+/files/gtk+-3.1.90-gtk_tree_view_draw-return.patch x11-libs/gtk+/gtk+-3.1.90.ebuild x11-libs/gtk+/gtk+-3.2.0.ebuild X-VCS-Directories: x11-libs/gtk+/files/ x11-libs/gtk+/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: d2bd426ba125617d1beeaba7e7b30d39e6914bc1 Date: Mon, 26 Sep 2011 04:46:00 +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: e33bc69d06084a9abc38d35b63864e51 commit: d2bd426ba125617d1beeaba7e7b30d39e6914bc1 Author: Alexandre Rostovtsev gmail com> AuthorDate: Mon Sep 26 03:02:57 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Sep 26 03:02:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dd2bd426b x11-libs/gtk+: 3.1.90 =E2=86=92 3.2.0 Bump to gnome-3.2 version. Patches were applied upstream. --- ...gtk+-3.1.90-gtk_application_startup-chain.patch | 22 --------------= ---- .../gtk+-3.1.90-gtk_icon_view_draw-return.patch | 23 --------------= ----- .../gtk+-3.1.90-gtk_tree_view_draw-return.patch | 24 --------------= ------ .../gtk+/{gtk+-3.1.90.ebuild =3D> gtk+-3.2.0.ebuild} | 3 -- 4 files changed, 0 insertions(+), 72 deletions(-) diff --git a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_application_startup-chai= n.patch b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_application_startup-chain.p= atch deleted file mode 100644 index da5653f..0000000 --- a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_application_startup-chain.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f86351c05f88d3d7911615fc27ddd8091260caf3 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie -Date: Wed, 14 Sep 2011 18:02:51 +0000 -Subject: GtkApplication: chain up ::startup - ---- -diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c -index c6db4e8..c192d75 100644 ---- a/gtk/gtkapplication.c -+++ b/gtk/gtkapplication.c -@@ -97,6 +97,9 @@ gtk_application_focus_in_event_cb (GtkWindow *win= dow, - static void - gtk_application_startup (GApplication *application) - { -+ G_APPLICATION_CLASS (gtk_application_parent_class) -+ ->startup (application); -+ - gtk_init (0, 0); - } -=20 --- -cgit v0.9.0.2 diff --git a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_icon_view_draw-return.pa= tch b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_icon_view_draw-return.patch deleted file mode 100644 index 1f4505d..0000000 --- a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_icon_view_draw-return.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9ddc11fbb5a2e4bb1f9d71c7278feab874add1d6 Mon Sep 17 00:00:00 2001 -From: Benjamin Otte -Date: Wed, 14 Sep 2011 14:09:36 +0000 -Subject: iconview: Don't rturn TRUE from draw handler - ---- -diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c -index 8b4a184..2324889 100644 ---- a/gtk/gtkiconview.c -+++ b/gtk/gtkiconview.c -@@ -1683,9 +1683,7 @@ gtk_icon_view_draw (GtkWidget *widget, -=20 - cairo_restore (cr); -=20 -- GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->draw (widget, cr); -- -- return TRUE; -+ return GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->draw (widget, c= r); - } -=20 - static gboolean --- -cgit v0.9.0.2 diff --git a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_tree_view_draw-return.pa= tch b/x11-libs/gtk+/files/gtk+-3.1.90-gtk_tree_view_draw-return.patch deleted file mode 100644 index 87be406..0000000 --- a/x11-libs/gtk+/files/gtk+-3.1.90-gtk_tree_view_draw-return.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9e8b2f2521d1961930bf29b890df9eef89dfc019 Mon Sep 17 00:00:00 2001 -From: Benjamin Otte -Date: Wed, 14 Sep 2011 14:03:54 +0000 -Subject: treeview: Return FALSE from draw handler - -... like every widget should. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D658981 ---- -diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c -index 8eaeee8..3b2ec9e 100644 ---- a/gtk/gtktreeview.c -+++ b/gtk/gtktreeview.c -@@ -5383,7 +5383,7 @@ gtk_tree_view_draw (GtkWidget *widget, - button, cr); - } -=20 -- return TRUE; -+ return FALSE; - } -=20 - enum --- -cgit v0.9.0.2 diff --git a/x11-libs/gtk+/gtk+-3.1.90.ebuild b/x11-libs/gtk+/gtk+-3.2.0.= ebuild similarity index 98% rename from x11-libs/gtk+/gtk+-3.1.90.ebuild rename to x11-libs/gtk+/gtk+-3.2.0.ebuild index d078fb7..ec98b3a 100644 --- a/x11-libs/gtk+/gtk+-3.1.90.ebuild +++ b/x11-libs/gtk+/gtk+-3.2.0.ebuild @@ -111,9 +111,6 @@ src_prepare() { [[ ${PV} !=3D 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in fi =20 - # Useful upstream patches, will be in next release - epatch "${FILESDIR}/${P}"-*.patch - gnome2_src_prepare } =20