MozillaFirefox/MozillaFirefox.spec
branchfirefox64
changeset 1082 821cfbe8efcc
parent 1081 9fec29d2ead2
child 1083 2f7023025374
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Dec 11 08:48:38 2018 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Dec 12 12:15:16 2018 +0100
@@ -18,15 +18,20 @@
 
 
 # changed with every update
-%define major          63
-%define mainver        %major.0.3
-%define orig_version   63.0.3
+%define major          64
+%define mainver        %major.0
+%define orig_version   64.0
 %define orig_suffix    %{nil}
 %define update_channel release
 %define branding       1
-%define releasedate    20181114214635
+%define releasedate    20181206201918
 %define source_prefix  firefox-%{orig_version}
 
+# use clang (upstream default since 64.0)
+%if 0%{?suse_version} > 1320
+%define clang_build 1
+%endif
+
 # PIE, full relro (x86_64 for now)
 %define build_hardened 1
 
@@ -66,7 +71,6 @@
 %else
 BuildRequires:  gcc-c++
 %endif
-BuildRequires:  cargo >= 1.28
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libcurl-devel
 BuildRequires:  libidl-devel
@@ -75,13 +79,14 @@
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
 BuildRequires:  mozilla-nspr-devel >= 4.20
-BuildRequires:  mozilla-nss-devel >= 3.39
+BuildRequires:  mozilla-nss-devel >= 3.40.1
 BuildRequires:  nodejs8 >= 8.11
 BuildRequires:  python-devel
 BuildRequires:  python2-xml
 BuildRequires:  python3 >= 3.5
-BuildRequires:  rust >= 1.28
-BuildRequires:  rust-cbindgen >= 0.6.2
+BuildRequires:  rust >= 1.29
+BuildRequires:  cargo >= 1.29
+BuildRequires:  rust-cbindgen >= 0.6.4
 BuildRequires:  startup-notification-devel
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
@@ -160,8 +165,7 @@
 Patch7:         mozilla-aarch64-startup-crash.patch
 Patch8:         mozilla-bmo256180.patch
 Patch9:         mozilla-bmo1463035.patch
-Patch10:        mozilla-bmo1491289.patch
-Patch11:        mozilla-cubeb-noreturn.patch
+Patch10:        mozilla-cubeb-noreturn.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-branded-icons.patch
@@ -272,7 +276,6 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
@@ -303,9 +306,11 @@
 %endif
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 # boo#986541: add -fno-delete-null-pointer-checks for gcc6
+%if 0%{?clang_build} == 0
 %if 0%{?suse_version} > 1320
 export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
 %endif
+%endif
 %ifarch %arm %ix86
 # Limit RAM usage during link
 export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
@@ -336,8 +341,10 @@
 ac_add_options --disable-gconf
 %endif
 %if 0%{?build_hardened}
+%if 0%{?clang_build} == 0
 ac_add_options --enable-pie
 %endif
+%endif
 # gcc7 (boo#104105)
 %if 0%{?suse_version} > 1320
 ac_add_options --enable-optimize="-g -O2"