From 204ee7391c19f9b2fa7f8b2ef46d04c7ccf5bd42 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 8 May 2012 14:25:59 +0100 Subject: 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. Signed-off-by: Richard Purdie --- .../clipboard-manager/clipboard-manager_0.6.4.bb | 33 ---------------- .../clipboard-manager/files/daemonize.patch | 46 ---------------------- .../clipboard-manager/files/makefile.patch | 20 ---------- .../clipboard-manager/files/script.patch | 41 ------------------- 4 files changed, 140 deletions(-) delete mode 100644 meta-demoapps/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb delete mode 100644 meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch delete mode 100644 meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch delete mode 100644 meta-demoapps/recipes-sato/clipboard-manager/files/script.patch (limited to 'meta-demoapps/recipes-sato/clipboard-manager') diff --git a/meta-demoapps/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb b/meta-demoapps/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb deleted file mode 100644 index 82dd1d047..000000000 --- a/meta-demoapps/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb +++ /dev/null @@ -1,33 +0,0 @@ -LICENSE = "GPL" -DESCRIPTION = "clipboard manager" -DEPENDS = "virtual/libx11" - -SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/tags/clipboard-manager/;module=${PV};proto=https \ - file://makefile.patch;patch=1 \ - file://script.patch;patch=1 \ - file://daemonize.patch;patch=1 \ - " - -S = "${WORKDIR}/${PV}" - -inherit autotools pkgconfig - -do_install_append () { - mv ${D}/${sysconfdir}/X11/Xsession.d/clipboard.sh ${D}/${sysconfdir}/X11/Xsession.d/70clipboard - chmod u+x ${D}/${sysconfdir}/X11/Xsession.d/70clipboard -} - -pkg_postinst_clipboard-manager () { -#!/bin/sh -e -if [ x"$D" = "x" ]; then - { - if [ x$(pidof clipboard-manager) != x ]; then - kill -TERM $(pidof clipboard-manager) - fi - - ${sysconfdir}/X11/Xsession.d/70clipboard - } > /dev/null -else - exit 1 -fi -} diff --git a/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch b/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch deleted file mode 100644 index 24c11a9fa..000000000 --- a/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Inappropriate [enable feature] - -Index: 0.6.4/manager.c -=================================================================== ---- 0.6.4.orig/manager.c 2007-06-28 12:23:37.000000000 +0100 -+++ 0.6.4/manager.c 2007-06-28 12:36:14.000000000 +0100 -@@ -68,7 +68,8 @@ - ClipboardManager *manager; - int terminated = False; - Display *display; -- -+ pid_t pid; -+ - display = XOpenDisplay (NULL); - - if (!display) -@@ -83,6 +84,29 @@ - exit (1); - } - -+ /* deamonize */ -+ pid = fork(); -+ switch (pid) -+ { -+ case -1: fprintf (stderr, "Fork failed.\n"); -+ /* Fall through */ -+ default: exit(0); break; -+ case 0: break; -+ } -+ -+ chdir ("/"); -+ setsid (); -+ umask (0); -+ -+ pid = fork(); -+ switch (pid) -+ { -+ case -1: fprintf (stderr, "Fork failed.\n"); -+ /* Fall through */ -+ default: exit(0); break; -+ case 0: break; -+ } -+ - XSetErrorHandler (x_error); - manager = clipboard_manager_new (display, - error_trap_push, error_trap_pop, diff --git a/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch b/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch deleted file mode 100644 index 17cd74269..000000000 --- a/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: 0.6.4/Makefile.am -=================================================================== ---- 0.6.4.orig/Makefile.am 2007-06-28 12:23:37.000000000 +0100 -+++ 0.6.4/Makefile.am 2007-06-28 14:21:23.000000000 +0100 -@@ -1,5 +1,3 @@ --SUBDIRS = debian -- - bin_PROGRAMS = clipboard-manager - - INCLUDES = \ -@@ -21,6 +19,6 @@ - clipboard.txt \ - clipboard.sh - --servicedir = $(sysconfdir)/osso-af-init -+servicedir = $(sysconfdir)/X11/Xsession.d - - service_DATA = clipboard.sh diff --git a/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch b/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch deleted file mode 100644 index bdab05a93..000000000 --- a/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Index: 0.6.4/clipboard.sh -=================================================================== ---- 0.6.4.orig/clipboard.sh 2007-06-28 12:23:37.000000000 +0100 -+++ 0.6.4/clipboard.sh 2007-06-28 14:27:39.000000000 +0100 -@@ -1,33 +1,2 @@ - #!/bin/sh --# Clipboard persistence manager startup script -- --if [ "x$AF_PIDDIR" = "x" ]; then -- echo "$0: Error, AF_PIDDIR is not defined" -- exit 2 --fi --if [ "x$LAUNCHWRAPPER_NICE_TRYRESTART" = "x" ]; then -- echo "$0: Error, LAUNCHWRAPPER_NICE_TRYRESTART is not defined" -- exit 2 --fi --if [ ! -w $AF_PIDDIR ]; then -- echo "$0: Error, directory $AF_PIDDIR is not writable" -- exit 2 --fi --PROG=/usr/bin/clipboard-manager --SVC="clipboard-manager" -- --case "$1" in --start) START=TRUE -- ;; --stop) START=FALSE -- ;; --*) echo "Usage: $0 {start|stop}" -- exit 1 -- ;; --esac -- --if [ $START = TRUE ]; then -- source $LAUNCHWRAPPER_NICE_TRYRESTART start "$SVC" $PROG --else -- source $LAUNCHWRAPPER_NICE_TRYRESTART stop "$SVC" $PROG --fi -+/usr/bin/clipboard-manager & -- cgit v1.2.3