# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1451550450 -3600
# Node ID e1cfdb170c2f50d0c1dcddc968896dc46489e107
# Parent  571212dc4d0528ab7ab5feb685daf61eaf6c6332# Parent  86f72f1e98a4b1d603a597af0277b2a15cb13095
merge Gtk3 preparations into default branch

diff -r 86f72f1e98a4 -r e1cfdb170c2f MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Mon Dec 28 13:54:47 2015 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Thu Dec 31 09:27:30 2015 +0100
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Sat Dec 26 12:47:56 UTC 2015 - wr@rosenauer.org
-
-- experimental build with Gtk3
-
 -------------------------------------------------------------------
 Sat Dec 26 07:37:19 UTC 2015 - wr@rosenauer.org
 
@@ -15,6 +10,7 @@
   * workaround Youtube user agent detection issue (bmo#1233970)
 - fix file download regression for multi user systems
   (bmo#1233434) (mozilla-bmo1233434.patch)
+- prepare mozilla-kde.patch for Gtk3
 
 -------------------------------------------------------------------
 Sun Dec 13 23:07:56 UTC 2015 - wr@rosenauer.org
diff -r 86f72f1e98a4 -r e1cfdb170c2f MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Dec 28 13:54:47 2015 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Dec 31 09:27:30 2015 +0100
@@ -321,8 +321,8 @@
 ac_add_options --mandir=%{_mandir}
 ac_add_options --includedir=%{_includedir}
 ac_add_options --enable-release
-%if 0%{?suse_version} > 1310
-ac_add_options --enable-default-toolkit=cairo-gtk3
+%if 0%{?suse_version} > 1320
+#ac_add_options --enable-default-toolkit=cairo-gtk3
 %endif
 %ifarch %ix86 %arm
 %if 0%{?suse_version} > 1230
@@ -572,8 +572,8 @@
 %{progdir}/components/
 %{progdir}/defaults/
 %{progdir}/dictionaries/
-%if 0%{?suse_version} > 1310
-%dir %{progdir}/gtk2
+%if 0%{?suse_version} > 1320
+#%dir %{progdir}/gtk2
 %{progdir}/gtk2/libmozgtk.so
 %endif
 %{progdir}/webapprt/