[PR PATCH] android-tools: update to 33.0.3.

[PR PATCH] android-tools: update to 33.0.3.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages android-tools-33.0.0
https://github.com/void-linux/void-packages/pull/40630

android-tools: update to 33.0.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40630.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-33.0.0-40630.patch --]
[-- Type: text/x-diff, Size: 3996 bytes --]

From 75ce4679163d5399d05c16d5ca3213675edc4e03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Nov 2022 01:27:04 +0100
Subject: [PATCH] android-tools: update to 33.0.3.

---
 .../android-tools/patches/fix-build-ppc.patch | 30 ++++++++-----------
 srcpkgs/android-tools/patches/musl.patch      | 11 +++++++
 srcpkgs/android-tools/template                |  4 +--
 3 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/android-tools/patches/musl.patch

diff --git a/srcpkgs/android-tools/patches/fix-build-ppc.patch b/srcpkgs/android-tools/patches/fix-build-ppc.patch
index bfbd7b27416c..f7eec8b63f60 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 <stdio.h>
-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 <string.h>
- #include <unistd.h>
- #include <limits.h>
-+#include <linux/types.h>
- #include <ext2fs/ext2fs.h>
- 
- #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 <sys/types.h>
  #include <sys/stat.h>
-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 <linux/types.h>
+ #include "config.h"
  #include "perms.h"
  #include "support/nls-enable.h"
- #include <time.h>
+--- 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 <string.h>
+ #include <unistd.h>
+ #include <limits.h>
++#include <linux/types.h>
+ 
+ #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 000000000000..5c9f0f91aa32
--- /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 8413d1e0cc10..1a758cf87f3a 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 <me@johnnynator.dev>"
 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"

Re: [PR PATCH] [Merged]: android-tools: update to 33.0.3.

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]

There's a merged pull request on the void-packages repository

android-tools: update to 33.0.3.
https://github.com/void-linux/void-packages/pull/40630

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->