summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMihai Prica <mihai.prica@intel.com>2013-08-26 11:49:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-28 00:51:44 +0100
commite35dfbbf1540630125b322f36a0e1e44f199ff25 (patch)
tree5a82c271577d6aea639b97e6503eddd5261f0a1e
parentf17404dd712eec0e97efc7a43fcb602330521f5b (diff)
downloadpoky-e35dfbbf1540630125b322f36a0e1e44f199ff25.tar.gz
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 <mihai.prica@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/vala/vala-0.16.0/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch53
-rw-r--r--meta/recipes-devtools/vala/vala.inc20
-rw-r--r--meta/recipes-devtools/vala/vala_0.16.0.bb8
3 files changed, 81 insertions, 0 deletions
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 0000000000..e6c7941a77
--- /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 @@
1From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 21 Feb 2012 17:12:50 +0100
4Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git
5 repo
6
7* for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 build-aux/git-version-gen | 25 ++++++++++++++-----------
12 1 files changed, 14 insertions(+), 11 deletions(-)
13
14diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
15index 0fa6faa..1d1f9d2 100755
16--- a/build-aux/git-version-gen
17+++ b/build-aux/git-version-gen
18@@ -126,18 +126,21 @@ fi
19
20 v=`echo "$v" |sed 's/^v//'`
21
22-# Don't declare a version "dirty" merely because a time stamp has changed.
23-git status > /dev/null 2>&1
24+if test -d .git
25+then
26+ # Don't declare a version "dirty" merely because a time stamp has changed.
27+ git status > /dev/null 2>&1
28
29-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
30-case "$dirty" in
31- '') ;;
32- *) # Append the suffix only if there isn't one already.
33- case $v in
34- *-dirty) ;;
35- *) v="$v-dirty" ;;
36- esac ;;
37-esac
38+ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
39+ case "$dirty" in
40+ '') ;;
41+ *) # Append the suffix only if there isn't one already.
42+ case $v in
43+ *-dirty) ;;
44+ *) v="$v-dirty" ;;
45+ esac ;;
46+ esac
47+fi
48
49 # Omit the trailing newline, so that m4_esyscmd can use the result directly.
50 echo "$v" | tr -d '\012'
51--
521.7.8.4
53
diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc
new file mode 100644
index 0000000000..6cdc6053b8
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala.inc
@@ -0,0 +1,20 @@
1DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. \
2Vala compiles to plain C and has no runtime environment nor penalities whatsoever."
3SECTION = "devel"
4DEPENDS = "glib-2.0 dbus gtk+"
5BBCLASSEXTEND = "native"
6DEPENDS_virtclass-native = "glib-2.0-native dbus-native"
7HOMEPAGE = "http://vala-project.org"
8LICENSE = "LGPLv2.1"
9LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
10INC_PR = "r1"
11
12SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
13
14SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz"
15inherit autotools
16
17EXTRA_OECONF = "--disable-vapigen"
18
19FILES_${PN}-doc += "${datadir}/devhelp"
20FILES_${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 0000000000..92120b4a36
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala_0.16.0.bb
@@ -0,0 +1,8 @@
1require ${BPN}.inc
2
3PR = "${INC_PR}.1"
4
5SRC_URI += " file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch"
6
7SRC_URI[md5sum] = "84b742e9cca4c90fde3026c3793c03c1"
8SRC_URI[sha256sum] = "3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657"