diff options
| author |   Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /detect-stylus | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
| download | openembedded-f96441b9faf769c9ecdd4d338b605ea3d0cc4010.tar.gz | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'detect-stylus')
| -rw-r--r-- | detect-stylus/access.patch | 17 | ||||
| -rw-r--r-- | detect-stylus/detect-stylus-0.13/correct-theme-name.patch | 15 | ||||
| -rw-r--r-- | detect-stylus/detect-stylus-0.13/extra-device-check.patch | 13 |
3 files changed, 45 insertions, 0 deletions
diff --git a/detect-stylus/access.patch b/detect-stylus/access.patch index e69de29bb2..cd8c52074d 100644 --- a/detect-stylus/access.patch +++ b/detect-stylus/access.patch @@ -0,0 +1,17 @@ +Index: detect-stylus.c +=================================================================== +RCS file: /cvs/gpe/base/detect-stylus/detect-stylus.c,v +retrieving revision 1.12 +retrieving revision 1.13 +diff -u -r1.12 -r1.13 +--- detect-stylus.c 8 Sep 2004 15:57:15 -0000 1.12 ++++ detect-stylus.c 9 Sep 2004 23:08:42 -0000 1.13 +@@ -131,7 +131,7 @@ + XChangeProperty (dpy, root, atom, XA_INTEGER, 8, PropModeReplace, &b, 1); + + XCloseDisplay (dpy); +- if (!access("/usr/bin/xrdb", X_OK)) ++ if (access("/usr/bin/xrdb", X_OK)) + system ("echo \"Matchbox.cursor: no\nXcursor.theme: fully-transparent\" | /usr/X11R6/bin/xrdb -nocpp -merge"); + else + system ("echo \"Matchbox.cursor: no\nXcursor.theme: fully-transparent\" | /usr/bin/xrdb -nocpp -merge"); diff --git a/detect-stylus/detect-stylus-0.13/correct-theme-name.patch b/detect-stylus/detect-stylus-0.13/correct-theme-name.patch index e69de29bb2..7c8213da1f 100644 --- a/detect-stylus/detect-stylus-0.13/correct-theme-name.patch +++ b/detect-stylus/detect-stylus-0.13/correct-theme-name.patch @@ -0,0 +1,15 @@ +diff -urNd ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c detect-stylus-0.13/detect-stylus.c +--- ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c 2004-09-08 16:56:58.000000000 +0100 ++++ detect-stylus-0.13/detect-stylus.c 2004-09-13 21:36:03.000000000 +0100 +@@ -132,9 +132,9 @@ + + XCloseDisplay (dpy); + if (access("/usr/bin/xrdb", X_OK)) +- system ("echo \"Matchbox.cursor: no\nXcursor.theme: fully-transparent\" | /usr/X11R6/bin/xrdb -nocpp -merge"); ++ system ("echo \"Matchbox.cursor: no\nXcursor.theme: xcursor-transparent\" | /usr/X11R6/bin/xrdb -nocpp -merge"); + else +- system ("echo \"Matchbox.cursor: no\nXcursor.theme: fully-transparent\" | /usr/bin/xrdb -nocpp -merge"); ++ system ("echo \"Matchbox.cursor: no\nXcursor.theme: xcursor-transparent\" | /usr/bin/xrdb -nocpp -merge"); + } + + exit (0); diff --git a/detect-stylus/detect-stylus-0.13/extra-device-check.patch b/detect-stylus/detect-stylus-0.13/extra-device-check.patch index e69de29bb2..94542b11aa 100644 --- a/detect-stylus/detect-stylus-0.13/extra-device-check.patch +++ b/detect-stylus/detect-stylus-0.13/extra-device-check.patch @@ -0,0 +1,13 @@ +diff -urNd ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c detect-stylus-0.13/detect-stylus.c +--- ../detect-stylus-0.13-r1/detect-stylus-0.13/detect-stylus.c 2004-09-08 16:56:58.000000000 +0100 ++++ detect-stylus-0.13/detect-stylus.c 2004-09-18 23:43:12.000000000 +0100 +@@ -62,6 +62,9 @@ + if (fd < 0) + fd = try_open ("/dev/touchscreen/ucb1x00"); + ++ if (fd < 0) ++ fd = try_open ("/dev/ts"); ++ + if (fd < 0) + { + DIR *d; |