apt: Fix building with unified headers

diff --git a/packages/apt/apt-private-private-download.cc.patch b/packages/apt/apt-private-private-download.cc.patch
new file mode 100644 (file)
index 0000000..55e3d46
--- /dev/null
+++ b/packages/apt/apt-private-private-download.cc.patch
@@ -0,0 +1,11 @@
+diff -u -r ../apt-1.2.12/apt-private/private-download.cc ./apt-private/private-download.cc
+--- ../apt-1.2.12/apt-private/private-download.cc      2016-05-11 10:57:51.000000000 +0200
++++ ./apt-private/private-download.cc  2017-07-01 00:31:32.131776100 +0200
+@@ -121,7 +121,6 @@
+                                                                       /*}}}*/
+ bool CheckFreeSpaceBeforeDownload(std::string const &Dir, unsigned long long FetchBytes)/*{{{*/
+ {
+-   uint32_t const RAMFS_MAGIC = 0x858458f6;
+    /* Check for enough free space, but only if we are actually going to
+       download */
+    if (_config->FindB("APT::Get::Print-URIs", false) == true ||

diff --git a/packages/apt/cmndline-no-strchrnul.patch b/packages/apt/cmndline-no-strchrnul.patch
index 61b0479b101d2c545b3b65e05e6445be032dbef6..55a08727f1ee248b5c9c1a3f4f5c056aadcb723c 100644 (file)
--- a/packages/apt/cmndline-no-strchrnul.patch
+++ b/packages/apt/cmndline-no-strchrnul.patch
@@ -8,8 +8,8 @@ diff -u -r ../apt-0.9.16.1/apt-pkg/contrib/cmndline.cc ./apt-pkg/contrib/cmndlin
 +#if defined(__ANDROID__)
 +static char* strchrnul(char const* s, int c)
 +{
 +#if defined(__ANDROID__)
 +static char* strchrnul(char const* s, int c)
 +{

-+        char* result = strchr(s, c);
-+        return (result == NULL) ? const_cast<char*>(s + strlen(s)) : result;
++        char const* result = strchr(s, c);
++        return const_cast<char*>((result == NULL) ? (s + strlen(s)) : result);

 +}
 +#endif
 +
 +}
 +#endif
 +

diff --git a/packages/apt/debsrcrecords.patch b/packages/apt/debsrcrecords.patch
index bf34220b269e55af5c5194b858340a1704aa912d..bedcbc0960314fc272ff0e4721756a1b0943a758 100644 (file)
--- a/packages/apt/debsrcrecords.patch
+++ b/packages/apt/debsrcrecords.patch
@@ -8,8 +8,8 @@ diff -u -r ../apt-0.9.16.1/apt-pkg/deb/debsrcrecords.cc ./apt-pkg/deb/debsrcreco
 +#if defined(__ANDROID__)
 +static char* strchrnul(char const* s, int c)
 +{
 +#if defined(__ANDROID__)
 +static char* strchrnul(char const* s, int c)
 +{

-+                char* result = strchr(s, c);
-+                        return (result == NULL) ? const_cast<char*>(s + strlen(s)) : result;
++      char const* result = strchr(s, c);
++      return const_cast<char*>((result == NULL) ? (s + strlen(s)) : result);

 +}
 +#endif
 +
 +}
 +#endif
 +