* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2011-09-14 22:09 Alexandre Restovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Restovtsev @ 2011-09-14 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 5f1419d8fdff7e3172547f47706fb9fcb7d9c882
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 14 21:51:33 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep 14 22:02:18 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5f1419d8
gnome-base/gnome-desktop: 3.1.91 → 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 => 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_brightness_limites-crash.patch b/gnome-base/gnome-desktop/files/gnome-desktop-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_brightness_limites-crash.patch
@@ -0,0 +1,25 @@
+From fa5688ef9d73c2155bec38827dea466d028bda0e Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+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 = info->values[0];
+ output->backlight_max = info->values[1];
+ out:
+- XFree (info);
++ if (info != NULL)
++ {
++ XFree (info);
++ }
+ #endif
+ }
+
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-wall-clock-dispose.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-wall-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-dispose.patch
@@ -0,0 +1,28 @@
+From a65613bf0a507a226c172bb6f503e27532efb0fa Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+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=658583
+---
+diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnome-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 = GNOME_WALL_CLOCK (object);
+
++ if (self->priv->clock_update_id) {
++ g_source_remove (self->priv->clock_update_id);
++ self->priv->clock_update_id = 0;
++ }
++
+ if (self->priv->tz_monitor != NULL) {
+ g_object_unref (self->priv->tz_monitor);
+ self->priv->tz_monitor = 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="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit gnome2
+inherit eutils gnome2
if [[ ${PV} = 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"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
@ 2011-09-26 18:43 Alexandre Restovtsev
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Restovtsev @ 2011-09-26 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 1e2b70b62149c095b83757aaf10689b43608eede
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 17:49:39 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 17:49:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1e2b70b6
gnome-base/gnome-desktop: 3.1.91-r1 → 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 => 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_brightness_limites-crash.patch b/gnome-base/gnome-desktop/files/gnome-desktop-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_brightness_limites-crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fa5688ef9d73c2155bec38827dea466d028bda0e Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-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 = info->values[0];
- output->backlight_max = info->values[1];
- out:
-- XFree (info);
-+ if (info != NULL)
-+ {
-+ XFree (info);
-+ }
- #endif
- }
-
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-wall-clock-dispose.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-wall-clock-dispose.patch
deleted file mode 100644
index 2e16468..0000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-3.1.91-wall-clock-dispose.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a65613bf0a507a226c172bb6f503e27532efb0fa Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-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=658583
----
-diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnome-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 = GNOME_WALL_CLOCK (object);
-
-+ if (self->priv->clock_update_id) {
-+ g_source_remove (self->priv->clock_update_id);
-+ self->priv->clock_update_id = 0;
-+ }
-+
- if (self->priv->tz_monitor != NULL) {
- g_object_unref (self->priv->tz_monitor);
- self->priv->tz_monitor = NULL;
---
-cgit v0.9.0.2
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.1.91-r1.ebuild b/gnome-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="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit eutils gnome2
+inherit gnome2
if [[ ${PV} = 9999 ]]; then
inherit git-2 gnome2-live
fi
@@ -31,7 +31,7 @@ RDEPEND="
x11-libs/cairo[X]
>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
>=x11-libs/gtk+-3.0.0:3[introspection?]
- >=x11-libs/libXext-1.2
+ >=x11-libs/libXext-1.1
>=x11-libs/libXrandr-1.2
x11-libs/libX11
>=gnome-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-base/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="
x11-libs/cairo[X]
>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
>=x11-libs/gtk+-3.0.0:3[introspection?]
- >=x11-libs/libXext-1.2
+ >=x11-libs/libXext-1.1
>=x11-libs/libXrandr-1.2
x11-libs/libX11
>=gnome-base/gsettings-desktop-schemas-2.91.92
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-26 18:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-26 18:43 [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-09-14 22:09 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox