diff --git a/network/web/firefox/files/icu58.patch b/network/web/firefox/files/icu58.patch index c36039d974..9434439667 100644 --- a/network/web/firefox/files/icu58.patch +++ b/network/web/firefox/files/icu58.patch @@ -1,43 +1,43 @@ diff -Nuar a/build/autoconf/icu.m4 b/build/autoconf/icu.m4 ---- a/build/autoconf/icu.m4 2017-09-14 23:15:53.000000000 +0300 -+++ b/build/autoconf/icu.m4 2017-11-13 11:43:54.054556747 +0300 +--- a/build/autoconf/icu.m4 2017-11-16 13:59:07.382785239 +0300 ++++ b/build/autoconf/icu.m4 2017-11-16 13:58:09.618789407 +0300 @@ -15,7 +15,7 @@ MOZ_SYSTEM_ICU=1) if test -n "$MOZ_SYSTEM_ICU"; then - PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 59.1) -+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 58.2) ++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 58.0) CFLAGS="$CFLAGS $MOZ_ICU_CFLAGS" CXXFLAGS="$CXXFLAGS $MOZ_ICU_CFLAGS" fi diff -Nuar a/old-configure b/old-configure ---- a/old-configure 2017-09-27 00:09:17.000000000 +0300 -+++ b/old-configure 2017-11-13 11:42:42.974561876 +0300 -@@ -17775,29 +17775,29 @@ +--- a/old-configure 2017-11-12 17:58:43.000000000 +0300 ++++ b/old-configure 2017-11-16 13:56:43.494795621 +0300 +@@ -17666,29 +17666,29 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for icu-i18n >= 59.1""... $ac_c" 1>&6 --echo "configure:17780: checking for icu-i18n >= 59.1" >&5 -+ echo $ac_n "checking for icu-i18n >= 58.2""... $ac_c" 1>&6 -+echo "configure:17780: checking for icu-i18n >= 58.2" >&5 +-echo "configure:17671: checking for icu-i18n >= 59.1" >&5 ++ echo $ac_n "checking for icu-i18n >= 58.0""... $ac_c" 1>&6 ++echo "configure:17671: checking for icu-i18n >= 58.0" >&5 - if $PKG_CONFIG --exists "icu-i18n >= 59.1" ; then -+ if $PKG_CONFIG --exists "icu-i18n >= 58.2" ; then ++ if $PKG_CONFIG --exists "icu-i18n >= 58.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_ICU_CFLAGS""... $ac_c" 1>&6 - echo "configure:17787: checking MOZ_ICU_CFLAGS" >&5 + echo "configure:17678: checking MOZ_ICU_CFLAGS" >&5 - MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 59.1"` -+ MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 58.2"` ++ MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 58.0"` echo "$ac_t""$MOZ_ICU_CFLAGS" 1>&6 echo $ac_n "checking MOZ_ICU_LIBS""... $ac_c" 1>&6 - echo "configure:17792: checking MOZ_ICU_LIBS" >&5 + echo "configure:17683: checking MOZ_ICU_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic - MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 59.1\" |sed s/-Wl,--export-dynamic//g`" -+ MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 58.2\" |sed s/-Wl,--export-dynamic//g`" ++ MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 58.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_ICU_LIBS" 1>&6 else MOZ_ICU_CFLAGS="" @@ -45,16 +45,16 @@ diff -Nuar a/old-configure b/old-configure ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - MOZ_ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-i18n >= 59.1"` -+ MOZ_ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-i18n >= 58.2"` ++ MOZ_ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-i18n >= 58.0"` echo $MOZ_ICU_PKG_ERRORS fi -@@ -17813,7 +17813,7 @@ +@@ -17704,7 +17704,7 @@ : else if test "$COMPILE_ENVIRONMENT"; then - { echo "configure: error: Library requirements (icu-i18n >= 59.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (icu-i18n >= 59.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; } -+ { echo "configure: error: Library requirements (icu-i18n >= 58.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (icu-i18n >= 58.2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; } ++ { echo "configure: error: Library requirements (icu-i18n >= 58.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; echo "configure: error: Library requirements (icu-i18n >= 58.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&5; exit 1; } fi fi diff --git a/network/web/firefox/files/llvmversyon.patch b/network/web/firefox/files/llvmversyon.patch index 3d6397e460..bbac4847dc 100644 --- a/network/web/firefox/files/llvmversyon.patch +++ b/network/web/firefox/files/llvmversyon.patch @@ -1,16 +1,28 @@ diff -Nuar a/toolkit/moz.configure b/toolkit/moz.configure ---- a/toolkit/moz.configure 2017-09-14 23:16:01.000000000 +0300 -+++ b/toolkit/moz.configure 2017-11-13 11:29:08.953620612 +0300 -@@ -649,6 +649,8 @@ - 'llvm-config40', - 'llvm-config-3.9', - 'llvm-config39', -+ 'llvm-config-3.8', -+ 'llvm-config38', - 'llvm-config', - ] +--- a/toolkit/moz.configure 2017-11-16 13:38:11.571875852 +0300 ++++ b/toolkit/moz.configure 2017-11-16 13:35:29.679887533 +0300 +@@ -618,7 +618,7 @@ + @imports('os') + @imports('subprocess') + def llvm_config_paths(host): +- llvm_supported_versions = ['6.0', '5.0', '4.0', '3.9'] ++ llvm_supported_versions = ['6.0', '5.0', '4.0', '3.9', '3.8'] + llvm_config_progs = [] + for version in llvm_supported_versions: + llvm_config_progs += [ +@@ -662,9 +662,9 @@ -@@ -699,7 +701,7 @@ + with only_when(building_stylo_bindgen): + option('--with-libclang-path', nargs=1, +- help='Absolute path to a directory containing Clang/LLVM libraries for Stylo (version 3.9.x or above)') ++ help='Absolute path to a directory containing Clang/LLVM libraries for Stylo (version 3.8.x or above)') + option('--with-clang-path', nargs=1, +- help='Absolute path to a Clang binary for Stylo bindgen (version 3.9.x or above)') ++ help='Absolute path to a Clang binary for Stylo bindgen (version 3.8.x or above)') + + def invoke_llvm_config(llvm_config, *options): + '''Invoke llvm_config with the given options and return the first line of +@@ -675,7 +675,7 @@ @imports(_from='textwrap', _import='dedent') def check_minimum_llvm_config_version(llvm_config): version = Version(invoke_llvm_config(llvm_config, '--version')) diff --git a/network/web/firefox/pspec.xml b/network/web/firefox/pspec.xml index a473300987..4979d1ae15 100755 --- a/network/web/firefox/pspec.xml +++ b/network/web/firefox/pspec.xml @@ -15,7 +15,7 @@ app:gui Firefox Web Browser It is more secure and faster to browse the web with Firefox web browser. You can personalize your web browser with many specifications that is not enough to explain in two sentences. - https://ftp.mozilla.org/pub/firefox/releases/56.0.2/source/firefox-56.0.2.source.tar.xz + https://ftp.mozilla.org/pub/firefox/releases/57.0/source/firefox-57.0.source.tar.xz mozconfig @@ -57,10 +57,10 @@ firefox-install-dir.patch llvmversyon.patch icu58.patch - 0001-Bug-1384062-Make-SystemResourceMonitor.stop-more-res.patch + no-plt.diff - plugin-crash.diff - glibc-2.26-fix.diff + + @@ -542,6 +542,13 @@ + + 2017-11-19 + 57.0 + Version Bump + Mustafa Cinasal + muscnsl@gmail.com + 2017-11-12 56.0.2