Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (27b7e2a4990252027da2662d88d1ba7e6d27e4de)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (27b7e2a4990252027da2662d88d1ba7e6d27e4de)
  • Date: Sat, 15 Apr 2017 09:28:29 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde5-apps/konversation/DEPENDS | 37 +++++++-----
kde5-apps/konversation/HISTORY | 1
libs/icu/DETAILS | 12 ---
libs/icu/HISTORY | 5 +
libs/icu/PREPARE | 1
libs/icu/PRE_BUILD | 3
libs/icu/collation.patch | 124
-----------------------------------------
7 files changed, 31 insertions(+), 152 deletions(-)

New commits:
commit 27b7e2a4990252027da2662d88d1ba7e6d27e4de
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

konversation: depends++

commit bbf859035cdc36a4ab7cbeda4439a56c2897c76b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

icu: => 59.1

diff --git a/kde5-apps/konversation/DEPENDS b/kde5-apps/konversation/DEPENDS
index 816bb29..dca3a94 100755
--- a/kde5-apps/konversation/DEPENDS
+++ b/kde5-apps/konversation/DEPENDS
@@ -1,17 +1,24 @@
source "$GRIMOIRE/KDE5_DEPENDS" &&
-depends karchive
-depends kbookmarks
-depends kconfig
-depends kconfigwidgets
-depends kemoticons
-depends ki18n
-depends kidletime
-depends kio
-depends knotifyconfig
-depends kparts
-depends solid
-depends sonnet
-depends kwallet5
-depends kwidgetsaddons
-depends phonon4qt5
+depends karchive &&
+depends kbookmarks &&
+depends kconfig &&
+depends kconfigwidgets &&
+depends kcoreaddons &&
+depends kcrash &&
+depends kdbusaddons &&
+depends kdoctools &&
+depends kemoticons &&
+depends kglobalaccel &&
+depends kiconthemes &&
+depends kitemviews &&
+depends ki18n &&
+depends kidletime &&
+depends kio &&
+depends knotifyconfig &&
+depends kparts &&
+depends solid &&
+depends kwallet5 &&
+depends kwindowsystem &&
+depends kwidgetsaddons &&
+depends phonon4qt5 &&
optional_depends qca-qt5 '' '-DCMAKE_DISABLE_FIND_PACKAGE_Qca-qt5=1'
'encryption support'
diff --git a/kde5-apps/konversation/HISTORY b/kde5-apps/konversation/HISTORY
index 65dbda3..d73b2dc 100644
--- a/kde5-apps/konversation/HISTORY
+++ b/kde5-apps/konversation/HISTORY
@@ -1,6 +1,7 @@
2017-04-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.7
* DETAILS: add gpg checking
+ * DEPENDS: add missing changes

2016-08-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.2
diff --git a/libs/icu/DETAILS b/libs/icu/DETAILS
index e581a67..2ed0d08 100755
--- a/libs/icu/DETAILS
+++ b/libs/icu/DETAILS
@@ -1,12 +1,6 @@
SPELL=icu
-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
+ VERSION=59.1
+
SOURCE_HASH=sha512:9348aa68d72a74cd1f26588c30c80eee1b48800a26930d7eb0749390fd65f7930ee8843058b6a6dd5f265e79054fef661e807ded16a1ad691cbc5ebc5ab944c4
VX=$VERSION
SPELLX=icu4c
VERSIONX=${VERSION//./_}
@@ -15,7 +9,7 @@ fi
PATCHLEVEL=1

if [[ "$ICU_DOC" == 'y' ]]; then
-
SOURCE2_HASH=sha512:2c8d86a26f9fd35e4257779bb248c0491c128b3ffe27d8cdd8d9cee6f3e5c43d4021a6209190ad46b25fe3426406a15e222f623997e114243299c0b92a783230
+
SOURCE2_HASH=sha512:fd666fd9ce69e0757802d812b479197a0e447ff9fd7b98bdf6a03dd97ed72af1903df35c8932ca23a061cfdceef89f41fb8a7443049462dbb6965a7988884584
SOURCE2=$SPELLX-${VERSIONX}-docs.zip
SOURCE2_URL[0]=$SITE/$SPELLX/$VX/$SOURCE2
fi
diff --git a/libs/icu/HISTORY b/libs/icu/HISTORY
index fc64633..45feed4 100644
--- a/libs/icu/HISTORY
+++ b/libs/icu/HISTORY
@@ -1,3 +1,8 @@
+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 ddd2aa4..df0a264 100755
--- a/libs/icu/PREPARE
+++ b/libs/icu/PREPARE
@@ -1,2 +1 @@
-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
deleted file mode 100755
index b61b40e..0000000
--- a/libs/icu/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-patch -p3 < ${SPELL_DIRECTORY}/collation.patch
diff --git a/libs/icu/collation.patch b/libs/icu/collation.patch
deleted file mode 100644
index a1d1fb5..0000000
--- a/libs/icu/collation.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-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();
-
- /**



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (27b7e2a4990252027da2662d88d1ba7e6d27e4de), Treeve Jelbert, 04/15/2017

Archive powered by MHonArc 2.6.24.

Top of Page