diff --git a/network/web/firefox/files/icu58.patch b/network/web/firefox/files/icu58.patch index 9434439667..f8683c8c0c 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-11-16 13:59:07.382785239 +0300 -+++ b/build/autoconf/icu.m4 2017-11-16 13:58:09.618789407 +0300 +--- a/build/autoconf/icu.m4 2017-09-14 23:15:53.000000000 +0300 ++++ b/build/autoconf/icu.m4 2018-01-19 18:45:55.713445653 +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.0) ++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 58.2) CFLAGS="$CFLAGS $MOZ_ICU_CFLAGS" CXXFLAGS="$CXXFLAGS $MOZ_ICU_CFLAGS" fi diff -Nuar a/old-configure b/old-configure ---- 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 @@ +--- a/old-configure 2018-01-19 02:55:53.000000000 +0300 ++++ b/old-configure 2018-01-19 18:45:13.792448678 +0300 +@@ -17589,29 +17589,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: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 +-echo "configure:17594: checking for icu-i18n >= 59.1" >&5 ++ echo $ac_n "checking for icu-i18n >= 58.2""... $ac_c" 1>&6 ++echo "configure:17594: checking for icu-i18n >= 58.2" >&5 - if $PKG_CONFIG --exists "icu-i18n >= 59.1" ; then -+ if $PKG_CONFIG --exists "icu-i18n >= 58.0" ; then ++ if $PKG_CONFIG --exists "icu-i18n >= 58.2" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_ICU_CFLAGS""... $ac_c" 1>&6 - echo "configure:17678: checking MOZ_ICU_CFLAGS" >&5 + echo "configure:17601: checking MOZ_ICU_CFLAGS" >&5 - MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 59.1"` -+ MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 58.0"` ++ MOZ_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-i18n >= 58.2"` echo "$ac_t""$MOZ_ICU_CFLAGS" 1>&6 echo $ac_n "checking MOZ_ICU_LIBS""... $ac_c" 1>&6 - echo "configure:17683: checking MOZ_ICU_LIBS" >&5 + echo "configure:17606: 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.0\" |sed s/-Wl,--export-dynamic//g`" ++ MOZ_ICU_LIBS="`$PKG_CONFIG --libs \"icu-i18n >= 58.2\" |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.0"` ++ MOZ_ICU_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "icu-i18n >= 58.2"` echo $MOZ_ICU_PKG_ERRORS fi -@@ -17704,7 +17704,7 @@ +@@ -17627,7 +17627,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.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; } ++ { 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; } fi fi diff --git a/network/web/firefox/files/mozconfig b/network/web/firefox/files/mozconfig index 276671ba50..fb58816ea7 100755 --- a/network/web/firefox/files/mozconfig +++ b/network/web/firefox/files/mozconfig @@ -7,14 +7,14 @@ ac_add_options --enable-release ac_add_options --enable-official-branding # System libraries -#ac_add_options --with-system-nspr -#ac_add_options --with-system-nss -#ac_add_options --with-system-icu -#ac_add_options --with-system-jpeg +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-icu +ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 #ac_add_options --with-system-libevent -#ac_add_options --with-system-libvpx +ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-ffi #ac_add_options --enable-system-pixman diff --git a/network/web/firefox/files/no-crmf.diff b/network/web/firefox/files/no-crmf.diff new file mode 100644 index 0000000000..242304eb41 --- /dev/null +++ b/network/web/firefox/files/no-crmf.diff @@ -0,0 +1,15 @@ +diff --git i/old-configure.in w/old-configure.in +index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644 +--- i/old-configure.in ++++ w/old-configure.in +@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then + AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + +-if test -n "$MOZ_SYSTEM_NSS"; then +- NSS_LIBS="$NSS_LIBS -lcrmf" +-else ++if test -z "$MOZ_SYSTEM_NSS"; then + NSS_CFLAGS="-I${DIST}/include/nss" + case "${OS_ARCH}" in + # Only few platforms have been tested with GYP diff --git a/network/web/firefox/files/rustc.patch b/network/web/firefox/files/rustc.patch new file mode 100644 index 0000000000..f55baa8541 --- /dev/null +++ b/network/web/firefox/files/rustc.patch @@ -0,0 +1,12 @@ +diff -Nuar a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure +--- a/build/moz.configure/rust.configure 2018-01-11 23:16:54.000000000 +0300 ++++ b/build/moz.configure/rust.configure 2018-01-20 11:41:47.109584234 +0300 +@@ -58,7 +58,7 @@ + You can install rust by running './mach bootstrap' + or by directly running the installer from https://rustup.rs/ + ''')) +- rustc_min_version = Version('1.21.0') ++ rustc_min_version = Version('1.20.0') + cargo_min_version = Version('0.{}'.format(rustc_min_version.minor + 1)) + + version = rustc_info.version diff --git a/network/web/firefox/pspec.xml b/network/web/firefox/pspec.xml index aa2567ff52..f0623e70e4 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/57.0.4/source/firefox-57.0.4.source.tar.xz + https://ftp.mozilla.org/pub/firefox/releases/58.0.1/source/firefox-58.0.1.source.tar.xz mozconfig @@ -57,10 +57,10 @@ firefox-install-dir.patch llvmversyon.patch - icu58.patch - 0001-Bug-1360278-Add-preference-to-trigger-context-menu-o.patch - 0002-Bug-1419426-Implement-browserSettings.contextMenuSho.patch - no-plt.diff + + rustc.patch + + no-crmf.diff @@ -90,7 +90,7 @@ iconcan libXext icu4c - + libvpx alsa-lib libevent @@ -104,7 +104,7 @@ libXdamage libXrender libXcomposite - + libjpeg-turbo startup-notification @@ -544,6 +544,13 @@ + + 2018-02-04 + 58.0.1 + Version Bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-01-07 57.0.4