svn commit: r511869 - in head/devel/android-tools-adb: . files

[Jan Beich]

Author: jbeich
Date: Thu Sep 12 10:14:54 2019
New Revision: 511869
URL: https://svnweb.freebsd.org/changeset/ports/511869

Log:
  devel/android-tools-adb: update to 29.0.3
  
  Changes:	https://android.googlesource.com/platform/system/core/+log/platform-tools-29.0.2..platform-tools-29.0.3/adb
  Reported by:	portscout

Added:
  head/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp   (contents, props changed)
Deleted:
  head/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h
  head/devel/android-tools-adb/files/patch-adb_types.h
Modified:
  head/devel/android-tools-adb/Makefile   (contents, props changed)
  head/devel/android-tools-adb/distinfo   (contents, props changed)
  head/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp   (contents, props changed)
  head/devel/android-tools-adb/files/patch-liblog_logger.h   (contents, props changed)

Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile	Thu Sep 12 10:13:41 2019	(r511868)
+++ head/devel/android-tools-adb/Makefile	Thu Sep 12 10:14:54 2019	(r511869)
@@ -2,7 +2,7 @@
 
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	platform-tools-
-DISTVERSION?=	29.0.2
+DISTVERSION?=	29.0.3
 PORTREVISION?=	0
 CATEGORIES=	devel comms
 

Modified: head/devel/android-tools-adb/distinfo
==============================================================================
--- head/devel/android-tools-adb/distinfo	Thu Sep 12 10:13:41 2019	(r511868)
+++ head/devel/android-tools-adb/distinfo	Thu Sep 12 10:14:54 2019	(r511869)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1563393249
-SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.2_GH0.tar.gz) = cd0f6fe386f07d7aef98cf46a41cef0aa1e8cebfe06f434bb5c88777de4c2643
-SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.2_GH0.tar.gz) = 59909027
+TIMESTAMP = 1565662258
+SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.3_GH0.tar.gz) = f2938ab5d206f5d4e075afba1a3e32fc26656bb439b6208200bef0ea5bae77eb
+SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.3_GH0.tar.gz) = 61252755
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
-SHA256 (aosp-mirror-platform_development-platform-tools-29.0.2_GH0.tar.gz) = aa40c37fd1cbb1c4a93a0c4ba26468bb47a5837826cb94423f5ca161dd85f118
-SIZE (aosp-mirror-platform_development-platform-tools-29.0.2_GH0.tar.gz) = 56861217
+SHA256 (aosp-mirror-platform_development-platform-tools-29.0.3_GH0.tar.gz) = 58a291b441d7ab9a0ec1224ce3e383feff5ec67940de901d544af8fdfaf5687b
+SIZE (aosp-mirror-platform_development-platform-tools-29.0.3_GH0.tar.gz) = 56856358

Modified: head/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp
==============================================================================
--- head/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp	Thu Sep 12 10:13:41 2019	(r511868)
+++ head/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp	Thu Sep 12 10:14:54 2019	(r511869)
@@ -1,6 +1,23 @@
---- adb/bugreport_test.cpp.orig	2016-09-28 18:07:09 UTC
+--- adb/bugreport_test.cpp.orig	2019-08-13 02:10:58 UTC
 +++ adb/bugreport_test.cpp
-@@ -40,6 +40,7 @@ using ::testing::internal::CaptureStdout
+@@ -14,8 +14,6 @@
+  * limitations under the License.
+  */
+ 
+-#include "bugreport.h"
+-
+ #include <gmock/gmock.h>
+ #include <gtest/gtest.h>
+ 
+@@ -24,6 +22,7 @@
+ 
+ #include "sysdeps.h"
+ #include "adb_utils.h"
++#include "bugreport.h"
+ 
+ using ::testing::_;
+ using ::testing::Action;
+@@ -40,6 +39,7 @@ using ::testing::internal::CaptureStdout;
  using ::testing::internal::GetCapturedStderr;
  using ::testing::internal::GetCapturedStdout;
  
@@ -8,7 +25,7 @@
  // Empty function so tests don't need to be linked against file_sync_service.cpp, which requires
  // SELinux and its transitive dependencies...
  bool do_sync_pull(const std::vector<const char*>& srcs, const char* dst, bool copy_attrs,
-@@ -47,6 +48,7 @@ bool do_sync_pull(const std::vector<cons
+@@ -47,6 +47,7 @@ bool do_sync_pull(const std::vector<const char*>& srcs
      ADD_FAILURE() << "do_sync_pull() should have been mocked";
      return false;
  }

Added: head/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp	Thu Sep 12 10:14:54 2019	(r511869)
@@ -0,0 +1,11 @@
+--- adb/client/adb_install.cpp.orig	2019-08-13 02:10:58 UTC
++++ adb/client/adb_install.cpp
+@@ -214,7 +214,7 @@ static int install_app_streamed(int argc, const char**
+             return 1;
+         }
+ 
+-#ifdef __linux__
++#if !defined(__APPLE__) && !defined(_WIN32)
+         posix_fadvise(local_fd.get(), 0, 0, POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE);
+ #endif
+ 

Modified: head/devel/android-tools-adb/files/patch-liblog_logger.h
==============================================================================
--- head/devel/android-tools-adb/files/patch-liblog_logger.h	Thu Sep 12 10:13:41 2019	(r511868)
+++ head/devel/android-tools-adb/files/patch-liblog_logger.h	Thu Sep 12 10:14:54 2019	(r511869)
@@ -1,6 +1,6 @@
---- liblog/logger.h.orig	2019-07-17 19:54:09 UTC
+--- liblog/logger.h.orig	2019-08-13 02:10:58 UTC
 +++ liblog/logger.h
-@@ -16,8 +16,14 @@
+@@ -16,7 +16,13 @@
  
  #pragma once
  
@@ -10,7 +10,6 @@
 +using std::atomic_uintptr_t;
 +#else
  #include <stdatomic.h>
- #include <stdbool.h>
 +#endif
  
  #include <cutils/list.h>