[tbb-commits] [tor-browser-build/master] Use cairgo-gtk3 and provide libgtk-3-dev for Firefox 60 ESR

[gk at torproject.org]

commit ed1e40688ca502e1adc1819024c430c24aebebb0
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Mon May 28 09:48:35 2018 -0400

    Use cairgo-gtk3 and provide libgtk-3-dev for Firefox 60 ESR
---
 projects/firefox/config                 | 1 +
 projects/firefox/mozconfig-linux-i686   | 4 ++--
 projects/firefox/mozconfig-linux-x86_64 | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index c53ea7e..77ae405 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -37,6 +37,7 @@ targets:
     var:
       arch_deps:
         - libgtk2.0-dev
+        - libgtk-3-dev
         - libdbus-glib-1-dev
         - libxt-dev
         - hardening-wrapper
diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686
index a7d75fa..b677df3 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -17,8 +17,8 @@ ac_add_options --enable-optimize
 #ac_add_options --disable-optimize
 ac_add_options --enable-official-branding
 
-# Let's support GTK2 for ESR52
-ac_add_options --enable-default-toolkit=cairo-gtk2
+# Let's support GTK3 for ESR60
+ac_add_options --enable-default-toolkit=cairo-gtk3
 
 ac_add_options --enable-tor-browser-update
 ac_add_options --enable-signmar
diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64
index 7d9ab1c..2e8e2fa 100755
--- a/projects/firefox/mozconfig-linux-x86_64
+++ b/projects/firefox/mozconfig-linux-x86_64
@@ -9,8 +9,8 @@ ac_add_options --enable-optimize
 #ac_add_options --disable-optimize
 ac_add_options --enable-official-branding
 
-# Let's support GTK2 for ESR52
-ac_add_options --enable-default-toolkit=cairo-gtk2
+# Let's support GTK3 for ESR60
+ac_add_options --enable-default-toolkit=cairo-gtk3
 
 ac_add_options --enable-tor-browser-update
 ac_add_options --enable-signmar