Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

5 files changed, 0 insertions, 72 deletions

diff --git a/packages/vala/files/static-dbus-methods.patch b/packages/vala/files/static-dbus-methods.patch
deleted file mode 100644
index 7bf4144860..0000000000
--- a/packages/vala/files/static-dbus-methods.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Frederik Sdun <frederik.sdun@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/packages/vala/vala-native_0.5.7.bb b/packages/vala/vala-native_0.5.7.bb
deleted file mode 100644
index 735c93f3f6..0000000000
--- a/packages/vala/vala-native_0.5.7.bb
+++ /dev/null
@@ -1,10 +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/packages/vala/vala-native_git.bb b/packages/vala/vala-native_git.bb
deleted file mode 100644
index b33dbc28ab..0000000000
--- a/packages/vala/vala-native_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require vala_0.5.7.bb
-# vala from git always needs the latest released version to compile itself
-DEPENDS = "vala-native"
-
-SRCREV = "633493367757a8e5f663c69c975bf525ab8a6d53"
-PV := "0.5.7+0.5.8pre01-git${SRCREV}"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${GNOME_GIT}/vala;protocol=git;branch=master"
-S = "${WORKDIR}/git"
-
-inherit native
-DEPENDS = "glib-2.0-native"
diff --git a/packages/vala/vala.inc b/packages/vala/vala.inc
deleted file mode 100644
index f5ea1ee520..0000000000
--- a/packages/vala/vala.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Vala is a C#-like language dedicated to ease GObject programming. \
-Vala compiles to plain C and has no runtime environment nor penality whatsoever."
-SECTION = "devel"
-DEPENDS = "glib-2.0 dbus"
-HOMEPAGE = "http://live.gnome.org/Vala"
-LICENSE = "LGPL"
-
-MAJV = "${@bb.data.getVar('PV',d,1)[:3]}"
-
-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
-
-EXTRA_OECONF = "--enable-vapigen"
-
-FILES_${PN}-doc += ${datadir}/devhelp
diff --git a/packages/vala/vala_0.5.7.bb b/packages/vala/vala_0.5.7.bb
deleted file mode 100644
index 7b2b4e293c..0000000000
--- a/packages/vala/vala_0.5.7.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require vala.inc
-PR = "r2"