diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-30 08:36:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-30 08:55:52 +0000 |
| commit | 10818d8435f4fce5938903cb308ef5c63cfa931f (patch) | |
| tree | 85d6fe2f74343b7b58e5c9e937dddcf64474bd6a /main/xulrunner/bug-947981.patch | |
| parent | 97212ada95b68834b32b5ab0fe591bc1565d0d1e (diff) | |
| download | aports-10818d8435f4fce5938903cb308ef5c63cfa931f.tar.bz2 aports-10818d8435f4fce5938903cb308ef5c63cfa931f.tar.xz | |
main/xulrunner: upgrade to 29.0
Diffstat (limited to 'main/xulrunner/bug-947981.patch')
| -rw-r--r-- | main/xulrunner/bug-947981.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/main/xulrunner/bug-947981.patch b/main/xulrunner/bug-947981.patch deleted file mode 100644 index 4eb6eae580..0000000000 --- a/main/xulrunner/bug-947981.patch +++ /dev/null @@ -1,72 +0,0 @@ - -# HG changeset patch -# User Makoto Kato <m_kato@ga2.so-net.ne.jp> -# Date 1387329615 -32400 -# Node ID 82f8fd52a774837c84cc4d178e158ab2055e9a57 -# Parent 41a8213774080c318e8a6ba52a78a9c50e018f29 -Bug 947981 - broken --with-system-icu build. r=glandium - -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -3909,16 +3909,17 @@ MOZ_NATIVE_ICU= - MOZ_ARG_WITH_BOOL(system-icu, - [ --with-system-icu - Use system ICU (located with pkgconfig)], - MOZ_NATIVE_ICU=1) - - if test -n "$MOZ_NATIVE_ICU"; then - PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) - MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS" -+ MOZ_SHARED_ICU=1 - fi - - AC_SUBST(MOZ_NATIVE_ICU) - - dnl ======================================================== - dnl Java SDK support - dnl ======================================================== - -diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in ---- a/js/src/config/Makefile.in -+++ b/js/src/config/Makefile.in -@@ -31,17 +31,16 @@ include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DUNICODE -D_UNICODE - - ifdef WRAP_SYSTEM_INCLUDES - export:: \ - $(call mkdir_deps,system_wrappers_js) \ - $(NULL) - $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \ -- -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ - $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js - $(INSTALL) system_wrappers_js $(DIST) - - GARBAGE_DIRS += system_wrappers_js - endif - - GARBAGE += $(srcdir)/*.pyc *.pyc - -diff --git a/js/src/configure.in b/js/src/configure.in ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -4160,16 +4160,17 @@ ICU_LIB_NAMES= - MOZ_NATIVE_ICU= - MOZ_ARG_WITH_BOOL(system-icu, - [ --with-system-icu - Use system ICU (located with pkgconfig)], - MOZ_NATIVE_ICU=1) - - if test -n "$MOZ_NATIVE_ICU"; then - PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) -+ MOZ_SHARED_ICU=1 - fi - - MOZ_ARG_WITH_STRING(intl-api, - [ --with-intl-api, --with-intl-api=build, --without-intl-api - Determine the status of the ECMAScript Internationalization API. The first - (or lack of any of these) builds and exposes the API. The second builds it - but doesn't use ICU or expose the API to script. The third doesn't build - ICU at all.], - |