[mingw-icu/f18] Revert "Update to version 49"
pfor
pfor at fedoraproject.org
Sun Jan 27 15:37:25 UTC 2013
commit be3fbe2e2291dae3f846acc121ac7872f9e8eb97
Author: Paweł Forysiuk <tuxator at o2.pl>
Date: Sun Jan 27 16:25:43 2013 +0100
Revert "Update to version 49"
This reverts commit b942c392347ba1b68c4aa0603a774cecf5035915.
.gitignore | 1 -
icu4c-4_6_1-crossbuild.patch | 138 ++++++++++++++---------
icu4c-4_6_1-mingw-w64-mkdir-compatibility.patch | 4 +-
mingw-icu.spec | 53 ++++-----
sources | 2 +-
5 files changed, 111 insertions(+), 87 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c5f4815..eb41030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
/icu4c-4_8_1_1-src.tgz
-/icu4c-49_1_2-src.tgz
diff --git a/icu4c-4_6_1-crossbuild.patch b/icu4c-4_6_1-crossbuild.patch
index b9ed8d1..32dc212 100644
--- a/icu4c-4_6_1-crossbuild.patch
+++ b/icu4c-4_6_1-crossbuild.patch
@@ -1,31 +1,26 @@
-diff --git a/source/config/Makefile.inc.in b/source/config/Makefile.inc.in
-index 7a4496e..d47a397 100644
---- a/source/config/Makefile.inc.in
-+++ b/source/config/Makefile.inc.in
-@@ -41,7 +41,7 @@ UNICODE_VERSION = @UNICODE_VERSION@
- # The prefix for ICU libraries, normally 'icu'
- ICUPREFIX = icu
- PACKAGE = @PACKAGE@
--LIBICU = lib$(ICUPREFIX)
-+LIBICU = $(ICUPREFIX)
+--- a/source/common/unicode/platform.h.in
++++ b/source/common/unicode/platform.h.in
+@@ -248,6 +248,12 @@
+ #ifndef U_GNUC_UTF16_STRING
+ #define U_GNUC_UTF16_STRING @U_CHECK_GNUC_UTF16_STRING@
+ #endif
++
++/**
++ * Never define U_DECLARE_UTF16 for MinGW, as that will cause
++ * bogus UNICODE_STRING and U_STRING_DECL definitions.
++ */
++#ifndef __MINGW32__
+ #if @U_CHECK_UTF16_STRING@ || defined(U_CHECK_UTF16_STRING)
+ #if (defined(__xlC__) && defined(__IBM_UTF_LITERAL) && U_SIZEOF_WCHAR_T != 2) \
+ || (defined(__HP_aCC) && __HP_aCC >= 035000) \
+@@ -263,6 +269,7 @@
+ #define U_DECLARE_UTF16(string) L ## string
+ #endif
+ #endif
++#endif
- # Static library prefix and file extension
- STATIC_PREFIX = s
-diff --git a/source/config/icu-config-bottom b/source/config/icu-config-bottom
-index 0f0319a..ed86fff 100644
---- a/source/config/icu-config-bottom
-+++ b/source/config/icu-config-bottom
-@@ -3,7 +3,7 @@
- ## Copyright (c) 2002-2011, 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 --git a/source/config/icu.pc.in b/source/config/icu.pc.in
-index 406b196..44577b4 100644
--- a/source/config/icu.pc.in
+++ b/source/config/icu.pc.in
@@ -1,27 +1,27 @@
@@ -56,9 +51,9 @@ index 406b196..44577b4 100644
+#sbindir=@sbindir@
+#mandir=@mandir@
+#sysconfdir=@sysconfdir@
-+CFLAGS=@CFLAGS@
-+#CXXFLAGS=@CXXFLAGS@
-+DEFS=@DEFS@
++CFLAGS=@CFLAGS@
++#CXXFLAGS=@CXXFLAGS@
++DEFS=@DEFS@
UNICODE_VERSION=@UNICODE_VERSION@
ICUPREFIX=icu
ICULIBSUFFIX=@ICULIBSUFFIX@
@@ -72,38 +67,66 @@ index 406b196..44577b4 100644
#ICUPKGDATA_DIR=@libdir@
#ICUDATA_DIR=${pkgdatadir}
ICUDESC=International Components for Unicode
-diff --git a/source/config/mh-mingw b/source/config/mh-mingw
-index 2b1faa8..a0f17e9 100644
+--- a/source/config/Makefile.inc.in
++++ b/source/config/Makefile.inc.in
+@@ -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
+@@ -113,6 +113,7 @@
+ ICULIBS_BASE = $(LIBS) -L$(libdir)
+
+ # for icu-config to test with
++SO = lib
+ ICULIBS_COMMON_LIB_NAME = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}
+ ICULIBS_COMMON_LIB_NAME_A = ${LIBICU}${COMMON_STUBNAME}${ICULIBSUFFIX}.${A}
+
--- a/source/config/mh-mingw
+++ b/source/config/mh-mingw
-@@ -56,26 +56,20 @@ SO = dll
+@@ -38,8 +38,10 @@
+ #LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
+
+ ## Commands to make a shared library
+-SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared
+-SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared
++# $(subst) won't work in shell script. #M# at the end omits these
++# lines from the shell script (Make only)
++SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--enable-auto-import -Wl,--out-implib=$(subst $(SO_TARGET_VERSION_MAJOR),,$(subst $(ICUPREFIX),$(LIBPREFIX)$(ICUPREFIX),$@)).$(A)#M#
++SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,--enable-auto-import -Wl,--out-implib=$(subst $(SO_TARGET_VERSION_MAJOR),,$(subst $(ICUPREFIX),$(LIBPREFIX)$(ICUPREFIX),$@)).$(A)#M#
+
+ ## Compiler switch to embed a runtime search path
+ LD_RPATH=
+@@ -52,22 +54,20 @@
+ SO = dll
## Non-shared intermediate object suffix
STATIC_O = ao
-
--ifeq ($(ENABLE_SHARED),YES)
-SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR)
--else
--SO_TARGET_VERSION_SUFFIX =
--endif
-
-# Static library prefix and file extension
--LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX)
--A = a
-+## To have an import library is better on Windows
-+IMPORT_LIB_EXT = .dll.a
-
+-LIBSICU = $(STATIC_PREFIX)$(ICUPREFIX)
+-A = lib
+-
-## An import library is needed for z/OS and MSVC
--IMPORT_LIB_EXT = .lib
-+LIBICU = $(ICUPREFIX)
-+LIBSICU = $(LIBPREFIX)$(ICUPREFIX)
-
--#LIBPREFIX=
+-#IMPORT_LIB_EXT = .lib
+-
+-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)
++LIBSICU = $(LIBPREFIX)$(ICUPREFIX)
++## To have an import library is better on Windows
++IMPORT_LIB_EXT = .dll.a
++
++LIBICU = $(ICUPREFIX)
+ICULIBS_DT = -l$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)
+ICULIBS_UC = -l$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)
+ICULIBS_I18N = -l$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)
@@ -115,7 +138,7 @@ index 2b1faa8..a0f17e9 100644
# The #M# is used to delete lines for icu-config
# Current full path directory.
-@@ -111,25 +105,33 @@ CURR_SRCCODE_FULL_DIR=$(subst \,/,$(shell cmd /c cd))#M# for Cygwin shell
+@@ -103,21 +103,32 @@
## Versioned target for a shared library.
## Since symbolic links don't work the same way on Windows,
## we only use the version major number.
@@ -128,10 +151,6 @@ index 2b1faa8..a0f17e9 100644
+MIDDLE_IMPORT_LIB = $(IMPORT_LIB)#M#
+FINAL_IMPORT_LIB = $(IMPORT_LIB)#M#
--FINAL_IMPORT_LIB = $(dir $(SO_TARGET))lib$(notdir $(basename $(SO_TARGET)))$(IMPORT_LIB_EXT)#M#
--IMPORT_LIB = $(FINAL_IMPORT_LIB)#M#
--MIDDLE_IMPORT_LIB = $(FINAL_IMPORT_LIB)#M#
-
-## Special pkgdata information that is needed
-PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR)
-#ICUPKGDATA_INSTALL_DIR = $(shell cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M#
@@ -159,11 +178,9 @@ index 2b1faa8..a0f17e9 100644
# Environment variable to set a runtime search path
LDLIBRARYPATH_ENVVAR = PATH
-diff --git a/source/tools/toolutil/pkg_genc.c b/source/tools/toolutil/pkg_genc.c
-index 57c6f61..7222648 100644
--- a/source/tools/toolutil/pkg_genc.c
+++ b/source/tools/toolutil/pkg_genc.c
-@@ -142,6 +142,22 @@ static const struct AssemblyType {
+@@ -145,6 +145,22 @@
".long ","",HEX_0X
},
@@ -186,3 +203,14 @@ index 57c6f61..7222648 100644
{"sun",
"\t.section \".rodata\"\n"
"\t.align 8\n"
+--- a/source/config/icu-config-bottom
++++ b/source/config/icu-config-bottom
+@@ -3,7 +3,7 @@
+ ## Copyright (c) 2002-2010, 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 --git a/icu4c-4_6_1-mingw-w64-mkdir-compatibility.patch b/icu4c-4_6_1-mingw-w64-mkdir-compatibility.patch
index 5f5cd7d..284de74 100644
--- a/icu4c-4_6_1-mingw-w64-mkdir-compatibility.patch
+++ b/icu4c-4_6_1-mingw-w64-mkdir-compatibility.patch
@@ -1,13 +1,13 @@
--- icu/source/tools/toolutil/toolutil.cpp.orig 2012-02-11 00:08:41.443126312 +0100
+++ icu/source/tools/toolutil/toolutil.cpp 2012-02-11 00:09:22.265903655 +0100
-@@ -40,9 +40,11 @@
+@@ -36,9 +36,11 @@
# include <sys/types.h>
#endif
-/* In MinGW environment, io.h needs to be included for _mkdir() */
+/* In MinGW environment, io.h needs to be included for _mkdir() for
+ * the mingw.org toolchain and direct.h for the mingw-w64 toolchain */
- #if U_PLATFORM == U_PF_MINGW
+ #ifdef U_MINGW
#include <io.h>
+#include <direct.h>
#endif
diff --git a/mingw-icu.spec b/mingw-icu.spec
index a7caa6f..a2faa3c 100644
--- a/mingw-icu.spec
+++ b/mingw-icu.spec
@@ -1,11 +1,10 @@
%?mingw_package_header
%global underscore_version %(echo %{version} | sed 's/\\./_/g')
-%global lib_version %(echo %{version} | cut -d \. -f 1)
Name: mingw-icu
-Version: 49.1.2
-Release: 1%{?dist}
+Version: 4.8.1.1
+Release: 6%{?dist}
Summary: MinGW compilation of International Components for Unicode Tools
License: MIT and UCD and Public Domain
@@ -14,6 +13,7 @@ URL: http://icu-project.org
Source0: http://download.icu-project.org/files/icu4c/%{version}/icu4c-%{underscore_version}-src.tgz
BuildArch: noarch
+
Patch0: icu4c-4_6_1-crossbuild.patch
Patch1: icu4c-4_6_1-use-correct-genccode-assembly-on-win32-and-win64.patch
Patch2: icu4c-4_6_1-mingw-w64-mkdir-compatibility.patch
@@ -111,13 +111,13 @@ popd
find $RPM_BUILD_ROOT -name "*.dll" -type l -delete
-rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/libicudata%{version}.dll
-rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/libicudata%{version}.dll
+rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/icudata48.dll
+rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/icudata48.dll
-mv $RPM_BUILD_ROOT%{mingw32_libdir}/libicudata%{version}.dll \
- $RPM_BUILD_ROOT%{mingw32_bindir}/icudata%{lib_version}.dll
-mv $RPM_BUILD_ROOT%{mingw64_libdir}/libicudata%{version}.dll \
- $RPM_BUILD_ROOT%{mingw64_bindir}/icudata%{lib_version}.dll
+mv $RPM_BUILD_ROOT%{mingw32_libdir}/libicudata48.1.1.dll \
+ $RPM_BUILD_ROOT%{mingw32_libdir}/icudata48.dll
+mv $RPM_BUILD_ROOT%{mingw64_libdir}/libicudata48.1.1.dll \
+ $RPM_BUILD_ROOT%{mingw64_libdir}/icudata48.dll
for i in $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll ; \
do mv $i $RPM_BUILD_ROOT%{mingw32_bindir}/; done
@@ -159,14 +159,14 @@ rm -fr $RPM_BUILD_ROOT%{mingw64_libdir}/icu/pkgdata.inc
%{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_bindir}/icuio48.dll
+%{mingw32_bindir}/icuuc48.dll
+%{mingw32_bindir}/icule48.dll
+%{mingw32_bindir}/icui18n48.dll
+%{mingw32_bindir}/icutu48.dll
+%{mingw32_bindir}/icudata48.dll
+%{mingw32_bindir}/iculx48.dll
+%{mingw32_bindir}/icutest48.dll
%{mingw32_bindir}/icu-config
%{mingw32_libdir}/libicule.dll.a
@@ -207,14 +207,14 @@ rm -fr $RPM_BUILD_ROOT%{mingw64_libdir}/icu/pkgdata.inc
%{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_bindir}/icuio48.dll
+%{mingw64_bindir}/icuuc48.dll
+%{mingw64_bindir}/icule48.dll
+%{mingw64_bindir}/icui18n48.dll
+%{mingw64_bindir}/icutu48.dll
+%{mingw64_bindir}/icudata48.dll
+%{mingw64_bindir}/iculx48.dll
+%{mingw64_bindir}/icutest48.dll
%{mingw64_bindir}/icu-config
%{mingw64_libdir}/libicule.dll.a
@@ -237,9 +237,6 @@ rm -fr $RPM_BUILD_ROOT%{mingw64_libdir}/icu/pkgdata.inc
%changelog
-* Sun Dec 30 2012 Pawel Forysiuk <tuxator at o2.pl> - 49.1.2-1
-- Update to new upstream version
-
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index ad44ec2..f6ccab5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bbc609fe5237202d7abf016141012a45 icu4c-49_1_2-src.tgz
+ea93970a0275be6b42f56953cd332c17 icu4c-4_8_1_1-src.tgz
More information about the scm-commits
mailing list