sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (3083eb6672891518bda392206c97d775c1c167b0)

From: Florian Franzmann <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3083eb6672891518bda392206c97d775c1c167b0)
Date: Mon, 8 May 2017 21:03:33 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

libs/icu/DETAILS | 12 +++-
libs/icu/HISTORY | 5 -
libs/icu/PREPARE | 1
libs/icu/PRE_BUILD | 3 +
libs/icu/collation.patch | 124
+++++++++++++++++++++++++++++++++++++++++++++++
utils/youtube-dl/DETAILS | 2
utils/youtube-dl/HISTORY | 3 +
7 files changed, 141 insertions(+), 9 deletions(-)

New commits:
commit 3083eb6672891518bda392206c97d775c1c167b0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

utils/youtube-dl: version 2017.05.07

commit f4ce1a29d587795588073e6307a6d400f7f3284c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

Revert "icu: => 59.1"

This commit breaks qt4 and qtwebkit.

This reverts commit bbf859035cdc36a4ab7cbeda4439a56c2897c76b.

diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index 2ed0d08..e581a67 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,6 +1,12 @@
SPELL=icu
- VERSION=59.1
-
SOURCE_HASH=sha512:9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4
+if [[ "$ICU_DEV" == 'y' ]]; then
+ VERSION=58.2
+
SOURCE_HASH=sha512:5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
+ VX=${VERSION//.r/r}
+else
+ VERSION=58.2
+
SOURCE_HASH=sha512:5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a
+fi
VX=$VERSION
SPELLX=icu4c
VERSIONX=${VERSION//./_}
@@ -9,7 +15,7 @@
PATCHLEVEL=1

if [[ "$ICU_DOC" == 'y' ]]; then
-
SOURCE2_HASH=sha512:fd666fd9ce69e0757802d812b479197a0e447ff9fd7b98bdf6a03dd97ed72af1903df35c8932ca23a061cfdceef89f41fb8a7443049462dbb6965a7988884584
+
SOURCE2_HASH=sha512:2c8d86a26f9fd35e4257779bb248c0491c128b3ffe27d8cdd8d9cee6f3e5c43d4021a6209190ad46b25fe3426406a15e222f623997e114243299c0b92a783230
SOURCE2=$SPELLX-${VERSIONX}-docs.zip
SOURCE2_URL[0]=$SITE/$SPELLX/$VX/$SOURCE2
fi
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index 45feed4..fc64633 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,8 +1,3 @@
-2017-04-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 59.1
- * PRE_BUILD, collation.patch: deleted
- * PREPARE: drop devel version
-
2017-01-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 58.2

diff --git a/libs/icu/PREPARE b/libs/icu/PREPARE
index df0a264..ddd2aa4 100755
--- a/libs/icu/PREPARE
+++ b/libs/icu/PREPARE
@@ -1 +1,2 @@
+config_query ICU_DEV 'Build the development version?' n &&
config_query ICU_DOC 'Install the documentation?' n
diff --git a/libs/icu/PRE_BUILD b/libs/icu/PRE_BUILD
new file mode 100755
index 0000000..b61b40e
--- /dev/null
+++ b/libs/icu/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+patch -p3 < ${SPELL_DIRECTORY}/collation.patch
diff --git a/libs/icu/collation.patch b/libs/icu/collation.patch
new file mode 100644
index 0000000..a1d1fb5
--- /dev/null
+++ b/libs/icu/collation.patch
@@ -0,0 +1,124 @@
+Index: /icu/trunk/source/common/ulist.c
+===================================================================
+--- /icu/trunk/source/common/ulist.c (revision 39483)
++++ /icu/trunk/source/common/ulist.c (revision 39484)
+@@ -30,5 +30,4 @@
+
+ int32_t size;
+- int32_t currentIndex;
+ };
+
+@@ -52,5 +51,4 @@
+ newList->tail = NULL;
+ newList->size = 0;
+- newList->currentIndex = -1;
+
+ return newList;
+@@ -81,6 +79,7 @@
+ p->next->previous = p->previous;
+ }
+- list->curr = NULL;
+- list->currentIndex = 0;
++ if (p == list->curr) {
++ list->curr = p->next;
++ }
+ --list->size;
+ if (p->forceDelete) {
+@@ -151,5 +150,4 @@
+ list->head->previous = newItem;
+ list->head = newItem;
+- list->currentIndex++;
+ }
+
+@@ -194,5 +192,4 @@
+ curr = list->curr;
+ list->curr = curr->next;
+- list->currentIndex++;
+
+ return curr->data;
+@@ -210,5 +207,4 @@
+ if (list != NULL) {
+ list->curr = list->head;
+- list->currentIndex = 0;
+ }
+ }
+@@ -273,3 +269,2 @@
+ return (UList *)(en->context);
+ }
+-
+Index: /icu/trunk/source/i18n/ucol_res.cpp
+===================================================================
+--- /icu/trunk/source/i18n/ucol_res.cpp (revision 39483)
++++ /icu/trunk/source/i18n/ucol_res.cpp (revision 39484)
+@@ -681,4 +681,5 @@
+ }
+ memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));
++ ulist_resetList(sink.values); // Initialize the iterator.
+ en->context = sink.values;
+ sink.values = NULL; // Avoid deletion in the sink destructor.
+Index: /icu/trunk/source/test/intltest/apicoll.cpp
+===================================================================
+--- /icu/trunk/source/test/intltest/apicoll.cpp (revision 39483)
++++ /icu/trunk/source/test/intltest/apicoll.cpp (revision 39484)
+@@ -82,14 +82,7 @@
+ col = Collator::createInstance(Locale::getEnglish(), success);
+ if (U_FAILURE(success)){
+- errcheckln(success, "Default Collator creation failed. - %s",
u_errorName(success));
+- return;
+- }
+-
+- StringEnumeration* kwEnum = col->getKeywordValuesForLocale("",
Locale::getEnglish(),true,success);
+- if (U_FAILURE(success)){
+- errcheckln(success, "Get Keyword Values for Locale failed. - %s",
u_errorName(success));
+- return;
+- }
+- delete kwEnum;
++ errcheckln(success, "English Collator creation failed. - %s",
u_errorName(success));
++ return;
++ }
+
+ col->getVersion(versionArray);
+@@ -230,4 +223,27 @@
+ delete aFrCol;
+ delete junk;
++}
++
++void CollationAPITest::TestKeywordValues() {
++ IcuTestErrorCode errorCode(*this, "TestKeywordValues");
++ LocalPointer<Collator>
col(Collator::createInstance(Locale::getEnglish(), errorCode));
++ if (errorCode.logIfFailureAndReset("English Collator creation failed"))
{
++ return;
++ }
++
++ LocalPointer<StringEnumeration> kwEnum(
++ col->getKeywordValuesForLocale("collation", Locale::getEnglish(),
TRUE, errorCode));
++ if (errorCode.logIfFailureAndReset("Get Keyword Values for English
Collator failed")) {
++ return;
++ }
++ assertTrue("expect at least one collation tailoring for English",
kwEnum->count(errorCode) > 0);
++ const char *kw;
++ UBool hasStandard = FALSE;
++ while ((kw = kwEnum->next(NULL, errorCode)) != NULL) {
++ if (strcmp(kw, "standard") == 0) {
++ hasStandard = TRUE;
++ }
++ }
++ assertTrue("expect at least the 'standard' collation tailoring for
English", hasStandard);
+ }
+
+@@ -2467,4 +2483,5 @@
+ TESTCASE_AUTO_BEGIN;
+ TESTCASE_AUTO(TestProperty);
++ TESTCASE_AUTO(TestKeywordValues);
+ TESTCASE_AUTO(TestOperators);
+ TESTCASE_AUTO(TestDuplicate);
+Index: /icu/trunk/source/test/intltest/apicoll.h
+===================================================================
+--- /icu/trunk/source/test/intltest/apicoll.h (revision 39483)
++++ /icu/trunk/source/test/intltest/apicoll.h (revision 39484)
+@@ -36,4 +36,5 @@
+ */
+ void TestProperty(/* char* par */);
++ void TestKeywordValues();
+
+ /**
diff --git a/utils/youtube-dl/DETAILS b/utils/youtube-dl/DETAILS
index 067b76f..30debe6 100755
--- a/utils/youtube-dl/DETAILS
+++ b/utils/youtube-dl/DETAILS
@@ -1,5 +1,5 @@
SPELL=youtube-dl
- VERSION=2017.05.01
+ VERSION=2017.05.07
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/youtube-dl/HISTORY b/utils/youtube-dl/HISTORY
index feb1fcd..ae98d61 100644
--- a/utils/youtube-dl/HISTORY
+++ b/utils/youtube-dl/HISTORY
@@ -1,3 +1,6 @@
+2017-05-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2017.05.07
+
2017-05-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2017.05.01

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (3083eb6672891518bda392206c97d775c1c167b0), Florian Franzmann, 05/08/2017