merge of 6a34921c6649c2bea10ed83770e2567ab6ae34e0

     and fd21124c1937977bb79e37903f631e37652eb813

9 files changed, 23 insertions, 6 deletions

diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb
index 8158cb2d5b..0c7772d729 100644
--- a/packages/frodo/frodo_4.2.bb
+++ b/packages/frodo/frodo_4.2.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 SRCDATE = "20040801"
 PR = "r1"
 
-SRC_URI = "cvs://anoncvs:anoncvs@down.physik.uni-mainz.de/cvs;module=Frodo4 \
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.cebix.net/home/cvs/cebix;module=Frodo4 \
            file://m4.patch;patch=1 \
            file://configure.patch;patch=1 \
            file://frodorc \
diff --git a/packages/gnome/gnome-vfs-dbus_svn.bb b/packages/gnome/gnome-vfs-dbus_svn.bb
index d2faae9195..466d52adbe 100644
--- a/packages/gnome/gnome-vfs-dbus_svn.bb
+++ b/packages/gnome/gnome-vfs-dbus_svn.bb
@@ -83,6 +83,10 @@ do_configure_prepend() {
 	install ${WORKDIR}/gtk-doc.make ./
 }
 
+do_compile_prepend() {
+    find ${S} -name Makefile | xargs sed -i 's:-Werror::'
+}
+
 do_stage() {
 	oe_libinstall -so -C libgnomevfs libgnomevfs-2 ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/gnome-vfs-2.0/libgnomevfs
diff --git a/packages/links/links-x11_2.1pre20.bb b/packages/links/links-x11_2.1pre21.bb
index f763df7f60..f763df7f60 100644
--- a/packages/links/links-x11_2.1pre20.bb
+++ b/packages/links/links-x11_2.1pre21.bb
diff --git a/packages/links/links_2.1pre20.bb b/packages/links/links_2.1pre21.bb
index 81906242d3..e0a991e148 100644
--- a/packages/links/links_2.1pre20.bb
+++ b/packages/links/links_2.1pre21.bb
@@ -16,4 +16,4 @@ EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
 	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
 	        --without-libtiff --without-svgalib --with-fb \
 	        --without-directfb --without-pmshell --without-atheos \
-	        --without-x"
+	        --without-x --without-sdl"
diff --git a/packages/openobex/files/libusb_crosscompile_check.patch b/packages/openobex/files/libusb_crosscompile_check.patch
new file mode 100644
index 0000000000..c28921b8ca
--- /dev/null
+++ b/packages/openobex/files/libusb_crosscompile_check.patch
@@ -0,0 +1,12 @@
+diff -Naur openobex-1.2_old/acinclude.m4 openobex-1.2/acinclude.m4
+--- openobex-1.2_old/acinclude.m4	2006-03-07 19:57:49.000000000 +0200
++++ openobex-1.2/acinclude.m4	2006-04-18 23:07:25.000000000 +0300
+@@ -195,7 +195,7 @@
+ 
+ 	if (test "${usb_enable}" = "yes" && test "${usb_found}" = "yes"); then
+ 		AC_DEFINE(HAVE_USB, 1, [Define if system supports USB and it's enabled])
+-		AC_CHECK_FILE(${usb_prefix}/lib/pkgconfig/libusb.pc, REQUIRES="$REQUIRES libusb")
++		REQUIRES="libusb"
+ 	fi
+ 
+ 	AM_CONDITIONAL(APPS, test "${apps_enable}" = "yes")
diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb
index 421b342476..97f030d3e2 100644
--- a/packages/openobex/openobex_1.2.bb
+++ b/packages/openobex/openobex_1.2.bb
@@ -8,7 +8,8 @@ LICENSE = "GPL"
 PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \
-           file://disable-cable-test.patch;patch=1"
+           file://disable-cable-test.patch;patch=1" \
+	   file://libusb_crosscompile_check.patch;patch=1"
 
 inherit autotools binconfig pkgconfig
 
diff --git a/packages/uae/e-uae_0.8.27.bb b/packages/uae/e-uae_0.8.27.bb
index 60b9b7d8e9..454136cc05 100644
--- a/packages/uae/e-uae_0.8.27.bb
+++ b/packages/uae/e-uae_0.8.27.bb
@@ -5,7 +5,7 @@ DEPENDS = "libsdl-qpe"
 LICENSE = "GPL"
 PR = "r1"
 
-SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \
+SRC_URI = "http://rcdrummond.net/uae/old/e-uae-${PV}/e-uae-${PV}.tar.bz2 \
            file://configure.patch;patch=1"
 #           file://m4.patch;patch=1"
 
diff --git a/packages/xlibs/libxxf86dga_1.0.0.bb b/packages/xlibs/libxxf86dga_1.0.0.bb
index 9a4824c153..46ab999c5f 100644
--- a/packages/xlibs/libxxf86dga_1.0.0.bb
+++ b/packages/xlibs/libxxf86dga_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Xxf86dga extension library."
 SECTION = "x11/libs"
 LICENSE = "XFree86"
 
-DEPENDS = "libx11 libxext xxf86dgaproto"
+DEPENDS = "libx11 libxext xf86dgaproto"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86dga-${PV}.tar.bz2"
 S = "${WORKDIR}/libXxf86dga-${PV}"
diff --git a/packages/xlibs/libxxf86vm_1.0.0.bb b/packages/xlibs/libxxf86vm_1.0.0.bb
index fe67e123d9..a5df50e566 100644
--- a/packages/xlibs/libxxf86vm_1.0.0.bb
+++ b/packages/xlibs/libxxf86vm_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Xxf86vm extension library."
 SECTION = "x11/libs"
 LICENSE = "MIT"
 
-DEPENDS = "libx11 libxext xxf86vidmodeproto"
+DEPENDS = "libx11 libxext xf86vidmodeproto"
 
 SRC_URI = "${XORG_MIRROR}/X11R7.0/src/lib/libXxf86vm-${PV}.tar.bz2"
 S = "${WORKDIR}/libXxf86vm-${PV}"