From 8fc08491f26431ec46b36d6ebef9551f3773b96f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Dec 2023 23:17:55 +0000 Subject: gentoo auto-resync : 09:12:2023 - 23:17:54 --- dev-util/android-tools/Manifest | 3 +- dev-util/android-tools/android-tools-34.0.1.ebuild | 1 + .../android-tools-34.0.1-include-algorithm.patch | 45 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch (limited to 'dev-util/android-tools') diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest index 2e89b2c8b3b1..8a8b6e59dc58 100644 --- a/dev-util/android-tools/Manifest +++ b/dev-util/android-tools/Manifest @@ -1,11 +1,12 @@ 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 AUX android-tools-34.0.0-protobuf.patch 1414 BLAKE2B 599881bcf7b0b44592f3779abe54f1e727a6726ff758d51c5a7cdf3d2a08439dcf4ec6e9cae5ad36f7f64bb7d57d40c8c629752469925e6372371449e0a3d6fb SHA512 14a9bbeef4de9f6c6d13af2b0797fa448670be0c4e3ae6453dae90674a5ac685b18361a12619a3ce7900f511b3cea2e1508bf35b127fb18aa6e2942eb52c36ef +AUX android-tools-34.0.1-include-algorithm.patch 1399 BLAKE2B 91f52906183e32a910b19e7461d2a0d8cbaab982a8ca9fc2a7130f6783b0e04506914344b1736da15da3c255905ec3602e8d119f98cda5b09e869f66afc2f117 SHA512 ae8594354513cb36b5426cc884fb07c467c411526bcc4cf9e791498548c3f272c5d635e63cddb4982f0989adbfea6b05d4881b0b963d5ed533df234d906ede78 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 DIST android-tools-34.0.0.tar.xz 37882448 BLAKE2B 19698c08dd650abba61e5cad9f7474ee3993f5b1fd2f173221560e5ccfc1677093758c325833993a68058c1427e132986b009f9e69a1eae9c4447053920b6feb SHA512 2d24cd95df7da1efa902fab3c848e2ebf09d3335fac61e667b19e1892e95c30a850413d354ceda72a402014623bbda4154cc33fb93a62c31fece8857efbbd596 DIST android-tools-34.0.1.tar.xz 37904276 BLAKE2B 6b4d31dadbc646d52c8abd65602264dc16127eb36286d23be447539b0d9b46154592a04af37b3e7617933e62529e953b958db8cb77622e72cfe5ab176f822437 SHA512 413ddcca9a461d1c0a12d7fd19b9d8955619b281e1153318ed961bec17ad92bec103671abc8d63525bc83669376f37c11c887cc4cada85719120dff6c3951274 EBUILD android-tools-33.0.3-r1.ebuild 2384 BLAKE2B 5254d2332524ba5f45b697a4a629092847d4500f46aeb63cd3a87a098803eace1e1f8fa23bc00f3c6e26a2a9383fd6c165a30c89071ba44a11da7296ee3c1e3c SHA512 9191f11cf7cca821db90a877f5d2b9763b983f5d8553ab2ea19062ffa1c967158fab0e2f936672cae3440c2451d691905e1a776002468f6300d5d06e959ef988 EBUILD android-tools-34.0.0.ebuild 2438 BLAKE2B 59b54a35075efb311afad6b54a70d3091a16bd16fe7d99e23d189784ab40481b89e36d836c076aeb5f134d320051375d7cabc8ff8bd5fa834b95cfa7de5fafae SHA512 019fc5ca93170e7a4441a806940621a2b03cc2e50443a8fe26a458aef1150605bbb5c12fecc45687aed2b64a51cb48369d341deaf325e92c98d15398493974a6 -EBUILD android-tools-34.0.1.ebuild 2489 BLAKE2B 955a6fb946206826be287f4d3458d1360174c7f72a4747657d5edd0f15efc6ba64f125bf6929390d5d1f7f44d71207fdda3751f5a2777afe3c10981d9a4073b4 SHA512 88351854f5029db92f720601318f5dc5cfc297101f4aae1086e0590904b113090ed2c5476c65f13eb49ec18ba32d73addcad76f3ab47ea437371347698d1d080 +EBUILD android-tools-34.0.1.ebuild 2548 BLAKE2B 6635debce7820e3779e7fd66a4ea95d7185d654458ab3312ed56caaa4b5c5ea85e469c9e86a939dd062ca785500c91e555c88d028c65ac83a2dc431b350361c5 SHA512 58b1068e1ba5cd5d4f09f7af46bdf29950ad5bbc8980c7e2d997c7932b68815461acd3e0514ae282fe43220c68aa2010ad849465a634750f261d6b80ba6c1482 MISC metadata.xml 724 BLAKE2B 7ef6e07d806dff51946236dfee2f5eaf207fd7c9cde6e73cb7f372fea5cd8b2b559e4f1fe81a315c41beed5beba92603cc93a16183d63953fbed4ba0d2941116 SHA512 d47cf87259ad2b2a8d6f8edf6b2c2084d0046773447ed9647cc232437ec8f3e8c452cb26ac7e0a619b220e073518903b77c55ba7c2e9f7663069fea2e7096e75 diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild index f39af8537f13..71c640449d57 100644 --- a/dev-util/android-tools/android-tools-34.0.1.ebuild +++ b/dev-util/android-tools/android-tools-34.0.1.ebuild @@ -47,6 +47,7 @@ DOCS=() src_prepare() { eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch" eapply "${FILESDIR}/${PN}-34.0.0-protobuf.patch" + eapply "${FILESDIR}/${PN}-34.0.1-include-algorithm.patch" cd "${S}/vendor/core" || die eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch" diff --git a/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch b/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch new file mode 100644 index 000000000000..79bd52c4c634 --- /dev/null +++ b/dev-util/android-tools/files/android-tools-34.0.1-include-algorithm.patch @@ -0,0 +1,45 @@ +From 805c7e385123c6c142c8fec941406fea62af4459 Mon Sep 17 00:00:00 2001 +From: Christopher Fore +Date: Sat, 9 Dec 2023 15:07:12 -0500 +Subject: [PATCH] dev-util/android-tools: Add patch to fix compilation on GCC 14 + +https://github.com/gentoo/gentoo/pull/34201 +--- + +diff --git a/vendor/adb/client/incremental_utils.cpp b/vendor/adb/client/incremental_utils.cpp +index 2f6958b..67f21a1 100644 +--- a/vendor/adb/client/incremental_utils.cpp ++++ b/vendor/adb/client/incremental_utils.cpp +@@ -24,6 +24,7 @@ + #include + #include + ++#include + #include + #include + #include +diff --git a/vendor/core/fs_mgr/liblp/super_layout_builder.cpp b/vendor/core/fs_mgr/liblp/super_layout_builder.cpp +index 37f28e1..0db82e5 100644 +--- a/vendor/core/fs_mgr/liblp/super_layout_builder.cpp ++++ b/vendor/core/fs_mgr/liblp/super_layout_builder.cpp +@@ -17,6 +17,8 @@ + + #include + ++#include ++ + #include "images.h" + #include "utility.h" + #include "writer.h" +diff --git a/vendor/core/fs_mgr/liblp/utility.cpp b/vendor/core/fs_mgr/liblp/utility.cpp +index d8e171b..70c7b79 100644 +--- a/vendor/core/fs_mgr/liblp/utility.cpp ++++ b/vendor/core/fs_mgr/liblp/utility.cpp +@@ -25,6 +25,7 @@ + #include + #endif + ++#include + #include + #include + #include -- cgit v1.2.3