summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2012-05-10 21:09:29 +0000
committerMike Gilbert <floppym@gentoo.org>2012-05-10 21:09:29 +0000
commit8b527e393b05916bbf1d6e92024b4356411ba2a4 (patch)
tree82fbed9193413fceaa217fa8c9f4cbf52a204ec8 /dev-libs/icu/files
parentRemove mirror restriction, remnant from the ebuild in the lisp overlay. (diff)
downloadgentoo-2-8b527e393b05916bbf1d6e92024b4356411ba2a4.tar.gz
gentoo-2-8b527e393b05916bbf1d6e92024b4356411ba2a4.tar.bz2
gentoo-2-8b527e393b05916bbf1d6e92024b4356411ba2a4.zip
icu-49.1.1-bsd.patch: Use patch from upstream.
icu-49.1.1-regex.patch: Update URLs. Patch by Arfrever. (Portage version: 2.2.0_alpha102/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/icu/files')
-rw-r--r--dev-libs/icu/files/icu-49.1.1-bsd.patch29
-rw-r--r--dev-libs/icu/files/icu-49.1.1-regex.patch4
2 files changed, 22 insertions, 11 deletions
diff --git a/dev-libs/icu/files/icu-49.1.1-bsd.patch b/dev-libs/icu/files/icu-49.1.1-bsd.patch
index 69f6a7371d86..665087f97b41 100644
--- a/dev-libs/icu/files/icu-49.1.1-bsd.patch
+++ b/dev-libs/icu/files/icu-49.1.1-bsd.patch
@@ -1,14 +1,25 @@
-FreeBSD does not have timezone. ICU is able to compute it if U_TIMEZONE is not
-set.
+https://ssl.icu-project.org/trac/ticket/9286
+https://ssl.icu-project.org/trac/changeset/31780
---- icu/source/common/putilimp.h.old 2012-05-06 10:04:23.000000000 -0400
-+++ icu/source/common/putilimp.h 2012-05-06 10:05:50.000000000 -0400
-@@ -118,6 +118,8 @@
+--- common/putilimp.h
++++ common/putilimp.h
+@@ -116,6 +116,8 @@
+ # define U_TIMEZONE __timezone
+ #elif U_PLATFORM_USES_ONLY_WIN32_API
# define U_TIMEZONE _timezone
++#elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__)
++ /* not defined */
#elif U_PLATFORM == U_PF_OS400
/* not defined */
-+#elif U_PLATFORM == U_PF_BSD
-+ /* not defined */
#else
- # define U_TIMEZONE timezone
- #endif
+--- common/unicode/platform.h
++++ common/unicode/platform.h
+@@ -131,7 +131,7 @@
+ # include <android/api-level.h>
+ #elif defined(linux) || defined(__linux__) || defined(__linux)
+ # define U_PLATFORM U_PF_LINUX
+-#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ # define U_PLATFORM U_PF_BSD
+ #elif defined(sun) || defined(__sun)
+ /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */
diff --git a/dev-libs/icu/files/icu-49.1.1-regex.patch b/dev-libs/icu/files/icu-49.1.1-regex.patch
index e9d64e5c6f48..0ff59b958dc7 100644
--- a/dev-libs/icu/files/icu-49.1.1-regex.patch
+++ b/dev-libs/icu/files/icu-49.1.1-regex.patch
@@ -1,5 +1,5 @@
-http://ssl.icu-project.org/trac/ticket/9283
-http://ssl.icu-project.org/trac/changeset/31782
+https://ssl.icu-project.org/trac/ticket/9283
+https://ssl.icu-project.org/trac/changeset/31782
--- i18n/regexcmp.cpp
+++ i18n/regexcmp.cpp