chiark - git - mdw - termux-packages/blob - disabled-packages/apt-updated/apt-pkg-contrib-fileutl.patch

   1 diff -u -r ../apt-1.6~alpha3/apt-pkg/contrib/fileutl.cc ./apt-pkg/contrib/fileutl.cc
   2 --- ../apt-1.6~alpha3/apt-pkg/contrib/fileutl.cc        2017-10-28 17:57:05.000000000 +0200
   3 +++ ./apt-pkg/contrib/fileutl.cc        2017-11-02 17:38:43.633482989 +0100
   4 @@ -37,7 +37,9 @@
   5  #include <dirent.h>
   6  #include <errno.h>
   7  #include <fcntl.h>
   8 +#ifndef __ANDROID__
   9  #include <glob.h>
  10 +#endif
  11  #include <grp.h>
  12  #include <pwd.h>
  13  #include <signal.h>
  14 @@ -2790,6 +2792,7 @@
  15  }
  16                                                                         /*}}}*/
  17
  18 +#ifndef __ANDROID__
  19  // Glob - wrapper around "glob()"                                      /*{{{*/
  20  std::vector<std::string> Glob(std::string const &pattern, int flags)
  21  {
  22 @@ -2815,6 +2818,7 @@
  23     globfree(&globbuf);
  24     return result;
  25  }
  26 +#endif
  27                                                                         /*}}}*/
  28  static std::string APT_NONNULL(1) GetTempDirEnv(char const * const env)        /*{{{*/
  29  {
  30 diff -u -r ../apt-1.6~alpha3/apt-pkg/contrib/fileutl.h ./apt-pkg/contrib/fileutl.h
  31 --- ../apt-1.6~alpha3/apt-pkg/contrib/fileutl.h 2017-10-28 17:57:05.000000000 +0200
  32 +++ ./apt-pkg/contrib/fileutl.h 2017-11-02 17:37:38.518249720 +0100
  33 @@ -262,7 +262,9 @@
  34  APT_HIDDEN std::string flNormalize(std::string file);
  35
  36  // simple c++ glob
  37 +#ifndef __ANDROID__
  38  std::vector<std::string> Glob(std::string const &pattern, int flags=0);
  39 +#endif
  40
  41  /** \brief Popen() implementation that execv() instead of using a shell
  42   *