From ee549362c187b16f9b8eb12a10e6aa9cc7af0c52 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Aug 2019 15:56:38 +0000 Subject: [PATCH] mingw-icu fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675378 --- .gitignore | 4 - dead.package | 1 + icu4c-56_1-crossbuild.patch | 222 ---------------------------- mingw-icu.spec | 283 ------------------------------------ sources | 1 - 5 files changed, 1 insertion(+), 510 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 icu4c-56_1-crossbuild.patch delete mode 100644 mingw-icu.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9a462c3..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/icu4c-4_8_1_1-src.tgz -/icu4c-49_1_2-src.tgz -/icu4c-50_1_2-src.tgz -/icu4c-57_1-src.tgz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d93cd40 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +mingw-icu fails to build from source: https://bugzilla.redhat.com/show_bug.cgi?id=1675378 diff --git a/icu4c-56_1-crossbuild.patch b/icu4c-56_1-crossbuild.patch deleted file mode 100644 index 100453a..0000000 --- a/icu4c-56_1-crossbuild.patch +++ /dev/null @@ -1,222 +0,0 @@ ---- 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 @@ - ## 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} ---- 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 @@ - # Copyright (C) 2010-2013, International Business Machines Corporation. All Rights Reserved. - - # CFLAGS contains only anything end users should set --CFLAGS = @UCONFIG_CFLAGS@ -+CFLAGS=@UCONFIG_CFLAGS@ - # CXXFLAGS contains only anything end users should set --CXXFLAGS = @UCONFIG_CXXFLAGS@ -+CXXFLAGS=@UCONFIG_CXXFLAGS@ - # DEFS only contains those UCONFIG_CPPFLAGS which are not auto-set by platform.h --DEFS = @UCONFIG_CPPFLAGS@ --prefix = @prefix@ --exec_prefix = @exec_prefix@ --#bindir = @bindir@ --libdir = @libdir@ --includedir = @includedir@ --baselibs = @LIBS@ --#datarootdir = @datarootdir@ --#datadir = @datadir@ --#sbindir = @sbindir@ --#mandir = @mandir@ --#sysconfdir = @sysconfdir@ -+DEFS=@UCONFIG_CPPFLAGS@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+#bindir=@bindir@ -+libdir=@libdir@ -+includedir=@includedir@ -+baselibs=@LIBS@ -+#datarootdir=@datarootdir@ -+#datadir=@datadir@ -+#sbindir=@sbindir@ -+#mandir=@mandir@ -+#sysconfdir=@sysconfdir@ - UNICODE_VERSION=@UNICODE_VERSION@ - ICUPREFIX=icu - ICULIBSUFFIX=@ICULIBSUFFIX@ --LIBICU=lib${ICUPREFIX} -+LIBICU=${ICUPREFIX} - #SHAREDLIBCFLAGS=-fPIC - pkglibdir=${libdir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@ - #pkgdatadir=${datadir}/@PACKAGE@${ICULIBSUFFIX}/@VERSION@ --ICUDATA_NAME = icudt@LIB_VERSION_MAJOR@@ICUDATA_CHAR@ -+ICUDATA_NAME=icudata@LIB_VERSION_MAJOR@@ICUDATA_CHAR@ - #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 @@ - # The prefix for ICU libraries, normally 'icu' - ICUPREFIX = icu - PACKAGE = @PACKAGE@ --LIBICU = lib$(ICUPREFIX) -+LIBICU = $(ICUPREFIX) - - # Static library prefix and file extension - STATIC_PREFIX = s -@@ -106,18 +106,19 @@ - # - $(ICULIBS_LAYOUT) - ICU layout library. - # - $(ICULIBS_ICUIO) - ICU stdio equivalent library - --ICULIBS_COMMON = -l$(ICUPREFIX)uc$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --ICULIBS_DATA = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX)$(ICULIBSUFFIX_VERSION) --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) -+ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX) -+ICULIBS_TOOLUTIL = -l$(ICUPREFIX)tu$(ICULIBSUFFIX) -+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) - - # for icu-config to test with -+SO = dll - 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 @@ - endif - - # Static library prefix and file extension --LIBSICU = lib$(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) -+LIBSICU = lib$(LIBPREFIX)$(ICUPREFIX) - A = a - - ## An import library is needed for z/OS and MSVC -@@ -74,20 +74,13 @@ - - LIBPREFIX= - --# Change the stubnames so that poorly working FAT disks and installation programs can work. --# This is also for backwards compatibility. --DATA_STUBNAME = dt --I18N_STUBNAME = in --LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX) -+LIBICU = $(ICUPREFIX) - - #SH### copied from Makefile.inc - #SH## for icu-config to test with - #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)" --#SH#ICULIBS_I18N="-l$(ICUPREFIX)$(I18N_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} " -@@ -139,6 +132,9 @@ - #ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M# - #ICUPKGDATA_INSTALL_LIBDIR = $(shell cygpath -dma $(DESTDIR)$(libdir))#M# - -+# The following is for Makefile.inc's use. -+ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR) -+ - ## Versioned libraries rules - #%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) - # $(RM) $@ && cp ${= 95 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-gcc-c++ -BuildRequires: mingw32-binutils - -BuildRequires: mingw64-filesystem >= 95 -BuildRequires: mingw64-gcc -BuildRequires: mingw64-gcc-c++ -BuildRequires: mingw64-binutils - -%description -ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode and locale support. The library provides calendar -support, conversions for many character sets, language sensitive -collation, date and time formatting, support for many locales, message -catalogs and resources, message formatting, normalization, number and -currency formatting, time zone support, transliteration, and word, -line, and sentence breaking, etc. - - -# Win32 -%package -n mingw32-icu -Summary: MinGW compilation of International Components for Unicode Tools - -%description -n mingw32-icu -ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode and locale support. The library provides calendar -support, conversions for many character sets, language sensitive -collation, date and time formatting, support for many locales, message -catalogs and resources, message formatting, normalization, number and -currency formatting, time zone support, transliteration, and word, -line, and sentence breaking, etc. - -# Win64 -%package -n mingw64-icu -Summary: MinGW compilation of International Components for Unicode Tools - -%description -n mingw64-icu -ICU is a set of C and C++ libraries that provides robust and -full-featured Unicode and locale support. The library provides calendar -support, conversions for many character sets, language sensitive -collation, date and time formatting, support for many locales, message -catalogs and resources, message formatting, normalization, number and -currency formatting, time zone support, transliteration, and word, -line, and sentence breaking, etc. - - -%?mingw_debug_package - - -%prep -%setup -q -n icu - -%patch0 -p1 -b .crossbuild - - -%build -pushd source - -mkdir -p nativebuild -pushd nativebuild -../configure --enable-static --disable-shared -make %{?_smp_mflags} || make -popd - -%mingw_configure \ - --enable-shared --disable-static \ - --with-cross-build=$(pwd)/nativebuild \ - --with-data-packaging=library - -%mingw_make %{?_smp_mflags} - -popd - -%install -pushd source -%mingw_make DESTDIR=$RPM_BUILD_ROOT install -popd - -find $RPM_BUILD_ROOT -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 - -# remove unneded files -rm -fr $RPM_BUILD_ROOT%{mingw32_mandir} -rm -fr $RPM_BUILD_ROOT%{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 - - -# Win32 -%files -n mingw32-icu -%license license.html - -%{mingw32_bindir}/genrb.exe -%{mingw32_bindir}/gencnval.exe -%{mingw32_bindir}/uconv.exe -%{mingw32_bindir}/gencmn.exe -%{mingw32_bindir}/makeconv.exe -%{mingw32_bindir}/genbrk.exe -%{mingw32_bindir}/gensprep.exe -%{mingw32_bindir}/pkgdata.exe -%{mingw32_bindir}/icupkg.exe -%{mingw32_bindir}/derb.exe -%{mingw32_bindir}/genccode.exe -%{mingw32_bindir}/gendict.exe -%{mingw32_bindir}/gencfu.exe -%{mingw32_bindir}/gennorm2.exe -%{mingw32_bindir}/icuinfo.exe - -%{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 - -# Win64 -%files -n mingw64-icu -%license license.html - -%{mingw64_bindir}/genrb.exe -%{mingw64_bindir}/gencnval.exe -%{mingw64_bindir}/uconv.exe -%{mingw64_bindir}/gencmn.exe -%{mingw64_bindir}/makeconv.exe -%{mingw64_bindir}/genbrk.exe -%{mingw64_bindir}/gensprep.exe -%{mingw64_bindir}/pkgdata.exe -%{mingw64_bindir}/icupkg.exe -%{mingw64_bindir}/derb.exe -%{mingw64_bindir}/genccode.exe -%{mingw64_bindir}/gendict.exe -%{mingw64_bindir}/gencfu.exe -%{mingw64_bindir}/gennorm2.exe -%{mingw64_bindir}/icuinfo.exe - -%{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 -* Thu Jul 25 2019 Fedora Release Engineering - 57.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 57.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 57.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 57.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 57.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 57.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 24 2016 Kalev Lember - 57.1-1 -- Update to 57.1 -- Don't set group tags -- Use license macro - -* Thu Feb 04 2016 Fedora Release Engineering - 50.1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 50.1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 50.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Erik van Pienbroek - 50.1.2-3 -- Fix CVE-2013-2924 (RHBZ #1015595) - -* Sat Aug 03 2013 Fedora Release Engineering - 50.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun Jun 16 2013 Paweł Forysiuk - 50.1.2-1 -- Update to 50.1.2 to match native version -- Drop icu-config script - -* Sun Jan 27 2013 Paweł Forysiuk - 49.1.2-2 -- Properly package icudata library - -* Sun Dec 30 2012 Pawel Forysiuk - 49.1.2-1 -- Update to new upstream version - -* Fri Jul 20 2012 Fedora Release Engineering - 4.8.1.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Mar 18 2012 Erik van Pienbroek - 4.8.1.1-5 -- Added win64 support -- Use mingw macros without leading underscore -- Use %%global instead of %%define - -* Mon Feb 27 2012 Kalev Lember - 4.8.1.1-4 -- Added Erik van Pienbroek's patches to fix build with the mingw-w64 toolchain - -* Mon Feb 27 2012 Erik van Pienbroek - 4.8.1.1-3 -- Rebuild against the mingw-w64 toolchain - -* Tue Feb 07 2012 Forysiuk Paweł - 4.8.1.1-2 -- Fix icu4c-4_6_1-crossbuild.patch to compile cleanly -- Minor packaging cleanup - -* Tue Feb 07 2012 Forysiuk Paweł - 4.8.1.1-1 -- Initial release based on openSUSE mingw32-icu package diff --git a/sources b/sources deleted file mode 100644 index 9569d25..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -976734806026a4ef8bdd17937c8898b9 icu4c-57_1-src.tgz