Backed out 2 changesets (bug 1747165) for causing nightly blockers(bustages) a=backout

Backed out changeset 4b1ab0915c94 (bug 1747165)
Backed out changeset 96043d814772 (bug 1747165)

accessible/atk/moz.build

@@ -50,8 +50,8 @@ LOCAL_INCLUDES += [
 FINAL_LIBRARY = "xul"
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CFLAGS += CONFIG["TK_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 if CONFIG["MOZ_ENABLE_DBUS"]:
     CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"]

browser/components/shell/moz.build

@@ -81,9 +81,7 @@ for var in (
 ):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 if CONFIG["MOZ_ENABLE_DBUS"]:
     CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
 

chrome/moz.build

@@ -41,7 +41,7 @@ LOCAL_INCLUDES += [
 ]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 with Files("**"):
     BUG_COMPONENT = ("Toolkit", "Startup and Profile System")

dom/base/moz.build

@@ -573,8 +573,8 @@ include("/ipc/chromium/chromium-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+if CONFIG["MOZ_X11"]:
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 GeneratedFile(
     "UseCounterList.h",

dom/canvas/moz.build

@@ -202,8 +202,7 @@ LOCAL_INCLUDES += [
     "/media/libyuv/libyuv/include",
 ]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
 

dom/file/ipc/moz.build

@@ -65,8 +65,7 @@ include("/tools/fuzzing/libfuzzer-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 BROWSER_CHROME_MANIFESTS += ["tests/browser.ini"]
 MOCHITEST_MANIFESTS += ["tests/mochitest.ini"]

dom/ipc/moz.build

@@ -247,8 +247,7 @@ MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"]
 MOCHITEST_MANIFESTS += ["tests/mochitest.ini"]
 XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell.ini"]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 if CONFIG["FUZZING"] and CONFIG["FUZZING_INTERFACES"]:
     TEST_DIRS += ["fuzztest"]

dom/media/platforms/ffmpeg/ffmpeg58/moz.build

@@ -26,7 +26,7 @@ if CONFIG['CC_TYPE'] == 'gcc':
     '-Wno-attributes',
   ]
 if CONFIG['MOZ_WAYLAND']:
-  CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
+  CXXFLAGS += CONFIG['TK_CFLAGS']
   DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
   UNIFIED_SOURCES += [
     '../FFmpegVideoFramePool.cpp',

dom/media/platforms/ffmpeg/ffvpx/moz.build

@@ -37,7 +37,7 @@ DEFINES["FFVPX_VERSION"] = 46465650
 DEFINES["USING_MOZFFVPX"] = True
 
 if CONFIG["MOZ_WAYLAND"]:
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
     DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
 
 FINAL_LIBRARY = "xul"

dom/plugins/base/moz.build

@@ -41,5 +41,4 @@ include("/ipc/chromium/chromium-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]

gfx/gl/moz.build

@@ -150,9 +150,8 @@ FINAL_LIBRARY = "xul"
 if CONFIG["MOZ_D3DCOMPILER_VISTA_DLL"]:
     DEFINES["MOZ_D3DCOMPILER_VISTA_DLL"] = CONFIG["MOZ_D3DCOMPILER_VISTA_DLL"]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-    CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
+CFLAGS += CONFIG["TK_CFLAGS"]
 
 CXXFLAGS += ["-Werror=switch"]
 

gfx/ipc/moz.build

@@ -79,9 +79,7 @@ include("/ipc/chromium/chromium-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 CXXFLAGS += ["-Werror=switch"]
 
 LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]

gfx/layers/moz.build

@@ -495,9 +495,7 @@ if CONFIG["ENABLE_TESTS"]:
 MOCHITEST_MANIFESTS += ["apz/test/mochitest/mochitest.ini"]
 BROWSER_CHROME_MANIFESTS += ["apz/test/mochitest/browser.ini"]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 CXXFLAGS += ["-Werror=switch"]
 
 LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]

gfx/src/moz.build

@@ -91,6 +91,7 @@ LOCAL_INCLUDES += [
 
 FINAL_LIBRARY = "xul"
 
+CXXFLAGS += CONFIG["TK_CFLAGS"]
+
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
     CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"]

gfx/thebes/moz.build

@@ -272,12 +272,13 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
         if CONFIG[var]:
             DEFINES[var] = True
 
+CXXFLAGS += CONFIG["TK_CFLAGS"]
+CFLAGS += CONFIG["TK_CFLAGS"]
+
 if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("android"):
     CXXFLAGS += CONFIG["CAIRO_FT_CFLAGS"]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-    CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
     CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"]
 
 if CONFIG["MOZ_WAYLAND"]:

gfx/vr/moz.build

@@ -91,9 +91,8 @@ if CONFIG["OS_ARCH"] == "WINNT":
     LOCAL_INCLUDES += ["/layout/generic", "/widget", "/widget/windows"]
     SOURCES += ["FxROutputHandler.cpp", "FxRWindowManager.cpp"]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-    CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
+CFLAGS += CONFIG["TK_CFLAGS"]
 
 include("/ipc/chromium/chromium-config.mozbuild")
 

gfx/webrender_bindings/moz.build

@@ -124,7 +124,5 @@ FINAL_LIBRARY = "xul"
 LOCAL_INCLUDES += [
     "/gfx/cairo/cairo/src",
 ]
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 CXXFLAGS += ["-Werror=switch"]

image/decoders/icon/gtk/moz.build

@@ -14,7 +14,6 @@ EXPORTS += [
 
 FINAL_LIBRARY = "xul"
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 include("/ipc/chromium/chromium-config.mozbuild")

ipc/chromium/moz.build

@@ -123,8 +123,7 @@ if os_solaris:
         "src/base/time_posix.cc",
     ]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 TEST_DIRS += [
     "gtest",

ipc/ipdl/moz.build

@@ -15,8 +15,7 @@ FINAL_LIBRARY = "xul"
 
 # We #include some things in the dom/plugins/ directory that rely on
 # toolkit libraries.
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 # Add libFuzzer configuration directives
 include("/tools/fuzzing/libfuzzer-config.mozbuild")

js/xpconnect/shell/moz.build

@@ -68,7 +68,6 @@ if CONFIG["OS_TARGET"] == "Darwin":
         "-framework Foundation",
     ]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-    OS_LIBS += CONFIG["MOZ_GTK3_LIBS"]
+CFLAGS += CONFIG["TK_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
+OS_LIBS += CONFIG["TK_LIBS"]

layout/generic/moz.build

@@ -266,4 +266,4 @@ MOCHITEST_MANIFESTS += ["test/mochitest.ini"]
 MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]

layout/xul/moz.build

@@ -53,9 +53,8 @@ UNIFIED_SOURCES += [
 
 DIRS += ["tree"]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CFLAGS += CONFIG["TK_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 include("/ipc/chromium/chromium-config.mozbuild")
 

netwerk/protocol/gio/moz.build

@@ -35,8 +35,7 @@ LOCAL_INCLUDES += [
 
 FINAL_LIBRARY = "xul"
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 with Files("**"):
     BUG_COMPONENT = ("Core", "Widget: Gtk")

old-configure.in

@@ -45,6 +45,13 @@ _SUBDIR_CONFIG_ARGS="$ac_configure_args"
 
 dnl Set the minimum version of toolkit libs used by mozilla
 dnl ========================================================
+GLIB_VERSION=2.42
+GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_42
+GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_42
+CAIRO_VERSION=1.10
+GTK3_VERSION=3.14.0
+GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_14
+GDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_14
 W32API_VERSION=3.14
 
 dnl Set various checks
@@ -1241,6 +1248,35 @@ dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Toolkit Options)
 
+dnl ========================================================
+dnl = Enable the toolkit as needed                         =
+dnl ========================================================
+
+dnl there are a lot of tests on MOZ_ENABLE_GTK below, that are more convenient
+dnl to keep that way than testing against MOZ_WIDGET_TOOLKIT
+case "$MOZ_WIDGET_TOOLKIT" in
+gtk*)
+    MOZ_ENABLE_GTK=1
+    ;;
+esac
+
+if test "$COMPILE_ENVIRONMENT"; then
+  if test "$MOZ_WIDGET_TOOLKIT" = gtk; then
+    PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES)
+    TK_CFLAGS=$MOZ_GTK3_CFLAGS
+    TK_LIBS=$MOZ_GTK3_LIBS
+    AC_DEFINE_UNQUOTED(GDK_VERSION_MIN_REQUIRED,$GDK_VERSION_MIN_REQUIRED)
+    AC_DEFINE_UNQUOTED(GDK_VERSION_MAX_ALLOWED,$GDK_VERSION_MAX_ALLOWED)
+  fi
+  if test "$MOZ_ENABLE_GTK"; then
+    AC_DEFINE_UNQUOTED(GLIB_VERSION_MIN_REQUIRED,$GLIB_VERSION_MIN_REQUIRED)
+    AC_DEFINE_UNQUOTED(GLIB_VERSION_MAX_ALLOWED,$GLIB_VERSION_MAX_ALLOWED)
+  fi
+fi # COMPILE_ENVIRONMENT
+
+AC_SUBST_LIST(TK_CFLAGS)
+AC_SUBST_LIST(TK_LIBS)
+
 dnl ========================================================
 dnl =
 dnl = Components & Features
@@ -1546,6 +1582,17 @@ dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla))
 
+dnl Check for GLib.
+dnl ========================================================
+
+if test -z "$SKIP_PATH_CHECKS"; then
+if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then
+    if test "$MOZ_ENABLE_GTK" ; then
+        PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
+    fi
+fi
+fi
+
 if test "$USE_FC_FREETYPE"; then
     if test "$COMPILE_ENVIRONMENT"; then
         dnl ========================================================
@@ -1869,6 +1916,10 @@ fi # COMPILE_ENVIRONMENT
 dnl Set various defines and substitutions
 dnl ========================================================
 
+if test "$ACCESSIBILITY" -a "$MOZ_ENABLE_GTK" ; then
+    AC_DEFINE(MOZ_ACCESSIBILITY_ATK)
+fi
+
 AC_SUBST(MOZ_DEV_EDITION)
 if test -n "$MOZ_DEV_EDITION"; then
     AC_DEFINE(MOZ_DEV_EDITION)

python/mozbuild/mozbuild/gn_processor.py

@@ -471,7 +471,7 @@ def write_mozbuild(
             try:
                 if relsrcdir in write_mozbuild_variables["INCLUDE_TK_CFLAGS_DIRS"]:
                     mb.write('if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":\n')
-                    mb.write('    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]\n')
+                    mb.write('    CXXFLAGS += CONFIG["TK_CFLAGS"]\n')
             except KeyError:
                 pass
 

security/manager/ssl/tests/unit/tlsserver/cmd/moz.build

@@ -27,5 +27,4 @@ USE_LIBS += [
     "tlsserver",
 ]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]

security/sandbox/linux/broker/moz.build

@@ -32,7 +32,7 @@ LOCAL_INCLUDES += [
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
     CXXFLAGS += CONFIG["GLIB_CFLAGS"]
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 FINAL_LIBRARY = "xul"
 

security/sandbox/linux/launch/moz.build

@@ -27,8 +27,7 @@ USE_LIBS += [
 ]
 
 # For the X11 socket domain inspection in SandboxLaunch:
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 FINAL_LIBRARY = "xul"
 

testing/tools/screenshot/moz.build

@@ -9,8 +9,8 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk" and CONFIG["MOZ_X11"]:
     SOURCES += [
         "gdk-screenshot.cpp",
     ]
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-    OS_LIBS += CONFIG["MOZ_GTK3_LIBS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
+    OS_LIBS += CONFIG["TK_LIBS"]
     if CONFIG["MOZ_ENABLE_DBUS"]:
         OS_LIBS += CONFIG["MOZ_DBUS_GLIB_LIBS"]
 

third_party/libwebrtc/api/transport/stun_types_gn/moz.build

@@ -6,7 +6,7 @@
   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
   ### DO NOT edit it by hand.                                       ###
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 COMPILE_FLAGS["OS_INCLUDES"] = []
 AllowCompilerWarnings()

third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build

@@ -6,7 +6,7 @@
   ### This moz.build was AUTOMATICALLY GENERATED from a GN config,  ###
   ### DO NOT edit it by hand.                                       ###
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 COMPILE_FLAGS["OS_INCLUDES"] = []
 AllowCompilerWarnings()

third_party/pipewire/libpipewire/moz.build

@@ -8,8 +8,7 @@ SOURCES += [
     'mozpipewire.cpp',
 ]
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
+CXXFLAGS += CONFIG['TK_CFLAGS']
 
 LOCAL_INCLUDES += ['/third_party/pipewire']
 

toolkit/components/downloads/moz.build

@@ -17,8 +17,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = "downloads"
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 SOURCES += [
     "DownloadPlatform.cpp",

toolkit/components/protobuf/moz.build

@@ -142,5 +142,4 @@ if CONFIG['MOZ_USE_PTHREADS']:
 # Needed for the gzip streams.
 DEFINES['HAVE_ZLIB'] = True
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
+CXXFLAGS += CONFIG['TK_CFLAGS']

toolkit/components/remote/moz.build

@@ -32,7 +32,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
             "nsXRemoteClient.cpp",
             "nsXRemoteServer.cpp",
         ]
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
     SOURCES += [

toolkit/crashreporter/client/moz.build

@@ -82,9 +82,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
     USE_LIBS += [
         "breakpad_linux_common_s",
     ]
-    OS_LIBS += CONFIG["MOZ_GTK3_LIBS"]
+    OS_LIBS += CONFIG["TK_LIBS"]
     OS_LIBS += CONFIG["MOZ_GTHREAD_LIBS"]
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
     CXXFLAGS += CONFIG["MOZ_GTHREAD_CFLAGS"]
 
 if CONFIG["OS_ARCH"] == "Linux" or CONFIG["OS_ARCH"] == "SunOS":

toolkit/library/moz.build

@@ -319,7 +319,7 @@ if CONFIG["MOZ_ENABLE_DBUS"]:
     OS_LIBS += CONFIG["MOZ_DBUS_GLIB_LIBS"]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    OS_LIBS += [l for l in CONFIG["MOZ_GTK3_LIBS"] if l not in ("-lgtk-3", "-lgdk-3")]
+    OS_LIBS += [l for l in CONFIG["TK_LIBS"] if l not in ("-lgtk-3", "-lgdk-3")]
     OS_LIBS += CONFIG["MOZ_X11_LIBS"]
     OS_LIBS += CONFIG["MOZ_PANGO_LIBS"]
 

toolkit/moz.configure

@@ -1418,6 +1418,7 @@ def accessibility(value, check_for_midl, midl, c_compiler):
 
 set_config("ACCESSIBILITY", accessibility)
 set_define("ACCESSIBILITY", accessibility)
+add_old_configure_assignment("ACCESSIBILITY", accessibility)
 
 
 # Addon signing
@@ -2679,24 +2680,6 @@ with only_when(compile_environment):
         )
 
 
-# Gtk+
-# ==============================================================
-with only_when(toolkit_gtk):
-    pkg_check_modules(
-        "MOZ_GTK3",
-        "gtk+-3.0 >= 3.14.0 gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0",
-    )
-
-    set_define("GDK_VERSION_MIN_REQUIRED", "GDK_VERSION_3_14")
-    set_define("GDK_VERSION_MAX_ALLOWED", "GDK_VERSION_3_14")
-
-    pkg_check_modules("GLIB", "glib-2.0 >= 2.42 gobject-2.0")
-
-    set_define("GLIB_VERSION_MIN_REQUIRED", "GLIB_VERSION_2_42")
-    set_define("GLIB_VERSION_MAX_ALLOWED", "GLIB_VERSION_2_42")
-
-    set_define("MOZ_ACCESSIBILITY_ATK", True, when=accessibility)
-
 # DBus
 # ==============================================================
 with only_when(toolkit_gtk):

toolkit/mozapps/update/updater/updater-common.build

@@ -109,8 +109,8 @@ elif CONFIG["OS_ARCH"] == "WINNT":
     WIN32_EXE_LDFLAGS += ["-municode"]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-    OS_LIBS += CONFIG["MOZ_GTK3_LIBS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
+    OS_LIBS += CONFIG["TK_LIBS"]
 
 if CONFIG["CC_TYPE"] == "gcc":
     CXXFLAGS += ["-Wno-format-truncation"]

toolkit/system/gnome/moz.build

@@ -29,4 +29,4 @@ LOCAL_INCLUDES += [
 
 CXXFLAGS += CONFIG["GLIB_CFLAGS"]
 CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
-CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]

toolkit/xre/moz.build

@@ -268,11 +268,11 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
         "/xpcom/base",
     ]
 
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"]
 CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
     CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"]
 
 DEFINES["TOPOBJDIR"] = TOPOBJDIR

uriloader/exthandler/moz.build

@@ -134,10 +134,11 @@ LOCAL_INCLUDES += [
 ]
 
 if CONFIG["MOZ_ENABLE_DBUS"]:
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
     CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
     CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
 
 REQUIRES_UNIFIED_BUILD = True

widget/gtk/moz.build

@@ -153,8 +153,8 @@ DEFINES["CAIRO_GFX"] = True
 
 DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"]
 
-CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CFLAGS += CONFIG["TK_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 if CONFIG["MOZ_WAYLAND"]:
     CFLAGS += CONFIG["MOZ_WAYLAND_CFLAGS"]

widget/gtk/mozwayland/moz.build

@@ -13,4 +13,4 @@ EXPORTS.mozilla.widget += [
 
 SharedLibrary("mozwayland")
 
-CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CFLAGS += CONFIG["TK_CFLAGS"]

widget/gtk/wayland/moz.build

@@ -37,5 +37,5 @@ include("/ipc/chromium/chromium-config.mozbuild")
 
 FINAL_LIBRARY = "xul"
 
-CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CFLAGS += CONFIG["TK_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]

widget/moz.build

@@ -347,8 +347,7 @@ FINAL_LIBRARY = "xul"
 if CONFIG["MOZ_ENABLE_D3D10_LAYER"]:
     DEFINES["MOZ_ENABLE_D3D10_LAYER"] = True
 
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 if CONFIG["MOZ_WAYLAND"]:
     CXXFLAGS += CONFIG["MOZ_WAYLAND_CFLAGS"]
 

xpcom/base/moz.build

@@ -263,7 +263,7 @@ LOCAL_INCLUDES += [
 ]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
 
 if CONFIG["MOZ_BACKGROUNDTASKS"]:
     DEFINES["MOZ_BACKGROUNDTASKS"] = True

xpcom/components/moz.build

@@ -74,7 +74,7 @@ LOCAL_INCLUDES += [
 ]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+    CXXFLAGS += CONFIG["TK_CFLAGS"]
     if CONFIG["MOZ_ENABLE_DBUS"]:
         CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]