Drop need of setting TERMUX_PKG_FOLDERNAME
[termux-packages] / packages / apt / apt-pkg-contrib-fileutl.patch
CommitLineData
ee5e9ab1
FF
1diff -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
dc111072
FF
3+++ ./apt-pkg/contrib/fileutl.cc 2017-09-17 20:46:39.567888481 +0200
4@@ -46,7 +46,9 @@
5 #include <dirent.h>
6 #include <signal.h>
7 #include <errno.h>
8+#ifndef __ANDROID__
9 #include <glob.h>
10+#endif
11 #include <pwd.h>
12 #include <grp.h>
13
14@@ -2752,6 +2754,7 @@
ee5e9ab1
FF
15 }
16 /*}}}*/
17
18+#ifndef __ANDROID__
19 // Glob - wrapper around "glob()" /*{{{*/
20 std::vector<std::string> Glob(std::string const &pattern, int flags)
21 {
dc111072 22@@ -2777,6 +2780,7 @@
ee5e9ab1
FF
23 globfree(&globbuf);
24 return result;
25 }
26+#endif
27 /*}}}*/
28 static std::string APT_NONNULL(1) GetTempDirEnv(char const * const env) /*{{{*/
29 {
30diff -u -r ../apt-1.4.7/apt-pkg/contrib/fileutl.h ./apt-pkg/contrib/fileutl.h
31--- ../apt-1.4.7/apt-pkg/contrib/fileutl.h 2017-07-13 23:45:39.000000000 +0200
dc111072 32+++ ./apt-pkg/contrib/fileutl.h 2017-08-26 22:05:52.875932441 +0200
ee5e9ab1
FF
33@@ -239,7 +239,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 *