diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-27 07:57:53 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-27 07:57:53 +0000 |
| commit | f2299aed04cae8310f7fce0be5396370e346d966 (patch) | |
| tree | f553199fdc256388ed59b3d74a0b3b100765e24c /dev-util/android-tools | |
| parent | 2db43213e5c343995f4b9fb977726fe42ebdac67 (diff) | |
gentoo auto-resync : 27:01:2023 - 07:57:53
Diffstat (limited to 'dev-util/android-tools')
| -rw-r--r-- | dev-util/android-tools/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/android-tools/android-tools-33.0.3-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch | 25 |
3 files changed, 29 insertions, 2 deletions
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest index a91ce51879c1..328f84da25b5 100644 --- a/dev-util/android-tools/Manifest +++ b/dev-util/android-tools/Manifest @@ -1,5 +1,6 @@ AUX android-tools-33.0.3-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch 5109 BLAKE2B 4deee34669ce000050d04cf01040920a22ca0caafca006ff2651198a60936dce9e8f783263b05beb91bef8c015e14362725aa4dc23c32be30c6796ad20e69ad7 SHA512 4b8afcf5290be113d98572a9a1ad5309c8bf75f0c17aed2f698d3302f796f8fb7ead3422d649c4909019cf766ae16fc0d75401fb15eb42130e58b451d628af21 +AUX android-tools-33.0.3-adb-gcc-13.patch 798 BLAKE2B dea7b3086b4e879224625dbc50de045d4c3f05fed4fa5254b041d3c4526cfa04bd764b9f67f17ed332efe66a6b43637c71b3fe0db4a276ae133c5be74cb50ab9 SHA512 55444dcb7d4266f412ca54a018783fe10abe751e9aca3ef8494245a0b358bece07743c3773659d891822acfef0fa2edafec7857a0f4b522177b670f2a2489b96 DIST android-tools-31.0.3-no-gtest.patch 3152 BLAKE2B da71e3cba87b21ffcb144602a06d7e269faabd173233363b757cd2191c051f8d3281f591117d4551d7acc029d6e2d421f702f9f836dfe0dec6c676aa39a2d9fe SHA512 a28d2264bf40c420a279acf1f4c3b4588d96ce2d6e2d6d322abbde62d773804bef10dc33f13dd52c7de80ace6c58f91ae28f5d4e8e97dfae4d2a8473d8537423 DIST android-tools-33.0.3.tar.xz 25300756 BLAKE2B 4254f0ab8657966cf56e2a7c3e9a3d889dfa9f26e61d8b46480bb74c5a8be33494f450827e3b2db4087006b3160892e6a846ef33719870cbbd032647cfc3ce78 SHA512 78c8141f5f13f1c0e5da474e1d79760a612e911519af4e9f21c0e5005f2ce99f3aeacf16f3fcdfe1250fc795a88190fa243592e1066a2156e1fd8d2b9c3d7f71 -EBUILD android-tools-33.0.3-r1.ebuild 2333 BLAKE2B ad52ce8e49f5bf37f6d2d9a61a335bb5436ff0a48524748328ec8ea99ddff624d4a26d5bedb42d5a339dd5664184320b6fdd877a38d26911e4244d749b071021 SHA512 6fe2210ad27cfe33159d1ff3e80a2c4f75ab53670e3e3db4e3a8d3032d72b4560bbc6f0fbdf04596b7d7ae7740511b3c5fa00f5a04ecc5c49be9689e843d7e02 +EBUILD android-tools-33.0.3-r1.ebuild 2384 BLAKE2B 5254d2332524ba5f45b697a4a629092847d4500f46aeb63cd3a87a098803eace1e1f8fa23bc00f3c6e26a2a9383fd6c165a30c89071ba44a11da7296ee3c1e3c SHA512 9191f11cf7cca821db90a877f5d2b9763b983f5d8553ab2ea19062ffa1c967158fab0e2f936672cae3440c2451d691905e1a776002468f6300d5d06e959ef988 MISC metadata.xml 724 BLAKE2B 7ef6e07d806dff51946236dfee2f5eaf207fd7c9cde6e73cb7f372fea5cd8b2b559e4f1fe81a315c41beed5beba92603cc93a16183d63953fbed4ba0d2941116 SHA512 d47cf87259ad2b2a8d6f8edf6b2c2084d0046773447ed9647cc232437ec8f3e8c452cb26ac7e0a619b220e073518903b77c55ba7c2e9f7663069fea2e7096e75 diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild index 3b9b45c7c8e0..155cf7f10a4b 100644 --- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild +++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild @@ -55,8 +55,9 @@ src_prepare() { cd "${S}/vendor/adb" || die eapply "${FILESDIR}/${P}-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch" + eapply "${FILESDIR}/${P}-adb-gcc-13.patch" - cd "${S}" + cd "${S}" || die rm -r patches || die cmake_src_prepare } diff --git a/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch b/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch new file mode 100644 index 000000000000..4ba2c9a49c31 --- /dev/null +++ b/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/875575 +https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2399311 + +From ddffab649b12dce1502d63711836b58d007f6a28 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Mon, 23 Jan 2023 23:09:52 +0100 +Subject: [PATCH] Fix build with gcc 13 by including <cstdint> + +Like other versions before, gcc 13 moved some includes around and as a +result <cstdint> is no longer transitively included. Explicitly include +it for uint{32,64}_t. + +Test: local build +Change-Id: I05a27726b05427c486fd01b013dba4d698abac97 +--- a/file_sync_protocol.h ++++ b/file_sync_protocol.h +@@ -16,6 +16,8 @@ + + #pragma once + ++#include <cstdint> ++ + #define MKID(a, b, c, d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24)) + + #define ID_LSTAT_V1 MKID('S', 'T', 'A', 'T') |