rpms/firefox
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into f26

Browse Source
This commit is contained in:
Martin Stransky 2018-03-07 13:45:15 +01:00
commit 957147e501
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firefox-mozconfig
View File

@ -1,6 +1,6 @@
. $topsrcdir/browser/config/mozconfig . $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 --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR" 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 --with-google-api-keyfile=../google-api-key
ac_add_options --enable-release ac_add_options --enable-release
ac_add_options --enable-pie ac_add_options --enable-pie
ac_add_options --with-gl-provider=EGL
# Workaround for mozbz#1341234 # Workaround for mozbz#1341234
ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)" ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"

3
firefox.spec
View File

@ -433,6 +433,9 @@ echo "ac_add_options --disable-ion" >> .mozconfig
echo "ac_add_options --disable-stylo" >> .mozconfig echo "ac_add_options --disable-stylo" >> .mozconfig
%endif %endif
# Remove executable bit to make brp-mangle-shebangs happy.
chmod -x third_party/rust/itertools/src/lib.rs
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%build %build