summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firefox-mozconfig1
-rw-r--r--firefox.spec18
2 files changed, 18 insertions, 1 deletions
diff --git a/firefox-mozconfig b/firefox-mozconfig
index c3ca652..749a012 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -13,7 +13,6 @@ ac_add_options --disable-tests
ac_add_options --disable-mochitest
ac_add_options --disable-installer
ac_add_options --enable-xinerama
-ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-xprint
ac_add_options --disable-strip
ac_add_options --enable-system-cairo
diff --git a/firefox.spec b/firefox.spec
index 262fda7..6a4b656 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -10,9 +10,17 @@
%define system_ffi 1
%endif
+# Build for Gtk3?
+%define toolkit_gtk3 0
+
# Use system cairo?
%define system_cairo 0
+# Gtk3 needs system cairo
+%if %{toolkit_gtk3}
+%define system_cairo 1
+%endif
+
%define enable_gstreamer 1
# Separated plugins are supported on x86(64) only
@@ -155,7 +163,11 @@ BuildRequires: zip
BuildRequires: bzip2-devel
BuildRequires: zlib-devel
BuildRequires: libIDL-devel
+%if %{toolkit_gtk3}
+BuildRequires: gtk3-devel
+%else
BuildRequires: gtk2-devel
+%endif
BuildRequires: krb5-devel
BuildRequires: pango-devel
BuildRequires: freetype-devel >= %{freetype_version}
@@ -289,6 +301,12 @@ cd %{tarballdir}
%endif
%{__cp} %{SOURCE24} mozilla-api-key
+%if %{toolkit_gtk3}
+echo "ac_add_options --enable-default-toolkit=cairo-gtk3" >> .mozconfig
+%else
+echo "ac_add_options --enable-default-toolkit=cairo-gtk2" >> .mozconfig
+%endif
+
%if %{?system_nss}
echo "ac_add_options --with-system-nspr" >> .mozconfig
echo "ac_add_options --with-system-nss" >> .mozconfig
bgstack15