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

21 files changed, 222 insertions, 20 deletions

diff --git a/recipes/blktool/blktool_4.bb b/recipes/blktool/blktool_4.bb
index e658e3256f..e11686f12b 100644
--- a/recipes/blktool/blktool_4.bb
+++ b/recipes/blktool/blktool_4.bb
@@ -1,8 +1,11 @@
 DESCRIPTION = "Display or change block device settings"
 LICENSE = "GPLv2"
 
+DEPENDS = "glib-2.0"
+PR = "r1"
+
 SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz"
 
 S = "${WORKDIR}/${PN}-${PV}.orig"
 
-inherit autotools
\ No newline at end of file
+inherit pkgconfig autotools
diff --git a/recipes/dnsmasq/dnsmasq-dbus_2.47.bb b/recipes/dnsmasq/dnsmasq-dbus_2.47.bb
index d03dbdb06e..9aefb95ada 100644
--- a/recipes/dnsmasq/dnsmasq-dbus_2.47.bb
+++ b/recipes/dnsmasq/dnsmasq-dbus_2.47.bb
@@ -2,6 +2,8 @@
 
 require dnsmasq.inc
 
+S = "${WORKDIR}/dnsmasq-${PV}"
+
 DEPENDS = "dbus"
 EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS"
 
diff --git a/recipes/dnsmasq/dnsmasq.inc b/recipes/dnsmasq/dnsmasq.inc
index a8b8d85c50..68c6337306 100644
--- a/recipes/dnsmasq/dnsmasq.inc
+++ b/recipes/dnsmasq/dnsmasq.inc
@@ -1,14 +1,13 @@
-SECTION = "console/network"
 DESCRIPTION = "Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server."
 HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html"
+SECTION = "console/network"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${PV}.tar.gz \
+#at least versions 2.15 and prior are moved to the archive folder on the server
+SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(bb.data.getVar('PV',d,1).split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz \
            file://init \
            file://dnsmasq.conf"
 
-S = "${WORKDIR}/dnsmasq-${PV}"
-
 inherit update-rc.d
 
 INITSCRIPT_NAME = "dnsmasq"
diff --git a/recipes/dnsmasq/dnsmasq_2.11.bb b/recipes/dnsmasq/dnsmasq_2.11.bb
index 68fa543210..83aea1d299 100644
--- a/recipes/dnsmasq/dnsmasq_2.11.bb
+++ b/recipes/dnsmasq/dnsmasq_2.11.bb
@@ -1,5 +1 @@
 require dnsmasq.inc
-
-SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/archive/dnsmasq-${PV}.tar.gz \
-           file://init \
-           file://dnsmasq.conf"
diff --git a/recipes/efl1/ewl_svn.bb b/recipes/efl1/ewl_svn.bb
index a8e0bfaf8d..910831ac00 100644
--- a/recipes/efl1/ewl_svn.bb
+++ b/recipes/efl1/ewl_svn.bb
@@ -18,6 +18,10 @@ EXTRA_OECONF = "\
   --disable-opengl-glew \
 "
 
+do_configure_prepend() {
+	autopoint
+}
+
 # TODO package engines more granular
 PACKAGES += "${PN}-plugins ${PN}-engines"
 
diff --git a/recipes/mozilla/firefox.inc b/recipes/mozilla/firefox.inc
index 0539a2d0c6..b0e79f96c4 100644
--- a/recipes/mozilla/firefox.inc
+++ b/recipes/mozilla/firefox.inc
@@ -1,4 +1,5 @@
 DESCRIPTION ?= "Browser made by mozilla"
+DEPENDS += "alsa-lib"
 SRC_URI += "file://mozilla-${PN}.png file://mozilla-${PN}.desktop"
 
 PARALLEL_MAKE = ""
diff --git a/recipes/mozilla/firefox_1.0.7.bb b/recipes/mozilla/firefox_1.0.7.bb
index 1b091bef64..fc973e2f8e 100644
--- a/recipes/mozilla/firefox_1.0.7.bb
+++ b/recipes/mozilla/firefox_1.0.7.bb
@@ -1,6 +1,6 @@
 PR = "r2"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
 	file://firefox-cc-fix.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_2.0.0.3.bb b/recipes/mozilla/firefox_2.0.0.3.bb
index 72c42bc074..3208c74673 100644
--- a/recipes/mozilla/firefox_2.0.0.3.bb
+++ b/recipes/mozilla/firefox_2.0.0.3.bb
@@ -1,7 +1,7 @@
 DEPENDS += "cairo"
 PR = "r3"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://xptcstubs.patch;patch=1 \
 	file://no-xmb.patch;patch=1 \
 	file://jsautocfg.h \
diff --git a/recipes/mozilla/firefox_3.0.1.bb b/recipes/mozilla/firefox_3.0.1.bb
index f3e52a0c3f..ee60fc026e 100644
--- a/recipes/mozilla/firefox_3.0.1.bb
+++ b/recipes/mozilla/firefox_3.0.1.bb
@@ -1,7 +1,7 @@
 DEPENDS += "cairo"
 PR = "r9"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_3.0.4.bb b/recipes/mozilla/firefox_3.0.4.bb
index 83836d9117..7cfebfc554 100644
--- a/recipes/mozilla/firefox_3.0.4.bb
+++ b/recipes/mozilla/firefox_3.0.4.bb
@@ -1,7 +1,7 @@
 DEPENDS += "cairo"
 PR = "r1"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_3.0.8.bb b/recipes/mozilla/firefox_3.0.8.bb
index fceed37542..541a542c92 100644
--- a/recipes/mozilla/firefox_3.0.8.bb
+++ b/recipes/mozilla/firefox_3.0.8.bb
@@ -5,7 +5,7 @@ PR = "r1"
 # /OE/angstrom-dev/cross/armv7a/lib/gcc/arm-angstrom-linux-gnueabi/4.3.1/../../../../arm-angstrom-linux-gnueabi/bin/ld: ERROR: mozilla-xremote-client.o: Conflicting definitions of wchar_t
 DEFAULT_PREFERENCE = "-1"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb
index 75f29408b8..f126f13763 100644
--- a/recipes/mozilla/firefox_3.5.2.bb
+++ b/recipes/mozilla/firefox_3.5.2.bb
@@ -1,7 +1,7 @@
 DEPENDS += "cairo"
 PR = "r2"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb
index 48e2709855..37be0fb858 100644
--- a/recipes/mozilla/firefox_3.5.4.bb
+++ b/recipes/mozilla/firefox_3.5.4.bb
@@ -2,7 +2,7 @@ DEPENDS += "cairo"
 
 PR = "r1"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/mozilla/firefox_3.5.5.bb b/recipes/mozilla/firefox_3.5.5.bb
index 56d6525a0d..a440382d14 100644
--- a/recipes/mozilla/firefox_3.5.5.bb
+++ b/recipes/mozilla/firefox_3.5.5.bb
@@ -2,7 +2,7 @@ DEPENDS += "cairo"
 
 PR = "r2"
 
-SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
+SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
 	file://jsautocfg.h \
 	file://security-cross.patch;patch=1 \
 	file://jsautocfg-dontoverwrite.patch;patch=1 \
diff --git a/recipes/omgps/omgps/gcc-4.4.patch b/recipes/omgps/omgps/gcc-4.4.patch
new file mode 100644
index 0000000000..3eae960424
--- /dev/null
+++ b/recipes/omgps/omgps/gcc-4.4.patch
@@ -0,0 +1,68 @@
+diff -uNr omgps.orig/src/include/map_repo.h omgps/src/include/map_repo.h
+--- omgps.orig/src/include/map_repo.h	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/include/map_repo.h	2010-01-17 14:55:24.000000000 +0100
+@@ -3,6 +3,9 @@
+ 
+ #include <glib.h>
+ #include <gdk/gdk.h>
++// workaround Python.h unconditionally (re)defines _XOPEN_SOURCE and _POSIX_C_SOURCE
++#undef _XOPEN_SOURCE
++#undef _POSIX_C_SOURCE
+ #include <Python.h>
+ 
+ #define MAP_MAX_BG_COLORS	5
+diff -uNr omgps.orig/src/include/py_ext.h omgps/src/include/py_ext.h
+--- omgps.orig/src/include/py_ext.h	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/include/py_ext.h	2010-01-17 14:55:57.000000000 +0100
+@@ -4,8 +4,8 @@
+ void py_ext_init();
+ void py_ext_cleanup();
+ 
+-void inline py_ext_trylock();
+-void inline py_ext_lock();
+-void inline py_ext_unlock();
++void py_ext_trylock();
++void py_ext_lock();
++void py_ext_unlock();
+ 
+ #endif /* PY_EXT_H_ */
+diff -uNr omgps.orig/src/include/uart.h omgps/src/include/uart.h
+--- omgps.orig/src/include/uart.h	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/include/uart.h	2010-01-17 14:33:00.000000000 +0100
+@@ -12,9 +12,9 @@
+ extern void uart_cleanup();
+ extern void uart_close();
+ 
+-extern inline int read_with_timeout(U1 *buf, int len);
+-extern inline int write_with_timeout(U1 *buf, int len);
+-extern inline gboolean read_fixed_len(U1 *buf, int expected_len);
++extern int read_with_timeout(U1 *buf, int len);
++extern int write_with_timeout(U1 *buf, int len);
++extern gboolean read_fixed_len(U1 *buf, int expected_len);
+ 
+ extern int sysfs_get_gps_device_power();
+ extern gboolean gps_device_power_on();
+diff -uNr omgps.orig/src/py_ext.c omgps/src/py_ext.c
+--- omgps.orig/src/py_ext.c	2009-07-20 19:54:08.000000000 +0200
++++ omgps/src/py_ext.c	2010-01-17 14:56:46.000000000 +0100
+@@ -26,17 +26,17 @@
+ 		Py_Finalize();
+ }
+ 
+-void inline py_ext_trylock()
++void py_ext_trylock()
+ {
+ 	TRYLOCK_MUTEX(&lock);
+ }
+ 
+-void inline py_ext_lock()
++void py_ext_lock()
+ {
+ 	LOCK_MUTEX(&lock);
+ }
+ 
+-void inline py_ext_unlock()
++void py_ext_unlock()
+ {
+ 	UNLOCK_MUTEX(&lock);
+ }
diff --git a/recipes/omgps/omgps_svn.bb b/recipes/omgps/omgps_svn.bb
index e68a9a4a3d..d73ade1934 100644
--- a/recipes/omgps/omgps_svn.bb
+++ b/recipes/omgps/omgps_svn.bb
@@ -7,6 +7,7 @@ DEPENDS = "gtk+ python-pygobject dbus-glib"
 PV = "0.1+svnr${SRCPV}"
 PR = "r0"
 S = "${WORKDIR}/${PN}"
-SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;proto=http"
+SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;proto=http \
+           file://gcc-4.4.patch;patch=1"
 
 inherit autotools
diff --git a/recipes/scim/files/configure.patch b/recipes/scim/files/configure.patch
new file mode 100644
index 0000000000..ca4a19ff54
--- /dev/null
+++ b/recipes/scim/files/configure.patch
@@ -0,0 +1,45 @@
+upstream: not applicable upstream
+origin: unknown contributor, sorry I forgot your name, your work is highly appreciated
+
+--- scim-1.4.6/configure.ac.old	2007-05-26 19:08:41.000000000 +0200
++++ scim-1.4.6/configure.ac	2007-05-26 21:15:00.000000000 +0200
+@@ -112,20 +112,8 @@
+ AM_CONDITIONAL(HAVE_XSLTPROC, test x$XSLTPROC != xno)
+ AC_SUBST(XSLTPROC)
+
+-# Checks if docbook-style-xsl is available
+-AC_CHECK_FILE(
+- [/usr/share/sgml/docbook/xsl-stylesheets/html/tldp-html.xsl],
+- [DOCBOOK_XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/tldp-html.xsl],
+- [AC_CHECK_FILE(
+-  [/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl],
+-  [DOCBOOK_XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl],
+-   [AC_CHECK_FILE(
+-    [/usr/share/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl],
+-    [DOCBOOK_XSL=/usr/share/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl],
+-    [DOCBOOK_XSL=no]
+-    )]
+-  )]
+-)
++# Not needed
++DOCBOOK_XSL=no
+
+ AC_SUBST(DOCBOOK_XSL)
+
+@@ -156,16 +144,6 @@
+ AC_CHECK_SIZEOF(unsigned long long int)
+ AC_CHECK_HEADERS([stdint.h],[has_stdint=yes],[has_stdint=no])
+
+-if test x$ac_cv_sizeof_unsigned_short_int = x2 && test x$ac_cv_sizeof_char = x1 ; then
+-  :
+-else
+-  AC_MSG_ERROR([
+-*** SCIM requires
+-***      sizeof (unsigned short int)  == 2
+-***      sizeof (char)                == 1
+-*** You might want to consider using the GNU C compiler.
+-])
+-fi
+
+ if test x$ac_cv_sizeof_wchar_t = x0 ; then
+   AC_MSG_ERROR([
diff --git a/recipes/scim/files/gcc-4.4-const-char.dpatch b/recipes/scim/files/gcc-4.4-const-char.dpatch
new file mode 100644
index 0000000000..b53a7b4d9c
--- /dev/null
+++ b/recipes/scim/files/gcc-4.4-const-char.dpatch
@@ -0,0 +1,17 @@
+upstream: Laibsch will push upstream soon
+origin: the original patch was prepared by Jari Aalto <jari.aalto@cante.net> for the Debian distribution
+        http://bugs.debian.org/560486
+
+Index: scim-1.4.9/src/ltdl.cpp
+===================================================================
+--- scim-1.4.9.orig/src/ltdl.cpp	2010-01-17 02:39:44.000000000 +0100
++++ scim-1.4.9/src/ltdl.cpp	2010-01-17 02:39:54.000000000 +0100
+@@ -3361,7 +3361,7 @@
+ {
+   lt_dlhandle	handle		= 0;
+   char *	tmp		= 0;
+-  char *	ext		= 0;
++  const char *	ext		= 0;
+   size_t	len;
+   int		errors		= 0;
+
diff --git a/recipes/scim/scim_1.4.9.bb b/recipes/scim/scim_1.4.9.bb
new file mode 100644
index 0000000000..61802f1173
--- /dev/null
+++ b/recipes/scim/scim_1.4.9.bb
@@ -0,0 +1,65 @@
+DESCRIPTION = "Smart Common Input Method (SCIM) platform"
+HOMEPAGE = "http://www.scim-im.org"
+SECTION = "libs/inputmethod"
+LICENSE = "LGPL"
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz \
+           file://gcc-4.4-const-char.dpatch;patch=1 \
+           file://configure.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --without-doxygen "
+LEAD_SONAME = "libscim-1.0.so"
+
+PDIR = "${PN}-1.0"
+
+do_configure_append () {
+	# Fix unset @ALL_LINGUAS@
+	#   Replace with a list of available translations in ${S}/po
+
+	cd ${S}/po
+	SEDR=`ls *.gmo -1 --color=none | sed 's/.gmo//' | tr '\n' ' '`
+	SEDL='@ALL_LINGUAS@'
+	sed -i "s/${SEDL}.*/${SEDR}/" Makefile.in.in
+	sed -i "s/${SEDL}.*/${SEDR}/" Makefile.in
+	sed -i "s/${SEDL}.*/${SEDR}/" Makefile
+
+	# Fix unset @INTLTOOL_LIBDIR@
+	#   Only needed for a check to see if charmap.alias is present,
+	#   not really needed, so we fail that test by having it look
+	#   in ${S}
+
+	cd ${S}
+	sed -i 's/@INTLTOOL_LIBDIR@/./' intltool-merge.in
+	sed -i 's/@INTLTOOL_LIBDIR@/./' intltool-merge
+
+	# Fix unset @GTK_LIBDIR@
+	#   This is the same as ${libdir} so we use that
+
+	cd ${S}/extras/gtk2_immodule
+	sed -i 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.in
+	sed -i 's/@GTK_LIBDIR@/$(libdir)/g' Makefile.am
+}
+
+pkg_postinst_${PN} () {
+	# Update gtk2 immodules
+	#   Adds SCIM to the list
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_${PN} () {
+	# Update gtk2 immodules
+	#   Removes SCIM from the list
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+FILES_${PN}-dbg +=   "${libdir}/${PDIR}/.debug \
+                      ${libdir}/${PDIR}/1.4.0/*/.debug \
+		      ${libdir}/gtk-2.0/immodules/.debug"
+FILES_${PN} +=       "${libdir}/${PDIR}/scim-panel-gtk \
+                      ${libdir}/${PDIR}/scim-helper* \
+                      ${libdir}/${PDIR}/scim-launcher \
+		      ${libdir}/${PDIR}/1.4.0 \
+                      ${libdir}/gtk-2.0/immodules"
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 13dd65a7ae..aedeb3bb1b 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Feed"
-PR = "r34"
+PR = "r35"
 PV = "1.0"
 LICENSE = "GPL"
 
@@ -265,4 +265,5 @@ RDEPENDS_${PN} += "\
 		qi \
 		qi-ubi \
 		wpa-gui \
+		gabriel \
 "
diff --git a/recipes/zip/zip.inc b/recipes/zip/zip.inc
index b1154251b6..0ac49139f4 100644
--- a/recipes/zip/zip.inc
+++ b/recipes/zip/zip.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Archiver for .zip files"
 SECTION = "console/utils"
 LICENSE = "Info-ZIP"
 
-SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz"
+SRC_URI = "ftp://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC} ${LDFLAGS}' 'AS=${CC} -c' 'CPP=${CPP}' \
 		'CFLAGS=-I. -DUNIX ${CFLAGS} ${LDFLAGS}' 'LFLAGS1=${LDFLAGS}' 'INSTALL=install' \