From: Philip Chimento <philip.chimento@gmail.com>
Date: Sat, 25 Aug 2012 18:50:45 +0000 (+0200)
Subject: Build with GTK 3
X-Git-Tag: v0.9~29
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=c54286d231271809f8f57e548b3f7d6049fc431d;p=projects%2Fchimara%2Fchimara.git

Build with GTK 3

Use GTK 3 instead of GTK 2 packages
---

diff --git a/configure.ac b/configure.ac
index 9a3299d..6299c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,8 @@ LT_VERSION_INFO="$CHIMARA_CURRENT:$CHIMARA_REVISION:$CHIMARA_AGE"
 AC_SUBST(LT_VERSION_INFO)
 
 ### REQUIREMENTS ##############################################################
-# Recommended GTK version: at least 2.12
-# Recommended Glib version: at least 2.16
-GTK_REQUIRED_VERSION=2.6
-GLIB_REQUIRED_VERSION=2.6
+GTK_REQUIRED_VERSION=3.2
+GLIB_REQUIRED_VERSION=2.16
 GTK_DOC_REQUIRED_VERSION=1.12
 AC_SUBST(GTK_REQUIRED_VERSION)
 AC_SUBST(GLIB_REQUIRED_VERSION)
@@ -118,7 +116,7 @@ AM_CONDITIONAL(BUILDING_VAPI, $TEST "x$VAPIGEN" != xnotfound)
 # Libraries needed to build Chimara library
 PKG_CHECK_MODULES([CHIMARA], [
 	glib-2.0 >= $GLIB_REQUIRED_VERSION
-	gtk+-2.0 >= $GTK_REQUIRED_VERSION
+	gtk+-3.0 >= $GTK_REQUIRED_VERSION
 	gthread-2.0 
 	gmodule-2.0
 	pango
@@ -129,14 +127,14 @@ AC_SUBST(CHIMARA_LIBS)
 # Libraries needed to build Chimara player
 PKG_CHECK_MODULES([PLAYER], [
 	glib-2.0 >= $GLIB_REQUIRED_VERSION
-	gtk+-2.0 >= $GTK_REQUIRED_VERSION
+	gtk+-3.0 >= $GTK_REQUIRED_VERSION
 	gmodule-2.0
-	libgda-4.0
+	dnl libgda-4.0
 	libsoup-2.4
 ])
 # Libraries needed to build test programs
 PKG_CHECK_MODULES([TEST], [
-	gtk+-2.0 >= $GTK_REQUIRED_VERSION
+	gtk+-3.0 >= $GTK_REQUIRED_VERSION
 	gmodule-2.0 >= $GLIB_REQUIRED_VERSION
 ])
 
diff --git a/libchimara/Makefile.am b/libchimara/Makefile.am
index 7b02980..ef18a90 100644
--- a/libchimara/Makefile.am
+++ b/libchimara/Makefile.am
@@ -84,7 +84,7 @@ introspection_sources = \
 	chimara-if.c chimara-if.h
 
 Chimara-1.0.gir: libchimara.la
-Chimara_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-2.0
+Chimara_1_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-3.0
 Chimara_1_0_gir_CFLAGS = @CHIMARA_CFLAGS@ -I$(top_srcdir)
 Chimara_1_0_gir_LIBS = libchimara.la
 Chimara_1_0_gir_FILES = $(introspection_sources)
@@ -110,7 +110,7 @@ dist_vapi_DATA = chimara.vapi
 
 if BUILDING_VAPI
 chimara.vapi: $(INTROSPECTION_GIRS)
-	$(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-2.0 Chimara-1.0.gir && \
+	$(AM_V_GEN)$(VAPIGEN) --library=chimara --pkg gtk+-3.0 Chimara-1.0.gir && \
 	touch $@
 endif