Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4479 from Rmys/master

Browse Source 
firefox-58.0.1:ver.bump
This commit is contained in:
Rmys
2018-02-04 12:56:23 +03:00
committed by GitHub
parent 409f9f715e eeb149f04c
commit f7bfb0abb5
5 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/web/firefox/files/icu58.patch
+17 -17
View File
@@ -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
network/web/firefox/files/mozconfig
+5 -5
View File
@@ -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
network/web/firefox/files/no-crmf.diff
+15
View File
@@ -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
network/web/firefox/files/rustc.patch
+12
View File
@@ -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
network/web/firefox/pspec.xml
+14 -7
View File
@@ -15,7 +15,7 @@
<IsA>app:gui</IsA>
<Summary>Firefox Web Browser</Summary>
<Description>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.</Description>
<Archive sha1sum="c7e3aa5db3c711b9bc3e82224fae49c829cc857d" type="tarxz">https://ftp.mozilla.org/pub/firefox/releases/57.0.4/source/firefox-57.0.4.source.tar.xz</Archive>
<Archive sha1sum="33dde117cef998eadb8fe53e2d045ae8dd27c8bf" type="tarxz">https://ftp.mozilla.org/pub/firefox/releases/58.0.1/source/firefox-58.0.1.source.tar.xz</Archive>
<AdditionalFiles>
<!--Our main configure script. Configure paramters are stored here.-->
<AdditionalFile target=".mozconfig" permission="0644">mozconfig</AdditionalFile>
@@ -57,10 +57,10 @@
<Patches>
<Patch level="1">firefox-install-dir.patch</Patch>
<Patch level="1">llvmversyon.patch</Patch>
<Patch level="1">icu58.patch</Patch>
<Patch level="1">0001-Bug-1360278-Add-preference-to-trigger-context-menu-o.patch</Patch>
<Patch level="1">0002-Bug-1419426-Implement-browserSettings.contextMenuSho.patch</Patch>
<Patch level="1">no-plt.diff</Patch>
<!-- <Patch level="1">icu58.patch</Patch> -->
<Patch level="1">rustc.patch</Patch>
<!-- <Patch level="1">0002-Bug-1419426-Implement-browserSettings.contextMenuSho.patch</Patch> -->
<Patch level="1">no-crmf.diff</Patch>
<!-- <Patch level="1">plugin-crash.diff</Patch> -->
<!-- <Patch level="1">glibc-2.26-fix.diff</Patch> -->
</Patches>
@@ -90,7 +90,7 @@
<Dependency>iconcan</Dependency> <!--for <ICON></ICON>-->
<Dependency>libXext</Dependency>
<Dependency versionFrom="58.2">icu4c</Dependency>
<!--Dependency>libvpx</Dependency-->
<Dependency>libvpx</Dependency>
<Dependency>alsa-lib</Dependency>
<!--Dependency>gconf</Dependency-->
<Dependency>libevent</Dependency>
@@ -104,7 +104,7 @@
<Dependency>libXdamage</Dependency>
<Dependency>libXrender</Dependency>
<Dependency>libXcomposite</Dependency>
<!--Dependency>libjpeg-turbo</Dependency-->
<Dependency>libjpeg-turbo</Dependency>
<Dependency>startup-notification</Dependency>
</RuntimeDependencies>
<Files>
@@ -544,6 +544,13 @@
</Package>
<History>
<Update release="12">
<Date>2018-02-04</Date>
<Version>58.0.1</Version>
<Comment>Version Bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11">
<Date>2018-01-07</Date>
<Version>57.0.4</Version>