4 files changed, 76 insertions, 6 deletions
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch
new file mode 100644
index 00000000000..d98ffabba56
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch
@@ -0,0 +1,9 @@
+--- tools/testapp/Makefile.am.orig	2011-01-29 13:42:00.984605528 +0100
++++ tools/testapp/Makefile.am	2011-01-29 13:44:45.523514281 +0100
+@@ -12,6 +13,4 @@
+ 
+ dbusmenu_testapp_LDADD = \
+ 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
+-	$(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk.la \
+-	$(DBUSMENUGTK_LIBS) \
+ 	$(DBUSMENUTESTS_LIBS)
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
index b334b27638d..7fdc051c765 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-gtk.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
@@ -35,3 +35,51 @@
 +endif
 +
  DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
+--- tests/Makefile.am.orig	2011-01-29 14:37:11.863805482 +0100
++++ tests/Makefile.am	2011-01-29 14:38:48.910883303 +0100
+@@ -11,12 +11,16 @@
+ 	test-glib-proxy \
+ 	test-glib-simple-items \
+ 	test-glib-submenu \
+-	test-json \
++	test-json
++
++if WANT_LIBDBUSMENUGTK
++TESTS += \
+ 	test-gtk-objects-test \
+ 	test-gtk-label \
+ 	test-gtk-shortcut \
+ 	test-gtk-reorder \
+ 	test-gtk-submenu
++endif
+ 
+ check_PROGRAMS = \
+ 	glib-server-nomenu \
+@@ -30,19 +34,23 @@
+ 	test-glib-proxy-client \
+ 	test-glib-proxy-server \
+ 	test-glib-proxy-proxy \
+-	test-gtk-objects \
+ 	test-glib-submenu-client \
+ 	test-glib-submenu-server \
++	test-glib-simple-items \
++	test-json-client \
++	test-json-server
++
++if WANT_LIBDBUSMENUGTK
++check_PROGRAMS += \
++	test-gtk-objects \
+ 	test-gtk-label-client \
+ 	test-gtk-label-server \
+ 	test-gtk-shortcut-client \
+ 	test-gtk-shortcut-server \
+-	test-glib-simple-items \
+ 	test-gtk-reorder-server \
+-	test-json-client \
+-	test-json-server \
+ 	test-gtk-submenu-server \
+ 	test-gtk-submenu-client
++endif
+ 
+ XVFB_RUN=". $(srcdir)/run-xvfb.sh"
+ 
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-tests.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
index b4dd4d307e8..b0518717c1e 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-tests.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
@@ -29,14 +29,16 @@
 +endif
 +
  DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
---- tools/Makefile.am.orig	2010-09-20 22:02:07.280175897 +0200
-+++ tools/Makefile.am	2010-09-20 22:02:40.579759752 +0200
-@@ -1,3 +1,7 @@
+--- tools/testapp/Makefile.am.orig    2011-01-29 13:42:00.984605528 +0100
++++ tools/testapp/Makefile.am 2011-01-29 13:44:45.523514281 +0100
+@@ -1,5 +1,9 @@
  
--SUBDIRS = testapp
-+SUBDIRS =
+-libexec_PROGRAMS = dbusmenu-testapp
++libexec_PROGRAMS =
 +
 +if WANT_TESTS
-+SUBDIRS += testapp
++libexec_PROGRAMS += dbusmenu-testapp
 +endif
  
+ dbusmenu_testapp_SOURCES = \
+    main.c
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch
new file mode 100644
index 00000000000..ed605df58c5
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-parallel-make.patch
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2011-01-29 13:49:42.828302898 +0100
++++ Makefile.am	2011-01-29 13:50:45.096371768 +0100
+@@ -21,4 +21,8 @@
+ 
++libdbusmenu-gtk: libdbusmenu-glib
++tests: libdbusmenu-gtk
++tools: libdbusmenu-gtk
++
+ DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
+ 
+ dist-hook: