diff --git a/configure.ac b/configure.ac index 57bca4f..188e8ae 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_SUBST(LDFLAGS) GLIB_REQUIRED=2.12.0 -PKG_CHECK_MODULES(WIZBIT, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED uuid >= 1.40 sqlite3) +PKG_CHECK_MODULES(WIZBIT, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED uuid >= 1.40 sqlite3 gtk+-2.0) AC_SUBST(WIZBIT_CFLAGS) AC_SUBST(WIZBIT_LIBS) diff --git a/tests/Makefile.am b/tests/Makefile.am index 17e887b..50f1167 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -25,7 +25,7 @@ test_everything_SOURCES = \ $(NULL) test_everything.vala.stamp: $(test_everything_VALASOURCES) - $(VALAC) -C --basedir $(top_srcdir) --pkg gio-2.0 $^ + $(VALAC) -C --basedir $(top_srcdir) --pkg gio-2.0 --pkg gtk+-2.0 $^ touch $@ test_everything_CFLAGS= WIZBIT_CFLAGS@ @@ -42,7 +42,7 @@ test_sync_SOURCES = \ $(NULL) test-sync.vala.stamp: $(test_sync_VALASOURCES) - $(VALAC) -C --vapidir=$(top_srcdir)/vapi --basedir $(top_srcdir) --pkg gio-2.0 $^ + $(VALAC) -C --vapidir=$(top_srcdir)/vapi --basedir $(top_srcdir) --pkg gio-2.0 --pkg gtk+-2.0 $^ touch $@ test_sync_CFLAGS= WIZBIT_CFLAGS@ @@ -59,7 +59,7 @@ test_commit_store_SOURCES = \ $(NULL) test-commit-store.vala.stamp: $(test_commit_store_VALASOURCES) - $(VALAC) -C --vapidir=$(top_srcdir)/vapi --basedir $(top_srcdir) --pkg gio-2.0 $^ + $(VALAC) -C --vapidir=$(top_srcdir)/vapi --basedir $(top_srcdir) --pkg gio-2.0 --pkg gtk+-2.0 $^ touch $@ test_commit_store_CFLAGS= WIZBIT_CFLAGS@ diff --git a/tests/test-commit-store.vala b/tests/test-commit-store.vala index 77034e7..ad582b1 100644 --- a/tests/test-commit-store.vala +++ b/tests/test-commit-store.vala @@ -14,7 +14,7 @@ RarCommit create_dummy_commits(CommitStore store, uint no_commits, RarCommit ?gr nw.timestamp = (int) time_t(); var t = new TimeVal(); t.get_current_time(); - nw.timestamp2 = t.tv_usec; + nw.timestamp2 = (int) t.tv_usec; cur = store.store_commit(nw); } diff --git a/wizbit/bit.vala b/wizbit/bit.vala index 73537d3..5b528af 100644 --- a/wizbit/bit.vala +++ b/wizbit/bit.vala @@ -95,7 +95,7 @@ namespace Wiz { // and is probably good enough var t = new TimeVal(); t.get_current_time(); - commit.timestamp2 = t.tv_usec; + commit.timestamp2 = (int) t.tv_usec; this.commits.store_commit(commit);