Merge lp:~hasselmm/appmenu-gtk/gtk3 into lp:appmenu-gtk/0.4

[Mathias Hasselmann]

This permits building of a gtk3 version of appmenu-gtk.

[lp:~hasselmm/appmenu-gtk/gtk3]

137. By Mathias Hasselmann on 2011-05-08

Generate proper X session script for both gtk flavors

[Mathias Hasselmann (hasselmm)]

see also: https://launchpad.net/~hasselmm/+archive/ppa/+packages

[Mathias Hasselmann (hasselmm)]

fixes this bug: https://bugs.launchpad.net/appmenu-gtk/+bug/701295

[Michael Terry (mterry)]

Looks great. I have two comments:

1) Do we really need --with-gtk3? Seems like --with-gtk2 is enough.

2) You need to add the following in src/bridge.c:

+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <libdbusmenu-gtk3/menuitem.h>
+#include <libdbusmenu-gtk3/parser.h>
+#else
 #include <libdbusmenu-gtk/menuitem.h>
 #include <libdbusmenu-gtk/parser.h>
+#endif

Unfortunately (and this is my fault), the headers use different directories for gtk2/gtk3.

review: Needs Fixing

[lp:~hasselmm/appmenu-gtk/gtk3]

138. By Mathias Hasselmann on 2011-05-11

Include proper appmenu-gtk headers.

139. By Mathias Hasselmann on 2011-05-11

Drop somewhat redundant --with-gtk3 switch.

140. By Mathias Hasselmann on 2011-05-11

Bump package version

[Mathias Hasselmann (hasselmm)]

> 1) Do we really need --with-gtk3? Seems like --with-gtk2 is enough.

Dropped.

> 2) You need to add the following in src/bridge.c:

Fixed.

> Unfortunately (and this is my fault), the headers use different directories
> for gtk2/gtk3.

Maybe still can be fixed somehow? The files in that folders seem to be identical.

[Mathias Hasselmann (hasselmm)]

review: Needs Resubmitting

[Michael Terry (mterry)]

Looks great! Thanks!

> Maybe still can be fixed somehow? The files in that folders seem to be identical.

A) Can't guarantee that there will never be differences in gtk2/gtk3 versions, though seems more on the 0.1% chance side.

B) We need both libdbusmenu-gtk3-dev and libdbusmenu-gtk-dev to ship the headers so that a package can depend on either one and not get both. So we have to ship two copies of them anyway (or split the headers into some -dev-common package).

C) The normal way of dealing with it is like so:

#include <libdbusmenu-gtk/header.h>
/usr/include/dbusmenu/libdbusmenu-gtk/header.h
/usr/include/dbusmenu3/libdbusmenu-gtk/header.h
And have the .pc file specify which directory to -I

But with libdbusmenu, it sticks libdbusmenu-glib in the same directory with libdbusmenu-gtk, so we either had to duplicate the -glib headers or stick gtk3 headers in the same directory too. I went with the latter, but I'm not convinced it was optimal. :)

review: Approve

=== modified file '80appmenu.in'
--- 80appmenu.in	2011-02-14 15:02:09 +0000
+++ 80appmenu.in	2011-05-11 19:06:46 +0000
@@ -1,4 +1,4 @@
-if [ -f @libdir@/gtk-2.0/2.10.0/menuproxies/libappmenu.so ]
+if [ -f @moduledir@/menuproxies/libappmenu.so ]
 then
 	export UBUNTU_MENUPROXY="libappmenu.so"
 fi
 
=== modified file 'Makefile.am'
--- Makefile.am	2011-02-16 22:06:10 +0000
+++ Makefile.am	2011-05-11 19:06:46 +0000
@@ -8,17 +8,17 @@
 	build		\
 	src
 
-80appmenu: 80appmenu.in
-	sed -e "s|\@libdir\@|$(libdir)|" $< > $@
+$(sessionfile): 80appmenu.in
+	sed -e "s|\@moduledir\@|$(moduledir)|" $< > $@
 
 xsessiondir = $(sysconfdir)/X11/Xsession.d
 
-nodist_xsession_DATA = 80appmenu
+nodist_xsession_DATA = $(sessionfile)
 
 EXTRA_DIST = $(xsession_DATA) \
              configure.ac \
              Makefile.am \
              autogen.sh \
-			 80appmenu.in
+             80appmenu.in
 
-DISTCLEANFILES = 80appmenu
+DISTCLEANFILES = $(sessionfile)
 
=== modified file 'configure.ac'
--- configure.ac	2011-04-14 20:57:14 +0000
+++ configure.ac	2011-05-11 19:06:46 +0000
@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 
-AC_INIT([appmenu-gtk], [0.2.1], [[e-mail]])
+AC_INIT([appmenu-gtk], [0.3.0], [[e-mail]])
 AC_COPYRIGHT([Copyright 2010 Canonical])
 AC_CONFIG_SRCDIR([src/bridge.c])
 AC_CONFIG_MACRO_DIR([build/autotools])
@@ -15,24 +15,44 @@
 AM_PROG_CC_C_O
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
 
 AC_SUBST(VERSION)
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 ###########################
-# Dependencies - GLib
+# Dependencies - Gtk
 ###########################
 
-GTK_REQUIRED_VERSION=2.18
+gtk_api=3.0
+
+GTK2_REQUIRED_VERSION=2.18
+GTK3_REQUIRED_VERSION=3.0
 DBUSMENU_REQUIRED_VERSION=0.3.101
 
-PKG_CHECK_MODULES(APPMENU, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                           dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION)
+AC_ARG_WITH(gtk2, [AS_HELP_STRING([--with-gtk2],[use 2.0 API of GTK+])],[gtk_api=2.0])
+
+if test x$gtk_api = x2.0; then
+  PKG_CHECK_MODULES(APPMENU, gtk+-2.0 >= $GTK2_REQUIRED_VERSION
+                             dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION)
+  moduledir='$(libdir)/gtk-2.0/2.10.0/menuproxies'
+  sessionfile=80appmenu-gtk
+elif test x$gtk_api = x3.0; then
+  PKG_CHECK_MODULES(APPMENU, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                             dbusmenu-gtk3-0.4 >= $DBUSMENU_REQUIRED_VERSION)
+  moduledir='$(libdir)/gtk-3.0/3.0.0/menuproxies'
+  sessionfile=80appmenu-gtk3
+else
+  AC_MSG_ERROR([unknown GTK+ API: $gtk_api])
+fi
 
 AC_SUBST(APPMENU_CFLAGS)
 AC_SUBST(APPMENU_LIBS)
 
+AC_SUBST(moduledir)
+AC_SUBST(sessionfile)
+
 ###########################
 # Files
 ###########################
@@ -58,6 +78,7 @@
 
 appmenu-gtk configuration:
 
-	Prefix:                 $prefix
+        Prefix:                 $prefix
+        GTK+ API:               $gtk_api
 ])
 
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-01-04 22:54:15 +0000
+++ src/Makefile.am	2011-05-11 19:06:46 +0000
@@ -3,7 +3,6 @@
 BUILT_SOURCES =
 EXTRA_DIST=
 
-moduledir = $(libdir)/gtk-2.0/2.10.0/menuproxies
 module_LTLIBRARIES = libappmenu.la
 
 libappmenu_la_SOURCES =		\
@@ -37,13 +36,13 @@
 	$(GCC_FLAGS)			\
 	$(MAINTAINER_CFLAGS)
 
-gen-%.xml.h: %.xml
+gen-%.xml.h: $(srcdir)/%.xml
 	@echo "Building $@ from $<"
-	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
 
-gen-%.xml.c: %.xml
+gen-%.xml.c: $(srcdir)/%.xml
 	@echo "Building $@ from $<"
-	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
 	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
 	@echo ";" >> $@
 
 
=== modified file 'src/bridge.c'
--- src/bridge.c	2011-04-20 19:18:42 +0000
+++ src/bridge.c	2011-05-11 19:06:46 +0000
@@ -27,8 +27,14 @@
 #include <gdk/gdkx.h>
 #include <gio/gio.h>
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <libdbusmenu-gtk3/menuitem.h>
+#include <libdbusmenu-gtk3/parser.h>
+#else
 #include <libdbusmenu-gtk/menuitem.h>
 #include <libdbusmenu-gtk/parser.h>
+#endif
+
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/server.h>