From 345a264c71ee7d6882a47f55f04903bf10376f5f6cf93407c63fa9d97bddce88 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 2 Mar 2009 23:27:52 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/icu?expand=0&rev=10 --- icu-gcc44.patch | 13 +++++++++++++ icu.changes | 6 ++++++ icu.spec | 24 ++++++++++-------------- 3 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 icu-gcc44.patch diff --git a/icu-gcc44.patch b/icu-gcc44.patch new file mode 100644 index 0000000..102df36 --- /dev/null +++ b/icu-gcc44.patch @@ -0,0 +1,13 @@ +Index: source/layoutex/ParagraphLayout.cpp +=================================================================== +--- source/layoutex/ParagraphLayout.cpp.orig 2008-07-01 03:42:02.000000000 +0200 ++++ source/layoutex/ParagraphLayout.cpp 2009-03-02 21:47:07.000000000 +0100 +@@ -868,7 +868,7 @@ le_int32 ParagraphLayout::getLanguageCod + + return nullLanguageCode; + } +-#elif ++#else + + // TODO - dummy implementation for right now... + le_int32 ParagraphLayout::getLanguageCode(const Locale *locale) diff --git a/icu.changes b/icu.changes index 655f447..a0ce7b1 100644 --- a/icu.changes +++ b/icu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 2 22:07:18 CET 2009 - crrodriguez@suse.de + +- fix build with GCC 4.4 +- remove static libraries + ------------------------------------------------------------------- Wed Dec 10 12:34:56 CET 2008 - olh@suse.de diff --git a/icu.spec b/icu.spec index 2f159a5..38c2c2a 100644 --- a/icu.spec +++ b/icu.spec @@ -1,7 +1,7 @@ # # spec file for package icu (Version 4.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ License: X11/MIT Group: System/Libraries AutoReqProv: on Version: 4.0 -Release: 7 +Release: 8 Requires: libicu = %{version} Url: http://ibm.com/software/globalization/icu Source0: icu4c-4_0-src.tar.bz2 @@ -32,6 +32,7 @@ Source1: icu4c-4_0-docs.tar.bz2 Source3: SuSEconfig.icu # PATCH-FIX-UPSTREAM icu4c-3_6-src-setBreakType-public.diff -- OOo-2.3.1 and above needs to access the setBreakType method, see http://bugs.icu-project.org/trac/ticket/5498 Patch: icu4c-3_6-src-setBreakType-public.diff +Patch1: icu-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: International Components for Unicode @@ -143,6 +144,7 @@ Authors: %prep %setup -q -n icu -a1 %patch +%patch1 %build cd source @@ -151,18 +153,10 @@ rm -f config.cache export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$CXXFLAGS -DICU_DATA_DIR='/usr/share/icu/4.0/'" -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ +%configure --disable-static --with-pic\ --enable-shared \ - --enable-static \ - --without-samples \ - %{_target_cpu}-suse-linux-gnu -make -#make check + --without-samples +%{__make} %{?jobs:-j%jobs} %install find . -name CVS -type d | xargs rm -rf @@ -218,7 +212,6 @@ rm -rf $RPM_BUILD_ROOT %files -n libicu-devel %defattr(-, root, root) %{_libdir}/lib*.so -%{_libdir}/lib*.a /usr/include/unicode/ /usr/include/layout/ %{_libdir}/icu/%{version}/Makefile.inc @@ -241,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT /usr/share/icu/%{version}/UnicodeData.txt %changelog +* Mon Mar 02 2009 crrodriguez@suse.de +- fix build with GCC 4.4 +- remove static libraries * Wed Dec 10 2008 olh@suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293)