diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-10-01 21:42:28 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-10-29 07:53:41 +0200 |
| commit | 0035fdc7cc237ecfc1bd822fe4cb3e39eaf44861 (patch) | |
| tree | 13ca2032ab1d664d2d5021878fde1cfc665a911e /package/firefox | |
| parent | 6115d5a2ebd2dc7c81281f45e25a63ee0f4427bb (diff) | |
firefox: remove unneeded quota patch, use system icu
Diffstat (limited to 'package/firefox')
| -rw-r--r-- | package/firefox/Makefile | 1 | ||||
| -rw-r--r-- | package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp | 16 |
2 files changed, 1 insertions, 16 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 6716ae048..429534a68 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -57,6 +57,7 @@ CONFIGURE_ENV+= CROSS_COMPILE=1 \ ac_cv_sqlite_dbstat_vtab=yes CONFIGURE_ARGS+= --enable-application=browser \ --enable-official-branding \ + --with-system-icu \ --with-system-zlib \ --with-system-bz2 \ --with-system-png \ diff --git a/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp b/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp deleted file mode 100644 index 32345a436..000000000 --- a/package/firefox/patches/patch-xpcom_io_nsLocalFileUnix_cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- firefox-42.0.orig/xpcom/io/nsLocalFileUnix.cpp 2015-10-29 23:18:01.000000000 +0100 -+++ firefox-42.0/xpcom/io/nsLocalFileUnix.cpp 2015-12-17 18:31:49.639751737 +0100 -@@ -1407,8 +1407,13 @@ nsLocalFile::GetDiskSpaceAvailable(int64 - && dq.dqb_bhardlimit) { - int64_t QuotaSpaceAvailable = 0; - // dqb_bhardlimit is count of BLOCK_SIZE blocks, dqb_curspace is bytes -+#if defined(__UCLIBC__) -+ if ((BLOCK_SIZE * dq.dqb_bhardlimit) > dq.dqb_curblocks) -+ QuotaSpaceAvailable = int64_t(fs_buf.F_BSIZE * (dq.dqb_bhardlimit - dq.dqb_curblocks)); -+#else - if ((BLOCK_SIZE * dq.dqb_bhardlimit) > dq.dqb_curspace) - QuotaSpaceAvailable = int64_t(BLOCK_SIZE * dq.dqb_bhardlimit - dq.dqb_curspace); -+#endif - if (QuotaSpaceAvailable < *aDiskSpaceAvailable) { - *aDiskSpaceAvailable = QuotaSpaceAvailable; - } |