GNOME.org
 

[libchamplain] Use gtk3 and clutter-gtk 1.0

commit e9c3dbb797091dc392aa8c260f6d58b14e700707
Author: William Jon McCann <jmccann redhat com>
Date:   Tue Oct 12 01:26:35 2010 -0400

    Use gtk3 and clutter-gtk 1.0
    
    https://bugzilla.gnome.org/show_bug.cgi?id=631009

 bindings/vala/champlain-gtk/Makefile.am            |    2 +-
 .../vala/champlain-gtk/champlain-gtk-0.10.deps     |    2 +-
 bindings/vala/champlain-gtk/create.sh.in           |    2 +-
 champlain-gtk-uninstalled.pc.in                    |    2 +-
 champlain-gtk.pc.in                                |    2 +-
 champlain-gtk/Makefile.am                          |    4 ++--
 champlain-uninstalled.pc.in                        |    2 +-
 champlain.pc.in                                    |    2 +-
 champlain/Makefile.am                              |    4 ++--
 configure.ac                                       |    6 +++---
 10 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/bindings/vala/champlain-gtk/Makefile.am b/bindings/vala/champlain-gtk/Makefile.am
index bd3d8ce..653cc00 100644
--- a/bindings/vala/champlain-gtk/Makefile.am
+++ b/bindings/vala/champlain-gtk/Makefile.am
@@ -1,6 +1,6 @@
 
 #champlain-gtk-0.6.vapi: $(top_srcdir)/champlain-gtk/GtkChamplain-0.6.gir
-#	$(VAPIGEN) --vapidir ../champlain --pkg champlain-0.6 --pkg clutter-1.0 --pkg atk --pkg gtk+-2.0 --library champlain-gtk-0.6 $^
+#	$(VAPIGEN) --vapidir ../champlain --pkg champlain-0.6 --pkg clutter-1.0 --pkg atk --pkg gtk+-3.0 --library champlain-gtk-0.6 $^
 #	touch $@
 
 vapidir = $(datadir)/vala/vapi
diff --git a/bindings/vala/champlain-gtk/champlain-gtk-0.10.deps b/bindings/vala/champlain-gtk/champlain-gtk-0.10.deps
index 41d958f..882ca29 100644
--- a/bindings/vala/champlain-gtk/champlain-gtk-0.10.deps
+++ b/bindings/vala/champlain-gtk/champlain-gtk-0.10.deps
@@ -1,2 +1,2 @@
-gtk+-2.0
+gtk+-3.0
 champlain-0.10
diff --git a/bindings/vala/champlain-gtk/create.sh.in b/bindings/vala/champlain-gtk/create.sh.in
index 3ef70cc..a1eb8ba 100644
--- a/bindings/vala/champlain-gtk/create.sh.in
+++ b/bindings/vala/champlain-gtk/create.sh.in
@@ -1,4 +1,4 @@
 export PKG_CONFIG_PATH=$(readlink -f ../../../)
 
 vala-gen-introspect champlain-gtk- CHAMPLAIN_API_VERSION@ champlain-gtk- CHAMPLAIN_API_VERSION@
-vapigen --library champlain-gtk- CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-0.10 --pkg gtk+-2.0 --pkg champlain- CHAMPLAIN_API_VERSION@ --vapidir=../champlain champlain-gtk- CHAMPLAIN_API_VERSION@/champlain-gtk- CHAMPLAIN_API_VERSION@.gi --metadata champlain-gtk- CHAMPLAIN_API_VERSION@/champlain-gtk- CHAMPLAIN_API_VERSION@.metadata
+vapigen --library champlain-gtk- CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-0.10 --pkg gtk+-3.0 --pkg champlain- CHAMPLAIN_API_VERSION@ --vapidir=../champlain champlain-gtk- CHAMPLAIN_API_VERSION@/champlain-gtk- CHAMPLAIN_API_VERSION@.gi --metadata champlain-gtk- CHAMPLAIN_API_VERSION@/champlain-gtk- CHAMPLAIN_API_VERSION@.metadata
diff --git a/champlain-gtk-uninstalled.pc.in b/champlain-gtk-uninstalled.pc.in
index 224eb54..dea3cc5 100644
--- a/champlain-gtk-uninstalled.pc.in
+++ b/champlain-gtk-uninstalled.pc.in
@@ -8,4 +8,4 @@ Description: Gtk+ Widget wrapper for libchamplain
 Version: @VERSION@
 Libs: ${abs_top_builddir}/champlain-gtk/libchamplain-gtk- CHAMPLAIN_API_VERSION@.la
 Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
-Requires: champlain- CHAMPLAIN_API_VERSION@-uninstalled clutter-gtk-0.10 gtk+-2.0
+Requires: champlain- CHAMPLAIN_API_VERSION@-uninstalled clutter-gtk-0.10 gtk+-3.0
diff --git a/champlain-gtk.pc.in b/champlain-gtk.pc.in
index 6461a69..2c461b6 100644
--- a/champlain-gtk.pc.in
+++ b/champlain-gtk.pc.in
@@ -8,4 +8,4 @@ Description: Gtk+ Widget wrapper for libchamplain
 Version: @VERSION@
 Libs: -L${libdir} -lchamplain-gtk- CHAMPLAIN_API_VERSION@
 Cflags: -I${includedir}/libchamplain-gtk- CHAMPLAIN_API_VERSION@
-Requires: champlain- CHAMPLAIN_API_VERSION@ clutter-gtk-0.10 gtk+-2.0
+Requires: champlain- CHAMPLAIN_API_VERSION@ clutter-gtk-0.10 gtk+-3.0
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 471d63a..9a3e752 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -74,9 +74,9 @@ GtkChamplain- CHAMPLAIN_API_VERSION@.gir: libchamplain-gtk- CHAMPLAIN_API_VERSIO
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = GtkChamplain
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain-gtk- CHAMPLAIN_API_VERSION@.la
-GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-2.0
+GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources)
-GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-2.0 Champlain- CHAMPLAIN_API_VERSION@
+GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-3.0 Champlain- CHAMPLAIN_API_VERSION@
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
 	$(DEPS_CFLAGS) $(SOUP_CFLAGS) $(GTK_CFLAGS) \
 	-I$(top_srcdir) -I$(top_builddir)\
diff --git a/champlain-uninstalled.pc.in b/champlain-uninstalled.pc.in
index 13e566a..9afc281 100644
--- a/champlain-uninstalled.pc.in
+++ b/champlain-uninstalled.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
 Libs: ${abs_top_builddir}/champlain/libchamplain- CHAMPLAIN_API_VERSION@.la
 Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
 Requires: gobject-2.0 glib-2.0 clutter-1.0
-Requires.private: gdk-2.0 gio-2.0 cairo sqlite3 @SOUP_DEP@
+Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 @SOUP_DEP@
diff --git a/champlain.pc.in b/champlain.pc.in
index 69cb23a..6d38c26 100644
--- a/champlain.pc.in
+++ b/champlain.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
 Libs: -L${libdir} -lchamplain- CHAMPLAIN_API_VERSION@
 Cflags: -I${includedir}/libchamplain- CHAMPLAIN_API_VERSION@
 Requires: gobject-2.0 glib-2.0 clutter-1.0
-Requires.private: gdk-2.0 gio-2.0 cairo sqlite3 @SOUP_DEP@
+Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 @SOUP_DEP@
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index aab3c11..342817d 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -156,9 +156,9 @@ Champlain- CHAMPLAIN_API_VERSION@.gir: libchamplain- CHAMPLAIN_API_VERSION@.la
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_NAMESPACE = Champlain
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_VERSION = @CHAMPLAIN_API_VERSION@
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_LIBS = libchamplain- CHAMPLAIN_API_VERSION@.la
-Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-2.0
+Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_PACKAGES = gobject-2.0 gtk+-3.0
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources)
-Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-2.0 $(memphis_gir_include)
+Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-3.0 $(memphis_gir_include)
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
 	$(DEPS_CFLAGS) $(SOUP_CFLAGS) $(MEMPHIS_CFLAGS) \
 	-I$(top_srcdir)/tidy -I$(top_srcdir) -I$(top_builddir) \
diff --git a/configure.ac b/configure.ac
index 09a2827..d7e1def 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ AC_SUBST(LIBRARY_VERSION)
 PKG_CHECK_MODULES(DEPS,
   [   glib-2.0 >= 2.16
       gobject-2.0 >= 2.10
-      gdk-2.0 >= 2.10
+      gdk-3.0 >= 2.90
       clutter-1.0 >= 1.0
       cairo >= 1.4
       gio-2.0 >= 2.16
@@ -132,8 +132,8 @@ AC_ARG_ENABLE(gtk,
 
 if test x$enable_gtk = xyes; then
   PKG_CHECK_MODULES(GTK,
-    [   gtk+-2.0 >= 2.12
-        clutter-gtk-0.10 >= 0.10
+    [   gtk+-3.0 >= 2.90
+        clutter-gtk-1.0 >= 0.90
     ]
   )
   AC_SUBST(GTK_CFLAGS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]