From 40ebcf03e574b970f93cd3e7f78234641eda5473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 13 Aug 2013 09:06:17 +0100 Subject: [PATCH] drop icu 4.6 reversion patch --- ...ire-icu-4.6-or-later-with-system-icu.patch | 138 ------------------ libreoffice.spec | 42 +++--- 2 files changed, 20 insertions(+), 160 deletions(-) delete mode 100644 0001-Require-icu-4.6-or-later-with-system-icu.patch diff --git a/0001-Require-icu-4.6-or-later-with-system-icu.patch b/0001-Require-icu-4.6-or-later-with-system-icu.patch deleted file mode 100644 index ac47882..0000000 --- a/0001-Require-icu-4.6-or-later-with-system-icu.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 343a92f18cb4069acca547d455fcbd9ce42815e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Thu, 20 Dec 2012 15:35:29 +0100 -Subject: [PATCH] Require icu 4.6 or later with system icu -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I8c0da25a000e10d65479665a61be054fdb2486a5 -Reviewed-on: https://gerrit.libreoffice.org/1453 -Reviewed-by: David Tardon -Tested-by: Tomáš Chvátal ---- - config_host.mk.in | 1 - - configure.ac | 11 ++--------- - i18npool/CustomTarget_breakiterator.mk | 2 +- - 3 files changed, 3 insertions(+), 11 deletions(-) - -diff --git a/config_host.mk.in b/config_host.mk.in -index 4bab5d6..6ffd0fe 100644 ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -247,7 +247,6 @@ export ICECREAM_RUN=@ICECREAM_RUN@ - export ICU_MAJOR=@ICU_MAJOR@ - export ICU_MICRO=@ICU_MICRO@ - export ICU_MINOR=@ICU_MINOR@ --export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@ - export ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER@ - export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@ - export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@ -diff --git a/configure.ac b/configure.ac -index 064a2e9..b028e39 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8109,7 +8109,6 @@ SYSTEM_GENCMN= - ICU_MAJOR=49 - ICU_MINOR=1 - ICU_MICRO=1 --ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES" - ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES" - ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="YES" - ICU_RECLASSIFIED_HEBREW_LETTER="YES" -@@ -8134,10 +8133,10 @@ if test "$with_system_icu" = "yes"; then - ICU_MINOR=`echo $ICU_VERSION | cut -d"." -f2` - ICU_MICRO=`echo $ICU_VERSION | cut -d"." -f3` - -- if test "$ICU_MAJOR" -ge "4"; then -+ if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "6" \); then - AC_MSG_RESULT([OK, $ICU_VERSION]) - else -- AC_MSG_ERROR([not suitable, only >= 4.0 supported currently]) -+ AC_MSG_ERROR([not suitable, only >= 4.6 supported currently]) - fi - - if test "$cross_compiling" = "yes" -a \( "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" = "force" \); then -@@ -8172,11 +8171,6 @@ You can use --with-system-icu-for-build=force to use it anyway.]) - if test -z "$SYSTEM_GENCMN"; then - AC_MSG_ERROR([\'gencmn\' not found in \$PATH, install the icu development tool \'gencmn\']) - fi -- if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4" \); then -- ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES" -- else -- ICU_RECLASSIFIED_CLOSE_PARENTHESIS="NO" -- fi - if test "$ICU_MAJOR" -ge "49"; then - ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES" - else -@@ -8203,7 +8197,6 @@ AC_SUBST(SYSTEM_GENCMN) - AC_SUBST(ICU_MAJOR) - AC_SUBST(ICU_MINOR) - AC_SUBST(ICU_MICRO) --AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS) - AC_SUBST([ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER]) - AC_SUBST([ICU_RECLASSIFIED_HEBREW_LETTER]) - AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY) -diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk -index f7df926..f12b94c 100644 ---- a/i18npool/CustomTarget_breakiterator.mk -+++ b/i18npool/CustomTarget_breakiterator.mk -@@ -121,7 +121,7 @@ $(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(i18npool_GENBRKTARGET) - $(i18npool_BIDIR)/%.txt : \ - $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir - sed -e ': dummy' \ -- $(if $(filter YES,$(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)),-e "s#\[:LineBreak = Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#") \ -+ -e "s#\[:LineBreak = Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#" \ - $(if $(filter-out YES,$(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)),\ - -e '/\[:LineBreak = Conditional_Japanese_Starter:\]/d' \ - -e 's# $$CJ##' \ ---- libreoffice-4.0.0.3/i18nutil/source/utility/unicode.cxx -+++ libreoffice-4.0.0.3/i18nutil/source/utility/unicode.cxx -@@ -494,6 +494,12 @@ - case USCRIPT_UNKNOWN: - sRet = "und"; - break; -+ case USCRIPT_NABATAEAN: //no language with an assigned code yet -+ sRet = "mis"; -+ break; -+ case USCRIPT_PALMYRENE: //no language with an assigned code yet -+ sRet = "mis"; -+ break; - case USCRIPT_ARABIC: - sRet = "ar"; - break; -@@ -736,6 +742,9 @@ - case USCRIPT_LINEAR_A: - sRet = "ecr"; - break; -+ case USCRIPT_MANDAIC: -+ sRet = "mic"; -+ break; - case USCRIPT_MAYAN_HIEROGLYPHS: - sRet = "myn"; - break; -@@ -853,16 +862,6 @@ - case USCRIPT_TAI_VIET: - sRet = "blt"; - break; --#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 4) -- case USCRIPT_NABATAEAN: //no language with an assigned code yet -- sRet = "mis"; -- break; -- case USCRIPT_PALMYRENE: //no language with an assigned code yet -- sRet = "mis"; -- break; -- case USCRIPT_MANDAIC: -- sRet = "mic"; -- break; - case USCRIPT_BAMUM: - sRet = "bax"; - break; -@@ -908,7 +907,6 @@ - case USCRIPT_WARANG_CITI: - sRet = "hoc"; - break; --#endif - #if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 8) - case USCRIPT_AFAKA: - sRet = "djk"; diff --git a/libreoffice.spec b/libreoffice.spec index 27a1287..ba82ddd 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -244,18 +244,17 @@ Patch6: libreoffice-installfix.patch Patch7: libreoffice-rhel6gcj.patch Patch8: libreoffice-rhel6poppler.patch Patch9: libreoffice-rhel6langs.patch -Patch10: 0001-Require-icu-4.6-or-later-with-system-icu.patch -Patch11: libreoffice-rhel6limits.patch -Patch12: libreoffice-rhel6glib.patch -%endif -Patch13: 0001-temporarily-disable-failing-test.patch -Patch14: 0001-do-not-build-LibreOffice_Test.patch -Patch15: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch -Patch16: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch -Patch17: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch -Patch18: 0001-Resolves-fdo-48835-application-menu-for-LibreOffice.patch -Patch19: 0001-Resolves-fdo-67743-user-autocorr-file-not-written.patch -Patch20: 0001-only-use-the-SSPI-support-with-internal-neon.patch +Patch10: libreoffice-rhel6limits.patch +Patch11: libreoffice-rhel6glib.patch +%endif +Patch12: 0001-temporarily-disable-failing-test.patch +Patch13: 0001-do-not-build-LibreOffice_Test.patch +Patch14: 0001-Resolves-rhbz-968892-force-render-full-grapheme-with.patch +Patch15: 0001-Related-rhbz-968892-discard-impossible-languages-for.patch +Patch16: 0002-Related-rhbz-968892-discard-impossible-languages-for.patch +Patch17: 0001-Resolves-fdo-48835-application-menu-for-LibreOffice.patch +Patch18: 0001-Resolves-fdo-67743-user-autocorr-file-not-written.patch +Patch19: 0001-only-use-the-SSPI-support-with-internal-neon.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice @@ -996,18 +995,17 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch7 -p1 -b .rhel6gcj.patch %patch8 -p1 -b .rhel6poppler.patch %patch9 -p1 -b .rhel6langs.patch -%patch10 -p1 -R -b .Require-icu-4.6-or-later-with-system-icu.patch -%patch11 -p1 -b .rhel6limits.patch -%patch12 -p1 -b .rhel6glib.patch +%patch10 -p1 -b .rhel6limits.patch +%patch11 -p1 -b .rhel6glib.patch %endif -%patch13 -p1 -b .temporarily-disable-failing-test.patch -%patch14 -p1 -b .do-not-build-LibreOffice_Test.patch -%patch15 -p1 -b .rhbz-968892-force-render-full-grapheme-with.patch +%patch12 -p1 -b .temporarily-disable-failing-test.patch +%patch13 -p1 -b .do-not-build-LibreOffice_Test.patch +%patch14 -p1 -b .rhbz-968892-force-render-full-grapheme-with.patch +%patch15 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch %patch16 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch -%patch17 -p1 -b .rhbz-968892-discard-impossible-languages-for.patch -%patch18 -p1 -b .fdo-48835-application-menu-for-LibreOffice.patch -%patch19 -p1 -b .fdo-67743-user-autocorr-file-not-written.patch -%patch20 -p1 -b .only-use-the-SSPI-support-with-internal-neon.patch +%patch17 -p1 -b .fdo-48835-application-menu-for-LibreOffice.patch +%patch18 -p1 -b .fdo-67743-user-autocorr-file-not-written.patch +%patch19 -p1 -b .only-use-the-SSPI-support-with-internal-neon.patch # TODO: check this # these are horribly incomplete--empty translations and copied english