Github messages for voidlinux
 help / color / mirror / Atom feed
From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] android-tools: use upstream versioning
Date: Wed, 17 Jul 2019 13:30:33 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-13168@inbox.vuxu.org> (raw)

[-- 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

             reply	other threads:[~2019-07-17 11:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-17 11:30 voidlinux-github [this message]
2019-07-17 11:53 ` [PR PATCH] [Merged]: " voidlinux-github

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-13168@inbox.vuxu.org \
    --to=voidlinux-github@inbox.vuxu.org \
    --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).