From b55194a16fe9968cc6a0a77bf531c56c21cf6984 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 22 Dec 2021 23:56:24 +0000 Subject: [PATCH] Bug 1747165 - Replace TK_FLAGS/TK_LIBS with MOZ_GTK3_FLAGS/MOZ_GTK3_LIBS. r=firefox-build-system-reviewers,andi Differential Revision: https://phabricator.services.mozilla.com/D134464 --- accessible/atk/moz.build | 4 ++-- browser/components/shell/moz.build | 4 +++- chrome/moz.build | 2 +- dom/base/moz.build | 4 ++-- dom/canvas/moz.build | 3 ++- dom/file/ipc/moz.build | 3 ++- dom/ipc/moz.build | 3 ++- dom/media/platforms/ffmpeg/ffmpeg58/moz.build | 2 +- dom/media/platforms/ffmpeg/ffvpx/moz.build | 2 +- dom/plugins/base/moz.build | 3 ++- gfx/gl/moz.build | 5 +++-- gfx/ipc/moz.build | 4 +++- gfx/layers/moz.build | 4 +++- gfx/src/moz.build | 3 +-- gfx/thebes/moz.build | 5 ++--- gfx/vr/moz.build | 5 +++-- gfx/webrender_bindings/moz.build | 4 +++- image/decoders/icon/gtk/moz.build | 3 ++- ipc/chromium/moz.build | 3 ++- ipc/ipdl/moz.build | 3 ++- js/xpconnect/shell/moz.build | 7 ++++--- layout/generic/moz.build | 2 +- layout/xul/moz.build | 5 +++-- netwerk/protocol/gio/moz.build | 3 ++- old-configure.in | 5 ----- python/mozbuild/mozbuild/gn_processor.py | 2 +- security/manager/ssl/tests/unit/tlsserver/cmd/moz.build | 3 ++- security/sandbox/linux/broker/moz.build | 2 +- security/sandbox/linux/launch/moz.build | 3 ++- testing/tools/screenshot/moz.build | 4 ++-- .../libwebrtc/api/transport/stun_types_gn/moz.build | 2 +- .../desktop_capture/desktop_capture_generic_gn/moz.build | 2 +- third_party/pipewire/libpipewire/moz.build | 3 ++- toolkit/components/downloads/moz.build | 3 ++- toolkit/components/protobuf/moz.build | 3 ++- toolkit/components/remote/moz.build | 2 +- toolkit/crashreporter/client/moz.build | 4 ++-- toolkit/library/moz.build | 2 +- toolkit/mozapps/update/updater/updater-common.build | 4 ++-- toolkit/system/gnome/moz.build | 2 +- toolkit/xre/moz.build | 2 +- uriloader/exthandler/moz.build | 3 +-- widget/gtk/moz.build | 4 ++-- widget/gtk/mozwayland/moz.build | 2 +- widget/gtk/wayland/moz.build | 4 ++-- widget/moz.build | 3 ++- xpcom/base/moz.build | 2 +- xpcom/components/moz.build | 2 +- 48 files changed, 86 insertions(+), 68 deletions(-) diff --git a/accessible/atk/moz.build b/accessible/atk/moz.build index 00af8e3eadb35..ce6be5a3faf41 100644 --- a/accessible/atk/moz.build +++ b/accessible/atk/moz.build @@ -50,8 +50,8 @@ LOCAL_INCLUDES += [ FINAL_LIBRARY = "xul" if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": - CFLAGS += CONFIG["TK_CFLAGS"] - CXXFLAGS += CONFIG["TK_CFLAGS"] + CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] if CONFIG["MOZ_ENABLE_DBUS"]: CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"] diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build index ff17e5f35a060..a6e5d66061816 100644 --- a/browser/components/shell/moz.build +++ b/browser/components/shell/moz.build @@ -81,7 +81,9 @@ for var in ( ): DEFINES[var] = '"%s"' % CONFIG[var] -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + if CONFIG["MOZ_ENABLE_DBUS"]: CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] diff --git a/chrome/moz.build b/chrome/moz.build index d41e0ba501168..b373e4ea48dd0 100644 --- a/chrome/moz.build +++ b/chrome/moz.build @@ -41,7 +41,7 @@ LOCAL_INCLUDES += [ ] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": - CXXFLAGS += CONFIG["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] with Files("**"): BUG_COMPONENT = ("Toolkit", "Startup and Profile System") diff --git a/dom/base/moz.build b/dom/base/moz.build index 48877fe135905..7b4603d2de879 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -573,8 +573,8 @@ include("/ipc/chromium/chromium-config.mozbuild") FINAL_LIBRARY = "xul" -if CONFIG["MOZ_X11"]: - CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] GeneratedFile( "UseCounterList.h", diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build index 5dde7e71aba91..59ea18deaf86d 100644 --- a/dom/canvas/moz.build +++ b/dom/canvas/moz.build @@ -202,7 +202,8 @@ LOCAL_INCLUDES += [ "/media/libyuv/libyuv/include", ] -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"] diff --git a/dom/file/ipc/moz.build b/dom/file/ipc/moz.build index f4c7cc28c546b..4581c71cfa47b 100644 --- a/dom/file/ipc/moz.build +++ b/dom/file/ipc/moz.build @@ -65,7 +65,8 @@ include("/tools/fuzzing/libfuzzer-config.mozbuild") FINAL_LIBRARY = "xul" -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] BROWSER_CHROME_MANIFESTS += ["tests/browser.ini"] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index a932116172564..355738f74acd4 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -247,7 +247,8 @@ MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell.ini"] -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] if CONFIG["FUZZING"] and CONFIG["FUZZING_INTERFACES"]: TEST_DIRS += ["fuzztest"] diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build index 50d79b6ed4571..febf20746d615 100644 --- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build +++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build @@ -26,7 +26,7 @@ if CONFIG['CC_TYPE'] == 'gcc': '-Wno-attributes', ] if CONFIG['MOZ_WAYLAND']: - CXXFLAGS += CONFIG['TK_CFLAGS'] + CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS'] DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1 UNIFIED_SOURCES += [ '../FFmpegVideoFramePool.cpp', diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build b/dom/media/platforms/ffmpeg/ffvpx/moz.build index 728f766de5563..854f23d949158 100644 --- a/dom/media/platforms/ffmpeg/ffvpx/moz.build +++ b/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["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1 FINAL_LIBRARY = "xul" diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build index c4d1df7ebfee9..1e13483336445 100644 --- a/dom/plugins/base/moz.build +++ b/dom/plugins/base/moz.build @@ -41,4 +41,5 @@ include("/ipc/chromium/chromium-config.mozbuild") FINAL_LIBRARY = "xul" -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index 368490d06ba30..03434957ccb51 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -150,8 +150,9 @@ FINAL_LIBRARY = "xul" if CONFIG["MOZ_D3DCOMPILER_VISTA_DLL"]: DEFINES["MOZ_D3DCOMPILER_VISTA_DLL"] = CONFIG["MOZ_D3DCOMPILER_VISTA_DLL"] -CXXFLAGS += CONFIG["TK_CFLAGS"] -CFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] CXXFLAGS += ["-Werror=switch"] diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build index 3714505b118ab..f3917c333eecb 100644 --- a/gfx/ipc/moz.build +++ b/gfx/ipc/moz.build @@ -79,7 +79,9 @@ include("/ipc/chromium/chromium-config.mozbuild") FINAL_LIBRARY = "xul" -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + CXXFLAGS += ["-Werror=switch"] LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"] diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index ac141ad10e636..e8b1f6c56f4b3 100755 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -495,7 +495,9 @@ if CONFIG["ENABLE_TESTS"]: MOCHITEST_MANIFESTS += ["apz/test/mochitest/mochitest.ini"] BROWSER_CHROME_MANIFESTS += ["apz/test/mochitest/browser.ini"] -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + CXXFLAGS += ["-Werror=switch"] LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"] diff --git a/gfx/src/moz.build b/gfx/src/moz.build index 6e5d1e2e78953..2790a512cd304 100644 --- a/gfx/src/moz.build +++ b/gfx/src/moz.build @@ -91,7 +91,6 @@ 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"] diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index baa6f090a9a3a..0b6719692686d 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -272,13 +272,12 @@ 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"]: diff --git a/gfx/vr/moz.build b/gfx/vr/moz.build index 11e02c85a1afd..ec56fc56341d8 100644 --- a/gfx/vr/moz.build +++ b/gfx/vr/moz.build @@ -91,8 +91,9 @@ if CONFIG["OS_ARCH"] == "WINNT": LOCAL_INCLUDES += ["/layout/generic", "/widget", "/widget/windows"] SOURCES += ["FxROutputHandler.cpp", "FxRWindowManager.cpp"] -CXXFLAGS += CONFIG["TK_CFLAGS"] -CFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] include("/ipc/chromium/chromium-config.mozbuild") diff --git a/gfx/webrender_bindings/moz.build b/gfx/webrender_bindings/moz.build index bbcf10875a93c..0f168f3036158 100644 --- a/gfx/webrender_bindings/moz.build +++ b/gfx/webrender_bindings/moz.build @@ -124,5 +124,7 @@ FINAL_LIBRARY = "xul" LOCAL_INCLUDES += [ "/gfx/cairo/cairo/src", ] -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + CXXFLAGS += ["-Werror=switch"] diff --git a/image/decoders/icon/gtk/moz.build b/image/decoders/icon/gtk/moz.build index 1acddeec3412d..3eac86b6baa64 100644 --- a/image/decoders/icon/gtk/moz.build +++ b/image/decoders/icon/gtk/moz.build @@ -14,6 +14,7 @@ EXPORTS += [ FINAL_LIBRARY = "xul" -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] include("/ipc/chromium/chromium-config.mozbuild") diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index 49aaf14c51a10..0a9ab349d40ac 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -123,7 +123,8 @@ if os_solaris: "src/base/time_posix.cc", ] -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] TEST_DIRS += [ "gtest", diff --git a/ipc/ipdl/moz.build b/ipc/ipdl/moz.build index b5f01c5267825..320c2e2f85cb1 100644 --- a/ipc/ipdl/moz.build +++ b/ipc/ipdl/moz.build @@ -15,7 +15,8 @@ FINAL_LIBRARY = "xul" # We #include some things in the dom/plugins/ directory that rely on # toolkit libraries. -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] # Add libFuzzer configuration directives include("/tools/fuzzing/libfuzzer-config.mozbuild") diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build index 55f9356af95ea..5048fa7608aec 100644 --- a/js/xpconnect/shell/moz.build +++ b/js/xpconnect/shell/moz.build @@ -68,6 +68,7 @@ if CONFIG["OS_TARGET"] == "Darwin": "-framework Foundation", ] -CFLAGS += CONFIG["TK_CFLAGS"] -CXXFLAGS += CONFIG["TK_CFLAGS"] -OS_LIBS += CONFIG["TK_LIBS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + OS_LIBS += CONFIG["MOZ_GTK3_LIBS"] diff --git a/layout/generic/moz.build b/layout/generic/moz.build index d4adfa37c2703..341d399a2f155 100644 --- a/layout/generic/moz.build +++ b/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["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] diff --git a/layout/xul/moz.build b/layout/xul/moz.build index 4b71eb94bc0e7..be536100becb7 100644 --- a/layout/xul/moz.build +++ b/layout/xul/moz.build @@ -53,8 +53,9 @@ UNIFIED_SOURCES += [ DIRS += ["tree"] -CFLAGS += CONFIG["TK_CFLAGS"] -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] include("/ipc/chromium/chromium-config.mozbuild") diff --git a/netwerk/protocol/gio/moz.build b/netwerk/protocol/gio/moz.build index 7e28502558dd1..4078e5605c81d 100644 --- a/netwerk/protocol/gio/moz.build +++ b/netwerk/protocol/gio/moz.build @@ -35,7 +35,8 @@ LOCAL_INCLUDES += [ FINAL_LIBRARY = "xul" -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] with Files("**"): BUG_COMPONENT = ("Core", "Widget: Gtk") diff --git a/old-configure.in b/old-configure.in index fdcef71846ef2..75df9a7644b0d 100644 --- a/old-configure.in +++ b/old-configure.in @@ -1263,8 +1263,6 @@ 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 @@ -1274,9 +1272,6 @@ if test "$COMPILE_ENVIRONMENT"; then fi fi # COMPILE_ENVIRONMENT -AC_SUBST_LIST(TK_CFLAGS) -AC_SUBST_LIST(TK_LIBS) - dnl ======================================================== dnl = dnl = Components & Features diff --git a/python/mozbuild/mozbuild/gn_processor.py b/python/mozbuild/mozbuild/gn_processor.py index 4f1d75cc7a078..e358f770db0d9 100644 --- a/python/mozbuild/mozbuild/gn_processor.py +++ b/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["TK_CFLAGS"]\n') + mb.write(' CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]\n') except KeyError: pass diff --git a/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build b/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build index 5c6dbadc714b3..68c891978e3ac 100644 --- a/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build +++ b/security/manager/ssl/tests/unit/tlsserver/cmd/moz.build @@ -27,4 +27,5 @@ USE_LIBS += [ "tlsserver", ] -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] diff --git a/security/sandbox/linux/broker/moz.build b/security/sandbox/linux/broker/moz.build index 8af381656a80c..f993bc99c5c41 100644 --- a/security/sandbox/linux/broker/moz.build +++ b/security/sandbox/linux/broker/moz.build @@ -32,7 +32,7 @@ LOCAL_INCLUDES += [ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["GLIB_CFLAGS"] - CXXFLAGS += CONFIG["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] FINAL_LIBRARY = "xul" diff --git a/security/sandbox/linux/launch/moz.build b/security/sandbox/linux/launch/moz.build index 765072e4cbc5f..50a017c18b86e 100644 --- a/security/sandbox/linux/launch/moz.build +++ b/security/sandbox/linux/launch/moz.build @@ -27,7 +27,8 @@ USE_LIBS += [ ] # For the X11 socket domain inspection in SandboxLaunch: -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] FINAL_LIBRARY = "xul" diff --git a/testing/tools/screenshot/moz.build b/testing/tools/screenshot/moz.build index 2a7bfce846df1..829405856f1b7 100644 --- a/testing/tools/screenshot/moz.build +++ b/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["TK_CFLAGS"] - OS_LIBS += CONFIG["TK_LIBS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + OS_LIBS += CONFIG["MOZ_GTK3_LIBS"] if CONFIG["MOZ_ENABLE_DBUS"]: OS_LIBS += CONFIG["MOZ_DBUS_GLIB_LIBS"] diff --git a/third_party/libwebrtc/api/transport/stun_types_gn/moz.build b/third_party/libwebrtc/api/transport/stun_types_gn/moz.build index 8ebe427eb3163..4a740f2764780 100644 --- a/third_party/libwebrtc/api/transport/stun_types_gn/moz.build +++ b/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["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() diff --git a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build b/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build index 428fd07964fe7..a5cf9234d1228 100644 --- a/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build +++ b/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["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] COMPILE_FLAGS["OS_INCLUDES"] = [] AllowCompilerWarnings() diff --git a/third_party/pipewire/libpipewire/moz.build b/third_party/pipewire/libpipewire/moz.build index 275913e3dc037..3102b3cb69b79 100644 --- a/third_party/pipewire/libpipewire/moz.build +++ b/third_party/pipewire/libpipewire/moz.build @@ -8,7 +8,8 @@ SOURCES += [ 'mozpipewire.cpp', ] -CXXFLAGS += CONFIG['TK_CFLAGS'] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS'] LOCAL_INCLUDES += ['/third_party/pipewire'] diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build index 19ae8dcb56f4e..d4172e2d73ad0 100644 --- a/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build @@ -17,7 +17,8 @@ XPIDL_SOURCES += [ XPIDL_MODULE = "downloads" -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] SOURCES += [ "DownloadPlatform.cpp", diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build index 871a757adfe45..a94e48fa27678 100644 --- a/toolkit/components/protobuf/moz.build +++ b/toolkit/components/protobuf/moz.build @@ -142,4 +142,5 @@ if CONFIG['MOZ_USE_PTHREADS']: # Needed for the gzip streams. DEFINES['HAVE_ZLIB'] = True -CXXFLAGS += CONFIG['TK_CFLAGS'] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS'] diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build index c1853a9f4d980..d3bab6cf9a917 100644 --- a/toolkit/components/remote/moz.build +++ b/toolkit/components/remote/moz.build @@ -32,7 +32,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": "nsXRemoteClient.cpp", "nsXRemoteServer.cpp", ] - CXXFLAGS += CONFIG["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": SOURCES += [ diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build index 1fb94cca8a32e..48c4499914d71 100644 --- a/toolkit/crashreporter/client/moz.build +++ b/toolkit/crashreporter/client/moz.build @@ -82,9 +82,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": USE_LIBS += [ "breakpad_linux_common_s", ] - OS_LIBS += CONFIG["TK_LIBS"] + OS_LIBS += CONFIG["MOZ_GTK3_LIBS"] OS_LIBS += CONFIG["MOZ_GTHREAD_LIBS"] - CXXFLAGS += CONFIG["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTHREAD_CFLAGS"] if CONFIG["OS_ARCH"] == "Linux" or CONFIG["OS_ARCH"] == "SunOS": diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index 5d70297a13133..0b21d73c8c6d2 100644 --- a/toolkit/library/moz.build +++ b/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["TK_LIBS"] if l not in ("-lgtk-3", "-lgdk-3")] + OS_LIBS += [l for l in CONFIG["MOZ_GTK3_LIBS"] if l not in ("-lgtk-3", "-lgdk-3")] OS_LIBS += CONFIG["MOZ_X11_LIBS"] OS_LIBS += CONFIG["MOZ_PANGO_LIBS"] diff --git a/toolkit/mozapps/update/updater/updater-common.build b/toolkit/mozapps/update/updater/updater-common.build index 13926ea820468..95d1ab892485a 100644 --- a/toolkit/mozapps/update/updater/updater-common.build +++ b/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["TK_CFLAGS"] - OS_LIBS += CONFIG["TK_LIBS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + OS_LIBS += CONFIG["MOZ_GTK3_LIBS"] if CONFIG["CC_TYPE"] == "gcc": CXXFLAGS += ["-Wno-format-truncation"] diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build index 0fc94ed9e39af..a1b4aa29f2504 100644 --- a/toolkit/system/gnome/moz.build +++ b/toolkit/system/gnome/moz.build @@ -29,4 +29,4 @@ LOCAL_INCLUDES += [ CXXFLAGS += CONFIG["GLIB_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] -CXXFLAGS += CONFIG["TK_CFLAGS"] +CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index e39d75d60330b..b1e2b58621d64 100644 --- a/toolkit/xre/moz.build +++ b/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 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build index 8bac7bcfa376b..55ca638754295 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -134,11 +134,10 @@ LOCAL_INCLUDES += [ ] if CONFIG["MOZ_ENABLE_DBUS"]: - CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": - CXXFLAGS += CONFIG["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] REQUIRES_UNIFIED_BUILD = True diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build index 06b29cb23c8f6..3e7a13c95a573 100644 --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build @@ -153,8 +153,8 @@ DEFINES["CAIRO_GFX"] = True DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"] -CFLAGS += CONFIG["TK_CFLAGS"] -CXXFLAGS += CONFIG["TK_CFLAGS"] +CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] +CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] if CONFIG["MOZ_WAYLAND"]: CFLAGS += CONFIG["MOZ_WAYLAND_CFLAGS"] diff --git a/widget/gtk/mozwayland/moz.build b/widget/gtk/mozwayland/moz.build index 94eca8a785238..0df3f0f6857a2 100644 --- a/widget/gtk/mozwayland/moz.build +++ b/widget/gtk/mozwayland/moz.build @@ -13,4 +13,4 @@ EXPORTS.mozilla.widget += [ SharedLibrary("mozwayland") -CFLAGS += CONFIG["TK_CFLAGS"] +CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] diff --git a/widget/gtk/wayland/moz.build b/widget/gtk/wayland/moz.build index 34fea91447545..2bd15b3844e7a 100644 --- a/widget/gtk/wayland/moz.build +++ b/widget/gtk/wayland/moz.build @@ -37,5 +37,5 @@ include("/ipc/chromium/chromium-config.mozbuild") FINAL_LIBRARY = "xul" -CFLAGS += CONFIG["TK_CFLAGS"] -CXXFLAGS += CONFIG["TK_CFLAGS"] +CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] +CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] diff --git a/widget/moz.build b/widget/moz.build index 2f0d254b7d1a1..6b1998c0c0971 100644 --- a/widget/moz.build +++ b/widget/moz.build @@ -347,7 +347,8 @@ FINAL_LIBRARY = "xul" if CONFIG["MOZ_ENABLE_D3D10_LAYER"]: DEFINES["MOZ_ENABLE_D3D10_LAYER"] = True -CXXFLAGS += CONFIG["TK_CFLAGS"] +if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] if CONFIG["MOZ_WAYLAND"]: CXXFLAGS += CONFIG["MOZ_WAYLAND_CFLAGS"] diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build index 8780ca11853e8..90df35b635859 100644 --- a/xpcom/base/moz.build +++ b/xpcom/base/moz.build @@ -263,7 +263,7 @@ LOCAL_INCLUDES += [ ] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": - CXXFLAGS += CONFIG["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] if CONFIG["MOZ_BACKGROUNDTASKS"]: DEFINES["MOZ_BACKGROUNDTASKS"] = True diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build index 655e2a607a4a6..6cf78aa9bec51 100644 --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build @@ -74,7 +74,7 @@ LOCAL_INCLUDES += [ ] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": - CXXFLAGS += CONFIG["TK_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] if CONFIG["MOZ_ENABLE_DBUS"]: CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]