summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-12-29 00:00:39 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-12-29 00:00:39 +0000
commitd1da474ab8eb239effb7b77c5876dd008b6ed894 (patch)
treeccc9621d208af39c4ed58c426ed16f0e00807d12 /gnome-base
parentFix compilation with dev-libs/libxml2-2.9.0, thanks Harris Landgarten <harris... (diff)
downloadhistorical-d1da474ab8eb239effb7b77c5876dd008b6ed894.tar.gz
historical-d1da474ab8eb239effb7b77c5876dd008b6ed894.tar.bz2
historical-d1da474ab8eb239effb7b77c5876dd008b6ed894.zip
Fix build failure with python-3.2 and certain locales (bug #449062, thanks to pingoo et al.)
Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64 Manifest-Sign-Key: 0xCF0ADD61
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gdm/ChangeLog7
-rw-r--r--gnome-base/gdm/Manifest15
-rw-r--r--gnome-base/gdm/files/gdm-3.6.2-gdm-slave.xml-unicode.patch27
-rw-r--r--gnome-base/gdm/gdm-3.6.2.ebuild6
4 files changed, 48 insertions, 7 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/Manifest b/gnome-base/gdm/Manifest
index 71133c1610b0..a06e95d81ef3 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -42,6 +42,7 @@ AUX gdm-3.4.1-plymouth.patch 10434 SHA256 22de460e0b1b659299f0afc8cd3a0e23e7da7b
AUX gdm-3.4.1-save-root-window.patch 5010 SHA256 1472af09a3ca0ac1657130e1104e36c11dbd31a67f7600c9bde41d969b919b65 SHA512 f699f5fd345283813558c4637bbb19c6bec8857d785ab11b2752d02d4b0ac9bf67b682b7afbf252e8eaa81943f7d68b320ab65d0206afea825c0a5841dfb7fca WHIRLPOOL fbd6d27f92d60bb060e4b06f2a95ce88561a4b1dcd4a3c2d70a9485c8371599458bfe4b1ce8c9d92f7929d1fa0b61c934a936e079f81a5a9042aca08f8a7a683
AUX gdm-3.6.0-fix-daemonize-regression.patch 6639 SHA256 6ff6eeba681dc73ae77058ba6ad1ecb292af843189a83071b96b1d84fbe887e9 SHA512 5de1e38b447e1dce933b004951366c701707a35c990fa35c84959753b32326e93be7fde073abc51e5bf439b5fd4277adce5f3ab190a7aac3d65211d84411f06a WHIRLPOOL f6a5db38a750d47375f69088765dd9e653dc4a70750a542e660ce7c876cc30f61e05e332250e5daf0f9d50c512791eac18cc69585c42aa5decb206b2ee7b361d
AUX gdm-3.6.0-selinux-automagic.patch 909 SHA256 9b1a3c5913e53f30641dc1177d396060c81abcfff6d8e9acc738e4d19e396580 SHA512 68a6fa710862bde6479b9e35f66d5b65c5cf90df462d8f318ad06ad04fd2106376915250d8b09a6ca0716fab78aedc619e41de6f2c93e57449442a7613fe575b WHIRLPOOL a5ca1901f52be902cb6896759a3ce92f2298782d80ca6c6a023a3fd7a6cea8884f93af7cbc85788fd24166f4bf5da1c357b2056d3d6141fb5540273b9dd63a5a
+AUX gdm-3.6.2-gdm-slave.xml-unicode.patch 792 SHA256 4e53f08356b9fbc0669bfe15df848d92b845244604a329ed4cfe753c94691990 SHA512 4f856ffeb3e9b720be24fdb2f231a3245b4fea2a503cfc74b5ebbf77418ae6c6cf377568f53da053efe42304e0bad9add2dc5d7a0571ed3152fb0ad0c16a9019 WHIRLPOOL 59fbab49f7420236a2a3a34f5b700b2b6306235d6f60b383886cdbd01f05153dc2c06a102c0baad8ed350ffdcaad7a1ba448abb2ac6d77a7e759c541f63f3b14
DIST gdm-2.20.11.tar.bz2 4013059 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad1a28ef05f7e0178891f1eaa2 SHA512 ca8ce81161c640ef2753a35b8eb0fd8669a7e42dc6272b2aa7b4a9f525b4d03dc46bb5aa8d41b69aaba36c8715a220c92e75c169ce9d5af39b25853505abeb39 WHIRLPOOL 0bdb90aef849c7b505ffb1b0af1b904970a9cd11c27cf631794b14a01b5e0fb01666a51b68cf288ae79057dd7bfca9a8f1ef9518ec5b04a4867eb7792c631765
DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 SHA512 aaf0f4bfdb13f6dc81dbfe93b144343b6a8146698450fce9753396c92bef2c4e699f3f5c2ff9b88736432d2fcb861ab8dc423148109cb9194983e0c07baa8aa5 WHIRLPOOL 698cd66740872260a106f8174a51a44a45817112d696b2741fd537a10362308ffa8917df31190fe042c46b7ea76e2f8d1147f5c15e39cfb33f1f2f7e951ffb78
DIST gdm-2.32.1.tar.bz2 2441685 SHA256 7ba9cb2a8efb9856994467b14e4837a281fcf6d9dc9a267ea38a9aae1ec55abc SHA512 3a8a375a171392ce1097e6b870cdbdcea6c7f7bd0984434bf3865e6784130d9b25793a32e9e678f6dd3be6a70a25cd941c9ce4fea67c74a84eb0f05b2073cf25 WHIRLPOOL ea84cd34ec162eafebbd43ebb337855b39dbae692a40c14dee37e8f98634b6034ee74b50a58e207e52ef9b12dcfb4bc312ad4ac06b442e022a787850647df22d
@@ -52,13 +53,17 @@ DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278
EBUILD gdm-2.20.11-r1.ebuild 7213 SHA256 71ac1e2eaaac38e36b3a11fc9bd883399e57b0bcae84458804f15611b5bf05b0 SHA512 5b78fe76b6ce79f5cab0ff027c1bc117766c234acfa58869155e56cd4fe0aae5a2e971014f2d9ea15637dbc6fcc5d5e536b5f36a6e3e664b2b2cb68779d83b04 WHIRLPOOL 7837696f0f0e54045ae4df101b89aa8ac9147ce064a406ed604ef8c7c04b30953ba35a8773c6bc404a60d62f6bca124db486c498690a561d2e8112b5f4452b5d
EBUILD gdm-2.32.1-r1.ebuild 5592 SHA256 765c26e987ec88b21b2ea01abe2bd2f5f5947a6b8f2263a55ba03bbea8b2d08d SHA512 097770d57c11f60eda7cb2d95d13b2b820d4c09f12de3f98889204f2cbcb1b65aa807f37db120a95e9666066b421504a12cfb9fc459f77f6050392061f9466de WHIRLPOOL b3e361b9b11a1ac8b5e89d2d69a18f9ad6c022e6fe8c10b6a2498e295b372f1c6b6bff4e0f5fb8c0aacad004276d6905fac0ed2606c6b0a9fe3693e553259c1e
EBUILD gdm-3.4.1-r3.ebuild 8733 SHA256 a36c6f424e43c2b0911a44d190b8535b98b9a164d497919d65e3ebe717fcde48 SHA512 813c27847916a12f131f7e20876970052f8e6c93eafff50cd490c4ef47bb6af35f607551b4c2c13d81c9d9c5baa3a62068e76736f8bb00304439d203350d38f9 WHIRLPOOL a6a7dee748920bb3c237bd5adb0fe49651dfe38fc0f30fc35a7614fff131aa075d56b656e3c8a0a2a36d74af8e2f1fee5a98977df583c0022f4d45824c05cc52
-EBUILD gdm-3.6.2.ebuild 7756 SHA256 89dedac9c47202c7e4bc9ae3912440f477e7dd9c9a507bfbaa98f345b45dfe81 SHA512 65cb83fec5b80c57faf782bac36251774e758ca6a087c2101606e72c7f0b0d4e670d2d5acca95d66dcf766ee1d88a2eb195c3c613e9a3fe1e11c7a838449c5f6 WHIRLPOOL 6c328bc3a0435d5ac6a84fd78d8167c128b435ae6f029e20d7d9f11c7a5109fa24f04aefcfe25f5314e99bc792cf7801c7ca9bd1ca97a347162ef85c8023cc37
-MISC ChangeLog 53579 SHA256 54d497f72c714a3cadca39490ab65819fd6529e5356cd106dc1e15cf0856865c SHA512 159a8214398d04fe07c1c037c17cfaf28d554cfd9b343e307db545054779a1b3a4f44e06040e1388323b1c46abc7db72fdf0d901c996f6692cee4cc1170e2fb6 WHIRLPOOL cf3f9e49202348c361c364b7a040baddea2ab5f38557c347d49577ceb8f655b517b905ca41ef90082e4085117fd8c2db1f2f85f6bf5c42dbc972ad0edfe3608f
+EBUILD gdm-3.6.2.ebuild 7953 SHA256 0808556baa5bfa18341f02aa1be5aa92464238f11f4e9a4f1077b8b042b8a743 SHA512 4d9cb8a604f3d89fc3359afe15b3667e220347c8a57227ed2e68b96512c70a8276342b778c3f1aaff897787547e862875dff4db801cfd30eded19cf435609c0b WHIRLPOOL e5abe7bb68d8cb45ed2696d0da6b33ed7ab24cf8534af936b87ff542dba284b3785dd1c9495909d70062ecce12bf26bebe07d61a04ed771fe24231011fd127f4
+MISC ChangeLog 53808 SHA256 4463f5318594ac242f1b19df2fee5eb66cc4ad64e130701942f3b43e69549cc0 SHA512 e5ec9810d86328bfca2bd94a1a715c606033f808858c4a2416c382a53aa701b6f0a1acb77a75f9eddcafc9dfd010ccdd963265a949b534174e36cacb83b10ceb WHIRLPOOL e4f0c46ae9705e73c80d24d1ed90acdea0176a5f1ccc85ec0b30d8fb8e284cf4712f5f2a85b9642f3afbaa1ab5ca0c64b557e81d5a6f46548d1bd819fa1e1f39
MISC metadata.xml 1198 SHA256 12a62ad1cd6177eae915d242841c64cf8b02eb23b61bd825cbcdbfb3759e3a46 SHA512 fa81b652ed5548ca9ab95cd48852d26534861194044e5573442a150f7146c67d988ec99ad9c16ef53880873a3c55035a4f1d4905f9e51f8ded3e9299f28a0ce6 WHIRLPOOL c68ff0db9a24909e13dd62e7d97b09ff1d527686082b9211e183117b17cf86dc24564087ca7d8d3b569a9b8213d2b18ae37ddb6723c4d3d18cd290ebe15bc020
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlDbb94ACgkQ1fmVwcYIWAbsaACcDNf29S+fhO+TR/K1Ymg4cRvU
-QlcAoOPXy66Uk8Did2HDQyuDCbhCYt4t
-=BR/N
+iQEcBAEBCAAGBQJQ3jKjAAoJEJ0WA1zPCt1hPEcH/A4VGyBLtmZr++Avi+Mob7AH
+p6ZYfbv1Jwwm9QdnNr3GruYqFI1QbRNETN31YwW1P+rBkvhWZ+8Fs33arKgOMJvF
+mkO3MgSTuGrYkFX4DIFxj+WSrIYYXtpdPFaygQ+W1PJ2iBr9/pcwE0xQT7fzETD3
+rRwmEfrKgK5hgfa8wqqmnvaiB7xBI7lwcXAsBmr5sdkm2u/DEmazCMoAqC/wIY5K
+ro/p00svA41ovSpRqUjH5rgLotIcBBLgH0L7RNRxuijoxSKjh5U1cjEmHGdZKEWA
+68HfSo/W7W66MLlF+bv1BpZpNYDe88yR/l5NAg0A7Rc6HiuWjQy3hxmoD6qElAQ=
+=VaxZ
-----END PGP SIGNATURE-----
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"