[tor-commits] [tor-messenger-build/master] Force use of GTK2 instead of the default GTK3 in Firefox 42

[sukhbir at torproject.org]

commit 728a8e4d50a205c41cf8dbf117376b2834941ee6
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Tue Sep 22 22:10:58 2015 -0400

    Force use of GTK2 instead of the default GTK3 in Firefox 42
---
 projects/instantbird/config              |    2 ++
 projects/instantbird/force-gtk2.mozpatch |   12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 05b2280..ff4d5b0 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -117,6 +117,8 @@ input_files:
   - filename: block-plugins.mozpatch
   - filename: 824009fbc42f.mozpatch
     enable: '[% c("var/windows") %]'
+  - filename: force-gtk2.mozpatch
+    enable: '[% c("var/linux") %]'
   - filename: Bug-1133689-backport-Make-D3DVsyncDisplay-destructor.mozpatch
     enable: '[% c("var/windows") %]'
   - filename: OSX-package-as-tar.bz2.mozpatch
diff --git a/projects/instantbird/force-gtk2.mozpatch b/projects/instantbird/force-gtk2.mozpatch
new file mode 100644
index 0000000..03a815e
--- /dev/null
+++ b/projects/instantbird/force-gtk2.mozpatch
@@ -0,0 +1,12 @@
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -1000,7 +1000,7 @@
+ 
+ USE_DEPENDENT_LIBS=1
+ 
+-_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk3
++_PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
+ 
+ if test -n "$CROSS_COMPILE"; then
+     OS_TARGET="${target_os}"