From 60dc5e2272768253e5745fefe2953fad850e8cd5 Mon Sep 17 00:00:00 2001 From: stransky Date: Tue, 5 Sep 2023 08:14:21 +0000 Subject: [PATCH] Bug 1532281 [Linux] Don't build with dbus-glib r=glandium Differential Revision: https://phabricator.services.mozilla.com/D187208 --- 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, 1 insertion(+), 23 deletions(-) diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build index eb88cb287dc3..7e6413e360e4 100644 --- a/browser/components/shell/moz.build +++ b/browser/components/shell/moz.build @@ -85,8 +85,5 @@ 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 dc7f580453a7..20145e89af1b 100644 --- a/config/system-headers.mozbuild +++ b/config/system-headers.mozbuild @@ -160,8 +160,6 @@ 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 5f55d5a95e96..5d5cfbfa203a 100644 --- a/dom/gamepad/moz.build +++ b/dom/gamepad/moz.build @@ -76,6 +76,4 @@ 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 53034db9c519..2d6b6b5fab92 100644 --- a/dom/geolocation/moz.build +++ b/dom/geolocation/moz.build @@ -57,5 +57,4 @@ 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 f33e81eb13d7..9e7d6ef31d0f 100644 --- a/dom/system/linux/moz.build +++ b/dom/system/linux/moz.build @@ -18,7 +18,6 @@ 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 bc13c596c0d1..cef6ed3a12f5 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -132,7 +132,5 @@ 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 83e0546a5004..9e986c70b21f 100644 --- a/netwerk/wifi/moz.build +++ b/netwerk/wifi/moz.build @@ -54,7 +54,6 @@ 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 9d530191fd14..14b9b321ba7d 100644 --- a/testing/tools/screenshot/moz.build +++ b/testing/tools/screenshot/moz.build @@ -11,8 +11,6 @@ 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 d3bab6cf9a91..25eb966e9b1e 100644 --- a/toolkit/components/remote/moz.build +++ b/toolkit/components/remote/moz.build @@ -21,7 +21,6 @@ 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 3faa0370cc1c..da1d8c47f83e 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_GLIB_LIBS"] + OS_LIBS += CONFIG["MOZ_DBUS_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 5b6ea4a6a7b8..8f52e5aca6cb 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -3050,7 +3050,6 @@ 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 a1b4aa29f250..aa2df2b66b67 100644 --- a/toolkit/system/gnome/moz.build +++ b/toolkit/system/gnome/moz.build @@ -28,5 +28,4 @@ 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 de05e0cc2975..f9d042d0e69a 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -267,7 +267,6 @@ 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 0fb126a7f3f7..cb96c690a69a 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -141,4 +141,3 @@ 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 90cd17a0982b..3e485fc428e8 100644 --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build @@ -174,6 +174,5 @@ 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 95ee64e985ac..4a58f46da3f6 100644 --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build @@ -75,8 +75,6 @@ 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")