commit 2c41ca87289a39002576bed84e92d33afaaef1ee Author: Sukhbir Singh sukhbir@torproject.org Date: Wed Sep 23 10:08:48 2015 -0400

Force GTK2 using mozconfig instead of a patch --- projects/instantbird/config | 2 -- projects/instantbird/force-gtk2.mozpatch | 12 ------------ projects/instantbird/mozconfig-linux-i686 | 2 ++ projects/instantbird/mozconfig-linux-x86_64 | 2 ++ 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config index ff4d5b0..05b2280 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -117,8 +117,6 @@ 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 deleted file mode 100644 index 03a815e..0000000 --- a/projects/instantbird/force-gtk2.mozpatch +++ /dev/null @@ -1,12 +0,0 @@ -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}" diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index e65b880..2887ff9 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -25,3 +25,5 @@ ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-debug + +ac_add_options --enable-default-toolkit=cairo-gtk2 diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index 974156e..2f2b8fd 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -20,3 +20,5 @@ ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-debug + +ac_add_options --enable-default-toolkit=cairo-gtk2