On 14.02.2014 20:27, Andreas Cadhalpun wrote:
it is planned to upload valac 0.22 to unstable soon.
The attached patch updates the build-dependencies accordingly.
I tested it, and anjuta builds with the patch applied.
I'm sorry, but I missed, that the Vala support is not enabled with valac
0.22, due to a missing check in configure.ac.
The attached patch adds the relevant part of configure.ac from the new
upstream version 3.10.
It also supports now valac 0.20 as well, so that it can be enabled right
away.
I verified, that Vala support is now enabled for both 0.20 and 0.22.
Best regards,
Andreas
diff -ruN anjuta-3.8.4.orig/configure.ac anjuta-3.8.4/configure.ac
--- anjuta-3.8.4.orig/configure.ac 2014-02-14 19:56:52.000000000 +0100
+++ anjuta-3.8.4/configure.ac 2014-02-14 22:14:58.011317380 +0100
@@ -285,11 +285,9 @@
else
AC_MSG_RESULT(no)
AC_MSG_CHECKING(if libvala is available)
- PKG_CHECK_EXISTS([ libvala-0.20 ],
- [ valaver="-0.20" ],
- [ PKG_CHECK_EXISTS([ libvala-0.18 ],
- [ valaver="-0.18" ],
- [ valaver="" ])
+ m4_foreach([VERSION], [[0.18], [0.20], [0.22]],
+ [PKG_CHECK_EXISTS([ libvala-VERSION ],
+ [ valaver="-VERSION" ])
])
if test "x$valaver" != "x"; then
AC_MSG_RESULT(yes)
diff -ruN anjuta-3.8.4.orig/debian/control anjuta-3.8.4/debian/control
--- anjuta-3.8.4.orig/debian/control 2013-08-01 00:22:13.000000000 +0200
+++ anjuta-3.8.4/debian/control 2014-02-14 21:53:11.422027000 +0100
@@ -24,8 +24,8 @@
libgtksourceview-3.0-dev (>= 3.0.0),
libdevhelp-dev (>= 3.7.4),
libgladeui-dev (>= 3.12.0),
- libvala-0.20-dev,
- valac-0.20,
+ libvala-0.22-dev | libvala-0.20-dev,
+ valac (>= 0.20),
gobject-introspection (>= 0.9.5),
libgirepository1.0-dev (>= 0.10.7-1~),
libneon27-gnutls-dev (>= 0.28.2),
diff -ruN anjuta-3.8.4.orig/debian/control.in anjuta-3.8.4/debian/control.in
--- anjuta-3.8.4.orig/debian/control.in 2013-08-01 00:03:05.000000000 +0200
+++ anjuta-3.8.4/debian/control.in 2014-02-14 21:52:12.129953000 +0100
@@ -19,8 +19,8 @@
libgtksourceview-3.0-dev (>= 3.0.0),
libdevhelp-dev (>= 3.7.4),
libgladeui-dev (>= 3.12.0),
- libvala-0.20-dev,
- valac-0.20,
+ libvala-0.22-dev | libvala-0.20-dev,
+ valac (>= 0.20),
gobject-introspection (>= 0.9.5),
libgirepository1.0-dev (>= 0.10.7-1~),
libneon27-gnutls-dev (>= 0.28.2),
diff -ruN anjuta-3.8.4.orig/debian/patches/03_valac_0.22.patch anjuta-3.8.4/debian/patches/03_valac_0.22.patch
--- anjuta-3.8.4.orig/debian/patches/03_valac_0.22.patch 1970-01-01 01:00:00.000000000 +0100
+++ anjuta-3.8.4/debian/patches/03_valac_0.22.patch 2014-02-14 22:15:44.739365000 +0100
@@ -0,0 +1,17 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -285,11 +285,9 @@
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING(if libvala is available)
+- PKG_CHECK_EXISTS([ libvala-0.20 ],
+- [ valaver="-0.20" ],
+- [ PKG_CHECK_EXISTS([ libvala-0.18 ],
+- [ valaver="-0.18" ],
+- [ valaver="" ])
++ m4_foreach([VERSION], [[0.18], [0.20], [0.22]],
++ [PKG_CHECK_EXISTS([ libvala-VERSION ],
++ [ valaver="-VERSION" ])
+ ])
+ if test "x$valaver" != "x"; then
+ AC_MSG_RESULT(yes)
diff -ruN anjuta-3.8.4.orig/debian/patches/series anjuta-3.8.4/debian/patches/series
--- anjuta-3.8.4.orig/debian/patches/series 2013-06-16 20:50:47.000000000 +0200
+++ anjuta-3.8.4/debian/patches/series 2014-02-14 21:52:12.129953000 +0100
@@ -1,3 +1,4 @@
01_about_license_file.patch
02_no_gnu_gettext.patch
+03_valac_0.22.patch
workaround_python_config_bug.patch
