head 1.5; access; symbols pkgsrc-2017Q3:1.4.0.32 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.28 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.26 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.24 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.22 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.20 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.18 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.16 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.14 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.12 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.10 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.8 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.6 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.4 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.2 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.2.0.2 pkgsrc-2013Q4-base:1.2; locks; strict; comment @# @; 1.5 date 2017.10.27.13.45.42; author ryoon; state dead; branches; next 1.4; commitid QwqV0lWgJIae9HcA; 1.4 date 2014.03.26.13.56.22; author ryoon; state Exp; branches; next 1.3; commitid mqFoLKZMHkvAldux; 1.3 date 2014.01.03.17.15.23; author richard; state Exp; branches; next 1.2; commitid iFAO9Pl6j1jj5Hjx; 1.2 date 2013.12.15.14.02.25; author ryoon; state Exp; branches; next 1.1; commitid y7tiSdHUMLaWCehx; 1.1 date 2013.11.03.04.51.59; author ryoon; state Exp; branches; next ; commitid 5Fm3eDs9vunQVMbx; desc @@ 1.5 log @Remove firefox24 @ text @$NetBSD: patch-as,v 1.4 2014/03/26 13:56:22 ryoon Exp $ Treat DragonFly like FreeBSD. --- js/src/configure.in.orig 2014-03-15 16:06:29.000000000 +0000 +++ js/src/configure.in @@@@ -2431,6 +2431,7 @@@@ EOF #pragma GCC visibility push(hidden) #pragma GCC visibility push(default) #include +#include #pragma GCC visibility pop __attribute__ ((visibility ("default"))) void Func() { @@@@ -2439,7 +2440,7 @@@@ __attribute__ ((visibility ("default"))) } EOF ac_cv_have_visibility_builtin_bug=no - if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then ac_cv_have_visibility_builtin_bug=yes else if test `grep -c "@@PLT" conftest.S` = 0; then @@@@ -2504,7 +2505,7 @@@@ AC_LANG_C AC_ARG_ENABLE(dtrace, [ --enable-dtrace build with dtrace support if available (default=no)], - [enable_dtrace="yes"],) + [enable_dtrace=$enableval],) if test "x$enable_dtrace" = "xyes"; then MOZ_CHECK_HEADER(sys/sdt.h, HAVE_DTRACE=1) if test -n "$HAVE_DTRACE"; then @@@@ -2664,7 +2665,7 @@@@ then fi case "$target" in - *-*-freebsd*) + *-*-freebsd*|*-dragonfly*) AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) dnl -pthread links in -lpthread, so don't specify it explicitly. @@@@ -2743,14 +2744,19 @@@@ fi AC_CACHE_CHECK( [for res_ninit()], ac_cv_func_res_ninit, - [AC_TRY_LINK([ + [AC_TRY_RUN([ #ifdef linux #define _BSD_SOURCE 1 #endif + #ifdef __NetBSD__ + #error use of global _res variable in threaded programs is not portable + #endif #include - ], - [int foo = res_ninit(&_res);], + int main(int argc, char **argv){ + int foo = res_ninit(&_res); + }], [ac_cv_func_res_ninit=yes], + [ac_cv_func_res_ninit=no], [ac_cv_func_res_ninit=no]) ]) @@@@ -3524,7 +3530,7 @@@@ if test "$MOZ_MEMORY"; then *-darwin*) AC_DEFINE(MOZ_MEMORY_DARWIN) ;; - *-*freebsd*) + *-*freebsd*|*-*dragonfly*) AC_DEFINE(MOZ_MEMORY_BSD) ;; *-android*|*-linuxandroid*) @@@@ -4424,6 +4430,16 @@@@ fi dnl ======================================================== dnl ECMAScript Internationalization API Support (uses ICU) dnl ======================================================== +ICU_LIB_NAMES= +MOZ_NATIVE_ICU= +MOZ_ARG_WITH_BOOL(system-icu, +[ --with-system-icu + Use system icu (located with pkgconfig)], + MOZ_NATIVE_ICU=1) + +if test -n "$MOZ_NATIVE_ICU"; then + PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) +fi if test -n "$JS_STANDALONE"; then ENABLE_INTL_API=1 @@@@ -4436,37 +4452,36 @@@@ MOZ_ARG_ENABLE_BOOL(intl-api, dnl Settings for the implementation of the ECMAScript Internationalization API if test -n "$ENABLE_INTL_API"; then AC_DEFINE(ENABLE_INTL_API) - # We build ICU as a static library. - AC_DEFINE(U_STATIC_IMPLEMENTATION) - case "$OS_TARGET" in - WINNT) - ICU_LIB_NAMES="icuin icuuc icudt" - ;; - Darwin|Linux) - ICU_LIB_NAMES="icui18n icuuc icudata" - ;; - *) - AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) - esac - - ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' -else - ICU_LIB_NAMES= - ICU_LIBS= + if test -z "$MOZ_NATIVE_ICU"; then + case "$OS_TARGET" in + WINNT) + ICU_LIB_NAMES="icuin icuuc icudt" + ;; + Darwin|Linux) + ICU_LIB_NAMES="icui18n icuuc icudata" + ;; + *) + AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) + esac + MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' + fi fi AC_SUBST(ENABLE_INTL_API) AC_SUBST(ICU_LIB_NAMES) -AC_SUBST(ICU_LIBS) +AC_SUBST(MOZ_ICU_LIBS) +AC_SUBST(MOZ_NATIVE_ICU) -dnl Source files that use ICU should have control over which parts of the ICU -dnl namespace they want to use. -AC_DEFINE(U_USING_ICU_NAMESPACE,0) +dnl Settings for ICU +if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then + dnl We build ICU as a static library. + AC_DEFINE(U_STATIC_IMPLEMENTATION) + dnl Source files that use ICU should have control over which parts of the ICU + dnl namespace they want to use. + AC_DEFINE(U_USING_ICU_NAMESPACE,0) -dnl Settings for ICU -if test -n "$ENABLE_INTL_API" ; then # Set ICU compile options ICU_CPPFLAGS="" # don't use icu namespace automatically in client code @ 1.4 log @Partially regenerate patches to avoid "ignoring" @ text @d1 1 a1 1 $NetBSD: patch-as,v 1.3 2014/01/03 17:15:23 richard Exp $ @ 1.3 log @fix dtrace patch in patch-as @ text @d1 1 a1 1 $NetBSD: patch-as,v 1.2 2013/12/15 14:02:25 ryoon Exp $ d5 1 a5 1 --- js/src/configure.in.orig 2013-12-06 02:21:11.000000000 +0000 d7 1 a7 1 @@@@ -2426,6 +2426,7 @@@@ EOF d15 1 a15 1 @@@@ -2434,7 +2435,7 @@@@ __attribute__ ((visibility ("default"))) d24 1 a24 1 @@@@ -2499,7 +2500,7 @@@@ AC_LANG_C d33 1 a33 1 @@@@ -2659,7 +2660,7 @@@@ then d42 1 a42 1 @@@@ -2738,14 +2739,19 @@@@ fi d65 1 a65 1 @@@@ -3519,7 +3525,7 @@@@ if test "$MOZ_MEMORY"; then d74 1 a74 1 @@@@ -4419,6 +4425,16 @@@@ fi d91 1 a91 1 @@@@ -4431,37 +4447,36 @@@@ MOZ_ARG_ENABLE_BOOL(intl-api, d97 1 a97 1 - d108 1 a108 1 @ 1.2 log @Update to 24.2.0 * Fix PR pkg/48420: fix build on NetBSD with drace support Patches from richard@@ Changelog: Fixed in Firefox ESR 24.2 MFSA 2013-117 Mis-issued ANSSI/DCSSI certificate MFSA 2013-116 JPEG information leak MFSA 2013-115 GetElementIC typed array stubs can be generated outside observed typesets MFSA 2013-114 Use-after-free in synthetic mouse movement MFSA 2013-113 Trust settings for built-in roots ignored during EV certificate validation MFSA 2013-111 Segmentation violation when replacing ordered list elements MFSA 2013-109 Use-after-free during Table Editing MFSA 2013-108 Use-after-free in event listeners MFSA 2013-104 Miscellaneous memory safety hazards (rv:26.0 / rv:24.2) @ text @d1 1 a1 1 $NetBSD: patch-as,v 1.1 2013/11/03 04:51:59 ryoon Exp $ d24 2 a25 1 @@@@ -2500,7 +2501,7 @@@@ AC_LANG_C d28 3 a30 3 [enable_dtrace="yes"],) -if test "x$enable_dtrace" = "xyes"; then +if test "x$enable_dtrace" = $enableval; then a32 1 AC_DEFINE(INCLUDE_MOZILLA_DTRACE) d97 1 a97 1 d108 1 a108 1 - @ 1.1 log @Import firefox24-24.1.0 as www/firefox24. Mozilla Firefox is a free, open-source and cross-platform web browser for Windows, Linux, MacOS X and many other operating systems. It is fast and easy to use, and offers many advantages over other web browsers, such as tabbed browsing and the ability to block pop-up windows. Firefox also offers excellent bookmark and history management, and it can be extended by developers using industry standards such as XML, CSS, JavaScript, C++, etc. Many extensions are available. This package tracks 24 extended support release branch. @ text @d1 1 a1 1 $NetBSD: patch-as,v 1.4 2013/09/19 12:37:49 ryoon Exp $ d5 1 a5 1 --- js/src/configure.in.orig 2013-09-10 03:43:34.000000000 +0000 d7 1 a7 1 @@@@ -2424,6 +2424,7 @@@@ EOF d15 1 a15 1 @@@@ -2432,7 +2433,7 @@@@ __attribute__ ((visibility ("default"))) d24 10 a33 1 @@@@ -2657,7 +2658,7 @@@@ then d42 1 a42 1 @@@@ -2736,14 +2737,19 @@@@ fi d65 1 a65 1 @@@@ -3517,7 +3523,7 @@@@ if test "$MOZ_MEMORY"; then d74 1 a74 1 @@@@ -4417,6 +4423,16 @@@@ fi d91 1 a91 1 @@@@ -4429,37 +4445,36 @@@@ MOZ_ARG_ENABLE_BOOL(intl-api, @