diff options
| author | Martin Stransky <stransky@anakreon.cz> | 2016-07-11 23:02:00 +0200 |
|---|---|---|
| committer | Martin Stransky <stransky@anakreon.cz> | 2016-07-11 23:02:00 +0200 |
| commit | 912a2083dbde7c00f96b3f880ea38c4d47777362 (patch) | |
| tree | 435eb0f51e7a6886df626c063126f1e640ae7ba7 | |
| parent | Merge branch 'master' into f24 (diff) | |
| parent | Spec clean-up - removed toolkit_gtk3 switch (diff) | |
| download | librewolf-fedora-ff-912a2083dbde7c00f96b3f880ea38c4d47777362.tar.gz librewolf-fedora-ff-912a2083dbde7c00f96b3f880ea38c4d47777362.tar.bz2 librewolf-fedora-ff-912a2083dbde7c00f96b3f880ea38c4d47777362.zip | |
Merge branch 'master' into f24
| -rw-r--r-- | firefox-mozconfig | 2 | ||||
| -rw-r--r-- | firefox.spec | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/firefox-mozconfig b/firefox-mozconfig index 0f8397d..acdf98b 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -1,5 +1,7 @@ . $topsrcdir/browser/config/mozconfig +ac_add_options --enable-default-toolkit=cairo-gtk3 + ac_add_options --prefix="$PREFIX" ac_add_options --libdir="$LIBDIR" ac_add_options --with-system-zlib diff --git a/firefox.spec b/firefox.spec index 1160a02..fc86f4d 100644 --- a/firefox.spec +++ b/firefox.spec @@ -5,9 +5,6 @@ %define system_sqlite 1 %define system_ffi 1 -# Build for Gtk3? -%define toolkit_gtk3 1 - # Use system cairo? %define system_cairo 0 @@ -153,9 +150,7 @@ BuildRequires: zip BuildRequires: bzip2-devel BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libIDL-2.0) -%if %{toolkit_gtk3} BuildRequires: pkgconfig(gtk+-3.0) -%endif BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(pango) @@ -291,12 +286,6 @@ echo "ac_add_options --enable-official-branding" >> .mozconfig %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 @@ -769,9 +758,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/browser/crashreporter-override.ini %endif %{mozappdir}/*.so -%if %{toolkit_gtk3} %{mozappdir}/gtk2/*.so -%endif %{mozappdir}/defaults/pref/channel-prefs.js %{mozappdir}/dependentlibs.list %{mozappdir}/dictionaries |