diff --git a/.gitignore b/.gitignore index 3add6b5..cd4497b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /icu4c-57_1-src.tgz /icu4c-64_2-src.tgz /icu4c-65_1-src.tgz +/icu4c-67_1-src.tgz diff --git a/icu4c_mingwbuild.patch b/icu4c_mingwbuild.patch index b5269a0..c02b6f2 100644 --- a/icu4c_mingwbuild.patch +++ b/icu4c_mingwbuild.patch @@ -1,18 +1,6 @@ -diff -rupN --no-dereference icu/source/config/icu-config-bottom icu-new/source/config/icu-config-bottom ---- icu/source/config/icu-config-bottom 2019-10-03 13:16:41.000000000 +0200 -+++ icu-new/source/config/icu-config-bottom 2019-11-05 14:03:28.069671628 +0100 -@@ -5,7 +5,7 @@ - ## Copyright (c) 2002-2013, International Business Machines Corporation and - ## others. All Rights Reserved. - --ICUUC_FILE="${libdir}/${ICULIBS_COMMON_LIB_NAME}" -+ICUUC_FILE="${bindir}/${ICULIBS_COMMON_LIB_NAME}" - ICUUC_FILE_A="${libdir}/${ICULIBS_COMMON_LIB_NAME_A}" - - # echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS} -diff -rupN --no-dereference icu/source/config/icu.pc.in icu-new/source/config/icu.pc.in ---- icu/source/config/icu.pc.in 2019-10-03 13:16:41.000000000 +0200 -+++ icu-new/source/config/icu.pc.in 2019-11-05 14:03:28.069671628 +0100 +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 @@ -3,30 +3,30 @@ # Copyright (C) 2010-2013, International Business Machines Corporation. All Rights Reserved. @@ -60,9 +48,9 @@ diff -rupN --no-dereference icu/source/config/icu.pc.in icu-new/source/config/ic #ICUPKGDATA_DIR=@libdir@ #ICUDATA_DIR=${pkgdatadir} ICUDESC=International Components for Unicode -diff -rupN --no-dereference icu/source/config/Makefile.inc.in icu-new/source/config/Makefile.inc.in ---- icu/source/config/Makefile.inc.in 2019-10-03 13:16:41.000000000 +0200 -+++ icu-new/source/config/Makefile.inc.in 2019-11-05 14:03:28.069671628 +0100 +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 @@ -43,7 +43,7 @@ UNICODE_VERSION = @UNICODE_VERSION@ # The prefix for ICU libraries, normally 'icu' ICUPREFIX = icu @@ -99,10 +87,10 @@ diff -rupN --no-dereference icu/source/config/Makefile.inc.in icu-new/source/con ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO} ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A} -diff -rupN --no-dereference icu/source/config/mh-mingw icu-new/source/config/mh-mingw ---- icu/source/config/mh-mingw 2019-10-03 13:16:41.000000000 +0200 -+++ icu-new/source/config/mh-mingw 2019-11-05 14:03:28.070671625 +0100 -@@ -77,28 +77,21 @@ SO_TARGET_VERSION_SUFFIX = +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 = endif # Static library prefix and file extension @@ -129,14 +117,17 @@ diff -rupN --no-dereference icu/source/config/mh-mingw icu-new/source/config/mh- #SH#ICULIBS_COMMON_LIB_NAME_A="${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}" -#SH#ICULIBS_DATA="-l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION)" --#SH#ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_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# #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} " -@@ -166,6 +159,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# +@@ -172,6 +162,9 @@ MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)# + ## Special pkgdata information that is needed + PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR) +# The following is for Makefile.inc's use. +ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR) @@ -144,7 +135,7 @@ diff -rupN --no-dereference icu/source/config/mh-mingw icu-new/source/config/mh- ## Versioned libraries rules #%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) # $(RM) $@ && cp ${ - 67.1-1 +- Update to 67.1 + * Wed Jan 29 2020 Fedora Release Engineering - 65.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 1705ef7..caf3cb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (icu4c-65_1-src.tgz) = 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139 +SHA512 (icu4c-67_1-src.tgz) = 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8