Author: jbeich
Date: Tue Feb 11 11:39:22 2014
New Revision: 1490
Log:
replace system_wrappers changes with upstream-tracked patches
Added:
trunk/mail/thunderbird/files/patch-bug961816
trunk/mail/thunderbird/files/patch-bug962345
trunk/www/firefox-esr/files/patch-bug961816
trunk/www/firefox-esr/files/patch-bug962345
trunk/www/firefox-nightly/files/patch-bug962345
trunk/www/firefox/files/patch-bug961816
trunk/www/firefox/files/patch-bug962345
trunk/www/libxul/files/patch-bug961816
trunk/www/libxul/files/patch-bug962345
trunk/www/seamonkey/files/patch-bug961816
trunk/www/seamonkey/files/patch-bug962345
Modified:
trunk/Mk/bsd.gecko.mk
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Tue Feb 11 03:19:54 2014 (r1489)
+++ trunk/Mk/bsd.gecko.mk Tue Feb 11 11:39:22 2014 (r1490)
@@ -915,15 +915,6 @@
${PATCH} ${PATCH_ARGS} -d ${MOZSRC}/security/nss < $$i; \
done
.endif
-.for subdir in "" nsprpub js/src
- @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \
- for f in \
- cairo-qt.h \
- unwind.h; do \
- ${ECHO_CMD} "$$f" >> ${MOZSRC}/${subdir}/config/system-headers
; \
- done; \
- fi
-.endfor
@for f in \
${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
${WRKSRC}/directory/c-sdk/configure \
Added: trunk/mail/thunderbird/files/patch-bug961816
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug961816 Tue Feb 11 11:39:22
2014 (r1490)
@@ -0,0 +1,48 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1158,3 +1158,4 @@ unicode/unum.h
+ unicode/ustring.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -7455,7 +7455,10 @@ dnl
========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
+ MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++ AC_LANG_RESTORE
+ fi
+
+ dnl ========================================================
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
+@@ -1158,3 +1158,4 @@ unicode/unum.h
+ unicode/ustring.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -7455,7 +7455,10 @@ dnl
========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
+ MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++ AC_LANG_RESTORE
+ fi
+
+ dnl ========================================================
Added: trunk/mail/thunderbird/files/patch-bug962345
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug962345 Tue Feb 11 11:39:22
2014 (r1490)
@@ -0,0 +1,18 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1159,3 +1159,4 @@ unicode/ustring.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
+@@ -1159,3 +1159,4 @@ unicode/ustring.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
Added: trunk/www/firefox-esr/files/patch-bug961816
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-bug961816 Tue Feb 11 11:39:22 2014
(r1490)
@@ -0,0 +1,48 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- config/system-headers
++++ config/system-headers
+@@ -1158,3 +1158,4 @@ unicode/unum.h
+ unicode/ustring.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- configure.in
++++ configure.in
+@@ -7455,7 +7455,10 @@ dnl
========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
+ MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++ AC_LANG_RESTORE
+ fi
+
+ dnl ========================================================
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- js/src/config/system-headers
++++ js/src/config/system-headers
+@@ -1158,3 +1158,4 @@ unicode/unum.h
+ unicode/ustring.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -7455,7 +7455,10 @@ dnl
========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
+ MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++ AC_LANG_RESTORE
+ fi
+
+ dnl ========================================================
Added: trunk/www/firefox-esr/files/patch-bug962345
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-bug962345 Tue Feb 11 11:39:22 2014
(r1490)
@@ -0,0 +1,18 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- config/system-headers
++++ config/system-headers
+@@ -1159,3 +1159,4 @@ unicode/ustring.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- js/src/config/system-headers
++++ js/src/config/system-headers
+@@ -1159,3 +1159,4 @@ unicode/ustring.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
Added: trunk/www/firefox-nightly/files/patch-bug962345
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug962345 Tue Feb 11 11:39:22
2014 (r1490)
@@ -0,0 +1,9 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- config/system-headers
++++ config/system-headers
+@@ -1144,3 +1144,4 @@ unicode/utypes.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
Added: trunk/www/firefox/files/patch-bug961816
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug961816 Tue Feb 11 11:39:22 2014
(r1490)
@@ -0,0 +1,48 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- config/system-headers
++++ config/system-headers
+@@ -1145,3 +1145,4 @@ unicode/ustring.h
+ unicode/utypes.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- configure.in
++++ configure.in
+@@ -7455,7 +7455,10 @@ dnl
========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
+ MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++ AC_LANG_RESTORE
+ fi
+
+ dnl ========================================================
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- js/src/config/system-headers
++++ js/src/config/system-headers
+@@ -1145,3 +1145,4 @@ unicode/ustring.h
+ unicode/utypes.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -7455,7 +7455,10 @@ dnl
========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
+ MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++ AC_LANG_RESTORE
+ fi
+
+ dnl ========================================================
Added: trunk/www/firefox/files/patch-bug962345
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug962345 Tue Feb 11 11:39:22 2014
(r1490)
@@ -0,0 +1,18 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- config/system-headers
++++ config/system-headers
+@@ -1144,3 +1144,4 @@ unicode/utypes.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- js/src/config/system-headers
++++ js/src/config/system-headers
+@@ -1144,3 +1144,4 @@ unicode/utypes.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
Added: trunk/www/libxul/files/patch-bug961816
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/libxul/files/patch-bug961816 Tue Feb 11 11:39:22 2014
(r1490)
@@ -0,0 +1,48 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- config/system-headers
++++ config/system-headers
+@@ -1158,3 +1158,4 @@ unicode/unum.h
+ unicode/ustring.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- configure.in
++++ configure.in
+@@ -7455,7 +7455,10 @@ dnl
========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
+ MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++ AC_LANG_RESTORE
+ fi
+
+ dnl ========================================================
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- js/src/config/system-headers
++++ js/src/config/system-headers
+@@ -1158,3 +1158,4 @@ unicode/unum.h
+ unicode/ustring.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- js/src/configure.in
++++ js/src/configure.in
+@@ -7455,7 +7455,10 @@ dnl
========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
+ MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++ AC_LANG_RESTORE
+ fi
+
+ dnl ========================================================
Added: trunk/www/libxul/files/patch-bug962345
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/libxul/files/patch-bug962345 Tue Feb 11 11:39:22 2014
(r1490)
@@ -0,0 +1,18 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- config/system-headers
++++ config/system-headers
+@@ -1159,3 +1159,4 @@ unicode/ustring.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- js/src/config/system-headers
++++ js/src/config/system-headers
+@@ -1159,3 +1159,4 @@ unicode/ustring.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
Added: trunk/www/seamonkey/files/patch-bug961816
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug961816 Tue Feb 11 11:39:22 2014
(r1490)
@@ -0,0 +1,48 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1145,3 +1145,4 @@ unicode/ustring.h
+ unicode/utypes.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -7455,7 +7455,10 @@ dnl
========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
+ MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++ AC_LANG_RESTORE
+ fi
+
+ dnl ========================================================
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
+@@ -1145,3 +1145,4 @@ unicode/ustring.h
+ unicode/utypes.h
+ #endif
+ libutil.h
++unwind.h
+diff --git configure.in configure.in
+index f452a5e..a1ebbcc 100644
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -7455,7 +7455,10 @@ dnl
========================================================
+ dnl = Support for gcc stack unwinding (from gcc 3.3)
+ dnl ========================================================
+ if test -z "$SKIP_LIBRARY_CHECKS"; then
++ AC_LANG_SAVE
++ AC_LANG_CPLUSPLUS
+ MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
++ AC_LANG_RESTORE
+ fi
+
+ dnl ========================================================
Added: trunk/www/seamonkey/files/patch-bug962345
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug962345 Tue Feb 11 11:39:22 2014
(r1490)
@@ -0,0 +1,18 @@
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1144,3 +1144,4 @@ unicode/utypes.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
+diff --git config/system-headers config/system-headers
+index 8803150..ae38d68 100644
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
+@@ -1144,3 +1144,4 @@ unicode/utypes.h
+ #endif
+ libutil.h
+ unwind.h
++cairo-qt.h
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
