Merge branch 'omp-jb51115' into 'master'

Use dbus-gmain instead of dbus-glib

See merge request mer-core/dsme!44

Makefile.am

@@ -1 +1 @@
-SUBDIRS = dsme modules util test tests getbootstate
+SUBDIRS = dbus-gmain dsme modules util test tests getbootstate

configure.ac

@@ -1,7 +1,8 @@
 # Package name and version
 AC_INIT(dsme, 0.81.4)
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_EXTRA_RECURSIVE_TARGETS([dbus-gmain])
 
 AC_PREREQ([2.61])
 AC_CONFIG_SRCDIR([dsme/dsme-wdd-wd.c])
@@ -193,7 +194,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
+LT_INIT
 PKG_PROG_PKG_CONFIG
 
 # Specify dir for local macros
@@ -204,9 +205,8 @@ AM_PROG_CC_C_O()
 
 # Pkgconf checks
 PKG_CHECK_MODULES(LIBCRYPTSETUP, libcryptsetup)
-PKG_CHECK_MODULES(GLIB, glib-2.0)
-PKG_CHECK_MODULES(DBUS, dbus-1)
-PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.40)
+PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.8)
 PKG_CHECK_MODULES(MCE_DEV, mce,
 		  [],
 		  AC_MSG_ERROR(Development files for mce are missing. Install mce-headers / mce-dev.))
@@ -252,6 +252,7 @@ AC_CHECK_FUNCS([atexit clock_gettime dup2 ftw64 gettimeofday inet_ntoa memmove
 
 # Create files
 AC_CONFIG_FILES([Makefile
+                 dbus-gmain/Makefile
                  dsme/Makefile
                  modules/Makefile
                  util/Makefile
@@ -260,4 +261,5 @@ AC_CONFIG_FILES([Makefile
                  tests/Makefile
                  dsme.init])
 
-AC_OUTPUT(dsme-plugin.pc)
+AC_CONFIG_FILES([dsme-plugin.pc])
+AC_OUTPUT

modules/Makefile.am

@@ -3,7 +3,8 @@
 #
 AM_CFLAGS = $(C_GENFLAGS) $(C_OPTFLAGS) -fPIC
 AM_LDFLAGS = -pthread -module -avoid-version -shared
-AM_CPPFLAGS = $(CPP_GENFLAGS)
+AM_CPPFLAGS = $(CPP_GENFLAGS) -I$(top_srcdir) \
+	$(GLIB_CFLAGS)
 ACLOCAL_AMFLAGS = -I m4
 
 pkglib_LTLIBRARIES = startup.la              \
@@ -82,15 +83,14 @@ endif
 startup_la_SOURCES = startup.c
 
 heartbeat_la_SOURCES = heartbeat.c
-heartbeat_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
-
 state_la_SOURCES = state.c
 state_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 state_la_LIBADD =
 if WANT_VIBRA_FEEDBACK
 state_la_SOURCES += vibrafeedback.c vibrafeedback.h
-state_la_CFLAGS += $(GLIB_CFLAGS) $(LIBNGF_CFLAGS)
-state_la_LIBADD += $(GLIB_LIBS) $(LIBNGF_LIBS)
+state_la_CFLAGS += $(LIBNGF_CFLAGS)
+state_la_LIBADD += $(GLIB_LIBS) $(LIBNGF_LIBS) \
+	$(top_srcdir)/dbus-gmain/libdbus-gmain.la
 endif
 
 if WANT_RUNLEVEL
@@ -105,44 +105,44 @@ endif
 
 if WANT_VALIDATOR_LISTENER
 runlevel_la_SOURCES = validatorlistener.c
-validatorlistener_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
 endif
 
 processwd_la_SOURCES = processwd.c
-processwd_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
 
 dbusproxy_la_SOURCES = dbusproxy.c dsme_dbus.c
-dbusproxy_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS)
-dbusproxy_la_LIBADD = $(DBUSGLIB_LIBS) -ldsme_dbus_if
+dbusproxy_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+dbusproxy_la_LIBADD = $(DBUSGLIB_LIBS) -ldsme_dbus_if \
+	$(top_srcdir)/dbus-gmain/libdbus-gmain.la
 
 alarmtracker_la_SOURCES = alarmtracker.c
 alarmtracker_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 alarmtracker_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 thermalmanager_la_SOURCES = thermalmanager.c thermalobject.c
-thermalmanager_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+thermalmanager_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 thermalmanager_la_LIBADD = -lthermalmanager_dbus_if
 
 emergencycalltracker_la_SOURCES = emergencycalltracker.c
 emergencycalltracker_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
 usbtracker_la_SOURCES = usbtracker.c
-usbtracker_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
-usbtracker_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)
+usbtracker_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+usbtracker_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) \
+	$(top_srcdir)/dbus-gmain/libdbus-gmain.la
 
 iphb_la_SOURCES = iphb.c
-iphb_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(MCE_DEV_CFLAGS)
-iphb_la_CPPFLAGS = $(AM_CPPFLAGS)
-iphb_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)
+iphb_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) $(MCE_DEV_CFLAGS)
+iphb_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) \
+	$(top_srcdir)/dbus-gmain/libdbus-gmain.la
 
 thermalflagger_la_SOURCES = thermalflagger.c
 
 malf_la_SOURCES = malf.c
 
 if WANT_GENERIC_THERMAL_MGMT
 thermalsensor_generic_la_SOURCES = thermalsensor_generic.c
-thermalsensor_generic_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
-thermalsensor_generic_la_LIBADD = -lthermalmanager_dbus_if
+thermalsensor_generic_la_CFLAGS  = $(AM_CFLAGS) $(DBUS_CFLAGS)
+thermalsensor_generic_la_LIBADD  = -lthermalmanager_dbus_if
 endif
 
 
@@ -151,41 +151,40 @@ powerontimer_la_SOURCES = powerontimer.c         \
                              powerontimer_backend.c \
                              powerontimer.h         \
                              powerontimer_backend.h
-powerontimer_la_CFLAGS =  $(AM_CFLAGS) $(GLIB_CFLAGS)
 powerontimer_la_LIBADD = -lcal -lrt
 endif
 
 diskmonitor_la_SOURCES = diskmonitor.c \
 				diskmonitor.h
 
-diskmonitor_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
+diskmonitor_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 
 dbusautoconnector_la_SOURCES = dbusautoconnector.c
-dbusautoconnector_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
-dbusautoconnector_la_LIBADD = $(GLIB_LIBS)
+dbusautoconnector_la_CFLAGS  = $(AM_CFLAGS) $(DBUS_CFLAGS)
+dbusautoconnector_la_LIBADD  = $(GLIB_LIBS)
 
 if WANT_PWRKEY_MONITOR
 pwrkeymonitor_la_SOURCES = pwrkeymonitor.c
-pwrkeymonitor_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
 pwrkeymonitor_la_LIBADD = $(GLIB_LIBS)
 endif
 
 if WANT_BATTERY_TRACKER
 batterytracker_la_SOURCES = batterytracker.c
-batterytracker_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(MCE_DEV_CFLAGS)
-batterytracker_la_LIBADD = $(GLIB_LIBS)
+batterytracker_la_CFLAGS  = $(AM_CFLAGS) $(DBUS_CFLAGS) $(MCE_DEV_CFLAGS)
+batterytracker_la_LIBADD  = $(GLIB_LIBS)
 endif
 
 if WANT_BOOTREASON_LOGGER
 bootreasonlogger_la_SOURCES = bootreasonlogger.c
-bootreasonlogger_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
-bootreasonlogger_la_LIBADD = $(GLIB_LIBS)
+bootreasonlogger_la_CFLAGS  = $(AM_CFLAGS) $(DBUS_CFLAGS)
+bootreasonlogger_la_LIBADD  = $(GLIB_LIBS)
 endif
 
 if WANT_VIBRA_FEEDBACK
 shutdownfeedback_la_SOURCES = shutdownfeedback.c vibrafeedback.c vibrafeedback.h
-shutdownfeedback_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(LIBNGF_CFLAGS)
-shutdownfeedback_la_LIBADD = $(GLIB_LIBS) $(LIBNGF_LIBS)
+shutdownfeedback_la_CFLAGS  = $(AM_CFLAGS) $(DBUS_CFLAGS) $(LIBNGF_CFLAGS)
+shutdownfeedback_la_LIBADD  = $(GLIB_LIBS) $(LIBNGF_LIBS) \
+	$(top_srcdir)/dbus-gmain/libdbus-gmain.la
 endif
 
 if WANT_WLAN_LOADER
@@ -195,6 +194,6 @@ endif
 
 if WANT_ABOOTSETTINGS
 abootsettings_la_SOURCES = abootsettings.c
-abootsettings_la_CFLAGS =  $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
-abootsettings_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)
+abootsettings_la_CFLAGS  = $(AM_CFLAGS) $(DBUS_CFLAGS)
+abootsettings_la_LIBADD  = $(GLIB_LIBS) $(DBUS_LIBS)
 endif

modules/dsme_dbus.c

@@ -39,10 +39,8 @@
 #include "../dsme/dsme-server.h"
 #include <dsme/state.h>
 
-#include <glib.h>
 #include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus-gmain/dbus-gmain.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -1360,7 +1358,7 @@ manager_connect(DsmeDbusManager *self)
     dbus_connection_set_exit_on_disconnect(con, FALSE);
 
     /* Attach to glib mainloop */
-    dbus_connection_setup_with_g_main(con, 0);
+    dbus_gmain_set_up_connection(con, 0);
 
     /* Manager owns the connection */
     self->mr_connection = con, con = 0;

modules/iphb.c

@@ -62,8 +62,7 @@
 #include <linux/rtc.h>
 #include <limits.h>
 #include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus-gmain/dbus-gmain.h>
 #include <mce/dbus-names.h>
 
 #include "../include/android/android_alarm.h"
@@ -3017,7 +3016,7 @@ static void systembus_connect(void)
 	goto cleanup;
     }
 
-    dbus_connection_setup_with_g_main(systembus, 0);
+    dbus_gmain_set_up_connection(systembus, 0);
 
     xmce_handle_dbus_connect();
 

modules/usbtracker.c

@@ -49,8 +49,7 @@
 
 #include <string.h>
 #include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus-gmain/dbus-gmain.h>
 
 /** Prefix string used for logging from this module */
 #define PFIX "usbtracker: "
@@ -673,7 +672,7 @@ systembus_connect(void)
         goto cleanup;
     }
 
-    dbus_connection_setup_with_g_main(systembus, 0);
+    dbus_gmain_set_up_connection(systembus, 0);
 
     xusbmoded_init_tracking();
 

modules/vibrafeedback.c

@@ -38,7 +38,7 @@
 
 #include <glib.h>
 #include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus-gmain/dbus-gmain.h>
 
 #include "vibrafeedback.h"
 
@@ -148,7 +148,7 @@ void dsme_ini_vibrafeedback(void) {
                  err.name, err.message);
         goto cleanup;
     }
-    dbus_connection_setup_with_g_main(dbus_connection, NULL);
+    dbus_gmain_set_up_connection(dbus_connection, NULL);
 cleanup:
     dbus_error_free(&err);
 }

rpm/dsme.spec

@@ -14,8 +14,7 @@ Requires(preun): systemd
 Requires(post): systemd
 Requires(postun): systemd
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
-BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(dbus-1) >= 1.8
 BuildRequires:  pkgconfig(libiphb) >= 1.2.0
 BuildRequires:  pkgconfig(dsme) >= 0.66.0
 BuildRequires:  pkgconfig(libsystemd)