From 20cb0d64473ce69b50ebbb3b51f6287c0cf558f3 Mon Sep 17 00:00:00 2001
From: thoradia <22841905+thoradia@users.noreply.github.com>
Date: Fri, 23 Oct 2020 09:59:09 +0200
Subject: [PATCH] icu: version 68.1

---
 .../chrome-depends/icu/package.mk             | 35 -------------------
 packages/addons/addon-depends/icu/package.mk  | 25 +++++++++++++
 .../icu/patches/icu-01_ldflags.patch          | 12 +++++++
 3 files changed, 37 insertions(+), 35 deletions(-)
 delete mode 100644 packages/addons/addon-depends/chrome-depends/icu/package.mk
 create mode 100644 packages/addons/addon-depends/icu/package.mk
 create mode 100644 packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch

diff --git a/packages/addons/addon-depends/chrome-depends/icu/package.mk b/packages/addons/addon-depends/chrome-depends/icu/package.mk
deleted file mode 100644
index d354bc11b4..0000000000
--- a/packages/addons/addon-depends/chrome-depends/icu/package.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="icu"
-PKG_VERSION="61.1"
-PKG_SHA256="d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef"
-PKG_LICENSE="Custom"
-PKG_SITE="http://www.icu-project.org"
-PKG_URL="http://download.icu-project.org/files/icu4c/${PKG_VERSION}/icu4c-${PKG_VERSION//./_}-src.tgz"
-PKG_DEPENDS_HOST="toolchain:host"
-PKG_DEPENDS_TARGET="toolchain icu:host"
-PKG_LONGDESC="International Components for Unicode library."
-
-PKG_ICU_OPTS="--disable-extras \
-              --disable-icuio \
-              --disable-layout \
-              --disable-renaming \
-              --disable-samples \
-              --disable-tests \
-              --disable-tools"
-
-PKG_CONFIGURE_OPTS_HOST="--enable-static \
-                         --disable-shared \
-                         $PKG_ICU_OPTS"
-
-configure_package() {
-  PKG_CONFIGURE_OPTS_TARGET="--with-cross-build=$PKG_BUILD/.$HOST_NAME \
-                             $PKG_ICU_OPTS"
-
-  PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/source/configure"
-}
-
-post_makeinstall_target() {
-  rm -rf $INSTALL
-}
diff --git a/packages/addons/addon-depends/icu/package.mk b/packages/addons/addon-depends/icu/package.mk
new file mode 100644
index 0000000000..a08eb4e227
--- /dev/null
+++ b/packages/addons/addon-depends/icu/package.mk
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="icu"
+PKG_VERSION="68.1"
+PKG_SHA256="5b3cfb519c20511c1c0429b093ec16960f6a6a0d7968a9065fda393f9eba48fc"
+PKG_LICENSE="Custom"
+PKG_SITE="http://www.icu-project.org"
+PKG_URL="https://github.com/unicode-org/icu/archive/release-${PKG_VERSION//./-}.tar.gz"
+PKG_DEPENDS_HOST="toolchain:host"
+PKG_DEPENDS_TARGET="toolchain icu:host"
+PKG_LONGDESC="International Components for Unicode library."
+
+PKG_BUILD_FLAGS="-sysroot"
+
+configure_package() {
+  PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/icu4c/source/configure"
+  PKG_CONFIGURE_OPTS_TARGET="--disable-layout \
+                             --disable-layoutex \
+                             --disable-renaming \
+                             --disable-samples \
+                             --disable-tests \
+                             --disable-tools \
+                             --with-cross-build=${PKG_BUILD}/.${HOST_NAME}"
+}
diff --git a/packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch b/packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch
new file mode 100644
index 0000000000..8f740c86cd
--- /dev/null
+++ b/packages/addons/addon-depends/icu/patches/icu-01_ldflags.patch
@@ -0,0 +1,12 @@
+diff -Naur icu4c-67-1/icu-release-67-1/icu4c/source/config/mh-linux icu4c-67-1-ldflags/icu-release-67-1/icu4c/source/config/mh-linux
+--- icu-release-67-1/icu4c/source/config/mh-linux	2020-04-22 19:49:10.000000000 +0200
++++ icu-release-67-1.ldflags/icu4c/source/config/mh-linux	2020-09-05 17:58:05.635014182 +0200
+@@ -23,7 +23,7 @@
+ LD_RPATH_PRE = -Wl,-rpath,
+ 
+ ## These are the library specific LDFLAGS
+-LDFLAGSICUDT=-nodefaultlibs -nostdlib
++#LDFLAGSICUDT=-nodefaultlibs -nostdlib
+ 
+ ## Compiler switch to embed a library name
+ # The initial tab in the next line is to prevent icu-config from reading it.