diff options
| -rw-r--r-- | gnome-base/gnome-desktop/ChangeLog | 9 | ||||
| -rw-r--r-- | gnome-base/gnome-desktop/files/gnome-desktop-3.4.1-gnome-bg-clock.patch | 35 | ||||
| -rw-r--r-- | gnome-base/gnome-desktop/gnome-desktop-3.4.1.ebuild (renamed from gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild) | 26 |
3 files changed, 60 insertions, 10 deletions
diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog index 4d7927c4f7dc..66322b6e2f89 100644 --- a/gnome-base/gnome-desktop/ChangeLog +++ b/gnome-base/gnome-desktop/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gnome-desktop # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.301 2012/05/05 05:38:10 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.302 2012/05/13 23:34:05 tetromino Exp $ + +*gnome-desktop-3.4.1 (13 May 2012) + + 13 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -gnome-desktop-3.0.2-r1.ebuild, +gnome-desktop-3.4.1.ebuild, + +files/gnome-desktop-3.4.1-gnome-bg-clock.patch: + Version bump. Drop old. 05 May 2012; Jeff Horelick <jdhore@gentoo.org> gnome-desktop-2.30.2.ebuild, gnome-desktop-2.32.1.ebuild, gnome-desktop-2.32.1-r1.ebuild, diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-3.4.1-gnome-bg-clock.patch b/gnome-base/gnome-desktop/files/gnome-desktop-3.4.1-gnome-bg-clock.patch new file mode 100644 index 000000000000..623b7cd9c97c --- /dev/null +++ b/gnome-base/gnome-desktop/files/gnome-desktop-3.4.1-gnome-bg-clock.patch @@ -0,0 +1,35 @@ +From 48793aa3329ce4a1cbd0ddbb4a06e2fb94c70f0c Mon Sep 17 00:00:00 2001 +From: Daniel Drake <dsd@laptop.org> +Date: Wed, 11 Apr 2012 13:59:32 -0600 +Subject: [PATCH] gnome-bg: Fix crash when system clock is behind start date + +The 1-slide background included in Fedora 17 causes a crash +in gnome-bg when the system clock is set behind the date specified +in the slideshow xml file. + +This was due to slide->duration being set to UINT_MAX (to indicate a +single-slide show) but show->total_duration not being updated to take +account of this. The calculation in get_current_slide() was therefore +confused, and triggered a g_assert_not_reached(). + +https://bugzilla.gnome.org/show_bug.cgi?id=673551 +--- + libgnome-desktop/gnome-bg.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c +index c6e4e06..9a583a6 100644 +--- a/libgnome-desktop/gnome-bg.c ++++ b/libgnome-desktop/gnome-bg.c +@@ -2953,7 +2953,7 @@ read_slideshow_file (const char *filename, + /* one slide, there's no transition */ + } else if (len == 1) { + Slide *slide = show->slides->head->data; +- slide->duration = G_MAXUINT; ++ slide->duration = show->total_duration = G_MAXUINT; + } + } + +-- +1.7.8.6 + diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.4.1.ebuild index 66ae04082ead..d21ba7aa0a94 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.4.1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild,v 1.2 2012/05/05 05:38:10 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-3.4.1.ebuild,v 1.1 2012/05/13 23:34:05 tetromino Exp $ -EAPI="3" +EAPI="4" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" -inherit gnome2 +inherit eutils gnome2 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" HOMEPAGE="http://www.gnome.org/" @@ -18,24 +18,26 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~ # TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids) # Latest schemas needed due to commit 7f3e3d52 +# cairo[X] needed for gnome-bg RDEPEND=" >=dev-libs/glib-2.19.1:2 + x11-libs/cairo[X] >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] - >=x11-libs/gtk+-3.0.0:3[introspection?] - >=x11-libs/libXrandr-1.2 - >=x11-libs/startup-notification-0.5 + >=x11-libs/gtk+-3.3.6:3[introspection?] + >=x11-libs/libXext-1.1 + >=x11-libs/libXrandr-1.3 x11-libs/libX11 >=gnome-base/gsettings-desktop-schemas-2.91.92 doc? ( !<gnome-base/gnome-desktop-2.32.1-r1:2[doc] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 )" DEPEND="${RDEPEND} - ~app-text/docbook-xml-dtd-4.1.2 + app-text/docbook-xml-dtd:4.1.2 >=app-text/gnome-doc-utils-0.3.2 - >=dev-util/intltool-0.40 - virtual/pkgconfig + >=dev-util/intltool-0.40.6 sys-devel/gettext x11-proto/xproto >=x11-proto/randrproto-1.2 + virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.4 )" # Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto @@ -54,3 +56,9 @@ pkg_setup() { $(use_enable doc desktop-docs) $(use_enable introspection)" } + +src_prepare() { + # in next release + epatch "${FILESDIR}/${P}-gnome-bg-clock.patch" + gnome2_src_prepare +} |