ayatana-commits team mailing list archive

[Ken VanDine <ken.vandine@xxxxxxxxxxxxx>]

Ken VanDine has proposed merging lp:~ken-vandine/dbusmenu/lp713099 into lp:dbusmenu.

Requested reviews:
  DBus Menu Team (dbusmenu-team)
Related bugs:
  #713099 Typelib and GIR broken for Dbusmenu-Glib-0.4
  https://bugs.launchpad.net/bugs/713099

For more details, see:
https://code.launchpad.net/~ken-vandine/dbusmenu/lp713099/+merge/49102

Keeps the pkgconfig name dbusmenu-glib-0.4 but setting the namespace to Dbusmenu and version to just 0.4 to get a usable typelib name.

This should keep most existing apps the build depend on libdbusmenu-glib-dev from needing to be modified. With the exception of vala apps, which I am sure is minimal.

-- 
https://code.launchpad.net/~ken-vandine/dbusmenu/lp713099/+merge/49102
Your team ayatana-commits is subscribed to branch lp:dbusmenu.

=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am	2011-01-21 16:38:05 +0000
+++ libdbusmenu-glib/Makefile.am	2011-02-09 18:03:57 +0000
@@ -138,18 +138,18 @@
 
 introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
 
-Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
-Dbusmenu_Glib_0_4_gir_INCLUDES = \
+Dbusmenu-0.4.gir: libdbusmenu-glib.la
+Dbusmenu_0_4_gir_INCLUDES = \
 	GObject-2.0
-Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
-Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la
-Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
-Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu
-Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4
-Dbusmenu_Glib_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
-Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
+Dbusmenu_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
+Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la
+Dbusmenu_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu
+Dbusmenu_0_4_gir_VERSION = 0.4
+Dbusmenu_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
+Dbusmenu_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
 
-INTROSPECTION_GIRS += Dbusmenu-Glib-0.4.gir
+INTROSPECTION_GIRS += Dbusmenu-0.4.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -168,10 +168,10 @@
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = Dbusmenu-Glib-0.4.vapi
+vapi_DATA = Dbusmenu-0.4.vapi
 
-Dbusmenu-Glib-0.4.vapi: Dbusmenu-Glib-0.4.gir
-	$(VALA_API_GEN) --library=Dbusmenu-Glib-0.4 $<
+Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
+	$(VALA_API_GEN) --library=Dbusmenu-0.4 $<
 
 CLEANFILES += $(vapi_DATA)
 

=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am	2011-01-27 19:54:18 +0000
+++ libdbusmenu-gtk/Makefile.am	2011-02-09 18:03:57 +0000
@@ -98,7 +98,7 @@
 DbusmenuGtk_0_4_gir_INCLUDES = \
 	GObject-2.0 \
 	$(GTKGIR) \
-	Dbusmenu-Glib-0.4 
+	Dbusmenu-0.4 
 DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
 DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la
 DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
@@ -141,7 +141,7 @@
 		--pkg gdk-pixbuf-2.0 \
 		--pkg $(GTKVALA) \
 		--pkg atk \
-		--pkg Dbusmenu-Glib-0.4 \
+		--pkg Dbusmenu-0.4 \
 		--vapidir=$(top_builddir)/libdbusmenu-glib \
 		$<