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

Spec clean-up - removed toolkit_gtk3 switch

Browse Source
This commit is contained in:
Martin Stransky 2016-07-11 23:01:35 +02:00
parent f2e42bc5b1
commit 405574520c
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firefox-mozconfig
View File

@ -1,5 +1,7 @@
. $topsrcdir/browser/config/mozconfig . $topsrcdir/browser/config/mozconfig
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"
ac_add_options --with-system-zlib ac_add_options --with-system-zlib

13
firefox.spec
View File

@ -5,9 +5,6 @@
%define system_sqlite 1 %define system_sqlite 1
%define system_ffi 1 %define system_ffi 1
# Build for Gtk3?
%define toolkit_gtk3 1
# Use system cairo? # Use system cairo?
%define system_cairo 0 %define system_cairo 0
@ -153,9 +150,7 @@ BuildRequires: zip
BuildRequires: bzip2-devel BuildRequires: bzip2-devel
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
BuildRequires: pkgconfig(libIDL-2.0) BuildRequires: pkgconfig(libIDL-2.0)
%if %{toolkit_gtk3}
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
%endif
BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(krb5)
BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pango)
@ -291,12 +286,6 @@ echo "ac_add_options --enable-official-branding" >> .mozconfig
%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
@ -769,9 +758,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/browser/crashreporter-override.ini %{mozappdir}/browser/crashreporter-override.ini
%endif %endif
%{mozappdir}/*.so %{mozappdir}/*.so
%if %{toolkit_gtk3}
%{mozappdir}/gtk2/*.so %{mozappdir}/gtk2/*.so
%endif
%{mozappdir}/defaults/pref/channel-prefs.js %{mozappdir}/defaults/pref/channel-prefs.js
%{mozappdir}/dependentlibs.list %{mozappdir}/dependentlibs.list
%{mozappdir}/dictionaries %{mozappdir}/dictionaries