diff --git a/srcpkgs/android-tools/patches/fix-build-ppc.patch b/srcpkgs/android-tools/patches/fix-build-ppc.patch index bfbd7b27416..f7eec8b63f6 100644 --- a/srcpkgs/android-tools/patches/fix-build-ppc.patch +++ b/srcpkgs/android-tools/patches/fix-build-ppc.patch @@ -11,18 +11,6 @@ index 63cc1a2..e356da9 100644 #include "block_list.h" #include "block_range.h" #include -diff --git a/vendor/e2fsprogs/contrib/android/e2fsdroid.c b/vendor/e2fsprogs/contrib/android/e2fsdroid.c -index f5d24b8..6a731fb 100644 ---- a/vendor/e2fsprogs/contrib/android/e2fsdroid.c -+++ b/vendor/e2fsprogs/contrib/android/e2fsdroid.c -@@ -5,6 +5,7 @@ - #include - #include - #include -+#include - #include - - #include "perms.h" diff --git a/vendor/e2fsprogs/contrib/android/fsmap.c b/vendor/e2fsprogs/contrib/android/fsmap.c index 9ee8472..68a9345 100644 --- a/vendor/e2fsprogs/contrib/android/fsmap.c @@ -32,15 +20,23 @@ index 9ee8472..68a9345 100644 #include "fsmap.h" #include #include -diff --git a/vendor/e2fsprogs/contrib/android/perms.c b/vendor/e2fsprogs/contrib/android/perms.c -index 9c5ec05..4f02104 100644 ---- a/vendor/e2fsprogs/contrib/android/perms.c -+++ b/vendor/e2fsprogs/contrib/android/perms.c +--- a/vendor/e2fsprogs/contrib/android/perms.c 2022-09-23 10:49:27.000000000 +0200 ++++ - 2022-11-20 01:09:21.921899432 +0100 @@ -1,6 +1,7 @@ #ifndef _GNU_SOURCE # define _GNU_SOURCE //asprintf #endif +#include + #include "config.h" #include "perms.h" #include "support/nls-enable.h" - #include +--- a/vendor/e2fsprogs/contrib/android/e2fsdroid.c 2022-09-23 10:49:27.000000000 +0200 ++++ - 2022-11-20 01:10:24.783255145 +0100 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include "perms.h" + #include "base_fs.h" diff --git a/srcpkgs/android-tools/patches/musl.patch b/srcpkgs/android-tools/patches/musl.patch new file mode 100644 index 00000000000..5c9f0f91aa3 --- /dev/null +++ b/srcpkgs/android-tools/patches/musl.patch @@ -0,0 +1,11 @@ +--- a/vendor/CMakeLists.sparse.txt 2022-07-13 18:44:44.000000000 +0200 ++++ - 2022-11-20 01:25:48.530247621 +0100 +@@ -5,7 +5,7 @@ + core/libsparse/sparse_crc32.cpp + core/libsparse/sparse_err.cpp + core/libsparse/sparse_read.cpp) +- ++target_compile_definitions(libsparse PRIVATE SEEK_DATA=3 SEEK_HOLE=4) + target_include_directories(libsparse PUBLIC + core/libsparse/include libbase/include) + target_link_libraries(libsparse PRIVATE libbase) diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index 8413d1e0cc1..1a758cf87f3 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -1,6 +1,6 @@ # Template file for 'android-tools' pkgname=android-tools -version=31.0.3p2 +version=33.0.3 revision=1 archs="armv* aarch64* x86_64* i686* ppc64le*" build_style=cmake @@ -13,7 +13,7 @@ maintainer="John " license="Apache-2.0, ISC, GPL-2.0-only, MIT" homepage="http://developer.android.com/tools/help/adb.html" distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz" -checksum=2e1274d625368f57128477c2cda8474489443cc56e8738cb71919412a2872fca +checksum=8ce174dab781d5debd29ed0f96572231f777bee19b8ef3c167e33d3ea7670bc5 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel"