chiark - git - mdw - termux-packages/blob - packages/apt/cdrumtl.patch

   1 diff -u -r ../apt-0.9.16.1/apt-pkg/contrib/cdromutl.cc ./apt-pkg/contrib/cdromutl.cc
   2 --- ../apt-0.9.16.1/apt-pkg/contrib/cdromutl.cc 2014-03-15 17:26:21.000000000 +0100
   3 +++ ./apt-pkg/contrib/cdromutl.cc       2014-03-25 00:58:55.948730001 +0100
   4 @@ -24,7 +24,6 @@
   5  #include <iostream>
   6  #include <string>
   7  #include <vector>
   8 -#include <sys/statvfs.h>
   9  #include <dirent.h>
  10  #include <fcntl.h>
  11  #include <sys/stat.h>
  12 @@ -239,6 +238,7 @@
  13     closedir(D);
  14
  15     // Some stats from the fsys
  16 +#ifndef __ANDROID__
  17     if (_config->FindB("Debug::identcdrom",false) == false)
  18     {
  19        struct statvfs Buf;
  20 @@ -258,6 +258,7 @@
  21     }
  22     else
  23        sprintf(S,"-%u.debug",Version);
  24 +#endif
  25
  26     Res = Hash.Result().Value() + S;
  27     return true;
  28 @@ -266,6 +267,7 @@
  29  // FindMountPointForDevice - Find mountpoint for the given device      /*{{{*/
  30  string FindMountPointForDevice(const char *devnode)
  31  {
  32 +#ifndef __ANDROID__
  33     // this is the order that mount uses as well
  34     std::vector<std::string> const mounts = _config->FindVector("Dir::state::MountPoints", "/etc/mtab,/proc/mount");
  35
  36 @@ -290,7 +292,7 @@
  37          }
  38          fclose(f);
  39        }
  40 -
  41 +#endif
  42     return string();
  43  }
  44                                                                         /*}}}*/