aptitude-includes.patch

   1 --- aptitude-0.3.5.1/src/generic/problemresolver/test.cc.orig   2005-10-05 08:55:22.000000000 +0200
   2 +++ aptitude-0.3.5.1/src/generic/problemresolver/test.cc        2015-02-15 10:23:27.816683270 +0100
   3 @@ -24,6 +24,7 @@
   4  #include "dummy_universe.h"
   5  #include "problemresolver.h"
   6
   7 +#include <cstring>
   8  #include <iostream>
   9  #include <fstream>
  10  #include <string>
  11 --- aptitude-0.3.5.1/src/generic/util/temp.cc.orig      2005-10-05 08:55:22.000000000 +0200
  12 +++ aptitude-0.3.5.1/src/generic/util/temp.cc   2015-02-15 10:17:56.216697183 +0100
  13 @@ -24,6 +24,7 @@
  14  #include <aptitude.h>
  15
  16  #include <stdlib.h>
  17 +#include <unistd.h>
  18
  19  namespace temp
  20  {
  21 --- aptitude-0.3.5.1/src/generic/util/util.h.orig       2005-10-05 08:55:22.000000000 +0200
  22 +++ aptitude-0.3.5.1/src/generic/util/util.h    2015-02-15 10:17:40.113364528 +0100
  23 @@ -20,6 +20,7 @@
  24  #ifndef UTIL_H
  25  #define UTIL_H
  26
  27 +#include <cstdarg>
  28  #include <string>
  29  #include <utility>
  30
  31 --- aptitude-0.3.5.1/src/generic/util/util.cc.orig      2015-02-15 11:01:03.963255256 +0100
  32 +++ aptitude-0.3.5.1/src/generic/util/util.cc   2015-02-15 11:01:06.766588472 +0100
  33 @@ -23,6 +23,7 @@
  34  #include <errno.h>
  35  #include <pwd.h>
  36  #include <stdarg.h>
  37 +#include <stdio.h>
  38  #include <string.h>
  39  #include <sys/types.h>
  40  #include <time.h>
  41 --- aptitude-0.3.5.1/src/generic/problemresolver/dummy_universe.cc.orig 2015-02-15 11:02:01.546586175 +0100
  42 +++ aptitude-0.3.5.1/src/generic/problemresolver/dummy_universe.cc      2015-02-15 11:02:04.176586061 +0100
  43 @@ -19,6 +19,8 @@
  44
  45  #include "dummy_universe.h"
  46
  47 +#include <algorithm>
  48 +
  49  using namespace std;
  50
  51  dummy_package::dummy_package(const string &_name, unsigned int id)
  52 --- aptitude-0.3.5.1/src/generic/apt/acqprogress.cc.orig        2015-02-15 11:02:36.293251382 +0100
  53 +++ aptitude-0.3.5.1/src/generic/apt/acqprogress.cc     2015-02-15 11:02:40.536584538 +0100
  54 @@ -299,7 +299,7 @@
  55
  56     char C = 0;
  57     while (C != '\n' && C != '\r')
  58 -      read(STDIN_FILENO,&C,1);
  59 +      if (read(STDIN_FILENO,&C,1) <= 0) break;
  60
  61     manager.set_update(true);
  62     k(true);
  63 --- aptitude-0.3.5.1/src/generic/apt/matchers.h.orig    2005-10-12 21:45:03.000000000 +0200
  64 +++ aptitude-0.3.5.1/src/generic/apt/matchers.h 2015-02-15 11:43:29.419815099 +0100
  65 @@ -23,6 +23,7 @@
  66  #ifndef MATCHERS_H
  67  #define MATCHERS_H
  68
  69 +#include <memory>
  70  #include <string>
  71  #include <vector>
  72
  73 --- aptitude-0.3.5.1/src/generic/apt/apt.h.orig 2005-10-08 03:34:07.000000000 +0200
  74 +++ aptitude-0.3.5.1/src/generic/apt/apt.h      2015-02-15 11:50:41.116463649 +0100
  75 @@ -27,6 +27,7 @@
  76
  77  #include "aptcache.h"
  78
  79 +#include <cstring>
  80  #include <utility>
  81
  82  class OpProgress;
  83 --- aptitude-0.3.5.1/src/generic/apt/aptitude_resolver_universe.cc.orig 2005-10-05 08:55:26.000000000 +0200
  84 +++ aptitude-0.3.5.1/src/generic/apt/aptitude_resolver_universe.cc      2015-02-15 12:08:38.219751781 +0100
  85 @@ -4,6 +4,7 @@
  86
  87  #include <generic/problemresolver/solution.h>
  88
  89 +#include <algorithm>
  90  #include <sstream>
  91
  92  using namespace std;
  93 --- aptitude-0.3.5.1/src/generic/apt/log.cc.orig        2015-02-15 11:14:01.603222618 +0100
  94 +++ aptitude-0.3.5.1/src/generic/apt/log.cc     2015-02-15 12:10:52.026412833 +0100
  95 @@ -31,6 +31,7 @@
  96  #include <apt-pkg/strutl.h>
  97
  98  #include <errno.h>
  99 +#include <stdio.h>
 100
 101  using namespace std;
 102
 103 --- aptitude-0.3.5.1/src/generic/apt/pkg_hier_dump.cc.orig      2005-10-05 08:55:22.000000000 +0200
 104 +++ aptitude-0.3.5.1/src/generic/apt/pkg_hier_dump.cc   2015-02-15 12:23:01.009715573 +0100
 105 @@ -5,6 +5,7 @@
 106  #include "pkg_hier.h"
 107
 108  #include <stdio.h>
 109 +#include <string.h>
 110
 111  #include <apt-pkg/error.h>
 112
 113 --- aptitude-0.3.5.1/src/vscreen/curses++.h.orig        2005-10-05 08:55:22.000000000 +0200
 114 +++ aptitude-0.3.5.1/src/vscreen/curses++.h     2015-02-15 12:29:18.379699738 +0100
 115 @@ -22,6 +22,7 @@
 116  #ifndef CURSES_PLUSPLUS_H
 117  #define CURSES_PLUSPLUS_H
 118
 119 +#include <cstring>
 120  #include <string>
 121  #include <ncursesw/curses.h>
 122
 123 --- aptitude-0.3.5.1/src/vscreen/fragment.cc.orig       2005-10-05 08:55:22.000000000 +0200
 124 +++ aptitude-0.3.5.1/src/vscreen/fragment.cc    2015-02-15 12:33:23.383022788 +0100
 125 @@ -1170,7 +1170,7 @@
 126
 127    const char *start=format;
 128    // find all the arguments.
 129 -  char *nextpercent=strchr(start, '%');
 130 +  const char *nextpercent=strchr(start, '%');
 131
 132    // loop 1: count the arguments.
 133    while(nextpercent!=NULL)
 134 --- aptitude-0.3.5.1/src/vscreen/vscreen.cc.orig        2005-10-05 08:55:21.000000000 +0200
 135 +++ aptitude-0.3.5.1/src/vscreen/vscreen.cc     2015-02-15 12:34:08.646354222 +0100
 136 @@ -48,6 +48,7 @@
 137  // For _()
 138  #include "../aptitude.h"
 139
 140 +#include <limits.h>
 141  #include <signal.h>
 142
 143  #include <assert.h>
 144 --- aptitude-0.3.5.1/src/vscreen/vs_radiogroup.cc.orig  2005-10-05 08:55:22.000000000 +0200
 145 +++ aptitude-0.3.5.1/src/vscreen/vs_radiogroup.cc       2015-02-15 12:35:58.129682960 +0100
 146 @@ -4,6 +4,8 @@
 147
 148  #include "vs_togglebutton.h"
 149
 150 +#include <cstdlib>
 151 +
 152  #include <sigc++/adaptors/bind.h>
 153  #include <sigc++/functors/mem_fun.h>
 154
 155 --- aptitude-0.3.5.1/src/vscreen/transcode.cc.orig      2005-10-05 08:55:22.000000000 +0200
 156 +++ aptitude-0.3.5.1/src/vscreen/transcode.cc   2015-02-15 12:58:49.519625410 +0100
 157 @@ -22,6 +22,9 @@
 158  #include <assert.h>
 159  #include <errno.h>
 160  #include <iconv.h>
 161 +#include <langinfo.h>
 162 +#include <stdlib.h>
 163 +#include <string.h>
 164
 165  using namespace std;
 166
 167 --- aptitude-0.3.5.1/src/cmdline/cmdline_action.cc.orig 2005-10-14 08:10:09.000000000 +0200
 168 +++ aptitude-0.3.5.1/src/cmdline/cmdline_action.cc      2015-02-15 13:04:15.156278410 +0100
 169 @@ -5,6 +5,8 @@
 170  #include "cmdline_action.h"
 171  #include "cmdline_util.h"
 172
 173 +#include <cstdio>
 174 +
 175  #include <aptitude.h>
 176
 177  #include <generic/apt/apt.h>
 178 --- aptitude-0.3.5.1/src/cmdline/cmdline_clean.cc.orig  2005-10-05 08:55:22.000000000 +0200
 179 +++ aptitude-0.3.5.1/src/cmdline/cmdline_clean.cc       2015-02-15 13:06:30.906272716 +0100
 180 @@ -14,6 +14,7 @@
 181  #include <apt-pkg/error.h>
 182  #include <apt-pkg/strutl.h>
 183
 184 +#include <cstdio>
 185  #include <iostream>
 186
 187  #include <sys/stat.h>
 188 --- aptitude-0.3.5.1/src/cmdline/cmdline_do_action.cc.orig      2005-10-05 08:55:22.000000000 +0200
 189 +++ aptitude-0.3.5.1/src/cmdline/cmdline_do_action.cc   2015-02-15 13:07:02.206271400 +0100
 190 @@ -12,6 +12,8 @@
 191  #include "cmdline_simulate.h"
 192  #include "cmdline_util.h"
 193
 194 +#include <cstdio>
 195 +
 196  #include <generic/apt/apt.h>
 197  #include <generic/apt/config_signal.h>
 198  #include <generic/apt/download_install_manager.h>
 199 --- aptitude-0.3.5.1/src/cmdline/cmdline_forget_new.cc.orig     2005-10-05 08:55:22.000000000 +0200
 200 +++ aptitude-0.3.5.1/src/cmdline/cmdline_forget_new.cc  2015-02-15 13:12:45.162923676 +0100
 201 @@ -4,6 +4,8 @@
 202
 203  #include "cmdline_forget_new.h"
 204
 205 +#include <cstdio>
 206 +
 207  #include <aptitude.h>
 208
 209  #include <generic/apt/apt.h>
 210 --- aptitude-0.3.5.1/src/cmdline/cmdline_search.cc.orig 2005-10-12 21:27:44.000000000 +0200
 211 +++ aptitude-0.3.5.1/src/cmdline/cmdline_search.cc      2015-02-15 13:14:23.319586220 +0100
 212 @@ -6,6 +6,8 @@
 213
 214  #include "cmdline_common.h"
 215
 216 +#include <algorithm>
 217 +
 218  #include <aptitude.h>
 219  #include <load_sortpolicy.h>
 220  #include <pkg_columnizer.h>
 221 --- aptitude-0.3.5.1/src/cmdline/cmdline_update.cc.orig 2005-10-05 08:55:22.000000000 +0200
 222 +++ aptitude-0.3.5.1/src/cmdline/cmdline_update.cc      2015-02-15 13:24:24.086227676 +0100
 223 @@ -21,6 +21,8 @@
 224
 225  #include <aptitude.h>
 226
 227 +#include <cstdio>
 228 +
 229  #include <generic/apt/apt.h>
 230  #include <generic/apt/config_signal.h>
 231  #include <generic/apt/download_update_manager.h>
 232 --- aptitude-0.3.5.1/src/cmdline/cmdline_upgrade.cc.orig        2005-10-05 08:55:22.000000000 +0200
 233 +++ aptitude-0.3.5.1/src/cmdline/cmdline_upgrade.cc     2015-02-15 13:25:27.122891697 +0100
 234 @@ -10,6 +10,8 @@
 235  #include "cmdline_simulate.h"
 236  #include "cmdline_util.h"
 237
 238 +#include <cstdio>
 239 +
 240  #include <aptitude.h>
 241
 242  #include <generic/apt/apt.h>
 243 --- aptitude-0.3.5.1/src/cmdline/cmdline_util.cc.orig   2005-10-05 08:55:22.000000000 +0200
 244 +++ aptitude-0.3.5.1/src/cmdline/cmdline_util.cc        2015-02-15 13:25:59.272890348 +0100
 245 @@ -7,6 +7,8 @@
 246  #include "cmdline_common.h"
 247  #include "cmdline_progress.h"
 248
 249 +#include <memory>
 250 +
 251  #include <aptitude.h>
 252  #include <ui.h>
 253  #include <vs_progress.h>
 254 --- aptitude-0.3.5.1/src/mine/cmine.cc.orig     2005-10-05 08:55:22.000000000 +0200
 255 +++ aptitude-0.3.5.1/src/mine/cmine.cc  2015-02-15 13:26:48.646221609 +0100
 256 @@ -29,6 +29,7 @@
 257
 258  #include <string>
 259  #include <fstream>
 260 +#include <unistd.h>
 261
 262  #ifndef DONT_USE_FANCYBOXES
 263  // Some systems (*cough* Solaris xterms *cough*) don't like the fancy ASCII
 264 --- aptitude-0.3.5.1/src/main.cc.orig   2005-10-14 22:32:54.000000000 +0200
 265 +++ aptitude-0.3.5.1/src/main.cc        2015-02-15 13:29:04.419549244 +0100
 266 @@ -25,6 +25,7 @@
 267
 268  #include <getopt.h>
 269  #include <signal.h>
 270 +#include <unistd.h>
 271
 272  #include "aptitude.h"
 273
 274 --- aptitude-0.3.5.1/src/solution_fragment.cc.orig      2005-10-05 08:55:20.000000000 +0200
 275 +++ aptitude-0.3.5.1/src/solution_fragment.cc   2015-02-15 13:57:37.782810677 +0100
 276 @@ -31,6 +31,7 @@
 277  #include <vscreen/fragment.h>
 278  #include <vscreen/transcode.h>
 279
 280 +#include <algorithm>
 281  #include <vector>
 282
 283  typedef generic_solution<aptitude_universe> aptitude_solution;