diff options
| author | Saul Wold <Saul.Wold@intel.com> | 2010-11-22 13:57:13 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 13:57:13 +0000 |
| commit | cfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch) | |
| tree | 7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta-demoapps/recipes-sato/clipboard-manager/files | |
| parent | 762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff) | |
| download | openembedded-core-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz openembedded-core-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.bz2 openembedded-core-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.zip | |
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')
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 @@ +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 new file mode 100644 index 0000000000..6e48da004c --- /dev/null +++ b/meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch @@ -0,0 +1,18 @@ +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 new file mode 100644 index 0000000000..09e68620d7 --- /dev/null +++ b/meta-demoapps/recipes-sato/clipboard-manager/files/script.patch @@ -0,0 +1,39 @@ +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 & |