commit: ea1752bdffb228b31f045b17c6603afcf18ed192 Author: Christopher Fore <csfore <AT> posteo <DOT> net> AuthorDate: Sat Dec 9 20:07:12 2023 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sat Dec 9 21:43:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1752bd
dev-util/android-tools: Add patch to fix compilation on GCC 14 <algorithm> is no longer included by default in GCC 14 so explicitly including it is now required. Upstream: https://github.com/nmeum/android-tools/pull/129 AOSP CR: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2838578 AOSP CR: https://android-review.googlesource.com/c/platform/system/core/+/2839495 Both CRs to AOSP have been merged and upstream has merged the PR as well, all that is needed is a version bump from AOSP. Closes: https://bugs.gentoo.org/916788 Signed-off-by: Christopher Fore <csfore <AT> posteo.net> Closes: https://github.com/gentoo/gentoo/pull/34201 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> dev-util/android-tools/android-tools-34.0.1.ebuild | 1 + .../android-tools-34.0.1-include-algorithm.patch | 45 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) 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 <[email protected]> +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 <ziparchive/zip_archive.h> + #include <ziparchive/zip_writer.h> + ++#include <algorithm> + #include <array> + #include <cinttypes> + #include <numeric> +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 <liblp/liblp.h> + ++#include <algorithm> ++ + #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 <sys/ioctl.h> + #endif + ++#include <algorithm> + #include <map> + #include <string> + #include <vector>
