mdw@git.distorted.org.uk Git - termux-packages/blob - disabled-packages/apt/apt-pkg-contrib-fileutl.patch

   1 diff -u -r ../apt-1.4.7/apt-pkg/contrib/fileutl.cc ./apt-pkg/contrib/fileutl.cc
   2 --- ../apt-1.4.7/apt-pkg/contrib/fileutl.cc     2017-07-13 23:45:39.000000000 +0200
   3 +++ ./apt-pkg/contrib/fileutl.cc        2017-07-23 21:02:20.571611631 +0200
   4 @@ -2752,6 +2752,7 @@
   5  }
   6                                                                         /*}}}*/
   7
   8 +#ifndef __ANDROID__
   9  // Glob - wrapper around "glob()"                                      /*{{{*/
  10  std::vector<std::string> Glob(std::string const &pattern, int flags)
  11  {
  12 @@ -2777,6 +2778,7 @@
  13     globfree(&globbuf);
  14     return result;
  15  }
  16 +#endif
  17                                                                         /*}}}*/
  18  static std::string APT_NONNULL(1) GetTempDirEnv(char const * const env)        /*{{{*/
  19  {
  20 diff -u -r ../apt-1.4.7/apt-pkg/contrib/fileutl.h ./apt-pkg/contrib/fileutl.h
  21 --- ../apt-1.4.7/apt-pkg/contrib/fileutl.h      2017-07-13 23:45:39.000000000 +0200
  22 +++ ./apt-pkg/contrib/fileutl.h 2017-07-23 21:02:02.051824374 +0200
  23 @@ -239,7 +239,9 @@
  24  APT_HIDDEN std::string flNormalize(std::string file);
  25
  26  // simple c++ glob
  27 +#ifndef __ANDROID__
  28  std::vector<std::string> Glob(std::string const &pattern, int flags=0);
  29 +#endif
  30
  31  /** \brief Popen() implementation that execv() instead of using a shell
  32   *