rpms/firefox
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Gtk3 support - WIP

Browse Source
This commit is contained in:
Martin Stransky 2014-10-31 10:43:18 +01:00
parent b024cf0ab0
commit 88a98103f7
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firefox-mozconfig
View File

@ -13,7 +13,6 @@ ac_add_options --disable-tests
ac_add_options --disable-mochitest ac_add_options --disable-mochitest
ac_add_options --disable-installer ac_add_options --disable-installer
ac_add_options --enable-xinerama ac_add_options --enable-xinerama
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-xprint ac_add_options --disable-xprint
ac_add_options --disable-strip ac_add_options --disable-strip
ac_add_options --enable-system-cairo ac_add_options --enable-system-cairo

18
firefox.spec
View File

@ -10,9 +10,17 @@
%define system_ffi 1 %define system_ffi 1
%endif %endif
# Build for Gtk3?
%define toolkit_gtk3 0
# Use system cairo? # Use system cairo?
%define system_cairo 0 %define system_cairo 0
# Gtk3 needs system cairo
%if %{toolkit_gtk3}
%define system_cairo 1
%endif
%define enable_gstreamer 1 %define enable_gstreamer 1
# Separated plugins are supported on x86(64) only # Separated plugins are supported on x86(64) only
@ -155,7 +163,11 @@ BuildRequires: zip
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: libIDL-devel BuildRequires: libIDL-devel
%if %{toolkit_gtk3}
BuildRequires: gtk3-devel
%else
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
%endif
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: pango-devel BuildRequires: pango-devel
BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: freetype-devel >= %{freetype_version}
@ -289,6 +301,12 @@ cd %{tarballdir}
%endif %endif
%{__cp} %{SOURCE24} mozilla-api-key %{__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} %if %{?system_nss}
echo "ac_add_options --with-system-nspr" >> .mozconfig echo "ac_add_options --with-system-nspr" >> .mozconfig
echo "ac_add_options --with-system-nss" >> .mozconfig echo "ac_add_options --with-system-nss" >> .mozconfig