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 1R8G9s-000638-R0 for garchives@archives.gentoo.org; Mon, 26 Sep 2011 18:44:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68F1E21C10B; Mon, 26 Sep 2011 18:43:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2A41221C10B for ; Mon, 26 Sep 2011 18:43:50 +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 4F2211B4016 for ; Mon, 26 Sep 2011 18:43:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A4A8980042 for ; Mon, 26 Sep 2011 18:43:49 +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: <1e2b70b62149c095b83757aaf10689b43608eede.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-update_brightness_limites-crash.patch gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-wall-clock-dispose.patch gnome-base/gnome-desktop/gnome-desktop-3.1.91-r1.ebuild gnome-base/gnome-desktop/gnome-desktop-3.2.0.ebuild gnome-base/gnome-desktop/gnome-desktop-9999.ebuild X-VCS-Directories: gnome-base/gnome-desktop/ gnome-base/gnome-desktop/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 1e2b70b62149c095b83757aaf10689b43608eede Date: Mon, 26 Sep 2011 18:43:49 +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: d9f4d36c544e0d67ad7e96b05d2b6b17 commit: 1e2b70b62149c095b83757aaf10689b43608eede Author: Alexandre Rostovtsev gmail com> AuthorDate: Mon Sep 26 17:49:39 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Sep 26 17:49:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D1e2b70b6 gnome-base/gnome-desktop: 3.1.91-r1 =E2=86=92 3.1.20 Bump. Patches were applied upstream. --- ...op-3.1.91-update_brightness_limites-crash.patch | 25 --------------= --- .../gnome-desktop-3.1.91-wall-clock-dispose.patch | 28 --------------= ------ ...3.1.91-r1.ebuild =3D> gnome-desktop-3.2.0.ebuild} | 12 +------- gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 2 +- 4 files changed, 3 insertions(+), 64 deletions(-) diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-update_b= rightness_limites-crash.patch b/gnome-base/gnome-desktop/files/gnome-desk= top-3.1.91-update_brightness_limites-crash.patch deleted file mode 100644 index 76eb72a..0000000 --- a/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-update_brightne= ss_limites-crash.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fa5688ef9d73c2155bec38827dea466d028bda0e Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Tue, 13 Sep 2011 15:31:23 +0000 -Subject: gnome-rr: fix crash in update_brightness_limits - -XFree() isn't as forgiving as free() about NULL pointers. ---- -diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c -index 3cab1ed..8c5e9c9 100644 ---- a/libgnome-desktop/gnome-rr.c -+++ b/libgnome-desktop/gnome-rr.c -@@ -1558,7 +1558,10 @@ update_brightness_limits (GnomeRROutput *output) - output->backlight_min =3D info->values[0]; - output->backlight_max =3D info->values[1]; - out: -- XFree (info); -+ if (info !=3D NULL) -+ { -+ XFree (info); -+ } - #endif - } -=20 --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-wall-clo= ck-dispose.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-wa= ll-clock-dispose.patch deleted file mode 100644 index 2e16468..0000000 --- a/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-wall-clock-disp= ose.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a65613bf0a507a226c172bb6f503e27532efb0fa Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Thu, 08 Sep 2011 17:01:35 +0000 -Subject: GnomeWallClock: Remove the date/time source on dispose - -We don't do it in finalize since the dispose handler needs the objects -that are being disposed. - -https://bugzilla.gnome.org/show_bug.cgi?id=3D658583 ---- -diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnom= e-wall-clock.c -index 49437d8..167619d 100644 ---- a/libgnome-desktop/gnome-wall-clock.c -+++ b/libgnome-desktop/gnome-wall-clock.c -@@ -84,6 +84,11 @@ gnome_wall_clock_dispose (GObject *object) - { - GnomeWallClock *self =3D GNOME_WALL_CLOCK (object); -=20 -+ if (self->priv->clock_update_id) { -+ g_source_remove (self->priv->clock_update_id); -+ self->priv->clock_update_id =3D 0; -+ } -+ - if (self->priv->tz_monitor !=3D NULL) { - g_object_unref (self->priv->tz_monitor); - self->priv->tz_monitor =3D NULL; --- -cgit v0.9.0.2 diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.1.91-r1.ebuild b/gn= ome-base/gnome-desktop/gnome-desktop-3.2.0.ebuild similarity index 90% rename from gnome-base/gnome-desktop/gnome-desktop-3.1.91-r1.ebuild rename to gnome-base/gnome-desktop/gnome-desktop-3.2.0.ebuild index 01ebc4c..300f0d8 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.1.91-r1.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.2.0.ebuild @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" =20 -inherit eutils gnome2 +inherit gnome2 if [[ ${PV} =3D 9999 ]]; then inherit git-2 gnome2-live fi @@ -31,7 +31,7 @@ RDEPEND=3D" x11-libs/cairo[X] >=3Dx11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=3Dx11-libs/gtk+-3.0.0:3[introspection?] - >=3Dx11-libs/libXext-1.2 + >=3Dx11-libs/libXext-1.1 >=3Dx11-libs/libXrandr-1.2 x11-libs/libX11 >=3Dgnome-base/gsettings-desktop-schemas-2.91.92 @@ -85,11 +85,3 @@ src_unpack() { die "ln -sf failed" fi } - -src_prepare() { - gnome2_src_prepare - - # Upstream patches to prevent crashes, will be in next release - epatch "${FILESDIR}/${P}-wall-clock-dispose.patch" - epatch "${FILESDIR}/${P}-update_brightness_limites-crash.patch" -} diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-b= ase/gnome-desktop/gnome-desktop-9999.ebuild index 5ca10a7..300f0d8 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild @@ -31,7 +31,7 @@ RDEPEND=3D" x11-libs/cairo[X] >=3Dx11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=3Dx11-libs/gtk+-3.0.0:3[introspection?] - >=3Dx11-libs/libXext-1.2 + >=3Dx11-libs/libXext-1.1 >=3Dx11-libs/libXrandr-1.2 x11-libs/libX11 >=3Dgnome-base/gsettings-desktop-schemas-2.91.92