diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | firefox.spec | 60 | ||||
| -rw-r--r-- | mozilla-fix-attr-order.patch | 28 | ||||
| -rw-r--r-- | sources | 4 |
4 files changed, 49 insertions, 48 deletions
@@ -276,4 +276,7 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-57.0.4-20180104.tar.xz /firefox-58.0.source.tar.xz /firefox-langpacks-58.0-20180123.tar.xz -/mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24.tar.bz2 +/firefox-58.0.1.source.tar.xz +/firefox-langpacks-58.0.1-20180130.tar.xz +/2f6a4d2cf42c9d59626061d45c043817cb220814.tar.bz2 +/firefox-langpacks-59.0-20180306.tar.xz
\ No newline at end of file diff --git a/firefox.spec b/firefox.spec index 806f952..109480d 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,7 +1,5 @@ -ExclusiveArch: x86_64 i686 - # Use system nspr/nss? -%global system_nss 0 +%global system_nss 1 # Use system hunspell? %if 0%{?fedora} > 25 @@ -82,13 +80,13 @@ ExclusiveArch: x86_64 i686 %global mozappdir %{_libdir}/%{name} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} %global langpackdir %{mozappdir}/langpacks -#%global tarballdir %{name}-%{version}%{?pre_version} -%global tarballdir mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24 +%global release_hash 2f6a4d2cf42c9d59626061d45c043817cb220814 +%global tarballdir mozilla-release-%{release_hash} -%global official_branding 0 -%global build_langpacks 0 +%global official_branding 1 +%global build_langpacks 1 -%global enable_mozilla_crashreporter 0 +%global enable_mozilla_crashreporter 1 %if !%{debug_build} %ifarch %{ix86} x86_64 %global enable_mozilla_crashreporter 0 @@ -98,13 +96,12 @@ ExclusiveArch: x86_64 i686 Summary: Mozilla Firefox Web browser Name: firefox Version: 59.0 -Release: 0.8%{?pre_tag}%{?dist} +Release: 1%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ -#Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz -Source0: mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24.tar.bz2 +Source0: https://hg.mozilla.org/releases/mozilla-release/archive/%{release_hash}.tar.bz2 %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20180123.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20180306.tar.xz %endif Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js @@ -136,6 +133,7 @@ Patch36: build-missing-xlocale-h.patch Patch37: build-jit-atomic-always-lucky.patch # Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x) Patch38: build-cacheFlush-missing.patch +Patch39: mozilla-fix-attr-order.patch # Fedora specific patches Patch215: firefox-enable-addons.patch @@ -310,6 +308,7 @@ This package contains results of tests executed during build. %endif %patch29 -p1 -b .big-endian %patch37 -p1 -b .jit-atomic-lucky +%patch39 -p1 -b .fix-attr-order %patch3 -p1 -b .arm @@ -593,16 +592,11 @@ DESTDIR=%{buildroot} make -C objdir install %{__mkdir_p} %{buildroot}{%{_libdir},%{_bindir},%{_datadir}/applications} desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE20} -desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE29} # set up the firefox start script %{__rm} -rf %{buildroot}%{_bindir}/firefox %{__cat} %{SOURCE21} > %{buildroot}%{_bindir}/firefox %{__chmod} 755 %{buildroot}%{_bindir}/firefox -%{__cat} %{SOURCE28} > %{buildroot}%{_bindir}/firefox-wayland -%{__chmod} 755 %{buildroot}%{_bindir}/firefox-wayland -%{__cat} %{SOURCE30} > %{buildroot}%{_bindir}/firefox-x11 -%{__chmod} 755 %{buildroot}%{_bindir}/firefox-x11 %{__install} -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/firefox.1 @@ -801,8 +795,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %{_bindir}/firefox -%{_bindir}/firefox-wayland -%{_bindir}/firefox-x11 %{mozappdir}/firefox %{mozappdir}/firefox-bin %doc %{_mandir}/man1/* @@ -870,33 +862,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Fri Feb 2 2018 Martin Stransky <stransky@redhat.com> - 59.0-0.8 -- Fix crash when e10s is disabled and default wl_queue is processed. - -* Fri Feb 2 2018 Martin Stransky <stransky@redhat.com> - 59.0-0.7 -- Fixed Firefox X11 desktop file launcher. - -* Thu Feb 1 2018 Martin Stransky <stransky@redhat.com> - 59.0-0.6 -- Fixed remote window focus (mozbz#1434565). - -* Thu Feb 1 2018 Martin Stransky <stransky@redhat.com> - 59.0-0.5 -- Fixed clipboard copy->paste between Firefox windows - (mozbz#1434572). - -* Wed Jan 31 2018 Martin Stransky <stransky@redhat.com> - 59.0-0.4 -- Fixed remote launch when no profile name is given. - -* Wed Jan 31 2018 Martin Stransky <stransky@redhat.com> - 59.0-0.3 -- Added X11 launcher - -* Tue Jan 30 2018 Martin Stransky <stransky@redhat.com> - 59.0-0.2 -- Fixed typo at startup script. -- Added Wayland specific patches mozbz#1431052 mozbz#1432414 - mozbz#1434202 +* Tue Mar 6 2018 Martin Stransky <stransky@redhat.com> - 59.0-1 +- Updated to 59.0 -* Mon Jan 29 2018 Martin Stransky <stransky@redhat.com> - 59.0-0.1 -- Update to Firefox 59.0 Beta 4 -- Enabled Wayland backend +* Tue Feb 13 2018 Martin Stransky <stransky@redhat.com> - 58.0.1-3 +- Added build fix for gcc8 by Tom Callaway * Wed Jan 24 2018 Martin Stransky <stransky@redhat.com> - 58.0-4 - Enabled second arches diff --git a/mozilla-fix-attr-order.patch b/mozilla-fix-attr-order.patch new file mode 100644 index 0000000..aef2d25 --- /dev/null +++ b/mozilla-fix-attr-order.patch @@ -0,0 +1,28 @@ +diff -up mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c.fix-attr-order mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c +--- mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c.fix-attr-order 2018-02-03 11:59:21.173058184 -0500 ++++ mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/common_audio/vad/vad_core.c 2018-02-03 11:59:44.727509671 -0500 +@@ -115,8 +115,8 @@ static int32_t WeightedAverage(int16_t* + // undefined behavior, so not a good idea; this just makes UBSan ignore the + // violation, so that our old code can continue to do what it's always been + // doing.) +-static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) +- RTC_NO_SANITIZE("signed-integer-overflow") { ++RTC_NO_SANITIZE("signed-integer-overflow") static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) ++{ + return a * b; + } + +diff -up mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c.fix-attr-order mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c +--- mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c.fix-attr-order 2018-02-03 12:00:01.033129964 -0500 ++++ mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24/media/webrtc/trunk/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c 2018-02-03 12:00:45.758088456 -0500 +@@ -209,8 +209,8 @@ void WebRtcIsacfix_NormLatticeFilterMa(s + // Left shift of an int32_t that's allowed to overflow. (It's still undefined + // behavior, so not a good idea; this just makes UBSan ignore the violation, so + // that our old code can continue to do what it's always been doing.) +-static inline int32_t OverflowingLShiftS32(int32_t x, int shift) +- RTC_NO_SANITIZE("shift") { ++RTC_NO_SANITIZE("shift") static inline int32_t OverflowingLShiftS32(int32_t x, int shift) ++{ + return x << shift; + } + @@ -1,2 +1,2 @@ -SHA512 (firefox-langpacks-58.0-20180123.tar.xz) = 6781bf0a5d68bdaa513f85404b8d9111bef8d2aa6d12e1b5fa8db2e4f44fce2d2642b9b5a70a6fc92f0cb96167f6895e17505bdc212aea987240cfb018f340f5 -SHA512 (mozilla-beta-64737c752ac4af4766ad6f82720818521f3aca24.tar.bz2) = 77d6455adc011289391a63c2de9f05be78b6c293f0dd6cd064b6d0c4ba3b50a7cadfc190000aeaeb9c276e43de60ecfe30829426da2366110c407bd0197d15ef +SHA512 (2f6a4d2cf42c9d59626061d45c043817cb220814.tar.bz2) = 78d7e6da9062cdf0883097fa5bbad7c7db3f9b28dae9413e1ed880f34bb9fbfd9b2524b2c25fbca55bcf796b5023c42131758bf5bdee6c404e572bc751287215 +SHA512 (firefox-langpacks-59.0-20180306.tar.xz) = 7eda70eca83679581ef3e015e066f9d1a338bf7aab54f3f851a04d68d3155190d5e03cafca1f9716ff33648d78fec74ec07c2041a9a81c7aed5f8649ca367712 |