summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2018-03-07 13:45:15 +0100
committerMartin Stransky <stransky@redhat.com>2018-03-07 13:45:15 +0100
commit957147e50102e536c67a4804f5c7a1b6581ddc70 (patch)
tree05b47cd70f201b4427cfeb299e189e8688362ec8
parentMerge branch 'master' into f26 (diff)
parentBuild fix lib.rs file (diff)
downloadlibrewolf-fedora-ff-957147e50102e536c67a4804f5c7a1b6581ddc70.tar.gz
librewolf-fedora-ff-957147e50102e536c67a4804f5c7a1b6581ddc70.tar.bz2
librewolf-fedora-ff-957147e50102e536c67a4804f5c7a1b6581ddc70.zip
Merge branch 'master' into f26
-rw-r--r--firefox-mozconfig3
-rw-r--r--firefox.spec3
2 files changed, 4 insertions, 2 deletions
diff --git a/firefox-mozconfig b/firefox-mozconfig
index 953df70..6b4cb54 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -1,6 +1,6 @@
. $topsrcdir/browser/config/mozconfig
-ac_add_options --enable-default-toolkit=cairo-gtk3-wayland
+ac_add_options --enable-default-toolkit=cairo-gtk3
ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
@@ -20,7 +20,6 @@ ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
ac_add_options --with-google-api-keyfile=../google-api-key
ac_add_options --enable-release
ac_add_options --enable-pie
-ac_add_options --with-gl-provider=EGL
# Workaround for mozbz#1341234
ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
diff --git a/firefox.spec b/firefox.spec
index 0b69b7a..7e97177 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -433,6 +433,9 @@ echo "ac_add_options --disable-ion" >> .mozconfig
echo "ac_add_options --disable-stylo" >> .mozconfig
%endif
+# Remove executable bit to make brp-mangle-shebangs happy.
+chmod -x third_party/rust/itertools/src/lib.rs
+
#---------------------------------------------------------------------
%build
bgstack15