rpms/mingw-icu
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 64.2

Browse Source
This commit is contained in:
Sandro Mani 2019-08-13 13:49:03 +02:00
parent b10d7c6d6f
commit 8b2d1588a0
4 changed files with 65 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/icu4c-49_1_2-src.tgz
/icu4c-50_1_2-src.tgz
/icu4c-57_1-src.tgz
/icu4c-64_2-src.tgz

58
icu4c-56_1-crossbuild.patch → icu4c_mingwbuild.patch
View File

@ -1,6 +1,7 @@
--- icu/source/config/icu-config-bottom 2015-10-08 05:54:30.000000000 +0200
+++ icu/source/config/icu-config-bottom 2016-06-07 16:28:42.861210723 +0200
@@ -3,7 +3,7 @@
diff -rupN icu/source/config/icu-config-bottom icu-new/source/config/icu-config-bottom
--- icu/source/config/icu-config-bottom 2019-04-17 21:42:15.000000000 +0200
+++ icu-new/source/config/icu-config-bottom 2019-08-12 17:08:21.589301823 +0200
@@ -5,7 +5,7 @@
## Copyright (c) 2002-2013, International Business Machines Corporation and
## others. All Rights Reserved.
@ -9,9 +10,10 @@
ICUUC_FILE_A="${libdir}/${ICULIBS_COMMON_LIB_NAME_A}"
# echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS}
--- icu/source/config/icu.pc.in 2015-10-08 05:54:32.000000000 +0200
+++ icu/source/config/icu.pc.in 2016-06-07 16:28:42.861210723 +0200
@@ -1,30 +1,30 @@
diff -rupN icu/source/config/icu.pc.in icu-new/source/config/icu.pc.in
--- icu/source/config/icu.pc.in 2019-04-17 21:42:15.000000000 +0200
+++ icu-new/source/config/icu.pc.in 2019-08-12 17:08:21.590301834 +0200
@@ -3,30 +3,30 @@
# Copyright (C) 2010-2013, International Business Machines Corporation. All Rights Reserved.
# CFLAGS contains only anything end users should set
@ -58,9 +60,10 @@
#ICUPKGDATA_DIR=@libdir@
#ICUDATA_DIR=${pkgdatadir}
ICUDESC=International Components for Unicode
--- icu/source/config/Makefile.inc.in 2015-10-08 05:54:32.000000000 +0200
+++ icu/source/config/Makefile.inc.in 2016-06-07 16:28:42.861210723 +0200
@@ -41,7 +41,7 @@
diff -rupN icu/source/config/Makefile.inc.in icu-new/source/config/Makefile.inc.in
--- icu/source/config/Makefile.inc.in 2019-04-17 21:42:15.000000000 +0200
+++ icu-new/source/config/Makefile.inc.in 2019-08-12 17:08:21.590301834 +0200
@@ -43,7 +43,7 @@ UNICODE_VERSION = @UNICODE_VERSION@
# The prefix for ICU libraries, normally 'icu'
ICUPREFIX = icu
PACKAGE = @PACKAGE@
@ -69,8 +72,8 @@
# Static library prefix and file extension
STATIC_PREFIX = s
@@ -106,18 +106,19 @@
# - $(ICULIBS_LAYOUT) - ICU layout library.
@@ -106,17 +106,18 @@ CTESTFW_STUBNAME = test
# - $(ICULIBS_I18N) - i18n library, formatting, etc.
# - $(ICULIBS_ICUIO) - ICU stdio equivalent library
-ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
@ -80,7 +83,6 @@
-ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
-ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)
+ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)
+ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
@ -89,7 +91,6 @@
+ICULIBS_CTESTFW = -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)
+ICULIBS_ICUIO = -l$(ICUPREFIX)io$(ICULIBSUFFIX)
+ICULIBS_OBSOLETE = -l$(ICUPREFIX)obsolete$(ICULIBSUFFIX)
+ICULIBS_LAYOUT = -l$(ICUPREFIX)le$(ICULIBSUFFIX)
+ICULIBS_LAYOUTEX = -l$(ICUPREFIX)lx$(ICULIBSUFFIX)
ICULIBS_BASE = -L$(libdir)
@ -98,20 +99,22 @@
ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}
--- icu/source/config/mh-mingw 2015-10-08 05:54:32.000000000 +0200
+++ icu/source/config/mh-mingw 2016-06-07 16:30:24.974945050 +0200
@@ -66,7 +66,7 @@
diff -rupN icu/source/config/mh-mingw icu-new/source/config/mh-mingw
--- icu/source/config/mh-mingw 2019-04-17 21:42:15.000000000 +0200
+++ icu-new/source/config/mh-mingw 2019-08-13 11:13:10.104642164 +0200
@@ -77,28 +77,21 @@ SO_TARGET_VERSION_SUFFIX =
endif
# Static library prefix and file extension
-LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
-LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+LIBSICU = lib$(LIBPREFIX)$(ICUPREFIX)
A = a
## An import library is needed for z/OS and MSVC
@@ -74,20 +74,13 @@
IMPORT_LIB_EXT = .dll.a
LIBPREFIX=
-LIBPREFIX=lib
+LIBPREFIX=
-# Change the stubnames so that poorly working FAT disks and installation programs can work.
-# This is also for backwards compatibility.
@ -131,7 +134,7 @@
#SH## ICULIBS is the set of libraries your application should link
#SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well.
#SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
@@ -139,6 +132,9 @@
@@ -150,6 +143,9 @@ PKGDATA_VERSIONING = -r $(SO_TARGET_VERS
#ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M#
#ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M#
@ -141,7 +144,7 @@
## Versioned libraries rules
#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
# $(RM) $@ && cp ${<F} $@
@@ -154,5 +150,17 @@
@@ -165,5 +161,17 @@ GENCCODE_ASSEMBLY=-a gcc-cygwin
# These are needed to allow the pkgdata GNU make files to work
PKGDATA_DEFS = -DU_MAKE=\"$(MAKE)\"
@ -159,9 +162,10 @@
+
## End Cygwin/MinGW specific setup
--- icu/source/config/mh-mingw64 2015-10-08 05:54:30.000000000 +0200
+++ icu/source/config/mh-mingw64 2016-06-07 16:30:15.051165239 +0200
@@ -66,7 +66,7 @@
diff -rupN icu/source/config/mh-mingw64 icu-new/source/config/mh-mingw64
--- icu/source/config/mh-mingw64 2019-04-17 21:42:15.000000000 +0200
+++ icu-new/source/config/mh-mingw64 2019-08-12 17:08:21.590301834 +0200
@@ -77,7 +77,7 @@ SO_TARGET_VERSION_SUFFIX =
endif
# Static library prefix and file extension
@ -170,7 +174,7 @@
A = a
## An import library is needed for z/OS and MSVC
@@ -74,20 +74,13 @@
@@ -85,20 +85,13 @@ IMPORT_LIB_EXT = .dll.a
LIBPREFIX=
@ -192,7 +196,7 @@
#SH## ICULIBS is the set of libraries your application should link
#SH## with usually. Many applications will want to add ${ICULIBS_I18N} as well.
#SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA} "
@@ -139,6 +132,9 @@
@@ -150,6 +143,9 @@ PKGDATA_VERSIONING = -r $(SO_TARGET_VERS
#ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M#
#ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M#
@ -202,7 +206,7 @@
## Versioned libraries rules
#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
# $(RM) $@ && cp ${<F} $@
@@ -154,5 +150,17 @@
@@ -165,5 +161,17 @@ GENCCODE_ASSEMBLY=-a gcc-mingw64
# These are needed to allow the pkgdata GNU make files to work
PKGDATA_DEFS = -DU_MAKE=\"$(MAKE)\"

72
mingw-icu.spec
View File

@ -1,24 +1,26 @@
%?mingw_package_header
%{?mingw_package_header}
%global underscore_version %(echo %{version} | sed 's/\\./_/g')
%global lib_version %(echo %{version} | cut -d \. -f 1)
%global dash_version %(echo %{version} | sed 's/\\./-/g')
%global lib_version 64
Name: mingw-icu
Version: 57.1
Release: 7%{?dist}
Version: 64.2
Release: 1%{?dist}
Summary: MinGW compilation of International Components for Unicode Tools
License: MIT and UCD and Public Domain
URL: http://icu-project.org
Source0: http://download.icu-project.org/files/icu4c/%{version}/icu4c-%{underscore_version}-src.tgz
Source0: https://github.com/unicode-org/icu/releases/download/release-%{dash_version}/icu4c-%{underscore_version}-src.tgz
# Patch to fix the build from
# https://build.opensuse.org/package/show/windows:mingw:win32/mingw32-icu
Patch0: icu4c-56_1-crossbuild.patch
Patch0: icu4c_mingwbuild.patch
BuildArch: noarch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
@ -66,13 +68,11 @@ currency formatting, time zone support, transliteration, and word,
line, and sentence breaking, etc.
%?mingw_debug_package
%{?mingw_debug_package}
%prep
%setup -q -n icu
%patch0 -p1 -b .crossbuild
%autosetup -p1 -n icu
%build
@ -81,7 +81,8 @@ pushd source
mkdir -p nativebuild
pushd nativebuild
../configure --enable-static --disable-shared
make %{?_smp_mflags} || make
# Parallel build occasionally broken
%make_build || make
popd
%mingw_configure \
@ -95,32 +96,33 @@ popd
%install
pushd source
%mingw_make DESTDIR=$RPM_BUILD_ROOT install
%mingw_make DESTDIR=%{buildroot} install
popd
find $RPM_BUILD_ROOT -name "*.dll" -type l -delete
find %{buildroot} -name "*.dll" -type l -delete
for i in $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll ; \
do mv $i $RPM_BUILD_ROOT%{mingw32_bindir}/; done
for i in $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll ; \
do mv $i $RPM_BUILD_ROOT%{mingw64_bindir}/; done
for i in %{buildroot}%{mingw32_libdir}/*.dll ; \
do mv $i %{buildroot}%{mingw32_bindir}/; done
for i in %{buildroot}%{mingw64_libdir}/*.dll ; \
do mv $i %{buildroot}%{mingw64_bindir}/; done
# remove unneded files
rm -fr $RPM_BUILD_ROOT%{mingw32_mandir}
rm -fr $RPM_BUILD_ROOT%{mingw64_mandir}
rm -fr %{buildroot}%{mingw32_mandir}
rm -fr %{buildroot}%{mingw64_mandir}
rm -fr $RPM_BUILD_ROOT%{mingw32_bindir}/icu-config
rm -fr $RPM_BUILD_ROOT%{mingw64_bindir}/icu-config
rm -fr $RPM_BUILD_ROOT%{mingw32_libdir}/icu/Makefile.inc
rm -fr $RPM_BUILD_ROOT%{mingw64_libdir}/icu/Makefile.inc
rm -fr $RPM_BUILD_ROOT%{mingw32_libdir}/icu/pkgdata.inc
rm -fr $RPM_BUILD_ROOT%{mingw64_libdir}/icu/pkgdata.inc
rm -f %{buildroot}%{mingw32_bindir}/icu-config
rm -f %{buildroot}%{mingw64_bindir}/icu-config
rm -f %{buildroot}%{mingw32_libdir}/icu/Makefile.inc
rm -f %{buildroot}%{mingw64_libdir}/icu/Makefile.inc
rm -f %{buildroot}%{mingw32_libdir}/icu/pkgdata.inc
rm -f %{buildroot}%{mingw64_libdir}/icu/pkgdata.inc
# Win32
%files -n mingw32-icu
%license license.html
%{mingw32_bindir}/escapesrc.exe
%{mingw32_bindir}/genrb.exe
%{mingw32_bindir}/gencnval.exe
%{mingw32_bindir}/uconv.exe
@ -139,27 +141,20 @@ rm -fr $RPM_BUILD_ROOT%{mingw64_libdir}/icu/pkgdata.inc
%{mingw32_bindir}/icuio%{lib_version}.dll
%{mingw32_bindir}/icuuc%{lib_version}.dll
%{mingw32_bindir}/icule%{lib_version}.dll
%{mingw32_bindir}/icui18n%{lib_version}.dll
%{mingw32_bindir}/icutu%{lib_version}.dll
%{mingw32_bindir}/icudata%{lib_version}.dll
%{mingw32_bindir}/iculx%{lib_version}.dll
%{mingw32_bindir}/icutest%{lib_version}.dll
%{mingw32_libdir}/libicule.dll.a
%{mingw32_libdir}/libicudata.dll.a
%{mingw32_libdir}/libicui18n.dll.a
%{mingw32_libdir}/libicuuc.dll.a
%{mingw32_libdir}/libiculx.dll.a
%{mingw32_libdir}/libicuio.dll.a
%{mingw32_libdir}/libicutest.dll.a
%{mingw32_libdir}/libicutu.dll.a
%{mingw32_libdir}/pkgconfig/icu-i18n.pc
%{mingw32_libdir}/pkgconfig/icu-io.pc
%{mingw32_libdir}/pkgconfig/icu-le.pc
%{mingw32_libdir}/pkgconfig/icu-lx.pc
%{mingw32_libdir}/pkgconfig/icu-uc.pc
%{mingw32_includedir}/layout
%{mingw32_includedir}/unicode
%{mingw32_libdir}/icu
%{mingw32_datadir}/icu
@ -168,6 +163,7 @@ rm -fr $RPM_BUILD_ROOT%{mingw64_libdir}/icu/pkgdata.inc
%files -n mingw64-icu
%license license.html
%{mingw64_bindir}/escapesrc.exe
%{mingw64_bindir}/genrb.exe
%{mingw64_bindir}/gencnval.exe
%{mingw64_bindir}/uconv.exe
@ -186,33 +182,29 @@ rm -fr $RPM_BUILD_ROOT%{mingw64_libdir}/icu/pkgdata.inc
%{mingw64_bindir}/icuio%{lib_version}.dll
%{mingw64_bindir}/icuuc%{lib_version}.dll
%{mingw64_bindir}/icule%{lib_version}.dll
%{mingw64_bindir}/icui18n%{lib_version}.dll
%{mingw64_bindir}/icutu%{lib_version}.dll
%{mingw64_bindir}/icudata%{lib_version}.dll
%{mingw64_bindir}/iculx%{lib_version}.dll
%{mingw64_bindir}/icutest%{lib_version}.dll
%{mingw64_libdir}/libicule.dll.a
%{mingw64_libdir}/libicudata.dll.a
%{mingw64_libdir}/libicui18n.dll.a
%{mingw64_libdir}/libicuuc.dll.a
%{mingw64_libdir}/libiculx.dll.a
%{mingw64_libdir}/libicuio.dll.a
%{mingw64_libdir}/libicutest.dll.a
%{mingw64_libdir}/libicutu.dll.a
%{mingw64_libdir}/pkgconfig/icu-i18n.pc
%{mingw64_libdir}/pkgconfig/icu-io.pc
%{mingw64_libdir}/pkgconfig/icu-le.pc
%{mingw64_libdir}/pkgconfig/icu-lx.pc
%{mingw64_libdir}/pkgconfig/icu-uc.pc
%{mingw64_includedir}/layout
%{mingw64_includedir}/unicode
%{mingw64_libdir}/icu
%{mingw64_datadir}/icu
%changelog
* Tue Aug 13 2019 Sandro Mani <manisandro@gmail.com> - 64.2-1
- Update to 64.2
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 57.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
976734806026a4ef8bdd17937c8898b9 icu4c-57_1-src.tgz
SHA512 (icu4c-64_2-src.tgz) = 5ecb4c230ba45918747a1cf9aef86f555aa07d5b29b1d07ab674e8013f46dfb907a0e9d6945db41155f9dc3012fd94e1152ffc19f61a68b6dfcbabdcb8ae9d78