Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/srcpv

15 files changed, 30 insertions, 2 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b99d110d63..754f446e60 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -27378,6 +27378,10 @@ sha256=82b42534276018809aec934b572845e495ea19fc0c6abf6b6ef1e8571b91ccee
 md5=97e1497eed21ef0ac82514ead94c5ee4
 sha256=82b42534276018809aec934b572845e495ea19fc0c6abf6b6ef1e8571b91ccee
 
+[http://vagalume.igalia.com/files/source/vagalume_0.8.2.orig.tar.gz]
+md5=e25d41ea12eac9891663b2c32cb91851
+sha256=9d046572b1c8e2917f69df2abddf7199f643da1d0eee25aae828ad8891f67103
+
 [http://download.gnome.org/sources/vala/0.1/vala-0.1.5.tar.bz2]
 md5=4e082ecb7f60ebdc49f3bd19ae7ebca2
 sha256=20c577c9130f114dda24fd5a1c19cd477679553c4e2e7c8362471ae1f21b6836
diff --git a/recipes/efl1/libefso_svn.bb b/recipes/efl1/libefso_svn.bb
index d9bc651908..14b6d9f17e 100644
--- a/recipes/efl1/libefso_svn.bb
+++ b/recipes/efl1/libefso_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "EFL FSO wrapper library"
 SECTION = "e/libs"
 LICENSE = "GPLv2"
-DEPENDS = "ecore edbus"
+DEPENDS = "ecore edbus efreet"
 PV = "0.0.1+svnr${SRCPV}"
 
 SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=libefso"
diff --git a/recipes/matchbox2/matchbox-panel-2_svn.bb b/recipes/matchbox2/matchbox-panel-2_svn.bb
index a2a807f28a..ae3b122899 100644
--- a/recipes/matchbox2/matchbox-panel-2_svn.bb
+++ b/recipes/matchbox2/matchbox-panel-2_svn.bb
@@ -7,7 +7,7 @@ DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
 RDEPENDS_${PN} = "matchbox-panel-2-icon-theme"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 PV = "2.0+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 inherit autotools_stage pkgconfig
 
@@ -19,6 +19,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
 "
 S = "${WORKDIR}/${PN}"
 
+TARGET_CFLAGS += "-Wno-error"
+
 EXTRA_OECONF = "--disable-static --program-transform-name='s/$/-2/'"
 EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
 EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
diff --git a/recipes/gtk-webcore/midori-0.0.17/webkit-update.patch b/recipes/obsolete/gtk-webcore/midori-0.0.17/webkit-update.patch
index d3d19123cf..d3d19123cf 100644
--- a/recipes/gtk-webcore/midori-0.0.17/webkit-update.patch
+++ b/recipes/obsolete/gtk-webcore/midori-0.0.17/webkit-update.patch
diff --git a/recipes/gtk-webcore/midori-0.0.18/desktop.patch b/recipes/obsolete/gtk-webcore/midori-0.0.18/desktop.patch
index bb1225432a..bb1225432a 100644
--- a/recipes/gtk-webcore/midori-0.0.18/desktop.patch
+++ b/recipes/obsolete/gtk-webcore/midori-0.0.18/desktop.patch
diff --git a/recipes/gtk-webcore/midori_0.0.10.bb b/recipes/obsolete/gtk-webcore/midori_0.0.10.bb
index 86904de5d5..86904de5d5 100644
--- a/recipes/gtk-webcore/midori_0.0.10.bb
+++ b/recipes/obsolete/gtk-webcore/midori_0.0.10.bb
diff --git a/recipes/gtk-webcore/midori_0.0.11.bb b/recipes/obsolete/gtk-webcore/midori_0.0.11.bb
index b879fef57b..b879fef57b 100644
--- a/recipes/gtk-webcore/midori_0.0.11.bb
+++ b/recipes/obsolete/gtk-webcore/midori_0.0.11.bb
diff --git a/recipes/gtk-webcore/midori_0.0.12.bb b/recipes/obsolete/gtk-webcore/midori_0.0.12.bb
index b879fef57b..b879fef57b 100644
--- a/recipes/gtk-webcore/midori_0.0.12.bb
+++ b/recipes/obsolete/gtk-webcore/midori_0.0.12.bb
diff --git a/recipes/gtk-webcore/midori_0.0.13.bb b/recipes/obsolete/gtk-webcore/midori_0.0.13.bb
index b879fef57b..b879fef57b 100644
--- a/recipes/gtk-webcore/midori_0.0.13.bb
+++ b/recipes/obsolete/gtk-webcore/midori_0.0.13.bb
diff --git a/recipes/gtk-webcore/midori_0.0.15.bb b/recipes/obsolete/gtk-webcore/midori_0.0.15.bb
index b879fef57b..b879fef57b 100644
--- a/recipes/gtk-webcore/midori_0.0.15.bb
+++ b/recipes/obsolete/gtk-webcore/midori_0.0.15.bb
diff --git a/recipes/gtk-webcore/midori_0.0.17.bb b/recipes/obsolete/gtk-webcore/midori_0.0.17.bb
index 1278d21cbf..1278d21cbf 100644
--- a/recipes/gtk-webcore/midori_0.0.17.bb
+++ b/recipes/obsolete/gtk-webcore/midori_0.0.17.bb
diff --git a/recipes/gtk-webcore/midori_0.0.18.bb b/recipes/obsolete/gtk-webcore/midori_0.0.18.bb
index bb144f8600..bb144f8600 100644
--- a/recipes/gtk-webcore/midori_0.0.18.bb
+++ b/recipes/obsolete/gtk-webcore/midori_0.0.18.bb
diff --git a/recipes/gtk-webcore/midori_0.0.8.bb b/recipes/obsolete/gtk-webcore/midori_0.0.8.bb
index 01fc94867c..01fc94867c 100644
--- a/recipes/gtk-webcore/midori_0.0.8.bb
+++ b/recipes/obsolete/gtk-webcore/midori_0.0.8.bb
diff --git a/recipes/recode/recode_3.6.bb b/recipes/recode/recode_3.6.bb
index 37e3b2a8aa..1eb6d78cc6 100644
--- a/recipes/recode/recode_3.6.bb
+++ b/recipes/recode/recode_3.6.bb
@@ -8,6 +8,8 @@ SRC_URI = "${GNU_MIRROR}/recode/recode-${PV}.tar.gz \
 
 inherit autotools
 
+TARGET_CC_ARCH_append = "${LDFLAGS}"
+
 do_configure() {
 	gnu-configize
 	oe_runconf
diff --git a/recipes/vagalume/vagalume_0.8.2.bb b/recipes/vagalume/vagalume_0.8.2.bb
new file mode 100644
index 0000000000..da30fb2268
--- /dev/null
+++ b/recipes/vagalume/vagalume_0.8.2.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Last.fm client"
+AUTHOR = "agarcia@igalia.com"
+HOMEPAGE = "http://vagalume.igalia.com/"
+SECTION = "x11"
+DEPENDS = "gtk+ gstreamer curl gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}"
+RDEPENDS = "curl gst-plugin-autodetect gst-plugin-audioconvert gst-plugin-alsa gst-plugin-gconfelements librsvg-gtk ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)}"
+RRECOMMENDS = "dbus-x11 hicolor-icon-theme"
+PR = "r0"
+
+SRC_URI = "http://vagalume.igalia.com/files/source/vagalume_${PV}.orig.tar.gz\
+	   file://index.theme \
+	  "
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1"
+
+do_install_append() {
+	install -m 0644 ${WORKDIR}/index.theme ${D}${datadir}/vagalume/icons/hicolor
+}