summaryrefslogtreecommitdiffstats
path: root/meta-demoapps/recipes-sato/clipboard-manager/files
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@intel.com>2010-11-22 13:57:13 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-11-22 13:57:13 +0000
commitcfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch)
tree7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta-demoapps/recipes-sato/clipboard-manager/files
parent762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff)
downloadpoky-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz
Meta: Recipe Reogranization
This is the next stage of recipe reorganization, in this stage many recipes where moved to a new meta-demoapps layer since this is more appropriate for demo usage then the core. Additional some recipes were moved to meta-extras to indicate they may be depercated at a future time. A number of recipes were modified since dependencies need to be corrected. Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta-demoapps/recipes-sato/clipboard-manager/files')
-rw-r--r--meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch44
-rw-r--r--meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch18
-rw-r--r--meta-demoapps/recipes-sato/clipboard-manager/files/script.patch39
3 files changed, 101 insertions, 0 deletions
diff --git a/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch b/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch
new file mode 100644
index 0000000000..51ce4781a5
--- /dev/null
+++ b/meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch
@@ -0,0 +1,44 @@
1Index: 0.6.4/manager.c
2===================================================================
3--- 0.6.4.orig/manager.c 2007-06-28 12:23:37.000000000 +0100
4+++ 0.6.4/manager.c 2007-06-28 12:36:14.000000000 +0100
5@@ -68,7 +68,8 @@
6 ClipboardManager *manager;
7 int terminated = False;
8 Display *display;
9-
10+ pid_t pid;
11+
12 display = XOpenDisplay (NULL);
13
14 if (!display)
15@@ -83,6 +84,29 @@
16 exit (1);
17 }
18
19+ /* deamonize */
20+ pid = fork();
21+ switch (pid)
22+ {
23+ case -1: fprintf (stderr, "Fork failed.\n");
24+ /* Fall through */
25+ default: exit(0); break;
26+ case 0: break;
27+ }
28+
29+ chdir ("/");
30+ setsid ();
31+ umask (0);
32+
33+ pid = fork();
34+ switch (pid)
35+ {
36+ case -1: fprintf (stderr, "Fork failed.\n");
37+ /* Fall through */
38+ default: exit(0); break;
39+ case 0: break;
40+ }
41+
42 XSetErrorHandler (x_error);
43 manager = clipboard_manager_new (display,
44 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
new file mode 100644
index 0000000000..6e48da004c
--- /dev/null
+++ b/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch
@@ -0,0 +1,18 @@
1Index: 0.6.4/Makefile.am
2===================================================================
3--- 0.6.4.orig/Makefile.am 2007-06-28 12:23:37.000000000 +0100
4+++ 0.6.4/Makefile.am 2007-06-28 14:21:23.000000000 +0100
5@@ -1,5 +1,3 @@
6-SUBDIRS = debian
7-
8 bin_PROGRAMS = clipboard-manager
9
10 INCLUDES = \
11@@ -21,6 +19,6 @@
12 clipboard.txt \
13 clipboard.sh
14
15-servicedir = $(sysconfdir)/osso-af-init
16+servicedir = $(sysconfdir)/X11/Xsession.d
17
18 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
new file mode 100644
index 0000000000..09e68620d7
--- /dev/null
+++ b/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch
@@ -0,0 +1,39 @@
1Index: 0.6.4/clipboard.sh
2===================================================================
3--- 0.6.4.orig/clipboard.sh 2007-06-28 12:23:37.000000000 +0100
4+++ 0.6.4/clipboard.sh 2007-06-28 14:27:39.000000000 +0100
5@@ -1,33 +1,2 @@
6 #!/bin/sh
7-# Clipboard persistence manager startup script
8-
9-if [ "x$AF_PIDDIR" = "x" ]; then
10- echo "$0: Error, AF_PIDDIR is not defined"
11- exit 2
12-fi
13-if [ "x$LAUNCHWRAPPER_NICE_TRYRESTART" = "x" ]; then
14- echo "$0: Error, LAUNCHWRAPPER_NICE_TRYRESTART is not defined"
15- exit 2
16-fi
17-if [ ! -w $AF_PIDDIR ]; then
18- echo "$0: Error, directory $AF_PIDDIR is not writable"
19- exit 2
20-fi
21-PROG=/usr/bin/clipboard-manager
22-SVC="clipboard-manager"
23-
24-case "$1" in
25-start) START=TRUE
26- ;;
27-stop) START=FALSE
28- ;;
29-*) echo "Usage: $0 {start|stop}"
30- exit 1
31- ;;
32-esac
33-
34-if [ $START = TRUE ]; then
35- source $LAUNCHWRAPPER_NICE_TRYRESTART start "$SVC" $PROG
36-else
37- source $LAUNCHWRAPPER_NICE_TRYRESTART stop "$SVC" $PROG
38-fi
39+/usr/bin/clipboard-manager &