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 1Q6uet-0002QU-Ag for garchives@archives.gentoo.org; Tue, 05 Apr 2011 01:02:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68D37E086F; Tue, 5 Apr 2011 00:57:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 261B1E086F for ; Tue, 5 Apr 2011 00:57:41 +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 EFE391B40DF for ; Tue, 5 Apr 2011 00:57:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4F23780074 for ; Tue, 5 Apr 2011 00:57:40 +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: <0e581ba965791577ca2eab8f459143aad40f87e2.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/, gnome-base/gdm/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gdm/files/gdm-2.91.94-fix-gtk+-crasher.patch gnome-base/gdm/gdm-2.91.94-r1.ebuild gnome-base/gdm/gdm-3.0.0.ebuild X-VCS-Directories: gnome-base/gdm/ gnome-base/gdm/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 0e581ba965791577ca2eab8f459143aad40f87e2 Date: Tue, 5 Apr 2011 00:57:40 +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: db092cb5a9094a158292cd478c6101c2 commit: 0e581ba965791577ca2eab8f459143aad40f87e2 Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Apr 4 20:02:28 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Apr 4 21:20:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D0e581ba9 gnome-base/gdm: 2.91.94-r1 =E2=86=92 3.0.0 * Translation updates * Remove gtk+ hack patch, gtk+ 3.0.8 was released --- .../gdm/files/gdm-2.91.94-fix-gtk+-crasher.patch | 104 --------------= ------ .../{gdm-2.91.94-r1.ebuild =3D> gdm-3.0.0.ebuild} | 3 - 2 files changed, 0 insertions(+), 107 deletions(-) diff --git a/gnome-base/gdm/files/gdm-2.91.94-fix-gtk+-crasher.patch b/gn= ome-base/gdm/files/gdm-2.91.94-fix-gtk+-crasher.patch deleted file mode 100644 index 3b8379e..0000000 --- a/gnome-base/gdm/files/gdm-2.91.94-fix-gtk+-crasher.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 045c319f2655fc45c24951479eb9cd1e59792cef Mon Sep 17 00:00:00 2001 -From: Benjamin Otte -Date: Sat, 2 Apr 2011 04:10:09 +0200 -Subject: [PATCH] simple-greeter: Don't request an invalid size - -GTK widgets must at all times report a size they can handle. So it is -not allowed to return 0 when not realized, because then size allocations -break when GTK uses this size for its widget. -In this case, GTK uses the pre-realize size to determine the size it -should request when creating the greeter window - chicken and egg so to -say. - -This patch just uses the default monitor (I guess the root window's -monitor is the default monitor?) for determining the login window size. - -One thing this patch doesn't do is add a call to gtk_widget_queue_resize= () -from the realize callback or from monitor-changing signals, though -that's probably technically necessary. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D646498 ---- - gui/simple-greeter/gdm-greeter-login-window.c | 28 +++++++++---------= ------- - 1 files changed, 10 insertions(+), 18 deletions(-) - -diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-= greeter/gdm-greeter-login-window.c -index abd6707..3ec9a09 100644 ---- a/gui/simple-greeter/gdm-greeter-login-window.c -+++ b/gui/simple-greeter/gdm-greeter-login-window.c -@@ -1413,25 +1413,22 @@ gdm_greeter_login_window_get_preferred_width (Gt= kWidget *widget, - { - int monitor; - GdkScreen *screen; -+ GdkWindow *window; - GdkRectangle area; - GtkAllocation widget_allocation; - int min_size; - int nat_size; -=20 -- min_size =3D 0; -- nat_size =3D 0; -- -- if (!gtk_widget_get_realized (widget)) { -- goto out; -- } -- - gtk_widget_get_preferred_width (gtk_bin_get_child (GTK_BIN (wid= get)), - &min_size, - &nat_size); -=20 - /* Make width be at least 33% screen width */ - screen =3D gtk_widget_get_screen (widget); -- monitor =3D gdk_screen_get_monitor_at_window (screen, gtk_widge= t_get_window (widget)); -+ window =3D gtk_widget_get_window (widget); -+ if (window =3D=3D NULL) -+ window =3D gdk_screen_get_root_window (screen); -+ monitor =3D gdk_screen_get_monitor_at_window (screen, window); - gdk_screen_get_monitor_geometry (screen, monitor, &area); - min_size =3D MAX (min_size, .33 * area.width); - nat_size =3D MAX (nat_size, .33 * area.width); -@@ -1442,7 +1439,6 @@ gdm_greeter_login_window_get_preferred_width (GtkW= idget *widget, - min_size =3D MAX (min_size, widget_allocation.width); - nat_size =3D MAX (nat_size, widget_allocation.width); -=20 -- out: - if (minimum_size) - *minimum_size =3D min_size; - if (natural_size) -@@ -1456,29 +1452,25 @@ gdm_greeter_login_window_get_preferred_height (G= tkWidget *widget, - { - int monitor; - GdkScreen *screen; -+ GdkWindow *window; - GdkRectangle area; - int min_size; - int nat_size; -=20 -- min_size =3D 0; -- nat_size =3D 0; -- -- if (!gtk_widget_get_realized (widget)) { -- goto out; -- } -- - gtk_widget_get_preferred_height (gtk_bin_get_child (GTK_BIN (wi= dget)), - &min_size, - &nat_size); -=20 - /* Make height be at most 80% of screen height */ - screen =3D gtk_widget_get_screen (widget); -- monitor =3D gdk_screen_get_monitor_at_window (screen, gtk_widge= t_get_window (widget)); -+ window =3D gtk_widget_get_window (widget); -+ if (window =3D=3D NULL) -+ window =3D gdk_screen_get_root_window (screen); -+ monitor =3D gdk_screen_get_monitor_at_window (screen, window); - gdk_screen_get_monitor_geometry (screen, monitor, &area); - min_size =3D MIN (min_size, .8 * area.height); - nat_size =3D MIN (nat_size, .8 * area.height); -=20 -- out: - if (minimum_size) - *minimum_size =3D min_size; - if (natural_size) ---=20 -1.7.4 \ No newline at end of file diff --git a/gnome-base/gdm/gdm-2.91.94-r1.ebuild b/gnome-base/gdm/gdm-3.= 0.0.ebuild similarity index 98% rename from gnome-base/gdm/gdm-2.91.94-r1.ebuild rename to gnome-base/gdm/gdm-3.0.0.ebuild index 971c67a..1a5e95e 100644 --- a/gnome-base/gdm/gdm-2.91.94-r1.ebuild +++ b/gnome-base/gdm/gdm-3.0.0.ebuild @@ -118,9 +118,6 @@ src_prepare() { # fix libxklavier automagic support epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch" =20 - # Fix crasher with gtk+-3.0.7, bug 361679 - epatch "${FILESDIR}/${P}-fix-gtk+-crasher.patch" - mkdir "${S}"/m4 intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf