[latexila/latexila-next] Upgrade to gee-0.8
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [latexila/latexila-next] Upgrade to gee-0.8
- Date: Sat, 29 Mar 2014 13:10:05 +0000 (UTC)
commit 7c9130aaa2943aaafaef612bf82559cccf55b4a6
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri Mar 28 23:09:50 2014 +0100
Upgrade to gee-0.8
Yes, gee-0.8 is newer than gee-1.0, see the difference with:
$ pkg-config --modversion gee-1.0
0.6.8
$ pkg-config --modversion gee-0.8
0.14.0
README.in | 2 +-
configure.ac | 8 +++++---
src/Makefile.am | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/README.in b/README.in
index f0f1612..63f3463 100644
--- a/README.in
+++ b/README.in
@@ -19,7 +19,7 @@ GLib >= @GLIB_REQUIRED_VERSION@
GTK+ >= @GTK_REQUIRED_VERSION@
GtkSourceView >= @GTKSOURCEVIEW_REQUIRED_VERSION@
GtkSpell >= @GTKSPELL_REQUIRED_VERSION@
-gee-1.0
+gee-0.8 >= @GEE_REQUIRED_VERSION@
gettext
gsettings-desktop-schemas
Latexmk >= 4.31 (optional, but strongly recommended)
diff --git a/configure.ac b/configure.ac
index 6dde085..cc5e059 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,12 +30,14 @@ GTK_REQUIRED_VERSION="3.6"
GTKSOURCEVIEW_REQUIRED_VERSION="3.10"
GTKSPELL_REQUIRED_VERSION="3.0.4"
VALA_REQUIRED_VERSION="0.20.0"
+GEE_REQUIRED_VERSION="0.14"
AC_SUBST([GLIB_REQUIRED_VERSION])
AC_SUBST([GTK_REQUIRED_VERSION])
AC_SUBST([GTKSOURCEVIEW_REQUIRED_VERSION])
AC_SUBST([GTKSPELL_REQUIRED_VERSION])
AC_SUBST([VALA_REQUIRED_VERSION])
+AC_SUBST([GEE_REQUIRED_VERSION])
# Some directories
@@ -102,8 +104,8 @@ if ! pkg-config gsettings-desktop-schemas; then
AC_MSG_ERROR([gsettings-desktop-schemas required.])
fi
-if ! pkg-config gee-1.0; then
- AC_MSG_ERROR([gee-1.0 required.])
+if ! pkg-config --atleast-version=${GEE_REQUIRED_VERSION} gee-0.8; then
+ AC_MSG_ERROR([gee-0.8 >= ${GEE_REQUIRED_VERSION} required.])
fi
dependencies="
@@ -113,7 +115,7 @@ dependencies="
gtksourceview-3.0
gtkspell3-3.0
gsettings-desktop-schemas
- gee-1.0"
+ gee-0.8"
CFLAGS="$CFLAGS `pkg-config --cflags ${dependencies}`"
LIBS="$LIBS `pkg-config --libs ${dependencies}`"
diff --git a/src/Makefile.am b/src/Makefile.am
index db11658..f8e91de 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ VALAFLAGS = \
--pkg gtk+-3.0 \
--pkg gtksourceview-3.0 \
--pkg gtkspell3-3.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg posix \
--target-glib=2.36
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]