From e35dfbbf1540630125b322f36a0e1e44f199ff25 Mon Sep 17 00:00:00 2001 From: Mihai Prica Date: Mon, 26 Aug 2013 11:49:26 +0000 Subject: vala: add version 0.16 from meta-oe Vala is a C#-like language dedicated to ease GObject programming. It is required by the Midori web-browser. (From OE-Core rev: 649b48557d8702daaf4f28482848ab0b07abed83) Signed-off-by: Mihai Prica Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- ...-gen-don-t-append-dirty-if-we-re-not-in-g.patch | 53 ++++++++++++++++++++++ meta/recipes-devtools/vala/vala.inc | 20 ++++++++ meta/recipes-devtools/vala/vala_0.16.0.bb | 8 ++++ 3 files changed, 81 insertions(+) create mode 100644 meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch create mode 100644 meta/recipes-devtools/vala/vala.inc create mode 100644 meta/recipes-devtools/vala/vala_0.16.0.bb (limited to 'meta/recipes-devtools/vala') diff --git a/meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch new file mode 100644 index 0000000..e6c7941 --- /dev/null +++ b/meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch @@ -0,0 +1,53 @@ +From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Tue, 21 Feb 2012 17:12:50 +0100 +Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git + repo + +* for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty + +Signed-off-by: Martin Jansa +--- + build-aux/git-version-gen | 25 ++++++++++++++----------- + 1 files changed, 14 insertions(+), 11 deletions(-) + +diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen +index 0fa6faa..1d1f9d2 100755 +--- a/build-aux/git-version-gen ++++ b/build-aux/git-version-gen +@@ -126,18 +126,21 @@ fi + + v=`echo "$v" |sed 's/^v//'` + +-# Don't declare a version "dirty" merely because a time stamp has changed. +-git status > /dev/null 2>&1 ++if test -d .git ++then ++ # Don't declare a version "dirty" merely because a time stamp has changed. ++ git status > /dev/null 2>&1 + +-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +-case "$dirty" in +- '') ;; +- *) # Append the suffix only if there isn't one already. +- case $v in +- *-dirty) ;; +- *) v="$v-dirty" ;; +- esac ;; +-esac ++ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= ++ case "$dirty" in ++ '') ;; ++ *) # Append the suffix only if there isn't one already. ++ case $v in ++ *-dirty) ;; ++ *) v="$v-dirty" ;; ++ esac ;; ++ esac ++fi + + # Omit the trailing newline, so that m4_esyscmd can use the result directly. + echo "$v" | tr -d '\012' +-- +1.7.8.4 + diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc new file mode 100644 index 0000000..6cdc605 --- /dev/null +++ b/meta/recipes-devtools/vala/vala.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. \ +Vala compiles to plain C and has no runtime environment nor penalities whatsoever." +SECTION = "devel" +DEPENDS = "glib-2.0 dbus gtk+" +BBCLASSEXTEND = "native" +DEPENDS_virtclass-native = "glib-2.0-native dbus-native" +HOMEPAGE = "http://vala-project.org" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" +INC_PR = "r1" + +SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" +inherit autotools + +EXTRA_OECONF = "--disable-vapigen" + +FILES_${PN}-doc += "${datadir}/devhelp" +FILES_${PN} += "${datadir}/${BPN}-${SHRT_VER}/vapi" diff --git a/meta/recipes-devtools/vala/vala_0.16.0.bb b/meta/recipes-devtools/vala/vala_0.16.0.bb new file mode 100644 index 0000000..92120b4 --- /dev/null +++ b/meta/recipes-devtools/vala/vala_0.16.0.bb @@ -0,0 +1,8 @@ +require ${BPN}.inc + +PR = "${INC_PR}.1" + +SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch" + +SRC_URI[md5sum] = "84b742e9cca4c90fde3026c3793c03c1" +SRC_URI[sha256sum] = "3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657" -- cgit v1.1