diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-11-12 03:08:38 +0300 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-11-12 03:08:38 +0300 |
| commit | de8ffe4113d99413430db87830837042920a3ed9 (patch) | |
| tree | 75436606c5fea6876dc0464965db02448b27e70d /recipes/vala | |
| parent | bf132a8996db2e75ce4d9e754ea50fa487c52160 (diff) | |
| parent | 98c4cef80ccac7e109e8479ac3902b6ef24ff16f (diff) | |
Merge commit 'origin/org.openembedded.dev' into org.openembedded.dev
Diffstat (limited to 'recipes/vala')
| -rw-r--r-- | recipes/vala/vala-native_0.7.8.1.bb | 3 | ||||
| -rw-r--r-- | recipes/vala/vala-native_0.7.8.bb | 8 | ||||
| -rw-r--r-- | recipes/vala/vala-native_git.bb | 6 | ||||
| -rw-r--r-- | recipes/vala/vala.inc | 2 | ||||
| -rw-r--r-- | recipes/vala/vala_0.7.8.1.bb | 2 | ||||
| -rw-r--r-- | recipes/vala/vala_0.7.8.bb | 4 |
6 files changed, 8 insertions, 17 deletions
diff --git a/recipes/vala/vala-native_0.7.8.1.bb b/recipes/vala/vala-native_0.7.8.1.bb new file mode 100644 index 0000000000..d6c239f7bf --- /dev/null +++ b/recipes/vala/vala-native_0.7.8.1.bb @@ -0,0 +1,3 @@ +require vala_${PV}.bb +inherit native +DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala-native_0.7.8.bb b/recipes/vala/vala-native_0.7.8.bb deleted file mode 100644 index 7a5cad2d30..0000000000 --- a/recipes/vala/vala-native_0.7.8.bb +++ /dev/null @@ -1,8 +0,0 @@ -require vala.inc -inherit native - -PR = "r0" - -DEPENDS = "glib-2.0-native" - -SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2" diff --git a/recipes/vala/vala-native_git.bb b/recipes/vala/vala-native_git.bb index 545849b9d3..698ad4a301 100644 --- a/recipes/vala/vala-native_git.bb +++ b/recipes/vala/vala-native_git.bb @@ -3,11 +3,9 @@ inherit native DEPENDS = "glib-2.0-native" # vala from git always needs the latest released version to compile itself -DEPENDS += "vala-bootstrap-native" -PV = "0.6.0-fso1-gitr${SRCREV}" +PV = "0.7.0-fso1-gitr${SRCREV}" SRC_URI = "\ - ${FREESMARTPHONE_GIT}/vala-lang;protocol=git;branch=mickey/0.6/posix \ - file://static-dbus-methods.patch;patch=1 \ + ${FREESMARTPHONE_GIT}/vala-lang;protocol=git;branch=pending-upstream-move \ " S = "${WORKDIR}/git" diff --git a/recipes/vala/vala.inc b/recipes/vala/vala.inc index f45d557c88..258a3f7498 100644 --- a/recipes/vala/vala.inc +++ b/recipes/vala/vala.inc @@ -4,7 +4,7 @@ SECTION = "devel" DEPENDS = "glib-2.0 dbus" HOMEPAGE = "http://vala-project.org" LICENSE = "LGPL" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "http://www.freesmartphone.org/sources/vala-${PV}.tar.gz" diff --git a/recipes/vala/vala_0.7.8.1.bb b/recipes/vala/vala_0.7.8.1.bb new file mode 100644 index 0000000000..a5b1958f2c --- /dev/null +++ b/recipes/vala/vala_0.7.8.1.bb @@ -0,0 +1,2 @@ +require vala.inc +PR = "${INC_PR}.0" diff --git a/recipes/vala/vala_0.7.8.bb b/recipes/vala/vala_0.7.8.bb deleted file mode 100644 index 2d0b5b7765..0000000000 --- a/recipes/vala/vala_0.7.8.bb +++ /dev/null @@ -1,4 +0,0 @@ -require vala.inc -PR = "r0" - -SRC_URI = "${GNOME_MIRROR}/vala/0.7/vala-${PV}.tar.bz2" |