Compare commits
12 Commits
62.1-1mamb
...
73.2-2mamb
Author | SHA1 | Date | |
---|---|---|---|
e4acbad2ec | |||
8503fea664 | |||
3279f97532 | |||
9dcabff8bd | |||
f2b4961f6b | |||
e0d1b52c1b | |||
96790eb7f4 | |||
9b8bbb1e6d | |||
e5247265c8 | |||
a512eff63a | |||
90a827063f | |||
9f25d2edb2 |
@@ -1,31 +0,0 @@
|
||||
--- icu/source/tools/ctestfw/Makefile.in
|
||||
+++ icu/source/tools/ctestfw/Makefile.in
|
||||
@@ -79,6 +79,28 @@
|
||||
install-local: install-library
|
||||
|
||||
install-library: all-local
|
||||
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
|
||||
+ifneq ($(ENABLE_STATIC),)
|
||||
+ $(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)
|
||||
+endif
|
||||
+ifneq ($(ENABLE_SHARED),)
|
||||
+ $(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)
|
||||
+ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
|
||||
+ cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(SO_TARGET))
|
||||
+ifneq ($(FINAL_SO_TARGET),$(MIDDLE_SO_TARGET))
|
||||
+ cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_SO_TARGET)) && ln -s $(notdir $(FINAL_SO_TARGET)) $(notdir $(MIDDLE_SO_TARGET))
|
||||
+endif
|
||||
+endif
|
||||
+ifneq ($(IMPORT_LIB_EXT),)
|
||||
+ $(INSTALL-L) $(FINAL_IMPORT_LIB) $(DESTDIR)$(libdir)
|
||||
+ifneq ($(IMPORT_LIB),$(FINAL_IMPORT_LIB))
|
||||
+ cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(IMPORT_LIB))
|
||||
+endif
|
||||
+ifneq ($(MIDDLE_IMPORT_LIB),$(FINAL_IMPORT_LIB))
|
||||
+ cd $(DESTDIR)$(libdir) && $(RM) $(notdir $(MIDDLE_IMPORT_LIB)) && ln -s $(notdir $(FINAL_IMPORT_LIB)) $(notdir $(MIDDLE_IMPORT_LIB))
|
||||
+endif
|
||||
+endif
|
||||
+endif
|
||||
|
||||
dist-local:
|
||||
|
@@ -1,16 +0,0 @@
|
||||
diff -Nru icu.orig//source/tools/toolutil/pkg_genc.c icu/source/tools/toolutil/pkg_genc.c
|
||||
--- icu.orig//source/tools/toolutil/pkg_genc.c 2010-04-28 15:27:46.000000000 +0000
|
||||
+++ icu/source/tools/toolutil/pkg_genc.c 2010-07-13 11:57:46.000000000 +0000
|
||||
@@ -118,10 +118,10 @@
|
||||
} assemblyHeader[] = {
|
||||
{"gcc",
|
||||
".globl %s\n"
|
||||
- "\t.section .note.GNU-stack,\"\",@progbits\n"
|
||||
+ "\t.section .note.GNU-stack,\"\",%%progbits\n"
|
||||
"\t.section .rodata\n"
|
||||
"\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
|
||||
- "\t.type %s,@object\n"
|
||||
+ "\t.type %s,%%object\n"
|
||||
"%s:\n\n",
|
||||
|
||||
".long ","",HEX_0X
|
25
icu-73.2-ICU-22132.patch
Normal file
25
icu-73.2-ICU-22132.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
diff -u a/i18n/vtzone.cpp a/i18n/vtzone.cpp
|
||||
--- a/i18n/vtzone.cpp 2023-07-14 09:05:38.000000000 +0100
|
||||
+++ b/i18n/vtzone.cpp 2023-07-14 09:05:38.000000000 +0100
|
||||
@@ -1735,14 +1735,14 @@
|
||||
}
|
||||
}
|
||||
} else {
|
||||
- UnicodeString icutzprop;
|
||||
- UVector customProps(nullptr, uhash_compareUnicodeString, status);
|
||||
+ UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status);
|
||||
if (olsonzid.length() > 0 && icutzver.length() > 0) {
|
||||
- icutzprop.append(olsonzid);
|
||||
- icutzprop.append(u'[');
|
||||
- icutzprop.append(icutzver);
|
||||
- icutzprop.append(u']');
|
||||
- customProps.addElement(&icutzprop, status);
|
||||
+ LocalPointer<UnicodeString> icutzprop(new UnicodeString(ICU_TZINFO_PROP), status);
|
||||
+ icutzprop->append(olsonzid);
|
||||
+ icutzprop->append(u'[');
|
||||
+ icutzprop->append(icutzver);
|
||||
+ icutzprop->append(u']');
|
||||
+ customProps.adoptElement(icutzprop.orphan(), status);
|
||||
}
|
||||
writeZone(writer, *tz, &customProps, status);
|
||||
}
|
74
icu.spec
74
icu.spec
@@ -1,18 +1,18 @@
|
||||
%define libname libicu
|
||||
%define pkgver %(echo %version | tr '.' '_')
|
||||
%define gitver %(echo %version | tr '.' '-')
|
||||
|
||||
Name: icu
|
||||
Version: 62.1
|
||||
Release: 1mamba
|
||||
Version: 73.2
|
||||
Release: 2mamba
|
||||
Summary: Set of C/C++ and Java libraries for Unicode support
|
||||
Group: System/Libraries
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://www.icu-project.org
|
||||
Source: http://download.icu-project.org/files/icu4c/%{version}/icu4c-%{pkgver}-src.tgz
|
||||
Patch0: %{name}-4.4-ctestfw-makefilein.patch
|
||||
Patch1: %{name}-4.4.1-arm_assembly.patch
|
||||
URL: https://www.icu-project.org
|
||||
Source: https://github.com/unicode-org/icu.git/release-%{gitver}/icu-%{version}.tar.bz2
|
||||
Patch0: icu-73.2-ICU-22132.patch
|
||||
License: MIT
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@@ -20,7 +20,6 @@ BuildRequires: libgcc
|
||||
BuildRequires: libstdc++6-devel
|
||||
## AUTOBUILDREQ-END
|
||||
Requires: %{libname} = %{version}-%{release}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
|
||||
%description
|
||||
ICU is a set of C/C++ and Java libraries that provides robust and full-featured Unicode and locale support.
|
||||
@@ -49,13 +48,16 @@ ICU is widely portable and gives applications the same results on all platforms
|
||||
|
||||
This package contains static libraries and header files need for development.
|
||||
|
||||
%debug_package
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}
|
||||
#%patch0 -p1
|
||||
#%patch1 -p1
|
||||
%setup -q
|
||||
cd icu4c/source
|
||||
%patch 0 -p1 -b .ICU-22132
|
||||
cd ../..
|
||||
|
||||
%build
|
||||
cd source
|
||||
cd icu4c/source
|
||||
|
||||
%configure \
|
||||
--enable-shared \
|
||||
@@ -66,7 +68,7 @@ cd source
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
%makeinstall -C source
|
||||
%makeinstall -C icu4c/source
|
||||
|
||||
# fix wrong libraries permissions
|
||||
chmod +x %{buildroot}%{_libdir}/*.so.*
|
||||
@@ -83,6 +85,7 @@ rm -f %{buildroot}%{_datadir}/icu/%{version}/license.html
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/derb
|
||||
%{_bindir}/gen*
|
||||
%{_bindir}/icuexportdata
|
||||
%{_bindir}/icuinfo
|
||||
%{_bindir}/makeconv
|
||||
%{_bindir}/pkgdata
|
||||
@@ -91,11 +94,11 @@ rm -f %{buildroot}%{_datadir}/icu/%{version}/license.html
|
||||
%{_sbindir}/gen*
|
||||
%{_sbindir}/icupkg
|
||||
%{_mandir}/man?/*
|
||||
%doc license.html readme.html
|
||||
|
||||
%files -n %{libname}
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/*.so.*
|
||||
%{_libdir}/libicu*.so.*
|
||||
%doc icu4c/LICENSE
|
||||
|
||||
%files -n %{libname}-devel
|
||||
%defattr(-,root,root)
|
||||
@@ -111,8 +114,8 @@ rm -f %{buildroot}%{_datadir}/icu/%{version}/license.html
|
||||
#%dir %{_includedir}/layout
|
||||
#%{_includedir}/layout/*.h
|
||||
%{_includedir}/unicode/*.h
|
||||
%{_libdir}/*.a
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/libicu*.a
|
||||
%{_libdir}/libicu*.so
|
||||
%dir %{_libdir}/icu
|
||||
%dir %{_libdir}/icu/%{version}
|
||||
%{_libdir}/icu/current
|
||||
@@ -123,6 +126,45 @@ rm -f %{buildroot}%{_datadir}/icu/%{version}/license.html
|
||||
%{_libdir}/pkgconfig/icu-*.pc
|
||||
|
||||
%changelog
|
||||
* Fri Sep 29 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 73.2-2mamba
|
||||
- added upstream patch to fix problems seen with thunderbird >= 115 (see https://bugzilla.mozilla.org/show_bug.cgi?id=1843007 )
|
||||
|
||||
* Wed Jun 14 2023 Automatic Build System <autodist@mambasoft.it> 73.2-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Apr 13 2023 Automatic Build System <autodist@mambasoft.it> 73.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Oct 20 2022 Automatic Build System <autodist@mambasoft.it> 72.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Apr 07 2022 Automatic Build System <autodist@mambasoft.it> 71.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Mon Nov 01 2021 Automatic Build System <autodist@mambasoft.it> 70.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Apr 09 2021 Automatic Build System <autodist@mambasoft.it> 69.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Tue Dec 22 2020 Automatic Build System <autodist@mambasoft.it> 68.2-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri May 22 2020 Automatic Build System <autodist@mambasoft.it> 67.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Dec 26 2019 Automatic Build System <autodist@mambasoft.it> 65.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Fri Apr 26 2019 Automatic Build System <autodist@mambasoft.it> 64.2-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sun Apr 07 2019 Automatic Build System <autodist@mambasoft.it> 64.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Tue Oct 30 2018 Automatic Build System <autodist@mambasoft.it> 63.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Thu Aug 09 2018 Automatic Build System <autodist@mambasoft.it> 62.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
Reference in New Issue
Block a user