[arch-commits] Commit in android-tools/repos (3 files)

[Felix Yan]

    Date: Saturday, June 11, 2022 @ 16:42:20
  Author: felixonmars
Revision: 1233889

archrelease: copy trunk to community-staging-x86_64

Added:
  android-tools/repos/community-staging-x86_64/
  android-tools/repos/community-staging-x86_64/PKGBUILD
    (from rev 1233888, android-tools/trunk/PKGBUILD)
  android-tools/repos/community-staging-x86_64/gcc12.patch
    (from rev 1233888, android-tools/trunk/gcc12.patch)

-------------+
 PKGBUILD    |   39 +++++++++++++++++++++++++++++++++++++++
 gcc12.patch |   11 +++++++++++
 2 files changed, 50 insertions(+)

Copied: android-tools/repos/community-staging-x86_64/PKGBUILD (from rev 1233888, android-tools/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2022-06-11 16:42:20 UTC (rev 1233889)
@@ -0,0 +1,39 @@
+# Maintainer: Anatol Pomozov
+# Contributor: 謝致邦 <Yeking at Red54.com>
+# Contributor: Alucryd <alucryd at gmail dot com>
+
+pkgname=android-tools
+pkgver=31.0.3
+_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries extra patch version on top of the upstream versioning
+pkgrel=6
+pkgdesc='Android platform tools'
+arch=(x86_64)
+url='http://tools.android.com/'
+license=(Apache MIT)
+depends=(libusb protobuf brotli zstd android-udev)
+makedepends=(pcre2 gtest cmake go ninja git)
+source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz        gcc12.patch)
+sha256sums=('0ef69f919d58a2bdff2083d2e83a9ef38df079ec82651b2544e9e48086df5ab8'
+            'df27d803da03d0a2656c4feb3cf471a076c459f45004ec20ec86a5cfb36be862')
+
+prepare() {
+  cd android-tools-$_tag
+  patch -Np1 -i ../gcc12.patch
+}
+
+build() {
+  cd android-tools-$_tag
+
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+    -DCMAKE_C_FLAGS="$CFLAGS" \
+    -G Ninja -S . -B build
+}
+
+package() {
+  cd android-tools-$_tag
+
+  DESTDIR="${pkgdir}" ninja -C build install
+}

Copied: android-tools/repos/community-staging-x86_64/gcc12.patch (from rev 1233888, android-tools/trunk/gcc12.patch)
===================================================================
--- community-staging-x86_64/gcc12.patch	                        (rev 0)
+++ community-staging-x86_64/gcc12.patch	2022-06-11 16:42:20 UTC (rev 1233889)
@@ -0,0 +1,11 @@
+diff -upr android-tools-31.0.3p1.orig/vendor/adb/tls/include/adb/tls/tls_connection.h android-tools-31.0.3p1/vendor/adb/tls/include/adb/tls/tls_connection.h
+--- android-tools-31.0.3p1.orig/vendor/adb/tls/include/adb/tls/tls_connection.h	2021-03-22 19:48:10.000000000 +0200
++++ android-tools-31.0.3p1/vendor/adb/tls/include/adb/tls/tls_connection.h	2022-06-11 19:39:36.472011172 +0300
+@@ -19,6 +19,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
++#include <functional>
+ #include <string_view>
+ #include <vector>
+