From a5004bcab189b3dc72e682bd37f0adabeb71cb30 Mon Sep 17 00:00:00 2001 From: Simon Dawson Date: Mon, 12 Nov 2012 01:47:21 +0000 Subject: lcdproc: remove patch rejected upstream Remove an lcdproc patch which has been rejected upstream. It has been decided by lcdproc developer Markus Dolze that the behaviour of the client_add_key command when handling the minus key is "intentional to some degree." This patch also takes the opportunity to remove the version number from the single remaining lcdproc patch. Signed-off-by: Simon Dawson Signed-off-by: Peter Korsgaard --- package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch | 18 ---------- ...cdproc-0.5.5-fix-client_add_key-for-minus.patch | 38 ---------------------- package/lcdproc/lcdproc-LCDd.conf.patch | 18 ++++++++++ 3 files changed, 18 insertions(+), 56 deletions(-) delete mode 100644 package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch delete mode 100644 package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch create mode 100644 package/lcdproc/lcdproc-LCDd.conf.patch (limited to 'package/lcdproc') diff --git a/package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch b/package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch deleted file mode 100644 index 283ac8867..000000000 --- a/package/lcdproc/lcdproc-0.5.5-LCDd.conf.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix the default LCDd configuration file, so that the DriverPath -is set to the correct lcdproc library install path, rather than -the dummy/default path. - -Signed-off-by: Simon Dawson ---- - ---- lcdproc-0.5.3/LCDd.conf.orig 2009-06-20 14:48:34.000000000 +0100 -+++ lcdproc-0.5.3/LCDd.conf 2010-05-11 10:02:21.000000000 +0100 -@@ -34,7 +34,7 @@ - # the driver modules and will thus not be able to - # function properly. - # NOTE: Always place a slash as last character ! --DriverPath=server/drivers/ -+DriverPath=/usr/lib/lcdproc/ - - # Tells the server to load the given drivers. Multiple lines can be given. - # The name of the driver is case sensitive and determines the section diff --git a/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch b/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch deleted file mode 100644 index c17ee83af..000000000 --- a/package/lcdproc/lcdproc-0.5.5-fix-client_add_key-for-minus.patch +++ /dev/null @@ -1,38 +0,0 @@ -Calling client_add_key as follows - - client_add_key - - -will fail. However using an explicit -shared option, like this: - - client_add_key -shared - - -will succeed. This is caused by a failure to parse the - key token, which is -mistaken for the first character of an option argument. - -The client_add_key command also returns a spurious "success" message when a -malformed option is supplied. - -This patch fixes both issues. - -Signed-off-by: Simon Dawson - -diff -Nurp a/server/commands/client_commands.c b/server/commands/client_commands.c ---- a/server/commands/client_commands.c 2011-08-14 13:29:16.000000000 +0100 -+++ b/server/commands/client_commands.c 2012-10-05 07:50:40.357795535 +0100 -@@ -181,7 +181,7 @@ client_add_key_func(Client *c, int argc, - } - - argnr = 1; -- if (argv[argnr][0] == '-') { -+ if (argv[argnr][0] == '-' && strcmp(argv[argnr], "-") != 0) { - if (strcmp( argv[argnr], "-shared") == 0) { - exclusively = 0; - } -@@ -190,6 +190,7 @@ client_add_key_func(Client *c, int argc, - } - else { - sock_printf_error(c->sock, "Invalid option: %s\n", argv[argnr]); -+ return 0; - } - argnr++; - } diff --git a/package/lcdproc/lcdproc-LCDd.conf.patch b/package/lcdproc/lcdproc-LCDd.conf.patch new file mode 100644 index 000000000..283ac8867 --- /dev/null +++ b/package/lcdproc/lcdproc-LCDd.conf.patch @@ -0,0 +1,18 @@ +Fix the default LCDd configuration file, so that the DriverPath +is set to the correct lcdproc library install path, rather than +the dummy/default path. + +Signed-off-by: Simon Dawson +--- + +--- lcdproc-0.5.3/LCDd.conf.orig 2009-06-20 14:48:34.000000000 +0100 ++++ lcdproc-0.5.3/LCDd.conf 2010-05-11 10:02:21.000000000 +0100 +@@ -34,7 +34,7 @@ + # the driver modules and will thus not be able to + # function properly. + # NOTE: Always place a slash as last character ! +-DriverPath=server/drivers/ ++DriverPath=/usr/lib/lcdproc/ + + # Tells the server to load the given drivers. Multiple lines can be given. + # The name of the driver is case sensitive and determines the section -- cgit v1.2.3