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 1R3xer-00062V-Rj for garchives@archives.gentoo.org; Wed, 14 Sep 2011 22:10:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18FD321C258; Wed, 14 Sep 2011 22:10:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C8E0521C25D for ; Wed, 14 Sep 2011 22:09:59 +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 35A221B402D for ; Wed, 14 Sep 2011 22:09:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7D2D880042 for ; Wed, 14 Sep 2011 22:09:58 +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: <5f1419d8fdff7e3172547f47706fb9fcb7d9c882.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.1.91.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: 5f1419d8fdff7e3172547f47706fb9fcb7d9c882 Date: Wed, 14 Sep 2011 22:09:58 +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: 4c05a48a0254e7bf6cd11fb761e1d755 commit: 5f1419d8fdff7e3172547f47706fb9fcb7d9c882 Author: Alexandre Rostovtsev gmail com> AuthorDate: Wed Sep 14 21:51:33 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Sep 14 22:02:18 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D5f1419d8 gnome-base/gnome-desktop: 3.1.91 =E2=86=92 3.1.91-r1 Add two upstream patches to fix crashes. --- ...op-3.1.91-update_brightness_limites-crash.patch | 25 ++++++++++++++= +++ .../gnome-desktop-3.1.91-wall-clock-dispose.patch | 28 ++++++++++++++= ++++++ ....1.91.ebuild =3D> gnome-desktop-3.1.91-r1.ebuild} | 10 ++++++- 3 files changed, 62 insertions(+), 1 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 new file mode 100644 index 0000000..76eb72a --- /dev/null +++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-update_brightne= ss_limites-crash.patch @@ -0,0 +1,25 @@ +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 new file mode 100644 index 0000000..2e16468 --- /dev/null +++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-wall-clock-disp= ose.patch @@ -0,0 +1,28 @@ +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.ebuild b/gnome= -base/gnome-desktop/gnome-desktop-3.1.91-r1.ebuild similarity index 91% rename from gnome-base/gnome-desktop/gnome-desktop-3.1.91.ebuild rename to gnome-base/gnome-desktop/gnome-desktop-3.1.91-r1.ebuild index 5ca10a7..01ebc4c 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.1.91.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.1.91-r1.ebuild @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" =20 -inherit gnome2 +inherit eutils gnome2 if [[ ${PV} =3D 9999 ]]; then inherit git-2 gnome2-live fi @@ -85,3 +85,11 @@ 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" +}