diff --git a/.gitignore b/.gitignore index 72c9dc8..84b22a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -SOURCES/thunderbird-31.8.0.source.tar.bz2 -SOURCES/thunderbird-langpacks-31.8.0-20150715.tar.bz2 +SOURCES/l10n-lightning-38.2.0.tar.bz2 +SOURCES/thunderbird-38.2.0.source.tar.bz2 +SOURCES/thunderbird-langpacks-38.2.0-20150814.tar.bz2 diff --git a/.thunderbird.metadata b/.thunderbird.metadata index 6edf68a..8dc6416 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,2 +1,3 @@ -38492b0805a518bdc61e30aa541030195e425334 SOURCES/thunderbird-31.8.0.source.tar.bz2 -38336f5f3ab39cefb80b2fadf56c2294e674d767 SOURCES/thunderbird-langpacks-31.8.0-20150715.tar.bz2 +372a8235cb2a99ab2d2d9cc67ed7912c4c2f23e0 SOURCES/l10n-lightning-38.2.0.tar.bz2 +0e27c54ee63b71cd7e8ff4fd87bbe66e0a16ffc1 SOURCES/thunderbird-38.2.0.source.tar.bz2 +5c5969a2692bf970db3062b128691e4fa2fb3676 SOURCES/thunderbird-langpacks-38.2.0-20150814.tar.bz2 diff --git a/SOURCES/build-nspr-prbool.patch b/SOURCES/build-nspr-prbool.patch new file mode 100644 index 0000000..a46f472 --- /dev/null +++ b/SOURCES/build-nspr-prbool.patch @@ -0,0 +1,66 @@ +diff -up mozilla-beta/media/webrtc/trunk/webrtc/base/nssidentity.h.prbool-fix mozilla-beta/media/webrtc/trunk/webrtc/base/nssidentity.h +--- mozilla-beta/media/webrtc/trunk/webrtc/base/nssidentity.h.prbool-fix 2015-04-07 10:29:51.919137851 +0200 ++++ mozilla-beta/media/webrtc/trunk/webrtc/base/nssidentity.h 2015-04-07 10:33:06.886532753 +0200 +@@ -15,6 +15,7 @@ + + #include "cert.h" + #include "nspr.h" ++#include "prtypes.h" + #include "hasht.h" + #include "keythi.h" + +diff -up mozilla-beta/modules/libmar/sign/nss_secutil.h.prbool-fix mozilla-beta/modules/libmar/sign/nss_secutil.h +--- mozilla-beta/modules/libmar/sign/nss_secutil.h.prbool-fix 2015-04-07 10:33:13.079513533 +0200 ++++ mozilla-beta/modules/libmar/sign/nss_secutil.h 2015-04-07 10:33:16.101504154 +0200 +@@ -11,6 +11,7 @@ + #include "nss.h" + #include "pk11pub.h" + #include "cryptohi.h" ++#include "prtypes.h" + #include "hasht.h" + #include "cert.h" + #include "key.h" +diff -up mozilla-beta/security/certverifier/ExtendedValidation.cpp.prbool-fix mozilla-beta/security/certverifier/ExtendedValidation.cpp +--- mozilla-beta/security/certverifier/ExtendedValidation.cpp.prbool-fix 2015-04-07 10:36:42.693902941 +0200 ++++ mozilla-beta/security/certverifier/ExtendedValidation.cpp 2015-04-07 10:36:45.925893606 +0200 +@@ -9,6 +9,7 @@ + #include "cert.h" + #include "certdb.h" + #include "base64.h" ++#include "prtypes.h" + #include "hasht.h" + #include "pkix/stdkeywords.h" + #include "pkix/pkixtypes.h" +diff -up mozilla-beta/security/certverifier/OCSPCache.h.prbool-fix mozilla-beta/security/certverifier/OCSPCache.h +--- mozilla-beta/security/certverifier/OCSPCache.h.prbool-fix 2015-04-07 10:36:34.106927741 +0200 ++++ mozilla-beta/security/certverifier/OCSPCache.h 2015-04-07 10:36:35.940922444 +0200 +@@ -25,6 +25,7 @@ + #ifndef mozilla_psm_OCSPCache_h + #define mozilla_psm_OCSPCache_h + ++#include "prtypes.h" + #include "hasht.h" + #include "mozilla/Mutex.h" + #include "mozilla/Vector.h" +diff -up mozilla-beta/security/manager/ssl/src/nsCryptoHash.h.prbool-fix mozilla-beta/security/manager/ssl/src/nsCryptoHash.h +--- mozilla-beta/security/manager/ssl/src/nsCryptoHash.h.prbool-fix 2015-04-07 10:36:15.887980360 +0200 ++++ mozilla-beta/security/manager/ssl/src/nsCryptoHash.h 2015-04-07 10:36:18.124973899 +0200 +@@ -10,6 +10,7 @@ + #include "nsICryptoHash.h" + #include "nsICryptoHMAC.h" + #include "nsNSSShutDown.h" ++#include "prtypes.h" + #include "hasht.h" + #include "secmodt.h" + +diff -up mozilla-beta/security/manager/ssl/tests/unit/tlsserver/cmd/ClientAuthServer.cpp.prbool-fix mozilla-beta/security/manager/ssl/tests/unit/tlsserver/cmd/ClientAuthServer.cpp +--- mozilla-beta/security/manager/ssl/tests/unit/tlsserver/cmd/ClientAuthServer.cpp.prbool-fix 2015-04-07 10:36:25.065953853 +0200 ++++ mozilla-beta/security/manager/ssl/tests/unit/tlsserver/cmd/ClientAuthServer.cpp 2015-04-07 10:36:27.319947343 +0200 +@@ -15,6 +15,7 @@ + + #include + ++#include "prtypes.h" + #include "hasht.h" + #include "ScopedNSSTypes.h" + #include "ssl.h" diff --git a/SOURCES/build-nss-3.19.1.patch b/SOURCES/build-nss-3.19.1.patch deleted file mode 100644 index ae0cb00..0000000 --- a/SOURCES/build-nss-3.19.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up comm-esr31/mozilla/configure.in.nss-3.18 comm-esr31/mozilla/configure.in ---- comm-esr31/mozilla/configure.in.nss-3.18 2015-07-15 12:11:13.745268957 +0200 -+++ comm-esr31/mozilla/configure.in 2015-07-15 12:11:32.630243688 +0200 -@@ -3655,7 +3655,7 @@ MOZ_ARG_WITH_BOOL(system-nss, - _USE_SYSTEM_NSS=1 ) - - if test -n "$_USE_SYSTEM_NSS"; then -- AM_PATH_NSS(3.19.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) -+ AM_PATH_NSS(3.19.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) - fi - - if test -n "$MOZ_NATIVE_NSS"; then diff --git a/SOURCES/build-werror.patch b/SOURCES/build-werror.patch new file mode 100644 index 0000000..262337c --- /dev/null +++ b/SOURCES/build-werror.patch @@ -0,0 +1,11 @@ +diff -up firefox-32.0/mozilla-release/media/libstagefright/moz.build.old firefox-32.0/mozilla-release/media/libstagefright/moz.build +--- firefox-32.0/mozilla-release/media/libstagefright/moz.build.old 2014-08-26 05:38:08.000000000 +0200 ++++ firefox-32.0/mozilla-release/media/libstagefright/moz.build 2014-08-27 15:40:12.030299348 +0200 +@@ -120,7 +120,6 @@ elif CONFIG['GNU_CXX']: + '-Wno-sign-compare' + ] + CXXFLAGS += [ +- '-Wno-format', + '-Wno-multichar', + '-Wno-sign-compare', + '-Wno-unused', diff --git a/SOURCES/firefox-nss-3.19.1.patch b/SOURCES/firefox-nss-3.19.1.patch new file mode 100644 index 0000000..53c8426 --- /dev/null +++ b/SOURCES/firefox-nss-3.19.1.patch @@ -0,0 +1,12 @@ +diff -up mozilla-esr38/configure.in.nss-3.19.0 mozilla-esr38/configure.in +--- mozilla-esr38/configure.in.nss-3.19.0 2015-06-25 10:36:40.205019840 +0200 ++++ mozilla-esr38/configure.in 2015-06-25 11:58:46.859155245 +0200 +@@ -3627,7 +3627,7 @@ MOZ_ARG_WITH_BOOL(system-nss, + _USE_SYSTEM_NSS=1 ) + + if test -n "$_USE_SYSTEM_NSS"; then +- AM_PATH_NSS(3.19.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.19.1, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + + if test -n "$MOZ_NATIVE_NSS"; then diff --git a/SOURCES/firefox-ppc64le.patch b/SOURCES/firefox-ppc64le.patch new file mode 100644 index 0000000..6465eec --- /dev/null +++ b/SOURCES/firefox-ppc64le.patch @@ -0,0 +1,28 @@ +diff -up firefox-36.0/mozilla-release/gfx/skia/trunk/include/core/SkPreConfig.h.ppc64le firefox-36.0/mozilla-release/gfx/skia/trunk/include/core/SkPreConfig.h +--- firefox-36.0/mozilla-release/gfx/skia/trunk/include/core/SkPreConfig.h.ppc64le 2015-02-20 03:01:40.000000000 +0100 ++++ firefox-36.0/mozilla-release/gfx/skia/trunk/include/core/SkPreConfig.h 2015-03-06 15:52:58.298050379 +0100 +@@ -90,6 +90,13 @@ + #endif + + ////////////////////////////////////////////////////////////////////// ++#if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN) ++ #if defined(__BIG_ENDIAN__) ++ #define SK_CPU_BENDIAN ++ #elif defined(__LITTLE_ENDIAN__) ++ #define SK_CPU_LENDIAN ++ #endif ++#endif + + #if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN) + #if defined(__sparc) || defined(__sparc__) || \ +diff -up firefox-36.0/mozilla-release/js/src/jsdtoa.cpp.ppc64le firefox-36.0/mozilla-release/js/src/jsdtoa.cpp +--- firefox-36.0/mozilla-release/js/src/jsdtoa.cpp.ppc64le 2015-02-20 03:01:49.000000000 +0100 ++++ firefox-36.0/mozilla-release/js/src/jsdtoa.cpp 2015-03-06 15:54:38.348048226 +0100 +@@ -52,6 +52,7 @@ static inline void dtoa_free(void* p) { + #define MALLOC dtoa_malloc + #define FREE dtoa_free + #include "dtoa.c" ++#undef CONST + + /* Mapping of JSDToStrMode -> js_dtoa mode */ + static const uint8_t dtoaModes[] = { diff --git a/SOURCES/mklangsource.sh b/SOURCES/mklangsource.sh new file mode 100755 index 0000000..cadb6af --- /dev/null +++ b/SOURCES/mklangsource.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# This checks out and builds the language sources. The lightning source needs +# to already be unpacked +#lver=`awk '/^%global *lightning_ver/ { print $3; exit }' thunderbird.spec` +tbver=`awk '/^Version:/ { print $2; exit }' thunderbird.spec` +#tag=CALENDAR_${lver//./_}_RELEASE +tag=THUNDERBIRD_${tbver//./_}_RELEASE +branch=`awk '/^%define *tarballdir/ { print $3; exit }' thunderbird.spec` +locales=$PWD/thunderbird-${tbver}/${branch}/calendar/locales/shipped-locales +#locales=$PWD/shipped-locales +if [ ! -f $locales ] +then + echo "ERROR: missing $locales, try fedpkg prep first" + exit 1 +fi +[ ! -d l10n ] && mkdir l10n +cd l10n +for lang in $(<$locales) +do + if [ -d $lang ] + then + pushd $lang + hg pull + hg update $tag + popd + else + hg clone -u $tag http://hg.mozilla.org/releases/l10n/mozilla-release/$lang + fi +done + +# Tar up, minus the mercurial files +cd .. +rm -f l10n-${lver}.tar.bz2 +tar cjf l10n-lightning-${tbver}.tar.bz2 --exclude='.hg*' l10n diff --git a/SOURCES/mozilla-1005535.patch b/SOURCES/mozilla-1005535.patch new file mode 100644 index 0000000..2f0381b --- /dev/null +++ b/SOURCES/mozilla-1005535.patch @@ -0,0 +1,194 @@ +# HG changeset patch +# Parent b7eb1ce0237d6125b75bc8ff1cb3afc328d6e78c +# User Steve Singer +Bug 1005535 - Get skia GPU building on big endian. + +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -8231,21 +8231,21 @@ dnl Skia + dnl ======================================================== + if test "$MOZ_ENABLE_SKIA"; then + AC_DEFINE(MOZ_ENABLE_SKIA) + AC_DEFINE(USE_SKIA) + if test "${MOZ_WIDGET_TOOLKIT}" = "android" -o x"$MOZ_WIDGET_TOOLKIT" = x"gonk"; then + AC_DEFINE(SK_BUILD_FOR_ANDROID_NDK) + fi + +- if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then ++# if test "${CPU_ARCH}" != "ppc" -a "${CPU_ARCH}" != "ppc64" -a "${CPU_ARCH}" != "sparc" -a -z "$MOZ_DISABLE_SKIA_GPU" ; then + MOZ_ENABLE_SKIA_GPU=1 + AC_DEFINE(USE_SKIA_GPU) + AC_SUBST(MOZ_ENABLE_SKIA_GPU) +- fi ++# fi + fi + AC_SUBST(MOZ_ENABLE_SKIA) + + dnl ======================================================== + dnl disable xul + dnl ======================================================== + MOZ_ARG_DISABLE_BOOL(xul, + [ --disable-xul Disable XUL], +diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py +--- a/gfx/skia/generate_mozbuild.py ++++ b/gfx/skia/generate_mozbuild.py +@@ -236,17 +236,17 @@ def generate_separated_sources(platform_ + return True + + return False + + separated = { + 'common': { + #'trunk/src/effects/gradients/SkGradientTileProc.cpp', + 'trunk/src/gpu/gl/GrGLCreateNativeInterface_none.cpp', +- 'trunk/src/ports/SkDiscardableMemory_none.cpp', ++ #'trunk/src/ports/SkDiscardableMemory_none.cpp', + 'trunk/src/ports/SkImageDecoder_empty.cpp', + 'trunk/src/ports/SkMemory_mozalloc.cpp', + # 'trunk/src/images/SkImages.cpp', + # 'trunk/src/images/SkImageRef.cpp', + # 'trunk/src/images/SkImageRef_GlobalPool.cpp', + # 'trunk/src/images/SkImageRefPool.cpp', + # 'trunk/src/images/SkImageDecoder.cpp', + # 'trunk/src/images/SkImageDecoder_Factory.cpp', +diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build +--- a/gfx/skia/moz.build ++++ b/gfx/skia/moz.build +@@ -847,17 +847,16 @@ else: + 'trunk/src/opts/SkBitmapProcState_opts_none.cpp', + 'trunk/src/opts/SkBlitMask_opts_none.cpp', + 'trunk/src/opts/SkBlitRow_opts_none.cpp', + 'trunk/src/opts/SkBlurImage_opts_none.cpp', + 'trunk/src/opts/SkMorphology_opts_none.cpp', + 'trunk/src/opts/SkTextureCompression_opts_none.cpp', + 'trunk/src/opts/SkUtils_opts_none.cpp', + 'trunk/src/opts/SkXfermode_opts_none.cpp', +- 'trunk/src/ports/SkDiscardableMemory_none.cpp', + ] + + + # can we find a better way of dealing with asm sources? + + # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with + if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']: + SOURCES += [ +diff --git a/gfx/skia/trunk/include/config/SkUserConfig.h b/gfx/skia/trunk/include/config/SkUserConfig.h +--- a/gfx/skia/trunk/include/config/SkUserConfig.h ++++ b/gfx/skia/trunk/include/config/SkUserConfig.h +@@ -192,16 +192,17 @@ + + #if defined(SK_CPU_ARM32) || defined(SK_CPU_ARM64) + # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_arm.h" + #else + # define SK_BARRIERS_PLATFORM_H "skia/SkBarriers_x86.h" + #endif + + // On all platforms we have this byte order ++ + #define SK_A32_SHIFT 24 + #define SK_R32_SHIFT 16 + #define SK_G32_SHIFT 8 + #define SK_B32_SHIFT 0 + + #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0 + + #define SK_SUPPORT_LEGACY_GETDEVICE +diff --git a/gfx/skia/trunk/include/core/SkColorPriv.h b/gfx/skia/trunk/include/core/SkColorPriv.h +--- a/gfx/skia/trunk/include/core/SkColorPriv.h ++++ b/gfx/skia/trunk/include/core/SkColorPriv.h +@@ -27,37 +27,27 @@ + * For easier compatibility with Skia's GPU backend, we further restrict these + * to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does + * not directly correspond to the same shift-order, since we have to take endianess + * into account. + * + * Here we enforce this constraint. + */ + +-#ifdef SK_CPU_BENDIAN +- #define SK_RGBA_R32_SHIFT 24 +- #define SK_RGBA_G32_SHIFT 16 +- #define SK_RGBA_B32_SHIFT 8 +- #define SK_RGBA_A32_SHIFT 0 + +- #define SK_BGRA_B32_SHIFT 24 +- #define SK_BGRA_G32_SHIFT 16 +- #define SK_BGRA_R32_SHIFT 8 +- #define SK_BGRA_A32_SHIFT 0 +-#else + #define SK_RGBA_R32_SHIFT 0 + #define SK_RGBA_G32_SHIFT 8 + #define SK_RGBA_B32_SHIFT 16 + #define SK_RGBA_A32_SHIFT 24 + + #define SK_BGRA_B32_SHIFT 0 + #define SK_BGRA_G32_SHIFT 8 + #define SK_BGRA_R32_SHIFT 16 + #define SK_BGRA_A32_SHIFT 24 +-#endif ++ + + #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA) + #error "can't define PMCOLOR to be RGBA and BGRA" + #endif + + #define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA \ + (SK_A32_SHIFT == SK_RGBA_A32_SHIFT && \ + SK_R32_SHIFT == SK_RGBA_R32_SHIFT && \ +diff --git a/gfx/skia/trunk/include/core/SkImageInfo.h b/gfx/skia/trunk/include/core/SkImageInfo.h +--- a/gfx/skia/trunk/include/core/SkImageInfo.h ++++ b/gfx/skia/trunk/include/core/SkImageInfo.h +@@ -83,19 +83,20 @@ enum SkColorType { + + kLastEnum_SkColorType = kIndex_8_SkColorType, + + #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) + kN32_SkColorType = kBGRA_8888_SkColorType, + #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) + kN32_SkColorType = kRGBA_8888_SkColorType, + #else +-#error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order" ++ kN32_SkColorType = kBGRA_8888_SkColorType + #endif + ++ + #ifdef SK_SUPPORT_LEGACY_N32_NAME + kPMColor_SkColorType = kN32_SkColorType + #endif + }; + + static int SkColorTypeBytesPerPixel(SkColorType ct) { + static const uint8_t gSize[] = { + 0, // Unknown +diff --git a/gfx/skia/trunk/include/gpu/GrTypes.h b/gfx/skia/trunk/include/gpu/GrTypes.h +--- a/gfx/skia/trunk/include/gpu/GrTypes.h ++++ b/gfx/skia/trunk/include/gpu/GrTypes.h +@@ -304,25 +304,23 @@ enum GrPixelConfig { + * Byte order is r, g, b, a. This color format is 32 bits per channel + */ + kRGBA_float_GrPixelConfig, + kLast_GrPixelConfig = kRGBA_float_GrPixelConfig + }; + static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1; + + // Aliases for pixel configs that match skia's byte order. +-#ifndef SK_CPU_LENDIAN +- #error "Skia gpu currently assumes little endian" +-#endif ++ + #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) + static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; + #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) + static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig; + #else +- #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format." ++ static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig; + #endif + + // Returns true if the pixel config is a GPU-specific compressed format + // representation. + static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) { + switch (config) { + case kETC1_GrPixelConfig: + case kLATC_GrPixelConfig: diff --git a/SOURCES/mozilla-1129859-dictfix2.patch b/SOURCES/mozilla-1129859-dictfix2.patch deleted file mode 100644 index c45ac19..0000000 --- a/SOURCES/mozilla-1129859-dictfix2.patch +++ /dev/null @@ -1,419 +0,0 @@ -# HG changeset patch -# Parent 58ce6051edf56ce70c1a62e88bd879a6e56d9239 -# User Jan Horak -# Bug 1129859 - Always use '-' as separator between lang-region in dictionary names, fixes problems with system dictionaries which has '_' as separator -try: -b do -p all -u all -t none - -diff --git a/editor/composer/nsEditorSpellCheck.cpp b/editor/composer/nsEditorSpellCheck.cpp ---- a/editor/composer/nsEditorSpellCheck.cpp -+++ b/editor/composer/nsEditorSpellCheck.cpp -diff --git a/extensions/spellcheck/hunspell/src/mozHunspell.cpp b/extensions/spellcheck/hunspell/src/mozHunspell.cpp ---- a/extensions/spellcheck/hunspell/src/mozHunspell.cpp -+++ b/extensions/spellcheck/hunspell/src/mozHunspell.cpp -@@ -485,16 +485,19 @@ mozHunspell::LoadDictionariesFromDir(nsI - rv = file->Exists(&check); - if (NS_FAILED(rv) || !check) - continue; - - #ifdef DEBUG_bsmedberg - printf("Adding dictionary: %s\n", NS_ConvertUTF16toUTF8(dict).get()); - #endif - -+ // Replace '_' separator with '-' -+ dict.ReplaceChar("_", '-'); -+ - mDictionaries.Put(dict, file); - } - - return NS_OK; - } - - nsresult mozHunspell::ConvertCharset(const char16_t* aStr, char ** aDst) - { -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.aff b/extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.dic b/extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.sug b/extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.sug -rename from extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.sug -rename to extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.sug -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.test b/extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.test -rename from extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.test -rename to extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.wrong b/extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/1463589_utf.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/1463589-utf.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.aff b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.dic b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.good b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.good -rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.good -rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.sug b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.sug -rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.sug -rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.sug -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.test b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.test -rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.test -rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.wrong b/extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/allcaps_utf.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/allcaps-utf.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.aff b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.dic b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.good b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.good -rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.good -rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.sug b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.sug -rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.sug -rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.sug -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.test b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.test -rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.test -rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/base_utf.wrong b/extensions/spellcheck/hunspell/tests/unit/data/base-utf.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/base_utf.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/base-utf.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.aff b/extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.dic b/extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.test b/extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.test -rename from extensions/spellcheck/hunspell/tests/unit/data/colons_in_words.test -rename to extensions/spellcheck/hunspell/tests/unit/data/colons-in-words.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/condition_utf.aff b/extensions/spellcheck/hunspell/tests/unit/data/condition-utf.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/condition_utf.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/condition-utf.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/condition_utf.dic b/extensions/spellcheck/hunspell/tests/unit/data/condition-utf.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/condition_utf.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/condition-utf.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/condition_utf.good b/extensions/spellcheck/hunspell/tests/unit/data/condition-utf.good -rename from extensions/spellcheck/hunspell/tests/unit/data/condition_utf.good -rename to extensions/spellcheck/hunspell/tests/unit/data/condition-utf.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/condition_utf.test b/extensions/spellcheck/hunspell/tests/unit/data/condition-utf.test -rename from extensions/spellcheck/hunspell/tests/unit/data/condition_utf.test -rename to extensions/spellcheck/hunspell/tests/unit/data/condition-utf.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/condition_utf.wrong b/extensions/spellcheck/hunspell/tests/unit/data/condition-utf.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/condition_utf.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/condition-utf.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.aff b/extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.dic b/extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.test b/extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.test -rename from extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.test -rename to extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.wrong b/extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/digits_in_words.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/digits-in-words.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.aff b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.dic b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.good b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.good -rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.good -rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.sug b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.sug -rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.sug -rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.sug -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.test b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.test -rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.test -rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.wrong b/extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/ngram_utf_fix.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/ngram-utf-fix.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.aff b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.dic b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.good b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.good -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.good -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.test b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.test -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.test -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.wrong b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.aff b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.dic b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.good b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.good -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.good -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.test b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.test -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.test -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.wrong b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_cpdpat2.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-cpdpat2.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.aff b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.dic b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.good b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.good -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.good -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.sug b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.sug -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.sug -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.sug -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.test b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.test -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.test -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.wrong b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword1.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword1.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.aff b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.dic b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.good b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.good -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.good -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.sug b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.sug -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.sug -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.sug -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.test b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.test -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.test -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.wrong b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_forbiddenword2.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-forbiddenword2.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.aff b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.dic b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.good b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.good -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.good -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.sug b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.sug -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.sug -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.sug -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.test b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.test -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.test -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.wrong b/extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/opentaal_keepcase.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/opentaal-keepcase.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.aff b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.dic b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.good b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.good -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.good -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.test b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.test -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom.test -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.aff b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.dic b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.good b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.good -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.good -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.test b/extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.test -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_bom2.test -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-bom2.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.aff b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.aff -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.aff -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.aff -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.dic b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.dic -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.dic -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.dic -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.good b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.good -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.good -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.good -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.sug b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.sug -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.sug -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.sug -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.test b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.test -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.test -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.test -diff --git a/extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.wrong b/extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.wrong -rename from extensions/spellcheck/hunspell/tests/unit/data/utf8_nonbmp.wrong -rename to extensions/spellcheck/hunspell/tests/unit/data/utf8-nonbmp.wrong -diff --git a/extensions/spellcheck/hunspell/tests/unit/test_hunspell.js b/extensions/spellcheck/hunspell/tests/unit/test_hunspell.js ---- a/extensions/spellcheck/hunspell/tests/unit/test_hunspell.js -+++ b/extensions/spellcheck/hunspell/tests/unit/test_hunspell.js -@@ -3,21 +3,21 @@ - */ - - const Cc = Components.classes; - const Ci = Components.interfaces; - - const tests = [ - ["affixes", "iso-8859-1"], - ["condition", "iso-8859-1"], -- ["condition_utf", "UTF-8"], -+ ["condition-utf", "UTF-8"], - ["base", "iso-8859-1"], -- ["base_utf", "UTF-8"], -+ ["base-utf", "UTF-8"], - ["allcaps", "iso-8859-1"], -- ["allcaps_utf", "UTF-8"], -+ ["allcaps-utf", "UTF-8"], - ["allcaps2", "iso-8859-1"], - ["allcaps3", "iso-8859-1"], - ["keepcase", "iso-8859-1"], - ["i58202", "iso-8859-1"], - ["map", "iso-8859-1"], - ["rep", "iso-8859-1"], - ["sug", "iso-8859-1"], - ["sugutf", "UTF-8"], -@@ -43,19 +43,19 @@ const tests = [ - ["fogemorpheme", "iso-8859-1"], - ["onlyincompound", "iso-8859-1"], - ["complexprefixes", "iso-8859-1"], - ["complexprefixes2", "iso-8859-1"], - ["complexprefixesutf", "UTF-8"], - ["conditionalprefix", "iso-8859-1"], - ["zeroaffix", "iso-8859-1"], - ["utf8", "UTF-8"], -- ["utf8_bom", "UTF-8", {1: "todo"}], -- ["utf8_bom2", "UTF-8", {1: "todo"}], -- ["utf8_nonbmp", "UTF-8", {1: "todo", 2: "todo", 3: "todo", 4: "todo"}], -+ ["utf8-bom", "UTF-8", {1: "todo"}], -+ ["utf8-bom2", "UTF-8", {1: "todo"}], -+ ["utf8-nonbmp", "UTF-8", {1: "todo", 2: "todo", 3: "todo", 4: "todo"}], - ["compoundflag", "iso-8859-1"], - ["compoundrule", "iso-8859-1"], - ["compoundrule2", "iso-8859-1"], - ["compoundrule3", "iso-8859-1"], - ["compoundrule4", "iso-8859-1"], - ["compoundrule5", "UTF-8"], - ["compoundrule6", "iso-8859-1"], - ["compoundrule7", "iso-8859-1"], -@@ -86,43 +86,43 @@ const tests = [ - ["reputf", "UTF-8"], - ["ignore", "iso-8859-1"], - ["ignoreutf", "UTF-8", - {1: "todo", 2: "todo", 3: "todo", 4: "todo", 5: "todo", 6: "todo", - 7: "todo", 8: "todo"}], - ["1592880", "iso-8859-1"], - ["1695964", "iso-8859-1"], - ["1463589", "iso-8859-1"], -- ["1463589_utf", "UTF-8"], -+ ["1463589-utf", "UTF-8"], - ["IJ", "iso-8859-1"], - ["i68568", "iso-8859-1"], - ["i68568utf", "UTF-8"], - ["1706659", "iso-8859-1"], -- ["digits_in_words", "iso-8859-1"], --// ["colons_in_words", "iso-8859-1"], Suggestion test only -- ["ngram_utf_fix", "UTF-8"], -+ ["digits-in-words", "iso-8859-1"], -+// ["colons-in-words", "iso-8859-1"], Suggestion test only -+ ["ngram-utf-fix", "UTF-8"], - ["morph", "us-ascii", - {11: "todo", 12: "todo", 13: "todo", 14: "todo", 15: "todo", 16: "todo", - 17: "todo", 18: "todo", 19: "todo", 20: "todo", 21: "todo", 22: "todo", - 23: "todo", 24: "todo", 25: "todo", 26: "todo", 27: "todo"}], - ["1975530", "UTF-8"], - ["fullstrip", "iso-8859-1"], - ["iconv", "UTF-8"], - ["oconv", "UTF-8"], - ["encoding", "iso-8859-1", {1: "todo", 3: "todo"}], - ["korean", "UTF-8"], -- ["opentaal_forbiddenword1", "UTF-8"], -- ["opentaal_forbiddenword2", "UTF-8"], -- ["opentaal_keepcase", "UTF-8"], -+ ["opentaal-forbiddenword1", "UTF-8"], -+ ["opentaal-forbiddenword2", "UTF-8"], -+ ["opentaal-keepcase", "UTF-8"], - ["arabic", "UTF-8"], - ["2970240", "iso-8859-1"], - ["2970242", "iso-8859-1"], - ["breakoff", "iso-8859-1"], -- ["opentaal_cpdpat", "iso-8859-1"], -- ["opentaal_cpdpat2", "iso-8859-1"], -+ ["opentaal-cpdpat", "iso-8859-1"], -+ ["opentaal-cpdpat2", "iso-8859-1"], - ["2999225", "iso-8859-1"], - ["onlyincompound2", "iso-8859-1"], - ["forceucase", "iso-8859-1"], - ["warn", "iso-8859-1"] - ]; - - function do_get_file_by_line(file, charset) { - dump("getting file by line for file " + file.path + "\n"); -diff --git a/extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xul b/extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xul ---- a/extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xul -+++ b/extensions/spellcheck/tests/chrome/test_add_remove_dictionaries.xul -@@ -63,26 +63,26 @@ function RunTest() { - ok(map.exists()); - hunspell.addDirectory(map); - - Components.utils.import("resource://gre/modules/AsyncSpellCheckTestHelper.jsm"); - onSpellCheck(textbox, function () { - - // test that base and map dictionaries are available - var dicts = getDictionaryList(editor); -- isnot(dicts.indexOf("base_utf"), -1, "base is available"); -+ isnot(dicts.indexOf("base-utf"), -1, "base is available"); - isnot(dicts.indexOf("maputf"), -1, "map is available"); - - // select base dictionary -- setCurrentDictionary(editor, "base_utf"); -+ setCurrentDictionary(editor, "base-utf"); - - onSpellCheck(textbox, function () { - // test that base dictionary is in use - is(getMisspelledWords(editor), "Frühstück" + "qwertyu", "base misspellings"); -- is(getCurrentDictionary(editor), "base_utf", "current dictionary"); -+ is(getCurrentDictionary(editor), "base-utf", "current dictionary"); - - // select map dictionary - setCurrentDictionary(editor, "maputf"); - - onSpellCheck(textbox, function () { - // test that map dictionary is in use - is(getMisspelledWords(editor), "created" + "imply" + "tomorrow" + "qwertyu", "map misspellings"); - is(getCurrentDictionary(editor), "maputf", "current dictionary"); -@@ -92,17 +92,17 @@ function RunTest() { - - onSpellCheck(textbox, function () { - // test that map dictionary is not in use - isnot(getMisspelledWords(editor), "created" + "imply" + "tomorrow" + "qwertyu", "map misspellings"); - isnot(getCurrentDictionary(editor), "maputf", "current dictionary"); - - // test that base dictionary is available and map dictionary is unavailable - var dicts = getDictionaryList(editor); -- isnot(dicts.indexOf("base_utf"), -1, "base is available"); -+ isnot(dicts.indexOf("base-utf"), -1, "base is available"); - is(dicts.indexOf("maputf"), -1, "map is unavailable"); - - // uninstall base dictionary - hunspell.removeDirectory(base); - - onSpellCheck(textbox, function () { - SimpleTest.finish(); - }); diff --git a/SOURCES/mozilla-858919.patch b/SOURCES/mozilla-858919.patch deleted file mode 100644 index 6e62b81..0000000 --- a/SOURCES/mozilla-858919.patch +++ /dev/null @@ -1,272 +0,0 @@ -# HG changeset patch -# Parent b17cad2d1e5e6bcb5a10096d51d07ea8a79b6921 -# User Martin Stransky -Bug 858919 - Add support for libnotify calls which was removed for new notification API. r=karlt - -diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build ---- a/toolkit/system/gnome/moz.build -+++ b/toolkit/system/gnome/moz.build -@@ -1,15 +1,17 @@ - # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- - # vim: set filetype=python: - # This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - SOURCES += [ -+ 'nsAlertsIconListener.cpp', -+ 'nsAlertsService.cpp', - 'nsGnomeModule.cpp', - ] - - if CONFIG['MOZ_ENABLE_GCONF']: - SOURCES += [ - 'nsGConfService.cpp', - ] - -diff --git a/toolkit/system/gnome/nsAlertsIconListener.h b/toolkit/system/gnome/nsAlertsIconListener.h -new file mode 100644 ---- /dev/null -+++ b/toolkit/system/gnome/nsAlertsIconListener.h -@@ -0,0 +1,89 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef nsAlertsIconListener_h__ -+#define nsAlertsIconListener_h__ -+ -+#include "nsCOMPtr.h" -+#include "imgINotificationObserver.h" -+#include "nsStringAPI.h" -+#include "nsIObserver.h" -+#include "nsWeakReference.h" -+ -+#include -+ -+class imgIRequest; -+ -+struct NotifyNotification; -+ -+class nsAlertsIconListener : public imgINotificationObserver, -+ public nsIObserver, -+ public nsSupportsWeakReference -+{ -+public: -+ NS_DECL_ISUPPORTS -+ NS_DECL_IMGINOTIFICATIONOBSERVER -+ NS_DECL_NSIOBSERVER -+ -+ nsAlertsIconListener(); -+ -+ nsresult InitAlertAsync(const nsAString & aImageUrl, -+ const nsAString & aAlertTitle, -+ const nsAString & aAlertText, -+ bool aAlertTextClickable, -+ const nsAString & aAlertCookie, -+ nsIObserver * aAlertListener); -+ -+ void SendCallback(); -+ void SendClosed(); -+ -+protected: -+ virtual ~nsAlertsIconListener(); -+ -+ nsresult OnStopRequest(imgIRequest* aRequest); -+ nsresult OnStopFrame(imgIRequest* aRequest); -+ -+ /** -+ * The only difference between libnotify.so.4 and libnotify.so.1 for these symbols -+ * is that notify_notification_new takes three arguments in libnotify.so.4 and -+ * four in libnotify.so.1. -+ * Passing the fourth argument as NULL is binary compatible. -+ */ -+ typedef void (*NotifyActionCallback)(NotifyNotification*, char*, gpointer); -+ typedef bool (*notify_is_initted_t)(void); -+ typedef bool (*notify_init_t)(const char*); -+ typedef GList* (*notify_get_server_caps_t)(void); -+ typedef NotifyNotification* (*notify_notification_new_t)(const char*, const char*, const char*, const char*); -+ typedef bool (*notify_notification_show_t)(void*, char*); -+ typedef void (*notify_notification_set_icon_from_pixbuf_t)(void*, GdkPixbuf*); -+ typedef void (*notify_notification_add_action_t)(void*, const char*, const char*, NotifyActionCallback, gpointer, GFreeFunc); -+ -+ nsCOMPtr mIconRequest; -+ nsCString mAlertTitle; -+ nsCString mAlertText; -+ -+ nsCOMPtr mAlertListener; -+ nsString mAlertCookie; -+ -+ bool mLoadedFrame; -+ bool mAlertHasAction; -+ -+ static void* libNotifyHandle; -+ static bool libNotifyNotAvail; -+ static notify_is_initted_t notify_is_initted; -+ static notify_init_t notify_init; -+ static notify_get_server_caps_t notify_get_server_caps; -+ static notify_notification_new_t notify_notification_new; -+ static notify_notification_show_t notify_notification_show; -+ static notify_notification_set_icon_from_pixbuf_t notify_notification_set_icon_from_pixbuf; -+ static notify_notification_add_action_t notify_notification_add_action; -+ NotifyNotification* mNotification; -+ gulong mClosureHandler; -+ -+ nsresult StartRequest(const nsAString & aImageUrl); -+ nsresult ShowAlert(GdkPixbuf* aPixbuf); -+}; -+ -+#endif -diff --git a/toolkit/system/gnome/nsAlertsService.cpp b/toolkit/system/gnome/nsAlertsService.cpp -new file mode 100644 ---- /dev/null -+++ b/toolkit/system/gnome/nsAlertsService.cpp -@@ -0,0 +1,53 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode:nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#include "nsXULAppAPI.h" -+#include "nsAlertsService.h" -+#include "nsAlertsIconListener.h" -+#include "nsAutoPtr.h" -+ -+NS_IMPL_ADDREF(nsAlertsService) -+NS_IMPL_RELEASE(nsAlertsService) -+ -+NS_INTERFACE_MAP_BEGIN(nsAlertsService) -+ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAlertsService) -+ NS_INTERFACE_MAP_ENTRY(nsIAlertsService) -+NS_INTERFACE_MAP_END_THREADSAFE -+ -+nsAlertsService::nsAlertsService() -+{ -+} -+ -+nsAlertsService::~nsAlertsService() -+{} -+ -+nsresult -+nsAlertsService::Init() -+{ -+ return NS_OK; -+} -+ -+NS_IMETHODIMP nsAlertsService::ShowAlertNotification(const nsAString & aImageUrl, const nsAString & aAlertTitle, -+ const nsAString & aAlertText, bool aAlertTextClickable, -+ const nsAString & aAlertCookie, -+ nsIObserver * aAlertListener, -+ const nsAString & aAlertName, -+ const nsAString & aBidi, -+ const nsAString & aLang, -+ nsIPrincipal * aPrincipal) -+{ -+ nsRefPtr alertListener = new nsAlertsIconListener(); -+ if (!alertListener) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ return alertListener->InitAlertAsync(aImageUrl, aAlertTitle, aAlertText, aAlertTextClickable, -+ aAlertCookie, aAlertListener); -+} -+ -+NS_IMETHODIMP nsAlertsService::CloseAlert(const nsAString& aAlertName, -+ nsIPrincipal* aPrincipal) -+{ -+ return NS_ERROR_NOT_IMPLEMENTED; -+} -diff --git a/toolkit/system/gnome/nsAlertsService.h b/toolkit/system/gnome/nsAlertsService.h -new file mode 100644 ---- /dev/null -+++ b/toolkit/system/gnome/nsAlertsService.h -@@ -0,0 +1,27 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -+/* This Source Code Form is subject to the terms of the Mozilla Public -+ * License, v. 2.0. If a copy of the MPL was not distributed with this -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifndef nsAlertsService_h__ -+#define nsAlertsService_h__ -+ -+#include "nsIAlertsService.h" -+#include "nsCOMPtr.h" -+ -+class nsAlertsService : public nsIAlertsService -+{ -+public: -+ NS_DECL_NSIALERTSSERVICE -+ NS_DECL_ISUPPORTS -+ -+ nsAlertsService(); -+ -+ nsresult Init(); -+ -+protected: -+ virtual ~nsAlertsService(); -+ -+}; -+ -+#endif /* nsAlertsService_h__ */ -diff --git a/toolkit/system/gnome/nsGnomeModule.cpp b/toolkit/system/gnome/nsGnomeModule.cpp ---- a/toolkit/system/gnome/nsGnomeModule.cpp -+++ b/toolkit/system/gnome/nsGnomeModule.cpp -@@ -17,53 +17,58 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGC - NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGnomeVFSService, Init) - #endif - #ifdef MOZ_ENABLE_GIO - #include "nsGIOService.h" - #include "nsGSettingsService.h" - NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIOService) - NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGSettingsService, Init) - #endif -+#include "nsAlertsService.h" -+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAlertsService, Init) - - #ifdef MOZ_ENABLE_GCONF - NS_DEFINE_NAMED_CID(NS_GCONFSERVICE_CID); - #endif - #ifdef MOZ_ENABLE_GNOMEVFS - NS_DEFINE_NAMED_CID(NS_GNOMEVFSSERVICE_CID); - #endif - #ifdef MOZ_ENABLE_GIO - NS_DEFINE_NAMED_CID(NS_GIOSERVICE_CID); - NS_DEFINE_NAMED_CID(NS_GSETTINGSSERVICE_CID); - #endif -+NS_DEFINE_NAMED_CID(NS_SYSTEMALERTSSERVICE_CID); - - static const mozilla::Module::CIDEntry kGnomeCIDs[] = { - #ifdef MOZ_ENABLE_GCONF - { &kNS_GCONFSERVICE_CID, false, nullptr, nsGConfServiceConstructor }, - #endif - #ifdef MOZ_ENABLE_GNOMEVFS - { &kNS_GNOMEVFSSERVICE_CID, false, nullptr, nsGnomeVFSServiceConstructor }, - #endif - #ifdef MOZ_ENABLE_GIO - { &kNS_GIOSERVICE_CID, false, nullptr, nsGIOServiceConstructor }, - { &kNS_GSETTINGSSERVICE_CID, false, nullptr, nsGSettingsServiceConstructor }, - #endif -+ { &kNS_SYSTEMALERTSSERVICE_CID, false, nullptr, nsAlertsServiceConstructor }, - { nullptr } - }; - - static const mozilla::Module::ContractIDEntry kGnomeContracts[] = { - #ifdef MOZ_ENABLE_GCONF - { NS_GCONFSERVICE_CONTRACTID, &kNS_GCONFSERVICE_CID }, - #endif - #ifdef MOZ_ENABLE_GNOMEVFS - { NS_GNOMEVFSSERVICE_CONTRACTID, &kNS_GNOMEVFSSERVICE_CID }, - #endif - #ifdef MOZ_ENABLE_GIO - { NS_GIOSERVICE_CONTRACTID, &kNS_GIOSERVICE_CID }, - { NS_GSETTINGSSERVICE_CONTRACTID, &kNS_GSETTINGSSERVICE_CID }, - #endif -+ { NS_SYSTEMALERTSERVICE_CONTRACTID, &kNS_SYSTEMALERTSSERVICE_CID }, - { nullptr } - }; - - static nsresult - InitGType () - { - g_type_init(); - return NS_OK; diff --git a/SOURCES/ppc64le-build.patch b/SOURCES/ppc64le-build.patch index 5802580..2afc328 100644 --- a/SOURCES/ppc64le-build.patch +++ b/SOURCES/ppc64le-build.patch @@ -1,1966 +1,11 @@ -From 3480f36d80a89e0b337b1eef7641a1975f4b15fd Mon Sep 17 00:00:00 2001 -From: Gustavo Luiz Duarte -Date: Fri, 11 Apr 2014 13:07:49 -0500 -Subject: [PATCH 1/4] ppc64le build support - ---- - ldap/sdks/c-sdk/config/autoconf/config.guess | 637 +++++++++++++++------------ - ldap/sdks/c-sdk/config/autoconf/config.sub | 459 +++++++++++++------ - mozilla/build/autoconf/config.guess | 499 +++++++++++---------- - mozilla/build/autoconf/config.sub | 305 ++++++++----- - mozilla/configure.in | 2 +- - mozilla/js/src/build/autoconf/config.guess | 499 +++++++++++---------- - mozilla/js/src/build/autoconf/config.sub | 305 ++++++++----- - mozilla/js/src/ctypes/libffi/config.guess | 418 ++++++++++-------- - mozilla/js/src/ctypes/libffi/config.sub | 305 ++++++++----- - 9 files changed, 2052 insertions(+), 1377 deletions(-) - -diff --git a/ldap/sdks/c-sdk/config/autoconf/config.guess b/ldap/sdks/c-sdk/config/autoconf/config.guess -index a20b311..9afd676 100644 ---- a/ldap/sdks/c-sdk/config/autoconf/config.guess -+++ b/ldap/sdks/c-sdk/config/autoconf/config.guess -@@ -1,13 +1,12 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+# Copyright 1992-2013 Free Software Foundation, Inc. - --timestamp='2005-10-13' -+timestamp='2013-11-29' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # - # This program is distributed in the hope that it will be useful, but -@@ -16,26 +15,22 @@ timestamp='2005-10-13' - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . +diff -up comm-esr38/mozilla/build/autoconf/config.guess.build-guess comm-esr38/mozilla/build/autoconf/config.guess +--- comm-esr38/mozilla/build/autoconf/config.guess.build-guess 2015-08-03 09:58:23.639750942 +0200 ++++ comm-esr38/mozilla/build/autoconf/config.guess 2015-08-03 09:58:27.581743695 +0200 +@@ -30,6 +30,7 @@ timestamp='2014-02-12' + # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- -- --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). -+# -+# Originally written by Per Bothner. - # --# This script attempts to guess a canonical system name similar to --# config.sub. If it succeeds, it prints the system name on stdout, and --# exits with 0. Otherwise, it exits with 1. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+ + # Please send patches with a ChangeLog entry to config-patches@gnu.org. ++set -x me=`echo "$0" | sed -e 's,.*/,,'` -@@ -55,8 +50,7 @@ version="\ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --Free Software Foundation, Inc. -+Copyright 1992-2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -106,7 +100,7 @@ set_cc_for_build=' - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -@@ -138,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -+case "${UNAME_SYSTEM}" in -+Linux|GNU|GNU/*) -+ # If the system lacks a compiler, then just pick glibc. -+ # We could probably try harder. -+ LIBC=gnu -+ -+ eval $set_cc_for_build -+ cat <<-EOF > $dummy.c -+ #include -+ #if defined(__UCLIBC__) -+ LIBC=uclibc -+ #elif defined(__dietlibc__) -+ LIBC=dietlibc -+ #else -+ LIBC=gnu -+ #endif -+ EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ ;; -+esac -+ - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -160,6 +175,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -168,7 +184,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -178,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -199,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -206,8 +226,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; - macppc:MirBSD:*:*) -- echo powerppc-unknown-mirbsd${UNAME_RELEASE} -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -@@ -218,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -264,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -290,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -319,14 +345,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -- i86pc:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize -@@ -370,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -456,8 +501,8 @@ EOF - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -470,7 +515,7 @@ EOF - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -527,7 +572,7 @@ EOF - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[45]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -570,52 +615,52 @@ EOF - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c - -- #define _HPUX_SOURCE -- #include -- #include -+ #define _HPUX_SOURCE -+ #include -+ #include - -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); - -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -635,7 +680,7 @@ EOF - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -- grep __LP64__ >/dev/null -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -706,22 +751,22 @@ EOF - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -745,14 +790,14 @@ EOF - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -764,33 +809,51 @@ EOF - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -- i*:MINGW*:*) -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; --#### MozillaHack --# Netscape's hacked uname -- xx:WINNT:* | xx:WIN95:*) -- echo i586-pc-msvc -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys - exit ;; --### End MozillaHack - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- x86:Interix*:[34]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -- exit ;; -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ authenticamd | genuineintel | EM64T) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we -@@ -811,182 +874,157 @@ EOF - exit ;; - *:GNU:*:*) - # the GNU system -- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland -- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ arc:Linux:*:* | arceb:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - arm*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ else -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf -+ fi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ i*86:Linux:*:*) -+ echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m32r*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; -- mips:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips -- #undef mipsel -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -- #else -- CPU= -- #endif -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -- ;; -- mips64:Linux:*:*) -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips64 -- #undef mips64el -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; -+ or1k:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-${LIBC} - exit ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -- exit ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-unknown-linux-gnu ;; -- PA8*) echo hppa2.0-unknown-linux-gnu ;; -- *) echo hppa-unknown-linux-gnu ;; -+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; -+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; -+ *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-${LIBC} -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-${LIBC} -+ exit ;; -+ ppc64le:Linux:*:*) -+ echo powerpc64le-unknown-linux-${LIBC} -+ exit ;; -+ ppcle:Linux:*:*) -+ echo powerpcle-unknown-linux-${LIBC} - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) -- echo ${UNAME_MACHINE}-ibm-linux -+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #ifdef __INTEL_COMPILER -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && { -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -- exit -- } -- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } -- ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both -@@ -994,11 +1032,11 @@ EOF - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1015,7 +1053,7 @@ EOF - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) -@@ -1030,7 +1068,7 @@ EOF - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1058,10 +1096,13 @@ EOF - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i386. -- echo i386-pc-msdosdjgpp -- exit ;; -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. -+ # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that -+ # this is a cross-build. -+ echo i586-pc-msdosdjgpp -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1096,8 +1137,18 @@ EOF - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; -@@ -1110,7 +1161,7 @@ EOF - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) -@@ -1130,20 +1181,10 @@ EOF - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; --#### MozillaHack -- *:*OpenVMS*:*:*) -- case "${UNAME_SYSTEM}" in -- POSIX_for_OpenVMS_AXP) echo alpha-dec-openvmsposix ;; -- POSIX_for_OpenVMS_VAX) echo vax-dec-openvmsposix ;; -- OpenVMS) echo alpha-dec-openvms ;; -- *) echo unknown-dec-openvms ;; -- esac -- exit ;; --#### End MozillaHack -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1169,11 +1210,11 @@ EOF - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1183,6 +1224,12 @@ EOF - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1192,6 +1239,15 @@ EOF - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; -@@ -1200,9 +1256,31 @@ EOF - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -- case $UNAME_PROCESSOR in -- unknown) UNAME_PROCESSOR=powerpc ;; -- esac -+ eval $set_cc_for_build -+ if test "$UNAME_PROCESSOR" = unknown ; then -+ UNAME_PROCESSOR=powerpc -+ fi -+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ case $UNAME_PROCESSOR in -+ i386) UNAME_PROCESSOR=x86_64 ;; -+ powerpc) UNAME_PROCESSOR=powerpc64 ;; -+ esac -+ fi -+ fi -+ elif test "$UNAME_PROCESSOR" = i386 ; then -+ # Avoid executing cc on OS X 10.9, as it ships with a stub -+ # that puts up a graphical alert prompting to install -+ # developer tools. Any system running Mac OS X 10.7 or -+ # later (Darwin 11 and later) is required to have a 64-bit -+ # processor. This is not true of the ARM version of Darwin -+ # that Apple uses in portable devices. -+ UNAME_PROCESSOR=x86_64 -+ fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) -@@ -1216,7 +1294,10 @@ EOF - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1261,13 +1342,13 @@ EOF - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1279,11 +1360,17 @@ EOF - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - -@@ -1439,9 +1526,9 @@ This script, last modified $timestamp, has failed to recognize - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - and -- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be -diff --git a/ldap/sdks/c-sdk/config/autoconf/config.sub b/ldap/sdks/c-sdk/config/autoconf/config.sub -index 4900684..ece8142 100644 ---- a/ldap/sdks/c-sdk/config/autoconf/config.sub -+++ b/ldap/sdks/c-sdk/config/autoconf/config.sub -@@ -1,43 +1,40 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+# Copyright 1992-2013 Free Software Foundation, Inc. - --timestamp='2005-10-13' -+timestamp='2013-10-01' - --# This file is (in principle) common to ALL GNU software. --# The presence of a machine in this file suggests that SOME GNU software --# can handle that machine. It does not imply ALL GNU software can. --# --# This file is free software; you can redistribute it and/or modify --# it under the terms of the GNU General Public License as published by --# the Free Software Foundation; either version 2 of the License, or -+# This file is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or - # (at your option) any later version. - # --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --# GNU General Public License for more details. -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). - - --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -71,8 +68,7 @@ Report bugs and patches to ." - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 --Free Software Foundation, Inc. -+Copyright 1992-2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -119,11 +115,18 @@ esac - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ -- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | \ -+ kopensolaris*-gnu* | \ -+ storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -146,10 +149,13 @@ case $os in - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -+ -bluegene*) -+ os=-cnk -+ ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 -@@ -164,13 +170,17 @@ case $os in - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -+ -sco6) -+ os=-sco5v6 -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -187,6 +197,10 @@ case $os in - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -sco5v6*) -+ # Don't forget version if it is 3.2v4 or newer. -+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -+ ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -204,6 +218,12 @@ case $os in - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -226,28 +246,37 @@ esac - case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. --#### MozillaHack --# mips*el --#### End MozillaHack - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ -+ | arc | arceb \ -+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ -+ | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ -- | c4x | clipper \ -+ | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | fr30 | frv \ -+ | epiphany \ -+ | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ -- | mips | mipsbe | mipseb | mips*el | mipsle \ -+ | k1om \ -+ | le32 | le64 \ -+ | lm32 \ -+ | m32c | m32r | m32rle | m68000 | m68k | m88k \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ -+ | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -- | mips64vr | mips64vrel \ -+ | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ -+ | mips64r5900 | mips64r5900el \ -+ | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ -@@ -258,37 +287,68 @@ case $basic_machine in - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ -+ | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ -- | ms1 \ -+ | moxie \ -+ | mt \ - | msp430 \ -+ | nds32 | nds32le | nds32be \ -+ | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ -- | or32 \ -+ | open8 \ -+ | or1k | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ -+ | rl78 | rx \ -+ | score \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ -- | sparcv8 | sparcv9 | sparcv9b \ -- | strongarm \ -- | tahoe | thumb | tic4x | tic80 | tron \ -- | v850 | v850e \ -+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ -+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ -+ | ubicom32 \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ -- | z8k) -+ | x86 | xc16x | xstormy16 | xtensa \ -+ | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m32c) -- basic_machine=$basic_machine-unknown -+ c54x) -+ basic_machine=tic54x-unknown -+ ;; -+ c55x) -+ basic_machine=tic55x-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12) -- # Motorola 68HC11/12. -+ c6x) -+ basic_machine=tic6x-unknown -+ ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; -+ ms1) -+ basic_machine=mt-unknown -+ ;; -+ -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and -@@ -302,34 +362,40 @@ case $basic_machine in - exit 1 - ;; - # Recognize the basic CPU types with company name. --#### MozillaHack --# mips*el --#### End MozillaHack - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ -- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -- | avr-* \ -+ | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -- | clipper-* | craynv-* | cydra-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ -+ | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ -- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ -+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -- | m32r-* | m32rle-* \ -+ | k1om-* \ -+ | le32-* | le64-* \ -+ | lm32-* \ -+ | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* \ -- | mips-* | mipsbe-* | mipseb-* | mips*el-* | mipsle-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ -+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -- | mips64vr-* | mips64vrel-* \ -+ | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ -+ | mips64r5900-* | mips64r5900el-* \ -+ | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ -@@ -340,32 +406,41 @@ case $basic_machine in - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ -+ | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ -- | ms1-* \ -+ | mt-* \ - | msp430-* \ -+ | nds32-* | nds32le-* | nds32be-* \ -+ | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | romp-* | rs6000-* \ -- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ -+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ -- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ -+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile*-* \ - | tron-* \ -- | v850-* | v850e-* | vax-* \ -+ | ubicom32-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ -- | xstormy16-* | xtensa-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ -+ | xstormy16-* | xtensa*-* \ - | ymp-* \ -- | z8k-*) -+ | z8k-* | z80-*) - ;; -- m32c-*) -+ # Recognize the basic CPU types without company name, with glob match. -+ xtensa*) -+ basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. -@@ -383,7 +458,7 @@ case $basic_machine in - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -429,6 +504,10 @@ case $basic_machine in - basic_machine=m68k-apollo - os=-bsd - ;; -+ aros) -+ basic_machine=i386-pc -+ os=-aros -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -437,10 +516,35 @@ case $basic_machine in - basic_machine=ns32k-sequent - os=-dynix - ;; -+ blackfin) -+ basic_machine=bfin-unknown -+ os=-linux -+ ;; -+ blackfin-*) -+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; -+ bluegene*) -+ basic_machine=powerpc-ibm -+ os=-cnk -+ ;; -+ c54x-*) -+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c55x-*) -+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c6x-*) -+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -+ cegcc) -+ basic_machine=arm-unknown -+ os=-cegcc -+ ;; - convex-c1) - basic_machine=c1-convex - os=-bsd -@@ -469,8 +573,8 @@ case $basic_machine in - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16c) -- basic_machine=cr16c-unknown -+ cr16 | cr16-*) -+ basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) -@@ -508,6 +612,10 @@ case $basic_machine in - basic_machine=m88k-motorola - os=-sysv3 - ;; -+ dicos) -+ basic_machine=i686-pc -+ os=-dicos -+ ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp -@@ -623,7 +731,6 @@ case $basic_machine in - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -662,6 +769,14 @@ case $basic_machine in - basic_machine=m68k-isi - os=-sysv - ;; -+ m68knommu) -+ basic_machine=m68k-unknown -+ os=-linux -+ ;; -+ m68knommu-*) -+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - m88k-omron*) - basic_machine=m88k-omron - ;; -@@ -673,16 +788,21 @@ case $basic_machine in - basic_machine=ns32k-utek - os=-sysv - ;; -+ microblaze*) -+ basic_machine=microblaze-xilinx -+ ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) -- basic_machine=i386-pc -+ basic_machine=i686-pc - os=-mingw32 - ;; --#### MozillaHack -- i386-msvc | msvc) -- basic_machine=i386-pc -- os=-msvc -+ mingw32ce) -+ basic_machine=arm-unknown -+ os=-mingw32ce - ;; --#### End MozillaHack - miniframe) - basic_machine=m68000-convergent - ;; -@@ -708,10 +828,21 @@ case $basic_machine in - basic_machine=i386-pc - os=-msdos - ;; -+ ms1-*) -+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` -+ ;; -+ msys) -+ basic_machine=i686-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -776,6 +907,12 @@ case $basic_machine in - np1) - basic_machine=np1-gould - ;; -+ neo-tandem) -+ basic_machine=neo-tandem -+ ;; -+ nse-tandem) -+ basic_machine=nse-tandem -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -806,6 +943,14 @@ case $basic_machine in - basic_machine=i860-intel - os=-osf - ;; -+ parisc) -+ basic_machine=hppa-unknown -+ os=-linux -+ ;; -+ parisc-*) -+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=-linux -+ ;; - pbd) - basic_machine=sparc-tti - ;; -@@ -815,6 +960,12 @@ case $basic_machine in - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; -+ pc98) -+ basic_machine=i386-pc -+ ;; -+ pc98-*) -+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; -@@ -844,9 +995,10 @@ case $basic_machine in - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -856,7 +1008,7 @@ case $basic_machine in - ;; - ppc64) basic_machine=powerpc64-unknown - ;; -- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown -@@ -871,6 +1023,14 @@ case $basic_machine in - basic_machine=i586-unknown - os=-pw32 - ;; -+ rdos | rdos64) -+ basic_machine=x86_64-pc -+ os=-rdos -+ ;; -+ rdos32) -+ basic_machine=i386-pc -+ os=-rdos -+ ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff -@@ -897,6 +1057,10 @@ case $basic_machine in - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; -+ sde) -+ basic_machine=mipsisa32-sde -+ os=-elf -+ ;; - sei) - basic_machine=mips-sei - os=-seiux -@@ -908,6 +1072,9 @@ case $basic_machine in - basic_machine=sh-hitachi - os=-hms - ;; -+ sh5el) -+ basic_machine=sh5le-unknown -+ ;; - sh64) - basic_machine=sh64-unknown - ;; -@@ -929,6 +1096,9 @@ case $basic_machine in - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -985,17 +1155,9 @@ case $basic_machine in - basic_machine=t90-cray - os=-unicos - ;; -- tic54x | c54x*) -- basic_machine=tic54x-unknown -- os=-coff -- ;; -- tic55x | c55x*) -- basic_machine=tic55x-unknown -- os=-coff -- ;; -- tic6x | c6x*) -- basic_machine=tic6x-unknown -- os=-coff -+ tile*) -+ basic_machine=$basic_machine-unknown -+ os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown -@@ -1064,6 +1226,9 @@ case $basic_machine in - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1072,6 +1237,10 @@ case $basic_machine in - basic_machine=z8k-unknown - os=-sim - ;; -+ z80-*-coff) -+ basic_machine=z80-unknown -+ os=-sim -+ ;; - none) - basic_machine=none-none - os=-none -@@ -1110,10 +1279,10 @@ case $basic_machine in - we32k) - basic_machine=we32k-att - ;; -- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) -+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; -- sparc | sparcv8 | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) -@@ -1157,9 +1326,12 @@ esac - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -+ -auroraux) -+ os=-auroraux -+ ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; -@@ -1179,32 +1351,32 @@ case $os in - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. --#### MozillaHack --# msvc --#### End MozillaHack - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ -- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ -- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ -+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ -+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ -+ | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* \ -+ | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ -- | -chorusos* | -chorusrdb* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -chorusos* | -chorusrdb* | -cegcc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ -+ | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ -- | -msvc* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1243,9 +1415,12 @@ case $os in - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; -+ -wince*) -+ os=-wince -+ ;; - -osfrose*) - os=-osfrose - ;; -@@ -1289,7 +1464,7 @@ case $os in - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1325,12 +1500,14 @@ case $os in - -aros*) - os=-aros - ;; -- -kaos*) -- os=-kaos -- ;; - -zvmoe) - os=-zvmoe - ;; -+ -dicos*) -+ os=-dicos -+ ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1353,6 +1530,12 @@ else - # system, and we'll never get to this point. - - case $basic_machine in -+ score-*) -+ os=-elf -+ ;; -+ spu-*) -+ os=-elf -+ ;; - *-acorn) - os=-riscix1.2 - ;; -@@ -1362,9 +1545,24 @@ case $basic_machine in - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ c8051-*) -+ os=-elf -+ ;; -+ hexagon-*) -+ os=-elf -+ ;; -+ tic54x-*) -+ os=-coff -+ ;; -+ tic55x-*) -+ os=-coff -+ ;; -+ tic6x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1383,19 +1581,22 @@ case $basic_machine in - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -+ mep-*) -+ os=-elf -+ ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; -+ or1k-*) -+ os=-elf -+ ;; - or32-*) - os=-coff - ;; -@@ -1414,7 +1615,7 @@ case $basic_machine in - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) -@@ -1519,7 +1720,7 @@ case $basic_machine in - -sunos*) - vendor=sun - ;; -- -aix*) -+ -cnk*|-aix*) - vendor=ibm - ;; - -beos*) diff --git a/SOURCES/remove-ogg.patch b/SOURCES/remove-ogg.patch deleted file mode 100644 index 9bf924b..0000000 --- a/SOURCES/remove-ogg.patch +++ /dev/null @@ -1,449 +0,0 @@ -diff -up mozilla-aurora/config/external/moz.build.remove-ogg mozilla-aurora/config/external/moz.build ---- mozilla-aurora/config/external/moz.build.remove-ogg 2014-05-06 13:17:17.000000000 +0200 -+++ mozilla-aurora/config/external/moz.build 2014-06-03 13:51:14.450340480 +0200 -@@ -33,14 +33,15 @@ if CONFIG['MOZ_WEBM_ENCODER']: - if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']: - external_dirs += ['media/libvpx'] - -+if CONFIG['MOZ_OGG']: -+ external_dirs += ['media/libogg', 'media/libtheora'] -+ - if not CONFIG['MOZ_NATIVE_PNG']: - external_dirs += ['media/libpng'] - - external_dirs += [ - 'media/kiss_fft', - 'media/libcubeb', -- 'media/libogg', -- 'media/libtheora', - 'media/libspeex_resampler', - 'media/libsoundtouch', - ] -diff -up mozilla-aurora/configure.in.remove-ogg mozilla-aurora/configure.in ---- mozilla-aurora/configure.in.remove-ogg 2014-05-06 13:17:17.000000000 +0200 -+++ mozilla-aurora/configure.in 2014-06-03 13:51:14.452340483 +0200 -@@ -3938,6 +3938,7 @@ MOZ_FEEDS=1 - MOZ_WEBAPP_RUNTIME= - MOZ_JSDEBUGGER=1 - MOZ_AUTH_EXTENSION=1 -+MOZ_OGG=1 - MOZ_RAW= - MOZ_VORBIS= - MOZ_TREMOR= -@@ -5191,25 +5192,37 @@ fi - - AC_SUBST(MOZ_RAW) - --dnl Checks for __attribute__(aligned()) directive need by libogg --AC_CACHE_CHECK([__attribute__ ((aligned ())) support], -- [ac_cv_c_attribute_aligned], -- [ac_cv_c_attribute_aligned=0 -- CFLAGS_save="${CFLAGS}" -- CFLAGS="${CFLAGS} -Werror" -- for ac_cv_c_attr_align_try in 64 32 16 8; do -- echo "trying $ac_cv_c_attr_align_try" -- AC_TRY_COMPILE([], -- [static char c __attribute__ ((aligned(${ac_cv_c_attr_align_try}))) = 0; return c;], -- [ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}"]) -- if test "$ac_cv_c_attribute_aligned" != 0; then -- break; -- fi -- done -- CFLAGS="${CFLAGS_save}"]) --if test "${ac_cv_c_attribute_aligned}" != "0"; then -- AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], -- [${ac_cv_c_attribute_aligned}],[Maximum supported data alignment]) -+dnl ======================================================== -+dnl = Disable Ogg Codecs -+dnl ======================================================== -+MOZ_ARG_DISABLE_BOOL(ogg, -+[ --disable-ogg Disable support for OGG media (Theora video and Vorbis audio)], -+ MOZ_OGG=, -+ MOZ_OGG=1) -+ -+if test -n "$MOZ_OGG"; then -+ AC_DEFINE(MOZ_OGG) -+ -+ dnl Checks for __attribute__(aligned()) directive -+ AC_CACHE_CHECK([__attribute__ ((aligned ())) support], -+ [ac_cv_c_attribute_aligned], -+ [ac_cv_c_attribute_aligned=0 -+ CFLAGS_save="${CFLAGS}" -+ CFLAGS="${CFLAGS} -Werror" -+ for ac_cv_c_attr_align_try in 64 32 16 8; do -+ echo "trying $ac_cv_c_attr_align_try" -+ AC_TRY_COMPILE([], -+ [static char c __attribute__ ((aligned(${ac_cv_c_attr_align_try}))) = 0; return c;], -+ [ac_cv_c_attribute_aligned="${ac_cv_c_attr_align_try}"]) -+ if test "$ac_cv_c_attribute_aligned" != 0; then -+ break; -+ fi -+ done -+ CFLAGS="${CFLAGS_save}"]) -+ if test "${ac_cv_c_attribute_aligned}" != "0"; then -+ AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX], -+ [${ac_cv_c_attribute_aligned}],[Maximum supported data alignment]) -+ fi - fi - - dnl ======================================================== -@@ -5426,7 +5439,7 @@ AC_SUBST(MOZ_NATIVE_LIBVPX) - AC_SUBST(MOZ_LIBVPX_CFLAGS) - AC_SUBST(MOZ_LIBVPX_LIBS) - --if test "$MOZ_WEBM"; then -+if test "$MOZ_WEBM" -o "$MOZ_OGG"; then - if test "$MOZ_SAMPLE_TYPE_FLOAT32"; then - MOZ_VORBIS=1 - else -@@ -5533,6 +5546,15 @@ dnl ==================================== - dnl = Handle dependent MEDIA defines - dnl ======================================================== - -+if test -n "$MOZ_OPUS" -a -z "$MOZ_OGG"; then -+ AC_MSG_ERROR([MOZ_OPUS requires MOZ_OGG which is disabled.]) -+fi -+ -+if test -n "$MOZ_VORBIS" -a -z "$MOZ_OGG"; then -+ AC_MSG_ERROR([MOZ_VORBIS requires MOZ_OGG which is disabled. -+Note that you need vorbis support for WebM playback.]) -+fi -+ - if test -n "$MOZ_VORBIS" -a -n "$MOZ_TREMOR"; then - AC_MSG_ERROR([MOZ_VORBIS and MOZ_TREMOR are mutually exclusive! The build system should not allow them both to be set, but they are. Please file a bug at https://bugzilla.mozilla.org/]) - fi -@@ -8842,6 +8864,7 @@ AC_SUBST(MOZ_APPLEMEDIA) - AC_SUBST(MOZ_OMX_PLUGIN) - AC_SUBST(MOZ_VPX_ERROR_CONCEALMENT) - AC_SUBST(MOZ_VPX) -+AC_SUBST(MOZ_OGG) - AC_SUBST(VPX_AS) - AC_SUBST(VPX_ASFLAGS) - AC_SUBST(VPX_DASH_C_FLAG) -diff -up mozilla-aurora/content/html/content/src/HTMLAudioElement.cpp.remove-ogg mozilla-aurora/content/html/content/src/HTMLAudioElement.cpp ---- mozilla-aurora/content/html/content/src/HTMLAudioElement.cpp.remove-ogg 2014-05-06 13:17:19.000000000 +0200 -+++ mozilla-aurora/content/html/content/src/HTMLAudioElement.cpp 2014-06-03 13:51:14.452340483 +0200 -@@ -81,12 +81,16 @@ nsresult HTMLAudioElement::SetAcceptHead - #ifdef MOZ_WEBM - "audio/webm," - #endif -+#ifdef MOZ_OGG - "audio/ogg," -+#endif - #ifdef MOZ_WAVE - "audio/wav," - #endif - "audio/*;q=0.9," -+#ifdef MOZ_OGG - "application/ogg;q=0.7," -+#endif - "video/*;q=0.6,*/*;q=0.5"); - - return aChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"), -diff -up mozilla-aurora/content/html/content/src/HTMLVideoElement.cpp.remove-ogg mozilla-aurora/content/html/content/src/HTMLVideoElement.cpp ---- mozilla-aurora/content/html/content/src/HTMLVideoElement.cpp.remove-ogg 2014-05-06 13:17:19.000000000 +0200 -+++ mozilla-aurora/content/html/content/src/HTMLVideoElement.cpp 2014-06-03 13:51:14.452340483 +0200 -@@ -136,9 +136,13 @@ nsresult HTMLVideoElement::SetAcceptHead - #ifdef MOZ_WEBM - "video/webm," - #endif -+#ifdef MOZ_OGG - "video/ogg," -+#endif - "video/*;q=0.9," -+#ifdef MOZ_OGG - "application/ogg;q=0.7," -+#endif - "audio/*;q=0.6,*/*;q=0.5"); - - return aChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"), -diff -up mozilla-aurora/content/media/DecoderTraits.cpp.remove-ogg mozilla-aurora/content/media/DecoderTraits.cpp ---- mozilla-aurora/content/media/DecoderTraits.cpp.remove-ogg 2014-05-06 13:17:20.000000000 +0200 -+++ mozilla-aurora/content/media/DecoderTraits.cpp 2014-06-03 13:51:14.452340483 +0200 -@@ -13,8 +13,10 @@ - #include "MediaPluginHost.h" - #endif - -+#ifdef MOZ_OGG - #include "OggDecoder.h" - #include "OggReader.h" -+#endif - #ifdef MOZ_WAVE - #include "WaveDecoder.h" - #include "WaveReader.h" -@@ -100,6 +102,7 @@ IsRawType(const nsACString& aType) - } - #endif - -+#ifdef MOZ_OGG - // See http://www.rfc-editor.org/rfc/rfc5334.txt for the definitions - // of Ogg media types and codec types - static const char* const gOggTypes[4] = { -@@ -131,6 +134,7 @@ IsOggType(const nsACString& aType) - - return CodecListContains(gOggTypes, aType); - } -+#endif - - #ifdef MOZ_WAVE - // See http://www.rfc-editor.org/rfc/rfc2361.txt for the definitions -@@ -199,8 +203,10 @@ IsGStreamerSupportedType(const nsACStrin - if (IsWebMType(aMimeType) && !Preferences::GetBool("media.prefer-gstreamer", false)) - return false; - #endif -+#ifdef MOZ_OGG - if (IsOggType(aMimeType) && !Preferences::GetBool("media.prefer-gstreamer", false)) - return false; -+#endif - - return GStreamerDecoder::CanHandleMediaType(aMimeType, nullptr); - } -@@ -370,10 +376,12 @@ DecoderTraits::CanHandleMediaType(const - result = CANPLAY_MAYBE; - } - #endif -+#ifdef MOZ_OGG - if (IsOggType(nsDependentCString(aMIMEType))) { - codecList = MediaDecoder::IsOpusEnabled() ? gOggCodecsWithOpus : gOggCodecs; - result = CANPLAY_MAYBE; - } -+#endif - #ifdef MOZ_WAVE - if (IsWaveType(nsDependentCString(aMIMEType))) { - codecList = gWaveCodecs; -@@ -479,10 +487,12 @@ InstantiateDecoder(const nsACString& aTy - return decoder.forget(); - } - #endif -+#ifdef MOZ_OGG - if (IsOggType(aType)) { - decoder = new OggDecoder(); - return decoder.forget(); - } -+#endif - #ifdef MOZ_WAVE - if (IsWaveType(aType)) { - decoder = new WaveDecoder(); -@@ -587,9 +597,11 @@ MediaDecoderReader* DecoderTraits::Creat - decoderReader = new RawReader(aDecoder); - } else - #endif -+#ifdef MOZ_OGG - if (IsOggType(aType)) { - decoderReader = new OggReader(aDecoder); - } else -+#endif - #ifdef MOZ_WAVE - if (IsWaveType(aType)) { - decoderReader = new WaveReader(aDecoder); -@@ -642,7 +654,9 @@ MediaDecoderReader* DecoderTraits::Creat - bool DecoderTraits::IsSupportedInVideoDocument(const nsACString& aType) - { - return -+#ifdef MOZ_OGG - IsOggType(aType) || -+#endif - #ifdef MOZ_OMX_DECODER - // We support amr inside WebApps on firefoxOS but not in general web content. - // Ensure we dont create a VideoDocument when accessing amr URLs directly. -diff -up mozilla-aurora/content/media/encoder/MediaEncoder.cpp.remove-ogg mozilla-aurora/content/media/encoder/MediaEncoder.cpp ---- mozilla-aurora/content/media/encoder/MediaEncoder.cpp.remove-ogg 2014-05-06 13:17:20.000000000 +0200 -+++ mozilla-aurora/content/media/encoder/MediaEncoder.cpp 2014-06-03 13:51:14.453340485 +0200 -@@ -9,7 +9,9 @@ - #include "prlog.h" - #include "mozilla/Preferences.h" - -+#ifdef MOZ_OGG - #include "OggWriter.h" -+#endif - #ifdef MOZ_OPUS - #include "OpusTrackEncoder.h" - -@@ -133,6 +135,7 @@ MediaEncoder::CreateEncoder(const nsAStr - mimeType = NS_LITERAL_STRING(AUDIO_3GPP); - } - #endif // MOZ_OMX_ENCODER -+#ifdef MOZ_OGG - else if (MediaDecoder::IsOggEnabled() && MediaDecoder::IsOpusEnabled() && - (aMIMEType.EqualsLiteral(AUDIO_OGG) || - (aTrackTypes & ContainerWriter::CREATE_AUDIO_TRACK))) { -@@ -142,6 +145,7 @@ MediaEncoder::CreateEncoder(const nsAStr - NS_ENSURE_TRUE(audioEncoder, nullptr); - mimeType = NS_LITERAL_STRING(AUDIO_OGG); - } -+#endif // MOZ_OGG - else { - LOG(PR_LOG_ERROR, ("Can not find any encoder to record this media stream")); - return nullptr; -diff -up mozilla-aurora/content/media/MediaDecoder.cpp.remove-ogg mozilla-aurora/content/media/MediaDecoder.cpp ---- mozilla-aurora/content/media/MediaDecoder.cpp.remove-ogg 2014-05-06 13:17:20.000000000 +0200 -+++ mozilla-aurora/content/media/MediaDecoder.cpp 2014-06-03 13:51:14.453340485 +0200 -@@ -1653,6 +1653,7 @@ MediaDecoder::IsRawEnabled() - } - #endif - -+#ifdef MOZ_OGG - bool - MediaDecoder::IsOpusEnabled() - { -@@ -1668,6 +1669,7 @@ MediaDecoder::IsOggEnabled() - { - return Preferences::GetBool("media.ogg.enabled"); - } -+#endif - - #ifdef MOZ_WAVE - bool -diff -up mozilla-aurora/content/media/MediaDecoder.h.remove-ogg mozilla-aurora/content/media/MediaDecoder.h ---- mozilla-aurora/content/media/MediaDecoder.h.remove-ogg 2014-05-06 13:17:20.000000000 +0200 -+++ mozilla-aurora/content/media/MediaDecoder.h 2014-06-03 13:51:14.453340485 +0200 -@@ -844,8 +844,10 @@ public: - static bool IsRawEnabled(); - #endif - -+#ifdef MOZ_OGG - static bool IsOggEnabled(); - static bool IsOpusEnabled(); -+#endif - - #ifdef MOZ_WAVE - static bool IsWaveEnabled(); -diff -up mozilla-aurora/content/media/moz.build.remove-ogg mozilla-aurora/content/media/moz.build ---- mozilla-aurora/content/media/moz.build.remove-ogg 2014-05-06 13:17:20.000000000 +0200 -+++ mozilla-aurora/content/media/moz.build 2014-06-03 13:51:14.453340485 +0200 -@@ -7,7 +7,6 @@ - PARALLEL_DIRS += [ - 'encoder', - 'mediasource', -- 'ogg', - 'webaudio', - 'webvtt' - ] -@@ -17,6 +16,9 @@ TEST_TOOL_DIRS += ['compiledtest'] - if CONFIG['MOZ_RAW']: - PARALLEL_DIRS += ['raw'] - -+if CONFIG['MOZ_OGG']: -+ PARALLEL_DIRS += ['ogg'] -+ - if CONFIG['MOZ_WAVE']: - PARALLEL_DIRS += ['wave'] - -diff -up mozilla-aurora/layout/media/symbols.def.in.remove-ogg mozilla-aurora/layout/media/symbols.def.in ---- mozilla-aurora/layout/media/symbols.def.in.remove-ogg 2014-05-06 13:17:13.000000000 +0200 -+++ mozilla-aurora/layout/media/symbols.def.in 2014-06-03 13:51:14.454340486 +0200 -@@ -145,6 +145,7 @@ cubeb_stream_init - cubeb_stream_start - cubeb_stream_stop - cubeb_stream_get_latency -+#ifdef MOZ_OGG - th_comment_clear - th_comment_init - th_decode_alloc -@@ -158,6 +159,7 @@ th_info_init - th_packet_isheader - th_packet_iskeyframe - th_setup_free -+#endif - #ifdef MOZ_OPUS - opus_decoder_create - opus_decoder_destroy -diff -up mozilla-aurora/modules/libpref/src/init/all.js.remove-ogg mozilla-aurora/modules/libpref/src/init/all.js ---- mozilla-aurora/modules/libpref/src/init/all.js.remove-ogg 2014-05-19 11:43:49.000000000 +0200 -+++ mozilla-aurora/modules/libpref/src/init/all.js 2014-06-03 13:51:25.028355239 +0200 -@@ -212,7 +212,9 @@ pref("media.fragmented-mp4.use-blank-dec - #ifdef MOZ_RAW - pref("media.raw.enabled", true); - #endif -+#ifdef MOZ_OGG - pref("media.ogg.enabled", true); -+#endif - #ifdef MOZ_OPUS - pref("media.opus.enabled", true); - #endif -diff -up mozilla-aurora/python/mozbuild/mozbuild/mozinfo.py.remove-ogg mozilla-aurora/python/mozbuild/mozbuild/mozinfo.py ---- mozilla-aurora/python/mozbuild/mozbuild/mozinfo.py.remove-ogg 2014-05-06 13:17:17.000000000 +0200 -+++ mozilla-aurora/python/mozbuild/mozbuild/mozinfo.py 2014-06-03 13:51:25.028355239 +0200 -@@ -84,6 +84,7 @@ def build_dict(config, env=os.environ): - d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1" - d['bin_suffix'] = substs.get('BIN_SUFFIX', '') - -+ d['ogg'] = bool(substs.get('MOZ_OGG')) - d['webm'] = bool(substs.get('MOZ_WEBM')) - d['wave'] = bool(substs.get('MOZ_WAVE')) - -diff -up mozilla-aurora/uriloader/exthandler/nsExternalHelperAppService.cpp.remove-ogg mozilla-aurora/uriloader/exthandler/nsExternalHelperAppService.cpp ---- mozilla-aurora/uriloader/exthandler/nsExternalHelperAppService.cpp.remove-ogg 2014-05-06 13:17:27.000000000 +0200 -+++ mozilla-aurora/uriloader/exthandler/nsExternalHelperAppService.cpp 2014-06-03 13:51:25.030355242 +0200 -@@ -462,6 +462,7 @@ static nsDefaultMimeTypeEntry defaultMim - { "application/xhtml+xml", "xhtml" }, - { "application/xhtml+xml", "xht" }, - { TEXT_PLAIN, "txt" }, -+#ifdef MOZ_OGG - { VIDEO_OGG, "ogv" }, - { VIDEO_OGG, "ogg" }, - { APPLICATION_OGG, "ogg" }, -@@ -469,6 +470,7 @@ static nsDefaultMimeTypeEntry defaultMim - #ifdef MOZ_OPUS - { AUDIO_OGG, "opus" }, - #endif -+#endif - #ifdef MOZ_WEBM - { VIDEO_WEBM, "webm" }, - { AUDIO_WEBM, "webm" }, -diff -up mozilla-aurora/xpcom/build/nsXPComInit.cpp.remove-ogg mozilla-aurora/xpcom/build/nsXPComInit.cpp ---- mozilla-aurora/xpcom/build/nsXPComInit.cpp.remove-ogg 2014-06-03 14:04:38.913464144 +0200 -+++ mozilla-aurora/xpcom/build/nsXPComInit.cpp 2014-06-03 14:06:03.282582245 +0200 -@@ -133,7 +133,9 @@ extern nsresult nsStringInputStreamConst - #include "mozilla/VisualEventTracer.h" - #endif - -+#if MOZ_OGG - #include "ogg/ogg.h" -+#endif - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - #include "vpx_mem/vpx_mem.h" - #endif -@@ -378,7 +380,7 @@ private: - NS_IMPL_ISUPPORTS(ICUReporter, nsIMemoryReporter) - - /* static */ template<> Atomic CountingAllocatorBase::sAmount(0); -- -+#if MOZ_OGG - class OggReporter MOZ_FINAL : public nsIMemoryReporter, - public CountingAllocatorBase - { -@@ -420,7 +422,7 @@ NS_IMPL_ISUPPORTS(VPXReporter, nsIMemory - - /* static */ template<> Atomic CountingAllocatorBase::sAmount(0); - #endif /* MOZ_VPX */ -- -+#endif /* MOZ_OGG */ - #ifdef MOZ_WEBM - class NesteggReporter MOZ_FINAL : public nsIMemoryReporter - , public CountingAllocatorBase -@@ -606,12 +608,13 @@ NS_InitXPCOM2(nsIServiceManager* *result - // depend on the XPCOM-based memory reporting goop. So for now, we have - // this oddness. - mozilla::SetICUMemoryFunctions(); -- -+#if MOZ_OGG - // Do the same for libogg. - ogg_set_mem_functions(OggReporter::CountingMalloc, - OggReporter::CountingCalloc, - OggReporter::CountingRealloc, - OggReporter::CountingFree); -+#endif - - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - // And for VPX. -@@ -678,7 +681,9 @@ NS_InitXPCOM2(nsIServiceManager* *result - - // The memory reporter manager is up and running -- register our reporters. - RegisterStrongMemoryReporter(new ICUReporter()); -+#if MOZ_OGG - RegisterStrongMemoryReporter(new OggReporter()); -+#endif - #ifdef MOZ_VPX - RegisterStrongMemoryReporter(new VPXReporter()); - #endif diff --git a/SOURCES/rhbz-1014858.patch b/SOURCES/rhbz-1014858.patch new file mode 100644 index 0000000..c953b33 --- /dev/null +++ b/SOURCES/rhbz-1014858.patch @@ -0,0 +1,16 @@ +diff -up mozilla-release/toolkit/xre/nsAppRunner.cpp.old mozilla-release/toolkit/xre/nsAppRunner.cpp +--- mozilla-release/toolkit/xre/nsAppRunner.cpp.old 2014-11-26 03:17:40.000000000 +0100 ++++ mozilla-release/toolkit/xre/nsAppRunner.cpp 2015-01-05 14:23:05.977933308 +0100 +@@ -4168,10 +4168,8 @@ XREMain::XRE_main(int argc, char* argv[] + + #if defined(MOZ_WIDGET_GTK) + #if defined(MOZ_MEMORY) || defined(__FreeBSD__) || defined(__NetBSD__) +- // Disable the slice allocator, since jemalloc already uses similar layout +- // algorithms, and using a sub-allocator tends to increase fragmentation. +- // This must be done before g_thread_init() is called. +- g_slice_set_config(G_SLICE_CONFIG_ALWAYS_MALLOC, 1); ++ // rhbz#1014858 - enable slice allocator for child processes ++ unsetenv("G_SLICE"); + #endif + g_thread_init(nullptr); + #endif diff --git a/SOURCES/rhbz-1219542-s390-build.patch b/SOURCES/rhbz-1219542-s390-build.patch new file mode 100644 index 0000000..4f38200 --- /dev/null +++ b/SOURCES/rhbz-1219542-s390-build.patch @@ -0,0 +1,23 @@ +diff -up mozilla-release/js/src/configure.in.opt mozilla-release/js/src/configure.in +--- mozilla-release/js/src/configure.in.opt 2015-05-04 02:43:23.000000000 +0200 ++++ mozilla-release/js/src/configure.in 2015-05-07 14:21:07.685405039 +0200 +@@ -1492,7 +1492,7 @@ case "$host" in + *-linux*|*-kfreebsd*-gnu|*-gnu*) + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" + HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' +- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" ++ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O1}" + ;; + + *) +@@ -1674,8 +1674,8 @@ ia64*-hpux*) + # while; Intel recommends against using it. + MOZ_OPTIMIZE_FLAGS="-O2" + elif test "$GNU_CC" -o "$GNU_CXX"; then +- MOZ_PGO_OPTIMIZE_FLAGS="-O3" +- MOZ_OPTIMIZE_FLAGS="-O3" ++ MOZ_PGO_OPTIMIZE_FLAGS="-O1" ++ MOZ_OPTIMIZE_FLAGS="-O1" + if test -z "$CLANG_CC"; then + MOZ_OPTIMIZE_FLAGS="-freorder-blocks $MOZ_OPTIMIZE_FLAGS" + fi diff --git a/SOURCES/thunderbird-centos-default-prefs.js b/SOURCES/thunderbird-centos-default-prefs.js deleted file mode 100644 index 013aa21..0000000 --- a/SOURCES/thunderbird-centos-default-prefs.js +++ /dev/null @@ -1,28 +0,0 @@ -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -# Allow users to set custom colors -# pref("browser.display.use_system_colors", true); -pref("general.useragent.vendor", "CentOS"); -pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("mail.shell.checkDefaultClient", false); -pref("toolkit.networkmanager.disable", false); -pref("offline.autoDetect", true); - -# Disable global indexing by default -pref("mailnews.database.global.indexer.enabled", false); - -# Do not switch to Smart Folders after upgrade to 3.0b4 -pref("mail.folder.views.version", "1") -pref("extensions.shownSelectionUI", true); -pref("extensions.autoDisableScope", 0); - -# For rhbz#1024232 -pref("ui.SpellCheckerUnderlineStyle", 1); - -/* Workaround for rhbz#1134876 */ -pref("javascript.options.baselinejit", false); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); diff --git a/SOURCES/thunderbird-enable-addons.patch b/SOURCES/thunderbird-enable-addons.patch index 80635af..4f78187 100644 --- a/SOURCES/thunderbird-enable-addons.patch +++ b/SOURCES/thunderbird-enable-addons.patch @@ -13,14 +13,26 @@ diff -up comm-esr31/mail/app/profile/all-thunderbird.js.addons comm-esr31/mail/a diff -up comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm --- comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2014-07-29 15:29:11.951728146 +0200 +++ comm-esr31/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2014-07-29 15:30:51.879030210 +0200 -@@ -1894,8 +1894,8 @@ this.XPIProvider = { - this.showUpgradeUI(); - flushCaches = true; - } -- else if (aAppChanged === undefined) { +@@ -2102,11 +2102,7 @@ this.XPIProvider = { + + AddonManagerPrivate.markProviderSafe(this); + +- if (aAppChanged === undefined) { - // For new profiles we will never need to show the add-on selection UI -+ else { -+ // For all profiles we will never need to show the add-on selection UI - Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); +- Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); +- } +- else if (aAppChanged && !this.allAppGlobal && ++ if (aAppChanged && !this.allAppGlobal && + Preferences.get(PREF_EM_SHOW_MISMATCH_UI, true)) { + if (!Preferences.get(PREF_SHOWN_SELECTION_UI, false)) { + // Flip a flag to indicate that we interrupted startup with an interactive prompt +@@ -2126,6 +2122,9 @@ this.XPIProvider = { + flushCaches = true; + } + } ++ } else { ++ // For new profiles we will never need to show the add-on selection UI ++ Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); } + if (flushCaches) { diff --git a/SOURCES/thunderbird-install-dir.patch b/SOURCES/thunderbird-install-dir.patch index 26d87e0..1d99761 100644 --- a/SOURCES/thunderbird-install-dir.patch +++ b/SOURCES/thunderbird-install-dir.patch @@ -1,17 +1,6 @@ -diff -up thunderbird-31.0/comm-esr31/config/baseconfig.mk.dir thunderbird-31.0/comm-esr31/config/baseconfig.mk ---- thunderbird-31.0/comm-esr31/config/baseconfig.mk.dir 2014-07-29 13:51:58.204106461 +0200 -+++ thunderbird-31.0/comm-esr31/config/baseconfig.mk 2014-07-29 13:54:26.868555504 +0200 -@@ -1,6 +1,6 @@ - includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - MOZILLA_SRCDIR = $(topsrcdir)/mozilla - MOZDEPTH = $(DEPTH)/mozilla -diff -up thunderbird-31.0/comm-esr31/mozilla/config/baseconfig.mk.dir thunderbird-31.0/comm-esr31/mozilla/config/baseconfig.mk ---- thunderbird-31.0/comm-esr31/mozilla/config/baseconfig.mk.dir 2014-07-18 02:05:10.000000000 +0200 -+++ thunderbird-31.0/comm-esr31/mozilla/config/baseconfig.mk 2014-07-29 13:51:58.204106461 +0200 +diff -up comm-esr38/mozilla/config/baseconfig.mk.dir comm-esr38/mozilla/config/baseconfig.mk +--- comm-esr38/mozilla/config/baseconfig.mk.dir 2015-06-08 19:49:23.000000000 +0200 ++++ comm-esr38/mozilla/config/baseconfig.mk 2015-06-16 14:45:16.048913473 +0200 @@ -4,7 +4,7 @@ # whether a normal build is happening or whether the check is running. includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) diff --git a/SOURCES/thunderbird-mozconfig b/SOURCES/thunderbird-mozconfig index f613909..4a02d99 100644 --- a/SOURCES/thunderbird-mozconfig +++ b/SOURCES/thunderbird-mozconfig @@ -30,6 +30,10 @@ ac_add_options --disable-gnomevfs ac_add_options --disable-gstreamer ac_add_options --enable-system-ffi +# lightning related +ac_add_options --enable-calendar +ac_add_options --with-l10n-base=../../l10n + export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/SOURCES/thunderbird-redhat-default-prefs.js b/SOURCES/thunderbird-redhat-default-prefs.js new file mode 100644 index 0000000..af23193 --- /dev/null +++ b/SOURCES/thunderbird-redhat-default-prefs.js @@ -0,0 +1,28 @@ +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); +# Allow users to set custom colors +# pref("browser.display.use_system_colors", true); +pref("general.useragent.vendor", "Red Hat"); +pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); +pref("intl.locale.matchOS", true); +pref("mail.shell.checkDefaultClient", false); +pref("toolkit.networkmanager.disable", false); +pref("offline.autoDetect", true); + +# Disable global indexing by default +pref("mailnews.database.global.indexer.enabled", false); + +# Do not switch to Smart Folders after upgrade to 3.0b4 +pref("mail.folder.views.version", "1") +pref("extensions.shownSelectionUI", true); +pref("extensions.autoDisableScope", 0); + +# For rhbz#1024232 +pref("ui.SpellCheckerUnderlineStyle", 1); + +/* Workaround for rhbz#1134876 */ +pref("javascript.options.baselinejit", false); +/* Workaround for rhbz#1110291 */ +pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); +/* Workaround for mozbz#1063315 */ +pref("security.use_mozillapkix_verification", false); diff --git a/SOURCES/thunderbird.sh.in b/SOURCES/thunderbird.sh.in index badc70e..55728e2 100644 --- a/SOURCES/thunderbird.sh.in +++ b/SOURCES/thunderbird.sh.in @@ -55,6 +55,11 @@ GNOME_DISABLE_CRASH_DIALOG=1 export GNOME_DISABLE_CRASH_DIALOG ## +## Disable the SLICE allocator (rhbz#1014858) +## +export G_SLICE=always-malloc + +## ## To disable the use of Firefox localization, set MOZ_DISABLE_LANGPACKS=1 ## in your environment before launching Firefox. ## @@ -72,11 +77,8 @@ FEDORA_LANGPACK_CONFIG="$MOZ_EXTENSIONS_PROFILE_DIR/.fedora-langpack-install" # MOZ_DISABLE_LANGPACKS disables language packs completelly MOZILLA_DOWN=0 if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then - if [ -x $MOZ_DIST_BIN/mozilla-xremote-client ]; then - # Is thunderbird running? - $MOZ_DIST_BIN/mozilla-xremote-client -a thunderbird 'ping()' > /dev/null 2>&1 - MOZILLA_DOWN=$? - fi + pidof thunderbird > /dev/null 2>&1 + MOZILLA_DOWN=$? fi # Modify language pack configuration only when thunderbird is not running diff --git a/SOURCES/webm.patch b/SOURCES/webm.patch deleted file mode 100644 index 570713b..0000000 --- a/SOURCES/webm.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mozilla-esr31/browser/confvars.sh.webm-fix mozilla-esr31/browser/confvars.sh ---- mozilla-esr31/browser/confvars.sh.webm-fix 2014-07-21 13:56:53.522253529 +0200 -+++ mozilla-esr31/browser/confvars.sh 2014-07-21 13:57:49.983533186 +0200 -@@ -65,6 +65,6 @@ MOZ_PAY=1 - # Enable activities. These are used for FxOS developers currently. - MOZ_ACTIVITIES=1 - MOZ_JSDOWNLOADS=1 --MOZ_WEBM_ENCODER=1 -+#MOZ_WEBM_ENCODER=1 - # Enable exact rooting on desktop. - JSGC_USE_EXACT_ROOTING=1 diff --git a/SOURCES/webrtc-arch-cpu.patch b/SOURCES/webrtc-arch-cpu.patch new file mode 100644 index 0000000..29fd578 --- /dev/null +++ b/SOURCES/webrtc-arch-cpu.patch @@ -0,0 +1,22 @@ +--- a/media/webrtc/trunk/build/build_config.h ++++ b/media/webrtc/trunk/build/build_config.h +@@ -123,7 +123,9 @@ + #define ARCH_CPU_PPC_FAMILY 1 + #define ARCH_CPU_PPC64 1 + #define ARCH_CPU_64_BITS 1 ++#ifndef _LITTLE_ENDIAN + #define ARCH_CPU_BIG_ENDIAN 1 ++#endif + #elif defined(__ppc__) || defined(__powerpc__) + #define ARCH_CPU_PPC_FAMILY 1 + #define ARCH_CPU_PPC 1 +@@ -156,6 +158,9 @@ + #elif defined(__alpha__) + #define ARCH_CPU_ALPHA 1 + #define ARCH_CPU_64_BITS 1 ++#elif defined(__aarch64__) ++#define ARCH_CPU_AARCH64 1 ++#define ARCH_CPU_64_BITS 1 + #else + #error Please add support for your architecture in build/build_config.h + #endif diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index c7f8075..fa457e5 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -1,35 +1,28 @@ # Use system nspr/nss? %define system_nss 1 +# Enable webm +%define enable_webm 1 +%define system_libvpx 1 +%define with_gdata 0 # Build as a debug package? %define debug_build 0 -# -%if 0%{?fedora} -%define system_libvpx 1 -%else -%define system_libvpx 0 -%endif - %if 0%{?fedora} < 20 -%define system_sqlite 0 +%define system_sqlite 0 +%define system_ffi 0 %else -%define system_sqlite 1 +%define system_sqlite 1 +%define system_ffi 1 %endif -%define build_langpacks 1 +%define build_langpacks 1 %if %{?system_nss} %global nspr_version 4.10.6 %global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) -%if 0%{?fedora} %global nss_version 3.16.2.3 %global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) -%else -%global nss_version 3.16.2.3 -%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) -%endif - %endif %define cairo_version 1.8.8 @@ -46,13 +39,18 @@ %define _default_patch_fuzz 2 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} +# Bump one with each minor lightning release +%if %{?with_gdata} +%define gdata_version 1.9 +%global gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc} +%endif # The tarball is pretty inconsistent with directory structure. # Sometimes there is a top level directory. That goes here. # # IMPORTANT: If there is no top level directory, this should be # set to the cwd, ie: '.' -%define tarballdir comm-esr31 +%define tarballdir comm-esr38 %define objdir objdir %define mozappdir %{_libdir}/%{name} @@ -66,20 +64,22 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 31.8.0 +Version: 38.2.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -#ExcludeArch: s390x s390 ppc ppc64 i686 - Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.bz2 %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}-20150715.tar.bz2 +Source1: thunderbird-langpacks-%{version}-20150814.tar.bz2 %endif +# Locales for lightning +Source2: l10n-lightning-%{version}.tar.bz2 +Source3: mklangsource.sh + Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded -Source12: thunderbird-centos-default-prefs.js +Source12: thunderbird-redhat-default-prefs.js Source20: thunderbird.desktop Source21: thunderbird.sh.in Source100: find-external-requires @@ -87,28 +87,28 @@ Source100: find-external-requires # Mozilla (XULRunner) patches Patch0: thunderbird-install-dir.patch Patch9: mozilla-build-arm.patch -Patch10: webm.patch -Patch11: remove-ogg.patch -Patch12: mozilla-1129859-dictfix2.patch # Build patches Patch100: thunderbird-objdir.patch -Patch101: build-nss-3.19.1.patch - +Patch101: build-nspr-prbool.patch +Patch102: build-werror.patch +Patch103: rhbz-1219542-s390-build.patch +Patch104: firefox-nss-3.19.1.patch +Patch105: mozilla-1005535.patch +Patch106: webrtc-arch-cpu.patch # Linux specific Patch200: thunderbird-enable-addons.patch # PPC fixes Patch300: xulrunner-24.0-jemalloc-ppc.patch +Patch301: ppc64le-build.patch # Fedora specific patches Patch400: rhbz-966424.patch -Patch401: mozilla-858919.patch - -# Epel patches: +Patch402: rhbz-1014858.patch # Arch patches -Patch600: ppc64le-build.patch +Patch600: firefox-ppc64le.patch %if %{official_branding} # Required by Mozilla Corporation @@ -143,13 +143,16 @@ BuildRequires: hunspell-devel BuildRequires: sqlite-devel >= %{sqlite_version} Requires: sqlite >= %{sqlite_build_version} %endif +%if %{?system_ffi} +BuildRequires: libffi-devel +%endif BuildRequires: startup-notification-devel BuildRequires: alsa-lib-devel BuildRequires: autoconf213 BuildRequires: desktop-file-utils BuildRequires: libcurl-devel BuildRequires: mesa-libGL-devel -%if %{?system_libvpx} +%if 0%{?system_libvpx} BuildRequires: libvpx-devel >= %{libvpx_version} Requires: libvpx >= %{libvpx_version} %endif @@ -157,6 +160,7 @@ BuildRequires: pulseaudio-libs-devel BuildRequires: libicu-devel Requires: mozilla-filesystem BuildRequires: libffi-devel +Obsoletes: thunderbird-lightning %define _use_internal_dependency_generator 0 %define __find_requires %{SOURCE100} @@ -183,28 +187,48 @@ debug %{name}, you want to install %{name}-debuginfo instead. %defattr(-,root,root) %endif +%global tb_version %{version} + +%if %{?with_gdata} +%package lightning-gdata +Summary: Lightning data provider for Google Calendar +Version: %{gdata_version} +Requires: %{name}%{?_isa} = %{tb_version}-%{release} + +%description lightning-gdata +This extension allows Lightning to read and write events to a Google Calendar. + +Please read http://wiki.mozilla.org/Calendar:GDATA_Provider for more details +and before filing a bug. Also, be sure to visit the dicussion forums, maybe +your bug already has a solution! +%endif %prep %setup -q -c cd %{tarballdir} -%patch0 -p2 -b .dir +%patch0 -p1 -b .dir %patch100 -p2 -b .objdir -%patch101 -p1 -b .nss-3.19.1 + # Mozilla (XULRunner) patches cd mozilla %patch9 -p2 -b .arm -%patch10 -p1 -b .web-m -%patch11 -p1 -b .remove-ogg -%patch12 -p1 -b .dict-fix %patch300 -p2 -b .852698 +%patch106 -p1 -b .webrtc-arch-cpu +%patch105 -p1 -b .moz-1005535 +%patch104 -p1 -b .nss-3.19.1 +%patch102 -p2 -b .build-werror +%patch101 -p1 -b .nspr-prbool +%ifarch s390 +%patch103 -p1 -b .rhbz-1219542-s390-build +%endif %patch400 -p1 -b .966424 -%patch401 -p1 -b .858919 +%patch402 -p1 -b .rhbz-1014858 +%patch600 -p2 -b .ppc64le cd .. %patch200 -p1 -b .addons -%patch600 -p1 -b .ppc64le - +%patch301 -p1 -b .ppc64le-build %if %{official_branding} # Required by Mozilla Corporation @@ -239,6 +263,10 @@ echo "ac_add_options --enable-system-sqlite" >> .mozconfig echo "ac_add_options --disable-system-sqlite" >> .mozconfig %endif +%if %{?system_ffi} +echo "ac_add_options --enable-system-ffi" >> .mozconfig +%endif + %if %{?debug_build} echo "ac_add_options --enable-debug" >> .mozconfig echo "ac_add_options --disable-optimize" >> .mozconfig @@ -254,18 +282,57 @@ echo "ac_add_options --disable-elf-hack" >> .mozconfig %ifnarch %{ix86} x86_64 echo "ac_add_options --disable-webrtc" >> .mozconfig %endif -%if %{?system_libvpx} -echo "ac_add_options --enable-system-libvpx" >> .mozconfig + +%ifarch armv7hl +echo "ac_add_options --with-arch=armv7-a" >> .mozconfig +echo "ac_add_options --with-float-abi=hard" >> .mozconfig +echo "ac_add_options --with-fpu=vfpv3-d16" >> .mozconfig +echo "ac_add_options --disable-elf-hack" >> .mozconfig +%endif +%ifarch armv7hnl +echo "ac_add_options --with-arch=armv7-a" >> .mozconfig +echo "ac_add_options --with-float-abi=hard" >> .mozconfig +echo "ac_add_options --with-fpu=neon" >> .mozconfig +echo "ac_add_options --disable-elf-hack" >> .mozconfig +echo "ac_add_options --disable-ion" >> .mozconfig +echo "ac_add_options --disable-yarr-jit" >> .mozconfig +%endif +%ifarch armv5tel +echo "ac_add_options --with-arch=armv5te" >> .mozconfig +echo "ac_add_options --with-float-abi=soft" >> .mozconfig +echo "ac_add_options --disable-elf-hack" >> .mozconfig +echo "ac_add_options --disable-ion" >> .mozconfig +echo "ac_add_options --disable-yarr-jit" >> .mozconfig +%endif + +%if %{?enable_webm} +echo "ac_add_options --enable-webm" >> .mozconfig +echo "ac_add_options --enable-webrtc" >> .mozconfig +echo "ac_add_options --enable-ogg" >> .mozconfig %else +echo "ac_add_options --without-system-libvpx" >> .mozconfig echo "ac_add_options --disable-webm" >> .mozconfig echo "ac_add_options --disable-webrtc" >> .mozconfig +echo "ac_add_options --disable-ogg" >> .mozconfig +echo "ac_add_options --disable-opus" >> .mozconfig +%endif +%if 0%{?system_libvpx} +echo "ac_add_options --with-system-libvpx" >> .mozconfig +%else +echo "ac_add_options --without-system-libvpx" >> .mozconfig + %endif + %if %{enable_mozilla_crashreporter} echo "ac_add_options --enable-crashreporter" >> .mozconfig %else echo "ac_add_options --disable-crashreporter" >> .mozconfig %endif +# install lightning langpacks +cd .. +%{__tar} xf %{SOURCE2} +cd - #=============================================================================== %build @@ -282,6 +349,10 @@ esac cd %{tarballdir} +# Update the various config.guess to upstream release for aarch64 support +#find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';' +find ./ -name config.guess -exec cp ./mozilla/build/autoconf/config.guess {} ';' + # -fpermissive is needed to build with gcc 4.6+ which has become stricter # # Mozilla builds with -Wall with exception of a few warnings which show up @@ -297,13 +368,17 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//') %endif %ifarch s390 -MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/') +MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/') +# If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which +# overrides the -g1 from line above and breaks building on s390 +# (OOM when linking, rhbz#1238225) +export MOZ_DEBUG_FLAGS=" " %endif -%ifarch s390 %{arm} ppc +%ifarch s390 %{arm} ppc aarch64 i686 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" %endif -export CFLAGS=$MOZ_OPT_FLAGS +export CFLAGS=`echo $MOZ_OPT_FLAGS |sed -e 's/-fpermissive//g'` export CXXFLAGS="$MOZ_OPT_FLAGS -fno-strict-aliasing" export LDFLAGS=$MOZ_LINK_FLAGS @@ -313,16 +388,29 @@ export LIBDIR='%{_libdir}' MOZ_SMP_FLAGS=-j1 # On x86 architectures, Mozilla can build up to 4 jobs at once in parallel, # however builds tend to fail on other arches when building in parallel. -%ifarch %{ix86} x86_64 ppc ppc64 ppc64le +%ifarch %{ix86} x86_64 ppc ppc64 ppc64le aarch64 [ -z "$RPM_BUILD_NCPUS" ] && \ RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 [ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4 [ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8 %endif - +echo "test config.guess" +./mozilla/build/autoconf/config.guess +echo "test LDAP config.guess" +sh -x ./ldap/sdks/c-sdk/config/autoconf/config.guess make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" +# Package l10n files +cd %{objdir}/calendar/lightning +grep -v 'osx' ../../../calendar/locales/shipped-locales | while read lang x +do + make AB_CD=en-US L10N_XPI_NAME=lightning libs-$lang +done +# install l10n files +make tools +cd - + # create debuginfo for crash-stats.mozilla.com %if %{enable_mozilla_crashreporter} make -C %{objdir} buildsymbols @@ -356,7 +444,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird # set up our default preferences -%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' > \ +%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{tb_version}-%{release},g' > \ $RPM_BUILD_ROOT/rh-default-prefs %{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js %{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js @@ -389,7 +477,7 @@ done %endif # build_langpacks # Get rid of devel package and its debugsymbols -%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{version} +%{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{tb_version} # Copy over the LICENSE cd mozilla @@ -408,7 +496,15 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat # Add debuginfo for crash-stats.mozilla.com %if %{enable_mozilla_crashreporter} %{__mkdir_p} $RPM_BUILD_ROOT/%{moz_debug_dir} -%{__cp} %{objdir}/mozilla/dist/%{symbols_file_name} $RPM_BUILD_ROOT/%{moz_debug_dir} +%{__cp} %{objdir}/dist/%{symbols_file_name} $RPM_BUILD_ROOT/%{moz_debug_dir} +%endif + +# lightning-gdata +%if %{?with_gdata} +mkdir -p $RPM_BUILD_ROOT%{gdata_extname} +touch $RPM_BUILD_ROOT%{gdata_extname}/chrome.manifest + +unzip -qod $RPM_BUILD_ROOT%{gdata_extname} %{objdir}/dist/xpi-stage/gdata-provider-%{gdata_version}.en-US.linux-*.xpi %endif #=============================================================================== @@ -427,6 +523,12 @@ fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +# lightning-gdata files========================================================= +%if %{?with_gdata} +%files lightning-gdata +%doc %{tarballdir}/mozilla/LEGAL %{tarballdir}/mozilla/LICENSE %{tarballdir}/mozilla/README.txt +%{gdata_extname} +%endif #=============================================================================== %files -f %{tarballdir}/%{name}.lang %defattr(-,root,root,-) @@ -452,7 +554,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %dir %{mozappdir}/langpacks %{mozappdir}/greprefs %{mozappdir}/isp -%{mozappdir}/mozilla-xremote-client %{mozappdir}/run-mozilla.sh %{mozappdir}/thunderbird-bin %{mozappdir}/thunderbird @@ -475,17 +576,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %if !%{?system_nss} %{mozappdir}/*.chk %endif -%exclude %{_datadir}/idl/%{name}-%{version} -%exclude %{_includedir}/%{name}-%{version} +%exclude %{_datadir}/idl/%{name}-%{tb_version} +%exclude %{_includedir}/%{name}-%{tb_version} %{mozappdir}/chrome.manifest %{mozappdir}/searchplugins %{mozappdir}/dependentlibs.list +%{mozappdir}/distribution #=============================================================================== %changelog -* Mon Jul 20 2015 CentOS Sources - 31.8.0-1.el7.centos -- rebrand default prefs +* Fri Aug 14 2015 Jan Horak - 38.2.0-1 +- Update to 38.2.0 + +* Wed Jul 15 2015 Jan Horak - 38.1.0-2 +- Rebase to 38.1.0 * Wed Jul 15 2015 Jan Horak - 31.8.0-1 - Update to 31.8.0