icu/icu4c-macosx.patch | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
New commits:
commit bdbd8d8084d257cb2cb42ad9ba8e14c03a53a28d
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 11 13:24:41 2012 +0100
bodge MacOSX harder
Change-Id: If5a3afa4fea10e95cc52a7411f91ee86bea2b54c
diff --git a/icu/icu4c-macosx.patch b/icu/icu4c-macosx.patch
index d685a5f..0de6ac3 100644
--- a/icu/icu4c-macosx.patch
+++ b/icu/icu4c-macosx.patch
@@ -1,14 +1,19 @@
--- misc/icu/source/common/putil.cpp
+++ misc/build/icu/source/common/putil.cpp
-@@ -975,6 +975,11 @@
- return result;
- }
- #endif
-+
+@@ -1080,8 +1080,16 @@
+ static const time_t decemberSolstice=1198332540; /*2007-12-22 06:09
UT*/
+
+ /* This probing will tell us when daylight savings occurs. */
+#if U_PLATFORM_IS_DARWIN_BASED
-+extern struct tm *localtime_r(const time_t *, struct tm *);
++ struct tm *tmp;
++ tmp = localtime(&juneSolstice);
++ juneSol = *tmp;
++ tmp = localtime(&decemberSolstice);
++ decemberSol = *tmp;
++#else
+ localtime_r(&juneSolstice, &juneSol);
+ localtime_r(&decemberSolstice, &decemberSol);
+#endif
-+
- U_CAPI const char* U_EXPORT2
- uprv_tzname(int n)
- {
+ if(decemberSol.tm_isdst > 0) {
+ daylightType = U_DAYLIGHT_DECEMBER;
+ } else if(juneSol.tm_isdst > 0) {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
