- ncurses patch, stolen from from gentoo. More details here

  http://bugs.gentoo.org/show_bug.cgi?id=313081

Changed files:
    conky-ncurses.patch -> 1.1

diff --git a/conky-ncurses.patch b/conky-ncurses.patch
new file mode 100644 (file)
index 0000000..599a73c
--- /dev/null
+++ b/conky-ncurses.patch
@@ -0,0 +1,140 @@
+diff -burNp conky-1.8.0/configure.ac.in conky-1.8.0-dud/configure.ac.in
+--- conky-1.8.0/configure.ac.in        2010-03-30 19:47:30.000000000 +0200
++++ conky-1.8.0-dud/configure.ac.in    2010-04-08 22:13:46.056130555 +0200
+@@ -1011,6 +1011,7 @@ dnl  OpenMP:           $want_openmp
+   ALSA mixer:       $want_alsa
+   apcupsd:          $want_apcupsd
+   I/O stats:        $want_iostats
++  ncurses:          $want_ncurses
+ 
+  * Lua ($want_lua) bindings:
+   Cairo:            $want_lua_cairo
+diff -burNp conky-1.8.0/src/conky.c conky-1.8.0-dud/src/conky.c
+--- conky-1.8.0/src/conky.c    2010-03-25 21:27:32.000000000 +0100
++++ conky-1.8.0-dud/src/conky.c        2010-04-08 22:25:15.789443783 +0200
+@@ -3119,36 +3119,48 @@ int draw_each_line_inner(char *s, int sp
+                                               if (seconds != 0) {
+                                                       timeunits = seconds / 86400; seconds %= 86400;
+                                                       if (timeunits > 0) {
+-                                                              asprintf(&tmp_day_str, "%dd", timeunits);
++                                                              if (asprintf(&tmp_day_str, "%dd", timeunits) < 0) {
++                                                                      tmp_day_str = 0;
++                                                              }
+                                                       } else {
+                                                               tmp_day_str = strdup("");
+                                                       }
+                                                       timeunits = seconds / 3600; seconds %= 3600;
+                                                       if (timeunits > 0) {
+-                                                              asprintf(&tmp_hour_str, "%dh", timeunits);
++                                                              if (asprintf(&tmp_hour_str, "%dh", timeunits) < 0) {
++                                                                      tmp_day_str = 0;
++                                                              }       
+                                                       } else {
+                                                               tmp_hour_str = strdup("");
+                                                       }
+                                                       timeunits = seconds / 60; seconds %= 60;
+                                                       if (timeunits > 0) {
+-                                                              asprintf(&tmp_min_str, "%dm", timeunits);
++                                                              if (asprintf(&tmp_min_str, "%dm", timeunits) < 0) {
++                                                                      tmp_min_str = 0;
++                                                              }
+                                                       } else {
+                                                               tmp_min_str = strdup("");
+                                                       }
+                                                       if (seconds > 0) {
+-                                                              asprintf(&tmp_sec_str, "%ds", seconds);
++                                                              if (asprintf(&tmp_sec_str, "%ds", seconds) < 0) {
++                                                                      tmp_sec_str = 0;
++                                                              }
+                                                       } else {
+                                                               tmp_sec_str = strdup("");
+                                                       }
+-                                                      asprintf(&tmp_str, "%s%s%s%s", tmp_day_str, tmp_hour_str, tmp_min_str, tmp_sec_str);
+-                                                      free(tmp_day_str); free(tmp_hour_str); free(tmp_min_str); free(tmp_sec_str);
++                                                      if (asprintf(&tmp_str, "%s%s%s%s", tmp_day_str, tmp_hour_str, tmp_min_str, tmp_sec_str) < 0) {
++                                                              tmp_str = 0;
++                                                      }
++#define FREE(a) if ((a)) free((a));
++                                                      FREE(tmp_day_str); FREE(tmp_hour_str); FREE(tmp_min_str); FREE(tmp_sec_str);
+                                               } else {
+-                                                      asprintf(&tmp_str, "Range not possible"); // should never happen, but better safe then sorry
++                                                      tmp_str = strdup("Range not possible"); /* should never happen, but better safe then sorry */
+                                               }
+                                               cur_x += (w / 2) - (font_ascent() * (strlen(tmp_str) / 2));
+                                               cur_y += font_h / 2;
+                                               draw_string(tmp_str);
+-                                              free(tmp_str);
++                                              FREE(tmp_str);
++#undef FREE
+                                               cur_x = tmp_x;
+                                               cur_y = tmp_y;
+                                       }
+@@ -4518,13 +4530,13 @@ void setalignment(int* ltext_alignment,
+               int a = string_to_alignment(value);
+ 
+               if (a <= 0) {
+-                      if(setbyconffile == true) {
++                      if (setbyconffile) {
+                               CONF_ERR;
+                       } else NORM_ERR("'%s' is not a alignment setting", value);
+               } else {
+                       *ltext_alignment = a;
+               }
+-      } else if(setbyconffile == true) {
++      } else if (setbyconffile) {
+               CONF_ERR;
+       }
+ }
+@@ -4573,7 +4585,7 @@ char load_config_file(const char *f)
+                       }
+               }
+               CONF("alignment") {
+-                      setalignment(&text_alignment, window.type, value, f, line, true);
++                      setalignment(&text_alignment, window.type, value, f, line, 1);
+               }
+               CONF("background") {
+                       fork_to_background = string_to_bool(value);
+@@ -5696,7 +5708,7 @@ void initialisation(int argc, char **arg
+                               set_first_font(optarg);
+                               break;
+                       case 'a':
+-                              setalignment(&text_alignment, window.type, optarg, NULL, 0, false);
++                              setalignment(&text_alignment, window.type, optarg, NULL, 0, 0);
+                               break;
+ 
+ #ifdef OWN_WINDOW
+@@ -5895,7 +5907,9 @@ int main(int argc, char **argv)
+                               current_config = strndup(optarg, max_user_text);
+                               break;
+                       case 'q':
+-                              freopen("/dev/null", "w", stderr);
++                              if (!freopen("/dev/null", "w", stderr)) {
++                                      NORM_ERR("unable to redirect stderr to /dev/null");
++                              }
+                               break;
+                       case 'h':
+                               print_help(argv[0]);
+diff -burNp conky-1.8.0/src/conky.c conky-1.8.0-dud/src/conky.c
+--- conky-1.8.0/src/conky.c    2010-03-25 21:27:32.000000000 +0100
++++ conky-1.8.0-dud/src/conky.c        2010-04-08 22:30:40.745051008 +0200
+@@ -65,7 +65,7 @@
+ #include <fcntl.h>
+ #include <getopt.h>
+ #ifdef NCURSES
+-#include <ncurses.h>
++#include <ncurses/ncurses.h>
+ #endif
+ #ifdef XOAP
+ #include <libxml/parser.h>
+diff -burNp conky-1.8.0/src/core.c conky-1.8.0-dud/src/core.c
+--- conky-1.8.0/src/core.c     2010-03-25 21:27:32.000000000 +0100
++++ conky-1.8.0-dud/src/core.c 2010-04-09 10:24:30.287419400 +0200
+@@ -65,7 +65,7 @@
+ #include "top.h"
+ 
+ #ifdef NCURSES
+-#include <ncurses.h>
++#include <ncurses/ncurses.h>
+ #endif
+ 
+ /* check for OS and include appropriate headers */