diff options
-rw-r--r-- | meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch | 31 | ||||
-rw-r--r-- | meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb | 7 |
2 files changed, 35 insertions, 3 deletions
diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch b/meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch new file mode 100644 index 000000000..a3a9330ef --- /dev/null +++ b/meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 35267d995a81263b98f0ad56399ac3e30f9cf152 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Tue, 30 Apr 2019 09:48:08 +0200 | ||
4 | Subject: [PATCH] configure.ac: Detect vala-api version if not set explicitly | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
12 | --- | ||
13 | configure.ac | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 9bf4230..c489385 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -38,7 +38,7 @@ AC_ARG_WITH([vala-api], | ||
21 | AC_HELP_STRING([--with-vala-api=VERSION], | ||
22 | [Use Vala API version VERSION]), | ||
23 | [vala_api=$withval], | ||
24 | - [vala_api='0.16']) | ||
25 | + [vala_api=`$PKG_CONFIG --variable=vapidir_versioned vapigen | sed -e 's:.*vala-::' -e s:/vapi::`]) | ||
26 | M8T_CHECK_VALA([$vala_api]) | ||
27 | AC_ARG_WITH([default-vapidir], | ||
28 | AC_HELP_STRING([--with-default-vapidir], | ||
29 | -- | ||
30 | 2.20.1 | ||
31 | |||
diff --git a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb index 97007bec4..68dbc69af 100644 --- a/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb +++ b/meta-xfce/recipes-bindings/vala/xfce4-vala_4.10.3.bb | |||
@@ -7,12 +7,13 @@ inherit xfce pkgconfig distro_features_check | |||
7 | 7 | ||
8 | REQUIRED_DISTRO_FEATURES = "x11" | 8 | REQUIRED_DISTRO_FEATURES = "x11" |
9 | 9 | ||
10 | SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2" | 10 | SRC_URI = " \ |
11 | http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \ | ||
12 | file://0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch \ | ||
13 | " | ||
11 | SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71" | 14 | SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71" |
12 | SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" | 15 | SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b" |
13 | 16 | ||
14 | EXTRA_OECONF = "-with-vala-api=0.42" | ||
15 | |||
16 | FILES_${PN} += "${datadir}/vala-*/vapi" | 17 | FILES_${PN} += "${datadir}/vala-*/vapi" |
17 | 18 | ||
18 | RDEPENDS_${PN} = "vala" | 19 | RDEPENDS_${PN} = "vala" |