summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2017-10-06 09:53:15 +0200
committerMartin Stransky <stransky@redhat.com>2017-10-06 09:53:15 +0200
commitc69ed95f5cdf2d972343ad755e3004fb506dd8ee (patch)
tree7b70c5ca8881b5f8cdfd2d470d20ab0cf73d40a7
parentFixed rhbz#1497932 - Plug-Ins for example flash fails because of unresolved s... (diff)
downloadlibrewolf-fedora-ff-c69ed95f5cdf2d972343ad755e3004fb506dd8ee.tar.gz
librewolf-fedora-ff-c69ed95f5cdf2d972343ad755e3004fb506dd8ee.tar.bz2
librewolf-fedora-ff-c69ed95f5cdf2d972343ad755e3004fb506dd8ee.zip
Enabled stylo again
-rw-r--r--firefox-mozconfig3
-rw-r--r--firefox.spec11
-rw-r--r--mozilla-1341234.patch9
3 files changed, 10 insertions, 13 deletions
diff --git a/firefox-mozconfig b/firefox-mozconfig
index f98a89e..f3f4d15 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -22,7 +22,8 @@ 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 --disable-stylo
+# Workaround for mozbz#1341234
+ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
diff --git a/firefox.spec b/firefox.spec
index 1c7028f..fe2c132 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,3 +1,7 @@
+%if 0%{?fedora} < 26
+ExcludeArch: armv7hl
+%endif
+
# Use ALSA backend?
%define alsa_backend 0
@@ -99,7 +103,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 56.0
-Release: 4%{?pre_tag}%{?dist}
+Release: 5%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -159,7 +163,6 @@ Patch410: mozilla-1321521.patch
Patch411: mozilla-1321521-2.patch
Patch412: mozilla-1337988.patch
Patch413: mozilla-1353817.patch
-Patch414: mozilla-1341234.patch
Patch415: mozilla-1405267.patch
# Debian patches
@@ -347,7 +350,6 @@ This package contains results of tests executed during build.
%endif
%endif
%patch413 -p1 -b .1353817
-%patch414 -p1 -b .1341234
%patch415 -p1 -b .1405267
# Debian extension patch
@@ -871,6 +873,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Fri Oct 6 2017 Martin Stransky <stransky@redhat.com> - 56.0-5
+- Enable Stylo again.
+
* Wed Oct 4 2017 Martin Stransky <stransky@redhat.com> - 56.0-4
- Fixed rhbz#1497932 - Plug-Ins for example flash fails
because of unresolved symbols
diff --git a/mozilla-1341234.patch b/mozilla-1341234.patch
deleted file mode 100644
index 2de5080..0000000
--- a/mozilla-1341234.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up firefox-56.0/layout/style/bindgen.toml.in.old firefox-56.0/layout/style/bindgen.toml.in
---- firefox-56.0/layout/style/bindgen.toml.in.old 2017-09-27 16:30:14.518213900 +0200
-+++ firefox-56.0/layout/style/bindgen.toml.in 2017-09-27 16:30:38.089179153 +0200
-@@ -1,4 +1,5 @@
- [build]
- args = [
-+ "/usr/include",
- @BINDGEN_CFLAGS@
- ]
bgstack15