From 17fb8bac17c7b999027b83c631384901ffc1b4d2 Mon Sep 17 00:00:00 2001 From: Stanca Serban Date: Tue, 5 Sep 2023 11:38:18 +0300 Subject: [PATCH] Backed out changeset 50b448b2d902 (bug 1532281) for causing Linux build bustages. CLOSED TREE --- browser/components/shell/moz.build | 3 +++ config/system-headers.mozbuild | 2 ++ dom/gamepad/moz.build | 2 ++ dom/geolocation/moz.build | 1 + dom/system/linux/moz.build | 1 + hal/moz.build | 2 ++ netwerk/wifi/moz.build | 1 + testing/tools/screenshot/moz.build | 2 ++ toolkit/components/remote/moz.build | 1 + toolkit/library/moz.build | 2 +- toolkit/moz.configure | 1 + toolkit/system/gnome/moz.build | 1 + toolkit/xre/moz.build | 1 + uriloader/exthandler/moz.build | 1 + widget/gtk/moz.build | 1 + xpcom/components/moz.build | 2 ++ 16 files changed, 23 insertions(+), 1 deletion(-) diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build index 7e6413e360e4..eb88cb287dc3 100644 --- a/browser/components/shell/moz.build +++ b/browser/components/shell/moz.build @@ -85,5 +85,8 @@ for var in ( if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] +if CONFIG["MOZ_ENABLE_DBUS"]: + CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] + with Files("**"): BUG_COMPONENT = ("Firefox", "Shell Integration") diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild index 20145e89af1b..dc7f580453a7 100644 --- a/config/system-headers.mozbuild +++ b/config/system-headers.mozbuild @@ -160,6 +160,8 @@ system_headers = [ 'curses.h', 'cxxabi.h', 'DateTimeUtils.h', + 'dbus/dbus-glib.h', + 'dbus/dbus-glib-lowlevel.h', 'dbus/dbus.h', 'ddeml.h', 'Debug.h', diff --git a/dom/gamepad/moz.build b/dom/gamepad/moz.build index 5d5cfbfa203a..5f55d5a95e96 100644 --- a/dom/gamepad/moz.build +++ b/dom/gamepad/moz.build @@ -76,4 +76,6 @@ LOCAL_INCLUDES += [ ] CFLAGS += CONFIG["GLIB_CFLAGS"] +CFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += CONFIG["GLIB_CFLAGS"] +CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build index 2d6b6b5fab92..53034db9c519 100644 --- a/dom/geolocation/moz.build +++ b/dom/geolocation/moz.build @@ -57,4 +57,5 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": DEFINES["MOZ_GPSD"] = True if CONFIG["MOZ_ENABLE_DBUS"]: LOCAL_INCLUDES += ["/dom/system/linux"] + CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] diff --git a/dom/system/linux/moz.build b/dom/system/linux/moz.build index 9e7d6ef31d0f..f33e81eb13d7 100644 --- a/dom/system/linux/moz.build +++ b/dom/system/linux/moz.build @@ -18,6 +18,7 @@ if CONFIG["MOZ_ENABLE_DBUS"]: SOURCES += ["GeoclueLocationProvider.cpp"] SOURCES += ["PortalLocationProvider.cpp"] LOCAL_INCLUDES += ["/dom/geolocation"] + CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] FINAL_LIBRARY = "xul" diff --git a/hal/moz.build b/hal/moz.build index cef6ed3a12f5..bc13c596c0d1 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -132,5 +132,7 @@ LOCAL_INCLUDES += [ CFLAGS += CONFIG["GLIB_CFLAGS"] CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] +CFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += CONFIG["GLIB_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] +CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build index 9e986c70b21f..83e0546a5004 100644 --- a/netwerk/wifi/moz.build +++ b/netwerk/wifi/moz.build @@ -54,6 +54,7 @@ elif CONFIG["NECKO_WIFI_DBUS"]: LOCAL_INCLUDES += [ "dbus", ] + CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] TEST_DIRS += ["gtest"] diff --git a/testing/tools/screenshot/moz.build b/testing/tools/screenshot/moz.build index 14b9b321ba7d..9d530191fd14 100644 --- a/testing/tools/screenshot/moz.build +++ b/testing/tools/screenshot/moz.build @@ -11,6 +11,8 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": ] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] OS_LIBS += CONFIG["MOZ_GTK3_LIBS"] + if CONFIG["MOZ_ENABLE_DBUS"]: + OS_LIBS += CONFIG["MOZ_DBUS_GLIB_LIBS"] elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": Program("screenshot") diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build index 25eb966e9b1e..d3bab6cf9a91 100644 --- a/toolkit/components/remote/moz.build +++ b/toolkit/components/remote/moz.build @@ -21,6 +21,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": "nsDBusRemoteClient.cpp", "nsDBusRemoteServer.cpp", ] + CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] EXPORTS += [ "nsUnixRemoteServer.h", "RemoteUtils.h", diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index da1d8c47f83e..3faa0370cc1c 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -315,7 +315,7 @@ if CONFIG["OS_ARCH"] == "OpenBSD": ] if CONFIG["MOZ_ENABLE_DBUS"]: - OS_LIBS += CONFIG["MOZ_DBUS_LIBS"] + OS_LIBS += CONFIG["MOZ_DBUS_GLIB_LIBS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk" and CONFIG["COMPILE_ENVIRONMENT"]: OS_LIBS += [l for l in CONFIG["MOZ_GTK3_LIBS"] if l not in ("-lgtk-3", "-lgdk-3")] diff --git a/toolkit/moz.configure b/toolkit/moz.configure index 8f52e5aca6cb..5b6ea4a6a7b8 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -3050,6 +3050,7 @@ with only_when(toolkit_gtk): with only_when("--enable-dbus"): pkg_check_modules("MOZ_DBUS", "dbus-1 >= 0.60") + pkg_check_modules("MOZ_DBUS_GLIB", "dbus-glib-1 >= 0.60") set_config("MOZ_ENABLE_DBUS", True) set_define("MOZ_ENABLE_DBUS", True) diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build index aa2df2b66b67..a1b4aa29f250 100644 --- a/toolkit/system/gnome/moz.build +++ b/toolkit/system/gnome/moz.build @@ -28,4 +28,5 @@ LOCAL_INCLUDES += [ ] CXXFLAGS += CONFIG["GLIB_CFLAGS"] +CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index f9d042d0e69a..de05e0cc2975 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -267,6 +267,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": ] CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"] +CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build index cb96c690a69a..0fb126a7f3f7 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -141,3 +141,4 @@ if CONFIG["MOZ_ENABLE_DBUS"]: if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build index 3e485fc428e8..90cd17a0982b 100644 --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build @@ -174,5 +174,6 @@ if CONFIG["MOZ_ENABLE_DBUS"]: UNIFIED_SOURCES += [ "AsyncDBus.cpp", ] + CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += ["-Werror=switch"] diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build index 4a58f46da3f6..95ee64e985ac 100644 --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build @@ -75,6 +75,8 @@ LOCAL_INCLUDES += [ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"] + if CONFIG["MOZ_ENABLE_DBUS"]: + CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] include("/ipc/chromium/chromium-config.mozbuild")