Patchwork [meta-oe] vala: upgrade to newer vala from meta-smartphone/meta-fso layer

login
register
mail settings
Submitter Martin Jansa
Date Feb. 21, 2012, 5:59 p.m.
Message ID <1329847186-10278-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/21495/
State Accepted
Commit b9fbd254ba2bcf7d350842e8467f50c4016fc5b8
Headers show

Comments

Martin Jansa - Feb. 21, 2012, 5:59 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...-gen-don-t-append-dirty-if-we-re-not-in-g.patch |   53 ++++++++++++++++++++
 meta-oe/recipes-devtools/vala/vala_0.12.1.bb       |    7 ---
 meta-oe/recipes-devtools/vala/vala_0.14.2.bb       |   14 +++++
 3 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
 delete mode 100644 meta-oe/recipes-devtools/vala/vala_0.12.1.bb
 create mode 100644 meta-oe/recipes-devtools/vala/vala_0.14.2.bb

Patch

diff --git a/meta-oe/recipes-devtools/vala/vala-0.14.2/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/meta-oe/recipes-devtools/vala/vala-0.14.2/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-oe/recipes-devtools/vala/vala-0.14.2/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 <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
+
diff --git a/meta-oe/recipes-devtools/vala/vala_0.12.1.bb b/meta-oe/recipes-devtools/vala/vala_0.12.1.bb
deleted file mode 100644
index 1049ed6..0000000
--- a/meta-oe/recipes-devtools/vala/vala_0.12.1.bb
+++ /dev/null
@@ -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"
diff --git a/meta-oe/recipes-devtools/vala/vala_0.14.2.bb b/meta-oe/recipes-devtools/vala/vala_0.14.2.bb
new file mode 100644
index 0000000..18e6346
--- /dev/null
+++ b/meta-oe/recipes-devtools/vala/vala_0.14.2.bb
@@ -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"