From 5b5360bff7a61ef17173cbe35cc32712ca0fc329 Mon Sep 17 00:00:00 2001 From: Jeremy Whiting Date: Wed, 4 Jul 2012 09:37:47 -0600 Subject: [PATCH] Change libgee dependency from 0.6 to 0.8. --- backends/eds/Makefile.am | 2 +- backends/eds/lib/Makefile.am | 2 +- backends/eds/lib/folks-eds-uninstalled.pc.in | 2 +- backends/eds/lib/folks-eds.deps | 2 +- backends/eds/lib/folks-eds.pc.in | 2 +- backends/key-file/Makefile.am | 2 +- backends/libsocialweb/Makefile.am | 2 +- backends/libsocialweb/lib/Makefile.am | 4 ++-- .../lib/folks-libsocialweb-uninstalled.pc.in | 2 +- backends/libsocialweb/lib/folks-libsocialweb.pc.in | 2 +- backends/telepathy/Makefile.am | 2 +- backends/telepathy/lib/Makefile.am | 2 +- .../telepathy/lib/folks-telepathy-uninstalled.pc.in | 2 +- backends/telepathy/lib/folks-telepathy.pc.in | 2 +- backends/tracker/Makefile.am | 2 +- backends/tracker/lib/Makefile.am | 4 ++-- backends/tracker/lib/folks-tracker-uninstalled.pc.in | 2 +- backends/tracker/lib/folks-tracker.pc.in | 2 +- configure.ac | 17 +++-------------- docs/Makefile.am | 8 ++++---- folks/Makefile.am | 5 +++-- folks/folks-uninstalled.pc.in | 2 +- folks/folks.deps | 2 +- folks/folks.pc.in | 2 +- tests/eds/Makefile.am | 2 +- tests/folks/Makefile.am | 2 +- tests/key-file/Makefile.am | 2 +- tests/lib/Makefile.am | 2 +- tests/lib/eds/Makefile.am | 2 +- tests/lib/libsocialweb/Makefile.am | 2 +- tests/lib/telepathy/contactlist/Makefile.am | 2 +- tests/lib/tracker/Makefile.am | 2 +- tests/libsocialweb/Makefile.am | 2 +- tests/telepathy/Makefile.am | 2 +- tests/tracker/Makefile.am | 2 +- tools/Makefile.am | 2 +- tools/inspect/Makefile.am | 2 +- 37 files changed, 46 insertions(+), 56 deletions(-) diff --git a/backends/eds/Makefile.am b/backends/eds/Makefile.am index 18a037e..ca36417 100644 --- a/backends/eds/Makefile.am +++ b/backends/eds/Makefile.am @@ -23,7 +23,7 @@ eds_deps = \ folks \ folks-internal \ folks-eds \ - gee-1.0 \ + gee-0.8 \ gio-2.0 \ gobject-2.0 \ libebook-1.2 \ diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am index 6e277c7..cc276df 100644 --- a/backends/eds/lib/Makefile.am +++ b/backends/eds/lib/Makefile.am @@ -47,7 +47,7 @@ libfolks_eds_la_VALAFLAGS = \ --vapidir=$(top_srcdir)/folks \ --pkg folks \ --pkg folks-internal \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg gio-2.0 \ --pkg gobject-2.0 \ --pkg libebook-1.2 \ diff --git a/backends/eds/lib/folks-eds-uninstalled.pc.in b/backends/eds/lib/folks-eds-uninstalled.pc.in index d1f76e7..e6e38f9 100644 --- a/backends/eds/lib/folks-eds-uninstalled.pc.in +++ b/backends/eds/lib/folks-eds-uninstalled.pc.in @@ -7,6 +7,6 @@ vapidir=@abs_top_srcdir@/folks Name: Folks e-d-s support library (uninstalled copy) Description: Evolution Data Server support library for the Folks meta-contacts library Version: @VERSION@ -Requires: folks glib-2.0 gobject-2.0 gee-1.0 libebook-1.2 libedataserver-1.2 +Requires: folks glib-2.0 gobject-2.0 gee-0.8 libebook-1.2 libedataserver-1.2 Libs: ${abs_top_builddir}/backends/telepathy/libfolks-eds.la Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/backends/eds -I${abs_top_builddir} diff --git a/backends/eds/lib/folks-eds.deps b/backends/eds/lib/folks-eds.deps index 9cb8d84..05bde79 100644 --- a/backends/eds/lib/folks-eds.deps +++ b/backends/eds/lib/folks-eds.deps @@ -3,4 +3,4 @@ gobject-2.0 folks libebook-1.2 libedataserver-1.2 -gee-1.0 +gee-0.8 diff --git a/backends/eds/lib/folks-eds.pc.in b/backends/eds/lib/folks-eds.pc.in index 4d581af..9400f1e 100644 --- a/backends/eds/lib/folks-eds.pc.in +++ b/backends/eds/lib/folks-eds.pc.in @@ -10,6 +10,6 @@ vapidir=@datadir@/vala/vapi Name: Folks e-d-s support library Description: Evolution Data Server support library for the Folks meta-contacts library Version: @VERSION@ -Requires: folks glib-2.0 gobject-2.0 gee-1.0 libebook-1.2 libedataserver-1.2 +Requires: folks glib-2.0 gobject-2.0 gee-0.8 libebook-1.2 libedataserver-1.2 Libs: -L${libdir} -lfolks-eds Cflags: -I${includedir} diff --git a/backends/key-file/Makefile.am b/backends/key-file/Makefile.am index 0e359c8..f9a1a7f 100644 --- a/backends/key-file/Makefile.am +++ b/backends/key-file/Makefile.am @@ -17,7 +17,7 @@ key_file_la_VALAFLAGS = \ --vapidir=$(top_srcdir)/folks \ --pkg folks \ --pkg folks-internal \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg gio-2.0 \ --pkg gobject-2.0 \ $(NULL) diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am index 65fc1b9..7cb5d8f 100644 --- a/backends/libsocialweb/Makefile.am +++ b/backends/libsocialweb/Makefile.am @@ -23,7 +23,7 @@ libsocialweb_deps = \ folks \ folks-internal \ folks-libsocialweb \ - gee-1.0 \ + gee-0.8 \ gio-2.0 \ gobject-2.0 \ libsocialweb-client \ diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am index 8242b81..b8db152 100644 --- a/backends/libsocialweb/lib/Makefile.am +++ b/backends/libsocialweb/lib/Makefile.am @@ -43,7 +43,7 @@ libfolks_libsocialweb_la_VALAFLAGS = \ --pkg folks-internal \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg libsocialweb-client \ --includedir folks \ --vapi folks-libsocialweb.vapi \ @@ -52,7 +52,7 @@ libfolks_libsocialweb_la_VALAFLAGS = \ folks_backend_libsocialweb_deps = \ folks \ - gee-1.0 \ + gee-0.8 \ gio-2.0 \ gobject-2.0 \ libsocialweb-client \ diff --git a/backends/libsocialweb/lib/folks-libsocialweb-uninstalled.pc.in b/backends/libsocialweb/lib/folks-libsocialweb-uninstalled.pc.in index 60af3f3..02018c4 100644 --- a/backends/libsocialweb/lib/folks-libsocialweb-uninstalled.pc.in +++ b/backends/libsocialweb/lib/folks-libsocialweb-uninstalled.pc.in @@ -7,6 +7,6 @@ vapidir=@abs_top_srcdir@/folks Name: Folks Libsocialweb support library (uninstalled copy) Description: Libsocialweb support library for the Folks meta-contacts library Version: @VERSION@ -Requires: folks glib-2.0 gobject-2.0 gee-1.0 libsocialweb-client +Requires: folks glib-2.0 gobject-2.0 gee-0.8 libsocialweb-client Libs: ${abs_top_builddir}/backends/telepathy/libfolks-libsocialweb.la Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/backends/libsocialweb -I${abs_top_builddir} diff --git a/backends/libsocialweb/lib/folks-libsocialweb.pc.in b/backends/libsocialweb/lib/folks-libsocialweb.pc.in index 3fac010..bcf6abf 100644 --- a/backends/libsocialweb/lib/folks-libsocialweb.pc.in +++ b/backends/libsocialweb/lib/folks-libsocialweb.pc.in @@ -10,6 +10,6 @@ vapidir=@datadir@/vala/vapi Name: Folks libsocialweb support library Description: Libsocialweb support library for the Folks meta-contacts library Version: @VERSION@ -Requires: folks glib-2.0 gobject-2.0 gee-1.0 libsocialweb-client +Requires: folks glib-2.0 gobject-2.0 gee-0.8 libsocialweb-client Libs: -L${libdir} -lfolks-libsocialweb Cflags: -I${includedir} diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am index 95932e6..83d5b88 100644 --- a/backends/telepathy/Makefile.am +++ b/backends/telepathy/Makefile.am @@ -23,7 +23,7 @@ telepathy_deps = \ folks \ folks-internal \ folks-telepathy \ - gee-1.0 \ + gee-0.8 \ gio-2.0 \ gobject-2.0 \ telepathy-glib \ diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am index fe0d596..93be4a4 100644 --- a/backends/telepathy/lib/Makefile.am +++ b/backends/telepathy/lib/Makefile.am @@ -120,7 +120,7 @@ libfolks_telepathy_la_VALAFLAGS = \ --pkg tp-lowlevel \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg telepathy-glib \ --pkg zeitgeist-1.0 \ --includedir folks \ diff --git a/backends/telepathy/lib/folks-telepathy-uninstalled.pc.in b/backends/telepathy/lib/folks-telepathy-uninstalled.pc.in index 45d8968..c3a70c3 100644 --- a/backends/telepathy/lib/folks-telepathy-uninstalled.pc.in +++ b/backends/telepathy/lib/folks-telepathy-uninstalled.pc.in @@ -7,6 +7,6 @@ vapidir=@abs_top_srcdir@/folks Name: Folks Telepathy support library (uninstalled copy) Description: Telepathy support library for the Folks meta-contacts library Version: @VERSION@ -Requires: folks glib-2.0 gobject-2.0 gee-1.0 telepathy-glib >= 0.11.11 +Requires: folks glib-2.0 gobject-2.0 gee-0.8 telepathy-glib >= 0.11.11 Libs: ${abs_top_builddir}/backends/telepathy/libfolks-telepathy.la Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/backends/telepathy -I${abs_top_builddir} diff --git a/backends/telepathy/lib/folks-telepathy.pc.in b/backends/telepathy/lib/folks-telepathy.pc.in index 4f9b67b..3e56916 100644 --- a/backends/telepathy/lib/folks-telepathy.pc.in +++ b/backends/telepathy/lib/folks-telepathy.pc.in @@ -10,6 +10,6 @@ vapidir=@datadir@/vala/vapi Name: Folks Telepathy support library Description: Telepathy support library for the Folks meta-contacts library Version: @VERSION@ -Requires: folks glib-2.0 gobject-2.0 gee-1.0 telepathy-glib >= 0.11.11 +Requires: folks glib-2.0 gobject-2.0 gee-0.8 telepathy-glib >= 0.11.11 Libs: -L${libdir} -lfolks-telepathy Cflags: -I${includedir} diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am index e99c34c..73dc099 100644 --- a/backends/tracker/Makefile.am +++ b/backends/tracker/Makefile.am @@ -24,7 +24,7 @@ tracker_deps = \ folks \ folks-internal \ folks-tracker \ - gee-1.0 \ + gee-0.8 \ gio-2.0 \ gobject-2.0 \ tracker-sparql-$(TRACKER_SPARQL_MAJOR) \ diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am index c43885b..3c16a8d 100644 --- a/backends/tracker/lib/Makefile.am +++ b/backends/tracker/lib/Makefile.am @@ -28,7 +28,7 @@ libfolks_tracker_la_VALAFLAGS = \ --pkg folks-internal \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \ --includedir folks \ --vapi folks-tracker.vapi \ @@ -37,7 +37,7 @@ libfolks_tracker_la_VALAFLAGS = \ folks_backend_tracker_deps = \ folks \ - gee-1.0 \ + gee-0.8 \ gio-2.0 \ gobject-2.0 \ tracker-sparql-$(TRACKER_SPARQL_MAJOR) \ diff --git a/backends/tracker/lib/folks-tracker-uninstalled.pc.in b/backends/tracker/lib/folks-tracker-uninstalled.pc.in index fcffc8c..7f3561b 100644 --- a/backends/tracker/lib/folks-tracker-uninstalled.pc.in +++ b/backends/tracker/lib/folks-tracker-uninstalled.pc.in @@ -7,6 +7,6 @@ vapidir=@abs_top_srcdir@/folks Name: Folks Tracker support library (uninstalled copy) Description: Tracker support library for the Folks meta-contacts library Version: @VERSION@ -Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-@TRACKER_SPARQL_MAJOR@ +Requires: folks glib-2.0 gobject-2.0 gee-0.8 tracker-sparql-@TRACKER_SPARQL_MAJOR@ Libs: ${abs_top_builddir}/backends/telepathy/libfolks-tracker.la Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/backends/tracker -I${abs_top_builddir} diff --git a/backends/tracker/lib/folks-tracker.pc.in b/backends/tracker/lib/folks-tracker.pc.in index 7898842..734827f 100644 --- a/backends/tracker/lib/folks-tracker.pc.in +++ b/backends/tracker/lib/folks-tracker.pc.in @@ -10,6 +10,6 @@ vapidir=@datadir@/vala/vapi Name: Folks tracker support library Description: Tracker support library for the Folks meta-contacts library Version: @VERSION@ -Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-@TRACKER_SPARQL_MAJOR@ +Requires: folks glib-2.0 gobject-2.0 gee-0.8 tracker-sparql-@TRACKER_SPARQL_MAJOR@ Libs: -L${libdir} -lfolks-tracker Cflags: -I${includedir} diff --git a/configure.ac b/configure.ac index 3008b07..6730f12 100644 --- a/configure.ac +++ b/configure.ac @@ -119,7 +119,7 @@ if test "x$enable_libsocialweb_backend" != "xno"; then "x$enable_vala" = "xyes"; then VALA_CHECK_PACKAGES([telepathy-glib gio-2.0 - gee-1.0 + gee-0.8 libsocialweb-client], , have_libsocialweb_backend="no") @@ -163,18 +163,7 @@ PKG_CHECK_MODULES([GMODULE], [gmodule-no-export-2.0]) PKG_CHECK_MODULES([GIO], [gio-2.0 >= $GLIB_REQUIRED]) PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1]) -# FIXME: We depend on libgee < 0.7 because 0.7 breaks API. bgo#627746 -PKG_CHECK_MODULES([GEE], [gee-1.0 < 0.7], - have_gee_0_6_x="yes", - have_gee_0_6_x="no") - -if test "x$have_gee_0_6_x" != "xyes"; then - AC_MSG_ERROR([ -Gee 0.6.x required but not installed. - -Note that Gee 0.8.x provides gee-0.8 (but gee-1.0 is, confusingly, provided by -Gee 0.6.x)]) -fi +PKG_CHECK_MODULES([GEE], [gee-0.8]) TP_GLIB_REQUIRED=0.19.0 PKG_CHECK_MODULES([TP_GLIB], [telepathy-glib >= $TP_GLIB_REQUIRED]) @@ -270,7 +259,7 @@ if test "x$enable_vala" = "xyes" ; then VALA_CHECK_PACKAGES([telepathy-glib gio-2.0 - gee-1.0 + gee-0.8 zeitgeist-1.0]) if test x$enable_tracker_backend = xyes; then diff --git a/docs/Makefile.am b/docs/Makefile.am index 8e222cd..cc179a3 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -79,7 +79,7 @@ folks_doc_files = \ folks_doc_deps = \ gmodule-2.0 \ gio-2.0 \ - gee-1.0 \ + gee-0.8 \ folks-internal \ build-conf \ $(NULL) @@ -111,7 +111,7 @@ folks_telepathy_doc_files = $(top_srcdir)/backends/telepathy/lib/*.vala folks_telepathy_doc_deps = \ gmodule-2.0 \ gio-2.0 \ - gee-1.0 \ + gee-0.8 \ telepathy-glib \ zeitgeist-1.0 \ tp-lowlevel \ @@ -173,7 +173,7 @@ folks_eds_doc_files = $(top_srcdir)/backends/eds/lib/*.vala folks_eds_doc_deps = \ gmodule-2.0 \ gio-2.0 \ - gee-1.0 \ + gee-0.8 \ libebook-1.2 \ libedataserver-1.2 \ build-conf \ @@ -242,7 +242,7 @@ folks_libsocialweb_doc_files = $(top_srcdir)/backends/libsocialweb/lib/*.vala folks_libsocialweb_doc_deps = \ gmodule-2.0 \ gio-2.0 \ - gee-1.0 \ + gee-0.8 \ libsocialweb-client \ build-conf \ folks \ diff --git a/folks/Makefile.am b/folks/Makefile.am index 4bcc042..d283eb6 100644 --- a/folks/Makefile.am +++ b/folks/Makefile.am @@ -25,7 +25,7 @@ libfolks_internal_la_VALAFLAGS = \ --vapidir=. \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg posix \ --vapi folks-internal.vapi \ -H folks-internal.h \ @@ -107,7 +107,8 @@ libfolks_la_VALAFLAGS = \ --pkg gobject-2.0 \ --pkg gmodule-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ + --pkg gconf-2.0 \ --includedir folks \ --vapi folks.vapi \ -H folks.h \ diff --git a/folks/folks-uninstalled.pc.in b/folks/folks-uninstalled.pc.in index 0443df0..642d801 100644 --- a/folks/folks-uninstalled.pc.in +++ b/folks/folks-uninstalled.pc.in @@ -7,6 +7,6 @@ vapidir=@abs_top_srcdir@/folks Name: Folks (uninstalled copy) Description: The Folks meta-contacts library Version: @VERSION@ -Requires: glib-2.0 gobject-2.0 gee-1.0 telepathy-glib >= 0.11.11 +Requires: glib-2.0 gobject-2.0 gee-0.8 telepathy-glib >= 0.11.11 Libs: ${abs_top_builddir}/folks/libfolks.la Cflags: -I${abs_top_srcdir} -I${abs_top_builddir} diff --git a/folks/folks.deps b/folks/folks.deps index 664361d..411c6da 100644 --- a/folks/folks.deps +++ b/folks/folks.deps @@ -1,4 +1,4 @@ glib-2.0 gobject-2.0 gio-2.0 -gee-1.0 +gee-0.8 diff --git a/folks/folks.pc.in b/folks/folks.pc.in index d96d97b..b45fb81 100644 --- a/folks/folks.pc.in +++ b/folks/folks.pc.in @@ -10,6 +10,6 @@ vapidir=@datadir@/vala/vapi Name: Folks Description: The Folks meta-contacts library Version: @VERSION@ -Requires: glib-2.0 gobject-2.0 gee-1.0 telepathy-glib >= 0.11.11 +Requires: glib-2.0 gobject-2.0 gee-0.8 telepathy-glib >= 0.11.11 Libs: -L${libdir} -lfolks Cflags: -I${includedir} diff --git a/tests/eds/Makefile.am b/tests/eds/Makefile.am index 40c67b3..7e81ed5 100644 --- a/tests/eds/Makefile.am +++ b/tests/eds/Makefile.am @@ -30,7 +30,7 @@ AM_VALAFLAGS = \ --vapidir=$(top_srcdir)/tests/lib/eds \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg folks \ --pkg folks-test \ --pkg libebook-1.2 \ diff --git a/tests/folks/Makefile.am b/tests/folks/Makefile.am index 5a4852f..c40fff3 100644 --- a/tests/folks/Makefile.am +++ b/tests/folks/Makefile.am @@ -34,7 +34,7 @@ AM_VALAFLAGS = \ --vapidir=$(top_builddir)/tests/lib/telepathy/contactlist/ \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg folks \ --pkg folks-test \ --pkg kf-test \ diff --git a/tests/key-file/Makefile.am b/tests/key-file/Makefile.am index 45c7b73..a2a1e7f 100644 --- a/tests/key-file/Makefile.am +++ b/tests/key-file/Makefile.am @@ -23,7 +23,7 @@ AM_VALAFLAGS = \ --vapidir=$(top_srcdir)/tests/lib/key-file \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg folks \ --pkg folks-test \ --pkg kf-test \ diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index b3bd792..d3aff8e 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -53,7 +53,7 @@ libfolks_test_la_VALAFLAGS = \ --vapidir=$(top_srcdir)/folks \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg folks \ --library folks-test \ -H folks-test.h \ diff --git a/tests/lib/eds/Makefile.am b/tests/lib/eds/Makefile.am index 4a698a9..304629a 100644 --- a/tests/lib/eds/Makefile.am +++ b/tests/lib/eds/Makefile.am @@ -8,7 +8,7 @@ VALAFLAGS += \ --vapidir=. \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg folks \ --pkg libebook-1.2 \ --pkg libedataserver-1.2 \ diff --git a/tests/lib/libsocialweb/Makefile.am b/tests/lib/libsocialweb/Makefile.am index 09ae0f9..5e4bfb4 100644 --- a/tests/lib/libsocialweb/Makefile.am +++ b/tests/lib/libsocialweb/Makefile.am @@ -7,7 +7,7 @@ VALAFLAGS += \ --vapidir=. \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg folks \ --pkg libsocialweb-client \ --pkg folks-libsocialweb \ diff --git a/tests/lib/telepathy/contactlist/Makefile.am b/tests/lib/telepathy/contactlist/Makefile.am index e429abc..87bc672 100644 --- a/tests/lib/telepathy/contactlist/Makefile.am +++ b/tests/lib/telepathy/contactlist/Makefile.am @@ -8,7 +8,7 @@ VAPIGENFLAGS += \ --vapidir=. \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg gmodule-2.0 \ --pkg dbus-glib-1 \ --pkg telepathy-glib \ diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am index bd0776b..f0d2524 100644 --- a/tests/lib/tracker/Makefile.am +++ b/tests/lib/tracker/Makefile.am @@ -7,7 +7,7 @@ VALAFLAGS += \ --vapidir=. \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg folks \ --pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \ --pkg folks-tracker \ diff --git a/tests/libsocialweb/Makefile.am b/tests/libsocialweb/Makefile.am index fa17017..1186dbe 100644 --- a/tests/libsocialweb/Makefile.am +++ b/tests/libsocialweb/Makefile.am @@ -34,7 +34,7 @@ AM_VALAFLAGS = \ --vapidir=$(top_srcdir)/tests/lib/libsocialweb \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg folks \ --pkg folks-test \ --pkg folks-libsocialweb \ diff --git a/tests/telepathy/Makefile.am b/tests/telepathy/Makefile.am index 5058bd4..9ffa42c 100644 --- a/tests/telepathy/Makefile.am +++ b/tests/telepathy/Makefile.am @@ -34,7 +34,7 @@ AM_VALAFLAGS = \ --vapidir=$(top_srcdir)/backends/telepathy/lib \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg gmodule-2.0 \ --pkg telepathy-glib \ --pkg folks \ diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am index 83d4032..5ebd1e0 100644 --- a/tests/tracker/Makefile.am +++ b/tests/tracker/Makefile.am @@ -32,7 +32,7 @@ AM_VALAFLAGS = \ --vapidir=$(top_srcdir)/tests/lib/tracker \ --pkg gobject-2.0 \ --pkg gio-2.0 \ - --pkg gee-1.0 \ + --pkg gee-0.8 \ --pkg folks \ --pkg folks-test \ --pkg folks-tracker \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 99ac032..84bcff7 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -13,7 +13,7 @@ endif VALAFLAGS = \ $(AM_VALAFLAGS) \ --vapidir=$(top_builddir)/folks \ - --pkg=gee-1.0 \ + --pkg=gee-0.8 \ --pkg=libxml-2.0 \ --pkg=folks \ --pkg=build-conf \ diff --git a/tools/inspect/Makefile.am b/tools/inspect/Makefile.am index 0bf0c9b..f341e4a 100644 --- a/tools/inspect/Makefile.am +++ b/tools/inspect/Makefile.am @@ -5,7 +5,7 @@ VALAFLAGS = \ --pkg=readline \ --pkg=gobject-2.0 \ --pkg=gio-2.0 \ - --pkg=gee-1.0 \ + --pkg=gee-0.8 \ --pkg=folks \ --pkg=build-conf \ $(NULL) -- 2.7.4