# HG changeset patch # User Wolfgang Rosenauer # Date 1510391316 -3600 # Node ID 77c890186192a4d49829aed9f0cb0cfbc5e2156e # Parent 65e317e42effd6f0a2b65ba76db27af0bf09b960 removed obsolete patches fix stylo build diff -r 65e317e42eff -r 77c890186192 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Mon Nov 06 07:44:08 2017 +0100 +++ b/MozillaFirefox/MozillaFirefox.changes Sat Nov 11 10:08:36 2017 +0100 @@ -1,9 +1,22 @@ ------------------------------------------------------------------- -Sat Nov 4 19:24:17 UTC 2017 - wr@rosenauer.org +Thu Nov 9 15:01:30 UTC 2017 - wr@rosenauer.org - update to Firefox 57.0b14 + * Firefox Quantum + * Photon UI + * AMD VP9 hardware video decoder support + * Added support for Date/Time input + * stricter security sandbox blocking filesystem reading and + writing on Linux systems + * middle mouse paste in the content area no longer navigates to + URLs by default on Unix systems - requires NSPR 4.17, NSS 3.33 and rustc 1.19 - rebased patches +- added mozilla-bindgen-systemlibs.patch to allow stylo build + with system libs (bmo#1341234) +- removed mozilla-language.patch since the whole locale code + changed in Firefox and is relying on ICU now +- removed obsolete mozilla-ucontext.patch ------------------------------------------------------------------- Sat Oct 28 06:30:37 UTC 2017 - wr@rosenauer.org diff -r 65e317e42eff -r 77c890186192 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Mon Nov 06 07:44:08 2017 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Sat Nov 11 10:08:36 2017 +0100 @@ -95,6 +95,9 @@ BuildRequires: pkgconfig(libpulse) %if 0%{?suse_version} > 1320 BuildRequires: llvm-clang-devel >= 3.9.0 +%else +# this covers the workaround to compile on Leap 42 in OBS +BuildRequires: clang4-devel %endif # libavcodec is required for H.264 support but the # openSUSE version is currently not able to play H.264 @@ -143,14 +146,13 @@ Source19: google-api-key # Gecko/Toolkit Patch1: mozilla-nongnome-proxies.patch -Patch3: mozilla-kde.patch -Patch5: mozilla-language.patch -Patch6: mozilla-ntlm-full-path.patch -Patch7: mozilla-openaes-decl.patch -Patch8: mozilla-no-stdcxx-check.patch -Patch9: mozilla-reduce-files-per-UnifiedBindings.patch -Patch10: mozilla-aarch64-startup-crash.patch -Patch11: mozilla-ucontext.patch +Patch2: mozilla-kde.patch +Patch3: mozilla-ntlm-full-path.patch +Patch4: mozilla-openaes-decl.patch +Patch5: mozilla-no-stdcxx-check.patch +Patch6: mozilla-reduce-files-per-UnifiedBindings.patch +Patch7: mozilla-aarch64-startup-crash.patch +Patch8: mozilla-bindgen-systemlibs.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch @@ -253,16 +255,15 @@ %endif cd $RPM_BUILD_DIR/mozilla %patch1 -p1 +%patch2 -p1 %patch3 -p1 -#%patch5 -p1 +%patch4 -p1 +%patch5 -p1 +%ifarch %ix86 %patch6 -p1 +%endif %patch7 -p1 %patch8 -p1 -%ifarch %ix86 -%patch9 -p1 -%endif -%patch10 -p1 -#%patch11 -p1 # Firefox %patch101 -p1 %patch102 -p1 @@ -357,9 +358,6 @@ ac_add_options --enable-update-channel=%{update_channel} ac_add_options --with-mozilla-api-keyfile=%{SOURCE18} ac_add_options --with-google-api-keyfile=%{SOURCE19} -%if 0%{?suse_version} <= 1320 -ac_add_options --disable-stylo -%endif %if %branding ac_add_options --enable-official-branding %endif diff -r 65e317e42eff -r 77c890186192 MozillaFirefox/mozilla-bindgen-systemlibs.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MozillaFirefox/mozilla-bindgen-systemlibs.patch Sat Nov 11 10:08:36 2017 +0100 @@ -0,0 +1,1 @@ +../mozilla-bindgen-systemlibs.patch \ No newline at end of file diff -r 65e317e42eff -r 77c890186192 MozillaFirefox/mozilla-language.patch --- a/MozillaFirefox/mozilla-language.patch Mon Nov 06 07:44:08 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-language.patch \ No newline at end of file diff -r 65e317e42eff -r 77c890186192 MozillaFirefox/mozilla-ucontext.patch --- a/MozillaFirefox/mozilla-ucontext.patch Mon Nov 06 07:44:08 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-ucontext.patch \ No newline at end of file diff -r 65e317e42eff -r 77c890186192 mozilla-bindgen-systemlibs.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-bindgen-systemlibs.patch Sat Nov 11 10:08:36 2017 +0100 @@ -0,0 +1,102 @@ +# HG changeset patch +# Parent e85dde0eabf214916c69924aa49192ab412e00a1 + +diff --git a/build/autoconf/config.status.m4 b/build/autoconf/config.status.m4 +--- a/build/autoconf/config.status.m4 ++++ b/build/autoconf/config.status.m4 +@@ -40,16 +40,31 @@ define([AC_SUBST_LIST], + [ifdef([AC_SUBST_SET_$1], [m4_fatal([Cannot use AC_SUBST_SET and AC_SUBST_LIST on the same variable ($1)])], + [ifdef([AC_SUBST_LIST_$1], , + [define([AC_SUBST_LIST_$1], )dnl + AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl + (''' $1 ''', list(r''' [$]$1 '''.split())) + AC_DIVERT_POP()dnl + ])])])]) + ++dnl Like AC_SUBST, but makes the value available as a string of quoted strings ++dnl in python, with values got from the value of the environment variable, ++dnl split on whitespaces. The value is suitable for embedding into a .toml ++dnl list. ++define([AC_SUBST_TOML_LIST], ++[ifdef([AC_SUBST_$1], [m4_fatal([Cannot use AC_SUBST and AC_SUBST_LIST on the same variable ($1)])], ++[ifdef([AC_SUBST_SET_$1], [m4_fatal([Cannot use AC_SUBST_SET and AC_SUBST_LIST on the same variable ($1)])], ++[ifdef([AC_SUBST_LIST_$1], , ++[define([AC_SUBST_LIST_$1], )dnl ++AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl ++ (''' $1 ''', r''' %s ''' % str(', '.join("'%s'" % s for s in r''' [$]$1 '''.split()))) ++AC_DIVERT_POP()dnl ++])])])]) ++ ++ + dnl Ignore AC_SUBSTs for variables we don't have use for but that autoconf + dnl itself exports. + define([AC_SUBST_CFLAGS], ) + define([AC_SUBST_CPPFLAGS], ) + define([AC_SUBST_CXXFLAGS], ) + define([AC_SUBST_FFLAGS], ) + define([AC_SUBST_DEFS], ) + define([AC_SUBST_LDFLAGS], ) +diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure +--- a/build/moz.configure/toolchain.configure ++++ b/build/moz.configure/toolchain.configure +@@ -897,25 +897,24 @@ def check_have_64_bit(have_64_bit, compi + configure_error('The target compiler does not agree with configure ' + 'about the target bitness.') + + option(env='BINDGEN_CFLAGS', + nargs=1, + help='Options bindgen should pass to the C/C++ parser') + + @depends('BINDGEN_CFLAGS') +-@checking('bindgen cflags', lambda s: s if s and s.strip() else 'no') ++@checking('bindgen cflags', lambda s: s if s and s[0].strip() else 'no') + def bindgen_cflags(value): + if value and len(value): + # Reformat the env value for substitution into a toml list. + flags = value[0].split() +- return ', '.join('"' + flag + '"' for flag in flags) +- return '' ++ return flags + +-set_config('BINDGEN_CFLAGS', bindgen_cflags) ++add_old_configure_assignment('_BINDGEN_CFLAGS', bindgen_cflags) + + @depends(c_compiler) + def default_debug_flags(compiler_info): + # Debug info is ON by default. + if compiler_info.type in ('msvc', 'clang-cl'): + return '-Zi' + return '-g' + +diff --git a/layout/style/bindgen.toml.in b/layout/style/bindgen.toml.in +--- a/layout/style/bindgen.toml.in ++++ b/layout/style/bindgen.toml.in +@@ -1,4 +1,4 @@ + [build] + args = [ +- @BINDGEN_CFLAGS@ ++ @BINDGEN_SYSTEM_FLAGS@ + ] +diff --git a/old-configure.in b/old-configure.in +--- a/old-configure.in ++++ b/old-configure.in +@@ -4453,16 +4453,19 @@ android) + esac + + AC_SUBST(MOZ_TREE_CAIRO) + AC_SUBST_LIST(MOZ_CAIRO_CFLAGS) + AC_SUBST_LIST(MOZ_CAIRO_LIBS) + AC_SUBST_LIST(MOZ_CAIRO_OSLIBS) + AC_SUBST(MOZ_TREE_PIXMAN) + ++BINDGEN_SYSTEM_FLAGS="$_BINDGEN_CFLAGS $NSPR_CFLAGS $NSS_CFLAGS $MOZ_PIXMAN_CFLAGS $MOZ_CAIRO_CFLAGS" ++AC_SUBST_TOML_LIST(BINDGEN_SYSTEM_FLAGS) ++ + dnl ======================================================== + dnl disable xul + dnl ======================================================== + MOZ_ARG_DISABLE_BOOL(xul, + [ --disable-xul Disable XUL], + MOZ_XUL= ) + if test "$MOZ_XUL"; then + AC_DEFINE(MOZ_XUL) diff -r 65e317e42eff -r 77c890186192 mozilla-language.patch --- a/mozilla-language.patch Mon Nov 06 07:44:08 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,65 +0,0 @@ -# HG changeset patch -# User Wolfgang Rosenauer -# Parent 5a29924228527f8882c83cf62d470963ea1ce62e -# Parent 242f2521ed48bb63b91582956b5e4af80bcb3378 -Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE - -diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp ---- a/intl/locale/nsLocaleService.cpp -+++ b/intl/locale/nsLocaleService.cpp -@@ -116,16 +116,17 @@ nsLocaleService::nsLocaleService(void) - NS_ENSURE_SUCCESS_VOID(rv); - #endif - #if defined(XP_UNIX) && !defined(XP_MACOSX) - RefPtr resultLocale(new nsLocale()); - NS_ENSURE_TRUE_VOID(resultLocale); - - // Get system configuration - const char* lang = getenv("LANG"); -+ const char* language = getenv("LANGUAGE"); - - nsAutoString xpLocale, platformLocale; - nsAutoString category, category_platform; - int i; - - for( i = 0; i < LocaleListLength; i++ ) { - nsresult result; - // setlocale( , "") evaluates LC_* and LANG -@@ -151,16 +152,37 @@ nsLocaleService::nsLocaleService(void) - } else { - CopyASCIItoUTF16(lang, platformLocale); - result = nsPosixLocale::GetXPLocale(lang, xpLocale); - } - } - if (NS_FAILED(result)) { - return; - } -+ // LANGUAGE is overriding LC_MESSAGES -+ // it can be a colon separated list of preferred languages -+ // as we do not recognize here if a language is available -+ // we actually only consider the first entry unless GetXPLocale -+ // fails completely -+ if (i == LC_MESSAGES && language && *language) { -+#define LANGUAGE_SEP ":" -+ nsAutoString xpLocale_temp; -+ char* rawBuffer = (char*) language; -+ char* token = nsCRT::strtok(rawBuffer, LANGUAGE_SEP, &rawBuffer); -+ for (; token; -+ token = nsCRT::strtok(rawBuffer, LANGUAGE_SEP, &rawBuffer)) { -+ result = nsPosixLocale::GetXPLocale(token, xpLocale_temp); -+ if (NS_SUCCEEDED(result)) { -+ CopyASCIItoUTF16(token, platformLocale); -+ xpLocale = xpLocale_temp; -+ break; -+ } -+ } -+ } -+ - resultLocale->AddCategory(category, xpLocale); - resultLocale->AddCategory(category_platform, platformLocale); - } - mSystemLocale = do_QueryInterface(resultLocale); - mApplicationLocale = do_QueryInterface(resultLocale); - - #endif // XP_UNIX - diff -r 65e317e42eff -r 77c890186192 mozilla-ucontext.patch --- a/mozilla-ucontext.patch Mon Nov 06 07:44:08 2017 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,313 +0,0 @@ -# HG changeset patch -# User Wolfgang Rosenauer -# Parent f6b8a48d89d77c7a3eb13fef234c618943306c2b -Replace struct ucontext with ucontext_t - -diff --git a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc ---- a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc -+++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.cc -@@ -35,25 +35,25 @@ - namespace google_breakpad { - - // Minidump defines register structures which are different from the raw - // structures which we get from the kernel. These are platform specific - // functions to juggle the ucontext and user structures into minidump format. - - #if defined(__i386__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_ESP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_EIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - - out->context_flags = MD_CONTEXT_X86_FULL | - MD_CONTEXT_X86_FLOATING_POINT; - - out->gs = regs[REG_GS]; - out->fs = regs[REG_FS]; -@@ -83,25 +83,25 @@ void UContextReader::FillCPUContext(RawC - out->float_save.data_selector = fp->datasel; - - // 8 registers * 10 bytes per register. - my_memcpy(out->float_save.register_area, fp->_st, 10 * 8); - } - - #elif defined(__x86_64) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RSP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - - out->context_flags = MD_CONTEXT_AMD64_FULL; - - out->cs = regs[REG_CSGSFS] & 0xffff; - - out->fs = (regs[REG_CSGSFS] >> 32) & 0xffff; -@@ -140,25 +140,25 @@ void UContextReader::FillCPUContext(RawC - out->flt_save.mx_csr = fpregs->mxcsr; - out->flt_save.mx_csr_mask = fpregs->mxcr_mask; - my_memcpy(&out->flt_save.float_registers, &fpregs->_st, 8 * 16); - my_memcpy(&out->flt_save.xmm_registers, &fpregs->_xmm, 16 * 16); - } - - #elif defined(__ARM_EABI__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_ARM_FULL; - - out->iregs[0] = uc->uc_mcontext.arm_r0; - out->iregs[1] = uc->uc_mcontext.arm_r1; - out->iregs[2] = uc->uc_mcontext.arm_r2; - out->iregs[3] = uc->uc_mcontext.arm_r3; - out->iregs[4] = uc->uc_mcontext.arm_r4; - out->iregs[5] = uc->uc_mcontext.arm_r5; -@@ -179,25 +179,25 @@ void UContextReader::FillCPUContext(RawC - // TODO: fix this after fixing ExceptionHandler - out->float_save.fpscr = 0; - my_memset(&out->float_save.regs, 0, sizeof(out->float_save.regs)); - my_memset(&out->float_save.extra, 0, sizeof(out->float_save.extra)); - } - - #elif defined(__aarch64__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; - - out->cpsr = static_cast(uc->uc_mcontext.pstate); - for (int i = 0; i < MD_CONTEXT_ARM64_REG_SP; ++i) - out->iregs[i] = uc->uc_mcontext.regs[i]; - out->iregs[MD_CONTEXT_ARM64_REG_SP] = uc->uc_mcontext.sp; - out->iregs[MD_CONTEXT_ARM64_REG_PC] = uc->uc_mcontext.pc; -@@ -205,25 +205,25 @@ void UContextReader::FillCPUContext(RawC - out->float_save.fpsr = fpregs->fpsr; - out->float_save.fpcr = fpregs->fpcr; - my_memcpy(&out->float_save.regs, &fpregs->vregs, - MD_FLOATINGSAVEAREA_ARM64_FPR_COUNT * 16); - } - - #elif defined(__mips__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - #if _MIPS_SIM == _ABI64 - out->context_flags = MD_CONTEXT_MIPS64_FULL; - #elif _MIPS_SIM == _ABIO32 - out->context_flags = MD_CONTEXT_MIPS_FULL; - #else - #error "This mips ABI is currently not supported (n32)" - #endif - -diff --git a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h ---- a/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h -+++ b/toolkit/crashreporter/breakpad-client/linux/dump_writer_common/ucontext_reader.h -@@ -36,29 +36,29 @@ - #include "linux/dump_writer_common/raw_context_cpu.h" - #include "common/memory.h" - #include "google_breakpad/common/minidump_format.h" - - namespace google_breakpad { - - // Wraps platform-dependent implementations of accessors to ucontext structs. - struct UContextReader { -- static uintptr_t GetStackPointer(const struct ucontext* uc); -+ static uintptr_t GetStackPointer(const ucontext_t* uc); - -- static uintptr_t GetInstructionPointer(const struct ucontext* uc); -+ static uintptr_t GetInstructionPointer(const ucontext_t* uc); - - // Juggle a arch-specific ucontext into a minidump format - // out: the minidump structure - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp); - #elif defined(__aarch64__) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); - #else -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); - #endif - }; - - } // namespace google_breakpad - - #endif // CLIENT_LINUX_DUMP_WRITER_COMMON_UCONTEXT_READER_H -diff --git a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc ---- a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc -+++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc -@@ -434,30 +434,30 @@ bool ExceptionHandler::HandleSignal(int - info->si_code == SI_TKILL; - if (signal_trusted || (signal_pid_trusted && info->si_pid == getpid())) { - sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0); - } - - // Fill in all the holes in the struct to make Valgrind happy. - memset(&g_crash_context_, 0, sizeof(g_crash_context_)); - memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); -- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); -+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); - #if defined(__aarch64__) -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context* fp_ptr = - (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { - memcpy(&g_crash_context_.float_state, fp_ptr, - sizeof(g_crash_context_.float_state)); - } - #elif !defined(__ARM_EABI__) && !defined(__mips__) - // FP state is not part of user ABI on ARM Linux. - // In case of MIPS Linux FP state is already part of struct ucontext - // and 'float_state' is not a member of CrashContext. -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - if (uc_ptr->uc_mcontext.fpregs) { - memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, - sizeof(g_crash_context_.float_state)); - } - #endif - g_crash_context_.tid = syscall(__NR_gettid); - if (crash_handler_ != NULL) { - if (crash_handler_(&g_crash_context_, sizeof(g_crash_context_), -@@ -471,17 +471,17 @@ bool ExceptionHandler::HandleSignal(int - // This is a public interface to HandleSignal that allows the client to - // generate a crash dump. This function may run in a compromised context. - bool ExceptionHandler::SimulateSignalDelivery(int sig) { - siginfo_t siginfo = {}; - // Mimic a trusted signal to allow tracing the process (see - // ExceptionHandler::HandleSignal(). - siginfo.si_code = SI_USER; - siginfo.si_pid = getpid(); -- struct ucontext context; -+ ucontext_t context; - getcontext(&context); - return HandleSignal(sig, &siginfo, &context); - } - - // This function may run in a compromised context: see the top of the file. - bool ExceptionHandler::GenerateDump(CrashContext *context) { - if (IsOutOfProcess()) - return crash_generation_client_->RequestDump(context, sizeof(*context)); -diff --git a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h ---- a/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h -+++ b/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.h -@@ -186,17 +186,17 @@ class ExceptionHandler { - MinidumpCallback callback, - void* callback_context); - - // This structure is passed to minidump_writer.h:WriteMinidump via an opaque - // blob. It shouldn't be needed in any user code. - struct CrashContext { - siginfo_t siginfo; - pid_t tid; // the crashing thread. -- struct ucontext context; -+ ucontext_t context; - #if !defined(__ARM_EABI__) && !defined(__mips__) - // #ifdef this out because FP state is not part of user ABI for Linux ARM. - // In case of MIPS Linux FP state is already part of struct - // ucontext so 'float_state' is not required. - fpstate_t float_state; - #endif - }; - -diff --git a/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc ---- a/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc -+++ b/toolkit/crashreporter/breakpad-client/linux/microdump_writer/microdump_writer.cc -@@ -566,17 +566,17 @@ class MicrodumpWriter { - ++iter) { - DumpModule(iter->first, false, 0, iter->second); - } - return true; - } - - void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } - -- const struct ucontext* const ucontext_; -+ const ucontext_t* const ucontext_; - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; - #endif - LinuxDumper* dumper_; - const MappingList& mapping_list_; - const MicrodumpExtraInfo microdump_extra_info_; - char* log_line_; - }; -diff --git a/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc ---- a/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc -+++ b/toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc -@@ -1242,17 +1242,17 @@ class MinidumpWriter { - return false; - return WriteFile(result, buf); - } - - // Only one of the 2 member variables below should be set to a valid value. - const int fd_; // File descriptor where the minidum should be written. - const char* path_; // Path to the file where the minidum should be written. - -- const struct ucontext* const ucontext_; // also from the signal handler -+ const ucontext_t* const ucontext_; // also from the signal handler - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; // ditto - #endif - LinuxDumper* dumper_; - MinidumpFileWriter minidump_writer_; - off_t minidump_size_limit_; - MDLocationDescriptor crashing_thread_context_; - // Blocks of memory written to the dump. These are all currently diff -r 65e317e42eff -r 77c890186192 series --- a/series Mon Nov 06 07:44:08 2017 +0100 +++ b/series Sat Nov 11 10:08:36 2017 +0100 @@ -1,14 +1,13 @@ # xulrunner/gecko patches mozilla-nongnome-proxies.patch mozilla-kde.patch -#mozilla-language.patch mozilla-ntlm-full-path.patch mozilla-idldir.patch mozilla-openaes-decl.patch mozilla-no-stdcxx-check.patch mozilla-reduce-files-per-UnifiedBindings.patch mozilla-aarch64-startup-crash.patch -#mozilla-ucontext.patch +mozilla-bindgen-systemlibs.patch # Firefox patches firefox-kde.patch