Fix localization of date/time, bug 411929 by Franz Fellner. Patch has been merged upstream for Qt 4.8.2 (https://codereview.qt-project.org/20869).

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 41 insertions, 17 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index bbec5da317a9..b5c9786d1caf 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.157 2012/04/12 17:56:22 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.158 2012/04/15 14:10:41 pesa Exp $
+
+*qt-core-4.8.1-r1 (15 Apr 2012)
+
+  15 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/qt-core-4.8.1-localized-time.patch, +qt-core-4.8.1-r1.ebuild,
+  -qt-core-4.8.1.ebuild:
+  Fix localization of date/time, bug 411929 by Franz Fellner. Patch has been
+  merged upstream for Qt 4.8.2 (https://codereview.qt-project.org/20869).
 
   12 Apr 2012; Davide Pesavento <pesa@gentoo.org>
   -files/qt-core-4.8.0-qurl-regression-fix.patch, -qt-core-4.6.3.ebuild,
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index ffae3b060cf5..77de2bd7825a 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -6,6 +6,7 @@ AUX blacklist_ssl.patch 3839 RMD160 769b5652df6d626ef4436afcdae8fc6f927c4c47 SHA
 AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
 AUX qt-4.6-nox11r6.patch 5191 RMD160 60bac3e843addd91427ada9e4e4d7a94dc8f0430 SHA1 7534d6838426b86101ac8fc5ced829c5d5035a04 SHA256 b6db19c5b1de5e86628d37ca467f293b3ab3cf48272df93dae7ad5755ffa79cd
 AUX qt-core-4.7.4-fix-libreoffice-crash.patch 1958 RMD160 da10c0614e4ecb8f6f3c705d191503a42e174659 SHA1 652fc396b99846d1f2fe334c15f4cd4b8599806b SHA256 097021dfb6c25d8d8ca31a8a1bf70e35f9962113ce44791ad682fb54f4604844
+AUX qt-core-4.8.1-localized-time.patch 414 RMD160 03d9d0114a5e69ce736c940843a384c77b277230 SHA1 d0a1049d9457edb06b06b84221a6f5da62c7fca1 SHA256 cfba302368ff281f94541549c9489517a5f13467583d87dd966ec255b92ff92e
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 RMD160 3e47b09663a89973b1c8628506c995dfc2a5387c SHA1 af9016aa924a577f7b06ffd28c9773b56d74c939 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e
@@ -13,23 +14,23 @@ DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 RMD160 538e626fae80ca8c
 EBUILD qt-core-4.6.3-r1.ebuild 5128 RMD160 c4415638e41f79147a94c36f6e089654c5040874 SHA1 1169313a308c4b01a0b8a74742550704d6b5bb2e SHA256 e403781b7f9188ffaa8a58c5e82d2fb1c802e50a8d9fd4efea8e26f141ef1f97
 EBUILD qt-core-4.7.2-r2.ebuild 5153 RMD160 931395bd70ce9f80d79754377034856ee56aaff3 SHA1 338a4265d9955067e3b923bcf1ebbbc44d589bb5 SHA256 c8f26fea402bcdfe0e6cd9d2a0267599e5d483024ee8d357d2bfd15826096f66
 EBUILD qt-core-4.7.4-r1.ebuild 5173 RMD160 a8f8118c4df899024978d80e0339f9153c999dc6 SHA1 c4978513baafbac348a492a6082aef879aa0a906 SHA256 5bd26485ff70124ba2dd7f529f39c495f79d3577845b917d580b87371c9fa8be
-EBUILD qt-core-4.8.1.ebuild 4692 RMD160 0e285cd7d2b1d9012e4104fd117a19fc4fee4d14 SHA1 4a9706f07193b64e4331fdc56d3787b11666c402 SHA256 94e6dcfcf9c86a819dbdfa7950e8a9853691391db4013ad91b968e67bc30ec23
-MISC ChangeLog 21209 RMD160 3e83fc170df7705d219cc57fbaefb6d6748ad67c SHA1 9ffa08bb7f52d8b459af7688149c072a247f499f SHA256 1037538164b0012a61e7cc28420283c08cf84a25f95f1996a80d32029cd35169
+EBUILD qt-core-4.8.1-r1.ebuild 4749 RMD160 f35c36608bc25dc2b12487cd4da4384829c9a3c3 SHA1 18f174f893f842f878454743fb7f665b1ae21b5e SHA256 db95c63eb377822e21a06e37d28df630c9275f07061d0c5cab1dca2086fca703
+MISC ChangeLog 21540 RMD160 e6985306b96e78f6b0b7de3754d9472d0a8b7175 SHA1 b2507eda091676f79d038c72b721c9add8ece6cb SHA256 2385f802711e6aff37ced4ce8628eb99cf76b9cba87cd01b67bd8a7d0aa4502d
 MISC metadata.xml 942 RMD160 e6e15c516510312f8e71e6f2518f126bd0fa77c3 SHA1 6a8b4d7d8a04b7d7a548a8eff98f3d5599c5dec2 SHA256 3b57581e80ed0df200a4f20843f4fc1592bac336c779dce8864881d19785cdf7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPhxdMAAoJENXLsxwXqFxyulwQAIUZ6WV2IXR7bMRjbyEMQMyh
-wb1854I59kdx2HzxCqAXY8dgmp5R8imejQikEDLs1a5j2AsCd4ZGh5TttmcD4WaX
-fm/6FbFWQjZzqWjuUOlUxJ1FdGrQea5WIkZ53EQ9sT9heEIB/UvdSgjliTI7NfzP
-bRYbOnLWjeqIqVM/L3qMZngxTSjk3Fsz1RSr6XjbqE8T1aJsugX27I2udzKgRbOz
-Vrn4+tFvUVNxIjeyfRN0TZZiZL0uoi+e/SDLG5icincQpS7uVGEHH6X2kKAxVfjm
-NzT86YsPTOYnqfbE2d2ej8O1VON3NlpkL+6lEK92SmV5Ir8oBXj+oxs5bS4oUKDT
-s6kKSfAEx3qrk7N3C4lNPaQBdtpwDhWedowfZ3oPTIR+xPO4xhHkw7a1RtHTrBvt
-AfYVf35b6vLfTvkGqMAIiCkFJckw3rE1+1/+7fXtIm1iNTYXThI4hLo7S2HxVDp/
-3sjtD7Dphn6Zg3joLEbAIFK0YCSWnafo44hRB5/HsuIwIFKeqstWByUFU04Jw2IA
-fiZQTLPk1cVEc85pOA51pCTok346EVwFJhF3VT1TVBVArpn5jK4gY/q2TTEyn4to
-rB1Dg7H2FkC0v/VTihDssXGlcmpL3oBV/8LgeOdyCx/EoPjpuaOJoW7x2UtzxIJT
-i7onHt+Y9+sjr2BdJnQv
-=jZDv
+iQIcBAEBCgAGBQJPitboAAoJENXLsxwXqFxyUkIP/RVyO4iSUnWMC5ZhniaVwoNU
+GEs0iV84sYGg6maCGOz+Kx3Ns95FnYiSp2FD7UpoJ3MwKw+TuYXF2Vk8H6bx3fie
+OPFYn4596HyZM9i8bMsY04a025bJ8s3cWvtld9M6eh3pei9Oa6uHVOuFxSdzJWCl
+hSEyxZXg2i8lf4kLmQZ4sjOSZrrwbn/o2lYMcY784nUGtkBtaYQfaDDJeOXaigym
+RN4C97y7utTCZ32o6e9BoCCd2cUHUbkGCabbv1LWMGSZ43TwIvTD/QMoX9jhW2Qe
+pm5p+HJaMQqOqZ2v3UMBeqq3sAeIyjYuTPQGlCx+S2ocdE+7sSJdwq+6I+Y3N/KO
+v7/GRTVafeh+uQaBQ+vrY7nwJ9CKdnOMqnufb3bt/LU9dp0Z4uL2rCL+dVSncV3E
+9EL4Ihd+ThbOBEXyHB9/k6UlH2n6s8ZjKC8nv+1x55AmNR0L2rqbzaai0DWNjuGM
+24t04a++gmK6GqwLzrgE0zzVtvRkFgOjHbq4B+oZDFl47oWsEk4155qK1OA1bu/a
+RNqktDv7ukhahep5XBTv4Kll0VykFii5aRLXYsgnuNu5y3aZ3XquS/CCEX1kBenY
+cb09dFmd47KNBT32MIPqx1hA0MXrHFhH/RuVBAh6vbrJ963pz3OPCS5DSUEzcfQe
+G7RX5bnW190yfWUVswqz
+=4HHa
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-core/files/qt-core-4.8.1-localized-time.patch b/x11-libs/qt-core/files/qt-core-4.8.1-localized-time.patch
new file mode 100644
index 000000000000..39931cf42c3e
--- /dev/null
+++ b/x11-libs/qt-core/files/qt-core-4.8.1-localized-time.patch
@@ -0,0 +1,11 @@
+--- src/corelib/tools/qlocale_unix.cpp.org	2012-04-14 11:02:06.425917171 +0200
++++ src/corelib/tools/qlocale_unix.cpp	2012-04-14 11:02:50.247920549 +0200
+@@ -68,6 +68,8 @@
+             lang = QByteArray("C");
+         if (numeric.isEmpty())
+             numeric = lang;
++	if (time.isEmpty())
++	    time = lang;
+         if (monetary.isEmpty())
+             monetary = lang;
+         if (lc_messages_var.isEmpty())
diff --git a/x11-libs/qt-core/qt-core-4.8.1.ebuild b/x11-libs/qt-core/qt-core-4.8.1-r1.ebuild
index d1829ba52600..3e1a3ba67ff4 100644
--- a/x11-libs/qt-core/qt-core-4.8.1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.8.1-r1.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/x11-libs/qt-core/qt-core-4.8.1.ebuild,v 1.1 2012/03/29 22:09:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.8.1-r1.ebuild,v 1.1 2012/04/15 14:10:41 pesa Exp $
 
 EAPI=4
 
@@ -27,6 +27,10 @@ PDEPEND="
 	qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,glib=,qpa=,qt3support] )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-localized-time.patch"
+)
+
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/tools/bootstrap