GNOME.org
 

Re: Call to maintainers: GNOME 2.31 to ship GTK 2.90

On Thu, 2010-06-10 at 13:24 +0200, Andre Klapper wrote:
[snip]
> The following modules are affected (list not necessarily complete):
[snip]

Also, avahi is an external dependency, and its tarball has an avahi-ui
library, which is therefore also implicitly blessed. It has not yet been
ported to GTK+-3.0. I don't know if anything in the GNOME release sets
uses avahi-ui, though it's blocking my port of Glom.

I tried to file a ticket about it at avahi.org but couldn't log in.
CCing Lennart instead. The attached patch is one possible fix that works
for me, though I think this would be easier if avahi-ui was a separate
module.

-- 
murrayc murrayc com
www.murrayc.com
www.openismus.com

>From 4f245843c26940fb9cf55c6fdf1af8ca8e91c755 Mon Sep 17 00:00:00 2001
From: Murray Cumming <murrayc murrayc com>
Date: Sun, 13 Jun 2010 13:59:58 +0200
Subject: [PATCH] avahi-ui: Use gtk-3.0 instead of gtk-2.0 and become avahi-ui-3.0.

* avahi-ui.pc.in: Rename to avahi-ui-3.0.pc.in and update it.
* configure.ac: Check for gtk-3.0 instead of gtk-2.0,
update the .pc.in mention and rename the (already-versioned)
variables.
* Makefile.am: Change for the renamed .pc file.
* avahi-ui/Makefile.am: Change the shared library name to
libavahi-ui-3.0 and change the installed headers location to
avahi-ui-3.0
* avahi-discover-standalone/Makefile.am: Adapt.
---
 Makefile.am                           |    8 ++++----
 avahi-discover-standalone/Makefile.am |    4 ++--
 avahi-ui-3.0.pc.in                    |   11 +++++++++++
 avahi-ui.pc.in                        |   11 -----------
 avahi-ui/Makefile.am                  |   26 +++++++++++++-------------
 configure.ac                          |    8 ++++----
 6 files changed, 34 insertions(+), 34 deletions(-)
 create mode 100644 avahi-ui-3.0.pc.in
 delete mode 100644 avahi-ui.pc.in

diff --git a/Makefile.am b/Makefile.am
index c19e72c..b21bee7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,7 @@ EXTRA_DIST = \
 	avahi-ui-sharp.pc.in \
 	avahi-compat-libdns_sd.pc.in \
 	avahi-compat-howl.pc.in \
-	avahi-ui.pc.in \
+	avahi-ui-3.0.pc.in \
 	doxygen_to_devhelp.xsl
 
 SUBDIRS = \
@@ -245,14 +245,14 @@ endif
 if HAVE_GTK
 if HAVE_DBUS
 
-pkgconfig_DATA += avahi-ui.pc
+pkgconfig_DATA += avahi-ui-3.0.pc
 
-avahi-ui.pc: avahi-ui.pc.in
+avahi-ui-3.0.pc: avahi-ui-3.0.pc.in
 	sed -e 's,@prefix\@,$(prefix),g' \
 	    -e 's,@libdir\@,$(libdir),g' \
 	    -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
-CLEANFILES += avahi-ui.pc
+CLEANFILES += avahi-ui-3.0.pc
 
 endif
 endif
diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index 133ff4d..671f67a 100644
--- a/avahi-discover-standalone/Makefile.am
+++ b/avahi-discover-standalone/Makefile.am
@@ -35,7 +35,7 @@ avahi_discover_standalone_SOURCES = \
 
 avahi_discover_standalone_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(GLIB20_CFLAGS) $(GTK20_CFLAGS) \
+	$(GLIB20_CFLAGS) $(GTK30_CFLAGS) \
 	-DAVAHI_INTERFACES_DIR=\"$(interfacesdir)\"
 
 avahi_discover_standalone_LDADD = \
@@ -43,7 +43,7 @@ avahi_discover_standalone_LDADD = \
 	../avahi-common/libavahi-common.la \
 	../avahi-glib/libavahi-glib.la \
 	../avahi-core/libavahi-core.la  \
-	$(GLIB20_LIBS) $(GTK20_LIBS)
+	$(GLIB20_LIBS) $(GTK30_LIBS)
 
 interfaces_DATA = $(interfaces)
 
diff --git a/avahi-ui-3.0.pc.in b/avahi-ui-3.0.pc.in
new file mode 100644
index 0000000..43a1719
--- /dev/null
+++ b/avahi-ui-3.0.pc.in
@@ -0,0 +1,11 @@
+prefix= prefix@
+exec_prefix=${prefix}
+libdir= libdir@
+includedir=${prefix}/include
+
+Name: avahi-ui
+Description: Avahi Multicast DNS Responder (Common GTK UI support)
+Requires: gtk+-3.0 avahi-client avahi-glib
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lavahi-ui-3.0
+Cflags: -D_REENTRANT -I${includedir}
diff --git a/avahi-ui.pc.in b/avahi-ui.pc.in
deleted file mode 100644
index ca9c2ef..0000000
--- a/avahi-ui.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix= prefix@
-exec_prefix=${prefix}
-libdir= libdir@
-includedir=${prefix}/include
-
-Name: avahi-ui
-Description: Avahi Multicast DNS Responder (Common GTK UI support)
-Requires: gtk+-2.0 avahi-client avahi-glib
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lavahi-ui
-Cflags: -D_REENTRANT -I${includedir}
diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 6dbbd24..d5ae636 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -34,29 +34,29 @@ AM_CFLAGS += -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 if HAVE_DBUS
 if HAVE_GLIB
 
-avahiincludedir=$(includedir)/avahi-ui
+avahiincludedir=$(includedir)/avahi-ui-3.0
 
 avahiinclude_HEADERS = \
 	avahi-ui.h
 
 lib_LTLIBRARIES = \
-	libavahi-ui.la 
+	libavahi-ui-3.0.la 
 
-libavahi_ui_la_SOURCES = \
+libavahi_ui_3_0_la_SOURCES = \
 	avahi-ui.h avahi-ui.c
-libavahi_ui_la_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
-libavahi_ui_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GTK20_LIBS)
-libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_UI_VERSION_INFO)
+libavahi_ui_3_0_la_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS)
+libavahi_ui_3_0_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GTK30_LIBS)
+libavahi_ui_3_0_la_LDFLAGS = $(AM_LDFLAGS)  -version-info $(LIBAVAHI_UI_VERSION_INFO)
 
 if HAVE_GDBM
-libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
-libavahi_ui_la_LIBADD += -lgdbm
+libavahi_ui_3_0_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
+libavahi_ui_3_0_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+libavahi_ui_3_0_la_LIBADD += -lgdbm
 endif
 
 if HAVE_DBM
-libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+libavahi_ui_3_0_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
+libavahi_ui_3_0_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 endif
 
 bin_PROGRAMS = bssh
@@ -64,8 +64,8 @@ desktop_DATA += bssh.desktop bvnc.desktop
 @INTLTOOL_DESKTOP_RULE@
 
 bssh_SOURCES = bssh.c
-bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
-bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
+bssh_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS)
+bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui-3.0.la
 
 install-exec-local:
 	cd $(DESTDIR)/$(bindir) && \
diff --git a/configure.ac b/configure.ac
index 4e527bc..3ae42ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -530,10 +530,10 @@ AC_ARG_ENABLE(gtk,
         [HAVE_GTK=yes])
 
 if test "x$HAVE_GTK" = "xyes" ; then
-        # Check for GTK 2.0
-        PKG_CHECK_MODULES(GTK20, [ gtk+-2.0 >= 2.14.0 ])
-        AC_SUBST(GTK20_CFLAGS)
-        AC_SUBST(GTK20_LIBS)
+        # Check for GTK 3.0
+        PKG_CHECK_MODULES(GTK30, [ gtk+-3.0 >= 2.90.0 ])
+        AC_SUBST(GTK30_CFLAGS)
+        AC_SUBST(GTK30_LIBS)
 fi
 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
 
-- 
1.7.0.4
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]