meta-demoapps: Remove except for xeyes and pong-clock

http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/022059.html As proposed by Martin Jansa with a couple of changes from me. (From OE-Core rev: 204ee7391c19f9b2fa7f8b2ef46d04c7ccf5bd42) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-08 14:25:59 +01:00 · 2012-05-08 14:25:59 +01:00 · 67f6baa72a
parent 71e56f8d89
commit 67f6baa72a
116 changed files with 0 additions and 5676 deletions
--- a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
+++ b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
@ -1,23 +0,0 @@
-DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
-HOMEPAGE = "http://farsight.sf.net"
-SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${BPN}-${PV}.tar.gz"
-LICENSE = "LGPLv2.1"
-DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base"
-
-inherit autotools
-
-PR = "r2"
-
-EXTRA_OECONF = " \
-  --disable-debug \
-  --disable-gtk-doc \
-  --disable-python \
-"
-
-FILES_${PN} += "${libdir}/*/*.so"
-FILES_${PN}-dev += "${libdir}/f*/*a ${libdir}/g*/*a"
-FILES_${PN}-dbg += "${libdir}/*/.debug"
-
-
-
-
--- a/meta-demoapps/recipes-connectivity/farsight/libnice_0.0.6.bb
+++ b/meta-demoapps/recipes-connectivity/farsight/libnice_0.0.6.bb
@ -1,23 +0,0 @@
-SUMMARY = "IETF draft Interactice Connectivity Establishment standard"
-DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactice Connectivity Establishment standard (ICE)."
-HOMEPAGE = "http://nice.freedesktop.org/wiki/"
-SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz"
-
-LICENSE = "LGPL/MPL"
-DEPENDS = "glib-2.0 gstreamer"
-
-inherit autotools
-
-FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*a"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
-
-do_compile_append() {
-        for i in $(find ${S} -name "*.pc") ; do
-            sed -i -e s:${STAGING_DIR_TARGET}::g \
-                   -e s:/${TARGET_SYS}::g \
-                      $i
-        done
-}
-
-
--- a/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch
+++ b/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch
@ -1,20 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---
- configure.ac |    1 +
- 1 file changed, 1 insertion(+)
-
--- libetpan-0.54.orig/configure.ac
-+++ libetpan-0.54/configure.ac
-@@ -104,10 +104,11 @@ if test "$have_w32_system" = yes; then
- fi
- AM_CONDITIONAL(HAVE_MINGW32_SYSTEM, test "$have_w32_system" = yes)
- 
- # Check the C compiler.
- AC_PROG_CC
-+AC_PROG_CXX
- 
- # Compiler flags.
- AC_ARG_ENABLE(debug,   [  --enable-debug          setup flags (gcc) for debugging (default=no)],
- if test "x$GCC" = xyes; then
-   CFLAGS="$CFLAGS -O2 -g"
--- a/meta-demoapps/recipes-connectivity/libetpan/libetpan_0.54.bb
+++ b/meta-demoapps/recipes-connectivity/libetpan/libetpan_0.54.bb
@ -1,20 +0,0 @@
-SUMMARY = "Library for communicating with mail and news services"
-DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
-It supports the protocols SMTP, POP3, IMAP and NNTP."
-HOMEPAGE = "http://www.etpan.org"
-SECTION = "libs"
-DEPENDS = "curl expat gnutls"
-LICENSE = "BSD"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-           file://cxx-is-here.patch;patch=1"
-
-inherit autotools pkgconfig gettext binconfig
-
-EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
-
-PARALLEL_MAKE = ""
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
--- a/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
+++ b/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
@ -1,10 +0,0 @@
-SUMMARY = "XMPP/Jabber library"
-DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the XMPP/Jabber protocol."
-HOMEPAGE = "http://www.loudmouth-project.org/"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 gnutls libcheck"
-PR = "r2"
-
-SRC_URI = "http://ftp.imendio.com/pub/imendio/${BPN}/src/${BPN}-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
+++ b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: openswan-2.4.7/Makefile.inc
-===================================================================
--- openswan-2.4.7.orig/Makefile.inc	2006-12-25 18:05:40.608503250 +0100
-+++ openswan-2.4.7/Makefile.inc	2006-12-25 18:06:39.028154250 +0100
-@@ -158,7 +158,7 @@
- # how backup names are composed.
- # Note that the install procedures will never overwrite an existing config
- # file, which is why -b is not specified for them.
-INSTBINFLAGS=-b --suffix=.old
-+INSTBINFLAGS=
- INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
- INSTMANFLAGS=
- INSTCONFFLAGS=
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
+++ b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
--- openswan-2.2.0.orig/programs/Makefile.program	2004-06-03 03:06:27.000000000 +0200
-+++ openswan-2.2.0/programs/Makefile.program	2005-03-05 13:50:19.000000000 +0100
-@@ -30,10 +30,6 @@
- 
- CFLAGS+= ${WERROR}
- 
-ifneq ($(LD_LIBRARY_PATH),)
-LDFLAGS=-L$(LD_LIBRARY_PATH)
-endif
-
- MANDIR8=$(MANTREE)/man8
- MANDIR5=$(MANTREE)/man5
- 
--- openswan-2.2.0.orig/programs/pluto/Makefile	2005-01-03 20:40:45.000000000 +0100
-+++ openswan-2.2.0/programs/pluto/Makefile	2005-03-05 13:51:21.000000000 +0100
-@@ -234,10 +234,6 @@
- LIBSPLUTO+=${CURL_LIBS} 
- LIBSPLUTO+= -lgmp -lresolv # -lefence
- 
-ifneq ($(LD_LIBRARY_PATH),)
-LDFLAGS=-L$(LD_LIBRARY_PATH)
-endif
-
- LIBSADNS = $(OPENSWANLIB)
- LIBSADNS += -lresolv # -lefence
- 
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
+++ b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
@ -1,379 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile
--- openswan-2.4.7.orig/doc/Makefile	2005-11-08 23:32:45.000000000 +0200
-+++ openswan-2.4.7/doc/Makefile	2006-12-06 22:46:54.732830840 +0200
-@@ -1,6 +1,6 @@
- # Makefile to generate various formats from HTML source
- #
-# Assumes the htmldoc utility is available.
-+# No longer cares if the htmldoc utility is available.
- # This can be downloaded from www.easysw.com
- #
- # Also needs lynx(1) for HTML-to-text conversion
-diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl
--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl	2004-07-16 03:24:45.000000000 +0300
-+++ openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl	2006-12-06 22:46:54.732830840 +0200
-@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # The inner loop instruction sequence and the IP/FP modifications are from
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
-diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl
--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2004-07-10 11:07:06.000000000 +0300
-+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl	2006-12-06 22:46:54.736831090 +0200
-@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
- # des_cblock (*input);
-diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2004-07-10 11:07:06.000000000 +0300
-+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl	2006-12-06 22:46:54.736831090 +0200
-@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- # require 'x86asm.pl';
- # &asm_init("cpp","des-586.pl");
-diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2004-07-10 11:07:07.000000000 +0300
-+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl	2006-12-06 22:46:54.736831090 +0200
-@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86ms;
- 
-diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2004-07-10 11:07:07.000000000 +0300
-+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl	2006-12-06 22:46:54.736831090 +0200
-@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- package x86unix;
- 
-diff -Nru openswan-2.4.7.orig/lib/liblwres/Makefile openswan-2.4.7/lib/liblwres/Makefile
--- openswan-2.4.7.orig/lib/liblwres/Makefile	2004-12-18 20:13:34.000000000 +0200
-+++ openswan-2.4.7/lib/liblwres/Makefile	2006-12-06 22:46:54.736831090 +0200
-@@ -20,7 +20,7 @@
- CDEFINES = -g
- CWARNINGS = -Werror
- 
-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
-+CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE)
- 
- VERSION="@(\#) openswan-hacking-9.3-for-osw2"
- LIBINTERFACE=2
-diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl
--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl	2006-12-06 22:46:54.736831090 +0200
-@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # The inner loop instruction sequence and the IP/FP modifications are from
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
-diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl
--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl	2006-12-06 22:46:54.740831340 +0200
-@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $prog="des686.pl";
- 
-diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl
--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl	2004-07-10 11:06:50.000000000 +0300
-+++ openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl	2006-12-06 22:46:54.740831340 +0200
-@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- $L="edi";
- $R="esi";
-diff -Nru openswan-2.4.7.orig/Makefile.inc openswan-2.4.7/Makefile.inc
--- openswan-2.4.7.orig/Makefile.inc	2006-11-14 19:56:09.000000000 +0200
-+++ openswan-2.4.7/Makefile.inc	2006-12-06 22:48:32.534943089 +0200
-@@ -46,7 +46,7 @@
- DESTDIR?=
- 
- # "local" part of tree, used in building other pathnames
-INC_USRLOCAL=/usr/local
-+INC_USRLOCAL?=/usr
- 
- # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
- # settings which are assumed to include it (or at least, to include *some*
-@@ -80,7 +80,7 @@
- MANPLACES=man3 man5 man8
- 
- # where configuration files go
-FINALCONFFILE?=/etc/ipsec.conf
-+FINALCONFFILE?=/etc/ipsec/ipsec.conf
- CONFFILE=$(DESTDIR)$(FINALCONFFILE)
- 
- FINALCONFDIR?=/etc
-@@ -91,7 +91,7 @@
- 
- # sample configuration files go into
- INC_DOCDIR?=share/doc
-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
- EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
- 
- FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
-@@ -239,7 +239,7 @@
- # installed one in RH 7.2, won't work - you wind up depending upon
- # openssl.
- 
-BIND9STATICLIBDIR?=/usr/local/lib
-+BIND9STATICLIBDIR?=/usr/lib
- 
- # if you install elsewere, you may need to point the include files to it.
- #BIND9STATICLIBDIR?=/sandel/lib
-diff -Nru openswan-2.4.7.orig/programs/barf/barf.in openswan-2.4.7/programs/barf/barf.in
--- openswan-2.4.7.orig/programs/barf/barf.in	2006-11-07 05:49:18.000000000 +0200
-+++ openswan-2.4.7/programs/barf/barf.in	2006-12-06 22:46:54.740831340 +0200
-@@ -16,7 +16,7 @@
- 
- LOGS=${LOGS-/var/log}
- CONFS=${IPSEC_CONFS-/etc}
-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
-+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
- me="ipsec barf"
- # Max lines to use for things like 'route -n'
- maxlines=100
-@@ -238,13 +238,13 @@
- 	done
- fi
- _________________________ ipsec/ls-libdir
-ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec}
-+ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec}
- _________________________ ipsec/ls-execdir
-ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}
-+ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec}
- _________________________ ipsec/updowns
-for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown`
-+for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown`
- do
-	cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f
-+	cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f
- done
- _________________________ /proc/net/dev
- cat /proc/net/dev
-diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.5 openswan-2.4.7/programs/eroute/eroute.5
--- openswan-2.4.7.orig/programs/eroute/eroute.5	2006-10-26 23:40:43.000000000 +0300
-+++ openswan-2.4.7/programs/eroute/eroute.5	2006-12-06 22:57:19.307864340 +0200
-@@ -168,7 +168,7 @@
- .SH "FILES"
- 
- .PP
-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
-+/proc/net/ipsec_eroute, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.8 openswan-2.4.7/programs/eroute/eroute.8
--- openswan-2.4.7.orig/programs/eroute/eroute.8	2003-10-31 04:32:27.000000000 +0200
-+++ openswan-2.4.7/programs/eroute/eroute.8	2006-12-06 22:46:54.740831340 +0200
-@@ -308,7 +308,7 @@
- .br
- .LP
- .SH FILES
-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
-+/proc/net/ipsec_eroute, /usr/bin/ipsec
- .SH "SEE ALSO"
- ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8),
- ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5)
-diff -Nru openswan-2.4.7.orig/programs/_include/_include.in openswan-2.4.7/programs/_include/_include.in
--- openswan-2.4.7.orig/programs/_include/_include.in	2003-01-06 23:44:04.000000000 +0200
-+++ openswan-2.4.7/programs/_include/_include.in	2006-12-06 22:46:54.740831340 +0200
-@@ -47,10 +47,10 @@
- do
- 	if test ! -r "$f"
- 	then
-		if test ! "$f" = "/etc/ipsec.conf"
-+		if test ! "$f" = "/etc/ipsec/ipsec.conf"
- 		then
- 			echo "#:cannot open configuration file \'$f\'"
-			if test "$f" = "/etc/ipsec.secrets"
-+			if test "$f" = "/etc/ipsec/ipsec.secrets"
- 			then
- 				echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
- 			fi
-diff -Nru openswan-2.4.7.orig/programs/ipsec/ipsec.8 openswan-2.4.7/programs/ipsec/ipsec.8
--- openswan-2.4.7.orig/programs/ipsec/ipsec.8	2003-02-27 18:51:54.000000000 +0200
-+++ openswan-2.4.7/programs/ipsec/ipsec.8	2006-12-06 22:46:54.744831590 +0200
-@@ -81,7 +81,7 @@
- .I ipsec
- thinks the IPsec configuration files are stored.
- .SH FILES
-/usr/local/lib/ipsec	usual utilities directory
-+/usr/lib/ipsec	usual utilities directory
- .SH ENVIRONMENT
- .PP
- The following environment variables control where FreeS/WAN finds its
-diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.7/programs/klipsdebug/klipsdebug.5
--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5	2006-10-27 01:21:25.000000000 +0300
-+++ openswan-2.4.7/programs/klipsdebug/klipsdebug.5	2006-12-06 22:58:04.150666840 +0200
-@@ -114,7 +114,7 @@
- .SH "FILES"
- 
- .PP
-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
-+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.7/programs/klipsdebug/klipsdebug.8
--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8	2006-10-27 01:21:25.000000000 +0300
-+++ openswan-2.4.7/programs/klipsdebug/klipsdebug.8	2006-12-06 22:58:22.295800840 +0200
-@@ -111,7 +111,7 @@
- .SH "FILES"
- 
- .PP
-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
-+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.7.orig/programs/mailkey/mailkey.in openswan-2.4.7/programs/mailkey/mailkey.in
--- openswan-2.4.7.orig/programs/mailkey/mailkey.in	2006-10-29 02:49:23.000000000 +0300
-+++ openswan-2.4.7/programs/mailkey/mailkey.in	2006-12-06 22:46:54.828836839 +0200
-@@ -60,7 +60,7 @@
- 
- "$test1st"
- 
-Common concerns: This account must be able to read /etc/ipsec.secrets. 
-+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. 
- If you haven't generated your key yet, please run 'ipsec newhostkey'." 
- exit 0
- }
-diff -Nru openswan-2.4.7.orig/programs/pluto/Makefile openswan-2.4.7/programs/pluto/Makefile
--- openswan-2.4.7.orig/programs/pluto/Makefile	2006-11-07 17:55:52.000000000 +0200
-+++ openswan-2.4.7/programs/pluto/Makefile	2006-12-06 22:46:54.832837088 +0200
-@@ -256,7 +256,7 @@
- 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
- 	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
- 
-ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
-+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
- 
- # libefence is a free memory allocation debugger
- # Solaris 2 needs -lsocket -lnsl
-diff -Nru openswan-2.4.7.orig/programs/setup/Makefile openswan-2.4.7/programs/setup/Makefile
--- openswan-2.4.7.orig/programs/setup/Makefile	2004-12-18 20:13:43.000000000 +0200
-+++ openswan-2.4.7/programs/setup/Makefile	2006-12-06 22:46:54.832837088 +0200
-@@ -33,25 +33,10 @@
- 	@rm -f $(BINDIR)/setup
- 	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
- 	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
-	-@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
-	-@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
-	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
-	-@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
-	-@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
-	-@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
-	-@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
-	-@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
- 
- install_file_list::
- 	@echo $(RCDIR)/ipsec
- 	@echo $(BINDIR)/setup
-	@echo $(RCDIR)/../rc0.d/K76ipsec
-	@echo $(RCDIR)/../rc1.d/K76ipsec
-	@echo $(RCDIR)/../rc2.d/S47ipsec
-	@echo $(RCDIR)/../rc3.d/S47ipsec
-	@echo $(RCDIR)/../rc4.d/S47ipsec
-	@echo $(RCDIR)/../rc5.d/S47ipsec
-	@echo $(RCDIR)/../rc6.d/K76ipsec
- 
- clean::
- 	@rm -f setup
-diff -Nru openswan-2.4.7.orig/programs/showhostkey/showhostkey.in openswan-2.4.7/programs/showhostkey/showhostkey.in
--- openswan-2.4.7.orig/programs/showhostkey/showhostkey.in	2004-11-14 15:40:41.000000000 +0200
-+++ openswan-2.4.7/programs/showhostkey/showhostkey.in	2006-12-06 22:46:54.844837840 +0200
-@@ -18,7 +18,7 @@
- usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
-                   [--dhclient] [--ipseckey]"
- 
-file=/etc/ipsec.secrets
-+file=/etc/ipsec/ipsec.secrets
- fmt=""
- gw=
- id=
-diff -Nru openswan-2.4.7.orig/programs/spi/spi.5 openswan-2.4.7/programs/spi/spi.5
--- openswan-2.4.7.orig/programs/spi/spi.5	2006-10-26 23:53:59.000000000 +0300
-+++ openswan-2.4.7/programs/spi/spi.5	2006-12-06 23:00:11.910340779 +0200
-@@ -157,7 +157,7 @@
- .SH "FILES"
- 
- .PP
-/proc/net/ipsec_spi, /usr/local/bin/ipsec
-+/proc/net/ipsec_spi, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.7.orig/programs/spi/spi.8 openswan-2.4.7/programs/spi/spi.8
--- openswan-2.4.7.orig/programs/spi/spi.8	2006-10-30 22:00:04.000000000 +0200
-+++ openswan-2.4.7/programs/spi/spi.8	2006-12-06 23:00:27.043286530 +0200
-@@ -215,7 +215,7 @@
- .SH "FILES"
- 
- .PP
-/proc/net/ipsec_spi, /usr/local/bin/ipsec
-+/proc/net/ipsec_spi, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.5 openswan-2.4.7/programs/spigrp/spigrp.5
--- openswan-2.4.7.orig/programs/spigrp/spigrp.5	2006-10-26 23:50:29.000000000 +0300
-+++ openswan-2.4.7/programs/spigrp/spigrp.5	2006-12-06 23:01:25.650949280 +0200
-@@ -67,7 +67,7 @@
- .SH "FILES"
- 
- .PP
-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
-+/proc/net/ipsec_spigrp, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.8 openswan-2.4.7/programs/spigrp/spigrp.8
--- openswan-2.4.7.orig/programs/spigrp/spigrp.8	2006-10-26 23:50:29.000000000 +0300
-+++ openswan-2.4.7/programs/spigrp/spigrp.8	2006-12-06 23:01:39.079788532 +0200
-@@ -87,7 +87,7 @@
- .SH "FILES"
- 
- .PP
-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
-+/proc/net/ipsec_spigrp, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.5 openswan-2.4.7/programs/tncfg/tncfg.5
--- openswan-2.4.7.orig/programs/tncfg/tncfg.5	2006-10-26 23:58:11.000000000 +0300
-+++ openswan-2.4.7/programs/tncfg/tncfg.5	2006-12-06 23:01:59.385057530 +0200
-@@ -101,7 +101,7 @@
- .SH "FILES"
- 
- .PP
-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
-+/proc/net/ipsec_tncfg, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
-diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.8 openswan-2.4.7/programs/tncfg/tncfg.8
--- openswan-2.4.7.orig/programs/tncfg/tncfg.8	2006-10-26 23:58:11.000000000 +0300
-+++ openswan-2.4.7/programs/tncfg/tncfg.8	2006-12-06 23:02:09.245673780 +0200
-@@ -63,7 +63,7 @@
- .SH "FILES"
- 
- .PP
-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
-+/proc/net/ipsec_tncfg, /usr/bin/ipsec
- 
- .SH "SEE ALSO"
- 
--- a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
+++ b/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
@ -1,36 +0,0 @@
-SECTION = "console/network"
-SUMMARY = "IPsec implementation"
-DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \
-Linux operating system."
-HOMEPAGE = "http://www.openswan.org"
-LICENSE = "GPLv2"
-DEPENDS = "gmp flex-native"
-RRECOMMENDS_${PN} = "kernel-module-ipsec"
-PR = "r2"
-
-SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
-	   file://openswan-2.4.7-gentoo.patch;patch=1 \
-           file://installflags.patch;patch=1 \
-	   file://ld-library-path-breakage.patch;patch=1"
-S = "${WORKDIR}/openswan-${PV}"
-
-PARALLEL_MAKE = ""
-EXTRA_OEMAKE = "DESTDIR=${D} \
-                USERCOMPILE="${CFLAGS}" \
-                FINALCONFDIR=${sysconfdir}/ipsec \
-                INC_RCDEFAULT=${sysconfdir}/init.d \
-                INC_USRLOCAL=${prefix} \
-                INC_MANDIR=share/man WERROR=''"
-
-do_compile () {
-	oe_runmake programs
-}
-
-do_install () {
-	oe_runmake install
-}
-
-FILES_${PN} = "${sysconfdir} ${libdir}/ipsec/* ${sbindir}/* ${libexecdir}/ipsec/*"
-FILES_${PN}-dbg += "${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug"
-
-CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf"
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
@ -1,20 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---
- cmake/OpenSyncInternal.cmake.in |    1 -
- 1 file changed, 1 deletion(-)
-
--- libopensync-0.36.orig/cmake/OpenSyncInternal.cmake.in
-+++ libopensync-0.36/cmake/OpenSyncInternal.cmake.in
-@@ -5,11 +5,10 @@ INCLUDE( OpenSyncTesting )
- INCLUDE( OpenSyncPackaging )
- INCLUDE( OpenSyncPlugin )
- INCLUDE( OpenSyncPlatforms )
- INCLUDE( MacroEnsureOutOfSourceBuild )
- 
-MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
- 
- 
- SET( OPENSYNC_PLUGINDIR "@OPENSYNC_PLUGINDIR@" )
- SET( OPENSYNC_FORMATSDIR "@OPENSYNC_FORMATSDIR@" )
- SET( OPENSYNC_PYTHON_PLUGINDIR "@OPENSYNC_PYTHON_PLUGINDIR@" )
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
@ -1,19 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---
- opensync/CMakeLists.txt |    1 -
- 1 file changed, 1 deletion(-)
-
-Index: libopensync-0.37/opensync/CMakeLists.txt
-===================================================================
--- libopensync-0.37.orig/opensync/CMakeLists.txt	2008-10-15 13:56:45.000000000 +0100
-+++ libopensync-0.37/opensync/CMakeLists.txt	2008-10-15 13:59:03.000000000 +0100
-@@ -67,8 +67,6 @@
- SET_TARGET_PROPERTIES( opensync PROPERTIES VERSION ${OPENSYNC_LIBVERSION_VERSION} )
- SET_TARGET_PROPERTIES( opensync PROPERTIES SOVERSION ${OPENSYNC_LIBVERSION_SOVERSION} )
- 
-SET_TARGET_PROPERTIES( opensync PROPERTIES COMPILE_FLAGS ${SYMBOLS_VISIBILITY} )
-
- IF ( OPENSYNC_UNITTESTS )
- 	ADD_LIBRARY( opensync-testing SHARED ${libopensync_LIB_SRCS} )
- 	TARGET_LINK_LIBRARIES( opensync-testing ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES}  ${LIBXSLT_LIBRARIES} ${LIBEXSLT_LIBRARIES} ${SQLITE3_LIBRARIES} )
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---
- CMakeLists.txt |    1 -
- 1 file changed, 1 deletion(-)
-
-Index: libopensync-0.37/CMakeLists.txt
-===================================================================
--- libopensync-0.37.orig/CMakeLists.txt	2008-08-18 16:14:24.000000000 +0100
-+++ libopensync-0.37/CMakeLists.txt	2008-10-15 14:00:12.000000000 +0100
-@@ -65,7 +65,6 @@
- FIND_PACKAGE( LibXslt REQUIRED )
- FIND_PACKAGE( LibExslt REQUIRED )
- FIND_PACKAGE( SWIG )	
-FIND_PACKAGE( PythonLibs )
- FIND_PACKAGE( Check )
- 
- ADD_SUBDIRECTORY( opensync )
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake
-===================================================================
--- libopensync-plugin-evolution2-0.36.orig/cmake/modules/FindOpenSync.cmake	2008-10-20 13:07:14.000000000 +0100
-+++ libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake	2008-10-20 13:08:09.000000000 +0100
-@@ -23,15 +23,15 @@
- ENDIF ( OpenSync_FIND_REQUIRED )
- 
- IF ( OPENSYNC_MIN_VERSION )
-	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0>=${OPENSYNC_MIN_VERSION} )
-+	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync>=${OPENSYNC_MIN_VERSION} )
- ELSE ( OPENSYNC_MIN_VERSION )
-	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0 )
-+	PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync )
- ENDIF ( OPENSYNC_MIN_VERSION )
- 
- FIND_PROGRAM( PKGCONFIG_EXECUTABLE NAMES pkg-config )
- 
- IF ( PKGCONFIG_EXECUTABLE )
-	EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS opensync-1.0 --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
-+	EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libopensync --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
- 	STRING( REGEX REPLACE "[\r\n]" " " _opensync_data_DIR "${_opensync_data_DIR}"  )
- ENDIF ( PKGCONFIG_EXECUTABLE )
- 
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
@ -1,8 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "LGPL"
-
-DEPENDS += " evolution-data-server"
-
-SRC_URI += "file://0.37-fixes.patch;patch=1"
-
-PR = "r2"
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb
@ -1,2 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "LGPL"
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb
@ -1,2 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "GPLv2"
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb
@ -1,4 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "GPLv2"
-
-DEPENDS += "openobex bluez4"
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [others]
-
-Index: libopensync-plugin-syncml-0.38/src/syncml_callbacks.c
-===================================================================
--- libopensync-plugin-syncml-0.38.orig/src/syncml_callbacks.c	2009-07-31 10:30:33.000000000 +0100
-+++ libopensync-plugin-syncml-0.38/src/syncml_callbacks.c	2009-07-31 10:30:39.000000000 +0100
-@@ -405,7 +405,7 @@
- 	} else {
- 		/* This problem should be fixed with the next SLOW-SYNC. */
- 		osync_trace(TRACE_EXIT_ERROR, "%s - unexpected Add or Replace command", __func__);
-		smlErrorSet(error, SML_ERROR_TEMPORARY, "Unwanted Add or Replace command on second OMA DS session.");
-+		smlErrorSet(error, SML_ERROR_GENERIC, "Unwanted Add or Replace command on second OMA DS session.");
- 		return FALSE;
- 	}
- }
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb
@ -1,8 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "LGPL"
-
-DEPENDS += " libsyncml (>= 0.4.7)"
-
-SRC_URI += "file://fixerror.patch;patch=1"
-
-PR = "r1"
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb
@ -1,4 +0,0 @@
-require libopensync-plugin_0.36.inc
-LICENSE = "LGPL"
-
-DEPENDS += "libcheck"
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
@ -1,11 +0,0 @@
-DEPENDS = "libopensync (>= 0.36)"
-
-DESCRIPTION ?= "OpenSync plugin"
-
-SRC_URI = "http://opensync.org/download/releases/${PV}/${BPN}-${PV}.tar.bz2"
-
-inherit cmake
-
-FILES_${PN} += "${libdir}/opensync*/plugins/*.so \
-                ${libdir}/opensync*/formats/*.so \
-                ${datadir}/opensync*/defaults/"
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync_0.37.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libopensync_0.37.bb
@ -1,26 +0,0 @@
-LICENSE = "LGPL"
-HOMEPAGE = "http://www.opensync.org/"
-SUMMARY = "Synchronization framwork"
-DESCRIPTION = "The OpenSync project is an ongoing effort to create a synchronization framework that will be a platform independent, general purpose synchronization engine utilizing modular plugins for content formats and different kind of connection types. OpenSync's modularity should allow it to be extended easily to new devices and purposes without radically changing the architecture itself, allowing it to support wide variety of devices used today and in the future."
-DEPENDS = "sqlite3 libxml2 glib-2.0 libcheck zlib libxslt"
-
-PR = "r1"
-
-SRC_URI = "http://opensync.org/download/releases/${PV}/libopensync-${PV}.tar.bz2\
-           file://cmake.patch;patch=1 \
-	   file://build-in-src.patch;patch=1 \
-	   file://no-python-check.patch;patch=1"
-
-inherit cmake pkgconfig
-
-LEAD_SONAME = "libopensync.so"
-
-FILES_${PN} += " ${libdir}/opensync*/formats/*.so \
-                 ${libdir}/opensync*/osplugin \
-                 ${datadir}/opensync*/schemas \
-                 ${datadir}/opensync*/capabilities \
-                 ${datadir}/opensync*/descriptions \
-		 "
-FILES_${PN}-dbg += " ${libdir}/opensync*/formats/.debug/*.so \
-	             ${libdir}/opensync*/.debug/osplugin "
-
--- a/meta-demoapps/recipes-connectivity/opensync/libsync_git.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libsync_git.bb
@ -1,22 +0,0 @@
-SUMMARY = "GObject-based sync library"
-DESCRIPTION = "LibSync is a GObject-based framework for more convenient use of \
-OpenSync in GLib applications."
-LICENSE = "LGPLv2"
-SECTION = "x11"
-DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi"
-RRECOMMENDS_${PN} = "\
-	libopensync-plugin-file \
-	"
-SRCREV = "3f375969d56028505db97cd25ef1679a167cfc59"
-PV = "0.0+gitr${SRCPV}"
-PR = "r2"
-
-SRC_URI = "git://git.yoctoproject.org/sync;protocol=git"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/sync"
-
-PACKAGES += "synctool"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_synctool = "${bindir} ${datadir}"
--- a/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch
+++ b/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch
@ -1,21 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---
- CMakeLists.txt |    4 ----
- 1 file changed, 4 deletions(-)
-
-Index: libsyncml-0.5.4/CMakeLists.txt
-===================================================================
--- libsyncml-0.5.4.orig/CMakeLists.txt	2009-07-31 09:56:16.000000000 +0100
-+++ libsyncml-0.5.4/CMakeLists.txt	2009-07-31 09:57:33.000000000 +0100
-@@ -72,10 +72,6 @@
- CHECK_TYPE_SIZE( uint32_t UINT32_T )
- CHECK_TYPE_SIZE( uint8_t UINT8_T )
- 
-# ensure out od source build
-INCLUDE( MacroEnsureOutOfSourceBuild )
-MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
-
- # find requirements
- SET ( GLIB2_MIN_VERSION "2.12" )
- SET ( OPENOBEX_MIN_VERSION "1.1" )
--- a/meta-demoapps/recipes-connectivity/opensync/libsyncml_0.5.4.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/libsyncml_0.5.4.bb
@ -1,17 +0,0 @@
-DESCRIPTION = "Libsyncml is a implementation of the SyncML protocol."
-HOMEPAGE = "http://libsyncml.opensync.org/"
-LICENSE = "LGPL"
-DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez4 openobex libcheck"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/0.5.4/libsyncml-0.5.4.tar.bz2 \
-           file://build-in-src.patch;patch=1"
-
-inherit cmake pkgconfig
-
-PACKAGES += "${PN}-tools"
-
-FILES_${PN}-tools = "${bindir}"
-FILES_${PN} = "${libdir}/*.so.*"
-
-export VERBOSE="1"
--- a/meta-demoapps/recipes-connectivity/opensync/msynctool_0.38.bb
+++ b/meta-demoapps/recipes-connectivity/opensync/msynctool_0.38.bb
@ -1,20 +0,0 @@
-SUMMARY = "Calendar (and other PIM data) synchronization program"
-DESCRIPTION = "msynctool is a program to synchronize calendars, \
-addressbooks and other PIM data between programs on your computer and \
-other computers, mobile devices, PDAs or cell phones.  It uses the \
-OpenSync plugins when synchronizing data."
-HOMEPAGE = "http://www.opensync.org/"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                    file://tools/msynctool.c;beginline=1;endline=20;md5=0b71ef245b75c74bff7d7ec58b9b4527"
-
-DEPENDS = "libopensync glib-2.0"
-
-SRC_URI = "http://www.opensync.org/download/releases/${PV}/msynctool-${PV}.tar.bz2"
-
-inherit cmake pkgconfig
-
-PR = "r0"
-
-SRC_URI[md5sum] = "495c45d6f12d3523a736864b0ced6ce5"
-SRC_URI[sha256sum] = "4a903d4db05bf2f677a675ec47e9791da9b1752c9feda0026157e82aa97e372b"
--- a/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
+++ b/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
@ -1,41 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
---
- Makefile.am      |    2 +-
- configure.ac     |    1 -
- help/Makefile.am |    1 -
- 3 files changed, 1 insertion(+), 3 deletions(-)
-
--- empathy-0.23.4.orig/Makefile.am
-+++ empathy-0.23.4/Makefile.am
-@@ -1,6 +1,6 @@
-SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
-+SUBDIRS = tools extensions po data libempathy libempathy-gtk src
- 
- if HAVE_MEGAPHONE
- SUBDIRS += megaphone
- endif
- 
--- empathy-0.23.4.orig/configure.ac
-+++ empathy-0.23.4/configure.ac
-@@ -55,11 +55,10 @@ AM_PROG_LIBTOOL
- AM_PROG_MKDIR_P
- AM_PATH_GLIB_2_0
- AC_PATH_XTRA
- IT_PROG_INTLTOOL([0.35.0])
- GTK_DOC_CHECK([1.3])
-GNOME_DOC_INIT
- IDT_COMPILE_WARNINGS
- AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
- AM_GCONF_SOURCE_2
- GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
--- empathy-0.23.4.orig/help/Makefile.am
-+++ empathy-0.23.4/help/Makefile.am
-@@ -1,6 +1,5 @@
-include $(top_srcdir)/gnome-doc-utils.make
- 
- DOC_MODULE = empathy
- DOC_ENTITIES = legal.xml
- DOC_FIGURES = \
- 	figures/empathy-main-window.png \
--- a/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
+++ b/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
@ -1,29 +0,0 @@
-SUMMARY = "a Telepathy based IM client"
-DESCRIPTION = "Instant messaging program supporting text, voice, video, file \
-transfers and interapplication communication over many different protocols, \
-include: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut, \
-Gadu-Gadu, Groupwise, ICQ and QQ."
-HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
-LICENSE = "GPL"
-DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade evolution-data-server"
-RDEPENDS_${PN} = "telepathy-mission-control"
-RRECOMMENDS_${PN} = "telepathy-gabble"
-PR = "r4"
-
-inherit gnome
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF += "--disable-scrollkeeper"
-
-PACKAGES =+ "empathy-scrollkeeper-junk"
-FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper"
-
-FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
-        ${datadir}/dbus-1/services/*.service \
-        ${datadir}/telepathy/managers/*.chandler \
-	${datadir}/icons \
-	${libdir}/python*"
-
-FILES_${PN}-dbg += "${libdir}/python*/*/.debug"
-
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
+++ b/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
@ -1,16 +0,0 @@
-SUMMARY = "Telepathy fasrsight"
-DESCRIPTION = "Glue library for telepathy media signalling and the media \
-streaming capabilities of Farsight2."
-HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
-DEPENDS = "glib-2.0 dbus telepathy-glib farsight2"
-LICENSE = "LGPLv2"
-
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${BPN}-${PV}.tar.gz \
-"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-python"
-
-FILES_${PN} += "${datadir}/telepathy \
-		${datadir}/dbus-1"
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager
+++ b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager
@ -1,33 +0,0 @@
-
-[ConnectionManager]
-BusName=org.freedesktop.Telepathy.ConnectionManager.gabble
-ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble
-
-[Protocol jabber]
-param-account=s required register
-param-password=s required register
-param-server=s
-param-resource=s
-param-priority=n
-param-port=q
-param-old-ssl=b
-param-register=b
-param-low-bandwidth=b
-param-https-proxy-server=s
-param-https-proxy-port=q
-param-fallback-conference-server=s
-param-stun-server=s
-param-stun-port=q
-param-ignore-ssl-errors=b
-param-alias=s
-param-mac=s
-param-btid=s
-default-resource=Telepathy
-default-priority=0
-default-port=5222
-default-old-ssl=false
-default-register=false
-default-low-bandwidth=false
-default-https-proxy-port=443
-default-stun-port=3478
-default-ignore-ssl-errors=false
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
+++ b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
@ -1,18 +0,0 @@
-SUMMARY = "Telepathy Jabber/XMPP connection manager"
-DESCRIPTION = "Telepathy implementation of the Jabber/XMPP protocols."
-HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
-DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib dbus-glib"
-LICENSE = "LGPL"
-
-# gabble.manager needs to get regenerated every release, so please don't copy it over blindly
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${BPN}-${PV}.tar.gz \
-           file://gabble.manager"
-
-inherit autotools pkgconfig
-
-do_compile_prepend() {
-      cp ${WORKDIR}/gabble.manager ${S}/data/
-}
-
-FILES_${PN} += "${datadir}/telepathy \
-		${datadir}/dbus-1"
--- a/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch
+++ b/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch
@ -1,17 +0,0 @@
-
-Upstream-Status: Inappropriate [configuration]
--- wbxml2-0.9.2/Makefile.am.old	2007-01-03 19:50:24.000000000 +0000
-+++ wbxml2-0.9.2/Makefile.am	2007-01-03 19:50:39.000000000 +0000
-@@ -24,9 +24,9 @@
- 	TODO\
- 	doxygen.h
- 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
-	cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
-+#install-data-local:
-+#	$(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
-+#	cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
- 
- dist-bz2: distdir
- 	sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux
--- a/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
+++ b/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
@ -1,24 +0,0 @@
-SUMMARY = "Parsing and Encoding of WBXML documents"
-DESCRIPTION = "The WBXML Library (aka libwbxml) contains a library and \
-its associated tools to Parse, Encode and Handle WBXML documents. The \
-WBXML format is a binary representation of XML, defined by the Wap \
-Forum, and used to reduce bandwidth in mobile communications."
-LICENSE = "GPLv2"
-
-DEPENDS = "libxml2 sed-native expat"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${BPN}-${PV}.tar.gz \
-	   file://no-doc-install.patch;patch=1"
-
-inherit autotools pkgconfig
-
-do_configure_append() {
-	sed -i s:-I/usr/include::g Makefile
-	sed -i s:-I/usr/include::g */Makefile
-}
-
-PACKAGES += "${PN}-tools"
-
-FILES_${PN}-tools = "${bindir}"
-FILES_${PN} = "${libdir}/*.so.*"
-
--- a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
+++ b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
@ -1,64 +0,0 @@
-DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
-HOMEPAGE = "http://www.abiword.org"
-SECTION = "x11/office"
-LICENSE = "GPLv2"
-DEPENDS     = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
-RDEPENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
-               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-
-SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
-
-#want 2.x from 2.x.y for the installation directory
-SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
-
-FILES_${PN} += " \
-		${datadir}/icons/* \
-		${datadir}/abiword-${SHRT_VER}/glade \
-		${datadir}/abiword-${SHRT_VER}/scripts \
-		${datadir}/abiword-${SHRT_VER}/system.profile-en \
-		${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
-		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
-		${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
-		${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
-		${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
-		${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
-		${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
-		${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
-		${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
-		${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
-
-#		${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
-#		${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
-EXTRA_OECONF = " --disable-pspell \
-                 --disable-spellcheck \
-		 --disable-printing \
-		 --disable-exports \
-		 --with-sys-wv"
-
-# AbiWord configure.ac does not play nicely with autoreconf
-# so use the autogen.sh script that comes with AbiWord
-#
-do_configure() {
-        cd ${S}
-        export NOCONFIGURE="no"; ./autogen.sh
-        oe_runconf
-}
-
-
-do_install_append() {
-        install -d ${D}${datadir}/pixmaps/
-        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
-}
-
-PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
-
-FILES_abiword-clipart 		+= "${datadir}/abiword-${SHRT_VER}/clipart"
-FILES_abiword-icons 		+= "${datadir}/abiword-${SHRT_VER}/icons"
-FILES_abiword-strings 		+= "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
-FILES_abiword-systemprofiles 	+= "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
-FILES_abiword-templates 	+= "${datadir}/abiword-${SHRT_VER}/templates"
--- a/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
+++ b/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
@ -1,12 +0,0 @@
-require abiword-2.5.inc
-
-PR = "r1"
-
-EXTRA_OECONF += "--enable-embedded"
-
-S = "${WORKDIR}/abiword-${PV}"
-
-RCONFLICTS = "abiword"
-RPROVIDES += "abiword"
-
-
--- a/meta-demoapps/recipes-gnome/abiword/abiword.inc
+++ b/meta-demoapps/recipes-gnome/abiword/abiword.inc
@ -1,64 +0,0 @@
-DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
-SECTION = "gnome/office"
-HOMEPAGE = "http://www.abiword.org""
-LICENSE = "GPLv2"
-
-DEPENDS     = "libgsf libglade libfribidi libxml2 wv"
-RRECOMMENDS_${PN}    = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
-               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
-
-# Share this file between recipes that use cvs and that pull tarballs
-# (one day change this to differentiate automatically based on PV and set the
-# SRC_URI and S var directly)
-RELURI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
-RELSRC = "${WORKDIR}/abiword-${PV}/abi"
-
-SVNURI = "svn://svn.abisource.com/abiword/trunk;module=abiword;proto=http"
-SVNSRC = "${WORKDIR}/abi"
-
-#want 2.x from 2.x.y for the installation directory
-SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
-
-FILES_${PN} += " \
-		${datadir}/icons/* \
-		${datadir}/mime-info \
-		${datadir}/abiword-${SHRT_VER}/glade \
-		${datadir}/abiword-${SHRT_VER}/system.profile-en \
-		${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \
-  "
-
-#		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
-#		${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
-
-inherit autotools pkgconfig
-
-PARALLEL_MAKE = ""
-
-# This is a minimalistic AbiWord build
-#
-# if you are planning to build plugins, make sure to comment out the
-# --disable-exports options
-
-EXTRA_OECONF = " --enable-embedded=poky    \
-		 --disable-printing   \
-		 --with-sys-wv 	     \
-		 --disable-exports    \
-		 --disable-spellcheck"
-
-# TODO -- refactor this, so that instead of two strings and profiles
-# packages we have lots of locale packages, each with a set of strings and
-# a profile
-#
-PACKAGES += " abiword-strings abiword-systemprofiles"
-
-FILES_abiword-strings 		+= "${datadir}/abiword-${SHRT_VER}/strings"
-FILES_abiword-systemprofiles 	+= "${datadir}/abiword-${SHRT_VER}/system.profile*"
-
-# AbiWord configure.ac does not play nicely with autoreconf
-# so use the autogen.sh script that comes with AbiWord
-#
-do_configure() {
-	cd ${S}
-	export NOCONFIGURE="no"; ./autogen.sh
-	oe_runconf
-}
--- a/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb
+++ b/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb
@ -1,5 +0,0 @@
-require abiword-2.5.inc
-
-PR = "r2"
-
-RCONFLICTS_${PN} = "abiword-embedded"
--- a/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
+++ b/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
@ -1,10 +0,0 @@
-require abiword.inc
-
-SRCREV = "21818"
-PV="2.5.2+svnr${SRCPV}"
-PR = "r0"
-
-SRC_URI = "${SVNURI}"
-
-S = "${SVNSRC}"
-
--- a/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
+++ b/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
@ -1,33 +0,0 @@
---
- Makefile.am           |    2 +-
- gcalctool/Makefile.am |    2 --
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: gcalctool-5.8.17/gcalctool/Makefile.am
-===================================================================
--- gcalctool-5.8.17.orig/gcalctool/Makefile.am	2005-12-19 15:46:57.000000000 +0000
-+++ gcalctool-5.8.17/gcalctool/Makefile.am	2007-05-16 16:03:26.000000000 +0100
-@@ -1,8 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
- INCLUDES = \
-	-I$(includedir) \
-	-DG_DISABLE_DEPRECATED \
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED \
- 	-DGDK_DISABLE_DEPRECATED \
- 	-DGNOME_DISABLE_DEPRECATED \
-Index: gcalctool-5.8.17/Makefile.am
-===================================================================
--- gcalctool-5.8.17.orig/Makefile.am	2007-05-16 15:35:44.000000000 +0100
-+++ gcalctool-5.8.17/Makefile.am	2007-05-16 16:06:46.000000000 +0100
-@@ -29,7 +29,7 @@ DISTCLEANFILES =                \
- 	gnome-doc-utils.make	\
- 	gcalctool.desktop
- 
-SUBDIRS = po gcalctool help
-+SUBDIRS = po gcalctool
- 
- SCHEMAS_FILE = gcalctool.schemas
- 
--- a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb
+++ b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb
@ -1,13 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11"
-DEPENDS = "gtk+"
-DESCRIPTION = "gcalctool is a powerful calculator"
-PR = "r2"
-
-SRC_URI = "http://download.gnome.org/sources/${BPN}/5.7/${BPN}-${PV}.tar.gz \
-        file://makefile-fix.diff;patch=1\
-	file://fix-includedir.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gnome"
--- a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
+++ b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
@ -1,12 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11"
-DEPENDS = "gtk+ gnome-doc-utils"
-DESCRIPTION = "gcalctool is a powerful calculator"
-PR = "r0"
-
-SRC_URI = "http://download.gnome.org/sources/${BPN}/5.8/${BPN}-${PV}.tar.gz \
-	file://fix-includedir.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gnome"
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
@ -1,32 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: gnome-settings-daemon-2.26.1/configure.ac
-===================================================================
--- gnome-settings-daemon-2.26.1.orig/configure.ac	2009-09-16 22:57:31.000000000 +0100
-+++ gnome-settings-daemon-2.26.1/configure.ac	2009-09-16 22:58:45.000000000 +0100
-@@ -133,9 +133,6 @@
- #
- AC_DEFUN([AC_CHECK_X_HEADERS], [
-   ac_save_CPPFLAGS="$CPPFLAGS"
-  if test \! -z "$includedir" ; then
-    CPPFLAGS="$CPPFLAGS -I$includedir"
-  fi
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-   AC_CHECK_HEADERS([$1],[$2],[$3],[$4])
-   CPPFLAGS="$ac_save_CPPFLAGS"])
-@@ -148,15 +145,9 @@
-   ac_save_LDFLAGS="$LDFLAGS"
- #  ac_save_LIBS="$LIBS"
- 
-  if test \! -z "$includedir" ; then
-    CPPFLAGS="$CPPFLAGS -I$includedir"
-  fi
-   # note: $X_CFLAGS includes $x_includes
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- 
-  if test \! -z "$libdir" ; then
-    LDFLAGS="$LDFLAGS -L$libdir"
-  fi
-   # note: $X_LIBS includes $x_libraries
-   LDFLAGS="$LDFLAGS $ALL_X_LIBS"
- 
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
--- gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in~	2009-04-24 20:59:51.000000000 -0700
-+++ gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in	2009-04-24 20:59:51.000000000 -0700
-@@ -2,7 +2,7 @@
- Type=Application
- _Name=GNOME Settings Daemon
- Exec=@LIBEXECDIR@/gnome-settings-daemon
-OnlyShowIn=GNOME;
-+OnlyShowIn=GNOME;MOBLIN;
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-Autostart-Notify=true
- X-GNOME-AutoRestart=true
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
@ -1,21 +0,0 @@
-Upstream-Status: Pending
-
-============================================================
- Listen for DeviceAdded in addition to DeviceEnabled
-
-  This should help address problems like left-handed
-mouse, and acceleration settings getting lost after
-resume, or when new devices gets plugged in.
-
-diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
--- a/plugins/mouse/gsd-mouse-manager.c
-+++ b/plugins/mouse/gsd-mouse-manager.c
-@@ -320,7 +320,7 @@ devicepresence_filter (GdkXEvent *xevent,
-         if (xev->type == xi_presence)
-         {
-             XDevicePresenceNotifyEvent *dpn = (XDevicePresenceNotifyEvent *) xev;
-            if (dpn->devchange == DeviceEnabled)
-+            if (dpn->devchange == DeviceEnabled || dpn->devchange == DeviceAdded)
-                 set_mouse_settings ((GsdMouseManager *) data);
-         }
-         return GDK_FILTER_CONTINUE;
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: gnome-settings-daemon-2.25.90/configure.ac
-===================================================================
--- gnome-settings-daemon-2.25.90.orig/configure.ac
-+++ gnome-settings-daemon-2.25.90/configure.ac
-@@ -85,6 +85,8 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
- 
- AM_GCONF_SOURCE_2
- 
-+AC_CHECK_LIB(gthread-2.0, g_thread_init)
-+
- dnl ---------------------------------------------------------------------------
- dnl - Check for libnotify
- dnl ---------------------------------------------------------------------------
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
@ -1,76 +0,0 @@
-Upstream-Status: Pending
-
-diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c
-index f84cfad..e8f474a 100644
--- a/plugins/housekeeping/gsd-housekeeping-manager.c
-+++ b/plugins/housekeeping/gsd-housekeeping-manager.c
-@@ -85,9 +85,13 @@ thumb_data_free (gpointer data)
-         }
- }
- 
-+typedef enum {
-+  HASH,
-+  HASH_PNG
-+} FileType;
- 
- static GList *
-read_dir_for_purge (const char *path, GList *files)
-+read_dir_for_purge (const char *path, GList *files, FileType type)
- {
-         GFile           *read_path;
-         GFileEnumerator *enum_dir;
-@@ -105,9 +109,20 @@ read_dir_for_purge (const char *path, GList *files)
-                 GFileInfo *info;
-                 while ((info = g_file_enumerator_next_file (enum_dir, NULL, NULL)) != NULL) {
-                         const char *name;
-+                        gboolean prune = FALSE;
-+
-                         name = g_file_info_get_name (info);
- 
-                        if (strlen (name) == 36 && strcmp (name + 32, ".png") == 0) {
-+                        switch (type) {
-+                        case HASH:
-+                          prune = (strlen (name) == 36);
-+                          break;
-+                        case HASH_PNG:
-+                          prune = (strlen (name) == 36 && strcmp (name + 32, ".png") == 0);
-+                          break;
-+                        }
-+
-+                        if (prune) {
-                                 ThumbData *td;
-                                 GFile     *entry;
-                                 char      *entry_path;
-@@ -197,14 +212,14 @@ purge_thumbnail_cache (void)
-                                  ".thumbnails",
-                                  "normal",
-                                  NULL);
-        files = read_dir_for_purge (path, NULL);
-+        files = read_dir_for_purge (path, NULL, HASH_PNG);
-         g_free (path);
- 
-         path = g_build_filename (g_get_home_dir (),
-                                  ".thumbnails",
-                                  "large",
-                                  NULL);
-        files = read_dir_for_purge (path, files);
-+        files = read_dir_for_purge (path, files, HASH_PNG);
-         g_free (path);
- 
-         path = g_build_filename (g_get_home_dir (),
-@@ -212,7 +227,14 @@ purge_thumbnail_cache (void)
-                                  "fail",
-                                  "gnome-thumbnail-factory",
-                                  NULL);
-        files = read_dir_for_purge (path, files);
-+        files = read_dir_for_purge (path, files, HASH_PNG);
-+        g_free (path);
-+
-+        path = g_build_filename (g_get_user_cache_dir (),
-+                                 "mojito",
-+                                 "thumbnails",
-+                                 NULL);
-+        files = read_dir_for_purge (path, files, HASH);
-         g_free (path);
- 
-         g_get_current_time (&current_time);
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
@ -1,620 +0,0 @@
-Upstream-Status: Pending
-
-diff --git a/configure.ac b/configure.ac
-index 135f2ce..ba737a5 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -356,6 +356,7 @@ plugins/keybindings/Makefile
- plugins/keyboard/Makefile
- plugins/media-keys/Makefile
- plugins/media-keys/cut-n-paste/Makefile
-+plugins/mount/Makefile
- plugins/mouse/Makefile
- plugins/screensaver/Makefile
- plugins/sound/Makefile
-diff --git a/data/gnome-settings-daemon.schemas.in b/data/gnome-settings-daemon.schemas.in
-index 4920ae3..502e9e6 100644
--- a/data/gnome-settings-daemon.schemas.in
-+++ b/data/gnome-settings-daemon.schemas.in
-@@ -557,5 +557,29 @@
-       </locale>
-     </schema>
- 
-+    <schema>
-+      <key>/schemas/apps/gnome_settings_daemon/plugins/mount/active</key>
-+      <applyto>/apps/gnome_settings_daemon/plugins/mount/active</applyto>
-+      <owner>gnome-settings-daemon</owner>
-+      <type>bool</type>
-+      <default>TRUE</default>
-+      <locale name="C">
-+        <short>Enable mount plugin</short>
-+        <long>Set to True to enable the plugin to automount media.</long>
-+      </locale>
-+    </schema>
-+    <schema>
-+      <key>/schemas/apps/gnome_settings_daemon/plugins/mount/priority</key>
-+      <applyto>/apps/gnome_settings_daemon/plugins/mount/priority</applyto>
-+      <owner>gnome-settings-daemon</owner>
-+      <type>int</type>
-+      <default>99</default>
-+      <locale name="C">
-+        <short></short>
-+        <long></long>
-+      </locale>
-+    </schema>
-+
-+
-   </schemalist>
- </gconfschemafile>
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 2d33061..46615c1 100644
--- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -11,6 +11,7 @@ SUBDIRS =		\
- 	keybindings	\
- 	keyboard	\
- 	media-keys	\
-+	mount		\
- 	mouse		\
- 	screensaver	\
- 	sound		\
-diff --git a/plugins/mount/Makefile.am b/plugins/mount/Makefile.am
-new file mode 100644
-index 0000000..188c83d
--- /dev/null
-+++ b/plugins/mount/Makefile.am
-@@ -0,0 +1,39 @@
-+plugin_LTLIBRARIES = \
-+	libmount.la
-+
-+libmount_la_SOURCES = 		\
-+	gsd-mount-manager.c	\
-+	gsd-mount-manager.h	\
-+	gsd-mount-plugin.c	\
-+	gsd-mount-plugin.h
-+
-+libmount_la_CPPFLAGS = \
-+	-I$(top_srcdir)/gnome-settings-daemon		\
-+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-+	$(AM_CPPFLAGS)
-+
-+libmount_la_CFLAGS = \
-+	$(SETTINGS_PLUGIN_CFLAGS)	\
-+	$(AM_CFLAGS)
-+
-+libmount_la_LDFLAGS = 		\
-+	$(GSD_PLUGIN_LDFLAGS)
-+
-+libmount_la_LIBADD  = 		\
-+	$(SETTINGS_PLUGIN_LIBS)
-+
-+plugin_in_files = 		\
-+	mount.gnome-settings-plugin.in
-+
-+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
-+
-+EXTRA_DIST = 			\
-+	$(plugin_in_files)
-+
-+CLEANFILES = 			\
-+	$(plugin_DATA)
-+
-+DISTCLEANFILES =		\
-+	$(plugin_DATA)
-+
-+@GSD_INTLTOOL_PLUGIN_RULE@
-diff --git a/plugins/mount/gsd-mount-manager.c b/plugins/mount/gsd-mount-manager.c
-new file mode 100644
-index 0000000..a768f03
--- /dev/null
-+++ b/plugins/mount/gsd-mount-manager.c
-@@ -0,0 +1,261 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2009 Intel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify it under
-+ * the terms of the GNU General Public License as published by the Free Software
-+ * Foundation; either version 2 of the License, or (at your option) any later
-+ * version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-+ * details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-+ * Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+#include <config.h>
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <gio/gio.h>
-+#include <gtk/gtk.h>
-+
-+#include "gsd-mount-manager.h"
-+
-+#define GSD_MOUNT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MOUNT_MANAGER, GsdMountManagerPrivate))
-+
-+struct GsdMountManagerPrivate
-+{
-+        GVolumeMonitor *monitor;
-+};
-+
-+G_DEFINE_TYPE (GsdMountManager, gsd_mount_manager, G_TYPE_OBJECT)
-+
-+static gpointer manager_object = NULL;
-+
-+#if 0
-+static void
-+drive_connected_cb (GVolumeMonitor *monitor,
-+                    GDrive *drive,
-+                    GsdMountManager *manager)
-+{
-+        /* TODO: listen for the eject button */
-+}
-+#endif
-+
-+static void
-+volume_mounted_cb (GObject *source_object, GAsyncResult *result, gpointer user_data)
-+{
-+        GError *error = NULL;
-+        char *name;
-+
-+        name = g_volume_get_name (G_VOLUME (source_object));
-+
-+	if (!g_volume_mount_finish (G_VOLUME (source_object), result, &error)) {
-+                g_debug ("Failed to mount '%s': %s", name, error->message);
-+
-+		if (error->code != G_IO_ERROR_FAILED_HANDLED) {
-+                        char *primary;
-+                        GtkWidget *dialog;
-+
-+			primary = g_strdup_printf (_("Unable to mount %s"), name);
-+
-+                        dialog = gtk_message_dialog_new (NULL, 0,
-+                                                         GTK_MESSAGE_ERROR,
-+                                                         GTK_BUTTONS_CLOSE,
-+                                                         primary);
-+
-+			g_free (primary);
-+                        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error->message);
-+
-+                        gtk_dialog_run (GTK_DIALOG (dialog));
-+                        gtk_widget_destroy (dialog);
-+		}
-+		g_error_free (error);
-+	} else {
-+                g_debug ("Mounted '%s'", name);
-+        }
-+
-+        g_free (name);
-+}
-+
-+static void
-+volume_added_cb (GVolumeMonitor *monitor,
-+                 GVolume *volume,
-+                 GsdMountManager *manager)
-+{
-+        char *name;
-+
-+        name = g_volume_get_name (volume);
-+        g_debug ("Volme '%s' added", name);
-+
-+        if (g_volume_can_mount (volume)) {
-+                GMountOperation *mount_op;
-+
-+                g_debug ("Mounting '%s'", name);
-+
-+                mount_op = gtk_mount_operation_new (NULL);
-+                g_volume_mount (volume, G_MOUNT_MOUNT_NONE,
-+                                mount_op, NULL,
-+                                volume_mounted_cb, manager);
-+        }
-+
-+        g_free (name);
-+}
-+
-+static void
-+mount_added_cb (GVolumeMonitor *monitor,
-+                GMount *mount,
-+                GsdMountManager *manager)
-+{
-+        GFile *file;
-+        char *uri;
-+
-+        file = g_mount_get_root (mount);
-+        uri = g_file_get_uri (file);
-+
-+        g_debug ("%s mounted, starting file manager", uri);
-+
-+        /* TODO: error */
-+        gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
-+
-+        g_free (uri);
-+        g_object_unref (file);
-+}
-+
-+static void
-+mount_existing_volumes (GsdMountManager *manager)
-+{
-+        /* TODO: iterate over drives to hook up eject */
-+        GList *l;
-+
-+        g_debug ("Mounting existing volumes");
-+
-+        l = g_volume_monitor_get_volumes (manager->priv->monitor);
-+        while (l) {
-+                GVolume *volume = l->data;
-+                GMount *mount;
-+
-+                mount = g_volume_get_mount (volume);
-+                if (mount == NULL &&
-+                    g_volume_can_mount (volume) &&
-+                    g_volume_should_automount (volume)) {
-+                        GMountOperation *mount_op;
-+                        char *name;
-+
-+                        name = g_volume_get_name (volume);
-+                        g_debug ("Mounting '%s'", name);
-+                        g_free (name);
-+
-+                        mount_op = gtk_mount_operation_new (NULL);
-+                        g_volume_mount (volume, G_MOUNT_MOUNT_NONE,
-+                                        mount_op, NULL,
-+                                        volume_mounted_cb, manager);
-+                }
-+
-+                if (mount)
-+                        g_object_unref (mount);
-+                g_object_unref (volume);
-+                l = g_list_delete_link (l, l);
-+        }
-+}
-+
-+gboolean
-+gsd_mount_manager_start (GsdMountManager *manager,
-+                               GError               **error)
-+{
-+        g_debug ("Starting mount manager");
-+
-+        manager->priv->monitor = g_volume_monitor_get ();
-+
-+#if 0
-+	g_signal_connect_object (manager->priv->monitor, "drive-connected",
-+				 G_CALLBACK (drive_connected_cb), manager, 0);
-+#endif
-+	g_signal_connect_object (manager->priv->monitor, "volume-added",
-+				 G_CALLBACK (volume_added_cb), manager, 0);
-+	g_signal_connect_object (manager->priv->monitor, "mount-added",
-+				 G_CALLBACK (mount_added_cb), manager, 0);
-+
-+        /* TODO: handle eject buttons */
-+
-+#if 0
-+        mount_existing_volumes (manager);
-+#endif
-+
-+        return TRUE;
-+}
-+
-+void
-+gsd_mount_manager_stop (GsdMountManager *manager)
-+{
-+        g_debug ("Stopping mount manager");
-+}
-+
-+static void
-+gsd_mount_manager_dispose (GObject *object)
-+{
-+        GsdMountManager *manager = GSD_MOUNT_MANAGER (object);
-+
-+        if (manager->priv->monitor) {
-+                g_signal_handlers_disconnect_by_func
-+                        (manager->priv->monitor, volume_added_cb, manager);
-+                g_signal_handlers_disconnect_by_func
-+                        (manager->priv->monitor, mount_added_cb, manager);
-+                g_object_unref (manager->priv->monitor);
-+                manager->priv->monitor = NULL;
-+        }
-+
-+        G_OBJECT_CLASS (gsd_mount_manager_parent_class)->dispose (object);
-+}
-+
-+static void
-+gsd_mount_manager_init (GsdMountManager *manager)
-+{
-+        manager->priv = GSD_MOUNT_MANAGER_GET_PRIVATE (manager);
-+}
-+
-+static void
-+gsd_mount_manager_finalize (GObject *object)
-+{
-+        GsdMountManager *mount_manager;
-+
-+        g_return_if_fail (object != NULL);
-+        g_return_if_fail (GSD_IS_MOUNT_MANAGER (object));
-+
-+        mount_manager = GSD_MOUNT_MANAGER (object);
-+
-+        g_return_if_fail (mount_manager->priv != NULL);
-+
-+        G_OBJECT_CLASS (gsd_mount_manager_parent_class)->finalize (object);
-+}
-+
-+static void
-+gsd_mount_manager_class_init (GsdMountManagerClass *klass)
-+{
-+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
-+
-+        object_class->dispose = gsd_mount_manager_dispose;
-+        object_class->finalize = gsd_mount_manager_finalize;
-+
-+        g_type_class_add_private (klass, sizeof (GsdMountManagerPrivate));
-+}
-+
-+GsdMountManager *
-+gsd_mount_manager_new (void)
-+{
-+        if (manager_object != NULL) {
-+                g_object_ref (manager_object);
-+        } else {
-+                manager_object = g_object_new (GSD_TYPE_MOUNT_MANAGER, NULL);
-+                g_object_add_weak_pointer (manager_object,
-+                                           (gpointer *) &manager_object);
-+        }
-+
-+        return GSD_MOUNT_MANAGER (manager_object);
-+}
-diff --git a/plugins/mount/gsd-mount-manager.h b/plugins/mount/gsd-mount-manager.h
-new file mode 100644
-index 0000000..9093fff
--- /dev/null
-+++ b/plugins/mount/gsd-mount-manager.h
-@@ -0,0 +1,58 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2009 Intel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify it under
-+ * the terms of the GNU General Public License as published by the Free Software
-+ * Foundation; either version 2 of the License, or (at your option) any later
-+ * version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-+ * details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-+ * Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+#ifndef __GSD_MOUNT_MANAGER_H
-+#define __GSD_MOUNT_MANAGER_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define GSD_TYPE_MOUNT_MANAGER         (gsd_mount_manager_get_type ())
-+#define GSD_MOUNT_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MOUNT_MANAGER, GsdMountManager))
-+#define GSD_MOUNT_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MOUNT_MANAGER, GsdMountManagerClass))
-+#define GSD_IS_MOUNT_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MOUNT_MANAGER))
-+#define GSD_IS_MOUNT_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MOUNT_MANAGER))
-+#define GSD_MOUNT_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MOUNT_MANAGER, GsdMountManagerClass))
-+
-+typedef struct GsdMountManagerPrivate GsdMountManagerPrivate;
-+
-+typedef struct
-+{
-+        GObject parent;
-+        GsdMountManagerPrivate *priv;
-+} GsdMountManager;
-+
-+typedef struct
-+{
-+        GObjectClass parent_class;
-+} GsdMountManagerClass;
-+
-+GType                   gsd_mount_manager_get_type            (void);
-+
-+GsdMountManager *       gsd_mount_manager_new                 (void);
-+
-+gboolean                gsd_mount_manager_start               (GsdMountManager *manager,
-+                                                               GError         **error);
-+void                    gsd_mount_manager_stop                (GsdMountManager *manager);
-+
-+G_END_DECLS
-+
-+#endif /* __GSD_MOUNT_MANAGER_H */
-diff --git a/plugins/mount/gsd-mount-plugin.c b/plugins/mount/gsd-mount-plugin.c
-new file mode 100644
-index 0000000..af295a5
--- /dev/null
-+++ b/plugins/mount/gsd-mount-plugin.c
-@@ -0,0 +1,103 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2009 Intel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify it under
-+ * the terms of the GNU General Public License as published by the Free Software
-+ * Foundation; either version 2, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-+ * details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-+ * Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+#include <config.h>
-+
-+#include <glib/gi18n.h>
-+#include <gmodule.h>
-+#include <gnome-settings-daemon/gnome-settings-plugin.h>
-+
-+#include "gsd-mount-plugin.h"
-+#include "gsd-mount-manager.h"
-+
-+struct GsdMountPluginPrivate {
-+        GsdMountManager *manager;
-+};
-+
-+#define GSD_MOUNT_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MOUNT_PLUGIN, GsdMountPluginPrivate))
-+
-+GNOME_SETTINGS_PLUGIN_REGISTER (GsdMountPlugin, gsd_mount_plugin)
-+
-+static void
-+gsd_mount_plugin_init (GsdMountPlugin *plugin)
-+{
-+        plugin->priv = GSD_MOUNT_PLUGIN_GET_PRIVATE (plugin);
-+
-+        g_debug ("GsdMountPlugin initializing");
-+
-+        plugin->priv->manager = gsd_mount_manager_new ();
-+}
-+
-+static void
-+gsd_mount_plugin_finalize (GObject *object)
-+{
-+        GsdMountPlugin *plugin;
-+
-+        g_return_if_fail (object != NULL);
-+        g_return_if_fail (GSD_IS_MOUNT_PLUGIN (object));
-+
-+        g_debug ("GsdMountPlugin finalizing");
-+
-+        plugin = GSD_MOUNT_PLUGIN (object);
-+
-+        g_return_if_fail (plugin->priv != NULL);
-+
-+        if (plugin->priv->manager != NULL) {
-+                g_object_unref (plugin->priv->manager);
-+        }
-+
-+        G_OBJECT_CLASS (gsd_mount_plugin_parent_class)->finalize (object);
-+}
-+
-+static void
-+impl_activate (GnomeSettingsPlugin *plugin)
-+{
-+        gboolean res;
-+        GError  *error;
-+
-+        g_debug ("Activating mount plugin");
-+
-+        error = NULL;
-+        res = gsd_mount_manager_start (GSD_MOUNT_PLUGIN (plugin)->priv->manager, &error);
-+        if (! res) {
-+                g_warning ("Unable to start mount manager: %s", error->message);
-+                g_error_free (error);
-+        }
-+}
-+
-+static void
-+impl_deactivate (GnomeSettingsPlugin *plugin)
-+{
-+        g_debug ("Deactivating mount plugin");
-+        gsd_mount_manager_stop (GSD_MOUNT_PLUGIN (plugin)->priv->manager);
-+}
-+
-+static void
-+gsd_mount_plugin_class_init (GsdMountPluginClass *klass)
-+{
-+        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
-+        GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
-+
-+        object_class->finalize = gsd_mount_plugin_finalize;
-+
-+        plugin_class->activate = impl_activate;
-+        plugin_class->deactivate = impl_deactivate;
-+
-+        g_type_class_add_private (klass, sizeof (GsdMountPluginPrivate));
-+}
-diff --git a/plugins/mount/gsd-mount-plugin.h b/plugins/mount/gsd-mount-plugin.h
-new file mode 100644
-index 0000000..526a41f
--- /dev/null
-+++ b/plugins/mount/gsd-mount-plugin.h
-@@ -0,0 +1,55 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2009 Intel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify it under
-+ * the terms of the GNU General Public License as published by the Free Software
-+ * Foundation; either version 2, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-+ * details.
-+ *
-+ * You should have received a copy of the GNU General Public License along with
-+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-+ * Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+#ifndef __GSD_MOUNT_PLUGIN_H__
-+#define __GSD_MOUNT_PLUGIN_H__
-+
-+#include <glib-object.h>
-+#include <gmodule.h>
-+#include <gnome-settings-daemon/gnome-settings-plugin.h>
-+
-+G_BEGIN_DECLS
-+
-+#define GSD_TYPE_MOUNT_PLUGIN                (gsd_mount_plugin_get_type ())
-+#define GSD_MOUNT_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MOUNT_PLUGIN, GsdMountPlugin))
-+#define GSD_MOUNT_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MOUNT_PLUGIN, GsdMountPluginClass))
-+#define GSD_IS_MOUNT_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MOUNT_PLUGIN))
-+#define GSD_IS_MOUNT_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MOUNT_PLUGIN))
-+#define GSD_MOUNT_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MOUNT_PLUGIN, GsdMountPluginClass))
-+
-+typedef struct GsdMountPluginPrivate GsdMountPluginPrivate;
-+
-+typedef struct
-+{
-+        GnomeSettingsPlugin    parent;
-+        GsdMountPluginPrivate *priv;
-+} GsdMountPlugin;
-+
-+typedef struct
-+{
-+        GnomeSettingsPluginClass parent_class;
-+} GsdMountPluginClass;
-+
-+GType   gsd_mount_plugin_get_type            (void) G_GNUC_CONST;
-+
-+G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
-+
-+G_END_DECLS
-+
-+#endif /* __GSD_MOUNT_PLUGIN_H__ */
-diff --git a/plugins/mount/mount.gnome-settings-plugin.in b/plugins/mount/mount.gnome-settings-plugin.in
-new file mode 100644
-index 0000000..ca29ad1
--- /dev/null
-+++ b/plugins/mount/mount.gnome-settings-plugin.in
-@@ -0,0 +1,8 @@
-+[GNOME Settings Plugin]
-+Module=mount
-+IAge=0
-+_Name=Mount
-+_Description=Mount removable media
-+Authors=Ross Burton
-+Copyright=Copyright © 2009 Intel Corporation
-+Website=
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon_2.26.1.bb
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon_2.26.1.bb
@ -1,25 +0,0 @@
-DESCRIPTION = "GNOME settings daemon"
-LICENSE = "GPL"
-DEPENDS = "libxklavier gnome-doc-utils gtk+ libglade libgnomekbd gnome-desktop librsvg libxml2 libart-lgpl"
-
-PR = "r3"
-
-inherit gnome
-
-SRC_URI += "file://desktop-moblin.patch;patch=1 \
-            file://gnome-settings-daemon-fix-gthread.patch;patch=1 \
-            file://mount-plugin.patch;patch=1 \
-            file://gnome-settings-daemon-2.24.0-catch-deviceadded.patch;patch=1 \
-            file://configurefix.patch;patch=1 \
-            file://mojito-cleanup.patch;patch=1"
-
-EXTRA_OECONF = "--disable-esd --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
-ASNEEDED = ""
-
-FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \
-                ${datadir}/dbus-1/ \
-                ${datadir}/icon* \
-                ${datadir}/xsession*"
-
-FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug"
-FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.a ${libdir}/gnome-settings-daemon-2.0/*.la"
--- a/meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
@ -1,22 +0,0 @@
-From 30f29e7d8e1b67c40cd18a7155ba30c4382692d5 Mon Sep 17 00:00:00 2001
-From: Seán de Búrca <leftmostcat@gmail.com>
-Date: Fri, 07 Aug 2009 00:38:52 +0000
-Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master
-
-Upstream-Status: Inappropriate [configuration]
-
---
-diff --git a/help/el/el.po b/help/el/el.po
-index ab77264..635b68f 100644
--- a/help/el/el.po
-+++ b/help/el/el.po
-@@ -10,7 +10,6 @@ msgstr ""
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: 2\n"
- "X-Poedit-Language: Greek\n"
- "X-Poedit-Country: GREECE\n"
- "X-Generator: Lokalize 0.2\n"
--
-cgit v0.8.3.1
--- a/meta-demoapps/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
+++ b/meta-demoapps/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
@ -1,16 +0,0 @@
-DESCRIPTION = "GNOME Terminal"
-LICENSE = "GPL"
-DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte"
-PR = "r2"
-
-inherit gnome
-
-SRC_URI += "file://30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch;patch=1"
-
-EXTRA_OECONF += "--disable-scrollkeeper"
-
-# Remove an autogenerated file that needs to be rebuilt
-do_configure_prepend () {
-	rm -f ${S}/src/terminal-type-builtins.c
-}
-
--- a/meta-demoapps/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb
+++ b/meta-demoapps/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb
@ -1,14 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DESCRIPTION = "A powerful object-oriented display"
-PR = "r2"
-
-inherit gnome
-
-DEPENDS = "libglade libart-lgpl virtual/gail"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
-FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
-FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
--- a/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb
+++ b/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb
@ -1,14 +0,0 @@
-DESCRIPTION = "GNOME keyboard library"
-LICENSE = "LGPL"
-
-DEPENDS = "gconf dbus libxklavier gtk+"
-
-inherit gnome
-
-do_configure_append() {
-        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
-}
-
-
-
--- a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
+++ b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
@ -1,25 +0,0 @@
-DESCRIPTION = "GNOME Structured File Library"
-LICENSE = "GPL"
-SECTION = "libs"
-PR = "r3"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \
-                    file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63 \
-                    file://gsf/gsf.h;endline=25;md5=15cf6d31ad023167779ab5f0bbb76f49"
-
-DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
-RDEPENDS_${PN} = "gconf"
-
-
-PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
-
-FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*"
-FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome"
-
-inherit autotools pkgconfig gnome gconf
-
-EXTRA_OECONF = "\
-		--without-python \
-		--without-gnome \
-		--disable-gtk-doc \
-		--with-bz2"
--- a/meta-demoapps/recipes-gnome/libgtkstylus/files/gtkstylus.sh
+++ b/meta-demoapps/recipes-gnome/libgtkstylus/files/gtkstylus.sh
@ -1,5 +0,0 @@
-#!/bin/sh
-
-GTK_MODULES=libgtkstylus.so
-
-export GTK_MODULES
--- a/meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
+++ b/meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
@ -1,24 +0,0 @@
-DESCRIPTION = "GTK plugin for stylus based systems"
-SECTION = "libs"
-DEPENDS = "gtk+"
-LICENSE = "LGPL"
-PR = "r2"
-
-inherit autotools
-
-SRC_URI = "http://burtonini.com/temp/${BPN}-${PV}.tar.gz \
-	file://gtkstylus.sh"
-
-do_install_append() {
-	install -d ${D}/${sysconfdir}/X11/Xsession.d
-	install -m 755 ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus
-}
-
-# Horrible but rpm falls over if you use '*'
-GTKVER = "2.10.0"
-
-FILES_${PN} = "${sysconfdir} \
-               ${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so.*"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/${GTKVER}/modules/.debug"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so \
-                    ${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.*a"
--- a/meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
+++ b/meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
@ -1,15 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: wv-1.2.0/wv-1.0.pc.in
-===================================================================
--- wv-1.2.0.orig/wv-1.0.pc.in	2008-03-19 22:25:18.000000000 +0000
-+++ wv-1.2.0/wv-1.0.pc.in	2008-03-19 22:26:32.000000000 +0000
-@@ -6,5 +6,6 @@
- Name: wvWare
- Description: Word Document Filter library and utilities
- Version: @VERSION@
-Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
-Cflags: -I${includedir}/wv @GSF_CFLAGS@
-+Requires: libgsf-1
-+Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
-+Cflags: -I${includedir}/wv
--- a/meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb
+++ b/meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb
@ -1,14 +0,0 @@
-DESCRIPTION = "Programs for accessing Microsoft Word documents"
-HOMEPAGE = "http://wvware.sourceforge.net/"
-LICENSE = "GPLv2"
-DEPENDS = "libgsf glib-2.0"
-PR = "r3"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
-           file://pkgconfig.patch;patch=1"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-EXTRA_OECONF = ""
--- a/meta-demoapps/recipes-graphics/clutter/tidy.inc
+++ b/meta-demoapps/recipes-graphics/clutter/tidy.inc
@ -1,20 +0,0 @@
-DESCRIPTION = "Tidy library"
-HOMEPAGE = "http://www.clutter-project.org/"
-LICENSE = "LGPLv2.1+"
-
-STDDEPENDS = "clutter-1.4"
-BASE_CONF = "--disable-gtk-doc"
-
-DEPENDS = "${STDDEPENDS}"
-EXTRA_OECONF = "${BASE_CONF}"
-
-inherit autotools pkgconfig
-
-PACKAGES =+ "tidy-examples"
-FILES_tidy-examples = "${bindir}/test-*"
-
-do_configure_prepend() {
-        touch ${S}/gtk-doc.make
-        sed -i s:docs/reference/Makefile::g ${S}/configure.ac
-        sed -i s:docs::g ${S}/Makefile.am
-}
--- a/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch
+++ b/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch
@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: tidy/doc/reference/Makefile.am
-===================================================================
--- tidy.orig/doc/reference/Makefile.am  2007-11-06 19:36:56.000000000 +0000
-+++ tidy/doc/reference/Makefile.am       2007-11-06 19:37:02.000000000 +0000
-@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
-+EXTRA_DIST = version.xml.in
-
--- a/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
+++ b/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: trunk/tests/Makefile.am
-===================================================================
--- trunk.orig/tests/Makefile.am	2008-03-04 12:22:10.000000000 +0000
-+++ trunk/tests/Makefile.am	2008-03-04 12:23:46.000000000 +0000
-@@ -1,4 +1,4 @@
-noinst_PROGRAMS = \
-+bin_PROGRAMS = \
- 	test-button \
- 	test-finger-scroll \
- 	test-list-view \
-@@ -14,6 +14,9 @@
- 	test-grow \
- 	test-viewport
- 
-+test_texture_framedir = $(pkgdatadir)
-+test_texture_frame_DATA = frame.png
-+
- INCLUDES = -I$(top_srcdir)
- LDADD = $(top_builddir)/tidy/libtidy-1.0.la
- 
--- a/meta-demoapps/recipes-graphics/clutter/tidy_git.bb
+++ b/meta-demoapps/recipes-graphics/clutter/tidy_git.bb
@ -1,14 +0,0 @@
-require tidy.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
-                    file://tidy/tidy.h;endline=21;md5=ac342e7aac55849bf0755d79967fa3e8"
-
-SRCREV = "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
-PV = "0.1.0+git${SRCPV}"
-PR = "r7"
-
-SRC_URI = "git://git.clutter-project.org/tidy.git;protocol=git \
-           file://tidy-enable-tests.patch;patch=1"
-
-S = "${WORKDIR}/git"
-
--- a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
+++ b/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libxklavier-3.7/libxklavier.pc.in
-===================================================================
--- libxklavier-3.7.orig/libxklavier.pc.in	2009-06-10 15:58:46.000000000 +0100
-+++ libxklavier-3.7/libxklavier.pc.in	2009-06-10 16:00:45.000000000 +0100
-@@ -5,7 +5,7 @@
- 
- Name: libxklavier
- Description: libxklavier library
-Requires: libxml-2.0
-+Requires: libxml-2.0 glib-2.0
- Version: @VERSION@
-Libs: -L${libdir} -lxklavier @GLIB_LIBS@ @XML_LIBS@
-Cflags: -I${includedir} @GLIB_CFLAGS@
-+Libs: -L${libdir} -lxklavier
-+Cflags: -I${includedir}
--- a/meta-demoapps/recipes-graphics/libxklavier/libxklavier_3.9.bb
+++ b/meta-demoapps/recipes-graphics/libxklavier/libxklavier_3.9.bb
@ -1,11 +0,0 @@
-DESCRIPTION = "Utility library to make using XKB easier"
-SECTION = "x11/libs"
-DEPENDS = "iso-codes libxml2 glib-2.0 libxkbfile"
-LICENSE = "LGPL"
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/gswitchit/libxklavier-${PV}.tar.bz2 \
-           file://pkgconfigfix.patch;patch=1"
-
-inherit autotools
-
--- a/meta-demoapps/recipes-graphics/xorg-app/xbacklight_1.1.bb
+++ b/meta-demoapps/recipes-graphics/xorg-app/xbacklight_1.1.bb
@ -1,4 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X Backlight Utility"
-DEPENDS += "libxrender libxrandr"
--- a/meta-demoapps/recipes-graphics/xorg-app/xrdb/60XDefaults.sh
+++ b/meta-demoapps/recipes-graphics/xorg-app/xrdb/60XDefaults.sh
@ -1,3 +0,0 @@
-if [ -e $HOME/.Xdefaults ]; then
-    xrdb -merge -nocpp < $HOME/.Xdefaults
-fi
--- a/meta-demoapps/recipes-graphics/xorg-app/xrdb_1.0.5.bb
+++ b/meta-demoapps/recipes-graphics/xorg-app/xrdb_1.0.5.bb
@ -1,14 +0,0 @@
-require xorg-app-common.inc
-
-DESCRIPTION = "X server resource database utility"
-LICENSE = "xrdb"
-DEPENDS += "libxmu"
-PE = "1"
-PR = "r2"
-
-SRC_URI += "file://60XDefaults.sh"
-
-do_install_append() {
-    install -d ${D}${sysconfdir}/X11/Xsession.d/
-    install -m 0755 ${WORKDIR}/60XDefaults.sh ${D}${sysconfdir}/X11/Xsession.d/
-}
--- a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
+++ b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
@ -1,65 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-During the build process the mkg3states binary needs to be run. This patch
-allows it to be built with the build systems gcc allowing this to work.
-
-RP 31/3/10
-
-Index: liblbxutil-1.1.0/configure.ac
-===================================================================
--- liblbxutil-1.1.0.orig/configure.ac	2009-12-04 22:52:04.000000000 +0000
-+++ liblbxutil-1.1.0/configure.ac	2010-03-31 15:26:33.000000000 +0100
-@@ -50,4 +50,5 @@
- 
- AC_OUTPUT([Makefile
- 	   src/Makefile
-+	   src/image/Makefile
- 	   lbxutil.pc])
-Index: liblbxutil-1.1.0/src/Makefile.am
-===================================================================
--- liblbxutil-1.1.0.orig/src/Makefile.am	2009-12-04 23:03:17.000000000 +0000
-+++ liblbxutil-1.1.0/src/Makefile.am	2010-03-31 15:27:25.000000000 +0100
-@@ -3,10 +3,7 @@
- AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
- INCLUDES = -I$(top_srcdir)/include
- 
-noinst_PROGRAMS = mkg3states
-
-mkg3states_SOURCES =				\
-	$(srcdir)/image/mkg3states.c
-+SUBDIRS = image
- 
- liblbxutil_la_SOURCES =				\
- 	$(srcdir)/lbx_zlib/reqstats.h		\
-@@ -38,9 +35,8 @@
- 
- $(srcdir)/image/dfaxg42d.c: g3states.h
- 
-g3states.h: mkg3states
-	-rm -f g3states.h
-	$(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
-+g3states.h: image/mkg3states
-+	./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
- 
- liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- 
-Index: liblbxutil-1.1.0/src/image/Makefile.am
-===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ liblbxutil-1.1.0/src/image/Makefile.am	2010-03-31 15:26:33.000000000 +0100
-@@ -0,0 +1,15 @@
-+# evil hack
-+CFLAGS=$(CFLAGS_FOR_BUILD)
-+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
-+LDFLAGS=$(LDFLAGS_FOR_BUILD)
-+
-+CC=$(CC_FOR_BUILD)
-+LIBTOOL = @LIBTOOL@ --tag=CC
-+
-+noinst_PROGRAMS = mkg3states
-+
-+mkg3states_SOURCES =				\
-+	mkg3states.c
-+
-+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
-+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
--- a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
+++ b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
@ -1,11 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "XFIXES Extension"
-DEPENDS += " libxext xextproto xproto zlib"
-PROVIDES = "lbxutil"
-PE = "1"
-PR = "r1"
-
-SRC_URI += "file://mkg3states.patch;patch=1"
-
-export CC_FOR_BUILD = "gcc"
--- a/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
+++ b/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
@ -1,21 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X Athena Widget Set"
-DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PROVIDES = "xaw"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libXaw"
-
-do_install_append () {
-	ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
-	ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
-	ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so
-}
-
-PACKAGES =+ "libxaw6 libxaw7 libxaw8"
-
-FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
-FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
-FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
--- a/meta-demoapps/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
+++ b/meta-demoapps/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 EvIE extension library"
-DEPENDS += "libxext evieext"
-PR = "r1"
-PE = "1"
-
-XORG_PN = "libXevie"
--- a/meta-demoapps/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
+++ b/meta-demoapps/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
@ -1,8 +0,0 @@
-require xorg-lib-common.inc
-
-DESCRIPTION = "X11 keyboard UI presentation library"
-LICENSE= "GPL"
-DEPENDS += "virtual/libx11 libxt libxkbfile"
-PROVIDES = "xkbui"
-PR = "r1"
-PE = "1"
--- a/meta-demoapps/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb
+++ b/meta-demoapps/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb
@ -1,5 +0,0 @@
-require xorg-proto-common.inc
-
-PROVIDES="xproxymngproto"
-PR = "r1"
-PE = "1"
--- a/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch
+++ b/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch
@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---
- src/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xournal-0.2/src/Makefile.am
-===================================================================
--- xournal-0.2.orig/src/Makefile.am	2007-05-09 15:06:26.000000000 +0100
-+++ xournal-0.2/src/Makefile.am	2007-05-09 15:06:35.000000000 +0100
-@@ -21,5 +21,5 @@ xournal_SOURCES = \
- 	xo-interface.c xo-interface.h \
- 	xo-callbacks.c xo-callbacks.h 
- 
-xournal_LDADD = @PACKAGE_LIBS@
-+xournal_LDADD = @PACKAGE_LIBS@ -lz
- 
--- a/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
+++ b/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
@ -1,180 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in
--- xournal-0.2/configure.in	2006-01-29 22:25:10.000000000 +0000
-+++ xournal-0.2.noprint/configure.in	2006-03-17 13:08:01.000000000 +0000
-@@ -10,11 +10,16 @@
- AM_PROG_CC_STDC
- AC_HEADER_STDC
- 
-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
-+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0"
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(PACKAGE_LIBS)
- 
-+#PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprintui-2.2 >= 2.0.0
-+#AC_SUBST(GNOMEPRINT_CFLAGS)
-+#AC_SUBST(GNOMEPRINT_LIBS)
-+AM_CONDITIONAL(ENABLE_PRINTING, false)
-+
- AC_OUTPUT([
- Makefile
- src/Makefile
-diff -ru xournal-0.2/src/main.c xournal-0.2.noprint/src/main.c
--- xournal-0.2/src/main.c	2006-01-29 22:22:52.000000000 +0000
-+++ xournal-0.2.noprint/src/main.c	2006-03-17 13:14:50.000000000 +0000
-@@ -28,7 +28,9 @@
- 
- void hide_unimplemented(void)
- {
-+#if ENABLE_PRINTING
-   gtk_widget_hide(GET_COMPONENT("filePrintOptions"));
-+#endif
-   gtk_widget_hide(GET_COMPONENT("journalFlatten"));
-   gtk_widget_hide(GET_COMPONENT("papercolorOther"));
-   gtk_widget_hide(GET_COMPONENT("journalApplyAllPages"));
-diff -ru xournal-0.2/src/Makefile.am xournal-0.2.noprint/src/Makefile.am
--- xournal-0.2/src/Makefile.am	2005-12-14 20:54:42.000000000 +0000
-+++ xournal-0.2.noprint/src/Makefile.am	2006-03-17 13:07:47.000000000 +0000
-@@ -7,12 +7,16 @@
- 
- bin_PROGRAMS = xournal
- 
-+if ENABLE_PRINTING
-+PRINT_SOURCE = 	xo-print.c xo-print.h
-+endif
-+
- xournal_SOURCES = \
- 	main.c xournal.h \
- 	xo-misc.c xo-misc.h \
- 	xo-file.c xo-file.h \
- 	xo-paint.c xo-paint.h \
-	xo-print.c xo-print.h \
-+	$(PRINT_SOURCE) \
- 	xo-support.c xo-support.h \
- 	xo-interface.c xo-interface.h \
- 	xo-callbacks.c xo-callbacks.h 
-diff -ru xournal-0.2/src/xo-callbacks.c xournal-0.2.noprint/src/xo-callbacks.c
--- xournal-0.2/src/xo-callbacks.c	2006-01-29 19:39:22.000000000 +0000
-+++ xournal-0.2.noprint/src/xo-callbacks.c	2006-03-17 13:12:01.000000000 +0000
-@@ -7,7 +7,9 @@
- #include <gtk/gtk.h>
- #include <libgnomecanvas/libgnomecanvas.h>
- #include <time.h>
-+#if ENABLE_PRINTING
- #include <libgnomeprintui/gnome-print-dialog.h>
-+#endif
- #include <glib/gstdio.h>
- 
- #include "xournal.h"
-@@ -17,7 +19,9 @@
- #include "xo-misc.h"
- #include "xo-file.h"
- #include "xo-paint.h"
-+#if ENABLE_PRINTING
- #include "xo-print.h"
-+#endif
- 
- void
- on_fileNew_activate                    (GtkMenuItem     *menuitem,
-@@ -261,7 +265,7 @@
- 
- }
- 
-
-+#if ENABLE_PRINTING
- void
- on_filePrint_activate                  (GtkMenuItem     *menuitem,
-                                         gpointer         user_data)
-@@ -407,7 +411,7 @@
- 
-   g_free(filename);
- }
-
-+#endif
- 
- void
- on_fileQuit_activate                   (GtkMenuItem     *menuitem,
-diff -ru xournal-0.2/src/xo-callbacks.h xournal-0.2.noprint/src/xo-callbacks.h
--- xournal-0.2/src/xo-callbacks.h	2006-01-26 20:47:00.000000000 +0000
-+++ xournal-0.2.noprint/src/xo-callbacks.h	2006-03-17 13:08:45.000000000 +0000
-@@ -24,6 +24,7 @@
- on_filePrintOptions_activate           (GtkMenuItem     *menuitem,
-                                         gpointer         user_data);
- 
-+#if ENABLE_PRINTING
- void
- on_filePrint_activate                  (GtkMenuItem     *menuitem,
-                                         gpointer         user_data);
-@@ -32,6 +33,8 @@
- on_filePrintPDF_activate               (GtkMenuItem     *menuitem,
-                                         gpointer         user_data);
- 
-+#endif
-+
- void
- on_fileQuit_activate                   (GtkMenuItem     *menuitem,
-                                         gpointer         user_data);
-diff -ru xournal-0.2/src/xo-interface.c xournal-0.2.noprint/src/xo-interface.c
--- xournal-0.2/src/xo-interface.c	2006-01-29 18:58:25.000000000 +0000
-+++ xournal-0.2.noprint/src/xo-interface.c	2006-03-17 13:11:31.000000000 +0000
-@@ -41,10 +41,12 @@
-   GtkWidget *fileSave;
-   GtkWidget *fileSaveAs;
-   GtkWidget *separator1;
-+#if ENABLE_PRINTING
-   GtkWidget *filePrintOptions;
-   GtkWidget *image501;
-   GtkWidget *filePrint;
-   GtkWidget *filePrintPDF;
-+#endif
-   GtkWidget *separator2;
-   GtkWidget *fileQuit;
-   GtkWidget *menuEdit;
-@@ -327,6 +329,7 @@
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1);
-   gtk_widget_set_sensitive (separator1, FALSE);
- 
-+#if ENABLE_PRINTING
-   filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options");
-   gtk_widget_show (filePrintOptions);
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions);
-@@ -347,6 +350,7 @@
-   gtk_widget_show (separator2);
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), separator2);
-   gtk_widget_set_sensitive (separator2, FALSE);
-+#endif
- 
-   fileQuit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
-   gtk_widget_show (fileQuit);
-@@ -1522,6 +1526,7 @@
-   g_signal_connect ((gpointer) fileSaveAs, "activate",
-                     G_CALLBACK (on_fileSaveAs_activate),
-                     NULL);
-+#if ENABLE_PRINTING
-   g_signal_connect ((gpointer) filePrintOptions, "activate",
-                     G_CALLBACK (on_filePrintOptions_activate),
-                     NULL);
-@@ -1531,6 +1536,7 @@
-   g_signal_connect ((gpointer) filePrintPDF, "activate",
-                     G_CALLBACK (on_filePrintPDF_activate),
-                     NULL);
-+#endif
-   g_signal_connect ((gpointer) fileQuit, "activate",
-                     G_CALLBACK (on_fileQuit_activate),
-                     NULL);
-@@ -1941,11 +1947,13 @@
-   GLADE_HOOKUP_OBJECT (winMain, fileSave, "fileSave");
-   GLADE_HOOKUP_OBJECT (winMain, fileSaveAs, "fileSaveAs");
-   GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1");
-+#if ENABLE_PRINTING
-   GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions");
-   GLADE_HOOKUP_OBJECT (winMain, image501, "image501");
-   GLADE_HOOKUP_OBJECT (winMain, filePrint, "filePrint");
-   GLADE_HOOKUP_OBJECT (winMain, filePrintPDF, "filePrintPDF");
-   GLADE_HOOKUP_OBJECT (winMain, separator2, "separator2");
-+#endif
-   GLADE_HOOKUP_OBJECT (winMain, fileQuit, "fileQuit");
-   GLADE_HOOKUP_OBJECT (winMain, menuEdit, "menuEdit");
-   GLADE_HOOKUP_OBJECT (winMain, menuEdit_menu, "menuEdit_menu");
--- a/meta-demoapps/recipes-graphics/xournal/xournal_0.2.bb
+++ b/meta-demoapps/recipes-graphics/xournal/xournal_0.2.bb
@ -1,12 +0,0 @@
-HOMEPAGE = "http://www-math.mit.edu/~auroux/software/xournal/"
-DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus."
-DEPENDS = "gtk+ libgnomecanvas zlib"
-SECTION = "x11"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "http://math.mit.edu/~auroux/software/xournal/xournal-0.2.tar.gz \
-           file://ldflags.patch;patch=1 \
-           file://no-printing.diff;patch=1"
-
-inherit autotools pkgconfig
--- a/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc
+++ b/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc
@ -1,58 +0,0 @@
-SECTION = "x11/network"
-DESCRIPTION = "Mail user agent"
-#DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell openssl"
-DEPENDS = "gtk+ libetpan openssl libowl"
-LICENSE = "GPL"
-PR = "r7"
-
-SRC_URI = "\
-	${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2	\
-	file://desktop.patch;patch=1				\
-	file://streamline-ui.patch;patch=1				\
-	file://owl-window-menu.patch;patch=1				\
-  file://fix-build.patch;patch=1    \
-	"
-
-FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
-
-#EXTRA_OECONF = "--disable-aspell-test \
-# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} \
-# --enable-aspell"
-
-EXTRA_OECONF = "--disable-aspell-test 		\
-		--disable-aspell 		\
-		--disable-manual		\
-		--disable-crash-dialog		\
-		--disable-jpilot		\
-		--disable-trayicon-plugin	\
-		--disable-spamassassin-plugin	\
-		--disable-bogofilter-plugin	\
-		--disable-pgpcore-plugin	\
-		--disable-pgpmime-plugin	\
-		--disable-pgpinline-plugin	\
-  		--disable-dillo-viewer-plugin	\
-		--disable-clamav-plugin		\
-		--disable-gnomeprint		\
-		--disable-valgrind		\
-    --disable-static    \
-		"
-
-#  		--disable-openssl 		\
-#		--disable-libetpan		\
-
-CFLAGS += "-D_GNU_SOURCE"
-
-inherit autotools pkgconfig gettext
-
-do_install_append() {
-	install -d ${D}${datadir}/applications
-	install -m 0644 claws-mail.desktop ${D}${datadir}/applications/
-	install -d ${D}${datadir}/pixmaps
-	install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
-}
-
-#python populate_packages_prepend () {
-#	abiword_libdir = bb.data.expand('${libdir}/claws-mail/plugins', d)
-#
-#	do_split_packages(d, abiword_libdir, '^(.*)\.so$', 'claws-mail-plugin-%s', 'Claws plugin for %s', extra_depends='')
-#}
--- a/meta-demoapps/recipes-sato/claws-mail/claws-mail_2.9.1.bb
+++ b/meta-demoapps/recipes-sato/claws-mail/claws-mail_2.9.1.bb
@ -1 +0,0 @@
-require claws-mail.inc
--- a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb
+++ b/meta-demoapps/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb
@ -1,14 +0,0 @@
-SECTION = "x11/network"
-DESCRIPTION = "Mail user agent plugins"
-DEPENDS = "claws-mail gtkhtml2 curl"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz"
-
-inherit autotools pkgconfig gettext
-
-S = "${WORKDIR}/gtkhtml2_viewer-${PV}"
-
-FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
-
--- a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb
+++ b/meta-demoapps/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb
@ -1,14 +0,0 @@
-SECTION = "x11/network"
-DESCRIPTION = "Mail user agent plugins"
-DEPENDS = "claws-mail db"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://www.claws-mail.org/downloads/plugins/maildir-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/maildir-${PV}"
-
-FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
-
--- a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb
+++ b/meta-demoapps/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb
@ -1,14 +0,0 @@
-SECTION = "x11/network"
-DESCRIPTION = "Mail user agent plugins"
-DEPENDS = "claws-mail"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/mailmbox-${PV}"
-
-FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
-FILES_${PN}-dbg = "${libdir}/claws-mail/plugins/.debug"
--- a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb
+++ b/meta-demoapps/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb
@ -1,14 +0,0 @@
-SECTION = "x11/network"
-DESCRIPTION = "Mail user agent plugins"
-DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz"
-
-inherit autotools pkgconfig gettext
-
-S = "${WORKDIR}/rssyl-${PV}"
-
-FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
-
--- a/meta-demoapps/recipes-sato/claws-mail/files/desktop.patch
+++ b/meta-demoapps/recipes-sato/claws-mail/files/desktop.patch
@ -1,21 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: claws-mail-2.9.1/claws-mail.desktop
-===================================================================
--- claws-mail-2.9.1.orig/claws-mail.desktop	2007-04-24 17:40:20.000000000 +0100
-+++ claws-mail-2.9.1/claws-mail.desktop	2007-04-25 07:08:36.000000000 +0100
-@@ -1,11 +1,11 @@
- [Desktop Entry]
- Encoding=UTF-8
-Name=Claws Mail
-+Name=Mail
- Exec=claws-mail
- Icon=claws-mail
-Info="Claws Mail"
-+Info=Email Application
- Categories=GTK;Network;Email;
-Comment="Gtk+ based Mail Client"
-+Comment=Email Application
- Terminal=false
- Type=Application
- StartupNotify=true
--- a/meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch
+++ b/meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch
@ -1,26 +0,0 @@
-Upstream-Status: Pending
-
-Remove duplicate file entries as this breaks install with new Automake
-
-JL 19/03/10
-
-Index: claws-mail-2.9.1/src/gtk/Makefile.am
-===================================================================
--- claws-mail-2.9.1.orig/src/gtk/Makefile.am	2007-03-22 07:52:47.000000000 +0000
-+++ claws-mail-2.9.1/src/gtk/Makefile.am	2010-03-19 14:54:06.565828281 +0000
-@@ -44,7 +44,6 @@
- 	filesel.h \
- 	foldersort.h \
- 	gtkaspell.h \
-	gtksctree.h \
- 	gtkshruler.h \
- 	gtksctree.h \
- 	gtksourceprintjob.h \
-@@ -57,7 +56,6 @@
- 	menu.h \
- 	pluginwindow.h \
- 	prefswindow.h \
-	gtkvscrollbutton.h \
- 	progressdialog.h \
- 	quicksearch.h \
- 	sslcertwindow.h \
--- a/meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch
+++ b/meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch
--- a/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch
+++ b/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch
--- a/meta-demoapps/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb
+++ b/meta-demoapps/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb
@ -1,33 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "clipboard manager"
-DEPENDS = "virtual/libx11"
-
-SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/tags/clipboard-manager/;module=${PV};proto=https \
-	   file://makefile.patch;patch=1  \
-	   file://script.patch;patch=1    \
-	   file://daemonize.patch;patch=1 \
-          "
-
-S = "${WORKDIR}/${PV}"
-
-inherit autotools pkgconfig
-
-do_install_append () {
-	mv ${D}/${sysconfdir}/X11/Xsession.d/clipboard.sh ${D}/${sysconfdir}/X11/Xsession.d/70clipboard
-	chmod u+x ${D}/${sysconfdir}/X11/Xsession.d/70clipboard
-}
-
-pkg_postinst_clipboard-manager () {
-#!/bin/sh -e
-if [ x"$D" = "x" ]; then
-  {
-    if [ x$(pidof clipboard-manager) != x ]; then
-      kill -TERM $(pidof clipboard-manager)
-    fi
-
-    ${sysconfdir}/X11/Xsession.d/70clipboard
-  } > /dev/null
-else
-  exit 1
-fi
-}
--- a/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch
+++ b/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch
@ -1,46 +0,0 @@
-Upstream-Status: Inappropriate [enable feature]
-
-Index: 0.6.4/manager.c
-===================================================================
--- 0.6.4.orig/manager.c	2007-06-28 12:23:37.000000000 +0100
-+++ 0.6.4/manager.c	2007-06-28 12:36:14.000000000 +0100
-@@ -68,7 +68,8 @@
-   ClipboardManager *manager;
-   int terminated = False;
-   Display *display;
-
-+  pid_t pid;
-+  
-   display = XOpenDisplay (NULL);
- 
-   if (!display)
-@@ -83,6 +84,29 @@
-       exit (1);
-     }
- 
-+  /* deamonize */
-+  pid = fork();
-+  switch (pid) 
-+    {
-+    case -1: fprintf (stderr, "Fork failed.\n");
-+      /* Fall through */
-+    default: exit(0); break;
-+    case 0: break;
-+    }
-+
-+  chdir ("/");
-+  setsid ();
-+  umask (0);
-+
-+  pid = fork();
-+  switch (pid) 
-+    {
-+    case -1: fprintf (stderr, "Fork failed.\n");
-+      /* Fall through */
-+    default: exit(0); break;
-+    case 0: break;
-+    }
-+  
-   XSetErrorHandler (x_error);
-   manager = clipboard_manager_new (display,
- 				   error_trap_push, error_trap_pop,
--- a/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch
+++ b/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch
@ -1,20 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: 0.6.4/Makefile.am
-===================================================================
--- 0.6.4.orig/Makefile.am	2007-06-28 12:23:37.000000000 +0100
-+++ 0.6.4/Makefile.am	2007-06-28 14:21:23.000000000 +0100
-@@ -1,5 +1,3 @@
-SUBDIRS = debian
-
- bin_PROGRAMS = clipboard-manager
- 
- INCLUDES = 			\
-@@ -21,6 +19,6 @@
- 	clipboard.txt \
- 	clipboard.sh
- 
-servicedir = $(sysconfdir)/osso-af-init
-+servicedir = $(sysconfdir)/X11/Xsession.d
- 
- service_DATA = clipboard.sh
--- a/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch
+++ b/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch
@ -1,41 +0,0 @@
-Upstream-Status: Inappropriate [disable feature]
-
-Index: 0.6.4/clipboard.sh
-===================================================================
--- 0.6.4.orig/clipboard.sh	2007-06-28 12:23:37.000000000 +0100
-+++ 0.6.4/clipboard.sh	2007-06-28 14:27:39.000000000 +0100
-@@ -1,33 +1,2 @@
- #!/bin/sh
-# Clipboard persistence manager startup script
-
-if [ "x$AF_PIDDIR" = "x" ]; then
-  echo "$0: Error, AF_PIDDIR is not defined"
-  exit 2
-fi
-if [ "x$LAUNCHWRAPPER_NICE_TRYRESTART" = "x" ]; then
-  echo "$0: Error, LAUNCHWRAPPER_NICE_TRYRESTART is not defined"
-  exit 2
-fi
-if [ ! -w $AF_PIDDIR ]; then
-  echo "$0: Error, directory $AF_PIDDIR is not writable"
-  exit 2
-fi
-PROG=/usr/bin/clipboard-manager
-SVC="clipboard-manager"
-
-case "$1" in
-start)  START=TRUE
-        ;;
-stop)   START=FALSE
-        ;;
-*)      echo "Usage: $0 {start|stop}"
-	exit 1
-        ;;
-esac
-
-if [ $START = TRUE ]; then
-  source $LAUNCHWRAPPER_NICE_TRYRESTART start "$SVC" $PROG
-else
-  source $LAUNCHWRAPPER_NICE_TRYRESTART stop "$SVC" $PROG
-fi
-+/usr/bin/clipboard-manager &
--- a/meta-demoapps/recipes-sato/epdfview/epdfview/epdfview-ui-print.xml
+++ b/meta-demoapps/recipes-sato/epdfview/epdfview/epdfview-ui-print.xml
@ -1,12 +0,0 @@
-<ui>
-  <menubar name="MenuBar">
-    <menu name="TopMenu" action="Top">
-      <menu action="FileMenu">
-        <placeholder name="PrintPlaceHolder">
-          <separator/>
-          <menuitem name="Print" action="Print"/>
-        </placeholder>
-      </menu>
-    </menu>
-  </menubar>
-</ui>
--- a/meta-demoapps/recipes-sato/epdfview/epdfview/epdfview-ui.xml
+++ b/meta-demoapps/recipes-sato/epdfview/epdfview/epdfview-ui.xml
@ -1,57 +0,0 @@
-<ui>
-  <menubar name="MenuBar">
-    <menu name="TopMenu" action="Top">
-      <menu action="FileMenu">
-        <menuitem name="OpenFile" action="OpenFile"/>
-        <menuitem name="ReloadFile" action="ReloadFile"/>
-        <menuitem name="SaveFile" action="SaveFile"/>
-        <placeholder name="PrintPlaceHolder"/>
-        <separator/>
-        <menuitem name="Quit" action="Quit"/>
-      </menu>
-      <menu action="EditMenu">
-        <menuitem name="Find" action="Find"/>
-        <separator />
-        <menuitem name="Preferences" action="Preferences"/>
-      </menu>
-      <menu action="ViewMenu">
-        <menuitem name="ShowToolBar" action="ShowToolBar"/>
-        <menuitem name="ShowStatusBar" action="ShowStatusBar"/>
-        <menuitem name="ShowIndex" action="ShowIndex"/>
-        <separator/>
-        <menuitem name="ZoomIn" action="ZoomIn"/>
-        <menuitem name="ZoomOut" action="ZoomOut"/>
-        <menuitem name="ZoomFit" action="ZoomFit"/>
-        <menuitem name="ZoomWidth" action="ZoomWidth"/>
-        <separator />
-        <menuitem name="FullScreen" action="FullScreen"/>
-        <separator />
-        <menuitem name="RotateRight" action="RotateRight"/>
-        <menuitem name="RotateLeft" action="RotateLeft"/>
-      </menu>
-      <menu action="GoMenu">
-        <menuitem name="GoToFirstPage" action="GoToFirstPage"/>
-        <menuitem name="GoToPreviousPage" action="GoToPreviousPage"/>
-        <menuitem name="GoToNextPage" action="GoToNextPage"/>
-        <menuitem name="GoToLastPage" action="GoToLastPage"/>
-      </menu>
-      <menu action="HelpMenu">
-        <menuitem name="About" action="About"/>
-      </menu>
-    </menu>
-  </menubar>
-    
-  <toolbar name="ToolBar">
-    <toolitem name="OpenFile" action="OpenFile"/>
-    <separator/>
-    <toolitem name="GoToPreviousPage" action="GoToPreviousPage"/>
-    <toolitem name="GoToNextPage" action="GoToNextPage"/>
-    <separator/>
-    <toolitem name="ZoomIn" action="ZoomIn"/>
-    <toolitem name="ZoomOut" action="ZoomOut"/>
-    <toolitem name="ZoomFit" action="ZoomFit"/>
-    <toolitem name="ZoomWidth" action="ZoomWidth"/>
-  </toolbar>
-
-  <accelerator name="SlashAccelerator" action="Slash"/>
-</ui>
--- a/meta-demoapps/recipes-sato/epdfview/epdfview/epdfview.desktop
+++ b/meta-demoapps/recipes-sato/epdfview/epdfview/epdfview.desktop
@ -1,10 +0,0 @@
-[Desktop Entry]
-Categories=Viewer;Office;GTK;
-Comment=Lightweight PDF document viewer
-Exec=epdfview %f
-GenericName=PDF Viewer
-Icon=accessories-text-editor
-Name=PDF Viewer
-MimeType=application/pdf;
-Terminal=false
-Type=Application
--- a/meta-demoapps/recipes-sato/epdfview/epdfview/owl-menus.patch
+++ b/meta-demoapps/recipes-sato/epdfview/epdfview/owl-menus.patch
@ -1,327 +0,0 @@
-Upstream-Status: Inappropriate [enable feature]
-
-Index: epdfview-0.1.7/src/Makefile.am
-===================================================================
--- epdfview-0.1.7.orig/src/Makefile.am	2010-07-13 12:30:44.014172385 +0100
-+++ epdfview-0.1.7/src/Makefile.am	2010-07-13 12:30:48.780063260 +0100
-@@ -58,7 +58,7 @@
- 	main.cxx
- 
- libshell_cxxflags = -I$(top_srcdir)/src/gtk $(GTK2_CFLAGS)
-libshell_ldadd = $(GTK2_LIBS) $(top_builddir)/src/gtk/libshell-gtk.a
-+libshell_ldadd = $(GTK2_LIBS) $(top_builddir)/src/gtk/libshell-gtk.a -lowl
- 
- epdfview_CXXFLAGS =	\
- 	-DLOCALEDIR='"$(datadir)/locale"'	\
-Index: epdfview-0.1.7/src/gtk/MainView.cxx
-===================================================================
--- epdfview-0.1.7.orig/src/gtk/MainView.cxx	2010-07-13 12:30:44.014172385 +0100
-+++ epdfview-0.1.7/src/gtk/MainView.cxx	2010-07-13 12:30:48.782124540 +0100
-@@ -20,6 +20,7 @@
- #include <string.h>
- #include <gettext.h>
- #include <gtk/gtk.h>
-+#include <libowl/owlwindowmenu.h>
- #include <epdfview.h>
- #include "StockIcons.h"
- #include "FindView.h"
-@@ -86,6 +87,7 @@
- // The actions for menus and toolbars.
- static const GtkActionEntry g_NormalEntries[] =
- {
-+    { "Top", NULL, "", NULL, NULL, NULL },
-     { "FileMenu", NULL, N_("_File"), NULL, NULL, NULL },
-     { "EditMenu", NULL, N_("_Edit"), NULL, NULL, NULL },
-     { "ViewMenu", NULL, N_("_View"), NULL, NULL, NULL },
-@@ -100,7 +102,7 @@
-       N_("Reload the current document"),
-       G_CALLBACK (main_window_reload_cb) },
- 
-    { "SaveFile", GTK_STOCK_SAVE, N_("_Save a Copy..."), "<control>S",
-+    { "SaveFile", GTK_STOCK_SAVE, N_("_Save a Copy..."), "<control>W",
-       N_("Save a copy of the current document"),
-       G_CALLBACK (main_window_save_file_cb) },
- 
-@@ -110,11 +112,11 @@
-       G_CALLBACK (main_window_print_cb) },
- #endif // HAVE_CUPS
- 
-    { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",
-+    { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>Q",
-       N_("Close this window"),
-       G_CALLBACK (main_window_quit_cb) },
- 
-    { "Find", GTK_STOCK_FIND, N_("_Find"), "<control>F",
-+    { "Find", GTK_STOCK_FIND, N_("_Find"), "<control>S",
-       N_("Find a word in the document"),
-       G_CALLBACK (main_window_find_cb) },
- 
-@@ -138,19 +140,19 @@
-       N_("Rotate the document 90 degrees counter-clockwise"),
-       G_CALLBACK (main_window_rotate_left_cb) },
- 
-    { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home",
-+    { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>1",
-       N_("Go to the first page"),
-       G_CALLBACK (main_window_go_to_first_page_cb) },
- 
-    { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Page_Down",
-+    { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Down",
-       N_("Go to the next page"),
-       G_CALLBACK (main_window_go_to_next_page_cb) },
- 
-    { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Page_Up",
-+    { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Up",
-       N_("Go to the previous page"),
-       G_CALLBACK (main_window_go_to_previous_page_cb) },
- 
-    { "GoToLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>End",
-+    { "GoToLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>0",
-       N_("Go to the last page"),
-       G_CALLBACK (main_window_go_to_last_page_cb) },
- 
-@@ -172,7 +174,7 @@
- 
- static GtkToggleActionEntry g_ToggleEntries[] =
- {
-    { "FullScreen", NULL, N_("F_ull screen"), "F11",
-+    { "FullScreen", NULL, N_("F_ull screen"), "<control>F",
-       N_("Toggle full screen window"),
-       G_CALLBACK (main_window_fullscreen_cb), FALSE },
- 
-@@ -184,7 +186,7 @@
-       N_("Show or hide the statusbar"),
-       G_CALLBACK (main_window_show_statusbar_cb), TRUE },
- 
-    { "ShowIndex", NULL, N_("Show I_ndex"), "F9",
-+    { "ShowIndex", NULL, N_("Show I_ndex"), "<control>I",
-       N_("Show or hide the document's outline"),
-       G_CALLBACK (main_window_show_index_cb), FALSE },
- 
-@@ -234,9 +236,8 @@
-     GtkAccelGroup *accelGroup = gtk_ui_manager_get_accel_group (m_UIManager);
-     gtk_window_add_accel_group (GTK_WINDOW (m_MainWindow), accelGroup);
-     // Add the menu bar and tool bar.
-    GtkWidget *menuBar = gtk_ui_manager_get_widget (m_UIManager, "/MenuBar");
-    gtk_box_pack_start (GTK_BOX (m_MainBox), menuBar, FALSE, FALSE, 0);
-    gtk_widget_show (menuBar);
-+    owl_set_window_menu_item (GTK_WINDOW (m_MainWindow), 
-+                              GTK_MENU_ITEM(gtk_ui_manager_get_widget(m_UIManager, "/MenuBar/TopMenu")));
-     GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar");
-     gtk_box_pack_start (GTK_BOX (m_MainBox), toolBar, FALSE, FALSE, 0);
-     // Add the current page tool item.
-@@ -285,7 +286,7 @@
- MainView::activeZoomFit (gboolean active)
- {
-     GtkAction *zoomFit =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomFit");
-     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomFit), active);
- }
- 
-@@ -293,7 +294,7 @@
- MainView::activeZoomWidth (gboolean active)
- {
-     GtkAction *zoomWidth =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomWidth");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomWidth");
-     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomWidth), active);
- }
- 
-@@ -484,7 +485,7 @@
- MainView::sensitiveFind (gboolean sensitive)
- {
-     GtkAction *find =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/EditMenu/Find");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/EditMenu/Find");
-     gtk_action_set_sensitive (find, sensitive);
- }
- 
-@@ -492,7 +493,7 @@
- MainView::sensitiveGoToFirstPage (gboolean sensitive)
- {
-     GtkAction *goToFirstPage = gtk_ui_manager_get_action (m_UIManager,
-            "/MenuBar/GoMenu/GoToFirstPage");
-+            "/MenuBar/TopMenu/GoMenu/GoToFirstPage");
-     gtk_action_set_sensitive (goToFirstPage, sensitive);
- }
- 
-@@ -500,7 +501,7 @@
- MainView::sensitiveGoToLastPage (gboolean sensitive)
- {
-     GtkAction *goToLastPage =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/GoMenu/GoToLastPage");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/GoMenu/GoToLastPage");
-     gtk_action_set_sensitive (goToLastPage, sensitive);
- }
- 
-@@ -508,7 +509,7 @@
- MainView::sensitiveGoToNextPage (gboolean sensitive)
- {
-     GtkAction *goToNextPage =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/GoMenu/GoToNextPage");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/GoMenu/GoToNextPage");
-     gtk_action_set_sensitive (goToNextPage, sensitive);
- }
- 
-@@ -522,7 +523,7 @@
- MainView::sensitiveGoToPreviousPage (gboolean sensitive)
- {
-     GtkAction *goToPreviousPage = gtk_ui_manager_get_action (m_UIManager, 
-            "/MenuBar/GoMenu/GoToPreviousPage");
-+            "/MenuBar/TopMenu/GoMenu/GoToPreviousPage");
-     gtk_action_set_sensitive (goToPreviousPage, sensitive);
- }
- 
-@@ -530,7 +531,7 @@
- MainView::sensitiveOpen (gboolean sensitive)
- {
-     GtkAction *open =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/OpenFile");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/FileMenu/OpenFile");
-     gtk_action_set_sensitive (open, sensitive);
- }
- 
-@@ -539,7 +540,7 @@
- MainView::sensitivePrint (gboolean sensitive)
- {
-     GtkAction *print = gtk_ui_manager_get_action (m_UIManager,
-            "/MenuBar/FileMenu/PrintPlaceHolder/Print");
-+            "/MenuBar/TopMenu/FileMenu/PrintPlaceHolder/Print");
-     gtk_action_set_sensitive (print, sensitive);
- }
- #endif // HAVE_CUPS
-@@ -548,7 +549,7 @@
- MainView::sensitiveReload (gboolean sensitive)
- {
-     GtkAction *reload =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/ReloadFile");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/FileMenu/ReloadFile");
-     gtk_action_set_sensitive (reload, sensitive);
- }
- 
-@@ -556,7 +557,7 @@
- MainView::sensitiveRotateLeft (gboolean sensitive)
- {
-     GtkAction *rotateLeft =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/RotateLeft");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/RotateLeft");
-     gtk_action_set_sensitive (rotateLeft, sensitive);
- }
- 
-@@ -564,7 +565,7 @@
- MainView::sensitiveRotateRight (gboolean sensitive)
- {
-     GtkAction *rotateRight = gtk_ui_manager_get_action (m_UIManager,
-            "/MenuBar/ViewMenu/RotateRight");
-+            "/MenuBar/TopMenu/ViewMenu/RotateRight");
-     gtk_action_set_sensitive (rotateRight, sensitive);
- }
- 
-@@ -572,7 +573,7 @@
- MainView::sensitiveSave (gboolean sensitive)
- {
-     GtkAction *save =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/FileMenu/SaveFile");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/FileMenu/SaveFile");
-     gtk_action_set_sensitive (save, sensitive);
- }
- 
-@@ -586,7 +587,7 @@
- MainView::sensitiveZoomIn (gboolean sensitive)
- {
-     GtkAction *zoomIn =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomIn");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomIn");
-     gtk_action_set_sensitive (zoomIn, sensitive);
- }
- 
-@@ -594,7 +595,7 @@
- MainView::sensitiveZoomOut (gboolean sensitive)
- {
-     GtkAction *zoomOut =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomOut");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomOut");
-     gtk_action_set_sensitive (zoomOut, sensitive);
- }
- 
-@@ -602,7 +603,7 @@
- MainView::sensitiveZoomFit (gboolean sensitive)
- {
-     GtkAction *zoomFit =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomFit");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomFit");
-     gtk_action_set_sensitive (zoomFit, sensitive);
- }
- 
-@@ -610,7 +611,7 @@
- MainView::sensitiveZoomWidth (gboolean sensitive)
- {
-     GtkAction *zoomWidth =
-        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/ViewMenu/ZoomWidth");
-+        gtk_ui_manager_get_action (m_UIManager, "/MenuBar/TopMenu/ViewMenu/ZoomWidth");
-     gtk_action_set_sensitive (zoomWidth, sensitive);
- }
- 
-@@ -654,7 +655,7 @@
-     }
-     GtkAction *showIndex =
-         gtk_ui_manager_get_action (m_UIManager,
-                                   "/MenuBar/ViewMenu/ShowIndex");
-+                                   "/MenuBar/TopMenu/ViewMenu/ShowIndex");
-     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (showIndex), show);
- }
- 
-@@ -695,13 +696,13 @@
-         gtk_window_fullscreen (GTK_WINDOW (m_MainWindow));
-         // Hide the menu bar, tool bar, status bar and the index bar. Then
-         // zoom to fit.
-        gtk_widget_hide (menuBar);
-+//        gtk_widget_hide (menuBar);
-         gtk_widget_hide (toolBar);
-         gtk_widget_hide (m_StatusBar);
-         gtk_widget_hide (m_Sidebar);
-         gtk_toggle_action_set_active (
-                 GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
-                                   "/MenuBar/ViewMenu/ZoomFit")), TRUE);
-+                                   "/MenuBar/TopMenu/ViewMenu/ZoomFit")), TRUE);
-     }
-     else
-     {
-@@ -711,15 +712,15 @@
-         // enabled.
-         main_window_show_index_cb (
-                 GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
-                        "/MenuBar/ViewMenu/ShowIndex")),
-+                        "/MenuBar/TopMenu/ViewMenu/ShowIndex")),
-                 (gpointer)m_Pter);
-         main_window_show_statusbar_cb (
-                 GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
-                        "/MenuBar/ViewMenu/ShowStatusBar")),
-+                        "/MenuBar/TopMenu/ViewMenu/ShowStatusBar")),
-                 (gpointer)m_Pter);
-         main_window_show_toolbar_cb (
-                 GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (m_UIManager,
-                        "/MenuBar/ViewMenu/ShowToolBar")),
-+                        "/MenuBar/TopMenu/ViewMenu/ShowToolBar")),
-                 (gpointer)m_Pter);
-     }
- }
-@@ -814,7 +815,7 @@
- MainView::showStatusbar (gboolean show)
- {
-     GtkAction *toggleAction = gtk_ui_manager_get_action (m_UIManager,
-                                            "/MenuBar/ViewMenu/ShowStatusBar");
-+                                            "/MenuBar/TopMenu/ViewMenu/ShowStatusBar");
-     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (toggleAction), show);
-     if ( show )
-     {
-@@ -830,7 +831,7 @@
- MainView::showToolbar (gboolean show)
- {
-     GtkAction *toggleAction = gtk_ui_manager_get_action (m_UIManager,
-                                            "/MenuBar/ViewMenu/ShowToolBar");
-+                                            "/MenuBar/TopMenu/ViewMenu/ShowToolBar");
-     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (toggleAction), show);
-     GtkWidget *toolBar = gtk_ui_manager_get_widget (m_UIManager, "/ToolBar");
-     if ( show )
--- a/meta-demoapps/recipes-sato/epdfview/epdfview_0.1.6.bb
+++ b/meta-demoapps/recipes-sato/epdfview/epdfview_0.1.6.bb
@ -1,21 +0,0 @@
-DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
-HOMEPAGE = "http://trac.emma-soft.com/epdfview/"
-LICENSE = "GPLv2"
-SECTION = "x11/applications"
-DEPENDS = "poppler gtk+ libowl"
-PR="r0"
-
-SRC_URI = "http://trac.emma-soft.com/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \
-           file://owl-menus.patch \
-           file://epdfview.desktop \
-           file://epdfview-ui.xml \
-           file://epdfview-ui-print.xml"
-
-inherit autotools gettext
-
-do_install_prepend() {
-	install ${WORKDIR}/epdfview-ui.xml ${S}/data/epdfview-ui.xml
-	install ${WORKDIR}/epdfview-ui-print.xml ${S}/data/epdfview-ui-print.xml
-	install ${WORKDIR}/epdfview.desktop ${S}/data/epdfview.desktop
-}
-
--- a/meta-demoapps/recipes-sato/epdfview/epdfview_0.1.7.bb
+++ b/meta-demoapps/recipes-sato/epdfview/epdfview_0.1.7.bb
@ -1,21 +0,0 @@
-DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
-HOMEPAGE = "http://trac.emma-soft.com/epdfview/"
-LICENSE = "GPLv2"
-SECTION = "x11/applications"
-DEPENDS = "poppler gtk+"
-PR="r0"
-
-SRC_URI = "http://trac.emma-soft.com/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \
-           file://owl-menus.patch;patch=1 \
-           file://epdfview.desktop \
-           file://epdfview-ui.xml \
-           file://epdfview-ui-print.xml"
-
-inherit autotools gettext
-
-do_install_prepend() {
-	install ${WORKDIR}/epdfview-ui.xml ${S}/data/epdfview-ui.xml
-	install ${WORKDIR}/epdfview-ui-print.xml ${S}/data/epdfview-ui-print.xml
-	install ${WORKDIR}/epdfview.desktop ${S}/data/epdfview.desktop
-}
-
--- a/meta-demoapps/recipes-sato/kf/files/fix-configure.patch
+++ b/meta-demoapps/recipes-sato/kf/files/fix-configure.patch
@ -1,27 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff -urNd ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in
--- ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in	2005-04-27 19:42:49.000000000 +0100
-+++ kf-0.5.4.1/configure.in	2005-09-29 14:12:32.000000000 +0100
-@@ -27,7 +27,7 @@
- dnl AC_ARG_ENABLE(debug,)
- 
- dnl modules needed for package
-MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.16"
-+MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.16 libxml-2.0"
- dnl MODULES="gtk+-2.0 >= 2.0.0 libglade-2.0 >= 1.110.0 loudmouth-1.0 >= 0.15.1"
- 
- dnl GtkSpell
-@@ -60,9 +60,9 @@
- 	AC_DEFINE([HAVE_LM_CONNECTION_SET_JID],1,[We have lm_connection_set_jid])
- fi
- 
-dnl XScreenSaver stuff...
-AC_DEFINE([HAVE_XSCREENSAVER], [1], [Whether to support XScreenSaver extension])
-PACKAGE_LIBS="$PACKAGE_LIBS -lXss -L/usr/X11R6/lib"
-+#dnl XScreenSaver stuff...
-+#AC_DEFINE([HAVE_XSCREENSAVER], [1], [Whether to support XScreenSaver extension])
-+#PACKAGE_LIBS="$PACKAGE_LIBS -lXss -L/usr/X11R6/lib"
- 
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(PACKAGE_LIBS)
--- a/meta-demoapps/recipes-sato/kf/files/fix-desktop-file.patch
+++ b/meta-demoapps/recipes-sato/kf/files/fix-desktop-file.patch
@ -1,22 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Common subdirectories: kf-0.5.4.1.orig/data and kf-0.5.4.1/data
-diff -u kf-0.5.4.1.orig/kf.desktop kf-0.5.4.1/kf.desktop
--- kf-0.5.4.1.orig/kf.desktop	2005-04-19 22:08:44.000000000 +0100
-+++ kf-0.5.4.1/kf.desktop	2005-10-03 14:36:47.000000000 +0100
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
-Name=kf jabber client
-+Name=Instant Messenger
- Name[pl]=kf klient sieci jabber
- Name[lt]=Pokalbių programa kf
- GenericName=Instant Messenger
-@@ -11,5 +11,6 @@
- Icon=kf.png
- Terminal=false
- Type=Application
-Categories=GTK;Application;Network;
-+Categories=GTK;PIM;Application;Network;
- StartupNotify=true
-+X-MB-SingleInstance=true
--- a/meta-demoapps/recipes-sato/kf/files/gcc4.patch
+++ b/meta-demoapps/recipes-sato/kf/files/gcc4.patch
@ -1,32 +0,0 @@
-Upstream-Status: Pending
-
-Index: kf-0.5.4.1/src/jispman.c
-===================================================================
--- kf-0.5.4.1.orig/src/jispman.c	2006-12-03 15:33:47.000000000 +0100
-+++ kf-0.5.4.1/src/jispman.c	2006-12-03 15:35:01.000000000 +0100
-@@ -25,12 +25,6 @@
- #include "emoticons.h"
- #include "kf.h"
- 
-struct _KfJispManager {
-	GHashTable *jisps;	/** A hash-table of all JISP pachages managed by this object, indexed by their filename */
-	GList *patterns;	/** A list of patterns */
-};
-
-
- /**
-  * \brief create a new instance of KfJispManager
-  * \return a new instance of KfJispManager
-Index: kf-0.5.4.1/src/jispman.h
-===================================================================
--- kf-0.5.4.1.orig/src/jispman.h	2006-12-03 15:33:47.000000000 +0100
-+++ kf-0.5.4.1/src/jispman.h	2006-12-03 15:34:37.000000000 +0100
-@@ -25,6 +25,8 @@
- #include "jisp.h"
- 
- typedef struct _KfJispManager {
-+        GHashTable *jisps;      /** A hash-table of all JISP pachages managed by this object, indexed by their filename */
-+        GList *patterns;        /** A list of patterns */
- } KfJispManager;
- 
- /**
--- a/meta-demoapps/recipes-sato/kf/kf_0.5.4.1.bb
+++ b/meta-demoapps/recipes-sato/kf/kf_0.5.4.1.bb
@ -1,16 +0,0 @@
-DESCRIPTION = "Kf is a GTK+ instant messaging client."
-LICENSE = "GPL"
-DEPENDS = "libxml2 glib-2.0 gtk+ loudmouth libglade"
-PR = "r4"
-
-SRC_URI = "http://jabberstudio.2nw.net/${BPN}/${BPN}-${PV}.tar.gz \
-           file://fix-configure.patch;patch=1 \
-           file://fix-desktop-file.patch;patch=0 \
-           file://gcc4.patch;patch=1"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-binreloc"
-
-export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"
-
--- a/meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
+++ b/meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
@ -1,28 +0,0 @@
-DESCRIPTION = "Matchbox window manager extra themes"
-LICENSE = "GPL"
-DEPENDS = "matchbox-wm"
-SECTION = "x11/wm"
-
-SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-themes-extra/${PV}/matchbox-themes-extra-${PV}.tar.bz2"
-S = "${WORKDIR}/matchbox-themes-extra-${PV}"
-
-SRC_URI[md5sum] = "04312628f4a21f4105bce1251ea08035"
-SRC_URI[sha256sum] = "98a1c8695842b0cd7f32e67b0ef9118fd0f32db5297f3f08706c706dee8fc6be"
-
-inherit autotools  pkgconfig
-
-# split into several packages plus one meta package
-PACKAGES = "${PN} ${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
-
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN} = ""
-RDEPENDS_${PN} = "${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
-
-FILES_${PN}-industrial = "${datadir}/themes/Industrial \
-			  ${datadir}/icons/Industrial"
-
-FILES_${PN}-expose = "${datadir}/themes/expose \
-		      ${datadir}/icons/expose"
-
-FILES_${PN}-mbcrystal = "${datadir}/themes/mbcrystal \
-			 ${datadir}/icons/mbcrystal"
--- a/Show More
+++ b/Show More