commit 329a2b8758f06f101e9ad5d9bc8034810f441868 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Fri Nov 29 18:41:04 2013 +0100
- up to 25.0.1 mozilla-firefox-941837.patch | 20 ++++++++++++++++++++ mozilla-firefox.spec | 6 ++++-- 2 files changed, 24 insertions(+), 2 deletions(-) --- diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec index b5f2661..3d30abf 100644 --- a/mozilla-firefox.spec +++ b/mozilla-firefox.spec @@ -21,17 +21,18 @@ Summary: Firefox Community Edition web browser Summary(pl.UTF-8): Firefox Community Edition - przeglÄ…darka WWW Name: mozilla-firefox -Version: 25.0 +Version: 25.0.1 Release: 1 License: MPL 1.1 or GPL v2+ or LGPL v2.1+ Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2 -# Source0-md5: 90ac047e83079a9046192c732e195329 +# Source0-md5: b5b57d3ea937a339e0ed7ebea604b430 Source3: %{name}.desktop Source4: %{name}.sh Source5: vendor.js Source6: vendor-ac.js Patch0: %{name}-branding.patch +Patch1: %{name}-941837.patch Patch7: %{name}-prefs.patch Patch9: %{name}-no-subshell.patch Patch11: %{name}-middle_click_paste.patch @@ -139,6 +140,7 @@ mv -f mozilla-release mozilla cd mozilla %patch0 -p1 +%patch1 -p1 %patch7 -p1 %patch9 -p2 %patch11 -p2 diff --git a/mozilla-firefox-941837.patch b/mozilla-firefox-941837.patch new file mode 100644 index 0000000..8e85cf6 --- /dev/null +++ b/mozilla-firefox-941837.patch @@ -0,0 +1,20 @@ +--- a/js/src/gc/Memory.cpp.orig 2013-11-13 01:13:53.000000000 +0100 ++++ a/js/src/gc/Memory.cpp 2013-11-28 05:03:31.160133711 +0100 +@@ -63,7 +63,7 @@ + p = VirtualAlloc(NULL, size * 2, MEM_RESERVE, PAGE_READWRITE); + if (!p) + return NULL; +- void *chunkStart = (void *)(uintptr_t(p) + (alignment - (uintptr_t(p) % alignment))); ++ void *chunkStart = (void *)AlignBytes(uintptr_t(p), alignment); + UnmapPages(rt, p, size * 2); + p = VirtualAlloc(chunkStart, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); + +@@ -335,7 +335,7 @@ + uintptr_t offset = uintptr_t(region) % alignment; + JS_ASSERT(offset < reqSize - size); + +- void *front = (void *)(uintptr_t(region) + (alignment - offset)); ++ void *front = (void *)AlignBytes(uintptr_t(region), alignment); + void *end = (void *)(uintptr_t(front) + size); + if (front != region) + JS_ALWAYS_TRUE(0 == munmap(region, alignment - offset)); ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/mozilla-firefox.git/commitdiff/329a2b8758f06f101e9ad5d9bc8034810f441868 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit