Bug 1328886 - Disable GTK3 for 2.48 beta's c-b r=jorgk,RattyAway a=jorgk DONTBUILD SEA248b1_2017021701_RELBRANCH
authorEdmund Wong <ewong@pw-wspx.org>
Tue, 14 Feb 2017 16:25:29 +0800
branchSEA248b1_2017021701_RELBRANCH
changeset 27766 47b9b06ca3f6e6edc670714e081112caf6ce8592
parent 26964 a762765080b9b6a6123db4f979c6fe2726504a19
child 27780 c4daf50288efe9f4062b5e83185641bdb80b38dc
push id357
push userclokep@gmail.com
push dateTue, 07 Mar 2017 13:50:14 +0000
reviewersjorgk, RattyAway, jorgk
bugs1328886
Bug 1328886 - Disable GTK3 for 2.48 beta's c-b r=jorgk,RattyAway a=jorgk DONTBUILD
build/check-sync-exceptions
build/unix/mozconfig.gtk
suite/config/mozconfigs/linux32/release
suite/config/mozconfigs/linux32/release-l10n
suite/config/mozconfigs/linux64/release
suite/config/mozconfigs/linux64/release-l10n
--- a/build/check-sync-exceptions
+++ b/build/check-sync-exceptions
@@ -1,15 +1,16 @@
 dumbmake-dependencies
 mach_bootstrap.py
 merge-installrdf.py
 pymake
 client.py-args
 client.py-l10n-args
 configobj.py
+mozconfig.gtk
 
 # Ignore detritus left lying around by editing tools.
 *~
 .#*
 #*#
 *.orig
 *.rej
 
--- a/build/unix/mozconfig.gtk
+++ b/build/unix/mozconfig.gtk
@@ -1,11 +1,11 @@
-# To do try builds with Gtk+2, uncomment the following line, and remove
-# everything after that.
-#ac_add_options --enable-default-toolkit=cairo-gtk2
+# To do builds with Gtk+2, set environment variable USE_GTK2=1
+
+if [ -z "${USE_GTK2}" ]; then
 
 TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 
 # $TOOLTOOL_DIR/gtk3 comes from tooltool, and must be included in the tooltool manifest.
 if [ -z "$PKG_CONFIG_LIBDIR" ]; then
   echo PKG_CONFIG_LIBDIR must be set >&2
   exit 1
 fi
@@ -21,8 +21,14 @@ ac_add_options --enable-default-toolkit=
 mk_add_options "export FONTCONFIG_PATH=$TOOLTOOL_DIR/gtk3/usr/local/etc/fonts"
 mk_add_options "export PANGO_SYSCONFDIR=$TOOLTOOL_DIR/gtk3/usr/local/etc"
 mk_add_options "export PANGO_LIBDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib"
 mk_add_options "export GDK_PIXBUF_MODULE_FILE=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
 mk_add_options "export GDK_PIXBUF_MODULEDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders"
 
 LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/gtk3/usr/local/lib
 mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+
+else
+
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
+fi
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -1,8 +1,9 @@
+export USE_GTK2=1
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-calendar
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
--- a/suite/config/mozconfigs/linux32/release-l10n
+++ b/suite/config/mozconfigs/linux32/release-l10n
@@ -1,8 +1,9 @@
+export USE_GTK2=1
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -1,8 +1,9 @@
+export USE_GTK2=1
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-calendar
 
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
--- a/suite/config/mozconfigs/linux64/release-l10n
+++ b/suite/config/mozconfigs/linux64/release-l10n
@@ -1,8 +1,9 @@
+export USE_GTK2=1
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1