diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | aarch64-fix-skia.patch | 4 | ||||
| -rw-r--r-- | firefox-debug.patch | 10 | ||||
| -rw-r--r-- | firefox-nspr.patch | 12 | ||||
| -rw-r--r-- | firefox-ppc64le.patch | 4 | ||||
| -rw-r--r-- | firefox.spec | 12 | ||||
| -rw-r--r-- | sources | 4 |
7 files changed, 17 insertions, 30 deletions
@@ -166,3 +166,4 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-41.0.2-20151015.tar.xz /firefox-42.0.source.tar.xz /firefox-langpacks-42.0-20151029.tar.xz +/firefox-langpacks-42.0-20151030.tar.xz diff --git a/aarch64-fix-skia.patch b/aarch64-fix-skia.patch index 4b9958d..17df80e 100644 --- a/aarch64-fix-skia.patch +++ b/aarch64-fix-skia.patch @@ -2,8 +2,8 @@ Based on https://github.com/google/skia/commit/b79ff56de23fef680ae7187040f2d6a95 Index: mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h =================================================================== ---- mozilla-release.orig/gfx/skia/trunk/src/core/SkUtilsArm.h -+++ mozilla-release/gfx/skia/trunk/src/core/SkUtilsArm.h +--- mozilla-release/gfx/skia/skia/src/core/SkUtilsArm.h ++++ mozilla-release/gfx/skia/skia/src/core/SkUtilsArm.h @@ -21,9 +21,9 @@ #define SK_ARM_NEON_MODE_ALWAYS 1 #define SK_ARM_NEON_MODE_DYNAMIC 2 diff --git a/firefox-debug.patch b/firefox-debug.patch index b719d26..d1da5cb 100644 --- a/firefox-debug.patch +++ b/firefox-debug.patch @@ -1,7 +1,7 @@ -diff -up mozilla-release/browser/installer/package-manifest.in.old mozilla-release/browser/installer/package-manifest.in ---- mozilla-release/browser/installer/package-manifest.in.old 2015-04-03 04:30:05.000000000 +0200 -+++ mozilla-release/browser/installer/package-manifest.in 2015-04-07 13:17:44.180343700 +0200 -@@ -608,7 +608,7 @@ +diff -up firefox-42.0/browser/installer/package-manifest.in.debug firefox-42.0/browser/installer/package-manifest.in +--- firefox-42.0/browser/installer/package-manifest.in.debug 2015-10-30 15:35:53.231857572 +0100 ++++ firefox-42.0/browser/installer/package-manifest.in 2015-10-30 15:36:58.975091068 +0100 +@@ -620,7 +620,7 @@ @RESPATH@/components/MozKeyboard.js @RESPATH@/components/InputMethod.manifest @@ -9,4 +9,4 @@ diff -up mozilla-release/browser/installer/package-manifest.in.old mozilla-relea +#ifdef ENABLE_TESTS @RESPATH@/components/TestInterfaceJS.js @RESPATH@/components/TestInterfaceJS.manifest - #endif + @RESPATH@/components/TestInterfaceJSMaplike.js diff --git a/firefox-nspr.patch b/firefox-nspr.patch deleted file mode 100644 index 5577be6..0000000 --- a/firefox-nspr.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up firefox-42.0/firefox-42.0/configure.in.old firefox-42.0/firefox-42.0/configure.in ---- firefox-42.0/firefox-42.0/configure.in.old 2015-10-27 01:10:02.000000000 +0100 -+++ firefox-42.0/firefox-42.0/configure.in 2015-10-29 11:56:49.779827023 +0100 -@@ -53,7 +53,7 @@ dnl ==================================== - MOZJPEG=62 - MOZPNG=10617 - NSPR_VERSION=4 --NSPR_MINVER=4.10.10 -+NSPR_MINVER=4.10.8 - NSS_VERSION=3 - - dnl Set the minimum version of toolkit libs used by mozilla diff --git a/firefox-ppc64le.patch b/firefox-ppc64le.patch index 6465eec..9f74819 100644 --- a/firefox-ppc64le.patch +++ b/firefox-ppc64le.patch @@ -1,6 +1,6 @@ diff -up firefox-36.0/mozilla-release/gfx/skia/trunk/include/core/SkPreConfig.h.ppc64le firefox-36.0/mozilla-release/gfx/skia/trunk/include/core/SkPreConfig.h ---- firefox-36.0/mozilla-release/gfx/skia/trunk/include/core/SkPreConfig.h.ppc64le 2015-02-20 03:01:40.000000000 +0100 -+++ firefox-36.0/mozilla-release/gfx/skia/trunk/include/core/SkPreConfig.h 2015-03-06 15:52:58.298050379 +0100 +--- firefox-36.0/mozilla-release/gfx/skia/skia/include/core/SkPreConfig.h.ppc64le 2015-02-20 03:01:40.000000000 +0100 ++++ firefox-36.0/mozilla-release/gfx/skia/skia/include/core/SkPreConfig.h 2015-03-06 15:52:58.298050379 +0100 @@ -90,6 +90,13 @@ #endif diff --git a/firefox.spec b/firefox.spec index 1048b9d..9ebeeaf 100644 --- a/firefox.spec +++ b/firefox.spec @@ -56,7 +56,7 @@ %global libvpx_version 1.3.0 %if %{?system_nss} -%global nspr_version 4.10.8 +%global nspr_version 4.10.10 %global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) %global nss_version 3.19.2 %global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) @@ -92,7 +92,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20151029.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20151030.tar.xz %endif Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js @@ -114,7 +114,6 @@ Patch20: firefox-build-prbool.patch Patch21: firefox-ppc64le.patch Patch24: firefox-debug.patch Patch25: rhbz-1219542-s390-build.patch -Patch26: firefox-nspr.patch # Fedora specific patches # Unable to install addons from https pages @@ -250,12 +249,11 @@ cd %{tarballdir} %patch18 -p2 -b .jemalloc-ppc %patch19 -p2 -b .s390-inlines %patch20 -p1 -b .prbool -#%patch21 -p2 -b .ppc64le -#%patch24 -p1 -b .debug +%patch21 -p2 -b .ppc64le +%patch24 -p1 -b .debug %ifarch s390 %patch25 -p1 -b .rhbz-1219542-s390 %endif -%patch26 -p2 -b .nspr %patch3 -p2 -b .arm @@ -273,7 +271,7 @@ cd %{tarballdir} %patch425 -p1 -b .1192243 %endif -#%patch500 -p1 +%patch500 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -1,2 +1,2 @@ -493e983a16dc2bc7a721e1e1457b074e firefox-42.0.source.tar.xz -58282feac2ca4f2431e969ec5eda5dce firefox-langpacks-42.0-20151029.tar.xz +d610bf10a75afb4734045e1a43d8eba4 firefox-42.0.source.tar.xz +bbc7022c261f147ac23e683f22939db0 firefox-langpacks-42.0-20151030.tar.xz |