[packages/icu] - updated to 59.1 (note: new soname)
qboosh
qboosh at pld-linux.org
Sat Apr 22 14:09:00 CEST 2017
commit 5eb75bd70b89081d8bd0f6b08794a6a95d070a39
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Apr 22 14:09:17 2017 +0200
- updated to 59.1 (note: new soname)
icu.spec | 11 ++--
..._getKeywordValuesForLocale-ulist_resetList.diff | 62 ----------------------
2 files changed, 5 insertions(+), 68 deletions(-)
---
diff --git a/icu.spec b/icu.spec
index a2c7e38..cf2c487 100644
--- a/icu.spec
+++ b/icu.spec
@@ -6,13 +6,12 @@
Summary: International Components for Unicode
Summary(pl.UTF-8): Międzynarodowe komponenty dla unikodu
Name: icu
-Version: 58.2
-Release: 2
+Version: 59.1
+Release: 1
License: MIT-like
Group: Libraries
Source0: http://download.icu-project.org/files/icu4c/%{version}/%{name}4c-%{ver}-src.tgz
-# Source0-md5: fac212b32b7ec7ab007a12dff1f3aea1
-Patch0: ucol_getKeywordValuesForLocale-ulist_resetList.diff
+# Source0-md5: 54923fa9fab5b2b83f235fb72523de37
URL: http://www.icu-project.org/
BuildRequires: autoconf >= 2.69
BuildRequires: libstdc++-devel
@@ -95,7 +94,6 @@ biblioteki programistyczne ICU.
%prep
%setup -q -n %{name}
-%patch0 -p1
%build
cd source
@@ -143,6 +141,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc license.html readme.html
%attr(755,root,root) %{_bindir}/derb
+%attr(755,root,root) %{_bindir}/escapesrc
%attr(755,root,root) %{_bindir}/gen*
%attr(755,root,root) %{_bindir}/icuinfo
%attr(755,root,root) %{_bindir}/icupkg
@@ -160,7 +159,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n libicu
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libicu*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libicu*.so.58
+%attr(755,root,root) %ghost %{_libdir}/libicu*.so.59
%files -n libicu-devel
%defattr(644,root,root,755)
diff --git a/ucol_getKeywordValuesForLocale-ulist_resetList.diff b/ucol_getKeywordValuesForLocale-ulist_resetList.diff
deleted file mode 100644
index 8718a0b..0000000
--- a/ucol_getKeywordValuesForLocale-ulist_resetList.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-https://ssl.icu-project.org/trac/ticket/12827
-https://ssl.icu-project.org/trac/changeset/39484 (Excluding test-related bits
-because we remove the "test" directory before applying the ICU patches.)
-
-Index: /intl/icu/source/common/ulist.c
-===================================================================
---- a/source/common/ulist.c (revision 39483)
-+++ b/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: /intl/icu/source/i18n/ucol_res.cpp
-===================================================================
---- a/source/i18n/ucol_res.cpp (revision 39483)
-+++ b/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.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icu.git/commitdiff/5eb75bd70b89081d8bd0f6b08794a6a95d070a39
More information about the pld-cvs-commit
mailing list