diff options
author | jbeich <jbeich@FreeBSD.org> | 2019-09-12 18:14:54 +0800 |
---|---|---|
committer | jbeich <jbeich@FreeBSD.org> | 2019-09-12 18:14:54 +0800 |
commit | 09275e257ca037a0c532f921c7dbf3c0c6734fd9 (patch) | |
tree | 397f290708d85c821171065d03187474f4276e4c /devel | |
parent | 88c40ede313145f81ad9159c151b7360136a709d (diff) | |
download | freebsd-ports-gnome-09275e257ca037a0c532f921c7dbf3c0c6734fd9.tar.gz freebsd-ports-gnome-09275e257ca037a0c532f921c7dbf3c0c6734fd9.tar.zst freebsd-ports-gnome-09275e257ca037a0c532f921c7dbf3c0c6734fd9.zip |
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
Diffstat (limited to 'devel')
-rw-r--r-- | devel/android-tools-adb/Makefile | 2 | ||||
-rw-r--r-- | devel/android-tools-adb/distinfo | 10 | ||||
-rw-r--r-- | devel/android-tools-adb/files/patch-adb_bugreport__test.cpp | 23 | ||||
-rw-r--r-- | devel/android-tools-adb/files/patch-adb_client_adb__install.cpp | 11 | ||||
-rw-r--r-- | devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h | 10 | ||||
-rw-r--r-- | devel/android-tools-adb/files/patch-adb_types.h | 10 | ||||
-rw-r--r-- | devel/android-tools-adb/files/patch-liblog_logger.h | 5 |
7 files changed, 39 insertions, 32 deletions
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile index 961b6c84e130..8776350b3263 100644 --- a/devel/android-tools-adb/Makefile +++ b/devel/android-tools-adb/Makefile @@ -2,7 +2,7 @@ PORTNAME= android-tools-adb DISTVERSIONPREFIX= platform-tools- -DISTVERSION?= 29.0.2 +DISTVERSION?= 29.0.3 PORTREVISION?= 0 CATEGORIES= devel comms diff --git a/devel/android-tools-adb/distinfo b/devel/android-tools-adb/distinfo index f731528f4fe4..3c4bd1880c70 100644 --- a/devel/android-tools-adb/distinfo +++ b/devel/android-tools-adb/distinfo @@ -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 diff --git a/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp b/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp index c201a86849dc..e9fa97dc6ed4 100644 --- a/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp +++ b/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp @@ -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; } diff --git a/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp b/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp new file mode 100644 index 000000000000..675ec42dba69 --- /dev/null +++ b/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp @@ -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 + diff --git a/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h b/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h deleted file mode 100644 index bf3766d9bf05..000000000000 --- a/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h +++ /dev/null @@ -1,10 +0,0 @@ ---- adb/fdevent/fdevent.h.orig 2019-07-17 19:54:09 UTC -+++ adb/fdevent/fdevent.h -@@ -20,6 +20,7 @@ - #include <stddef.h> - #include <stdint.h> - -+#include <atomic> // std::atomic<bool> for GCC - #include <chrono> - #include <deque> - #include <functional> diff --git a/devel/android-tools-adb/files/patch-adb_types.h b/devel/android-tools-adb/files/patch-adb_types.h deleted file mode 100644 index a4b9794ad1d3..000000000000 --- a/devel/android-tools-adb/files/patch-adb_types.h +++ /dev/null @@ -1,10 +0,0 @@ ---- adb/types.h.orig 2019-07-17 19:54:09 UTC -+++ adb/types.h -@@ -16,6 +16,7 @@ - - #pragma once - -+#include <cstring> // memcpy for GCC - #include <algorithm> - #include <deque> - #include <memory> diff --git a/devel/android-tools-adb/files/patch-liblog_logger.h b/devel/android-tools-adb/files/patch-liblog_logger.h index 77c69a4895cf..c446ea70c5c1 100644 --- a/devel/android-tools-adb/files/patch-liblog_logger.h +++ b/devel/android-tools-adb/files/patch-liblog_logger.h @@ -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> |