diff options
| author | Eike Rathke <erack@redhat.com> | 2017-05-29 14:25:57 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-05-29 16:42:44 +0200 |
| commit | 617aa72fe2c097183cb9dd73dd378d6fb0145208 (patch) | |
| tree | 73c7c70b72d3684eec547c3d4cf519bdd42a362c /configure.ac | |
| parent | 32d43cb00105e463cda42b926b829407f536cf1c (diff) | |
Resolves: tdf#108043 Revert "Upgrade to ICU 59.1"
As it would force us to not run on XP *AND* Vista anymore already with
this 5.4 release.
This is a combination of 4 commits.
Revert "Add ICU ticket number for this patch"
This reverts commit e24cd3818821971fe3c52820dafe0f5ccb4b023a.
Revert "Add ICU ticket number for this patch"
This reverts commit 8720877b8b6bc96e330842f7391ae49a21ec2f63.
Revert "Upgrade to ICU 59.1 follow-up: only add icu/source/data/misc/icudata.rc"
This reverts commit 89de6f62ae1e96d2c492cb5cd8f7d313b51e2f98.
Revert "Upgrade to ICU 59.1"
This reverts commit fabad007c60958f2ff87e8f636ff6a798ad1f963.
Change-Id: Idd2bfecf7f3c148ee404322e7287ac236c46b6cf
Reviewed-on: https://gerrit.libreoffice.org/38143
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index b38623879abd..3b1e6a0f699c 100644 --- a/configure.ac +++ b/configure.ac @@ -8981,7 +8981,7 @@ SYSTEM_GENBRK= SYSTEM_GENCCODE= SYSTEM_GENCMN= -ICU_MAJOR=59 +ICU_MAJOR=58 ICU_MINOR=1 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE" ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE" @@ -9069,15 +9069,6 @@ else ICU_CFLAGS="-I${WORKDIR}/UnpackedTarball/icu/source/i18n -I${WORKDIR}/UnpackedTarball/icu/source/common" ICU_LIBS="-L${WORKDIR}/UnpackedTarball/icu/source/lib" fi -if test "$ICU_MAJOR" -ge "59"; then - # As of ICU 59 it defaults to typedef char16_t UChar; which is available - # with -std=c++11 but not all external libraries can be built with that, - # for those use a bit-compatible typedef uint16_t UChar; see - # icu/source/common/unicode/umachine.h - ICU_UCHAR_TYPE="-DUCHAR_TYPE=uint16_t" -else - ICU_UCHAR_TYPE="" -fi AC_SUBST(SYSTEM_ICU) AC_SUBST(SYSTEM_GENBRK) AC_SUBST(SYSTEM_GENCCODE) @@ -9089,7 +9080,6 @@ AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER) AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER) AC_SUBST(ICU_CFLAGS) AC_SUBST(ICU_LIBS) -AC_SUBST(ICU_UCHAR_TYPE) dnl ================================================================== dnl Breakpad |