Backed out changeset 50b448b2d902 (bug 1532281) for causing Linux build bustages. CLOSED TREE

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")

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',

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"]

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"]

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"

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"]

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"]
 

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")

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",

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")]

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)

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"]

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"]

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"]

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"]

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")