Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] android-tools: update to 30.0.5.
Date: Mon, 25 Jan 2021 01:56:01 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28209@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1672 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages android-tools-30.0.5
https://github.com/void-linux/void-packages/pull/28209

android-tools: update to 30.0.5.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

The re-packaging efforts was done by me but I only used on x86_64-musl.

A patch file from https://github.com/void-linux/void-packages/pull/28209.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-30.0.5-28209.patch --]
[-- Type: text/x-diff, Size: 2516 bytes --]

From 8359a2192de91322f3991c8c4bc912bd57e56bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 25 Jan 2021 07:41:21 +0700
Subject: [PATCH] android-tools: update to 30.0.5.

---
 srcpkgs/android-tools/template | 18 +++++++-----------
 srcpkgs/android-tools/update   |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 343a543a9a2..f4104cb07d1 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,20 +1,22 @@
 # Template file for 'android-tools'
 pkgname=android-tools
-version=29.0.6
-revision=3
+version=30.0.5
+revision=1
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
-hostmakedepends="perl go"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel"
+hostmakedepends="perl go protobuf"
+makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+ liblz4-devel libzstd-devel protobuf-devel brotli-devel"
 short_desc="Android platform tools (adb and fastboot)"
 maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, ISC, GPL-2.0-only, MIT"
 homepage="http://developer.android.com/tools/help/adb.html"
 distfiles="https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"
-checksum=7fb1c127c36b0752657593838b6823743bf8e5730f9f8b0f7ba2c185424cf376
+checksum=1b870a3f28d75e4907c95dbe8e71b4014f56be636d089a75257ef3922ad39d62
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
+	configure_args="-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 fi
 
 pre_configure() {
@@ -31,16 +33,10 @@ pre_configure() {
 		_EOF
 		configure_args+=" ${boring_ssl_cmake_args}"
 	fi
-
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		sed -i vendor/CMakeLists.adb.txt \
-			-e "/target_link_libraries/s;$; atomic;"
-	fi
 }
 
 post_install() {
 	vlicense vendor/boringssl/LICENSE boringssl.LICENSE
 	vlicense vendor/boringssl/third_party/fiat/LICENSE fiat.LICENSE
-	vlicense vendor/boringssl/third_party/googletest/LICENSE gtest.LICENSE
 	vsv adb
 }
diff --git a/srcpkgs/android-tools/update b/srcpkgs/android-tools/update
index 49895605477..f69b1910ad9 100644
--- a/srcpkgs/android-tools/update
+++ b/srcpkgs/android-tools/update
@@ -1,2 +1,2 @@
-site="https://android.googlesource.com/platform/system/core"
+site="https://android.googlesource.com/platform/system/core/+refs"
 pattern='platform-tools-\K[\d._r]+'

             reply	other threads:[~2021-01-25  0:56 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-25  0:56 sgn [this message]
2021-01-25  1:24 ` sgn
2021-01-25  1:29 ` [PR PATCH] [Updated] " sgn
2021-01-25  1:39 ` sgn
2021-01-25  2:18 ` sgn
2021-01-25 16:26 ` sgn
2021-01-26 12:46 ` [PR PATCH] [Merged]: " sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28209@inbox.vuxu.org \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).