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

[Evangelos Foutras]

    Date: Saturday, June 11, 2022 @ 16:41:07
  Author: foutrelis
Revision: 1233887

Fix build with GCC 12

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

-------------+
 PKGBUILD    |   10 ++++++++--
 gcc12.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-11 16:35:52 UTC (rev 1233886)
+++ PKGBUILD	2022-06-11 16:41:07 UTC (rev 1233887)
@@ -12,9 +12,15 @@
 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)
-sha256sums=('0ef69f919d58a2bdff2083d2e83a9ef38df079ec82651b2544e9e48086df5ab8')
+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
 

Added: gcc12.patch
===================================================================
--- gcc12.patch	                        (rev 0)
+++ gcc12.patch	2022-06-11 16:41:07 UTC (rev 1233887)
@@ -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>
+