icu58.patch 3.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. diff -Nuar a/build/autoconf/icu.m4 b/build/autoconf/icu.m4
  2. --- a/build/autoconf/icu.m4 2017-09-14 23:15:53.000000000 +0300
  3. +++ b/build/autoconf/icu.m4 2018-01-19 18:45:55.713445653 +0300
  4. @@ -15,7 +15,7 @@
  5. MOZ_SYSTEM_ICU=1)
  6. if test -n "$MOZ_SYSTEM_ICU"; then
  7. - PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 59.1)
  8. + PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 58.2)
  9. CFLAGS="$CFLAGS $MOZ_ICU_CFLAGS"
  10. CXXFLAGS="$CXXFLAGS $MOZ_ICU_CFLAGS"
  11. fi
  12. diff -Nuar a/old-configure b/old-configure
  13. --- a/old-configure 2018-01-19 02:55:53.000000000 +0300
  14. +++ b/old-configure 2018-01-19 18:45:13.792448678 +0300
  15. @@ -17589,29 +17589,29 @@
  16. else
  17. PKG_CONFIG_MIN_VERSION=0.9.0
  18. if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
  19. - echo $ac_n "checking for icu-i18n >= 59.1""... $ac_c" 1>&6
  20. -echo "configure:17594: checking for icu-i18n >= 59.1" >&5
  21. + echo $ac_n "checking for icu-i18n >= 58.2""... $ac_c" 1>&6
  22. +echo "configure:17594: checking for icu-i18n >= 58.2" >&5
  23. - if $PKG_CONFIG --exists "icu-i18n >= 59.1" ; then
  24. + if $PKG_CONFIG --exists "icu-i18n >= 58.2" ; then
  25. echo "$ac_t""yes" 1>&6
  26. succeeded=yes
  27. echo $ac_n "checking MOZ_ICU_CFLAGS""... $ac_c" 1>&6
  28. echo "configure:17601: checking MOZ_ICU_CFLAGS" >&5
  29. - MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 59.1"`
  30. + MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 58.2"`
  31. echo "$ac_t""$MOZ_ICU_CFLAGS" 1>&6
  32. echo $ac_n "checking MOZ_ICU_LIBS""... $ac_c" 1>&6
  33. echo "configure:17606: checking MOZ_ICU_LIBS" >&5
  34. ## Remove evil flags like -Wl,--export-dynamic
  35. - MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 59.1\" |sed s/-Wl,--export-dynamic//g`"
  36. + MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 58.2\" |sed s/-Wl,--export-dynamic//g`"
  37. echo "$ac_t""$MOZ_ICU_LIBS" 1>&6
  38. else
  39. MOZ_ICU_CFLAGS=""
  40. MOZ_ICU_LIBS=""
  41. ## If we have a custom action on failure, don't print errors, but
  42. ## do set a variable so people can do so.
  43. - MOZ_ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-i18n >= 59.1"`
  44. + MOZ_ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-i18n >= 58.2"`
  45. echo $MOZ_ICU_PKG_ERRORS
  46. fi
  47. @@ -17627,7 +17627,7 @@
  48. :
  49. else
  50. if test "$COMPILE_ENVIRONMENT"; then
  51. - { echo "configure: error: Library requirements (icu-i18n >= 59.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (icu-i18n >= 59.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; }
  52. + { echo "configure: error: Library requirements (icu-i18n >= 58.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (icu-i18n >= 58.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; }
  53. fi
  54. fi