diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-12-29 00:00:34 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-12-29 00:00:34 +0000 |
| commit | 3e61d97103f57ec17e0709ff644c141c7d017230 (patch) | |
| tree | 9c786fbc87c16dc3603cb5b62065a272be3e503d | |
| parent | Fix compilation with dev-libs/libxml2-2.9.0, thanks Harris Landgarten <harris... (diff) | |
| download | gentoo-2-3e61d97103f57ec17e0709ff644c141c7d017230.tar.gz gentoo-2-3e61d97103f57ec17e0709ff644c141c7d017230.tar.bz2 gentoo-2-3e61d97103f57ec17e0709ff644c141c7d017230.zip | |
Fix build failure with python-3.2 and certain locales (bug #449062, thanks to pingoo et al.)
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
| -rw-r--r-- | gnome-base/gdm/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch | 27 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-3.6.2.ebuild | 6 |
3 files changed, 38 insertions, 2 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index c6457f110cf3..a756bb5279b5 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-base/gdm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.358 2012/12/26 21:45:01 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.359 2012/12/29 00:00:34 tetromino Exp $ + + 28 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gdm-3.6.2.ebuild, + +files/gdm-3.6.2-gdm-slave.xml-unicode.patch: + Fix build failure with python-3.2 and certain locales (bug #449062, thanks to + pingoo et al.) *gdm-3.6.2 (26 Dec 2012) diff --git a/gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch b/gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch new file mode 100644 index 000000000000..2863b752961a --- /dev/null +++ b/gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch @@ -0,0 +1,27 @@ +From 72fd8c8da02b47403992945a61d2514d6ee78cf4 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Fri, 28 Dec 2012 18:50:37 -0500 +Subject: [PATCH] daemon: remove spurious unicode characters from dbus + introspection file + +https://bugzilla.gnome.org/show_bug.cgi?id=690842 +--- + daemon/gdm-slave.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/daemon/gdm-slave.xml b/daemon/gdm-slave.xml +index 547c44e..d055252 100644 +--- a/daemon/gdm-slave.xml ++++ b/daemon/gdm-slave.xml +@@ -14,6 +14,6 @@ + <arg name="address" type="s" direction="out" /> + </method> + +- <property name="session_id" type="s" access="read"/>• +- </interface>• ++ <property name="session_id" type="s" access="read"/> ++ </interface> + </node> +-- +1.8.0.2 + diff --git a/gnome-base/gdm/gdm-3.6.2.ebuild b/gnome-base/gdm/gdm-3.6.2.ebuild index 98ad0808961e..1f483250964f 100644 --- a/gnome-base/gdm/gdm-3.6.2.ebuild +++ b/gnome-base/gdm/gdm-3.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.6.2.ebuild,v 1.1 2012/12/26 21:45:01 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.6.2.ebuild,v 1.2 2012/12/29 00:00:34 tetromino Exp $ EAPI="5" GNOME2_LA_PUNT="yes" @@ -136,6 +136,10 @@ src_prepare() { # automagic selinux :/ epatch "${FILESDIR}/${PN}-3.6.0-selinux-automagic.patch" + # spurious unicode characters causing build failure, bug #449062 + # https://bugzilla.gnome.org/show_bug.cgi?id=690842 + LC_ALL=C epatch "${FILESDIR}/${PN}-3.6.2-gdm-slave.xml-unicode.patch" + # don't load accessibility support at runtime when USE=-accessibility use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessibility.patch" |