From 95e4fc742556e9cdb56ee1459549abd764ea30d8 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 24 Nov 2010 12:04:18 -0500
Subject: Initial work on building with gtk3 as well as gtk2

---
 debian/rules | 41 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 1578fbf..7a88781 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,10 +3,43 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
-DEB_MAKE_CHECK_TARGET := check
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
+DEB_SRCDIR = .
+DEB_BUILDDIR = $(DEB_SRCDIR)/build
+
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.12)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.3.12)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk2 += -V 'libdbusmenu-gtk2 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib2 += -V 'libdbusmenu-glib2 (>= 0.3.90)'
+
+configure/libdbusmenu-gtk3:: stamp-configure-gtk3
+stamp-configure-gtk3:
+	: # configure for GTK+ 3.0
+	set -e; \
+	rm -rf build-gtk3; \
+	mkdir build-gtk3; \
+	cd build-gtk3; \
+	$(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \
+		$(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)) \
+		--enable-gtk-doc=no; \
+	cd ..;
+	touch stamp-configure-gtk3
+
+build/libdbusmenu-gtk3:: stamp-build-gtk3
+stamp-build-gtk3: stamp-configure-gtk3
+	: # build for GTK+ 3.0
+	$(MAKE) -C build-gtk3;
+	touch stamp-build-gtk3
+
+binary-install/libdbusmenu:: binary-install/libdbusmenu-gtk2 stamp-build-gtk3
+	: # install for GTK+ 3.0
+	$(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
+
+binary-predeb/gir%::
+	dh_girepository -p$(cdbs_curpkg)
 
+clean::
+	rm -f stamp-*-gtk3
+	rm -rf build-gtk3
-- 
cgit v1.2.3


From 0d98749cbe9f405e4579adf0c30d534c277c2686 Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Wed, 24 Nov 2010 14:07:15 -0500
Subject: * debian/rules   - Added build targets to build with gtk3 enabled in
 additional to     default build with gtk2 * debian/control   - Updated build
 depends to support building with gtk+-3.0   - Added dh-autoreconf build
 depends   - Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev,
 gir1.0-dbusmenu-gtk3-0.2     binaries   - build depend on
 libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed     for GIR fixes *
 docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am,  
 libdbusmenu-gtk/Makefile.am   - Fixes needed for building with-gtk=3

---
 debian/rules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 7a88781..cd1d01f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_SRCDIR = .
 DEB_BUILDDIR = $(DEB_SRCDIR)/build
@@ -10,10 +11,10 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-in
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk2 += -V 'libdbusmenu-gtk2 (>= 0.3.90)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-2 += -V 'libdbusmenu-gtk3-2 (>= 0.3.90)'
 DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib2 += -V 'libdbusmenu-glib2 (>= 0.3.90)'
 
-configure/libdbusmenu-gtk3:: stamp-configure-gtk3
+configure/libdbusmenu-gtk3-2:: stamp-configure-gtk3
 stamp-configure-gtk3:
 	: # configure for GTK+ 3.0
 	set -e; \
@@ -26,16 +27,15 @@ stamp-configure-gtk3:
 	cd ..;
 	touch stamp-configure-gtk3
 
-build/libdbusmenu-gtk3:: stamp-build-gtk3
+build/libdbusmenu-gtk3-2:: stamp-build-gtk3
 stamp-build-gtk3: stamp-configure-gtk3
 	: # build for GTK+ 3.0
 	$(MAKE) -C build-gtk3;
 	touch stamp-build-gtk3
 
-binary-install/libdbusmenu:: binary-install/libdbusmenu-gtk2 stamp-build-gtk3
+common-install-prehook-arch:: stamp-build-gtk3
 	: # install for GTK+ 3.0
 	$(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install
-	$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
 
 binary-predeb/gir%::
 	dh_girepository -p$(cdbs_curpkg)
-- 
cgit v1.2.3