CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

vala: upgrade to newer vala from meta-smartphone/meta-fso layer

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Martin Jansa 2012-02-21 17:59:46 +00:00 committed by Koen Kooi
parent 1e3ebb18e3
commit b9fbd254ba
3 changed files with 67 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch Normal file
View File

@ -0,0 +1,53 @@
From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
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 <Martin.Jansa@gmail.com>
---
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

7
meta-oe/recipes-devtools/vala/vala_0.12.1.bb
View File

@ -1,7 +0,0 @@
require vala.inc
SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/vala/0.12/vala-${PV}.tar.bz2"
FILES_${PN} += "${datadir}/vala-0.12/vapi"
SRC_URI[md5sum] = "bf35262cc611de447147d01cbac33767"
SRC_URI[sha256sum] = "d9a2be21bb8ab88eab838e7f3a4d0aaa2a1fddf35615dca32bef6a0051f58ea8"

14
meta-oe/recipes-devtools/vala/vala_0.14.2.bb Normal file
View File

@ -0,0 +1,14 @@
require recipes-devtools/vala/vala.inc
PR = "r1"
DEPENDS += "gtk+"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/vala/0.14/vala-${PV}.tar.xz \
file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
"
FILES_${PN} += "${datadir}/vala-0.14/vapi"
SRC_URI[md5sum] = "f05263a56c1e328637e4c97a61befdad"
SRC_URI[sha256sum] = "807e6978484f66cab3cf4fefd72f37a4293d2831d7a5fd29119bdf9d38a5b3d0"