diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-03-17 21:02:01 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-03-17 21:02:01 +0100 |
| commit | d2c966faf4979b5745ea0df8062795fc82b9fcc1 (patch) | |
| tree | 63eb9352d17cdcfd939ccb796e0d354a2a43d959 | |
| parent | 201bd67de450320520a12e2b0c465c8eb6818bd2 (diff) | |
Require glib >= 2.35.4 according to the usage of g_get_num_processors()
Bump vala buildflags accordingly
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | datahub/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/vala/Makefile.am | 2 | ||||
| -rw-r--r-- | extensions/Makefile.am | 2 | ||||
| -rw-r--r-- | extensions/fts++/Makefile.am | 2 | ||||
| -rw-r--r-- | libzeitgeist/Makefile.am | 2 | ||||
| -rw-r--r-- | libzeitgeist/log.vala | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | test/direct/Makefile.am | 2 |
9 files changed, 8 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index acf7daa8..45f50c78 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) -GLIB_REQUIRED=2.26.0 +GLIB_REQUIRED=2.35.4 SQLITE_REQUIRED=3.7.11 VALADOC_REQUIRED=0.2 diff --git a/datahub/Makefile.am b/datahub/Makefile.am index 9629baa7..19bcb3bb 100644 --- a/datahub/Makefile.am +++ b/datahub/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = \ $(NULL) AM_VALAFLAGS = \ - --target-glib=2.26 \ + --target-glib=2.36 \ --pkg gio-2.0 \ --pkg gio-unix-2.0 \ --pkg gtk+-3.0 \ diff --git a/examples/vala/Makefile.am b/examples/vala/Makefile.am index 99584e63..b7cd7c23 100644 --- a/examples/vala/Makefile.am +++ b/examples/vala/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ $(NULL) AM_VALAFLAGS = \ - --target-glib=2.26 \ + --target-glib=2.36 \ --pkg gio-2.0 \ $(top_builddir)/libzeitgeist/zeitgeist-datamodel-2.0.vapi \ $(top_builddir)/libzeitgeist/zeitgeist-2.0.vapi \ diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 20139aa7..72b9e245 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -24,7 +24,7 @@ AM_CPPFLAGS = \ $(NULL) AM_VALAFLAGS = \ - --target-glib=2.26 \ + --target-glib=2.36 \ --pkg gio-2.0 \ --pkg sqlite3 \ --pkg gmodule-2.0 \ diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am index 8bd9936b..0ebf2063 100644 --- a/extensions/fts++/Makefile.am +++ b/extensions/fts++/Makefile.am @@ -21,7 +21,7 @@ AM_CPPFLAGS = \ $(NULL) AM_VALAFLAGS = \ - --target-glib=2.26 \ + --target-glib=2.36 \ --pkg gio-2.0 \ --pkg sqlite3 \ --pkg posix \ diff --git a/libzeitgeist/Makefile.am b/libzeitgeist/Makefile.am index f44e950d..9af0cb42 100644 --- a/libzeitgeist/Makefile.am +++ b/libzeitgeist/Makefile.am @@ -27,7 +27,7 @@ AM_CPPFLAGS = \ $(NULL) AM_VALAFLAGS = \ - --target-glib=2.26 \ + --target-glib=2.36 \ --pkg gio-2.0 \ --pkg gio-unix-2.0 \ --pkg sqlite3 \ diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala index f0b65cb4..3de1c7de 100644 --- a/libzeitgeist/log.vala +++ b/libzeitgeist/log.vala @@ -59,9 +59,6 @@ namespace Zeitgeist */ public class Log : QueuedProxyWrapper { - [CCode (cname = "g_get_num_processors")] - private extern static uint get_num_processors (); - class DbWorker { private unowned ThreadFunc<void*> func; diff --git a/src/Makefile.am b/src/Makefile.am index 3deb6c28..65751ef5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ $(NULL) AM_VALAFLAGS = \ - --target-glib=2.26 \ + --target-glib=2.36 \ --pkg gio-2.0 \ --pkg sqlite3 \ --pkg posix \ diff --git a/test/direct/Makefile.am b/test/direct/Makefile.am index 80279d44..59e9f5f3 100644 --- a/test/direct/Makefile.am +++ b/test/direct/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = \ $(NULL) AM_VALAFLAGS = \ - --target-glib=2.26 \ + --target-glib=2.36 \ --pkg gio-2.0 \ --pkg gio-unix-2.0 \ --pkg sqlite3 \ |