Index: head/devel/android-tools-adb/Makefile =================================================================== --- head/devel/android-tools-adb/Makefile (revision 511868) +++ head/devel/android-tools-adb/Makefile (revision 511869) @@ -1,85 +1,85 @@ # $FreeBSD$ PORTNAME= android-tools-adb DISTVERSIONPREFIX= platform-tools- -DISTVERSION?= 29.0.2 +DISTVERSION?= 29.0.3 PORTREVISION?= 0 CATEGORIES= devel comms MAINTAINER= jbeich@FreeBSD.org COMMENT= Android debug bridge command line tool LICENSE= APACHE20 USE_GITHUB= yes GH_ACCOUNT= aosp-mirror GH_PROJECT= platform_system_core CONFLICTS_INSTALL?= ${PORTNAME}-devel-* USES= compiler:c++17-lang pkgconfig ssl uidfix BUILD_WRKSRC= ${WRKSRC}/adb INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} MAKEFILE?= ${.CURDIR}/files/Makefile MAKE_ENV= BINDIR="${PREFIX}/bin" FILESDIR="${DOCSDIR}" \ VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}" ALL_TARGET= all TEST_TARGET= test PLIST_FILES= bin/adb PORTDOCS= * OPTIONS_DEFINE+=MDNSRESPONDER BASH DOCS TEST TEST_PYTHON OPTIONS_DEFAULT=MDNSRESPONDER OPTIONS_SUB= yes .if make(makesum) # for optional distfiles .MAKEFLAGS: WITH="${OPTIONS_DEFINE}" .endif BASH_GH_ACCOUNT= mbrubeck:bashcomp BASH_GH_PROJECT= android-completion:bashcomp BASH_GH_TAGNAME= c1b0656:bashcomp BASH_PLIST_FILES= etc/bash_completion.d/adb BASH_VARS= LICENSE+=MIT LICENSE_COMB=multi DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_USES= localbase:ldflags MDNSRESPONDER_LDFLAGS= -ldns_sd MDNSRESPONDER_MAKE_ENV_OFF= MDNSEXT=_unsupported TEST_BUILD_DEPENDS+= googlemock>=1.6.0:devel/googlemock \ googletest>=1.6.0:devel/googletest TEST_ALL_TARGET= adb_test TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} TEST_PYTHON_GH_PROJECT= platform_development:development TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} TEST_PYTHON_USES= python:2.7,build post-patch: # XXX Hidden by poudriere/tinderbox, see lindev(4) for FreeBSD < 11.0 @if [ ! -e /dev/full ]; then \ ${REINPLACE_CMD} -e '/TEST/s/[^ ]*ENOSPC/DISABLED_&/' \ ${WRKSRC}/adb/adb_io_test.cpp; \ fi # XXX getcwd fails and not connected upstream @${REINPLACE_CMD} -e '/TEST/s/, /&DISABLED_/' \ ${WRKSRC}/adb/bugreport_test.cpp pre-install-TEST-on: do-test pre-install-TEST_PYTHON-on: # XXX python tests may leave behind running adb server ${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \ PYTHONPATH=${WRKSRC_development}/python-packages \ ${PYTHON_CMD} -m unittest discover -vs ${BUILD_WRKSRC} post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H} ${INSTALL_DATA} ${WRKSRC_bashcomp}/android \ ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES} .include Index: head/devel/android-tools-adb/distinfo =================================================================== --- head/devel/android-tools-adb/distinfo (revision 511868) +++ head/devel/android-tools-adb/distinfo (revision 511869) @@ -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 Index: head/devel/android-tools-adb/files/patch-adb_types.h =================================================================== --- head/devel/android-tools-adb/files/patch-adb_types.h (revision 511868) +++ head/devel/android-tools-adb/files/patch-adb_types.h (nonexistent) @@ -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 // memcpy for GCC - #include - #include - #include Property changes on: head/devel/android-tools-adb/files/patch-adb_types.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h =================================================================== --- head/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h (revision 511868) +++ head/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h (nonexistent) @@ -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 - #include - -+#include // std::atomic for GCC - #include - #include - #include Property changes on: head/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp =================================================================== --- head/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp (revision 511868) +++ head/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp (revision 511869) @@ -1,18 +1,35 @@ ---- 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 + #include + +@@ -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; +#ifdef __linux__ // 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& srcs, const char* dst, bool copy_attrs, -@@ -47,6 +48,7 @@ bool do_sync_pull(const std::vector& srcs ADD_FAILURE() << "do_sync_pull() should have been mocked"; return false; } +#endif // Empty functions so tests don't need to be linked against commandline.cpp DefaultStandardStreamsCallback DEFAULT_STANDARD_STREAMS_CALLBACK(nullptr, nullptr); Index: head/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp =================================================================== --- head/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp (nonexistent) +++ head/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp (revision 511869) @@ -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 + Property changes on: head/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/android-tools-adb/files/patch-liblog_logger.h =================================================================== --- head/devel/android-tools-adb/files/patch-liblog_logger.h (revision 511868) +++ head/devel/android-tools-adb/files/patch-liblog_logger.h (revision 511869) @@ -1,17 +1,16 @@ ---- 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 +#ifdef __cplusplus +#include +using std::atomic_int; +using std::atomic_uintptr_t; +#else #include - #include +#endif #include #include