From 6b1fdf7112b270ca8a83019736c2ebac1ae0c122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 25 Jan 2021 07:41:21 +0700 Subject: [PATCH] android-tools: update to 30.0.5. --- ...ypto_defaults-depends-on-protobuf-he.patch | 58 +++++++++++++++++++ srcpkgs/android-tools/template | 18 +++--- srcpkgs/android-tools/update | 2 +- 3 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/android-tools/patches/0001-vendor-libadb_crypto_defaults-depends-on-protobuf-he.patch diff --git a/srcpkgs/android-tools/patches/0001-vendor-libadb_crypto_defaults-depends-on-protobuf-he.patch b/srcpkgs/android-tools/patches/0001-vendor-libadb_crypto_defaults-depends-on-protobuf-he.patch new file mode 100644 index 00000000000..f6a813892a0 --- /dev/null +++ b/srcpkgs/android-tools/patches/0001-vendor-libadb_crypto_defaults-depends-on-protobuf-he.patch @@ -0,0 +1,58 @@ +From e284901aa2ce180164cbf4f2d613fb8f484e4f5e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + +Date: Mon, 25 Jan 2021 08:25:31 +0700 +Subject: [PATCH] vendor: libadb_crypto_defaults: depends on protobuf header +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +While we're at it, simplify OBJECT_DEPENDS as pointed out in +https://cmake.org/cmake/help/v3.18/prop_sf/OBJECT_DEPENDS.html + +This fix a broken build because of a race as shown in: +https://github.com/void-linux/void-packages/pull/28209/checks?check_run_id=1758983334 + +Signed-off-by: Đoàn Trần Công Danh +--- + vendor/CMakeLists.adb.txt | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) + +diff --git vendor/CMakeLists.adb.txt vendor/CMakeLists.adb.txt +index 1495a5d..ace2558 100644 +--- vendor/CMakeLists.adb.txt ++++ vendor/CMakeLists.adb.txt +@@ -34,19 +34,10 @@ add_library(libadb STATIC + core/adb/sysdeps_unix.cpp + core/adb/sysdeps/errno.cpp + core/adb/sysdeps/posix/network.cpp +- ${ADB_APP_PROCESSES_PROTO_SRCS} +- ${ADB_KNOWN_HOSTS_PROTO_SRCS} +- ${ADB_KEY_TYPE_PROTO_SRCS} +- ${ADB_PAIRING_PROTO_SRCS}) +- +-set_property(SOURCE core/adb/client/commandline.cpp +- PROPERTY OBJECT_DEPENDS ${ADB_APP_PROCESSES_PROTO_HDRS}) +-set_property(SOURCE core/adb/client/adb_wifi.cpp +- PROPERTY OBJECT_DEPENDS ${ADB_KNOWN_HOSTS_PROTO_HDRS}) +-set_property(SOURCE core/adb/client/auth.cpp +- PROPERTY OBJECT_DEPENDS ${ADB_KEY_TYPE_PROTO_HDRS}) +-set_property(SOURCE core/adb/pairing_connection/pairing_connection.cpp +- PROPERTY OBJECT_DEPENDS ${ADB_PAIRING_PROTO_HDRS}) ++ ${ADB_APP_PROCESSES_PROTO_SRCS} ${ADB_APP_PROCESSES_PROTO_HDRS} ++ ${ADB_KNOWN_HOSTS_PROTO_SRCS} ${ADB_KNOWN_HOSTS_PROTO_HDRS} ++ ${ADB_KEY_TYPE_PROTO_SRCS} ${ADB_KEY_TYPE_PROTO_HDRS} ++ ${ADB_PAIRING_PROTO_SRCS} ${ADB_PAIRING_PROTO_HDRS}) + + target_compile_definitions(libadb PRIVATE -D_GNU_SOURCE) + target_compile_definitions(libadb PUBLIC -DADB_HOST=1) +@@ -68,7 +59,8 @@ target_include_directories(libadb PUBLIC + add_library(libadb_crypto_defaults STATIC + core/adb/crypto/key.cpp + core/adb/crypto/rsa_2048_key.cpp +- core/adb/crypto/x509_generator.cpp) ++ core/adb/crypto/x509_generator.cpp ++ ${ADB_KEY_TYPE_PROTO_HDRS}) + + target_include_directories(libadb_crypto_defaults PUBLIC + core/adb diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index 343a543a9a2..f4104cb07d1 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -1,20 +1,22 @@ # Template file for 'android-tools' pkgname=android-tools -version=29.0.6 -revision=3 +version=30.0.5 +revision=1 archs="armv* aarch64* x86_64* i686* ppc64le*" build_style=cmake -hostmakedepends="perl go" -makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel" +hostmakedepends="perl go protobuf" +makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel + liblz4-devel libzstd-devel protobuf-devel brotli-devel" short_desc="Android platform tools (adb and fastboot)" maintainer="John " 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=7fb1c127c36b0752657593838b6823743bf8e5730f9f8b0f7ba2c185424cf376 +checksum=1b870a3f28d75e4907c95dbe8e71b4014f56be636d089a75257ef3922ad39d62 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" + configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic" fi pre_configure() { @@ -31,16 +33,10 @@ pre_configure() { _EOF configure_args+=" ${boring_ssl_cmake_args}" fi - - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - sed -i vendor/CMakeLists.adb.txt \ - -e "/target_link_libraries/s;$; atomic;" - fi } post_install() { vlicense vendor/boringssl/LICENSE boringssl.LICENSE vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE - vlicense vendor/boringssl/third_party/googletest/LICENSE gtest.LICENSE vsv adb } diff --git a/srcpkgs/android-tools/update b/srcpkgs/android-tools/update index 49895605477..f69b1910ad9 100644 --- a/srcpkgs/android-tools/update +++ b/srcpkgs/android-tools/update @@ -1,2 +1,2 @@ -site="https://android.googlesource.com/platform/system/core" +site="https://android.googlesource.com/platform/system/core/+refs" pattern='platform-tools-\K[\d._r]+'