Browse Source

Merge pull request #14322 from nxhack/icu_682

icu: update to 68.2
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
56df352a21
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 11 deletions
  1. +2
    -2
      libs/icu/Makefile
  2. +0
    -2
      libs/icu/patches/000-dont-cpy-files-from-topdirs.patch
  3. +1
    -1
      libs/icu/patches/001-change_optimization_option.patch
  4. +0
    -5
      libs/icu/patches/002-Disable-LDFLAGSICUDT-for-Linux.patch
  5. +1
    -1
      libs/icu/patches/010-max_align_t.patch

+ 2
- 2
libs/icu/Makefile View File

@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=icu4c PKG_NAME:=icu4c
MAJOR_VERSION:=68 MAJOR_VERSION:=68
MINOR_VERSION:=1
MINOR_VERSION:=2
PKG_VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION) PKG_VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(MAJOR_VERSION)_$(MINOR_VERSION)-src.tgz PKG_SOURCE:=$(PKG_NAME)-$(MAJOR_VERSION)_$(MINOR_VERSION)-src.tgz
PKG_SOURCE_URL:=https://github.com/unicode-org/icu/releases/download/release-$(MAJOR_VERSION)-$(MINOR_VERSION) PKG_SOURCE_URL:=https://github.com/unicode-org/icu/releases/download/release-$(MAJOR_VERSION)-$(MINOR_VERSION)
PKG_HASH:=a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d
PKG_HASH:=c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625
PKG_LICENSE:=ICU PKG_LICENSE:=ICU
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE


+ 0
- 2
libs/icu/patches/000-dont-cpy-files-from-topdirs.patch View File

@ -1,5 +1,3 @@
diff --git a/Makefile.in b/Makefile.in
index 9db6c52..6aa2273 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -190,7 +190,6 @@ install-icu: $(INSTALLED_BUILT_FILES) @@ -190,7 +190,6 @@ install-icu: $(INSTALLED_BUILT_FILES)


+ 1
- 1
libs/icu/patches/001-change_optimization_option.patch View File

@ -1,6 +1,6 @@
--- a/runConfigureICU --- a/runConfigureICU
+++ b/runConfigureICU +++ b/runConfigureICU
@@ -239,8 +239,8 @@
@@ -239,8 +239,8 @@ case $platform in
THE_COMP="the GNU C++" THE_COMP="the GNU C++"
CC=gcc; export CC CC=gcc; export CC
CXX=g++; export CXX CXX=g++; export CXX


+ 0
- 5
libs/icu/patches/002-Disable-LDFLAGSICUDT-for-Linux.patch View File

@ -10,8 +10,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
source/config/mh-linux | 2 +- source/config/mh-linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/mh-linux b/config/mh-linux
index 366f0cc..2689aab 100644
--- a/config/mh-linux --- a/config/mh-linux
+++ b/config/mh-linux +++ b/config/mh-linux
@@ -23,7 +23,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN @@ -23,7 +23,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
@ -23,6 +21,3 @@ index 366f0cc..2689aab 100644
## Compiler switch to embed a library name ## Compiler switch to embed a library name
# The initial tab in the next line is to prevent icu-config from reading it. # The initial tab in the next line is to prevent icu-config from reading it.
--
1.7.10.4

+ 1
- 1
libs/icu/patches/010-max_align_t.patch View File

@ -38,7 +38,7 @@
}; };
static const UText emptyText = UTEXT_INITIALIZER; static const UText emptyText = UTEXT_INITIALIZER;
@@ -584,7 +584,7 @@ utext_setup(UText *ut, int32_t extraSpace, UErrorCode *status) {
@@ -584,7 +584,7 @@ utext_setup(UText *ut, int32_t extraSpac
// We need to heap-allocate storage for the new UText // We need to heap-allocate storage for the new UText
int32_t spaceRequired = sizeof(UText); int32_t spaceRequired = sizeof(UText);
if (extraSpace > 0) { if (extraSpace > 0) {


Loading…
Cancel
Save