summaryrefslogtreecommitdiffstats
path: root/meta-demoapps
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-08 13:25:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-08 13:49:16 (GMT)
commit67f6baa72a2c4ab868ec9c333863476e4e77513a (patch)
tree00b72871d7f12e556eb98c67c1a0b3b0c94c3871 /meta-demoapps
parent71e56f8d89c05859ddb817731653d39a8145fb98 (diff)
downloadpoky-67f6baa72a2c4ab868ec9c333863476e4e77513a.tar.gz
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>
Diffstat (limited to 'meta-demoapps')
-rw-r--r--meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb23
-rw-r--r--meta-demoapps/recipes-connectivity/farsight/libnice_0.0.6.bb23
-rw-r--r--meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch20
-rw-r--r--meta-demoapps/recipes-connectivity/libetpan/libetpan_0.54.bb20
-rw-r--r--meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb10
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch15
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch28
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch379
-rw-r--r--meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb36
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch20
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch19
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch18
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch25
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb8
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb2
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb2
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb4
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch15
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb8
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb4
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc11
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libopensync_0.37.bb26
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libsync_git.bb22
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch21
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/libsyncml_0.5.4.bb17
-rw-r--r--meta-demoapps/recipes-connectivity/opensync/msynctool_0.38.bb20
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch41
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb29
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb16
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager33
-rw-r--r--meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb18
-rw-r--r--meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch17
-rw-r--r--meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb24
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc64
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb12
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword.inc64
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb5
-rw-r--r--meta-demoapps/recipes-gnome/abiword/abiword_svn.bb10
-rw-r--r--meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch33
-rw-r--r--meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb13
-rw-r--r--meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb12
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch32
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch13
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch21
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch15
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch76
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch620
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon_2.26.1.bb25
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch22
-rw-r--r--meta-demoapps/recipes-gnome/gnome/gnome-terminal_2.26.3.bb16
-rw-r--r--meta-demoapps/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb14
-rw-r--r--meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb14
-rw-r--r--meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb25
-rw-r--r--meta-demoapps/recipes-gnome/libgtkstylus/files/gtkstylus.sh5
-rw-r--r--meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb24
-rw-r--r--meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch15
-rw-r--r--meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb14
-rw-r--r--meta-demoapps/recipes-graphics/clutter/tidy.inc20
-rw-r--r--meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch13
-rw-r--r--meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch22
-rw-r--r--meta-demoapps/recipes-graphics/clutter/tidy_git.bb14
-rw-r--r--meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch17
-rw-r--r--meta-demoapps/recipes-graphics/libxklavier/libxklavier_3.9.bb11
-rw-r--r--meta-demoapps/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c410
-rw-r--r--meta-demoapps/recipes-graphics/pong-clock/pong-clock_1.0.bb16
-rw-r--r--meta-demoapps/recipes-graphics/xorg-app/xbacklight_1.1.bb4
-rw-r--r--meta-demoapps/recipes-graphics/xorg-app/xeyes_1.0.1.bb4
-rw-r--r--meta-demoapps/recipes-graphics/xorg-app/xrdb/60XDefaults.sh3
-rw-r--r--meta-demoapps/recipes-graphics/xorg-app/xrdb_1.0.5.bb14
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch65
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb11
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb21
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/libxevie_1.0.2.bb8
-rw-r--r--meta-demoapps/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb8
-rw-r--r--meta-demoapps/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb5
-rw-r--r--meta-demoapps/recipes-graphics/xournal/files/ldflags.patch17
-rw-r--r--meta-demoapps/recipes-graphics/xournal/files/no-printing.diff180
-rw-r--r--meta-demoapps/recipes-graphics/xournal/xournal_0.2.bb12
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-mail.inc58
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-mail_2.9.1.bb1
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb14
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb14
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb14
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb14
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/files/desktop.patch21
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch26
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch1011
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch1010
-rw-r--r--meta-demoapps/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb33
-rw-r--r--meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch46
-rw-r--r--meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch20
-rw-r--r--meta-demoapps/recipes-sato/clipboard-manager/files/script.patch41
-rw-r--r--meta-demoapps/recipes-sato/epdfview/epdfview/epdfview-ui-print.xml12
-rw-r--r--meta-demoapps/recipes-sato/epdfview/epdfview/epdfview-ui.xml57
-rw-r--r--meta-demoapps/recipes-sato/epdfview/epdfview/epdfview.desktop10
-rw-r--r--meta-demoapps/recipes-sato/epdfview/epdfview/owl-menus.patch327
-rw-r--r--meta-demoapps/recipes-sato/epdfview/epdfview_0.1.6.bb21
-rw-r--r--meta-demoapps/recipes-sato/epdfview/epdfview_0.1.7.bb21
-rw-r--r--meta-demoapps/recipes-sato/kf/files/fix-configure.patch27
-rw-r--r--meta-demoapps/recipes-sato/kf/files/fix-desktop-file.patch22
-rw-r--r--meta-demoapps/recipes-sato/kf/files/gcc4.patch32
-rw-r--r--meta-demoapps/recipes-sato/kf/kf_0.5.4.1.bb16
-rw-r--r--meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_0.3.bb28
-rw-r--r--meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb33
-rw-r--r--meta-demoapps/recipes-sato/matchbox-themes-gtk/files/gtkrc1
-rw-r--r--meta-demoapps/recipes-sato/matchbox-themes-gtk/matchbox-themes-gtk.bb17
-rw-r--r--meta-demoapps/recipes-support/iso-codes/iso-codes_3.3.bb13
-rw-r--r--meta-demoapps/recipes-support/libfribidi/files/libtool-update.patch13
-rw-r--r--meta-demoapps/recipes-support/libfribidi/libfribidi_0.10.4.bb23
-rw-r--r--meta-demoapps/recipes-support/openobex/files/disable-cable-test.patch17
-rw-r--r--meta-demoapps/recipes-support/openobex/files/libusb_crosscompile_check.patch15
-rw-r--r--meta-demoapps/recipes-support/openobex/openobex_1.5.bb23
-rw-r--r--meta-demoapps/recipes-support/poppler/poppler-data_0.1.bb16
-rw-r--r--meta-demoapps/recipes-support/poppler/poppler-fpu.inc6
-rw-r--r--meta-demoapps/recipes-support/poppler/poppler.inc18
-rw-r--r--meta-demoapps/recipes-support/poppler/poppler_0.9.2.bb2
116 files changed, 0 insertions, 6106 deletions
diff --git a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
deleted file mode 100644
index ee0ce8a..0000000
--- a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1DESCRIPTION = "FarSight is an audio/video conferencing framework specifically designed for Instant Messengers."
2HOMEPAGE = "http://farsight.sf.net"
3SRC_URI = "http://farsight.freedesktop.org/releases/farsight2/${BPN}-${PV}.tar.gz"
4LICENSE = "LGPLv2.1"
5DEPENDS = "libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base"
6
7inherit autotools
8
9PR = "r2"
10
11EXTRA_OECONF = " \
12 --disable-debug \
13 --disable-gtk-doc \
14 --disable-python \
15"
16
17FILES_${PN} += "${libdir}/*/*.so"
18FILES_${PN}-dev += "${libdir}/f*/*a ${libdir}/g*/*a"
19FILES_${PN}-dbg += "${libdir}/*/.debug"
20
21
22
23
diff --git a/meta-demoapps/recipes-connectivity/farsight/libnice_0.0.6.bb b/meta-demoapps/recipes-connectivity/farsight/libnice_0.0.6.bb
deleted file mode 100644
index 30cc7a1..0000000
--- a/meta-demoapps/recipes-connectivity/farsight/libnice_0.0.6.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1SUMMARY = "IETF draft Interactice Connectivity Establishment standard"
2DESCRIPTION = "Libnice is an implementation of the IETF's draft Interactice Connectivity Establishment standard (ICE)."
3HOMEPAGE = "http://nice.freedesktop.org/wiki/"
4SRC_URI = "http://nice.freedesktop.org/releases/libnice-${PV}.tar.gz"
5
6LICENSE = "LGPL/MPL"
7DEPENDS = "glib-2.0 gstreamer"
8
9inherit autotools
10
11FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
12FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*a"
13FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
14
15do_compile_append() {
16 for i in $(find ${S} -name "*.pc") ; do
17 sed -i -e s:${STAGING_DIR_TARGET}::g \
18 -e s:/${TARGET_SYS}::g \
19 $i
20 done
21}
22
23
diff --git a/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch b/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch
deleted file mode 100644
index 03d8da6..0000000
--- a/meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 configure.ac | 1 +
5 1 file changed, 1 insertion(+)
6
7--- libetpan-0.54.orig/configure.ac
8+++ libetpan-0.54/configure.ac
9@@ -104,10 +104,11 @@ if test "$have_w32_system" = yes; then
10 fi
11 AM_CONDITIONAL(HAVE_MINGW32_SYSTEM, test "$have_w32_system" = yes)
12
13 # Check the C compiler.
14 AC_PROG_CC
15+AC_PROG_CXX
16
17 # Compiler flags.
18 AC_ARG_ENABLE(debug, [ --enable-debug setup flags (gcc) for debugging (default=no)],
19 if test "x$GCC" = xyes; then
20 CFLAGS="$CFLAGS -O2 -g"
diff --git a/meta-demoapps/recipes-connectivity/libetpan/libetpan_0.54.bb b/meta-demoapps/recipes-connectivity/libetpan/libetpan_0.54.bb
deleted file mode 100644
index 9b69471..0000000
--- a/meta-demoapps/recipes-connectivity/libetpan/libetpan_0.54.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1SUMMARY = "Library for communicating with mail and news services"
2DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
3It supports the protocols SMTP, POP3, IMAP and NNTP."
4HOMEPAGE = "http://www.etpan.org"
5SECTION = "libs"
6DEPENDS = "curl expat gnutls"
7LICENSE = "BSD"
8PR = "r1"
9
10SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
11 file://cxx-is-here.patch;patch=1"
12
13inherit autotools pkgconfig gettext binconfig
14
15EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
16
17PARALLEL_MAKE = ""
18
19FILES_${PN} = "${libdir}/lib*.so.*"
20FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
diff --git a/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb b/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
deleted file mode 100644
index b6af11d..0000000
--- a/meta-demoapps/recipes-connectivity/loudmouth/loudmouth_1.4.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1SUMMARY = "XMPP/Jabber library"
2DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the XMPP/Jabber protocol."
3HOMEPAGE = "http://www.loudmouth-project.org/"
4LICENSE = "LGPL"
5DEPENDS = "glib-2.0 gnutls libcheck"
6PR = "r2"
7
8SRC_URI = "http://ftp.imendio.com/pub/imendio/${BPN}/src/${BPN}-${PV}.tar.bz2"
9
10inherit autotools pkgconfig
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch b/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
deleted file mode 100644
index ffebf2b..0000000
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/installflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: openswan-2.4.7/Makefile.inc
4===================================================================
5--- openswan-2.4.7.orig/Makefile.inc 2006-12-25 18:05:40.608503250 +0100
6+++ openswan-2.4.7/Makefile.inc 2006-12-25 18:06:39.028154250 +0100
7@@ -158,7 +158,7 @@
8 # how backup names are composed.
9 # Note that the install procedures will never overwrite an existing config
10 # file, which is why -b is not specified for them.
11-INSTBINFLAGS=-b --suffix=.old
12+INSTBINFLAGS=
13 INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
14 INSTMANFLAGS=
15 INSTCONFFLAGS=
diff --git 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
deleted file mode 100644
index 92f3547..0000000
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/ld-library-path-breakage.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3--- openswan-2.2.0.orig/programs/Makefile.program 2004-06-03 03:06:27.000000000 +0200
4+++ openswan-2.2.0/programs/Makefile.program 2005-03-05 13:50:19.000000000 +0100
5@@ -30,10 +30,6 @@
6
7 CFLAGS+= ${WERROR}
8
9-ifneq ($(LD_LIBRARY_PATH),)
10-LDFLAGS=-L$(LD_LIBRARY_PATH)
11-endif
12-
13 MANDIR8=$(MANTREE)/man8
14 MANDIR5=$(MANTREE)/man5
15
16--- openswan-2.2.0.orig/programs/pluto/Makefile 2005-01-03 20:40:45.000000000 +0100
17+++ openswan-2.2.0/programs/pluto/Makefile 2005-03-05 13:51:21.000000000 +0100
18@@ -234,10 +234,6 @@
19 LIBSPLUTO+=${CURL_LIBS}
20 LIBSPLUTO+= -lgmp -lresolv # -lefence
21
22-ifneq ($(LD_LIBRARY_PATH),)
23-LDFLAGS=-L$(LD_LIBRARY_PATH)
24-endif
25-
26 LIBSADNS = $(OPENSWANLIB)
27 LIBSADNS += -lresolv # -lefence
28
diff --git 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
deleted file mode 100644
index c24227c..0000000
--- a/meta-demoapps/recipes-connectivity/openswan/openswan-2.4.7/openswan-2.4.7-gentoo.patch
+++ /dev/null
@@ -1,379 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -Nru openswan-2.4.7.orig/doc/Makefile openswan-2.4.7/doc/Makefile
4--- openswan-2.4.7.orig/doc/Makefile 2005-11-08 23:32:45.000000000 +0200
5+++ openswan-2.4.7/doc/Makefile 2006-12-06 22:46:54.732830840 +0200
6@@ -1,6 +1,6 @@
7 # Makefile to generate various formats from HTML source
8 #
9-# Assumes the htmldoc utility is available.
10+# No longer cares if the htmldoc utility is available.
11 # This can be downloaded from www.easysw.com
12 #
13 # Also needs lynx(1) for HTML-to-text conversion
14diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl
15--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-16 03:24:45.000000000 +0300
16+++ openswan-2.4.7/lib/libcrypto/libdes/asm/crypt586.pl 2006-12-06 22:46:54.732830840 +0200
17@@ -1,4 +1,4 @@
18-#!/usr/local/bin/perl
19+#!/usr/bin/perl
20 #
21 # The inner loop instruction sequence and the IP/FP modifications are from
22 # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
23diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl
24--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 11:07:06.000000000 +0300
25+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2006-12-06 22:46:54.736831090 +0200
26@@ -1,4 +1,4 @@
27-#!/usr/local/bin/perl
28+#!/usr/bin/perl
29
30 # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
31 # des_cblock (*input);
32diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl
33--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 11:07:06.000000000 +0300
34+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2006-12-06 22:46:54.736831090 +0200
35@@ -1,4 +1,4 @@
36-#!/usr/local/bin/perl
37+#!/usr/bin/perl
38
39 # require 'x86asm.pl';
40 # &asm_init("cpp","des-586.pl");
41diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl
42--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 11:07:07.000000000 +0300
43+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2006-12-06 22:46:54.736831090 +0200
44@@ -1,4 +1,4 @@
45-#!/usr/local/bin/perl
46+#!/usr/bin/perl
47
48 package x86ms;
49
50diff -Nru openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl
51--- openswan-2.4.7.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 11:07:07.000000000 +0300
52+++ openswan-2.4.7/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2006-12-06 22:46:54.736831090 +0200
53@@ -1,4 +1,4 @@
54-#!/usr/local/bin/perl
55+#!/usr/bin/perl
56
57 package x86unix;
58
59diff -Nru openswan-2.4.7.orig/lib/liblwres/Makefile openswan-2.4.7/lib/liblwres/Makefile
60--- openswan-2.4.7.orig/lib/liblwres/Makefile 2004-12-18 20:13:34.000000000 +0200
61+++ openswan-2.4.7/lib/liblwres/Makefile 2006-12-06 22:46:54.736831090 +0200
62@@ -20,7 +20,7 @@
63 CDEFINES = -g
64 CWARNINGS = -Werror
65
66-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
67+CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE)
68
69 VERSION="@(\#) openswan-hacking-9.3-for-osw2"
70 LIBINTERFACE=2
71diff -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
72--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 11:06:50.000000000 +0300
73+++ openswan-2.4.7/linux/net/ipsec/des/asm/des-586.pl 2006-12-06 22:46:54.736831090 +0200
74@@ -1,4 +1,4 @@
75-#!/usr/local/bin/perl
76+#!/usr/bin/perl
77 #
78 # The inner loop instruction sequence and the IP/FP modifications are from
79 # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
80diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl
81--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/des686.pl 2004-07-10 11:06:50.000000000 +0300
82+++ openswan-2.4.7/linux/net/ipsec/des/asm/des686.pl 2006-12-06 22:46:54.740831340 +0200
83@@ -1,4 +1,4 @@
84-#!/usr/local/bin/perl
85+#!/usr/bin/perl
86
87 $prog="des686.pl";
88
89diff -Nru openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl
90--- openswan-2.4.7.orig/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 11:06:50.000000000 +0300
91+++ openswan-2.4.7/linux/net/ipsec/des/asm/desboth.pl 2006-12-06 22:46:54.740831340 +0200
92@@ -1,4 +1,4 @@
93-#!/usr/local/bin/perl
94+#!/usr/bin/perl
95
96 $L="edi";
97 $R="esi";
98diff -Nru openswan-2.4.7.orig/Makefile.inc openswan-2.4.7/Makefile.inc
99--- openswan-2.4.7.orig/Makefile.inc 2006-11-14 19:56:09.000000000 +0200
100+++ openswan-2.4.7/Makefile.inc 2006-12-06 22:48:32.534943089 +0200
101@@ -46,7 +46,7 @@
102 DESTDIR?=
103
104 # "local" part of tree, used in building other pathnames
105-INC_USRLOCAL=/usr/local
106+INC_USRLOCAL?=/usr
107
108 # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
109 # settings which are assumed to include it (or at least, to include *some*
110@@ -80,7 +80,7 @@
111 MANPLACES=man3 man5 man8
112
113 # where configuration files go
114-FINALCONFFILE?=/etc/ipsec.conf
115+FINALCONFFILE?=/etc/ipsec/ipsec.conf
116 CONFFILE=$(DESTDIR)$(FINALCONFFILE)
117
118 FINALCONFDIR?=/etc
119@@ -91,7 +91,7 @@
120
121 # sample configuration files go into
122 INC_DOCDIR?=share/doc
123-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
124+FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
125 EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
126
127 FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
128@@ -239,7 +239,7 @@
129 # installed one in RH 7.2, won't work - you wind up depending upon
130 # openssl.
131
132-BIND9STATICLIBDIR?=/usr/local/lib
133+BIND9STATICLIBDIR?=/usr/lib
134
135 # if you install elsewere, you may need to point the include files to it.
136 #BIND9STATICLIBDIR?=/sandel/lib
137diff -Nru openswan-2.4.7.orig/programs/barf/barf.in openswan-2.4.7/programs/barf/barf.in
138--- openswan-2.4.7.orig/programs/barf/barf.in 2006-11-07 05:49:18.000000000 +0200
139+++ openswan-2.4.7/programs/barf/barf.in 2006-12-06 22:46:54.740831340 +0200
140@@ -16,7 +16,7 @@
141
142 LOGS=${LOGS-/var/log}
143 CONFS=${IPSEC_CONFS-/etc}
144-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d}
145+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d}
146 me="ipsec barf"
147 # Max lines to use for things like 'route -n'
148 maxlines=100
149@@ -238,13 +238,13 @@
150 done
151 fi
152 _________________________ ipsec/ls-libdir
153-ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec}
154+ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec}
155 _________________________ ipsec/ls-execdir
156-ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}
157+ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec}
158 _________________________ ipsec/updowns
159-for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown`
160+for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown`
161 do
162- cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f
163+ cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f
164 done
165 _________________________ /proc/net/dev
166 cat /proc/net/dev
167diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.5 openswan-2.4.7/programs/eroute/eroute.5
168--- openswan-2.4.7.orig/programs/eroute/eroute.5 2006-10-26 23:40:43.000000000 +0300
169+++ openswan-2.4.7/programs/eroute/eroute.5 2006-12-06 22:57:19.307864340 +0200
170@@ -168,7 +168,7 @@
171 .SH "FILES"
172
173 .PP
174-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
175+/proc/net/ipsec_eroute, /usr/bin/ipsec
176
177 .SH "SEE ALSO"
178
179diff -Nru openswan-2.4.7.orig/programs/eroute/eroute.8 openswan-2.4.7/programs/eroute/eroute.8
180--- openswan-2.4.7.orig/programs/eroute/eroute.8 2003-10-31 04:32:27.000000000 +0200
181+++ openswan-2.4.7/programs/eroute/eroute.8 2006-12-06 22:46:54.740831340 +0200
182@@ -308,7 +308,7 @@
183 .br
184 .LP
185 .SH FILES
186-/proc/net/ipsec_eroute, /usr/local/bin/ipsec
187+/proc/net/ipsec_eroute, /usr/bin/ipsec
188 .SH "SEE ALSO"
189 ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8),
190 ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5)
191diff -Nru openswan-2.4.7.orig/programs/_include/_include.in openswan-2.4.7/programs/_include/_include.in
192--- openswan-2.4.7.orig/programs/_include/_include.in 2003-01-06 23:44:04.000000000 +0200
193+++ openswan-2.4.7/programs/_include/_include.in 2006-12-06 22:46:54.740831340 +0200
194@@ -47,10 +47,10 @@
195 do
196 if test ! -r "$f"
197 then
198- if test ! "$f" = "/etc/ipsec.conf"
199+ if test ! "$f" = "/etc/ipsec/ipsec.conf"
200 then
201 echo "#:cannot open configuration file \'$f\'"
202- if test "$f" = "/etc/ipsec.secrets"
203+ if test "$f" = "/etc/ipsec/ipsec.secrets"
204 then
205 echo "#:Your secrets file will be created when you start FreeS/WAN for the first time."
206 fi
207diff -Nru openswan-2.4.7.orig/programs/ipsec/ipsec.8 openswan-2.4.7/programs/ipsec/ipsec.8
208--- openswan-2.4.7.orig/programs/ipsec/ipsec.8 2003-02-27 18:51:54.000000000 +0200
209+++ openswan-2.4.7/programs/ipsec/ipsec.8 2006-12-06 22:46:54.744831590 +0200
210@@ -81,7 +81,7 @@
211 .I ipsec
212 thinks the IPsec configuration files are stored.
213 .SH FILES
214-/usr/local/lib/ipsec usual utilities directory
215+/usr/lib/ipsec usual utilities directory
216 .SH ENVIRONMENT
217 .PP
218 The following environment variables control where FreeS/WAN finds its
219diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.7/programs/klipsdebug/klipsdebug.5
220--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.5 2006-10-27 01:21:25.000000000 +0300
221+++ openswan-2.4.7/programs/klipsdebug/klipsdebug.5 2006-12-06 22:58:04.150666840 +0200
222@@ -114,7 +114,7 @@
223 .SH "FILES"
224
225 .PP
226-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
227+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
228
229 .SH "SEE ALSO"
230
231diff -Nru openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.7/programs/klipsdebug/klipsdebug.8
232--- openswan-2.4.7.orig/programs/klipsdebug/klipsdebug.8 2006-10-27 01:21:25.000000000 +0300
233+++ openswan-2.4.7/programs/klipsdebug/klipsdebug.8 2006-12-06 22:58:22.295800840 +0200
234@@ -111,7 +111,7 @@
235 .SH "FILES"
236
237 .PP
238-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec
239+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec
240
241 .SH "SEE ALSO"
242
243diff -Nru openswan-2.4.7.orig/programs/mailkey/mailkey.in openswan-2.4.7/programs/mailkey/mailkey.in
244--- openswan-2.4.7.orig/programs/mailkey/mailkey.in 2006-10-29 02:49:23.000000000 +0300
245+++ openswan-2.4.7/programs/mailkey/mailkey.in 2006-12-06 22:46:54.828836839 +0200
246@@ -60,7 +60,7 @@
247
248 "$test1st"
249
250-Common concerns: This account must be able to read /etc/ipsec.secrets.
251+Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets.
252 If you haven't generated your key yet, please run 'ipsec newhostkey'."
253 exit 0
254 }
255diff -Nru openswan-2.4.7.orig/programs/pluto/Makefile openswan-2.4.7/programs/pluto/Makefile
256--- openswan-2.4.7.orig/programs/pluto/Makefile 2006-11-07 17:55:52.000000000 +0200
257+++ openswan-2.4.7/programs/pluto/Makefile 2006-12-06 22:46:54.832837088 +0200
258@@ -256,7 +256,7 @@
259 -DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
260 -DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
261
262-ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
263+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE)
264
265 # libefence is a free memory allocation debugger
266 # Solaris 2 needs -lsocket -lnsl
267diff -Nru openswan-2.4.7.orig/programs/setup/Makefile openswan-2.4.7/programs/setup/Makefile
268--- openswan-2.4.7.orig/programs/setup/Makefile 2004-12-18 20:13:43.000000000 +0200
269+++ openswan-2.4.7/programs/setup/Makefile 2006-12-06 22:46:54.832837088 +0200
270@@ -33,25 +33,10 @@
271 @rm -f $(BINDIR)/setup
272 @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
273 @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
274- -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
275- -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
276- -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
277- -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
278- -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
279- -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
280- -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
281- -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
282
283 install_file_list::
284 @echo $(RCDIR)/ipsec
285 @echo $(BINDIR)/setup
286- @echo $(RCDIR)/../rc0.d/K76ipsec
287- @echo $(RCDIR)/../rc1.d/K76ipsec
288- @echo $(RCDIR)/../rc2.d/S47ipsec
289- @echo $(RCDIR)/../rc3.d/S47ipsec
290- @echo $(RCDIR)/../rc4.d/S47ipsec
291- @echo $(RCDIR)/../rc5.d/S47ipsec
292- @echo $(RCDIR)/../rc6.d/K76ipsec
293
294 clean::
295 @rm -f setup
296diff -Nru openswan-2.4.7.orig/programs/showhostkey/showhostkey.in openswan-2.4.7/programs/showhostkey/showhostkey.in
297--- openswan-2.4.7.orig/programs/showhostkey/showhostkey.in 2004-11-14 15:40:41.000000000 +0200
298+++ openswan-2.4.7/programs/showhostkey/showhostkey.in 2006-12-06 22:46:54.844837840 +0200
299@@ -18,7 +18,7 @@
300 usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]
301 [--dhclient] [--ipseckey]"
302
303-file=/etc/ipsec.secrets
304+file=/etc/ipsec/ipsec.secrets
305 fmt=""
306 gw=
307 id=
308diff -Nru openswan-2.4.7.orig/programs/spi/spi.5 openswan-2.4.7/programs/spi/spi.5
309--- openswan-2.4.7.orig/programs/spi/spi.5 2006-10-26 23:53:59.000000000 +0300
310+++ openswan-2.4.7/programs/spi/spi.5 2006-12-06 23:00:11.910340779 +0200
311@@ -157,7 +157,7 @@
312 .SH "FILES"
313
314 .PP
315-/proc/net/ipsec_spi, /usr/local/bin/ipsec
316+/proc/net/ipsec_spi, /usr/bin/ipsec
317
318 .SH "SEE ALSO"
319
320diff -Nru openswan-2.4.7.orig/programs/spi/spi.8 openswan-2.4.7/programs/spi/spi.8
321--- openswan-2.4.7.orig/programs/spi/spi.8 2006-10-30 22:00:04.000000000 +0200
322+++ openswan-2.4.7/programs/spi/spi.8 2006-12-06 23:00:27.043286530 +0200
323@@ -215,7 +215,7 @@
324 .SH "FILES"
325
326 .PP
327-/proc/net/ipsec_spi, /usr/local/bin/ipsec
328+/proc/net/ipsec_spi, /usr/bin/ipsec
329
330 .SH "SEE ALSO"
331
332diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.5 openswan-2.4.7/programs/spigrp/spigrp.5
333--- openswan-2.4.7.orig/programs/spigrp/spigrp.5 2006-10-26 23:50:29.000000000 +0300
334+++ openswan-2.4.7/programs/spigrp/spigrp.5 2006-12-06 23:01:25.650949280 +0200
335@@ -67,7 +67,7 @@
336 .SH "FILES"
337
338 .PP
339-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
340+/proc/net/ipsec_spigrp, /usr/bin/ipsec
341
342 .SH "SEE ALSO"
343
344diff -Nru openswan-2.4.7.orig/programs/spigrp/spigrp.8 openswan-2.4.7/programs/spigrp/spigrp.8
345--- openswan-2.4.7.orig/programs/spigrp/spigrp.8 2006-10-26 23:50:29.000000000 +0300
346+++ openswan-2.4.7/programs/spigrp/spigrp.8 2006-12-06 23:01:39.079788532 +0200
347@@ -87,7 +87,7 @@
348 .SH "FILES"
349
350 .PP
351-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec
352+/proc/net/ipsec_spigrp, /usr/bin/ipsec
353
354 .SH "SEE ALSO"
355
356diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.5 openswan-2.4.7/programs/tncfg/tncfg.5
357--- openswan-2.4.7.orig/programs/tncfg/tncfg.5 2006-10-26 23:58:11.000000000 +0300
358+++ openswan-2.4.7/programs/tncfg/tncfg.5 2006-12-06 23:01:59.385057530 +0200
359@@ -101,7 +101,7 @@
360 .SH "FILES"
361
362 .PP
363-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
364+/proc/net/ipsec_tncfg, /usr/bin/ipsec
365
366 .SH "SEE ALSO"
367
368diff -Nru openswan-2.4.7.orig/programs/tncfg/tncfg.8 openswan-2.4.7/programs/tncfg/tncfg.8
369--- openswan-2.4.7.orig/programs/tncfg/tncfg.8 2006-10-26 23:58:11.000000000 +0300
370+++ openswan-2.4.7/programs/tncfg/tncfg.8 2006-12-06 23:02:09.245673780 +0200
371@@ -63,7 +63,7 @@
372 .SH "FILES"
373
374 .PP
375-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec
376+/proc/net/ipsec_tncfg, /usr/bin/ipsec
377
378 .SH "SEE ALSO"
379
diff --git a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb b/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
deleted file mode 100644
index f783a85..0000000
--- a/meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb
+++ /dev/null
@@ -1,36 +0,0 @@
1SECTION = "console/network"
2SUMMARY = "IPsec implementation"
3DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \
4Linux operating system."
5HOMEPAGE = "http://www.openswan.org"
6LICENSE = "GPLv2"
7DEPENDS = "gmp flex-native"
8RRECOMMENDS_${PN} = "kernel-module-ipsec"
9PR = "r2"
10
11SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
12 file://openswan-2.4.7-gentoo.patch;patch=1 \
13 file://installflags.patch;patch=1 \
14 file://ld-library-path-breakage.patch;patch=1"
15S = "${WORKDIR}/openswan-${PV}"
16
17PARALLEL_MAKE = ""
18EXTRA_OEMAKE = "DESTDIR=${D} \
19 USERCOMPILE="${CFLAGS}" \
20 FINALCONFDIR=${sysconfdir}/ipsec \
21 INC_RCDEFAULT=${sysconfdir}/init.d \
22 INC_USRLOCAL=${prefix} \
23 INC_MANDIR=share/man WERROR=''"
24
25do_compile () {
26 oe_runmake programs
27}
28
29do_install () {
30 oe_runmake install
31}
32
33FILES_${PN} = "${sysconfdir} ${libdir}/ipsec/* ${sbindir}/* ${libexecdir}/ipsec/*"
34FILES_${PN}-dbg += "${libdir}/ipsec/.debug ${libexecdir}/ipsec/.debug"
35
36CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf"
diff --git 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
deleted file mode 100644
index fa61e15..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 cmake/OpenSyncInternal.cmake.in | 1 -
5 1 file changed, 1 deletion(-)
6
7--- libopensync-0.36.orig/cmake/OpenSyncInternal.cmake.in
8+++ libopensync-0.36/cmake/OpenSyncInternal.cmake.in
9@@ -5,11 +5,10 @@ INCLUDE( OpenSyncTesting )
10 INCLUDE( OpenSyncPackaging )
11 INCLUDE( OpenSyncPlugin )
12 INCLUDE( OpenSyncPlatforms )
13 INCLUDE( MacroEnsureOutOfSourceBuild )
14
15-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]'!")
16
17
18 SET( OPENSYNC_PLUGINDIR "@OPENSYNC_PLUGINDIR@" )
19 SET( OPENSYNC_FORMATSDIR "@OPENSYNC_FORMATSDIR@" )
20 SET( OPENSYNC_PYTHON_PLUGINDIR "@OPENSYNC_PYTHON_PLUGINDIR@" )
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
deleted file mode 100644
index 20d09cf..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 opensync/CMakeLists.txt | 1 -
5 1 file changed, 1 deletion(-)
6
7Index: libopensync-0.37/opensync/CMakeLists.txt
8===================================================================
9--- libopensync-0.37.orig/opensync/CMakeLists.txt 2008-10-15 13:56:45.000000000 +0100
10+++ libopensync-0.37/opensync/CMakeLists.txt 2008-10-15 13:59:03.000000000 +0100
11@@ -67,8 +67,6 @@
12 SET_TARGET_PROPERTIES( opensync PROPERTIES VERSION ${OPENSYNC_LIBVERSION_VERSION} )
13 SET_TARGET_PROPERTIES( opensync PROPERTIES SOVERSION ${OPENSYNC_LIBVERSION_SOVERSION} )
14
15-SET_TARGET_PROPERTIES( opensync PROPERTIES COMPILE_FLAGS ${SYMBOLS_VISIBILITY} )
16-
17 IF ( OPENSYNC_UNITTESTS )
18 ADD_LIBRARY( opensync-testing SHARED ${libopensync_LIB_SRCS} )
19 TARGET_LINK_LIBRARIES( opensync-testing ${GLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GMODULE2_LIBRARIES} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBEXSLT_LIBRARIES} ${SQLITE3_LIBRARIES} )
diff --git 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
deleted file mode 100644
index d59fddb..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 CMakeLists.txt | 1 -
5 1 file changed, 1 deletion(-)
6
7Index: libopensync-0.37/CMakeLists.txt
8===================================================================
9--- libopensync-0.37.orig/CMakeLists.txt 2008-08-18 16:14:24.000000000 +0100
10+++ libopensync-0.37/CMakeLists.txt 2008-10-15 14:00:12.000000000 +0100
11@@ -65,7 +65,6 @@
12 FIND_PACKAGE( LibXslt REQUIRED )
13 FIND_PACKAGE( LibExslt REQUIRED )
14 FIND_PACKAGE( SWIG )
15-FIND_PACKAGE( PythonLibs )
16 FIND_PACKAGE( Check )
17
18 ADD_SUBDIRECTORY( opensync )
diff --git 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
deleted file mode 100644
index 9ef0353..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake
4===================================================================
5--- libopensync-plugin-evolution2-0.36.orig/cmake/modules/FindOpenSync.cmake 2008-10-20 13:07:14.000000000 +0100
6+++ libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake 2008-10-20 13:08:09.000000000 +0100
7@@ -23,15 +23,15 @@
8 ENDIF ( OpenSync_FIND_REQUIRED )
9
10 IF ( OPENSYNC_MIN_VERSION )
11- PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0>=${OPENSYNC_MIN_VERSION} )
12+ PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync>=${OPENSYNC_MIN_VERSION} )
13 ELSE ( OPENSYNC_MIN_VERSION )
14- PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} opensync-1.0 )
15+ PKG_SEARCH_MODULE( OPENSYNC ${_pkgconfig_REQUIRED} libopensync )
16 ENDIF ( OPENSYNC_MIN_VERSION )
17
18 FIND_PROGRAM( PKGCONFIG_EXECUTABLE NAMES pkg-config )
19
20 IF ( PKGCONFIG_EXECUTABLE )
21- EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS opensync-1.0 --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
22+ EXEC_PROGRAM( ${PKGCONFIG_EXECUTABLE} ARGS libopensync --variable=datadir OUTPUT_VARIABLE _opensync_data_DIR )
23 STRING( REGEX REPLACE "[\r\n]" " " _opensync_data_DIR "${_opensync_data_DIR}" )
24 ENDIF ( PKGCONFIG_EXECUTABLE )
25
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
deleted file mode 100644
index 42dc4dd..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2_0.36.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "LGPL"
3
4DEPENDS += " evolution-data-server"
5
6SRC_URI += "file://0.37-fixes.patch;patch=1"
7
8PR = "r2"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb
deleted file mode 100644
index 404c172..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-file_0.37.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "LGPL"
diff --git 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
deleted file mode 100644
index dbcb2aa..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-google-calendar_0.36.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "GPLv2"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb
deleted file mode 100644
index cb601f2..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-irmc_0.36.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "GPLv2"
3
4DEPENDS += "openobex bluez4"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
deleted file mode 100644
index 9e7a260..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [others]
2
3Index: libopensync-plugin-syncml-0.38/src/syncml_callbacks.c
4===================================================================
5--- libopensync-plugin-syncml-0.38.orig/src/syncml_callbacks.c 2009-07-31 10:30:33.000000000 +0100
6+++ libopensync-plugin-syncml-0.38/src/syncml_callbacks.c 2009-07-31 10:30:39.000000000 +0100
7@@ -405,7 +405,7 @@
8 } else {
9 /* This problem should be fixed with the next SLOW-SYNC. */
10 osync_trace(TRACE_EXIT_ERROR, "%s - unexpected Add or Replace command", __func__);
11- smlErrorSet(error, SML_ERROR_TEMPORARY, "Unwanted Add or Replace command on second OMA DS session.");
12+ smlErrorSet(error, SML_ERROR_GENERIC, "Unwanted Add or Replace command on second OMA DS session.");
13 return FALSE;
14 }
15 }
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb
deleted file mode 100644
index e33336f..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml_0.38.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "LGPL"
3
4DEPENDS += " libsyncml (>= 0.4.7)"
5
6SRC_URI += "file://fixerror.patch;patch=1"
7
8PR = "r1"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb
deleted file mode 100644
index a7d50dc..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-vformat_0.37.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require libopensync-plugin_0.36.inc
2LICENSE = "LGPL"
3
4DEPENDS += "libcheck"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc b/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
deleted file mode 100644
index cde4779..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync-plugin_0.36.inc
+++ /dev/null
@@ -1,11 +0,0 @@
1DEPENDS = "libopensync (>= 0.36)"
2
3DESCRIPTION ?= "OpenSync plugin"
4
5SRC_URI = "http://opensync.org/download/releases/${PV}/${BPN}-${PV}.tar.bz2"
6
7inherit cmake
8
9FILES_${PN} += "${libdir}/opensync*/plugins/*.so \
10 ${libdir}/opensync*/formats/*.so \
11 ${datadir}/opensync*/defaults/"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libopensync_0.37.bb b/meta-demoapps/recipes-connectivity/opensync/libopensync_0.37.bb
deleted file mode 100644
index 437bdd2..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libopensync_0.37.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1LICENSE = "LGPL"
2HOMEPAGE = "http://www.opensync.org/"
3SUMMARY = "Synchronization framwork"
4DESCRIPTION = "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."
5DEPENDS = "sqlite3 libxml2 glib-2.0 libcheck zlib libxslt"
6
7PR = "r1"
8
9SRC_URI = "http://opensync.org/download/releases/${PV}/libopensync-${PV}.tar.bz2\
10 file://cmake.patch;patch=1 \
11 file://build-in-src.patch;patch=1 \
12 file://no-python-check.patch;patch=1"
13
14inherit cmake pkgconfig
15
16LEAD_SONAME = "libopensync.so"
17
18FILES_${PN} += " ${libdir}/opensync*/formats/*.so \
19 ${libdir}/opensync*/osplugin \
20 ${datadir}/opensync*/schemas \
21 ${datadir}/opensync*/capabilities \
22 ${datadir}/opensync*/descriptions \
23 "
24FILES_${PN}-dbg += " ${libdir}/opensync*/formats/.debug/*.so \
25 ${libdir}/opensync*/.debug/osplugin "
26
diff --git a/meta-demoapps/recipes-connectivity/opensync/libsync_git.bb b/meta-demoapps/recipes-connectivity/opensync/libsync_git.bb
deleted file mode 100644
index 4986206..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libsync_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SUMMARY = "GObject-based sync library"
2DESCRIPTION = "LibSync is a GObject-based framework for more convenient use of \
3OpenSync in GLib applications."
4LICENSE = "LGPLv2"
5SECTION = "x11"
6DEPENDS = "glib-2.0 gtk+ libglade libopensync avahi"
7RRECOMMENDS_${PN} = "\
8 libopensync-plugin-file \
9 "
10SRCREV = "3f375969d56028505db97cd25ef1679a167cfc59"
11PV = "0.0+gitr${SRCPV}"
12PR = "r2"
13
14SRC_URI = "git://git.yoctoproject.org/sync;protocol=git"
15
16inherit autotools pkgconfig
17
18S = "${WORKDIR}/sync"
19
20PACKAGES += "synctool"
21FILES_${PN} = "${libdir}/lib*.so.*"
22FILES_synctool = "${bindir} ${datadir}"
diff --git a/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch b/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch
deleted file mode 100644
index 9947af0..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 CMakeLists.txt | 4 ----
5 1 file changed, 4 deletions(-)
6
7Index: libsyncml-0.5.4/CMakeLists.txt
8===================================================================
9--- libsyncml-0.5.4.orig/CMakeLists.txt 2009-07-31 09:56:16.000000000 +0100
10+++ libsyncml-0.5.4/CMakeLists.txt 2009-07-31 09:57:33.000000000 +0100
11@@ -72,10 +72,6 @@
12 CHECK_TYPE_SIZE( uint32_t UINT32_T )
13 CHECK_TYPE_SIZE( uint8_t UINT8_T )
14
15-# ensure out od source build
16-INCLUDE( MacroEnsureOutOfSourceBuild )
17-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]'!")
18-
19 # find requirements
20 SET ( GLIB2_MIN_VERSION "2.12" )
21 SET ( OPENOBEX_MIN_VERSION "1.1" )
diff --git a/meta-demoapps/recipes-connectivity/opensync/libsyncml_0.5.4.bb b/meta-demoapps/recipes-connectivity/opensync/libsyncml_0.5.4.bb
deleted file mode 100644
index e96463b..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/libsyncml_0.5.4.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1DESCRIPTION = "Libsyncml is a implementation of the SyncML protocol."
2HOMEPAGE = "http://libsyncml.opensync.org/"
3LICENSE = "LGPL"
4DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez4 openobex libcheck"
5PR = "r1"
6
7SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/0.5.4/libsyncml-0.5.4.tar.bz2 \
8 file://build-in-src.patch;patch=1"
9
10inherit cmake pkgconfig
11
12PACKAGES += "${PN}-tools"
13
14FILES_${PN}-tools = "${bindir}"
15FILES_${PN} = "${libdir}/*.so.*"
16
17export VERBOSE="1"
diff --git a/meta-demoapps/recipes-connectivity/opensync/msynctool_0.38.bb b/meta-demoapps/recipes-connectivity/opensync/msynctool_0.38.bb
deleted file mode 100644
index ff86a0b..0000000
--- a/meta-demoapps/recipes-connectivity/opensync/msynctool_0.38.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1SUMMARY = "Calendar (and other PIM data) synchronization program"
2DESCRIPTION = "msynctool is a program to synchronize calendars, \
3addressbooks and other PIM data between programs on your computer and \
4other computers, mobile devices, PDAs or cell phones. It uses the \
5OpenSync plugins when synchronizing data."
6HOMEPAGE = "http://www.opensync.org/"
7LICENSE = "GPLv2+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
9 file://tools/msynctool.c;beginline=1;endline=20;md5=0b71ef245b75c74bff7d7ec58b9b4527"
10
11DEPENDS = "libopensync glib-2.0"
12
13SRC_URI = "http://www.opensync.org/download/releases/${PV}/msynctool-${PV}.tar.bz2"
14
15inherit cmake pkgconfig
16
17PR = "r0"
18
19SRC_URI[md5sum] = "495c45d6f12d3523a736864b0ced6ce5"
20SRC_URI[sha256sum] = "4a903d4db05bf2f677a675ec47e9791da9b1752c9feda0026157e82aa97e372b"
diff --git a/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch b/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
deleted file mode 100644
index ee15f4d..0000000
--- a/meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Upstream-Status: Inappropriate [disable feature]
2
3---
4 Makefile.am | 2 +-
5 configure.ac | 1 -
6 help/Makefile.am | 1 -
7 3 files changed, 1 insertion(+), 3 deletions(-)
8
9--- empathy-0.23.4.orig/Makefile.am
10+++ empathy-0.23.4/Makefile.am
11@@ -1,6 +1,6 @@
12-SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help
13+SUBDIRS = tools extensions po data libempathy libempathy-gtk src
14
15 if HAVE_MEGAPHONE
16 SUBDIRS += megaphone
17 endif
18
19--- empathy-0.23.4.orig/configure.ac
20+++ empathy-0.23.4/configure.ac
21@@ -55,11 +55,10 @@ AM_PROG_LIBTOOL
22 AM_PROG_MKDIR_P
23 AM_PATH_GLIB_2_0
24 AC_PATH_XTRA
25 IT_PROG_INTLTOOL([0.35.0])
26 GTK_DOC_CHECK([1.3])
27-GNOME_DOC_INIT
28 IDT_COMPILE_WARNINGS
29 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
30 AC_PATH_PROG(GCONFTOOL, gconftool-2)
31 AM_GCONF_SOURCE_2
32 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
33--- empathy-0.23.4.orig/help/Makefile.am
34+++ empathy-0.23.4/help/Makefile.am
35@@ -1,6 +1,5 @@
36-include $(top_srcdir)/gnome-doc-utils.make
37
38 DOC_MODULE = empathy
39 DOC_ENTITIES = legal.xml
40 DOC_FIGURES = \
41 figures/empathy-main-window.png \
diff --git a/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb b/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
deleted file mode 100644
index f4f8fae..0000000
--- a/meta-demoapps/recipes-connectivity/telepathy/empathy_2.26.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1SUMMARY = "a Telepathy based IM client"
2DESCRIPTION = "Instant messaging program supporting text, voice, video, file \
3transfers and interapplication communication over many different protocols, \
4include: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut, \
5Gadu-Gadu, Groupwise, ICQ and QQ."
6HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
7LICENSE = "GPL"
8DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade evolution-data-server"
9RDEPENDS_${PN} = "telepathy-mission-control"
10RRECOMMENDS_${PN} = "telepathy-gabble"
11PR = "r4"
12
13inherit gnome
14
15PARALLEL_MAKE = ""
16
17EXTRA_OECONF += "--disable-scrollkeeper"
18
19PACKAGES =+ "empathy-scrollkeeper-junk"
20FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper"
21
22FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
23 ${datadir}/dbus-1/services/*.service \
24 ${datadir}/telepathy/managers/*.chandler \
25 ${datadir}/icons \
26 ${libdir}/python*"
27
28FILES_${PN}-dbg += "${libdir}/python*/*/.debug"
29
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb b/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
deleted file mode 100644
index 3ddee8f..0000000
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-farsight_0.0.7.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1SUMMARY = "Telepathy fasrsight"
2DESCRIPTION = "Glue library for telepathy media signalling and the media \
3streaming capabilities of Farsight2."
4HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
5DEPENDS = "glib-2.0 dbus telepathy-glib farsight2"
6LICENSE = "LGPLv2"
7
8SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${BPN}-${PV}.tar.gz \
9"
10
11inherit autotools
12
13EXTRA_OECONF = "--disable-python"
14
15FILES_${PN} += "${datadir}/telepathy \
16 ${datadir}/dbus-1"
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager
deleted file mode 100644
index 9000cd4..0000000
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble/gabble.manager
+++ /dev/null
@@ -1,33 +0,0 @@
1
2[ConnectionManager]
3BusName=org.freedesktop.Telepathy.ConnectionManager.gabble
4ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble
5
6[Protocol jabber]
7param-account=s required register
8param-password=s required register
9param-server=s
10param-resource=s
11param-priority=n
12param-port=q
13param-old-ssl=b
14param-register=b
15param-low-bandwidth=b
16param-https-proxy-server=s
17param-https-proxy-port=q
18param-fallback-conference-server=s
19param-stun-server=s
20param-stun-port=q
21param-ignore-ssl-errors=b
22param-alias=s
23param-mac=s
24param-btid=s
25default-resource=Telepathy
26default-priority=0
27default-port=5222
28default-old-ssl=false
29default-register=false
30default-low-bandwidth=false
31default-https-proxy-port=443
32default-stun-port=3478
33default-ignore-ssl-errors=false
diff --git a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb b/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
deleted file mode 100644
index 36e9d65..0000000
--- a/meta-demoapps/recipes-connectivity/telepathy/telepathy-gabble_0.7.8.bb
+++ /dev/null
@@ -1,18 +0,0 @@
1SUMMARY = "Telepathy Jabber/XMPP connection manager"
2DESCRIPTION = "Telepathy implementation of the Jabber/XMPP protocols."
3HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
4DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib dbus-glib"
5LICENSE = "LGPL"
6
7# gabble.manager needs to get regenerated every release, so please don't copy it over blindly
8SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${BPN}-${PV}.tar.gz \
9 file://gabble.manager"
10
11inherit autotools pkgconfig
12
13do_compile_prepend() {
14 cp ${WORKDIR}/gabble.manager ${S}/data/
15}
16
17FILES_${PN} += "${datadir}/telepathy \
18 ${datadir}/dbus-1"
diff --git a/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch b/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch
deleted file mode 100644
index 1d9ea43..0000000
--- a/meta-demoapps/recipes-connectivity/wbxml/files/no-doc-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1
2Upstream-Status: Inappropriate [configuration]
3--- wbxml2-0.9.2/Makefile.am.old 2007-01-03 19:50:24.000000000 +0000
4+++ wbxml2-0.9.2/Makefile.am 2007-01-03 19:50:39.000000000 +0000
5@@ -24,9 +24,9 @@
6 TODO\
7 doxygen.h
8
9-install-data-local:
10- $(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
11- cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
12+#install-data-local:
13+# $(mkinstalldirs) $(DESTDIR)$(wbxmldocdir)/manual
14+# cp -Rp doc/* $(DESTDIR)$(wbxmldocdir)/manual
15
16 dist-bz2: distdir
17 sed -e "s/tar.gz/tar.bz2/g" $(distdir)/wbxml2.spec > $(distdir)/wbxml2.spec.aux
diff --git a/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb b/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
deleted file mode 100644
index 42655a1..0000000
--- a/meta-demoapps/recipes-connectivity/wbxml/wbxml2_0.9.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
1SUMMARY = "Parsing and Encoding of WBXML documents"
2DESCRIPTION = "The WBXML Library (aka libwbxml) contains a library and \
3its associated tools to Parse, Encode and Handle WBXML documents. The \
4WBXML format is a binary representation of XML, defined by the Wap \
5Forum, and used to reduce bandwidth in mobile communications."
6LICENSE = "GPLv2"
7
8DEPENDS = "libxml2 sed-native expat"
9
10SRC_URI = "${SOURCEFORGE_MIRROR}/wbxmllib/${BPN}-${PV}.tar.gz \
11 file://no-doc-install.patch;patch=1"
12
13inherit autotools pkgconfig
14
15do_configure_append() {
16 sed -i s:-I/usr/include::g Makefile
17 sed -i s:-I/usr/include::g */Makefile
18}
19
20PACKAGES += "${PN}-tools"
21
22FILES_${PN}-tools = "${bindir}"
23FILES_${PN} = "${libdir}/*.so.*"
24
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc b/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
deleted file mode 100644
index 511ae97..0000000
--- a/meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc
+++ /dev/null
@@ -1,64 +0,0 @@
1DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
2HOMEPAGE = "http://www.abiword.org"
3SECTION = "x11/office"
4LICENSE = "GPLv2"
5DEPENDS = "perl-native wv libgsf libglade libfribidi jpeg libpng libxml2"
6RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
7 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
8
9SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
10
11#want 2.x from 2.x.y for the installation directory
12SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
13
14FILES_${PN} += " \
15 ${datadir}/icons/* \
16 ${datadir}/abiword-${SHRT_VER}/glade \
17 ${datadir}/abiword-${SHRT_VER}/scripts \
18 ${datadir}/abiword-${SHRT_VER}/system.profile-en \
19 ${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
20 ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
21 ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
22 ${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
23 ${datadir}/abiword-${SHRT_VER}/templates/Business-Report.awt \
24 ${datadir}/abiword-${SHRT_VER}/templates/Fax-Coversheet.awt \
25 ${datadir}/abiword-${SHRT_VER}/templates/Resume.awt \
26 ${datadir}/abiword-${SHRT_VER}/templates/Two-Columns.awt \
27 ${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
28 ${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
29
30# ${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
31# ${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
32
33inherit autotools pkgconfig
34
35PARALLEL_MAKE = ""
36
37EXTRA_OECONF = " --disable-pspell \
38 --disable-spellcheck \
39 --disable-printing \
40 --disable-exports \
41 --with-sys-wv"
42
43# AbiWord configure.ac does not play nicely with autoreconf
44# so use the autogen.sh script that comes with AbiWord
45#
46do_configure() {
47 cd ${S}
48 export NOCONFIGURE="no"; ./autogen.sh
49 oe_runconf
50}
51
52
53do_install_append() {
54 install -d ${D}${datadir}/pixmaps/
55 mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
56}
57
58PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates "
59
60FILES_abiword-clipart += "${datadir}/abiword-${SHRT_VER}/clipart"
61FILES_abiword-icons += "${datadir}/abiword-${SHRT_VER}/icons"
62FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/AbiWord/strings"
63FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile*"
64FILES_abiword-templates += "${datadir}/abiword-${SHRT_VER}/templates"
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb b/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
deleted file mode 100644
index 7ee0f86..0000000
--- a/meta-demoapps/recipes-gnome/abiword/abiword-embedded_2.5.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require abiword-2.5.inc
2
3PR = "r1"
4
5EXTRA_OECONF += "--enable-embedded"
6
7S = "${WORKDIR}/abiword-${PV}"
8
9RCONFLICTS = "abiword"
10RPROVIDES += "abiword"
11
12
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword.inc b/meta-demoapps/recipes-gnome/abiword/abiword.inc
deleted file mode 100644
index 036f98f..0000000
--- a/meta-demoapps/recipes-gnome/abiword/abiword.inc
+++ /dev/null
@@ -1,64 +0,0 @@
1DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word"
2SECTION = "gnome/office"
3HOMEPAGE = "http://www.abiword.org""
4LICENSE = "GPLv2"
5
6DEPENDS = "libgsf libglade libfribidi libxml2 wv"
7RRECOMMENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
8 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
9
10# Share this file between recipes that use cvs and that pull tarballs
11# (one day change this to differentiate automatically based on PV and set the
12# SRC_URI and S var directly)
13RELURI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
14RELSRC = "${WORKDIR}/abiword-${PV}/abi"
15
16SVNURI = "svn://svn.abisource.com/abiword/trunk;module=abiword;proto=http"
17SVNSRC = "${WORKDIR}/abi"
18
19#want 2.x from 2.x.y for the installation directory
20SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
21
22FILES_${PN} += " \
23 ${datadir}/icons/* \
24 ${datadir}/mime-info \
25 ${datadir}/abiword-${SHRT_VER}/glade \
26 ${datadir}/abiword-${SHRT_VER}/system.profile-en \
27 ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \
28 "
29
30# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
31# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
32
33inherit autotools pkgconfig
34
35PARALLEL_MAKE = ""
36
37# This is a minimalistic AbiWord build
38#
39# if you are planning to build plugins, make sure to comment out the
40# --disable-exports options
41
42EXTRA_OECONF = " --enable-embedded=poky \
43 --disable-printing \
44 --with-sys-wv \
45 --disable-exports \
46 --disable-spellcheck"
47
48# TODO -- refactor this, so that instead of two strings and profiles
49# packages we have lots of locale packages, each with a set of strings and
50# a profile
51#
52PACKAGES += " abiword-strings abiword-systemprofiles"
53
54FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings"
55FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*"
56
57# AbiWord configure.ac does not play nicely with autoreconf
58# so use the autogen.sh script that comes with AbiWord
59#
60do_configure() {
61 cd ${S}
62 export NOCONFIGURE="no"; ./autogen.sh
63 oe_runconf
64}
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb b/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb
deleted file mode 100644
index c10d761..0000000
--- a/meta-demoapps/recipes-gnome/abiword/abiword_2.5.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require abiword-2.5.inc
2
3PR = "r2"
4
5RCONFLICTS_${PN} = "abiword-embedded"
diff --git a/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb b/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
deleted file mode 100644
index a8946a8..0000000
--- a/meta-demoapps/recipes-gnome/abiword/abiword_svn.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require abiword.inc
2
3SRCREV = "21818"
4PV="2.5.2+svnr${SRCPV}"
5PR = "r0"
6
7SRC_URI = "${SVNURI}"
8
9S = "${SVNSRC}"
10
diff --git a/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch b/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
deleted file mode 100644
index 64a9aff..0000000
--- a/meta-demoapps/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1---
2 Makefile.am | 2 +-
3 gcalctool/Makefile.am | 2 --
4 2 files changed, 1 insertion(+), 3 deletions(-)
5
6Upstream-Status: Inappropriate [configuration]
7
8Index: gcalctool-5.8.17/gcalctool/Makefile.am
9===================================================================
10--- gcalctool-5.8.17.orig/gcalctool/Makefile.am 2005-12-19 15:46:57.000000000 +0000
11+++ gcalctool-5.8.17/gcalctool/Makefile.am 2007-05-16 16:03:26.000000000 +0100
12@@ -1,8 +1,6 @@
13 ## Process this file with automake to produce Makefile.in
14
15 INCLUDES = \
16- -I$(includedir) \
17- -DG_DISABLE_DEPRECATED \
18 -DGDK_PIXBUF_DISABLE_DEPRECATED \
19 -DGDK_DISABLE_DEPRECATED \
20 -DGNOME_DISABLE_DEPRECATED \
21Index: gcalctool-5.8.17/Makefile.am
22===================================================================
23--- gcalctool-5.8.17.orig/Makefile.am 2007-05-16 15:35:44.000000000 +0100
24+++ gcalctool-5.8.17/Makefile.am 2007-05-16 16:06:46.000000000 +0100
25@@ -29,7 +29,7 @@ DISTCLEANFILES = \
26 gnome-doc-utils.make \
27 gcalctool.desktop
28
29-SUBDIRS = po gcalctool help
30+SUBDIRS = po gcalctool
31
32 SCHEMAS_FILE = gcalctool.schemas
33
diff --git a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb
deleted file mode 100644
index 4b74cf1..0000000
--- a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.7.32.bb
+++ /dev/null
@@ -1,13 +0,0 @@
1LICENSE = "GPL"
2SECTION = "x11"
3DEPENDS = "gtk+"
4DESCRIPTION = "gcalctool is a powerful calculator"
5PR = "r2"
6
7SRC_URI = "http://download.gnome.org/sources/${BPN}/5.7/${BPN}-${PV}.tar.gz \
8 file://makefile-fix.diff;patch=1\
9 file://fix-includedir.patch;patch=1"
10
11inherit autotools pkgconfig
12
13EXTRA_OECONF = "--disable-gnome"
diff --git a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb b/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
deleted file mode 100644
index 8854ecf..0000000
--- a/meta-demoapps/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1LICENSE = "GPL"
2SECTION = "x11"
3DEPENDS = "gtk+ gnome-doc-utils"
4DESCRIPTION = "gcalctool is a powerful calculator"
5PR = "r0"
6
7SRC_URI = "http://download.gnome.org/sources/${BPN}/5.8/${BPN}-${PV}.tar.gz \
8 file://fix-includedir.patch;patch=1"
9
10inherit autotools pkgconfig
11
12EXTRA_OECONF = "--disable-gnome"
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
deleted file mode 100644
index 892946f..0000000
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: gnome-settings-daemon-2.26.1/configure.ac
4===================================================================
5--- gnome-settings-daemon-2.26.1.orig/configure.ac 2009-09-16 22:57:31.000000000 +0100
6+++ gnome-settings-daemon-2.26.1/configure.ac 2009-09-16 22:58:45.000000000 +0100
7@@ -133,9 +133,6 @@
8 #
9 AC_DEFUN([AC_CHECK_X_HEADERS], [
10 ac_save_CPPFLAGS="$CPPFLAGS"
11- if test \! -z "$includedir" ; then
12- CPPFLAGS="$CPPFLAGS -I$includedir"
13- fi
14 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
15 AC_CHECK_HEADERS([$1],[$2],[$3],[$4])
16 CPPFLAGS="$ac_save_CPPFLAGS"])
17@@ -148,15 +145,9 @@
18 ac_save_LDFLAGS="$LDFLAGS"
19 # ac_save_LIBS="$LIBS"
20
21- if test \! -z "$includedir" ; then
22- CPPFLAGS="$CPPFLAGS -I$includedir"
23- fi
24 # note: $X_CFLAGS includes $x_includes
25 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
26
27- if test \! -z "$libdir" ; then
28- LDFLAGS="$LDFLAGS -L$libdir"
29- fi
30 # note: $X_LIBS includes $x_libraries
31 LDFLAGS="$LDFLAGS $ALL_X_LIBS"
32
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
deleted file mode 100644
index b8f1661..0000000
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3--- gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in~ 2009-04-24 20:59:51.000000000 -0700
4+++ gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in 2009-04-24 20:59:51.000000000 -0700
5@@ -2,7 +2,7 @@
6 Type=Application
7 _Name=GNOME Settings Daemon
8 Exec=@LIBEXECDIR@/gnome-settings-daemon
9-OnlyShowIn=GNOME;
10+OnlyShowIn=GNOME;MOBLIN;
11 X-GNOME-Autostart-Phase=Initialization
12 X-GNOME-Autostart-Notify=true
13 X-GNOME-AutoRestart=true
diff --git 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
deleted file mode 100644
index b9cf6e1..0000000
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Pending
2
3============================================================
4 Listen for DeviceAdded in addition to DeviceEnabled
5
6 This should help address problems like left-handed
7mouse, and acceleration settings getting lost after
8resume, or when new devices gets plugged in.
9
10diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
11--- a/plugins/mouse/gsd-mouse-manager.c
12+++ b/plugins/mouse/gsd-mouse-manager.c
13@@ -320,7 +320,7 @@ devicepresence_filter (GdkXEvent *xevent,
14 if (xev->type == xi_presence)
15 {
16 XDevicePresenceNotifyEvent *dpn = (XDevicePresenceNotifyEvent *) xev;
17- if (dpn->devchange == DeviceEnabled)
18+ if (dpn->devchange == DeviceEnabled || dpn->devchange == DeviceAdded)
19 set_mouse_settings ((GsdMouseManager *) data);
20 }
21 return GDK_FILTER_CONTINUE;
diff --git 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
deleted file mode 100644
index 965da09..0000000
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: gnome-settings-daemon-2.25.90/configure.ac
4===================================================================
5--- gnome-settings-daemon-2.25.90.orig/configure.ac
6+++ gnome-settings-daemon-2.25.90/configure.ac
7@@ -85,6 +85,8 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2)
8
9 AM_GCONF_SOURCE_2
10
11+AC_CHECK_LIB(gthread-2.0, g_thread_init)
12+
13 dnl ---------------------------------------------------------------------------
14 dnl - Check for libnotify
15 dnl ---------------------------------------------------------------------------
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
deleted file mode 100644
index 79f2871..0000000
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1Upstream-Status: Pending
2
3diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c
4index f84cfad..e8f474a 100644
5--- a/plugins/housekeeping/gsd-housekeeping-manager.c
6+++ b/plugins/housekeeping/gsd-housekeeping-manager.c
7@@ -85,9 +85,13 @@ thumb_data_free (gpointer data)
8 }
9 }
10
11+typedef enum {
12+ HASH,
13+ HASH_PNG
14+} FileType;
15
16 static GList *
17-read_dir_for_purge (const char *path, GList *files)
18+read_dir_for_purge (const char *path, GList *files, FileType type)
19 {
20 GFile *read_path;
21 GFileEnumerator *enum_dir;
22@@ -105,9 +109,20 @@ read_dir_for_purge (const char *path, GList *files)
23 GFileInfo *info;
24 while ((info = g_file_enumerator_next_file (enum_dir, NULL, NULL)) != NULL) {
25 const char *name;
26+ gboolean prune = FALSE;
27+
28 name = g_file_info_get_name (info);
29
30- if (strlen (name) == 36 && strcmp (name + 32, ".png") == 0) {
31+ switch (type) {
32+ case HASH:
33+ prune = (strlen (name) == 36);
34+ break;
35+ case HASH_PNG:
36+ prune = (strlen (name) == 36 && strcmp (name + 32, ".png") == 0);
37+ break;
38+ }
39+
40+ if (prune) {
41 ThumbData *td;
42 GFile *entry;
43 char *entry_path;
44@@ -197,14 +212,14 @@ purge_thumbnail_cache (void)
45 ".thumbnails",
46 "normal",
47 NULL);
48- files = read_dir_for_purge (path, NULL);
49+ files = read_dir_for_purge (path, NULL, HASH_PNG);
50 g_free (path);
51
52 path = g_build_filename (g_get_home_dir (),
53 ".thumbnails",
54 "large",
55 NULL);
56- files = read_dir_for_purge (path, files);
57+ files = read_dir_for_purge (path, files, HASH_PNG);
58 g_free (path);
59
60 path = g_build_filename (g_get_home_dir (),
61@@ -212,7 +227,14 @@ purge_thumbnail_cache (void)
62 "fail",
63 "gnome-thumbnail-factory",
64 NULL);
65- files = read_dir_for_purge (path, files);
66+ files = read_dir_for_purge (path, files, HASH_PNG);
67+ g_free (path);
68+
69+ path = g_build_filename (g_get_user_cache_dir (),
70+ "mojito",
71+ "thumbnails",
72+ NULL);
73+ files = read_dir_for_purge (path, files, HASH);
74 g_free (path);
75
76 g_get_current_time (&current_time);
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch b/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
deleted file mode 100644
index 25dc36e..0000000
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch
+++ /dev/null
@@ -1,620 +0,0 @@
1Upstream-Status: Pending
2
3diff --git a/configure.ac b/configure.ac
4index 135f2ce..ba737a5 100644
5--- a/configure.ac
6+++ b/configure.ac
7@@ -356,6 +356,7 @@ plugins/keybindings/Makefile
8 plugins/keyboard/Makefile
9 plugins/media-keys/Makefile
10 plugins/media-keys/cut-n-paste/Makefile
11+plugins/mount/Makefile
12 plugins/mouse/Makefile
13 plugins/screensaver/Makefile
14 plugins/sound/Makefile
15diff --git a/data/gnome-settings-daemon.schemas.in b/data/gnome-settings-daemon.schemas.in
16index 4920ae3..502e9e6 100644
17--- a/data/gnome-settings-daemon.schemas.in
18+++ b/data/gnome-settings-daemon.schemas.in
19@@ -557,5 +557,29 @@
20 </locale>
21 </schema>
22
23+ <schema>
24+ <key>/schemas/apps/gnome_settings_daemon/plugins/mount/active</key>
25+ <applyto>/apps/gnome_settings_daemon/plugins/mount/active</applyto>
26+ <owner>gnome-settings-daemon</owner>
27+ <type>bool</type>
28+ <default>TRUE</default>
29+ <locale name="C">
30+ <short>Enable mount plugin</short>
31+ <long>Set to True to enable the plugin to automount media.</long>
32+ </locale>
33+ </schema>
34+ <schema>
35+ <key>/schemas/apps/gnome_settings_daemon/plugins/mount/priority</key>
36+ <applyto>/apps/gnome_settings_daemon/plugins/mount/priority</applyto>
37+ <owner>gnome-settings-daemon</owner>
38+ <type>int</type>
39+ <default>99</default>
40+ <locale name="C">
41+ <short></short>
42+ <long></long>
43+ </locale>
44+ </schema>
45+
46+
47 </schemalist>
48 </gconfschemafile>
49diff --git a/plugins/Makefile.am b/plugins/Makefile.am
50index 2d33061..46615c1 100644
51--- a/plugins/Makefile.am
52+++ b/plugins/Makefile.am
53@@ -11,6 +11,7 @@ SUBDIRS = \
54 keybindings \
55 keyboard \
56 media-keys \
57+ mount \
58 mouse \
59 screensaver \
60 sound \
61diff --git a/plugins/mount/Makefile.am b/plugins/mount/Makefile.am
62new file mode 100644
63index 0000000..188c83d
64--- /dev/null
65+++ b/plugins/mount/Makefile.am
66@@ -0,0 +1,39 @@
67+plugin_LTLIBRARIES = \
68+ libmount.la
69+
70+libmount_la_SOURCES = \
71+ gsd-mount-manager.c \
72+ gsd-mount-manager.h \
73+ gsd-mount-plugin.c \
74+ gsd-mount-plugin.h
75+
76+libmount_la_CPPFLAGS = \
77+ -I$(top_srcdir)/gnome-settings-daemon \
78+ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
79+ $(AM_CPPFLAGS)
80+
81+libmount_la_CFLAGS = \
82+ $(SETTINGS_PLUGIN_CFLAGS) \
83+ $(AM_CFLAGS)
84+
85+libmount_la_LDFLAGS = \
86+ $(GSD_PLUGIN_LDFLAGS)
87+
88+libmount_la_LIBADD = \
89+ $(SETTINGS_PLUGIN_LIBS)
90+
91+plugin_in_files = \
92+ mount.gnome-settings-plugin.in
93+
94+plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
95+
96+EXTRA_DIST = \
97+ $(plugin_in_files)
98+
99+CLEANFILES = \
100+ $(plugin_DATA)
101+
102+DISTCLEANFILES = \
103+ $(plugin_DATA)
104+
105+@GSD_INTLTOOL_PLUGIN_RULE@
106diff --git a/plugins/mount/gsd-mount-manager.c b/plugins/mount/gsd-mount-manager.c
107new file mode 100644
108index 0000000..a768f03
109--- /dev/null
110+++ b/plugins/mount/gsd-mount-manager.c
111@@ -0,0 +1,261 @@
112+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
113+ *
114+ * Copyright (C) 2009 Intel Corporation
115+ *
116+ * This program is free software; you can redistribute it and/or modify it under
117+ * the terms of the GNU General Public License as published by the Free Software
118+ * Foundation; either version 2 of the License, or (at your option) any later
119+ * version.
120+ *
121+ * This program is distributed in the hope that it will be useful, but WITHOUT
122+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
123+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
124+ * details.
125+ *
126+ * You should have received a copy of the GNU General Public License along with
127+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
128+ * Place - Suite 330, Boston, MA 02111-1307, USA.
129+ *
130+ */
131+
132+#include <config.h>
133+
134+#include <glib.h>
135+#include <glib/gi18n.h>
136+#include <gio/gio.h>
137+#include <gtk/gtk.h>
138+
139+#include "gsd-mount-manager.h"
140+
141+#define GSD_MOUNT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MOUNT_MANAGER, GsdMountManagerPrivate))
142+
143+struct GsdMountManagerPrivate
144+{
145+ GVolumeMonitor *monitor;
146+};
147+
148+G_DEFINE_TYPE (GsdMountManager, gsd_mount_manager, G_TYPE_OBJECT)
149+
150+static gpointer manager_object = NULL;
151+
152+#if 0
153+static void
154+drive_connected_cb (GVolumeMonitor *monitor,
155+ GDrive *drive,
156+ GsdMountManager *manager)
157+{
158+ /* TODO: listen for the eject button */
159+}
160+#endif
161+
162+static void
163+volume_mounted_cb (GObject *source_object, GAsyncResult *result, gpointer user_data)
164+{
165+ GError *error = NULL;
166+ char *name;
167+
168+ name = g_volume_get_name (G_VOLUME (source_object));
169+
170+ if (!g_volume_mount_finish (G_VOLUME (source_object), result, &error)) {
171+ g_debug ("Failed to mount '%s': %s", name, error->message);
172+
173+ if (error->code != G_IO_ERROR_FAILED_HANDLED) {
174+ char *primary;
175+ GtkWidget *dialog;
176+
177+ primary = g_strdup_printf (_("Unable to mount %s"), name);
178+
179+ dialog = gtk_message_dialog_new (NULL, 0,
180+ GTK_MESSAGE_ERROR,
181+ GTK_BUTTONS_CLOSE,
182+ primary);
183+
184+ g_free (primary);
185+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error->message);
186+
187+ gtk_dialog_run (GTK_DIALOG (dialog));
188+ gtk_widget_destroy (dialog);
189+ }
190+ g_error_free (error);
191+ } else {
192+ g_debug ("Mounted '%s'", name);
193+ }
194+
195+ g_free (name);
196+}
197+
198+static void
199+volume_added_cb (GVolumeMonitor *monitor,
200+ GVolume *volume,
201+ GsdMountManager *manager)
202+{
203+ char *name;
204+
205+ name = g_volume_get_name (volume);
206+ g_debug ("Volme '%s' added", name);
207+
208+ if (g_volume_can_mount (volume)) {
209+ GMountOperation *mount_op;
210+
211+ g_debug ("Mounting '%s'", name);
212+
213+ mount_op = gtk_mount_operation_new (NULL);
214+ g_volume_mount (volume, G_MOUNT_MOUNT_NONE,
215+ mount_op, NULL,
216+ volume_mounted_cb, manager);
217+ }
218+
219+ g_free (name);
220+}
221+
222+static void
223+mount_added_cb (GVolumeMonitor *monitor,
224+ GMount *mount,
225+ GsdMountManager *manager)
226+{
227+ GFile *file;
228+ char *uri;
229+
230+ file = g_mount_get_root (mount);
231+ uri = g_file_get_uri (file);
232+
233+ g_debug ("%s mounted, starting file manager", uri);
234+
235+ /* TODO: error */
236+ gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL);
237+
238+ g_free (uri);
239+ g_object_unref (file);
240+}
241+
242+static void
243+mount_existing_volumes (GsdMountManager *manager)
244+{
245+ /* TODO: iterate over drives to hook up eject */
246+ GList *l;
247+
248+ g_debug ("Mounting existing volumes");
249+
250+ l = g_volume_monitor_get_volumes (manager->priv->monitor);
251+ while (l) {
252+ GVolume *volume = l->data;
253+ GMount *mount;
254+
255+ mount = g_volume_get_mount (volume);
256+ if (mount == NULL &&
257+ g_volume_can_mount (volume) &&
258+ g_volume_should_automount (volume)) {
259+ GMountOperation *mount_op;
260+ char *name;
261+
262+ name = g_volume_get_name (volume);
263+ g_debug ("Mounting '%s'", name);
264+ g_free (name);
265+
266+ mount_op = gtk_mount_operation_new (NULL);
267+ g_volume_mount (volume, G_MOUNT_MOUNT_NONE,
268+ mount_op, NULL,
269+ volume_mounted_cb, manager);
270+ }
271+
272+ if (mount)
273+ g_object_unref (mount);
274+ g_object_unref (volume);
275+ l = g_list_delete_link (l, l);
276+ }
277+}
278+
279+gboolean
280+gsd_mount_manager_start (GsdMountManager *manager,
281+ GError **error)
282+{
283+ g_debug ("Starting mount manager");
284+
285+ manager->priv->monitor = g_volume_monitor_get ();
286+
287+#if 0
288+ g_signal_connect_object (manager->priv->monitor, "drive-connected",
289+ G_CALLBACK (drive_connected_cb), manager, 0);
290+#endif
291+ g_signal_connect_object (manager->priv->monitor, "volume-added",
292+ G_CALLBACK (volume_added_cb), manager, 0);
293+ g_signal_connect_object (manager->priv->monitor, "mount-added",
294+ G_CALLBACK (mount_added_cb), manager, 0);
295+
296+ /* TODO: handle eject buttons */
297+
298+#if 0
299+ mount_existing_volumes (manager);
300+#endif
301+
302+ return TRUE;
303+}
304+
305+void
306+gsd_mount_manager_stop (GsdMountManager *manager)
307+{
308+ g_debug ("Stopping mount manager");
309+}
310+
311+static void
312+gsd_mount_manager_dispose (GObject *object)
313+{
314+ GsdMountManager *manager = GSD_MOUNT_MANAGER (object);
315+
316+ if (manager->priv->monitor) {
317+ g_signal_handlers_disconnect_by_func
318+ (manager->priv->monitor, volume_added_cb, manager);
319+ g_signal_handlers_disconnect_by_func
320+ (manager->priv->monitor, mount_added_cb, manager);
321+ g_object_unref (manager->priv->monitor);
322+ manager->priv->monitor = NULL;
323+ }
324+
325+ G_OBJECT_CLASS (gsd_mount_manager_parent_class)->dispose (object);
326+}
327+
328+static void
329+gsd_mount_manager_init (GsdMountManager *manager)
330+{
331+ manager->priv = GSD_MOUNT_MANAGER_GET_PRIVATE (manager);
332+}
333+
334+static void
335+gsd_mount_manager_finalize (GObject *object)
336+{
337+ GsdMountManager *mount_manager;
338+
339+ g_return_if_fail (object != NULL);
340+ g_return_if_fail (GSD_IS_MOUNT_MANAGER (object));
341+
342+ mount_manager = GSD_MOUNT_MANAGER (object);
343+
344+ g_return_if_fail (mount_manager->priv != NULL);
345+
346+ G_OBJECT_CLASS (gsd_mount_manager_parent_class)->finalize (object);
347+}
348+
349+static void
350+gsd_mount_manager_class_init (GsdMountManagerClass *klass)
351+{
352+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
353+
354+ object_class->dispose = gsd_mount_manager_dispose;
355+ object_class->finalize = gsd_mount_manager_finalize;
356+
357+ g_type_class_add_private (klass, sizeof (GsdMountManagerPrivate));
358+}
359+
360+GsdMountManager *
361+gsd_mount_manager_new (void)
362+{
363+ if (manager_object != NULL) {
364+ g_object_ref (manager_object);
365+ } else {
366+ manager_object = g_object_new (GSD_TYPE_MOUNT_MANAGER, NULL);
367+ g_object_add_weak_pointer (manager_object,
368+ (gpointer *) &manager_object);
369+ }
370+
371+ return GSD_MOUNT_MANAGER (manager_object);
372+}
373diff --git a/plugins/mount/gsd-mount-manager.h b/plugins/mount/gsd-mount-manager.h
374new file mode 100644
375index 0000000..9093fff
376--- /dev/null
377+++ b/plugins/mount/gsd-mount-manager.h
378@@ -0,0 +1,58 @@
379+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
380+ *
381+ * Copyright (C) 2009 Intel Corporation
382+ *
383+ * This program is free software; you can redistribute it and/or modify it under
384+ * the terms of the GNU General Public License as published by the Free Software
385+ * Foundation; either version 2 of the License, or (at your option) any later
386+ * version.
387+ *
388+ * This program is distributed in the hope that it will be useful, but WITHOUT
389+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
390+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
391+ * details.
392+ *
393+ * You should have received a copy of the GNU General Public License along with
394+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
395+ * Place - Suite 330, Boston, MA 02111-1307, USA.
396+ *
397+ */
398+
399+#ifndef __GSD_MOUNT_MANAGER_H
400+#define __GSD_MOUNT_MANAGER_H
401+
402+#include <glib-object.h>
403+
404+G_BEGIN_DECLS
405+
406+#define GSD_TYPE_MOUNT_MANAGER (gsd_mount_manager_get_type ())
407+#define GSD_MOUNT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MOUNT_MANAGER, GsdMountManager))
408+#define GSD_MOUNT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MOUNT_MANAGER, GsdMountManagerClass))
409+#define GSD_IS_MOUNT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MOUNT_MANAGER))
410+#define GSD_IS_MOUNT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MOUNT_MANAGER))
411+#define GSD_MOUNT_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MOUNT_MANAGER, GsdMountManagerClass))
412+
413+typedef struct GsdMountManagerPrivate GsdMountManagerPrivate;
414+
415+typedef struct
416+{
417+ GObject parent;
418+ GsdMountManagerPrivate *priv;
419+} GsdMountManager;
420+
421+typedef struct
422+{
423+ GObjectClass parent_class;
424+} GsdMountManagerClass;
425+
426+GType gsd_mount_manager_get_type (void);
427+
428+GsdMountManager * gsd_mount_manager_new (void);
429+
430+gboolean gsd_mount_manager_start (GsdMountManager *manager,
431+ GError **error);
432+void gsd_mount_manager_stop (GsdMountManager *manager);
433+
434+G_END_DECLS
435+
436+#endif /* __GSD_MOUNT_MANAGER_H */
437diff --git a/plugins/mount/gsd-mount-plugin.c b/plugins/mount/gsd-mount-plugin.c
438new file mode 100644
439index 0000000..af295a5
440--- /dev/null
441+++ b/plugins/mount/gsd-mount-plugin.c
442@@ -0,0 +1,103 @@
443+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
444+ *
445+ * Copyright (C) 2009 Intel Corporation
446+ *
447+ * This program is free software; you can redistribute it and/or modify it under
448+ * the terms of the GNU General Public License as published by the Free Software
449+ * Foundation; either version 2, or (at your option) any later version.
450+ *
451+ * This program is distributed in the hope that it will be useful, but WITHOUT
452+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
453+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
454+ * details.
455+ *
456+ * You should have received a copy of the GNU General Public License along with
457+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
458+ * Place - Suite 330, Boston, MA 02111-1307, USA.
459+ *
460+ */
461+
462+#include <config.h>
463+
464+#include <glib/gi18n.h>
465+#include <gmodule.h>
466+#include <gnome-settings-daemon/gnome-settings-plugin.h>
467+
468+#include "gsd-mount-plugin.h"
469+#include "gsd-mount-manager.h"
470+
471+struct GsdMountPluginPrivate {
472+ GsdMountManager *manager;
473+};
474+
475+#define GSD_MOUNT_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MOUNT_PLUGIN, GsdMountPluginPrivate))
476+
477+GNOME_SETTINGS_PLUGIN_REGISTER (GsdMountPlugin, gsd_mount_plugin)
478+
479+static void
480+gsd_mount_plugin_init (GsdMountPlugin *plugin)
481+{
482+ plugin->priv = GSD_MOUNT_PLUGIN_GET_PRIVATE (plugin);
483+
484+ g_debug ("GsdMountPlugin initializing");
485+
486+ plugin->priv->manager = gsd_mount_manager_new ();
487+}
488+
489+static void
490+gsd_mount_plugin_finalize (GObject *object)
491+{
492+ GsdMountPlugin *plugin;
493+
494+ g_return_if_fail (object != NULL);
495+ g_return_if_fail (GSD_IS_MOUNT_PLUGIN (object));
496+
497+ g_debug ("GsdMountPlugin finalizing");
498+
499+ plugin = GSD_MOUNT_PLUGIN (object);
500+
501+ g_return_if_fail (plugin->priv != NULL);
502+
503+ if (plugin->priv->manager != NULL) {
504+ g_object_unref (plugin->priv->manager);
505+ }
506+
507+ G_OBJECT_CLASS (gsd_mount_plugin_parent_class)->finalize (object);
508+}
509+
510+static void
511+impl_activate (GnomeSettingsPlugin *plugin)
512+{
513+ gboolean res;
514+ GError *error;
515+
516+ g_debug ("Activating mount plugin");
517+
518+ error = NULL;
519+ res = gsd_mount_manager_start (GSD_MOUNT_PLUGIN (plugin)->priv->manager, &error);
520+ if (! res) {
521+ g_warning ("Unable to start mount manager: %s", error->message);
522+ g_error_free (error);
523+ }
524+}
525+
526+static void
527+impl_deactivate (GnomeSettingsPlugin *plugin)
528+{
529+ g_debug ("Deactivating mount plugin");
530+ gsd_mount_manager_stop (GSD_MOUNT_PLUGIN (plugin)->priv->manager);
531+}
532+
533+static void
534+gsd_mount_plugin_class_init (GsdMountPluginClass *klass)
535+{
536+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
537+ GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass);
538+
539+ object_class->finalize = gsd_mount_plugin_finalize;
540+
541+ plugin_class->activate = impl_activate;
542+ plugin_class->deactivate = impl_deactivate;
543+
544+ g_type_class_add_private (klass, sizeof (GsdMountPluginPrivate));
545+}
546diff --git a/plugins/mount/gsd-mount-plugin.h b/plugins/mount/gsd-mount-plugin.h
547new file mode 100644
548index 0000000..526a41f
549--- /dev/null
550+++ b/plugins/mount/gsd-mount-plugin.h
551@@ -0,0 +1,55 @@
552+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
553+ *
554+ * Copyright (C) 2009 Intel Corporation
555+ *
556+ * This program is free software; you can redistribute it and/or modify it under
557+ * the terms of the GNU General Public License as published by the Free Software
558+ * Foundation; either version 2, or (at your option) any later version.
559+ *
560+ * This program is distributed in the hope that it will be useful, but WITHOUT
561+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
562+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
563+ * details.
564+ *
565+ * You should have received a copy of the GNU General Public License along with
566+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
567+ * Place - Suite 330, Boston, MA 02111-1307, USA.
568+ *
569+ */
570+
571+#ifndef __GSD_MOUNT_PLUGIN_H__
572+#define __GSD_MOUNT_PLUGIN_H__
573+
574+#include <glib-object.h>
575+#include <gmodule.h>
576+#include <gnome-settings-daemon/gnome-settings-plugin.h>
577+
578+G_BEGIN_DECLS
579+
580+#define GSD_TYPE_MOUNT_PLUGIN (gsd_mount_plugin_get_type ())
581+#define GSD_MOUNT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MOUNT_PLUGIN, GsdMountPlugin))
582+#define GSD_MOUNT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MOUNT_PLUGIN, GsdMountPluginClass))
583+#define GSD_IS_MOUNT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MOUNT_PLUGIN))
584+#define GSD_IS_MOUNT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MOUNT_PLUGIN))
585+#define GSD_MOUNT_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MOUNT_PLUGIN, GsdMountPluginClass))
586+
587+typedef struct GsdMountPluginPrivate GsdMountPluginPrivate;
588+
589+typedef struct
590+{
591+ GnomeSettingsPlugin parent;
592+ GsdMountPluginPrivate *priv;
593+} GsdMountPlugin;
594+
595+typedef struct
596+{
597+ GnomeSettingsPluginClass parent_class;
598+} GsdMountPluginClass;
599+
600+GType gsd_mount_plugin_get_type (void) G_GNUC_CONST;
601+
602+G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
603+
604+G_END_DECLS
605+
606+#endif /* __GSD_MOUNT_PLUGIN_H__ */
607diff --git a/plugins/mount/mount.gnome-settings-plugin.in b/plugins/mount/mount.gnome-settings-plugin.in
608new file mode 100644
609index 0000000..ca29ad1
610--- /dev/null
611+++ b/plugins/mount/mount.gnome-settings-plugin.in
612@@ -0,0 +1,8 @@
613+[GNOME Settings Plugin]
614+Module=mount
615+IAge=0
616+_Name=Mount
617+_Description=Mount removable media
618+Authors=Ross Burton
619+Copyright=Copyright © 2009 Intel Corporation
620+Website=
diff --git 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
deleted file mode 100644
index cb216b2..0000000
--- a/meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon_2.26.1.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1DESCRIPTION = "GNOME settings daemon"
2LICENSE = "GPL"
3DEPENDS = "libxklavier gnome-doc-utils gtk+ libglade libgnomekbd gnome-desktop librsvg libxml2 libart-lgpl"
4
5PR = "r3"
6
7inherit gnome
8
9SRC_URI += "file://desktop-moblin.patch;patch=1 \
10 file://gnome-settings-daemon-fix-gthread.patch;patch=1 \
11 file://mount-plugin.patch;patch=1 \
12 file://gnome-settings-daemon-2.24.0-catch-deviceadded.patch;patch=1 \
13 file://configurefix.patch;patch=1 \
14 file://mojito-cleanup.patch;patch=1"
15
16EXTRA_OECONF = "--disable-esd --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
17ASNEEDED = ""
18
19FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \
20 ${datadir}/dbus-1/ \
21 ${datadir}/icon* \
22 ${datadir}/xsession*"
23
24FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug"
25FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.a ${libdir}/gnome-settings-daemon-2.0/*.la"
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch b/meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
deleted file mode 100644
index 435cb6a..0000000
--- a/meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1From 30f29e7d8e1b67c40cd18a7155ba30c4382692d5 Mon Sep 17 00:00:00 2001
2From: Seán de Búrca <leftmostcat@gmail.com>
3Date: Fri, 07 Aug 2009 00:38:52 +0000
4Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master
5
6Upstream-Status: Inappropriate [configuration]
7
8---
9diff --git a/help/el/el.po b/help/el/el.po
10index ab77264..635b68f 100644
11--- a/help/el/el.po
12+++ b/help/el/el.po
13@@ -10,7 +10,6 @@ msgstr ""
14 "MIME-Version: 1.0\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Transfer-Encoding: 8bit\n"
17-"Plural-Forms: 2\n"
18 "X-Poedit-Language: Greek\n"
19 "X-Poedit-Country: GREECE\n"
20 "X-Generator: Lokalize 0.2\n"
21--
22cgit v0.8.3.1
diff --git a/meta-demoapps/recipes-gnome/gnome/gnome-terminal_2.26.3.bb b/meta-demoapps/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
deleted file mode 100644
index 73f0b99..0000000
--- a/meta-demoapps/recipes-gnome/gnome/gnome-terminal_2.26.3.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1DESCRIPTION = "GNOME Terminal"
2LICENSE = "GPL"
3DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte"
4PR = "r2"
5
6inherit gnome
7
8SRC_URI += "file://30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch;patch=1"
9
10EXTRA_OECONF += "--disable-scrollkeeper"
11
12# Remove an autogenerated file that needs to be rebuilt
13do_configure_prepend () {
14 rm -f ${S}/src/terminal-type-builtins.c
15}
16
diff --git a/meta-demoapps/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb b/meta-demoapps/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb
deleted file mode 100644
index 266d44b..0000000
--- a/meta-demoapps/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1LICENSE = "GPL"
2SECTION = "x11/gnome/libs"
3DESCRIPTION = "A powerful object-oriented display"
4PR = "r2"
5
6inherit gnome
7
8DEPENDS = "libglade libart-lgpl virtual/gail"
9
10EXTRA_OECONF = "--disable-gtk-doc"
11
12FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
13FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
14FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
diff --git a/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb b/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb
deleted file mode 100644
index 68e4eee..0000000
--- a/meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "GNOME keyboard library"
2LICENSE = "LGPL"
3
4DEPENDS = "gconf dbus libxklavier gtk+"
5
6inherit gnome
7
8do_configure_append() {
9 find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
10 find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
11}
12
13
14
diff --git a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb b/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
deleted file mode 100644
index 01139c7..0000000
--- a/meta-demoapps/recipes-gnome/libgsf/libgsf_1.14.5.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1DESCRIPTION = "GNOME Structured File Library"
2LICENSE = "GPL"
3SECTION = "libs"
4PR = "r3"
5
6LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \
7 file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63 \
8 file://gsf/gsf.h;endline=25;md5=15cf6d31ad023167779ab5f0bbb76f49"
9
10DEPENDS= "libxml2 bzip2 glib-2.0 zlib"
11RDEPENDS_${PN} = "gconf"
12
13
14PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev "
15
16FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*"
17FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome"
18
19inherit autotools pkgconfig gnome gconf
20
21EXTRA_OECONF = "\
22 --without-python \
23 --without-gnome \
24 --disable-gtk-doc \
25 --with-bz2"
diff --git a/meta-demoapps/recipes-gnome/libgtkstylus/files/gtkstylus.sh b/meta-demoapps/recipes-gnome/libgtkstylus/files/gtkstylus.sh
deleted file mode 100644
index b1302ed..0000000
--- a/meta-demoapps/recipes-gnome/libgtkstylus/files/gtkstylus.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2
3GTK_MODULES=libgtkstylus.so
4
5export GTK_MODULES
diff --git a/meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb b/meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
deleted file mode 100644
index b359938..0000000
--- a/meta-demoapps/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb
+++ /dev/null
@@ -1,24 +0,0 @@
1DESCRIPTION = "GTK plugin for stylus based systems"
2SECTION = "libs"
3DEPENDS = "gtk+"
4LICENSE = "LGPL"
5PR = "r2"
6
7inherit autotools
8
9SRC_URI = "http://burtonini.com/temp/${BPN}-${PV}.tar.gz \
10 file://gtkstylus.sh"
11
12do_install_append() {
13 install -d ${D}/${sysconfdir}/X11/Xsession.d
14 install -m 755 ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus
15}
16
17# Horrible but rpm falls over if you use '*'
18GTKVER = "2.10.0"
19
20FILES_${PN} = "${sysconfdir} \
21 ${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so.*"
22FILES_${PN}-dbg += "${libdir}/gtk-2.0/${GTKVER}/modules/.debug"
23FILES_${PN}-dev += "${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so \
24 ${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.*a"
diff --git a/meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch b/meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
deleted file mode 100644
index 0c0eddf..0000000
--- a/meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: wv-1.2.0/wv-1.0.pc.in
4===================================================================
5--- wv-1.2.0.orig/wv-1.0.pc.in 2008-03-19 22:25:18.000000000 +0000
6+++ wv-1.2.0/wv-1.0.pc.in 2008-03-19 22:26:32.000000000 +0000
7@@ -6,5 +6,6 @@
8 Name: wvWare
9 Description: Word Document Filter library and utilities
10 Version: @VERSION@
11-Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
12-Cflags: -I${includedir}/wv @GSF_CFLAGS@
13+Requires: libgsf-1
14+Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
15+Cflags: -I${includedir}/wv
diff --git a/meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb b/meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb
deleted file mode 100644
index 54878a9..0000000
--- a/meta-demoapps/recipes-gnome/wv/wv_1.2.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "Programs for accessing Microsoft Word documents"
2HOMEPAGE = "http://wvware.sourceforge.net/"
3LICENSE = "GPLv2"
4DEPENDS = "libgsf glib-2.0"
5PR = "r3"
6
7SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
8 file://pkgconfig.patch;patch=1"
9
10inherit autotools pkgconfig
11
12S = "${WORKDIR}/${BPN}-${PV}"
13
14EXTRA_OECONF = ""
diff --git a/meta-demoapps/recipes-graphics/clutter/tidy.inc b/meta-demoapps/recipes-graphics/clutter/tidy.inc
deleted file mode 100644
index 13d6fc7..0000000
--- a/meta-demoapps/recipes-graphics/clutter/tidy.inc
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION = "Tidy library"
2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2.1+"
4
5STDDEPENDS = "clutter-1.4"
6BASE_CONF = "--disable-gtk-doc"
7
8DEPENDS = "${STDDEPENDS}"
9EXTRA_OECONF = "${BASE_CONF}"
10
11inherit autotools pkgconfig
12
13PACKAGES =+ "tidy-examples"
14FILES_tidy-examples = "${bindir}/test-*"
15
16do_configure_prepend() {
17 touch ${S}/gtk-doc.make
18 sed -i s:docs/reference/Makefile::g ${S}/configure.ac
19 sed -i s:docs::g ${S}/Makefile.am
20}
diff --git a/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch b/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch
deleted file mode 100644
index 51b4eea..0000000
--- a/meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: tidy/doc/reference/Makefile.am
4===================================================================
5--- tidy.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000
6+++ tidy/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000
7@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
8
9 # Other files to distribute
10 # e.g. EXTRA_DIST += version.xml.in
11-EXTRA_DIST += version.xml.in
12+EXTRA_DIST = version.xml.in
13
diff --git a/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch b/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
deleted file mode 100644
index 6942577..0000000
--- a/meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: trunk/tests/Makefile.am
4===================================================================
5--- trunk.orig/tests/Makefile.am 2008-03-04 12:22:10.000000000 +0000
6+++ trunk/tests/Makefile.am 2008-03-04 12:23:46.000000000 +0000
7@@ -1,4 +1,4 @@
8-noinst_PROGRAMS = \
9+bin_PROGRAMS = \
10 test-button \
11 test-finger-scroll \
12 test-list-view \
13@@ -14,6 +14,9 @@
14 test-grow \
15 test-viewport
16
17+test_texture_framedir = $(pkgdatadir)
18+test_texture_frame_DATA = frame.png
19+
20 INCLUDES = -I$(top_srcdir)
21 LDADD = $(top_builddir)/tidy/libtidy-1.0.la
22
diff --git a/meta-demoapps/recipes-graphics/clutter/tidy_git.bb b/meta-demoapps/recipes-graphics/clutter/tidy_git.bb
deleted file mode 100644
index 623de18..0000000
--- a/meta-demoapps/recipes-graphics/clutter/tidy_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require tidy.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
4 file://tidy/tidy.h;endline=21;md5=ac342e7aac55849bf0755d79967fa3e8"
5
6SRCREV = "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
7PV = "0.1.0+git${SRCPV}"
8PR = "r7"
9
10SRC_URI = "git://git.clutter-project.org/tidy.git;protocol=git \
11 file://tidy-enable-tests.patch;patch=1"
12
13S = "${WORKDIR}/git"
14
diff --git a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch b/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
deleted file mode 100644
index f58f30b..0000000
--- a/meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libxklavier-3.7/libxklavier.pc.in
4===================================================================
5--- libxklavier-3.7.orig/libxklavier.pc.in 2009-06-10 15:58:46.000000000 +0100
6+++ libxklavier-3.7/libxklavier.pc.in 2009-06-10 16:00:45.000000000 +0100
7@@ -5,7 +5,7 @@
8
9 Name: libxklavier
10 Description: libxklavier library
11-Requires: libxml-2.0
12+Requires: libxml-2.0 glib-2.0
13 Version: @VERSION@
14-Libs: -L${libdir} -lxklavier @GLIB_LIBS@ @XML_LIBS@
15-Cflags: -I${includedir} @GLIB_CFLAGS@
16+Libs: -L${libdir} -lxklavier
17+Cflags: -I${includedir}
diff --git a/meta-demoapps/recipes-graphics/libxklavier/libxklavier_3.9.bb b/meta-demoapps/recipes-graphics/libxklavier/libxklavier_3.9.bb
deleted file mode 100644
index da077b8..0000000
--- a/meta-demoapps/recipes-graphics/libxklavier/libxklavier_3.9.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "Utility library to make using XKB easier"
2SECTION = "x11/libs"
3DEPENDS = "iso-codes libxml2 glib-2.0 libxkbfile"
4LICENSE = "LGPL"
5PR = "r2"
6
7SRC_URI = "${SOURCEFORGE_MIRROR}/gswitchit/libxklavier-${PV}.tar.bz2 \
8 file://pkgconfigfix.patch;patch=1"
9
10inherit autotools
11
diff --git a/meta-demoapps/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c b/meta-demoapps/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
deleted file mode 100644
index 41cebc5..0000000
--- a/meta-demoapps/recipes-graphics/pong-clock/pong-clock/pong-clock-no-flicker.c
+++ /dev/null
@@ -1,410 +0,0 @@
1/*
2 * Pong Clock - A clock that plays pong.
3 * See http://mocoloco.com/archives/001766.php for the inspiration.
4 *
5 * Copyright (C) 2005 Matthew Allum
6 *
7 * Author: Matthew Allum mallum@openedhand.com
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
22 *
23 */
24
25#include <stdlib.h>
26#include <time.h>
27#include <sys/time.h>
28#include <sys/types.h>
29#include <string.h>
30#include <stdio.h>
31#include <unistd.h>
32#include <signal.h>
33
34#include <X11/Xlib.h>
35#include <X11/Xutil.h>
36#include <X11/Xatom.h>
37
38/* Tweak values for different hw setups */
39
40#define FPS 50
41#define RESX 40
42#define RESY 40
43#define TO_MISS_SECS 55
44#define BALLDX 16
45#define BALLDY 4
46
47
48typedef struct PongClock
49{
50 Display *xdpy;
51 int xscreen;
52 Window xwin, xwin_root;
53 Pixmap backbuffer;
54 GC xgc;
55 int xwin_width, xwin_height;
56 int pixelw, pixelh;
57
58 int ball_x, ball_y, ball_dx, ball_dy;
59 int bata_y, batb_y;
60 Bool bata_to_miss, batb_to_miss;
61
62}
63PongClock;
64
65void
66get_time(int *hour, int *min, int *sec)
67{
68 struct timeval tv;
69 struct tm *localTime = NULL;
70 time_t actualTime;
71
72 gettimeofday(&tv, 0);
73 actualTime = tv.tv_sec;
74 localTime = localtime(&actualTime);
75
76 if (hour)
77 *hour = localTime->tm_hour;
78
79 if (min)
80 *min = localTime->tm_min;
81
82 if (sec)
83 *sec = localTime->tm_sec;
84}
85
86void
87draw_rect (PongClock *pong_clock,
88 int x,
89 int y,
90 int width,
91 int height)
92{
93 XFillRectangle (pong_clock->xdpy,
94 pong_clock->backbuffer,
95 pong_clock->xgc,
96 x * pong_clock->pixelw,
97 y * pong_clock->pixelh,
98 width * pong_clock->pixelw,
99 height * pong_clock->pixelh);
100}
101
102void
103draw_field (PongClock *pong_clock)
104{
105 int i;
106
107 draw_rect (pong_clock, 0, 0, RESX+1, 1);
108 draw_rect (pong_clock, 0, RESY-1, RESX+1, 1);
109
110 for (i=0; i < RESY/2; i++)
111 draw_rect (pong_clock, (RESX/2)-1, i*2, 2, 1);
112}
113
114void
115draw_digit (PongClock *pong_clock,
116 int x,
117 int y,
118 int digit)
119{
120 int digits[] = { 0x1f8c63f, 0x1f21086, 0x1f0fe1f, 0x1f87e1f, 0x1087e31,
121 0x1f87c3f, 0x1f8fc3f, 0x84421f, 0x1f8fe3f, 0x1087e3f };
122
123 XRectangle rects[5*5];
124 int i,j,k;
125
126 i = 0;
127
128 for (k=0; k<5; k++)
129 for (j=0; j<5; j++)
130 if (digits[digit] & (1 << ((k*5)+j)))
131 {
132 rects[i].x = (x + j) * pong_clock->pixelw;
133 rects[i].y = (y + k) * pong_clock->pixelh;
134 rects[i].width = pong_clock->pixelw;
135 rects[i].height = pong_clock->pixelh;
136 i++;
137 }
138
139 XFillRectangles (pong_clock->xdpy,
140 pong_clock->backbuffer,
141 pong_clock->xgc,
142 rects, i);
143}
144
145void
146draw_time (PongClock *pong_clock)
147{
148 int hour, min;
149
150 get_time(&hour, &min, NULL);
151
152 draw_digit (pong_clock,
153 (RESX/2) - 14,
154 5,
155 hour / 10 );
156
157 draw_digit (pong_clock,
158 (RESX/2) - 8,
159 5,
160 hour % 10 );
161
162 draw_digit (pong_clock,
163 (RESX/2) + 3,
164 5,
165 min / 10 );
166
167 draw_digit (pong_clock,
168 (RESX/2) + 9,
169 5,
170 min % 10 );
171}
172
173void
174draw_bat_and_ball (PongClock *pong_clock)
175{
176 /* ball */
177
178 XFillRectangle (pong_clock->xdpy,
179 pong_clock->backbuffer,
180 pong_clock->xgc,
181 pong_clock->ball_x,
182 pong_clock->ball_y,
183 pong_clock->pixelw,
184 pong_clock->pixelh);
185
186 /* bat a */
187
188 XFillRectangle (pong_clock->xdpy,
189 pong_clock->backbuffer,
190 pong_clock->xgc,
191 0,
192 pong_clock->bata_y - (2 * pong_clock->pixelh),
193 pong_clock->pixelw,
194 pong_clock->pixelh * 5);
195
196 /* bat b */
197
198 XFillRectangle (pong_clock->xdpy,
199 pong_clock->backbuffer,
200 pong_clock->xgc,
201 (pong_clock->xwin_width - pong_clock->pixelw),
202 pong_clock->batb_y - (2 * pong_clock->pixelh),
203 pong_clock->pixelw,
204 pong_clock->pixelh * 5);
205
206}
207
208void
209update_state (PongClock *pong_clock)
210{
211 int sec, min, hour;
212
213 get_time(&hour, &min, &sec);
214
215 /* Check ball is on field and no ones dues to miss a shot.
216 */
217 if ( (pong_clock->ball_x < 0 && !pong_clock->bata_to_miss)
218 || (pong_clock->ball_x > (pong_clock->xwin_width - pong_clock->pixelw)
219 && !pong_clock->batb_to_miss) )
220 pong_clock->ball_dx *= -1;
221
222 if ((pong_clock->ball_y < pong_clock->pixelh)
223 || pong_clock->ball_y > (pong_clock->xwin_height - (2*pong_clock->pixelh)))
224 pong_clock->ball_dy *= -1;
225
226 pong_clock->ball_x += pong_clock->ball_dx;
227 pong_clock->ball_y += pong_clock->ball_dy;
228
229 /* Set up someone to miss if we getting close to an hour or min.
230 */
231 if (sec > TO_MISS_SECS)
232 {
233 if (min == 59)
234 pong_clock->batb_to_miss = True;
235 else
236 pong_clock->bata_to_miss = True;
237 }
238 else
239 {
240 /* Reset the game */
241 if (pong_clock->bata_to_miss)
242 {
243 pong_clock->bata_to_miss = False;
244 pong_clock->ball_y = pong_clock->bata_y;
245 pong_clock->ball_x = pong_clock->pixelw;
246 pong_clock->ball_dx *= -1;
247 }
248
249 if (pong_clock->batb_to_miss)
250 {
251 pong_clock->batb_to_miss = False;
252 pong_clock->ball_y = pong_clock->batb_y;
253 pong_clock->ball_x = pong_clock->xwin_width - pong_clock->pixelw;
254 pong_clock->ball_dx *= -1;
255 }
256 }
257
258 /* Keep bats on field and only move in not setup to miss */
259 if (pong_clock->ball_y >= (3*pong_clock->pixelh)
260 && pong_clock->ball_y <= (pong_clock->xwin_height - (5*pong_clock->pixelh)))
261 {
262 if (!pong_clock->batb_to_miss)
263 pong_clock->batb_y = pong_clock->ball_y;
264
265 if (!pong_clock->bata_to_miss)
266 pong_clock->bata_y = pong_clock->ball_y;
267 }
268}
269
270void
271draw_frame (PongClock *pong_clock)
272{
273 update_state (pong_clock);
274
275 /* Clear playfield */
276 XSetForeground (pong_clock->xdpy,
277 pong_clock->xgc,
278 BlackPixel(pong_clock->xdpy,
279 pong_clock->xscreen));
280
281 XFillRectangle (pong_clock->xdpy,
282 pong_clock->backbuffer,
283 pong_clock->xgc,
284 0, 0,
285 pong_clock->xwin_width,
286 pong_clock->xwin_height);
287
288 XSetForeground (pong_clock->xdpy,
289 pong_clock->xgc,
290 WhitePixel(pong_clock->xdpy,
291 pong_clock->xscreen));
292
293 draw_field (pong_clock);
294
295 draw_time (pong_clock);
296
297 draw_bat_and_ball (pong_clock);
298
299 /* flip 'backbuffer' */
300 XSetWindowBackgroundPixmap (pong_clock->xdpy,
301 pong_clock->xwin,
302 pong_clock->backbuffer);
303 XClearWindow(pong_clock->xdpy, pong_clock->xwin);
304
305 XSync(pong_clock->xdpy, False);
306}
307
308int
309main (int argc, char **argv)
310{
311 XGCValues gcv;
312 Atom atoms_WINDOW_STATE, atoms_WINDOW_STATE_FULLSCREEN;
313 PongClock *pong_clock;
314
315 pong_clock = malloc(sizeof(PongClock));
316 memset(pong_clock, 0, sizeof(PongClock));
317
318 if ((pong_clock->xdpy = XOpenDisplay(getenv("DISPLAY"))) == NULL) {
319 fprintf(stderr, "Cannot connect to X server on display %s.",
320 getenv("DISPLAY"));
321 exit(-1);
322 }
323
324 pong_clock->xscreen = DefaultScreen(pong_clock->xdpy);
325 pong_clock->xwin_root = DefaultRootWindow(pong_clock->xdpy);
326 pong_clock->xwin_width = DisplayWidth(pong_clock->xdpy,
327 pong_clock->xscreen);
328 pong_clock->xwin_height = DisplayHeight(pong_clock->xdpy,
329 pong_clock->xscreen);
330
331 pong_clock->pixelw = pong_clock->xwin_width / RESX;
332 pong_clock->pixelh = pong_clock->xwin_height / RESY;
333
334 pong_clock->ball_x = 0;
335 pong_clock->ball_y = pong_clock->xwin_height / 2;
336
337 pong_clock->ball_dx = BALLDX;
338 pong_clock->ball_dy = BALLDY;
339
340 pong_clock->batb_y = pong_clock->bata_y = pong_clock->ball_y;
341
342 gcv.background = BlackPixel(pong_clock->xdpy,
343 pong_clock->xscreen);
344 gcv.foreground = WhitePixel(pong_clock->xdpy,
345 pong_clock->xscreen);
346 gcv.graphics_exposures = False;
347
348 pong_clock->xgc = XCreateGC (pong_clock->xdpy, pong_clock->xwin_root,
349 GCForeground|GCBackground|GCGraphicsExposures,
350 &gcv);
351
352 atoms_WINDOW_STATE
353 = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE",False);
354 atoms_WINDOW_STATE_FULLSCREEN
355 = XInternAtom(pong_clock->xdpy, "_NET_WM_STATE_FULLSCREEN",False);
356
357 pong_clock->xwin = XCreateSimpleWindow(pong_clock->xdpy,
358 pong_clock->xwin_root,
359 0, 0,
360 pong_clock->xwin_width,
361 pong_clock->xwin_height,
362 0,
363 WhitePixel(pong_clock->xdpy,
364 pong_clock->xscreen),
365 BlackPixel(pong_clock->xdpy,
366 pong_clock->xscreen));
367
368 pong_clock->backbuffer = XCreatePixmap(pong_clock->xdpy,
369 pong_clock->xwin_root,
370 pong_clock->xwin_width,
371 pong_clock->xwin_height,
372 DefaultDepth(pong_clock->xdpy,
373 pong_clock->xscreen));
374
375 XSelectInput(pong_clock->xdpy, pong_clock->xwin, KeyPressMask);
376
377
378 /* Set the hints for fullscreen */
379 XChangeProperty(pong_clock->xdpy,
380 pong_clock->xwin,
381 atoms_WINDOW_STATE,
382 XA_ATOM,
383 32,
384 PropModeReplace,
385 (unsigned char *) &atoms_WINDOW_STATE_FULLSCREEN, 1);
386
387 XMapWindow(pong_clock->xdpy, pong_clock->xwin);
388
389 while (True)
390 {
391 struct timeval timeout;
392 XEvent xev;
393
394 timeout.tv_sec = 0;
395 timeout.tv_usec = 1000000 / FPS;
396 select (0, NULL, NULL, NULL, &timeout);
397
398 draw_frame (pong_clock);
399
400 XFlush(pong_clock->xdpy);
401
402 if (XPending(pong_clock->xdpy))
403 {
404 if (XCheckMaskEvent(pong_clock->xdpy,
405 KeyPressMask,
406 &xev))
407 exit(-1);
408 }
409 }
410}
diff --git a/meta-demoapps/recipes-graphics/pong-clock/pong-clock_1.0.bb b/meta-demoapps/recipes-graphics/pong-clock/pong-clock_1.0.bb
deleted file mode 100644
index 8d3659f..0000000
--- a/meta-demoapps/recipes-graphics/pong-clock/pong-clock_1.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@
1DESCRIPTION = "A clock combined with a game of pong"
2LICENSE = "GPLv2+"
3DEPENDS = "virtual/libx11 xdmcp xau"
4
5SRC_URI = "file://pong-clock-no-flicker.c"
6
7S = "${WORKDIR}"
8
9do_compile () {
10 ${CC} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp`
11}
12
13do_install () {
14 install -d ${D}${bindir}
15 install -m 0755 pong-clock ${D}${bindir}
16}
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xbacklight_1.1.bb b/meta-demoapps/recipes-graphics/xorg-app/xbacklight_1.1.bb
deleted file mode 100644
index 78804d7..0000000
--- a/meta-demoapps/recipes-graphics/xorg-app/xbacklight_1.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X Backlight Utility"
4DEPENDS += "libxrender libxrandr"
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xeyes_1.0.1.bb b/meta-demoapps/recipes-graphics/xorg-app/xeyes_1.0.1.bb
deleted file mode 100644
index 07ce072..0000000
--- a/meta-demoapps/recipes-graphics/xorg-app/xeyes_1.0.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require xorg-app-common.inc
2PE = "1"
3
4DEPENDS += " virtual/libx11 libxau libxt libxext libxmu"
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xrdb/60XDefaults.sh b/meta-demoapps/recipes-graphics/xorg-app/xrdb/60XDefaults.sh
deleted file mode 100644
index 08d8bec..0000000
--- a/meta-demoapps/recipes-graphics/xorg-app/xrdb/60XDefaults.sh
+++ /dev/null
@@ -1,3 +0,0 @@
1if [ -e $HOME/.Xdefaults ]; then
2 xrdb -merge -nocpp < $HOME/.Xdefaults
3fi
diff --git a/meta-demoapps/recipes-graphics/xorg-app/xrdb_1.0.5.bb b/meta-demoapps/recipes-graphics/xorg-app/xrdb_1.0.5.bb
deleted file mode 100644
index 906d7d8..0000000
--- a/meta-demoapps/recipes-graphics/xorg-app/xrdb_1.0.5.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require xorg-app-common.inc
2
3DESCRIPTION = "X server resource database utility"
4LICENSE = "xrdb"
5DEPENDS += "libxmu"
6PE = "1"
7PR = "r2"
8
9SRC_URI += "file://60XDefaults.sh"
10
11do_install_append() {
12 install -d ${D}${sysconfdir}/X11/Xsession.d/
13 install -m 0755 ${WORKDIR}/60XDefaults.sh ${D}${sysconfdir}/X11/Xsession.d/
14}
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
deleted file mode 100644
index 63c1847..0000000
--- a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3During the build process the mkg3states binary needs to be run. This patch
4allows it to be built with the build systems gcc allowing this to work.
5
6RP 31/3/10
7
8Index: liblbxutil-1.1.0/configure.ac
9===================================================================
10--- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 22:52:04.000000000 +0000
11+++ liblbxutil-1.1.0/configure.ac 2010-03-31 15:26:33.000000000 +0100
12@@ -50,4 +50,5 @@
13
14 AC_OUTPUT([Makefile
15 src/Makefile
16+ src/image/Makefile
17 lbxutil.pc])
18Index: liblbxutil-1.1.0/src/Makefile.am
19===================================================================
20--- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-04 23:03:17.000000000 +0000
21+++ liblbxutil-1.1.0/src/Makefile.am 2010-03-31 15:27:25.000000000 +0100
22@@ -3,10 +3,7 @@
23 AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS)
24 INCLUDES = -I$(top_srcdir)/include
25
26-noinst_PROGRAMS = mkg3states
27-
28-mkg3states_SOURCES = \
29- $(srcdir)/image/mkg3states.c
30+SUBDIRS = image
31
32 liblbxutil_la_SOURCES = \
33 $(srcdir)/lbx_zlib/reqstats.h \
34@@ -38,9 +35,8 @@
35
36 $(srcdir)/image/dfaxg42d.c: g3states.h
37
38-g3states.h: mkg3states
39- -rm -f g3states.h
40- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
41+g3states.h: image/mkg3states
42+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
43
44 liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined
45
46Index: liblbxutil-1.1.0/src/image/Makefile.am
47===================================================================
48--- /dev/null 1970-01-01 00:00:00.000000000 +0000
49+++ liblbxutil-1.1.0/src/image/Makefile.am 2010-03-31 15:26:33.000000000 +0100
50@@ -0,0 +1,15 @@
51+# evil hack
52+CFLAGS=$(CFLAGS_FOR_BUILD)
53+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
54+LDFLAGS=$(LDFLAGS_FOR_BUILD)
55+
56+CC=$(CC_FOR_BUILD)
57+LIBTOOL = @LIBTOOL@ --tag=CC
58+
59+noinst_PROGRAMS = mkg3states
60+
61+mkg3states_SOURCES = \
62+ mkg3states.c
63+
64+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
65+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
deleted file mode 100644
index cdf3509..0000000
--- a/meta-demoapps/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "XFIXES Extension"
4DEPENDS += " libxext xextproto xproto zlib"
5PROVIDES = "lbxutil"
6PE = "1"
7PR = "r1"
8
9SRC_URI += "file://mkg3states.patch;patch=1"
10
11export CC_FOR_BUILD = "gcc"
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb b/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
deleted file mode 100644
index 489f456..0000000
--- a/meta-demoapps/recipes-graphics/xorg-lib/libxaw_1.0.5.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X Athena Widget Set"
4DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
5PROVIDES = "xaw"
6PR = "r1"
7PE = "1"
8
9XORG_PN = "libXaw"
10
11do_install_append () {
12 ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6
13 ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so.7
14 ln -sf libXaw7.so.7 ${D}${libdir}/libXaw.so
15}
16
17PACKAGES =+ "libxaw6 libxaw7 libxaw8"
18
19FILES_libxaw6 = "${libdir}/libXaw6.so.6*"
20FILES_libxaw7 = "${libdir}/libXaw7.so.7*"
21FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/libxevie_1.0.2.bb b/meta-demoapps/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
deleted file mode 100644
index 6c6b459..0000000
--- a/meta-demoapps/recipes-graphics/xorg-lib/libxevie_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 EvIE extension library"
4DEPENDS += "libxext evieext"
5PR = "r1"
6PE = "1"
7
8XORG_PN = "libXevie"
diff --git a/meta-demoapps/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb b/meta-demoapps/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
deleted file mode 100644
index 9a3f5f1..0000000
--- a/meta-demoapps/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require xorg-lib-common.inc
2
3DESCRIPTION = "X11 keyboard UI presentation library"
4LICENSE= "GPL"
5DEPENDS += "virtual/libx11 libxt libxkbfile"
6PROVIDES = "xkbui"
7PR = "r1"
8PE = "1"
diff --git a/meta-demoapps/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb b/meta-demoapps/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb
deleted file mode 100644
index 9c3d9ef..0000000
--- a/meta-demoapps/recipes-graphics/xorg-proto/xproxymanagementprotocol_1.0.3.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require xorg-proto-common.inc
2
3PROVIDES="xproxymngproto"
4PR = "r1"
5PE = "1"
diff --git a/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch b/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch
deleted file mode 100644
index ec75e71..0000000
--- a/meta-demoapps/recipes-graphics/xournal/files/ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 src/Makefile.am | 2 +-
5 1 file changed, 1 insertion(+), 1 deletion(-)
6
7Index: xournal-0.2/src/Makefile.am
8===================================================================
9--- xournal-0.2.orig/src/Makefile.am 2007-05-09 15:06:26.000000000 +0100
10+++ xournal-0.2/src/Makefile.am 2007-05-09 15:06:35.000000000 +0100
11@@ -21,5 +21,5 @@ xournal_SOURCES = \
12 xo-interface.c xo-interface.h \
13 xo-callbacks.c xo-callbacks.h
14
15-xournal_LDADD = @PACKAGE_LIBS@
16+xournal_LDADD = @PACKAGE_LIBS@ -lz
17
diff --git a/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff b/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
deleted file mode 100644
index 9fac498..0000000
--- a/meta-demoapps/recipes-graphics/xournal/files/no-printing.diff
+++ /dev/null
@@ -1,180 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in
4--- xournal-0.2/configure.in 2006-01-29 22:25:10.000000000 +0000
5+++ xournal-0.2.noprint/configure.in 2006-03-17 13:08:01.000000000 +0000
6@@ -10,11 +10,16 @@
7 AM_PROG_CC_STDC
8 AC_HEADER_STDC
9
10-pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0"
11+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0"
12 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
13 AC_SUBST(PACKAGE_CFLAGS)
14 AC_SUBST(PACKAGE_LIBS)
15
16+#PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprintui-2.2 >= 2.0.0
17+#AC_SUBST(GNOMEPRINT_CFLAGS)
18+#AC_SUBST(GNOMEPRINT_LIBS)
19+AM_CONDITIONAL(ENABLE_PRINTING, false)
20+
21 AC_OUTPUT([
22 Makefile
23 src/Makefile
24diff -ru xournal-0.2/src/main.c xournal-0.2.noprint/src/main.c
25--- xournal-0.2/src/main.c 2006-01-29 22:22:52.000000000 +0000
26+++ xournal-0.2.noprint/src/main.c 2006-03-17 13:14:50.000000000 +0000
27@@ -28,7 +28,9 @@
28
29 void hide_unimplemented(void)
30 {
31+#if ENABLE_PRINTING
32 gtk_widget_hide(GET_COMPONENT("filePrintOptions"));
33+#endif
34 gtk_widget_hide(GET_COMPONENT("journalFlatten"));
35 gtk_widget_hide(GET_COMPONENT("papercolorOther"));
36 gtk_widget_hide(GET_COMPONENT("journalApplyAllPages"));
37diff -ru xournal-0.2/src/Makefile.am xournal-0.2.noprint/src/Makefile.am
38--- xournal-0.2/src/Makefile.am 2005-12-14 20:54:42.000000000 +0000
39+++ xournal-0.2.noprint/src/Makefile.am 2006-03-17 13:07:47.000000000 +0000
40@@ -7,12 +7,16 @@
41
42 bin_PROGRAMS = xournal
43
44+if ENABLE_PRINTING
45+PRINT_SOURCE = xo-print.c xo-print.h
46+endif
47+
48 xournal_SOURCES = \
49 main.c xournal.h \
50 xo-misc.c xo-misc.h \
51 xo-file.c xo-file.h \
52 xo-paint.c xo-paint.h \
53- xo-print.c xo-print.h \
54+ $(PRINT_SOURCE) \
55 xo-support.c xo-support.h \
56 xo-interface.c xo-interface.h \
57 xo-callbacks.c xo-callbacks.h
58diff -ru xournal-0.2/src/xo-callbacks.c xournal-0.2.noprint/src/xo-callbacks.c
59--- xournal-0.2/src/xo-callbacks.c 2006-01-29 19:39:22.000000000 +0000
60+++ xournal-0.2.noprint/src/xo-callbacks.c 2006-03-17 13:12:01.000000000 +0000
61@@ -7,7 +7,9 @@
62 #include <gtk/gtk.h>
63 #include <libgnomecanvas/libgnomecanvas.h>
64 #include <time.h>
65+#if ENABLE_PRINTING
66 #include <libgnomeprintui/gnome-print-dialog.h>
67+#endif
68 #include <glib/gstdio.h>
69
70 #include "xournal.h"
71@@ -17,7 +19,9 @@
72 #include "xo-misc.h"
73 #include "xo-file.h"
74 #include "xo-paint.h"
75+#if ENABLE_PRINTING
76 #include "xo-print.h"
77+#endif
78
79 void
80 on_fileNew_activate (GtkMenuItem *menuitem,
81@@ -261,7 +265,7 @@
82
83 }
84
85-
86+#if ENABLE_PRINTING
87 void
88 on_filePrint_activate (GtkMenuItem *menuitem,
89 gpointer user_data)
90@@ -407,7 +411,7 @@
91
92 g_free(filename);
93 }
94-
95+#endif
96
97 void
98 on_fileQuit_activate (GtkMenuItem *menuitem,
99diff -ru xournal-0.2/src/xo-callbacks.h xournal-0.2.noprint/src/xo-callbacks.h
100--- xournal-0.2/src/xo-callbacks.h 2006-01-26 20:47:00.000000000 +0000
101+++ xournal-0.2.noprint/src/xo-callbacks.h 2006-03-17 13:08:45.000000000 +0000
102@@ -24,6 +24,7 @@
103 on_filePrintOptions_activate (GtkMenuItem *menuitem,
104 gpointer user_data);
105
106+#if ENABLE_PRINTING
107 void
108 on_filePrint_activate (GtkMenuItem *menuitem,
109 gpointer user_data);
110@@ -32,6 +33,8 @@
111 on_filePrintPDF_activate (GtkMenuItem *menuitem,
112 gpointer user_data);
113
114+#endif
115+
116 void
117 on_fileQuit_activate (GtkMenuItem *menuitem,
118 gpointer user_data);
119diff -ru xournal-0.2/src/xo-interface.c xournal-0.2.noprint/src/xo-interface.c
120--- xournal-0.2/src/xo-interface.c 2006-01-29 18:58:25.000000000 +0000
121+++ xournal-0.2.noprint/src/xo-interface.c 2006-03-17 13:11:31.000000000 +0000
122@@ -41,10 +41,12 @@
123 GtkWidget *fileSave;
124 GtkWidget *fileSaveAs;
125 GtkWidget *separator1;
126+#if ENABLE_PRINTING
127 GtkWidget *filePrintOptions;
128 GtkWidget *image501;
129 GtkWidget *filePrint;
130 GtkWidget *filePrintPDF;
131+#endif
132 GtkWidget *separator2;
133 GtkWidget *fileQuit;
134 GtkWidget *menuEdit;
135@@ -327,6 +329,7 @@
136 gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1);
137 gtk_widget_set_sensitive (separator1, FALSE);
138
139+#if ENABLE_PRINTING
140 filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options");
141 gtk_widget_show (filePrintOptions);
142 gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions);
143@@ -347,6 +350,7 @@
144 gtk_widget_show (separator2);
145 gtk_container_add (GTK_CONTAINER (menuFile_menu), separator2);
146 gtk_widget_set_sensitive (separator2, FALSE);
147+#endif
148
149 fileQuit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group);
150 gtk_widget_show (fileQuit);
151@@ -1522,6 +1526,7 @@
152 g_signal_connect ((gpointer) fileSaveAs, "activate",
153 G_CALLBACK (on_fileSaveAs_activate),
154 NULL);
155+#if ENABLE_PRINTING
156 g_signal_connect ((gpointer) filePrintOptions, "activate",
157 G_CALLBACK (on_filePrintOptions_activate),
158 NULL);
159@@ -1531,6 +1536,7 @@
160 g_signal_connect ((gpointer) filePrintPDF, "activate",
161 G_CALLBACK (on_filePrintPDF_activate),
162 NULL);
163+#endif
164 g_signal_connect ((gpointer) fileQuit, "activate",
165 G_CALLBACK (on_fileQuit_activate),
166 NULL);
167@@ -1941,11 +1947,13 @@
168 GLADE_HOOKUP_OBJECT (winMain, fileSave, "fileSave");
169 GLADE_HOOKUP_OBJECT (winMain, fileSaveAs, "fileSaveAs");
170 GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1");