From ea7fa1f207c12a64574d9a56f4f4108c12e65910 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 22 Dec 2021 16:31:53 +0100 Subject: [PATCH] Remove unnecessary aria2 patch This patch was to compile libaria2 on android. But we don't compile it for android since a long time. As it doesn't apply anymore, let's remove it. --- kiwixbuild/dependencies/aria2.py | 1 - kiwixbuild/patches/libaria2_android.patch | 29 ----------------------- 2 files changed, 30 deletions(-) delete mode 100644 kiwixbuild/patches/libaria2_android.patch diff --git a/kiwixbuild/dependencies/aria2.py b/kiwixbuild/dependencies/aria2.py index db5c76d..a15466a 100644 --- a/kiwixbuild/dependencies/aria2.py +++ b/kiwixbuild/dependencies/aria2.py @@ -13,7 +13,6 @@ class Aria2(Dependency): archive = Remotefile('aria2-1.36.0.tar.xz', '58d1e7608c12404f0229a3d9a4953d0d00c18040504498b483305bcb3de907a5', 'https://github.com/aria2/aria2/releases/download/release-1.36.0/aria2-1.36.0.tar.xz') - patches = ["libaria2_android.patch"] def _post_prepare_script(self, context): context.try_skip(self.extract_path) diff --git a/kiwixbuild/patches/libaria2_android.patch b/kiwixbuild/patches/libaria2_android.patch deleted file mode 100644 index ef647a5..0000000 --- a/kiwixbuild/patches/libaria2_android.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -ur libaria2-1.33.1/src/a2io.h libaria2-1.33.1.patched/src/a2io.h ---- libaria2-1.33.1/src/a2io.h 2017-11-08 13:39:06.000000000 +0100 -+++ libaria2-1.33.1.patched/src/a2io.h 2018-03-27 17:02:45.651414060 +0200 -@@ -147,7 +147,7 @@ - // # define a2fseek(fp, offset, origin): No fseek64 and not used in aria2 - #define a2fstat(fd, buf) fstat64(fd, buf) - // # define a2ftell(fd): No ftell64 and not used in aria2 --#define a2_struct_stat struct stat -+#define a2_struct_stat struct stat64 - #define a2stat(path, buf) stat64(path, buf) - #define a2mkdir(path, openMode) mkdir(path, openMode) - #define a2utimbuf utimbuf -diff -ur libaria2-1.33.1/src/crypto_endian.h libaria2-1.33.1.patched/src/crypto_endian.h ---- libaria2-1.33.1/src/crypto_endian.h 2017-11-08 13:39:06.000000000 +0100 -+++ libaria2-1.33.1.patched/src/crypto_endian.h 2018-03-27 16:56:55.264371501 +0200 -@@ -33,9 +33,13 @@ - #define BIG_ENDIAN 4321 - #define BYTE_ORDER LITTLE_ENDIAN - #else // ! defined(_WIN32) || defined(__INTEL_COMPILER) || defined (_MSC_VER) -+#if defined(__ANDROID__) -+#include -+#else // defined(__ANDROID__) - #ifdef HAVE_SYS_PARAM_H - #include - #endif // HAVE_SYS_PARAM_H -+#endif // defined(__ANDROID__) - #endif // ! defined(_WIN32) || defined(__INTEL_COMPILER) || defined (_MSC_VER) - - #if !defined(LITTLE_ENDIAN) || !defined(BIG_ENDIAN) || !defined(BYTE_ORDER) || \