From ba84cae2fe41496a89cc964bc5bc0bf13c9796ed Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Fri, 14 Jun 2013 16:04:14 -0500
Subject: remove build dependencies on dbusmenu, libindicator

---
 configure.ac    | 33 ++++++---------------------------
 debian/control  |  3 ---
 src/Makefile.am | 37 +------------------------------------
 3 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/configure.ac b/configure.ac
index e9acb8c..22a6ee5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,48 +38,27 @@ AS_IF([test "x$enable_deprecations" = xno],
   [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"]
 )
 
-AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
-AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
-
 PKG_PROG_PKG_CONFIG
 
 ###########################
 # Dependencies
 ###########################
 
-INDICATOR_REQUIRED_VERSION=0.3.19
-DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
-DBUSMENUGTK_REQUIRED_VERSION=0.5.90
+GLIB_REQUIRED_VERSION=2.35.4
 GIO_REQUIRED_VERSION=2.25.11
-INDICATOR_DISPLAY_OBJECTS=0.2.2
 GEOCLUE_REQUIRED_VERSION=0.12.0
+ICAL_REQUIRED_VERSION=0.48
 ECAL_REQUIRED_VERSION=3.5
 EDS_REQUIRED_VERSION=3.5
-ICAL_REQUIRED_VERSION=0.48
-CAIRO_REQUIRED_VERSION=1.10
-GDK_REQUIRED_VERSION=2.22
-GLIB_REQUIRED_VERSION=2.35.4
+
 GTK3_REQUIRED_VERSION=3.1.4
 
-PKG_CHECK_MODULES(INDICATOR, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                             glib-2.0 >= $GLIB_REQUIRED_VERSION
-                             dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                             dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                             libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
-
-PKG_CHECK_MODULES(SERVICE, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                           glib-2.0 >= $GLIB_REQUIRED_VERSION
-                           dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
-                           dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                           libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS
+PKG_CHECK_MODULES(SERVICE, glib-2.0 >= $GLIB_REQUIRED_VERSION
                            gio-2.0 >= $GIO_REQUIRED_VERSION
                            geoclue >= $GEOCLUE_REQUIRED_VERSION
-                           libecal-1.2 >= $ECAL_REQUIRED_VERSION
                            libical >= $ICAL_REQUIRED_VERSION
-                           libedataserver-1.2 >= EDS_REQUIRED_VERSION
-                           libedataserverui-3.0 >= EDS_REQUIRED_VERSION
-                           cairo >= CAIRO_REQUIRED_VERSION
-                           gdk-3.0 >= GDK_REQUIRED_VERSION)
+                           libecal-1.2 >= $ECAL_REQUIRED_VERSION
+                           libedataserver-1.2 >= EDS_REQUIRED_VERSION)
 
 ###########################
 # Control Center panel
diff --git a/debian/control b/debian/control
index 41bdb0f..01fc757 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,6 @@ Build-Depends: debhelper (>= 9),
                gnome-common,
                libxorg-gtest-dev,
                libgtest-dev,
-               libindicator3-dev (>= 0.3.90),
-               libdbusmenu-glib-dev (>= 0.5.90),
-               libdbusmenu-gtk3-dev (>= 0.5.90),
                libglib2.0-dev (>= 2.35.4),
                libido3-0.1-dev (>= 0.2.90),
                libgeoclue-dev (>= 0.12.0),
diff --git a/src/Makefile.am b/src/Makefile.am
index fee2245..31639af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,9 +7,6 @@ endif
 libexec_PROGRAMS = indicator-datetime-service
 
 indicator_datetime_service_SOURCES = \
-	datetime-interface.c \
-	datetime-interface.h \
-	gen-datetime-service.xml.c \
 	planner.c \
 	planner.h \
 	planner-eds.c \
@@ -27,6 +24,7 @@ indicator_datetime_service_SOURCES = \
 	utils.h \
 	dbus-shared.h \
 	settings-shared.h
+
 indicator_datetime_service_CFLAGS = \
 	-Wall \
         -Wextra -Wno-missing-field-initializers \
@@ -40,28 +38,6 @@ indicator_datetime_service_LDADD = \
 indicator_datetime_service_LDFLAGS = \
 	$(COVERAGE_LDFLAGS)
 
-datetimelibdir = $(INDICATORDIR)
-datetimelib_LTLIBRARIES = libdatetime.la
-libdatetime_la_SOURCES = \
-	gen-datetime-service.xml.h \
-	dbus-shared.h \
-	settings-shared.h \
-	utils.c \
-	utils.h \
-	indicator-datetime.c
-libdatetime_la_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-Wall -Werror \
-	-DTIMEZONE_FILE="\"/etc/timezone\"" \
-	-DG_LOG_DOMAIN=\"Indicator-Datetime\"
-libdatetime_la_LIBADD = \
-	$(INDICATOR_LIBS)
-libdatetime_la_LDFLAGS = \
-	$(COVERAGE_LDFLAGS) \
-	-module \
-	-avoid-version
-
 if BUILD_CCPANEL
 libindicator_datetime_la_SOURCES =\
 	datetime-prefs.c \
@@ -93,14 +69,3 @@ gen-%.xml.c: %.xml
 gen-%.xml.h: %.xml
 	@echo "Building $@ from $<"
 	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
-
-BUILT_SOURCES = \
-	gen-datetime-service.xml.c \
-	gen-datetime-service.xml.h
-
-
-CLEANFILES = \
-	$(BUILT_SOURCES)
-
-EXTRA_DIST = \
-	datetime-service.xml
-- 
cgit v1.2.3