[arch-commits] Commit in android-tools/trunk (PKGBUILD gcc12.patch)

[Anatol Pomozov]

    Date: Tuesday, August 9, 2022 @ 15:57:39
  Author: anatolik
Revision: 1263738

upgpkg: android-tools 31.0.3-7

Modified:
  android-tools/trunk/PKGBUILD
Deleted:
  android-tools/trunk/gcc12.patch

-------------+
 PKGBUILD    |   18 ++++++------------
 gcc12.patch |   11 -----------
 2 files changed, 6 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-09 15:57:37 UTC (rev 1263737)
+++ PKGBUILD	2022-08-09 15:57:39 UTC (rev 1263738)
@@ -4,23 +4,17 @@
 
 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
+_tag=${pkgver}p2 # https://github.com/nmeum/android-tools sometimes carries extra patch version on top of the upstream versioning
+pkgrel=7
 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')
+depends=(libusb protobuf brotli zstd android-udev pcre2)
+makedepends=(gtest cmake go ninja git)
+source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz)
+sha256sums=('2e1274d625368f57128477c2cda8474489443cc56e8738cb71919412a2872fca')
 
-prepare() {
-  cd android-tools-$_tag
-  patch -Np1 -i ../gcc12.patch
-}
-
 build() {
   cd android-tools-$_tag
 

Deleted: gcc12.patch
===================================================================
--- gcc12.patch	2022-08-09 15:57:37 UTC (rev 1263737)
+++ gcc12.patch	2022-08-09 15:57:39 UTC (rev 1263738)
@@ -1,11 +0,0 @@
-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>
-