[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/, dev-util/android-tools/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/, dev-util/android-tools/files/

[Sergei Trofimovich]

commit:     8997323e5e0645fc993041d623ccc270e3fe74dc
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 13:17:32 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 13:17:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8997323e

dev-util/android-tools: tweak for gcc-11

Fixed-by: andy
Closes: https://bugs.gentoo.org/764071
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild       |  4 +++-
 .../files/android-tools-9.0.0-limits-gcc11.patch              | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
index 3c4e5ba6b30..d5ba3b86332 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -44,6 +44,8 @@ RDEPEND="${DEPEND}
 DEPEND+="
 	dev-lang/go"
 
+PATCHES=("${FILESDIR}"/${PN}-9.0.0-limits-gcc11.patch)
+
 S=${WORKDIR}
 CMAKE_USE_DIR="${S}/boringssl"
 

diff --git a/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch b/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch
new file mode 100644
index 00000000000..ced85fc8306
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-9.0.0-limits-gcc11.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/764071
+--- a/core/fastboot/protocol.cpp	2018-06-21 02:58:42.000000000 +0200
++++ b/core/fastboot/protocol.cpp	2021-01-06 10:11:52.806586912 +0100
+@@ -37,6 +37,7 @@
+ 
+ #include <algorithm>
+ #include <vector>
++#include <limits>
+ 
+ #include <android-base/file.h>
+ #include <android-base/stringprintf.h>

[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/, dev-util/android-tools/files/

[Sam James]

commit:     9b60f64b5be8e35a125b92cc0ef957f5e2186c7c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 01:38:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 14 01:38:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b60f64b

dev-util/android-tools: fix build with GCC 12

Closes: https://bugs.gentoo.org/844127
Thanks-to: Mike Lothian <mike <AT> fireburn.co.uk>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/android-tools-31.0.3_p1.ebuild     |  4 +++-
 .../files/android-tools-31.0.3_p1-gcc12.patch             | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
index ba179d04c56f..0f1abac32b14 100644
--- a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
+++ b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -54,6 +54,8 @@ src_prepare() {
 	eapply "${DISTDIR}/${PN}-31.0.3-disable-werror-boringssl.patch"
 	cd "${S}/vendor/boringssl" || die
 	eapply "${S}/patches/boringssl/0011-Disable-Werror.patch"
+	cd "${S}/vendor/adb" || die
+	eapply "${FILESDIR}/${PN}-31.0.3_p1-gcc12.patch"
 	cd "${S}"
 	eapply "${DISTDIR}/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch"
 	rm -r patches || die

diff --git a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
new file mode 100644
index 000000000000..aa313daf9042
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
@@ -0,0 +1,15 @@
+From 752fc3bd9a971858dbb7b51a0ef0289232e67e58 Mon Sep 17 00:00:00 2001
+From: Mike Lothian <mike@fireburn.co.uk>
+Date: Sat, 14 May 2022 02:01:18 +0100
+Subject: [PATCH] Add functional include
+
+--- a/tls/include/adb/tls/tls_connection.h
++++ b/tls/include/adb/tls/tls_connection.h
+@@ -19,6 +19,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
++#include <functional>
+ #include <string_view>
+ #include <vector>
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/, dev-util/android-tools/files/

[Sam James]

commit:     5216d3cd0bf3a81048897d15ba4c00e0559ccf11
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 05:23:00 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 05:23:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5216d3cd

dev-util/android-tools: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/875575
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../android-tools/android-tools-33.0.3-r1.ebuild   |  3 ++-
 .../files/android-tools-33.0.3-adb-gcc-13.patch    | 25 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

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')

[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/, dev-util/android-tools/files/

[Sam James]

commit:     6715861d4786d75621d8ed980121b37be523f5bb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 21:23:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 22 21:23:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6715861d

dev-util/android-tools: fix build w/ new protobuf

Closes: https://bugs.gentoo.org/912789
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/android-tools/Manifest                    |  1 +
 dev-util/android-tools/android-tools-34.0.1.ebuild | 95 ++++++++++++++++++++++
 .../files/android-tools-34.0.0-protobuf.patch      | 41 ++++++++++
 3 files changed, 137 insertions(+)

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 157b8efb06a8..d89c8e9b9823 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/dev-util/android-tools/android-tools-34.0.1.ebuild b/dev-util/android-tools/android-tools-34.0.1.ebuild
new file mode 100644
index 000000000000..d8c292897706
--- /dev/null
+++ b/dev-util/android-tools/android-tools-34.0.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-r1
+
+DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
+HOMEPAGE="https://github.com/nmeum/android-tools/ https://developer.android.com/"
+
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/nmeum/android-tools/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz
+	https://dev.gentoo.org/~zmedico/dist/${PN}-31.0.3-no-gtest.patch
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
+LICENSE="Apache-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="python udev"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# dev-libs/libpcre only required for e2fsdroid
+DEPEND="
+	app-arch/brotli:=
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/libpcre2:=
+	>=dev-libs/protobuf-3.0.0:=
+	sys-libs/zlib:=
+	virtual/libusb:1=
+"
+RDEPEND="${DEPEND}
+	udev? ( dev-util/android-udev-rules )
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	dev-lang/go
+	dev-lang/perl
+"
+
+DOCS=()
+
+src_prepare() {
+	eapply "${DISTDIR}/${PN}-31.0.3-no-gtest.patch"
+	eapply "${FILESDIR}/${PN}-34.0.0-protobuf.patch"
+
+	cd "${S}/vendor/core" || die
+	eapply "${S}/patches/core/0011-Remove-the-useless-dependency-on-gtest.patch"
+
+	cd "${S}/vendor/libziparchive" || die
+	eapply "${S}/patches/libziparchive/0004-Remove-the-useless-dependency-on-gtest.patch"
+
+	cd "${S}" || die
+	rm -r patches || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Statically link the bundled boringssl
+		-DBUILD_SHARED_LIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	export GOCACHE="${T}/go-build"
+	export GOFLAGS="-mod=vendor"
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${ED}/usr/bin/mkbootimg" || die
+	rm "${ED}/usr/bin/unpack_bootimg" || die
+	rm "${ED}/usr/bin/repack_bootimg" || die
+	rm "${ED}/usr/bin/mkdtboimg" || die
+	rm "${ED}/usr/bin/avbtool" || die
+
+	if use python; then
+		python_foreach_impl python_newexe vendor/mkbootimg/mkbootimg.py mkbootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/unpack_bootimg.py unpack_bootimg
+		python_foreach_impl python_newexe vendor/mkbootimg/repack_bootimg.py repack_bootimg
+		python_foreach_impl python_newexe vendor/libufdt/utils/src/mkdtboimg.py mkdtboimg
+		python_foreach_impl python_newexe vendor/avb/avbtool.py avbtool
+	fi
+	docinto adb
+	dodoc vendor/adb/*.{txt,TXT}
+	docinto fastboot
+	dodoc vendor/core/fastboot/README.md
+}

diff --git a/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch b/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch
new file mode 100644
index 000000000000..d7aa309410a4
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-34.0.0-protobuf.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/912789
+https://github.com/nmeum/android-tools/commit/c5eae90a06072c6982e483f8154e490b47e620f7
+https://github.com/nmeum/android-tools/pull/120#issuecomment-1621066529
+
+--- a/vendor/CMakeLists.txt
++++ b/vendor/CMakeLists.txt
+@@ -73,6 +73,8 @@
+ pkg_check_modules(libzstd REQUIRED IMPORTED_TARGET libzstd)
+ 
++find_package(Protobuf CONFIG)
+ find_package(Protobuf REQUIRED)
++set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
+ find_package(Threads REQUIRED)
+ 
+--- a/vendor/extras/libjsonpb/parse/jsonpb.cpp
++++ b/vendor/extras/libjsonpb/parse/jsonpb.cpp
+@@ -50,8 +50,10 @@
+   if (!status.ok()) {
+ #if GOOGLE_PROTOBUF_VERSION < 3016000
+     return MakeError<std::string>(status.error_message().as_string());
+-#else
++#elif GOOGLE_PROTOBUF_VERSION < 4022000
+     return MakeError<std::string>(status.message().as_string());
++#else
++    return MakeError<std::string>(std::string(status.message()));
+ #endif
+   }
+   return ErrorOr<std::string>(std::move(json));
+@@ -67,8 +69,10 @@
+   if (!status.ok()) {
+ #if GOOGLE_PROTOBUF_VERSION < 3016000
+     return MakeError<std::monostate>(status.error_message().as_string());
+-#else
++#elif GOOGLE_PROTOBUF_VERSION < 4022000
+     return MakeError<std::monostate>(status.message().as_string());
++#else
++    return MakeError<std::monostate>(std::string(status.message()));
+ #endif
+   }
+   if (!message->ParseFromString(binary)) {

[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/, dev-util/android-tools/files/

[Zac Medico]

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 <csfore@posteo.net>
+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>