[oe-commits] Michael 'Mickey' Lauer : vala: major cleanup; default version is now 0.7. 3-fso1
git version control
git at git.openembedded.org
Sat May 30 17:21:21 UTC 2009
Module: openembedded.git
Branch: fso/milestone5.5
Commit: 2c35aab8063ff1061462ef6421c45b71234f9d7b
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2c35aab8063ff1061462ef6421c45b71234f9d7b
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date: Sat May 30 19:27:28 2009 +0200
vala: major cleanup; default version is now 0.7.3-fso1
vala-bootstra-native no longer necessary
---
conf/checksums.ini | 8 ++++----
recipes/vala/files/static-dbus-methods.patch | 26 --------------------------
recipes/vala/vala-bootstrap-native_0.6.0.bb | 11 -----------
recipes/vala/vala-native_0.7.3.bb | 5 +++++
recipes/vala/vala-native_git.bb | 13 -------------
recipes/vala/vala.inc | 13 +++++--------
recipes/vala/vala_0.6.0.bb | 2 --
recipes/vala/vala_0.7.3.bb | 2 ++
8 files changed, 16 insertions(+), 64 deletions(-)
diff --git a/conf/checksums.ini b/conf/checksums.ini
index e115d10..a0dbd5d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -21286,10 +21286,6 @@ sha256=dbd7c9200d45e9278498817490092c468aa31ec9815f30d71deb5b5009401b64
md5=92216c6ffb9fe0dee80c22603ee0bbb0
sha256=564463e9e4a2603a33bb29abb9011c9fcd7108d86054b19bd163b295c0511567
-[http://download.gnome.org/sources/vala/${MAJV}/vala-0.5.4.tar.bz2]
-md5=9aa42745fd87e55655adde0dc14f928c
-sha256=faf0b7863161927e1502c8829f24e23aad404d305305728a4f37a4824d73fdab
-
[http://download.gnome.org/sources/vala/0.5/vala-0.5.4.tar.bz2]
md5=9aa42745fd87e55655adde0dc14f928c
sha256=faf0b7863161927e1502c8829f24e23aad404d305305728a4f37a4824d73fdab
@@ -21314,6 +21310,10 @@ sha256=9d1cb3661e6c15059e4eecce323b3f118c243d1f17a1883e2b2d7ca0a16987e5
md5=109ebbd208be08f5d4927d4af6abf574
sha256=d179f289532180c1285fc93d6df4c6fa4dd914473858f4e29d3da1553cafccb3
+[http://www.freesmartphone.org/sources/vala-0.7.3-fso1.tar.gz]
+md5=10371510d6a690fa1e324989e5f05574
+sha256=eee6f3ff0ff6d45ecef8dd6e6135e2faa74cb04d1e03421eb9149e7ac51f2a46
+
[http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2]
md5=9407d33961186814cef0e6ecedfd6318
sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
diff --git a/recipes/vala/files/static-dbus-methods.patch b/recipes/vala/files/static-dbus-methods.patch
deleted file mode 100644
index 7bf4144..0000000
--- a/recipes/vala/files/static-dbus-methods.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Frederik Sdun <frederik.sdun at googlemail.com>
-Hi,
-
-I figured out that vala generates wrong code on static methods. It tries
-to add a user_data pointer, but then the C function has no void*
-user_data.
-
-I appended a diff which fixes the problem for me.
-
-Regards, Frederik
-
-Index: vala/gobject/valadbusclientmodule.vala
-===================================================================
---- vala/gobject/valadbusclientmodule.vala (Revision 2430)
-+++ vala/gobject/valadbusclientmodule.vala (Arbeitskopie)
-@@ -133,7 +133,9 @@
- cend_call.add_argument (new CCodeIdentifier ("call"));
- cend_call.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("error")));
- var creply_call = new CCodeFunctionCall ((CCodeExpression) callback.ccodenode);
-- creply_call.add_argument (new CCodeIdentifier ("user_data"));
-+ if( reply_method.binding != MemberBinding.STATIC ) {
-+ creply_call.add_argument (new CCodeIdentifier ("user_data"));
-+ }
- int param_count = reply_method.get_parameters ().size;
- int i = 0;
- foreach (FormalParameter param in reply_method.get_parameters ()) {
diff --git a/recipes/vala/vala-bootstrap-native_0.6.0.bb b/recipes/vala/vala-bootstrap-native_0.6.0.bb
deleted file mode 100644
index 4b653d5..0000000
--- a/recipes/vala/vala-bootstrap-native_0.6.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require vala_${PV}.bb
-
-inherit native
-DEPENDS = "glib-2.0-native"
-
-# work around timestamp problem in tarball
-do_compile_prepend() {
- touch gobject/gobject.vala.stamp
-}
-
-
diff --git a/recipes/vala/vala-native_0.7.3.bb b/recipes/vala/vala-native_0.7.3.bb
new file mode 100644
index 0000000..f04331f
--- /dev/null
+++ b/recipes/vala/vala-native_0.7.3.bb
@@ -0,0 +1,5 @@
+require vala.inc
+inherit native
+DEPENDS = "glib-2.0-native"
+PR = "${INC_PR}.0"
+
diff --git a/recipes/vala/vala-native_git.bb b/recipes/vala/vala-native_git.bb
deleted file mode 100644
index 545849b..0000000
--- a/recipes/vala/vala-native_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require vala.inc
-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}"
-
-SRC_URI = "\
- ${FREESMARTPHONE_GIT}/vala-lang;protocol=git;branch=mickey/0.6/posix \
- file://static-dbus-methods.patch;patch=1 \
-"
-S = "${WORKDIR}/git"
diff --git a/recipes/vala/vala.inc b/recipes/vala/vala.inc
index f5ea1ee..50775e9 100644
--- a/recipes/vala/vala.inc
+++ b/recipes/vala/vala.inc
@@ -4,16 +4,13 @@ SECTION = "devel"
DEPENDS = "glib-2.0 dbus"
HOMEPAGE = "http://live.gnome.org/Vala"
LICENSE = "LGPL"
+PV = "0.7.2+0.7.3-fso1"
+INC_PR = "r0"
-MAJV = "${@bb.data.getVar('PV',d,1)[:3]}"
+SRC_URI = "http://www.freesmartphone.org/sources/vala-0.7.3-fso1.tar.gz"
+S = "${WORKDIR}/vala-0.7.3-fso1"
-SRC_URI = "\
- http://download.gnome.org/sources/vala/${MAJV}/vala-${PV}.tar.bz2 \
- file://static-dbus-methods.patch;patch=1 \
-"
-S = "${WORKDIR}/vala-${PV}"
-
-inherit autotools autotools_stage lib_package
+inherit autotools autotools_stage
EXTRA_OECONF = "--enable-vapigen"
diff --git a/recipes/vala/vala_0.6.0.bb b/recipes/vala/vala_0.6.0.bb
deleted file mode 100644
index 7b2b4e2..0000000
--- a/recipes/vala/vala_0.6.0.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require vala.inc
-PR = "r2"
diff --git a/recipes/vala/vala_0.7.3.bb b/recipes/vala/vala_0.7.3.bb
new file mode 100644
index 0000000..a5b1958
--- /dev/null
+++ b/recipes/vala/vala_0.7.3.bb
@@ -0,0 +1,2 @@
+require vala.inc
+PR = "${INC_PR}.0"
More information about the Openembedded-commits
mailing list