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

Update to 69.1

Browse Source
This commit is contained in:
Sandro Mani 2021-05-22 20:09:18 +02:00
parent 2b1deeef9d
commit a961cf6124
4 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/icu4c-64_2-src.tgz
/icu4c-65_1-src.tgz
/icu4c-67_1-src.tgz
/icu4c-69_1-src.tgz

64
icu4c_mingwbuild.patch
View File

@ -1,6 +1,6 @@
diff -rupN icu/source/config/icu.pc.in icu-new/source/config/icu.pc.in
--- icu/source/config/icu.pc.in 2020-04-22 22:04:20.000000000 +0200
+++ icu-new/source/config/icu.pc.in 2020-05-18 22:03:29.327982862 +0200
diff -rupN --no-dereference icu/source/config/icu.pc.in icu-new/source/config/icu.pc.in
--- icu/source/config/icu.pc.in 2021-04-08 02:10:27.000000000 +0200
+++ icu-new/source/config/icu.pc.in 2021-05-22 19:02:10.219114070 +0200
@@ -3,30 +3,30 @@
# Copyright (C) 2010-2013, International Business Machines Corporation. All Rights Reserved.
@ -48,9 +48,9 @@ diff -rupN icu/source/config/icu.pc.in icu-new/source/config/icu.pc.in
#ICUPKGDATA_DIR=@libdir@
#ICUDATA_DIR=${pkgdatadir}
ICUDESC=International Components for Unicode
diff -rupN icu/source/config/Makefile.inc.in icu-new/source/config/Makefile.inc.in
--- icu/source/config/Makefile.inc.in 2020-04-22 22:04:20.000000000 +0200
+++ icu-new/source/config/Makefile.inc.in 2020-05-18 22:03:29.327982862 +0200
diff -rupN --no-dereference icu/source/config/Makefile.inc.in icu-new/source/config/Makefile.inc.in
--- icu/source/config/Makefile.inc.in 2021-04-08 02:10:27.000000000 +0200
+++ icu-new/source/config/Makefile.inc.in 2021-05-22 19:02:10.219114070 +0200
@@ -43,7 +43,7 @@ UNICODE_VERSION = @UNICODE_VERSION@
# The prefix for ICU libraries, normally 'icu'
ICUPREFIX = icu
@ -87,15 +87,15 @@ diff -rupN icu/source/config/Makefile.inc.in icu-new/source/config/Makefile.inc.
ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}
diff -rupN icu/source/config/mh-mingw icu-new/source/config/mh-mingw
--- icu/source/config/mh-mingw 2020-04-22 22:04:20.000000000 +0200
+++ icu-new/source/config/mh-mingw 2020-05-18 22:05:23.578281690 +0200
@@ -82,31 +82,21 @@ SO_TARGET_VERSION_SUFFIX =
diff -rupN --no-dereference icu/source/config/mh-mingw icu-new/source/config/mh-mingw
--- icu/source/config/mh-mingw 2021-04-08 02:10:27.000000000 +0200
+++ icu-new/source/config/mh-mingw 2021-05-22 19:02:10.219114070 +0200
@@ -82,34 +82,21 @@ SO_TARGET_VERSION_SUFFIX =
endif
# Static library prefix and file extension
-LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
+LIBSICU = lib$(LIBPREFIX)$(ICUPREFIX)
+LIBSICU = LIBSICU = lib$(LIBPREFIX)$(ICUPREFIX)
A = a
## An import library is needed for z/OS and MSVC
@ -116,16 +116,19 @@ diff -rupN icu/source/config/mh-mingw icu-new/source/config/mh-mingw
#SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
#SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}"
-#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_LX="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_CTESTFW="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_TOOLUTIL="-l$(ICUPREFIX)tu$(ICULIBSUFFIX)"
-#SH#
#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} "
@@ -172,6 +162,9 @@ MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#
@@ -175,6 +162,9 @@ MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#
## Special pkgdata information that is needed
PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR)
@ -135,7 +138,7 @@ diff -rupN icu/source/config/mh-mingw icu-new/source/config/mh-mingw
## Versioned libraries rules
#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
# $(RM) $@ && cp ${<F} $@
@@ -187,5 +180,17 @@ GENCCODE_ASSEMBLY=-a gcc-cygwin
@@ -190,5 +180,17 @@ GENCCODE_ASSEMBLY=-a gcc-cygwin
# These are needed to allow the pkgdata GNU make files to work
PKGDATA_DEFS = -DU_MAKE=\"$(MAKE)\"
@ -153,9 +156,9 @@ diff -rupN icu/source/config/mh-mingw icu-new/source/config/mh-mingw
+
## End Cygwin/MinGW specific setup
diff -rupN icu/source/config/mh-mingw64 icu-new/source/config/mh-mingw64
--- icu/source/config/mh-mingw64 2020-04-22 22:04:20.000000000 +0200
+++ icu-new/source/config/mh-mingw64 2020-05-18 22:06:19.338428221 +0200
diff -rupN --no-dereference icu/source/config/mh-mingw64 icu-new/source/config/mh-mingw64
--- icu/source/config/mh-mingw64 2021-04-08 02:10:27.000000000 +0200
+++ icu-new/source/config/mh-mingw64 2021-05-22 19:02:10.220114070 +0200
@@ -82,7 +82,7 @@ SO_TARGET_VERSION_SUFFIX =
endif
@ -165,7 +168,7 @@ diff -rupN icu/source/config/mh-mingw64 icu-new/source/config/mh-mingw64
A = a
## An import library is needed for z/OS and MSVC
@@ -90,23 +90,13 @@ IMPORT_LIB_EXT = .dll.a
@@ -90,26 +90,13 @@ IMPORT_LIB_EXT = .dll.a
LIBPREFIX=
@ -181,16 +184,19 @@ diff -rupN icu/source/config/mh-mingw64 icu-new/source/config/mh-mingw64
#SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
#SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}"
-#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)"
-#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_DT="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_LX="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_IO="-l$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_UC="-l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_CTESTFW="-l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)"
-ICULIBS_TOOLUTIL="-l$(ICUPREFIX)tu$(ICULIBSUFFIX)"
-#SH#
#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} "
@@ -172,6 +162,9 @@ MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#
@@ -175,6 +162,9 @@ MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#
## Special pkgdata information that is needed
PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR)
@ -200,7 +206,7 @@ diff -rupN icu/source/config/mh-mingw64 icu-new/source/config/mh-mingw64
## Versioned libraries rules
#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
# $(RM) $@ && cp ${<F} $@
@@ -187,5 +180,17 @@ GENCCODE_ASSEMBLY=-a gcc-mingw64
@@ -190,5 +180,17 @@ GENCCODE_ASSEMBLY=-a gcc-mingw64
# These are needed to allow the pkgdata GNU make files to work
PKGDATA_DEFS = -DU_MAKE=\"$(MAKE)\"

9
mingw-icu.spec
View File

@ -2,11 +2,11 @@
%global underscore_version %(echo %{version} | sed 's/\\./_/g')
%global dash_version %(echo %{version} | sed 's/\\./-/g')
%global lib_version 67
%global lib_version 69
Name: mingw-icu
Version: 67.1
Release: 3%{?dist}
Version: 69.1
Release: 1%{?dist}
Summary: MinGW compilation of International Components for Unicode Tools
License: MIT and UCD and Public Domain
@ -198,6 +198,9 @@ rm %{buildroot}%{mingw64_libdir}/icu/pkgdata.inc
%changelog
* Sat May 22 2021 Sandro Mani <manisandro@gmail.com> - 69.1-1
- Update to 69.1
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 67.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (icu4c-67_1-src.tgz) = 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
SHA512 (icu4c-69_1-src.tgz) = d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7