* [PR PATCH] android-tools: use upstream versioning
@ 2019-07-17 11:30 voidlinux-github
2019-07-17 11:53 ` [PR PATCH] [Merged]: " voidlinux-github
0 siblings, 1 reply; 2+ messages in thread
From: voidlinux-github @ 2019-07-17 11:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/void-linux/void-packages android-tools-versioning
https://github.com/void-linux/void-packages/pull/13168
android-tools: use upstream versioning
resolves #13165
We should use the `platform-tools-*` tags at some later point, but it requires patching of the ruby script that currently builds this package.
A patch file from https://github.com/void-linux/void-packages/pull/13168.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-android-tools-versioning-13168.patch --]
[-- Type: application/text/x-diff, Size: 1314 bytes --]
From 84c26b0642532d614219ed2fcb3923b622b8e218 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Wed, 17 Jul 2019 11:27:22 +0000
Subject: [PATCH] android-tools: use upstream versioning
resolves #13165
---
srcpkgs/android-tools/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a98bb216ada..12806884ec0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -4,9 +4,11 @@ pkgname=android-tools
# of android used by android-tools. Check for diff with:
# curl -L http://git.io/vvC0Z | sh -s 5.0.2_r1 5.1.0_r1
version=9.0.0r45
-revision=1
+revision=2
archs="x86_64* i686*"
_distver=${version/r/_r}
+#See https://android.googlesource.com/platform/development/+/refs/tags/android-${_distver}/sdk/plat_tools_source.prop_template
+_apiver="28.0.0 rc1"
create_wrksrc=yes
hostmakedepends="ruby cmake ninja perl go"
makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel"
@@ -44,7 +46,7 @@ do_extract() {
}
pre_configure() {
- PKGVER=${_distver} ${FILESDIR}/generate_build.rb > build.ninja
+ PKGVER="${_apiver}-void-${version}_${revision}" ${FILESDIR}/generate_build.rb > build.ninja
mkdir -p boringssl/build
cd boringssl/build
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-17 11:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-17 11:30 [PR PATCH] android-tools: use upstream versioning voidlinux-github
2019-07-17 11:53 ` [PR PATCH] [Merged]: " voidlinux-github
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).