sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (86cd7b50b04225ac141b53821df940d12fe35305)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (86cd7b50b04225ac141b53821df940d12fe35305)
- Date: Sun, 5 Nov 2017 16:06:07 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
libs/icu/DETAILS | 13 +++++++++----
libs/icu/HISTORY | 7 +++++++
libs/icu/PRE_BUILD | 2 ++
libs/icu/icu.gpg |binary
4 files changed, 18 insertions(+), 4 deletions(-)
New commits:
commit 86cd7b50b04225ac141b53821df940d12fe35305
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
icu-60.1 (dev)
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index e581a67..a2d6ba2 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,11 +1,9 @@
SPELL=icu
if [[ "$ICU_DEV" == 'y' ]]; then
- VERSION=58.2
-
SOURCE_HASH=sha512:5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
+ VERSION=60.1
VX=${VERSION//.r/r}
else
VERSION=58.2
-
SOURCE_HASH=sha512:5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
fi
VX=$VERSION
SPELLX=icu4c
@@ -15,13 +13,20 @@ fi
PATCHLEVEL=1
if [[ "$ICU_DOC" == 'y' ]]; then
-
SOURCE2_HASH=sha512:2c8d86a26f9fd35e4257779bb248c0491c128b3ffe27d8cdd8d9cee6f3e5c43d4021a6209190ad46b25fe3426406a15e222f623997e114243299c0b92a783230
SOURCE2=$SPELLX-${VERSIONX}-docs.zip
SOURCE2_URL[0]=$SITE/$SPELLX/$VX/$SOURCE2
+ SOURCE2=$SOURCE.asc
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=icu.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
fi
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/$SPELL"
SOURCE_URL[0]=$SITE/$SPELLX/$VX/$SOURCE
+ SOURCE2=$SOURCE.asc
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=icu.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
WEB_SITE=http://site.icu-project.org/
LICENSE[0]=$WEB_SITE/license.jsp
ENTERED=20030320
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 0ac42f0..f71b1ff 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,10 @@
+2017-11-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 60.1 (dev)
+ * add gpg checking
+ * PRE_BUILD: not needed for dev version
+ * icu.gpg: add FD8FABF1
+ "Steven R. Loomis (ICU Project) <srl AT icu-project.org>"
+
2017-09-24 Thomas Orgis <sobukus AT sourcemage.org>
* xlocale.patch, PRE_BUILD: fix build with glibc-2.26
diff --git a/libs/icu/PRE_BUILD b/libs/icu/PRE_BUILD
index 8cb3ff1..2721df2 100755
--- a/libs/icu/PRE_BUILD
+++ b/libs/icu/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
+if [[ "$ICU_DEV" == 'n' ]]; then
cd "${SOURCE_DIRECTORY}" &&
patch -p3 < "$SPELL_DIRECTORY/collation.patch" &&
patch -p0 < "$SPELL_DIRECTORY/xlocale.patch"
+fi
diff --git a/libs/icu/icu.gpg b/libs/icu/icu.gpg
new file mode 100644
index 0000000..b14e188
Binary files /dev/null and b/libs/icu/icu.gpg differ
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (86cd7b50b04225ac141b53821df940d12fe35305), Treeve Jelbert, 11/05/2017
Archive powered by MHonArc 2.6.24.