* Re: android-studio: update to 4.1.3.
2021-03-29 21:04 [PR PATCH] android-studio: update to 4.1.3 unspecd
@ 2021-03-29 21:04 ` unspecd
2021-03-29 21:26 ` unspecd
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: unspecd @ 2021-03-29 21:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1651 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/29858#issuecomment-809713511
Comment:
There is a possibility to skip runtime dependency on `openjdk` (due to NEEDED libawt.so, libawt_xawt.so, libjava.so, libjvm.so, libjli.so, which are bundled with the package). Here are the changes I'd like to propose.
File: common/hooks/pre-pkg/04-generate-runtime-deps.sh
```diff
@@ -93,11 +93,14 @@ hook() {
# above, the mapping is done thru the common/shlibs file.
#
for f in ${verify_deps}; do
- unset _f j rdep _rdep rdepcnt soname _pkgname _rdepver found
+ unset _f j rdep _rdep rdepcnt soname _pkgname _rdepver found skipso
_f=$(echo "$f"|sed -E 's|\+|\\+|g')
rdep="$(grep -E "^${_f}[[:blank:]]+.*$" $mapshlibs|cut -d ' ' -f2)"
rdepcnt="$(grep -E "^${_f}[[:blank:]]+.*$" $mapshlibs|cut -d ' ' -f2|wc -l)"
- if [ -z "$rdep" ]; then
+ if [[ "${skipsorequires}" == *"$f"* ]]; then
+ skipso=1
+ fi
+ if [ -z "$rdep" -o "$skipso" ]; then
# Ignore libs by current pkg
soname=$(find ${PKGDESTDIR} -name "$f")
if [ -z "$soname" ]; then
```
File: srcpkgs/android-studio/template
```diff
@@ -24,6 +24,8 @@ nopie=yes
nostrip=yes
noshlibprovides=yes
+# jdk is bundled with the package.
+skipsorequires="libawt.so libawt_xawt.so libjava.so libjvm.so libjli.so"
# These files are not run or loaded on the host thus skip scanning their runtime deps
skiprdeps="/opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_probes
```
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: android-studio: update to 4.1.3.
2021-03-29 21:04 [PR PATCH] android-studio: update to 4.1.3 unspecd
2021-03-29 21:04 ` unspecd
@ 2021-03-29 21:26 ` unspecd
2021-03-30 17:38 ` ericonr
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: unspecd @ 2021-03-29 21:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1653 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/29858#issuecomment-809713511
Comment:
There is the possibility to skip runtime dependency on `openjdk` (due to NEEDED libawt.so, libawt_xawt.so, libjava.so, libjvm.so, libjli.so, which are bundled with the package). Here are the changes I'd like to propose.
File: common/hooks/pre-pkg/04-generate-runtime-deps.sh
```diff
@@ -93,11 +93,14 @@ hook() {
# above, the mapping is done thru the common/shlibs file.
#
for f in ${verify_deps}; do
- unset _f j rdep _rdep rdepcnt soname _pkgname _rdepver found
+ unset _f j rdep _rdep rdepcnt soname _pkgname _rdepver found skipso
_f=$(echo "$f"|sed -E 's|\+|\\+|g')
rdep="$(grep -E "^${_f}[[:blank:]]+.*$" $mapshlibs|cut -d ' ' -f2)"
rdepcnt="$(grep -E "^${_f}[[:blank:]]+.*$" $mapshlibs|cut -d ' ' -f2|wc -l)"
- if [ -z "$rdep" ]; then
+ if [[ "${skipsorequires}" == *"$f"* ]]; then
+ skipso=1
+ fi
+ if [ -z "$rdep" -o "$skipso" ]; then
# Ignore libs by current pkg
soname=$(find ${PKGDESTDIR} -name "$f")
if [ -z "$soname" ]; then
```
File: srcpkgs/android-studio/template
```diff
@@ -24,6 +24,8 @@ nopie=yes
nostrip=yes
noshlibprovides=yes
+# jdk is bundled with the package.
+skipsorequires="libawt.so libawt_xawt.so libjava.so libjvm.so libjli.so"
# These files are not run or loaded on the host thus skip scanning their runtime deps
skiprdeps="/opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_probes
```
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: android-studio: update to 4.1.3.
2021-03-29 21:04 [PR PATCH] android-studio: update to 4.1.3 unspecd
2021-03-29 21:04 ` unspecd
2021-03-29 21:26 ` unspecd
@ 2021-03-30 17:38 ` ericonr
2021-03-30 18:59 ` Chocimier
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-03-30 17:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29858#issuecomment-810448799
Comment:
Please don't skip CI, the package should be buildable.
That sounds like a new feature to add to xbps-src, so tagging @void-linux/pkg-committers. There are places where it's been necessary before, I think, but it's been worked around some way or another. It's weird that ` soname=$(find ${PKGDESTDIR} -name "$f")` doesn't find them in this case...
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: android-studio: update to 4.1.3.
2021-03-29 21:04 [PR PATCH] android-studio: update to 4.1.3 unspecd
` (2 preceding siblings ...)
2021-03-30 17:38 ` ericonr
@ 2021-03-30 18:59 ` Chocimier
2021-03-30 23:14 ` [PR PATCH] [Updated] " unspecd
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Chocimier @ 2021-03-30 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/29858#issuecomment-810501420
Comment:
Same can be done by adding solibs to `common/shlibs` at end of file, see `elif [ "$rdepcnt" -gt 1 ]` branch.
`soname=$(find ${PKGDESTDIR} -name "$f")` is run only when solib isn't listed in `common/shlibs`.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] android-studio: update to 4.1.3.
2021-03-29 21:04 [PR PATCH] android-studio: update to 4.1.3 unspecd
` (3 preceding siblings ...)
2021-03-30 18:59 ` Chocimier
@ 2021-03-30 23:14 ` unspecd
2021-04-01 14:31 ` ericonr
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: unspecd @ 2021-03-30 23:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]
There is an updated pull request by unspecd against master on the void-packages repository
https://github.com/unspecd/void-packages pkg/android-studio
https://github.com/void-linux/void-packages/pull/29858
android-studio: update to 4.1.3.
Also clean up template.
<!-- 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.)
- [x] I built this PR locally for my native architecture, x86_64
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/29858.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pkg/android-studio-29858.patch --]
[-- Type: text/x-diff, Size: 2277 bytes --]
From 5e6eb0029924fbce98f5ca60b7711f3445fa7f34 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 30 Mar 2021 07:50:31 +1100
Subject: [PATCH] android-studio: update to 4.1.3.
Also clean up template.
---
srcpkgs/android-studio/template | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index f2117e44196c..49c84de00f3d 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,27 +1,28 @@
# Template file for 'android-studio'
pkgname=android-studio
-version=4.1.2
+version=4.1.3
revision=1
# _studio_build and _studio_rev are for downloading the zip from dl.google.com
# https://developer.android.com/studio/#resources as of 2018-07-12
-_studio_build=201.7042882
+_studio_build=201.7199119
_studio_rev=0
archs="x86_64 i686"
-create_wrksrc=yes
+wrksrc="$pkgname"
hostmakedepends="tar"
-depends="gtk+ virtual?libGL"
+depends="virtual?libGL"
short_desc="Official Android IDE"
maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
license="Apache-2.0"
-homepage="http://tools.android.com/"
+homepage="http://tools.android.com"
# changelog="https://developer.android.com/studio/releases/index.html"
distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz"
-checksum=89f7c3a03ed928edeb7bbb1971284bcb72891a77b4f363557a7ad4ed37652bb9
+checksum=f599749ca47cda06d392e2764017c8a8a0c7b963a6a88ed494b432bece7cbc1b
repository=nonfree
restricted=yes
python_version=2
nopie=yes
nostrip=yes
+noshlibprovides=yes
# These files are not run or loaded on the host thus skip scanning their runtime deps
skiprdeps="/opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_probes
@@ -59,10 +60,6 @@ skiprdeps="/opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_
/opt/android-studio/plugins/android/lib/libwebp_jni.so
/opt/android-studio/plugins/android/lib/libwebp_jni64.so"
-do_extract() {
- tar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-ide-${_studio_build}-linux.tar.gz --strip-components=1 -C ${wrksrc}
-}
-
do_install() {
vmkdir opt/${pkgname}
vcopy bin opt/${pkgname}/
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: android-studio: update to 4.1.3.
2021-03-29 21:04 [PR PATCH] android-studio: update to 4.1.3 unspecd
` (4 preceding siblings ...)
2021-03-30 23:14 ` [PR PATCH] [Updated] " unspecd
@ 2021-04-01 14:31 ` ericonr
2021-04-01 14:31 ` [PR PATCH] [Merged]: " ericonr
2021-04-02 0:54 ` unspecd
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-04-01 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29858#issuecomment-811948900
Comment:
Merging as is, improvements can come in a later PR.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Merged]: android-studio: update to 4.1.3.
2021-03-29 21:04 [PR PATCH] android-studio: update to 4.1.3 unspecd
` (5 preceding siblings ...)
2021-04-01 14:31 ` ericonr
@ 2021-04-01 14:31 ` ericonr
2021-04-02 0:54 ` unspecd
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-04-01 14:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1406 bytes --]
There's a merged pull request on the void-packages repository
android-studio: update to 4.1.3.
https://github.com/void-linux/void-packages/pull/29858
Description:
Also clean up template.
<!-- 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.)
- [x] I built this PR locally for my native architecture, x86_64
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] i686
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: android-studio: update to 4.1.3.
2021-03-29 21:04 [PR PATCH] android-studio: update to 4.1.3 unspecd
` (6 preceding siblings ...)
2021-04-01 14:31 ` [PR PATCH] [Merged]: " ericonr
@ 2021-04-02 0:54 ` unspecd
7 siblings, 0 replies; 9+ messages in thread
From: unspecd @ 2021-04-02 0:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/29858#issuecomment-812257969
Comment:
Ok, thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread