[oe] [PATCH] xfce4-vala: auto-detect vala api version

Khem Raj raj.khem at gmail.com
Tue Apr 30 18:15:11 UTC 2019


On Tue, Apr 30, 2019 at 1:44 AM Andreas Müller <schnitzeltony at gmail.com> wrote:
>
> Get rid of tedious maintenance burden
>
> Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
> ---
>  ...Detect-vapidir-if-not-set-explicitly.patch | 31 +++++++++++++++++++
>  .../vala/xfce4-vala_4.10.3.bb                 |  7 +++--
>  2 files changed, 35 insertions(+), 3 deletions(-)
>  create mode 100644 meta-xfce/recipes-bindings/vala/xfce4-vala/0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch
>
> 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 @@
> +From 35267d995a81263b98f0ad56399ac3e30f9cf152 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony at gmail.com>
> +Date: Tue, 30 Apr 2019 09:48:08 +0200
> +Subject: [PATCH] configure.ac: Detect vala-api version if not set explicitly
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index 9bf4230..c489385 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -38,7 +38,7 @@ AC_ARG_WITH([vala-api],
> +               AC_HELP_STRING([--with-vala-api=VERSION],
> +                               [Use Vala API version VERSION]),
> +               [vala_api=$withval],
> +-              [vala_api='0.16'])
> ++              [vala_api=`$PKG_CONFIG --variable=vapidir_versioned vapigen | sed -e 's:.*vala-::' -e s:/vapi::`])

thanks for fixing it once for all

> + M8T_CHECK_VALA([$vala_api])
> + AC_ARG_WITH([default-vapidir],
> +               AC_HELP_STRING([--with-default-vapidir],
> +--
> +2.20.1
> +
> 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
>
>  REQUIRED_DISTRO_FEATURES = "x11"
>
> -SRC_URI = "http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2"
> +SRC_URI = " \
> +    http://archive.xfce.org/src/bindings/${BPN}/${@xfce_verdir("${PV}")}/${BPN}-${PV}.tar.bz2 \
> +    file://0001-configure.ac-Detect-vapidir-if-not-set-explicitly.patch \
> +"
>  SRC_URI[md5sum] = "0bbb1d6e473e0fe9b335b7b1b49d8a71"
>  SRC_URI[sha256sum] = "07a8f2b7c09fcdd3d86e0c52adea3c58ca011d0142a93997a01b4af77260ae7b"
>
> -EXTRA_OECONF = "-with-vala-api=0.42"
> -
>  FILES_${PN} += "${datadir}/vala-*/vapi"
>
>  RDEPENDS_${PN} = "vala"
> --
> 2.20.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


More information about the Openembedded-devel mailing list