diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-08 14:25:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-08 14:49:16 +0100 |
commit | 67f6baa72a2c4ab868ec9c333863476e4e77513a (patch) | |
tree | 00b72871d7f12e556eb98c67c1a0b3b0c94c3871 /meta-demoapps/recipes-sato/clipboard-manager | |
parent | 71e56f8d89c05859ddb817731653d39a8145fb98 (diff) | |
download | poky-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/recipes-sato/clipboard-manager')
4 files changed, 0 insertions, 140 deletions
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 82dd1d047f..0000000000 --- a/meta-demoapps/recipes-sato/clipboard-manager/clipboard-manager_0.6.4.bb +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | LICENSE = "GPL" | ||
2 | DESCRIPTION = "clipboard manager" | ||
3 | DEPENDS = "virtual/libx11" | ||
4 | |||
5 | SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/tags/clipboard-manager/;module=${PV};proto=https \ | ||
6 | file://makefile.patch;patch=1 \ | ||
7 | file://script.patch;patch=1 \ | ||
8 | file://daemonize.patch;patch=1 \ | ||
9 | " | ||
10 | |||
11 | S = "${WORKDIR}/${PV}" | ||
12 | |||
13 | inherit autotools pkgconfig | ||
14 | |||
15 | do_install_append () { | ||
16 | mv ${D}/${sysconfdir}/X11/Xsession.d/clipboard.sh ${D}/${sysconfdir}/X11/Xsession.d/70clipboard | ||
17 | chmod u+x ${D}/${sysconfdir}/X11/Xsession.d/70clipboard | ||
18 | } | ||
19 | |||
20 | pkg_postinst_clipboard-manager () { | ||
21 | #!/bin/sh -e | ||
22 | if [ x"$D" = "x" ]; then | ||
23 | { | ||
24 | if [ x$(pidof clipboard-manager) != x ]; then | ||
25 | kill -TERM $(pidof clipboard-manager) | ||
26 | fi | ||
27 | |||
28 | ${sysconfdir}/X11/Xsession.d/70clipboard | ||
29 | } > /dev/null | ||
30 | else | ||
31 | exit 1 | ||
32 | fi | ||
33 | } | ||
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 24c11a9fa8..0000000000 --- a/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [enable feature] | ||
2 | |||
3 | Index: 0.6.4/manager.c | ||
4 | =================================================================== | ||
5 | --- 0.6.4.orig/manager.c 2007-06-28 12:23:37.000000000 +0100 | ||
6 | +++ 0.6.4/manager.c 2007-06-28 12:36:14.000000000 +0100 | ||
7 | @@ -68,7 +68,8 @@ | ||
8 | ClipboardManager *manager; | ||
9 | int terminated = False; | ||
10 | Display *display; | ||
11 | - | ||
12 | + pid_t pid; | ||
13 | + | ||
14 | display = XOpenDisplay (NULL); | ||
15 | |||
16 | if (!display) | ||
17 | @@ -83,6 +84,29 @@ | ||
18 | exit (1); | ||
19 | } | ||
20 | |||
21 | + /* deamonize */ | ||
22 | + pid = fork(); | ||
23 | + switch (pid) | ||
24 | + { | ||
25 | + case -1: fprintf (stderr, "Fork failed.\n"); | ||
26 | + /* Fall through */ | ||
27 | + default: exit(0); break; | ||
28 | + case 0: break; | ||
29 | + } | ||
30 | + | ||
31 | + chdir ("/"); | ||
32 | + setsid (); | ||
33 | + umask (0); | ||
34 | + | ||
35 | + pid = fork(); | ||
36 | + switch (pid) | ||
37 | + { | ||
38 | + case -1: fprintf (stderr, "Fork failed.\n"); | ||
39 | + /* Fall through */ | ||
40 | + default: exit(0); break; | ||
41 | + case 0: break; | ||
42 | + } | ||
43 | + | ||
44 | XSetErrorHandler (x_error); | ||
45 | manager = clipboard_manager_new (display, | ||
46 | 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 17cd74269b..0000000000 --- a/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: 0.6.4/Makefile.am | ||
4 | =================================================================== | ||
5 | --- 0.6.4.orig/Makefile.am 2007-06-28 12:23:37.000000000 +0100 | ||
6 | +++ 0.6.4/Makefile.am 2007-06-28 14:21:23.000000000 +0100 | ||
7 | @@ -1,5 +1,3 @@ | ||
8 | -SUBDIRS = debian | ||
9 | - | ||
10 | bin_PROGRAMS = clipboard-manager | ||
11 | |||
12 | INCLUDES = \ | ||
13 | @@ -21,6 +19,6 @@ | ||
14 | clipboard.txt \ | ||
15 | clipboard.sh | ||
16 | |||
17 | -servicedir = $(sysconfdir)/osso-af-init | ||
18 | +servicedir = $(sysconfdir)/X11/Xsession.d | ||
19 | |||
20 | 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 bdab05a930..0000000000 --- a/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | ||
2 | |||
3 | Index: 0.6.4/clipboard.sh | ||
4 | =================================================================== | ||
5 | --- 0.6.4.orig/clipboard.sh 2007-06-28 12:23:37.000000000 +0100 | ||
6 | +++ 0.6.4/clipboard.sh 2007-06-28 14:27:39.000000000 +0100 | ||
7 | @@ -1,33 +1,2 @@ | ||
8 | #!/bin/sh | ||
9 | -# Clipboard persistence manager startup script | ||
10 | - | ||
11 | -if [ "x$AF_PIDDIR" = "x" ]; then | ||
12 | - echo "$0: Error, AF_PIDDIR is not defined" | ||
13 | - exit 2 | ||
14 | -fi | ||
15 | -if [ "x$LAUNCHWRAPPER_NICE_TRYRESTART" = "x" ]; then | ||
16 | - echo "$0: Error, LAUNCHWRAPPER_NICE_TRYRESTART is not defined" | ||
17 | - exit 2 | ||
18 | -fi | ||
19 | -if [ ! -w $AF_PIDDIR ]; then | ||
20 | - echo "$0: Error, directory $AF_PIDDIR is not writable" | ||
21 | - exit 2 | ||
22 | -fi | ||
23 | -PROG=/usr/bin/clipboard-manager | ||
24 | -SVC="clipboard-manager" | ||
25 | - | ||
26 | -case "$1" in | ||
27 | -start) START=TRUE | ||
28 | - ;; | ||
29 | -stop) START=FALSE | ||
30 | - ;; | ||
31 | -*) echo "Usage: $0 {start|stop}" | ||
32 | - exit 1 | ||
33 | - ;; | ||
34 | -esac | ||
35 | - | ||
36 | -if [ $START = TRUE ]; then | ||
37 | - source $LAUNCHWRAPPER_NICE_TRYRESTART start "$SVC" $PROG | ||
38 | -else | ||
39 | - source $LAUNCHWRAPPER_NICE_TRYRESTART stop "$SVC" $PROG | ||
40 | -fi | ||
41 | +/usr/bin/clipboard-manager & | ||