[PR PATCH] android-studio: update to 2022.3.1.18

[PR PATCH] android-studio: update to 2022.3.1.18

[Luciogi]

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

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

https://github.com/Luciogi/void-packages android-studio
https://github.com/void-linux/void-packages/pull/45676

android-studio: update to 2022.3.1.18
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **Not sure, template already exist** 

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

This PR is based on #41215 

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

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

From df8fe04ae865c410dd464c0faec46b49b5fe0bda Mon Sep 17 00:00:00 2001
From: Luciogi <84625092+Luciogi@users.noreply.github.com>
Date: Sat, 19 Aug 2023 13:05:05 +0000
Subject: [PATCH] android-studio: update to 2022.3.1.18

---
 common/shlibs                   | 11 +++-
 srcpkgs/android-studio/template | 97 +++++++++++++++------------------
 2 files changed, 51 insertions(+), 57 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eab94bb9b16d9..785485ce6dc2c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2615,9 +2615,14 @@ libopenshot-audio.so.9 libopenshot-audio-0.3.0_1
 libopenshot.so.23 libopenshot-0.3.0_1
 libpqxx-6.3.so libpqxx-6.3.3_1
 libndpi.so.3 ndpi-3.4_1
-liblog.so android-studio-3.0.1_1
-libm.so android-studio-3.0.1_1
-libdl.so android-studio-3.0.1_1
+liblog.so android-studio-2022.3.1.18_1
+libm.so android-studio-2022.3.1.18_1
+libdl.so android-studio-2022.3.1.18_1
+libpanelw.so.5 android-studio-2022.3.1.18_1
+libncursesw.so.5 android-studio-2022.3.1.18_1
+libtinfo.so.5 android-studio-2022.3.1.18_1
+libandroid.so android-studio-2022.3.1.18_1
+libmediandk.so android-studio-2022.3.1.18_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libseafile.so.0 seafile-libclient-7.0.10_2
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 1736993a49431..cbd092b68f738 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,83 +1,72 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=4.1.3
+version=2022.3.1.18
 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.7199119
-_studio_rev=0
-archs="x86_64 i686"
+archs="x86_64"
 hostmakedepends="tar"
-depends="virtual?libGL"
 short_desc="Official Android IDE"
-maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 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=f599749ca47cda06d392e2764017c8a8a0c7b963a6a88ed494b432bece7cbc1b
+distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-${version}-linux.tar.gz"
+checksum=24215e1324a6ac911810b2cc1afb2d735cf745dfbc06918a42b8d6fbc6bf7433
 repository=nonfree
 restricted=yes
-python_version=2
+python_version=3
 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
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/x86/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/x86/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/x86/traced
- /opt/android-studio/plugins/android/resources/perfetto/x86/libperfetto.so
- /opt/android-studio/plugins/android/resources/simpleperf/armeabi-v7a/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/x86/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/x86_64/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/arm64-v8a/simpleperf
- /opt/android-studio/plugins/android/resources/installer/x86/installer
- /opt/android-studio/plugins/android/resources/installer/x86_64/installer
- /opt/android-studio/plugins/android/resources/installer/arm64-v8a/installer
- /opt/android-studio/plugins/android/resources/installer/test-installer
- /opt/android-studio/plugins/android/resources/installer/armeabi-v7a/installer
- /opt/android-studio/plugins/android/resources/transport/native/agent/arm64-v8a/libjvmtiagent.so
- /opt/android-studio/plugins/android/resources/transport/native/agent/armeabi-v7a/libjvmtiagent.so
- /opt/android-studio/plugins/android/resources/transport/native/agent/x86/libjvmtiagent.so
- /opt/android-studio/plugins/android/resources/transport/native/agent/x86_64/libjvmtiagent.so
- /opt/android-studio/plugins/android/resources/transport/armeabi-v7a/transport
- /opt/android-studio/plugins/android/resources/transport/x86/transport
- /opt/android-studio/plugins/android/resources/transport/arm64-v8a/transport
- /opt/android-studio/plugins/android/lib/libwebp_jni.so
- /opt/android-studio/plugins/android/lib/libwebp_jni64.so"
+skiprdeps="/opt/android-studio/plugins/android/resources/process-tracker-agent/native/x86_64/process-tracker
+/opt/android-studio/plugins/android/resources/process-tracker-agent/native/armeabi-v7a/process-tracker
+/opt/android-studio/plugins/android/resources/process-tracker-agent/native/arm64-v8a/process-tracker
+/opt/android-studio/plugins/android/resources/process-tracker-agent/native/x86/process-tracker
+/opt/android-studio/plugins/android/resources/screen-sharing-agent/x86_64/libscreen-sharing-agent.so
+/opt/android-studio/plugins/android/resources/screen-sharing-agent/armeabi-v7a/libscreen-sharing-agent.so
+/opt/android-studio/plugins/android/resources/screen-sharing-agent/arm64-v8a/libscreen-sharing-agent.so
+/opt/android-studio/plugins/android/resources/screen-sharing-agent/x86/libscreen-sharing-agent.so
+/opt/android-studio/plugins/android/resources/installer/x86_64/installer
+/opt/android-studio/plugins/android/resources/installer/armeabi-v7a/installer
+/opt/android-studio/plugins/android/resources/installer/arm64-v8a/installer
+/opt/android-studio/plugins/android/resources/installer/x86/installer
+/opt/android-studio/plugins/android/resources/transport/x86_64/transport
+/opt/android-studio/plugins/android/resources/transport/native/agent/x86_64/libjvmtiagent.so
+/opt/android-studio/plugins/android/resources/transport/native/agent/armeabi-v7a/libjvmtiagent.so
+/opt/android-studio/plugins/android/resources/transport/native/agent/arm64-v8a/libjvmtiagent.so
+/opt/android-studio/plugins/android/resources/transport/native/agent/x86/libjvmtiagent.so
+/opt/android-studio/plugins/android/resources/transport/armeabi-v7a/transport
+/opt/android-studio/plugins/android/resources/transport/arm64-v8a/transport
+/opt/android-studio/plugins/android/resources/transport/x86/transport
+/opt/android-studio/plugins/android/resources/perfetto/x86_64/libperfetto.so
+/opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_probes
+/opt/android-studio/plugins/android/resources/perfetto/x86_64/traced
+/opt/android-studio/plugins/android/resources/perfetto/x86_64/perfetto
+/opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/libperfetto.so
+/opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced_probes
+/opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced
+/opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/perfetto
+/opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/libperfetto.so
+/opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced_probes
+/opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced
+/opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/perfetto
+/opt/android-studio/plugins/android/resources/perfetto/x86/libperfetto.so
+/opt/android-studio/plugins/android/resources/perfetto/x86/traced_probes
+/opt/android-studio/plugins/android/resources/perfetto/x86/traced
+/opt/android-studio/plugins/android/resources/perfetto/x86/perfetto"
 
 do_install() {
 	vmkdir opt/${pkgname}
 	vcopy bin opt/${pkgname}/
 	vcopy lib opt/${pkgname}/
-	vcopy jre opt/${pkgname}/
+	vcopy jbr opt/${pkgname}/
 	vcopy plugins opt/${pkgname}/
 	vcopy build.txt opt/${pkgname}/ # read as IDE version information
 	vcopy product-info.json opt/${pkgname}/
 	vmkdir usr/bin
 	ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio
 
-	# The version of host-side simpleperf bundled with Android Studio (as of 3.4.2) requires
-	# libncurses.so.5, which is not provided by Void Linux. However, as host-side simpleperf
-	# parsing is a fairly recent addition, we can just disable it...
-
-	rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86_64
-	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio.vmoptions
-	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio64.vmoptions
-
 	vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/
 	chmod -R ugo+rX ${DESTDIR}/opt
 }

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685081954

Comment:
I have doubts:
- This package has optional dependency on ncurses5, though application works without it. [AUR package points that it required for native debugger](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=android-studio#n23)
- Please tell is `nopie` option is required [here](https://github.com/void-linux/void-packages/pull/45676/files#diff-76718ef6b79845dc9aa817671a5390627e1d108501cc5d4dbd07c002fe4822d0L22)
---
For maintainer ship , I m not fully ready

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685081954

Comment:
I have doubts:
- This package has optional dependency on ncurses5, though application works without it. [AUR package points that it required for native debugger](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=android-studio#n23)
- Please tell is `nopie` option is required [here](https://github.com/void-linux/void-packages/pull/45676/files#diff-76718ef6b79845dc9aa817671a5390627e1d108501cc5d4dbd07c002fe4822d0L22)
-  i m not sure which libraries to include in `shlibs`, if there is problem plz guide me
---
For maintainer ship , I m not fully ready

Re: [PR REVIEW] android-studio: update to 2022.3.1.18

[Bnyro]

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

New review comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#discussion_r1299357770

Comment:
Please indent these lines

Re: android-studio: update to 2022.3.1.18

[Bnyro]

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

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685257081

Comment:
As described [here](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#orphaning-a-template), please add `, orphan` to your commit message.

Re: android-studio: update to 2022.3.1.18

[Bnyro]

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

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685258598

Comment:
> This package has optional dependency on ncurses5, though application works without it
>
Optional dependencies should likely only be included if they're required for some fundamental features of the package - and I don't think that's the case here.

> Please tell is nopie option is required [here](https://github.com/void-linux/void-packages/pull/45676/files#diff-76718ef6b79845dc9aa817671a5390627e1d108501cc5d4dbd07c002fe4822d0L22)
>
It seems to build just fine without using nopie, so I think it can be removed here.

Re: [PR PATCH] [Updated] android-studio: update to 2022.3.1.18

[Luciogi]

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

There is an updated pull request by Luciogi against master on the void-packages repository

https://github.com/Luciogi/void-packages android-studio
https://github.com/void-linux/void-packages/pull/45676

android-studio: update to 2022.3.1.18
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **Not sure, template already exist** 

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

This PR is based on #41215 

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

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

From 526b184eeadf9d3a098856e46f2e8afd46c8ab7d Mon Sep 17 00:00:00 2001
From: Luciogi <84625092+Luciogi@users.noreply.github.com>
Date: Sat, 19 Aug 2023 13:05:05 +0000
Subject: [PATCH] android-studio: update to 2022.3.1.18, orphan

---
 common/shlibs                   | 11 +++--
 srcpkgs/android-studio/template | 86 ++++++++++++++-------------------
 2 files changed, 45 insertions(+), 52 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eab94bb9b16d9..785485ce6dc2c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2615,9 +2615,14 @@ libopenshot-audio.so.9 libopenshot-audio-0.3.0_1
 libopenshot.so.23 libopenshot-0.3.0_1
 libpqxx-6.3.so libpqxx-6.3.3_1
 libndpi.so.3 ndpi-3.4_1
-liblog.so android-studio-3.0.1_1
-libm.so android-studio-3.0.1_1
-libdl.so android-studio-3.0.1_1
+liblog.so android-studio-2022.3.1.18_1
+libm.so android-studio-2022.3.1.18_1
+libdl.so android-studio-2022.3.1.18_1
+libpanelw.so.5 android-studio-2022.3.1.18_1
+libncursesw.so.5 android-studio-2022.3.1.18_1
+libtinfo.so.5 android-studio-2022.3.1.18_1
+libandroid.so android-studio-2022.3.1.18_1
+libmediandk.so android-studio-2022.3.1.18_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libseafile.so.0 seafile-libclient-7.0.10_2
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 1736993a49431..f9048066a6e0f 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,83 +1,71 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=4.1.3
+version=2022.3.1.18
 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.7199119
-_studio_rev=0
-archs="x86_64 i686"
+archs="x86_64"
 hostmakedepends="tar"
-depends="virtual?libGL"
 short_desc="Official Android IDE"
-maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 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=f599749ca47cda06d392e2764017c8a8a0c7b963a6a88ed494b432bece7cbc1b
+distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-${version}-linux.tar.gz"
+checksum=24215e1324a6ac911810b2cc1afb2d735cf745dfbc06918a42b8d6fbc6bf7433
 repository=nonfree
 restricted=yes
-python_version=2
-nopie=yes
+python_version=3
 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
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/x86/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/x86/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/x86/traced
- /opt/android-studio/plugins/android/resources/perfetto/x86/libperfetto.so
- /opt/android-studio/plugins/android/resources/simpleperf/armeabi-v7a/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/x86/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/x86_64/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/arm64-v8a/simpleperf
- /opt/android-studio/plugins/android/resources/installer/x86/installer
+skiprdeps="/opt/android-studio/plugins/android/resources/process-tracker-agent/native/x86_64/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/armeabi-v7a/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/arm64-v8a/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/x86/process-tracker
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/x86_64/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/armeabi-v7a/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/arm64-v8a/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/x86/libscreen-sharing-agent.so
  /opt/android-studio/plugins/android/resources/installer/x86_64/installer
- /opt/android-studio/plugins/android/resources/installer/arm64-v8a/installer
- /opt/android-studio/plugins/android/resources/installer/test-installer
  /opt/android-studio/plugins/android/resources/installer/armeabi-v7a/installer
- /opt/android-studio/plugins/android/resources/transport/native/agent/arm64-v8a/libjvmtiagent.so
+ /opt/android-studio/plugins/android/resources/installer/arm64-v8a/installer
+ /opt/android-studio/plugins/android/resources/installer/x86/installer
+ /opt/android-studio/plugins/android/resources/transport/x86_64/transport
+ /opt/android-studio/plugins/android/resources/transport/native/agent/x86_64/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/native/agent/armeabi-v7a/libjvmtiagent.so
+ /opt/android-studio/plugins/android/resources/transport/native/agent/arm64-v8a/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/native/agent/x86/libjvmtiagent.so
- /opt/android-studio/plugins/android/resources/transport/native/agent/x86_64/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/armeabi-v7a/transport
- /opt/android-studio/plugins/android/resources/transport/x86/transport
  /opt/android-studio/plugins/android/resources/transport/arm64-v8a/transport
- /opt/android-studio/plugins/android/lib/libwebp_jni.so
- /opt/android-studio/plugins/android/lib/libwebp_jni64.so"
+ /opt/android-studio/plugins/android/resources/transport/x86/transport
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/x86/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/x86/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/x86/traced
+ /opt/android-studio/plugins/android/resources/perfetto/x86/perfetto"
 
 do_install() {
 	vmkdir opt/${pkgname}
 	vcopy bin opt/${pkgname}/
 	vcopy lib opt/${pkgname}/
-	vcopy jre opt/${pkgname}/
+	vcopy jbr opt/${pkgname}/
 	vcopy plugins opt/${pkgname}/
 	vcopy build.txt opt/${pkgname}/ # read as IDE version information
 	vcopy product-info.json opt/${pkgname}/
 	vmkdir usr/bin
 	ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio
 
-	# The version of host-side simpleperf bundled with Android Studio (as of 3.4.2) requires
-	# libncurses.so.5, which is not provided by Void Linux. However, as host-side simpleperf
-	# parsing is a fairly recent addition, we can just disable it...
-
-	rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86_64
-	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio.vmoptions
-	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio64.vmoptions
-
 	vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/
 	chmod -R ugo+rX ${DESTDIR}/opt
 }

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685278316

Comment:
@Bnyro  what about common/shlibs?

Re: android-studio: update to 2022.3.1.18

[Bnyro]

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

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685279692

Comment:
I'm not really familiar with that, sorry.

Looks fine to me, but you should rely on me for that one.

Re: android-studio: update to 2022.3.1.18

[Bnyro]

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

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685279692

Comment:
I'm not really familiar with that, sorry.

Looks fine to me, but you should not rely on me for that one.

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685280397

Comment:
can you ping someone to review ?

Re: android-studio: update to 2022.3.1.18

[Bnyro]

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

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685281600

Comment:
You can ask in the IRC room, it's linked in the Readme.

Re: android-studio: update to 2022.3.1.18

[Bnyro]

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

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685281901

Comment:
Should be https://web.libera.chat/?nick=Guest?#xbps

Re: [PR REVIEW] android-studio: update to 2022.3.1.18

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#discussion_r1299376597

Comment:
Why are you orphaning a package that you don't maintain?

Re: [PR REVIEW] android-studio: update to 2022.3.1.18

[Luciogi]

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

New review comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#discussion_r1299377684

Comment:
package have not updated from long time

Re: [PR REVIEW] android-studio: update to 2022.3.1.18

[Luciogi]

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

New review comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#discussion_r1299377762

Comment:
should I revert it ?

Re: [PR REVIEW] android-studio: update to 2022.3.1.18

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#discussion_r1299389932

Comment:
Looks like the maintainer hasn't contributed to Void in several years, so we can keep the orphan change.

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685324063

Comment:
@ahesford  can you tell me about `common/shlibs` I dont understand which libs to include 

Re: android-studio: update to 2022.3.1.18

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685352430

Comment:
No libraries from this package should be mentioned in 'common/shlibs`. Please remove your additions as well as the existing entries that you intended to replace.

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685368328

Comment:
@ahesford  after deleting libs from `common/shlibs` breaks package build
https://pastebin.com/Ug5xKLHT

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685368328

Comment:
@ahesford  after deleting libs from `common/shlibs` breaks package build
https://pastebin.com/Ug5xKLHT
it seems now ncurses5 is required to build

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685368328

Comment:
@ahesford  after deleting libs from `common/shlibs` breaks package build
https://pastebin.com/Ug5xKLHT
it seems now ncurses5 is required to build

would it possible to include compatibility for ncurses5 with current ncurses package (reference: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=ncurses5-compat-libs#n38)  

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685368328

Comment:
@ahesford  after deleting libs from `common/shlibs` breaks package build
https://pastebin.com/Ug5xKLHT
it seems now ncurses5 is required to build

would it possible to include compatibility for ncurses5 with current ncurses package (reference: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=ncurses5-compat-libs#n38)  

Or I skip dependency check for these following files (temporarily until ncurse5 is packages )
```
./plugins/android-ndk/resources/lldb/lib/python3.10/lib-dynload/_curses.cpython-310-x86_64-linux-gnu.so
./plugins/android-ndk/resources/lldb/lib/python3.10/lib-dynload/_curses_panel.cpython-310-x86_64-linux-gnu.so
```

Re: android-studio: update to 2022.3.1.18

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685405373

Comment:
The inclusion of ncurses v5 compact pins has been discussed and rejected in the past. Skipping dependency checks for those two libraries is one possible workaround, but it may be better to remove those CPython extensions entirely (and anything that depends on them) because they will not be importable by Python.

Re: android-studio: update to 2022.3.1.18

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685405373

Comment:
The inclusion of ncurses v5 compact libs has been discussed and rejected in the past. Skipping dependency checks for those two libraries is one possible workaround, but it may be better to remove those CPython extensions entirely (and anything that depends on them) because they will not be importable by Python.

Re: [PR PATCH] [Updated] android-studio: update to 2022.3.1.18

[Luciogi]

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

There is an updated pull request by Luciogi against master on the void-packages repository

https://github.com/Luciogi/void-packages android-studio
https://github.com/void-linux/void-packages/pull/45676

android-studio: update to 2022.3.1.18
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **Not sure, template already exist** 

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

This PR is based on #41215 

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

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

From f881ea44654cf48f4628964364911ebaf834f46f Mon Sep 17 00:00:00 2001
From: Luciogi <84625092+Luciogi@users.noreply.github.com>
Date: Sat, 19 Aug 2023 13:05:05 +0000
Subject: [PATCH] android-studio: update to 2022.3.1.18, orphan

---
 common/shlibs                   |  3 --
 srcpkgs/android-studio/template | 88 +++++++++++++++------------------
 2 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eab94bb9b16d9..67bb48a7d400c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2615,9 +2615,6 @@ libopenshot-audio.so.9 libopenshot-audio-0.3.0_1
 libopenshot.so.23 libopenshot-0.3.0_1
 libpqxx-6.3.so libpqxx-6.3.3_1
 libndpi.so.3 ndpi-3.4_1
-liblog.so android-studio-3.0.1_1
-libm.so android-studio-3.0.1_1
-libdl.so android-studio-3.0.1_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libseafile.so.0 seafile-libclient-7.0.10_2
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 1736993a49431..565542f005d2a 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,83 +1,73 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=4.1.3
+version=2022.3.1.18
 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.7199119
-_studio_rev=0
-archs="x86_64 i686"
+archs="x86_64"
 hostmakedepends="tar"
-depends="virtual?libGL"
 short_desc="Official Android IDE"
-maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 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=f599749ca47cda06d392e2764017c8a8a0c7b963a6a88ed494b432bece7cbc1b
+distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-${version}-linux.tar.gz"
+checksum=24215e1324a6ac911810b2cc1afb2d735cf745dfbc06918a42b8d6fbc6bf7433
 repository=nonfree
 restricted=yes
-python_version=2
-nopie=yes
+python_version=3
 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
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/x86/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/x86/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/x86/traced
- /opt/android-studio/plugins/android/resources/perfetto/x86/libperfetto.so
- /opt/android-studio/plugins/android/resources/simpleperf/armeabi-v7a/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/x86/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/x86_64/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/arm64-v8a/simpleperf
- /opt/android-studio/plugins/android/resources/installer/x86/installer
+skiprdeps="/opt/android-studio/plugins/android/resources/process-tracker-agent/native/x86_64/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/armeabi-v7a/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/arm64-v8a/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/x86/process-tracker
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/x86_64/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/armeabi-v7a/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/arm64-v8a/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/x86/libscreen-sharing-agent.so
  /opt/android-studio/plugins/android/resources/installer/x86_64/installer
- /opt/android-studio/plugins/android/resources/installer/arm64-v8a/installer
- /opt/android-studio/plugins/android/resources/installer/test-installer
  /opt/android-studio/plugins/android/resources/installer/armeabi-v7a/installer
- /opt/android-studio/plugins/android/resources/transport/native/agent/arm64-v8a/libjvmtiagent.so
+ /opt/android-studio/plugins/android/resources/installer/arm64-v8a/installer
+ /opt/android-studio/plugins/android/resources/installer/x86/installer
+ /opt/android-studio/plugins/android/resources/transport/x86_64/transport
+ /opt/android-studio/plugins/android/resources/transport/native/agent/x86_64/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/native/agent/armeabi-v7a/libjvmtiagent.so
+ /opt/android-studio/plugins/android/resources/transport/native/agent/arm64-v8a/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/native/agent/x86/libjvmtiagent.so
- /opt/android-studio/plugins/android/resources/transport/native/agent/x86_64/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/armeabi-v7a/transport
- /opt/android-studio/plugins/android/resources/transport/x86/transport
  /opt/android-studio/plugins/android/resources/transport/arm64-v8a/transport
- /opt/android-studio/plugins/android/lib/libwebp_jni.so
- /opt/android-studio/plugins/android/lib/libwebp_jni64.so"
+ /opt/android-studio/plugins/android/resources/transport/x86/transport
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/x86/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/x86/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/x86/traced
+ /opt/android-studio/plugins/android/resources/perfetto/x86/perfetto
+ /opt/android-studio/plugins/android-ndk/resources/lldb/lib/python3.10/lib-dynload/_curses.cpython-310-x86_64-linux-gnu.so
+ /opt/android-studio/plugins/android-ndk/resources/lldb/lib/python3.10/lib-dynload/_curses_panel.cpython-310-x86_64-linux-gnu.so"
 
 do_install() {
 	vmkdir opt/${pkgname}
 	vcopy bin opt/${pkgname}/
 	vcopy lib opt/${pkgname}/
-	vcopy jre opt/${pkgname}/
+	vcopy jbr opt/${pkgname}/
 	vcopy plugins opt/${pkgname}/
 	vcopy build.txt opt/${pkgname}/ # read as IDE version information
 	vcopy product-info.json opt/${pkgname}/
 	vmkdir usr/bin
 	ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio
 
-	# The version of host-side simpleperf bundled with Android Studio (as of 3.4.2) requires
-	# libncurses.so.5, which is not provided by Void Linux. However, as host-side simpleperf
-	# parsing is a fairly recent addition, we can just disable it...
-
-	rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86_64
-	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio.vmoptions
-	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio64.vmoptions
-
 	vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/
 	chmod -R ugo+rX ${DESTDIR}/opt
 }

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685715961

Comment:
@ahesford , Lint template test fails

Re: android-studio: update to 2022.3.1.18

[Bnyro]

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

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685719501

Comment:
`authored by noreply email` - you have to use a proper email for authoring the commit.

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685715961

Comment:
@ahesford , Lint template test fails

edit: `xlint template` does not produce any error locally

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685725365

Comment:
> 

would simplelogin alias work here?

Re: android-studio: update to 2022.3.1.18

[Bnyro]

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

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685733010

Comment:
You should use an email you have and keep access to, I'm not familiar with Simplelogin.

Re: [PR PATCH] [Updated] android-studio: update to 2022.3.1.18

[Luciogi]

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

There is an updated pull request by Luciogi against master on the void-packages repository

https://github.com/Luciogi/void-packages android-studio
https://github.com/void-linux/void-packages/pull/45676

android-studio: update to 2022.3.1.18
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **Not sure, template already exist** 

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

This PR is based on #41215 

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

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

From ec93af96dec4399f923d0e4470bf376276d38d6d Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sat, 19 Aug 2023 13:05:05 +0000
Subject: [PATCH] android-studio: update to 2022.3.1.18, orphan

---
 common/shlibs                   |  3 --
 srcpkgs/android-studio/template | 88 +++++++++++++++------------------
 2 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eab94bb9b16d9..67bb48a7d400c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2615,9 +2615,6 @@ libopenshot-audio.so.9 libopenshot-audio-0.3.0_1
 libopenshot.so.23 libopenshot-0.3.0_1
 libpqxx-6.3.so libpqxx-6.3.3_1
 libndpi.so.3 ndpi-3.4_1
-liblog.so android-studio-3.0.1_1
-libm.so android-studio-3.0.1_1
-libdl.so android-studio-3.0.1_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libseafile.so.0 seafile-libclient-7.0.10_2
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 1736993a49431..565542f005d2a 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,83 +1,73 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=4.1.3
+version=2022.3.1.18
 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.7199119
-_studio_rev=0
-archs="x86_64 i686"
+archs="x86_64"
 hostmakedepends="tar"
-depends="virtual?libGL"
 short_desc="Official Android IDE"
-maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 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=f599749ca47cda06d392e2764017c8a8a0c7b963a6a88ed494b432bece7cbc1b
+distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-${version}-linux.tar.gz"
+checksum=24215e1324a6ac911810b2cc1afb2d735cf745dfbc06918a42b8d6fbc6bf7433
 repository=nonfree
 restricted=yes
-python_version=2
-nopie=yes
+python_version=3
 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
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/x86/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/x86/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/x86/traced
- /opt/android-studio/plugins/android/resources/perfetto/x86/libperfetto.so
- /opt/android-studio/plugins/android/resources/simpleperf/armeabi-v7a/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/x86/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/x86_64/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/arm64-v8a/simpleperf
- /opt/android-studio/plugins/android/resources/installer/x86/installer
+skiprdeps="/opt/android-studio/plugins/android/resources/process-tracker-agent/native/x86_64/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/armeabi-v7a/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/arm64-v8a/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/x86/process-tracker
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/x86_64/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/armeabi-v7a/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/arm64-v8a/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/x86/libscreen-sharing-agent.so
  /opt/android-studio/plugins/android/resources/installer/x86_64/installer
- /opt/android-studio/plugins/android/resources/installer/arm64-v8a/installer
- /opt/android-studio/plugins/android/resources/installer/test-installer
  /opt/android-studio/plugins/android/resources/installer/armeabi-v7a/installer
- /opt/android-studio/plugins/android/resources/transport/native/agent/arm64-v8a/libjvmtiagent.so
+ /opt/android-studio/plugins/android/resources/installer/arm64-v8a/installer
+ /opt/android-studio/plugins/android/resources/installer/x86/installer
+ /opt/android-studio/plugins/android/resources/transport/x86_64/transport
+ /opt/android-studio/plugins/android/resources/transport/native/agent/x86_64/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/native/agent/armeabi-v7a/libjvmtiagent.so
+ /opt/android-studio/plugins/android/resources/transport/native/agent/arm64-v8a/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/native/agent/x86/libjvmtiagent.so
- /opt/android-studio/plugins/android/resources/transport/native/agent/x86_64/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/armeabi-v7a/transport
- /opt/android-studio/plugins/android/resources/transport/x86/transport
  /opt/android-studio/plugins/android/resources/transport/arm64-v8a/transport
- /opt/android-studio/plugins/android/lib/libwebp_jni.so
- /opt/android-studio/plugins/android/lib/libwebp_jni64.so"
+ /opt/android-studio/plugins/android/resources/transport/x86/transport
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/x86/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/x86/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/x86/traced
+ /opt/android-studio/plugins/android/resources/perfetto/x86/perfetto
+ /opt/android-studio/plugins/android-ndk/resources/lldb/lib/python3.10/lib-dynload/_curses.cpython-310-x86_64-linux-gnu.so
+ /opt/android-studio/plugins/android-ndk/resources/lldb/lib/python3.10/lib-dynload/_curses_panel.cpython-310-x86_64-linux-gnu.so"
 
 do_install() {
 	vmkdir opt/${pkgname}
 	vcopy bin opt/${pkgname}/
 	vcopy lib opt/${pkgname}/
-	vcopy jre opt/${pkgname}/
+	vcopy jbr opt/${pkgname}/
 	vcopy plugins opt/${pkgname}/
 	vcopy build.txt opt/${pkgname}/ # read as IDE version information
 	vcopy product-info.json opt/${pkgname}/
 	vmkdir usr/bin
 	ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio
 
-	# The version of host-side simpleperf bundled with Android Studio (as of 3.4.2) requires
-	# libncurses.so.5, which is not provided by Void Linux. However, as host-side simpleperf
-	# parsing is a fairly recent addition, we can just disable it...
-
-	rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86_64
-	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio.vmoptions
-	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio64.vmoptions
-
 	vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/
 	chmod -R ugo+rX ${DESTDIR}/opt
 }

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685753084

Comment:
lol same test was passed just before this commit

Re: android-studio: update to 2022.3.1.18

[Bnyro]

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

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685754412

Comment:
Only a network error, can be ignored.

Re: android-studio: update to 2022.3.1.18

[Luciogi]

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

New comment by Luciogi on void-packages repository

https://github.com/void-linux/void-packages/pull/45676#issuecomment-1685758135

Comment:
> Only a network error, can be ignored.

should I force push again
or reviewer will manually start checks ?

Re: [PR PATCH] [Updated] android-studio: update to 2022.3.1.18

[Luciogi]

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

There is an updated pull request by Luciogi against master on the void-packages repository

https://github.com/Luciogi/void-packages android-studio
https://github.com/void-linux/void-packages/pull/45676

android-studio: update to 2022.3.1.18
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **Not sure, template already exist** 

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

This PR is based on #41215 

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

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

From 094ae003012ece26e231107c0461fe5c49fe84bc Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sat, 19 Aug 2023 13:05:05 +0000
Subject: [PATCH] android-studio: update to 2022.3.1.18, orphan

---
 common/shlibs                   |  3 --
 srcpkgs/android-studio/template | 88 +++++++++++++++------------------
 2 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index eab94bb9b16d9..67bb48a7d400c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2615,9 +2615,6 @@ libopenshot-audio.so.9 libopenshot-audio-0.3.0_1
 libopenshot.so.23 libopenshot-0.3.0_1
 libpqxx-6.3.so libpqxx-6.3.3_1
 libndpi.so.3 ndpi-3.4_1
-liblog.so android-studio-3.0.1_1
-libm.so android-studio-3.0.1_1
-libdl.so android-studio-3.0.1_1
 libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
 libsearpc.so.1 libsearpc-3.0.7_1
 libseafile.so.0 seafile-libclient-7.0.10_2
diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 1736993a49431..565542f005d2a 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,83 +1,73 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=4.1.3
+version=2022.3.1.18
 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.7199119
-_studio_rev=0
-archs="x86_64 i686"
+archs="x86_64"
 hostmakedepends="tar"
-depends="virtual?libGL"
 short_desc="Official Android IDE"
-maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 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=f599749ca47cda06d392e2764017c8a8a0c7b963a6a88ed494b432bece7cbc1b
+distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-${version}-linux.tar.gz"
+checksum=24215e1324a6ac911810b2cc1afb2d735cf745dfbc06918a42b8d6fbc6bf7433
 repository=nonfree
 restricted=yes
-python_version=2
-nopie=yes
+python_version=3
 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
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced
- /opt/android-studio/plugins/android/resources/perfetto/x86_64/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced
- /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced
- /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/libperfetto.so
- /opt/android-studio/plugins/android/resources/perfetto/x86/traced_probes
- /opt/android-studio/plugins/android/resources/perfetto/x86/perfetto
- /opt/android-studio/plugins/android/resources/perfetto/x86/traced
- /opt/android-studio/plugins/android/resources/perfetto/x86/libperfetto.so
- /opt/android-studio/plugins/android/resources/simpleperf/armeabi-v7a/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/x86/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/x86_64/simpleperf
- /opt/android-studio/plugins/android/resources/simpleperf/arm64-v8a/simpleperf
- /opt/android-studio/plugins/android/resources/installer/x86/installer
+skiprdeps="/opt/android-studio/plugins/android/resources/process-tracker-agent/native/x86_64/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/armeabi-v7a/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/arm64-v8a/process-tracker
+ /opt/android-studio/plugins/android/resources/process-tracker-agent/native/x86/process-tracker
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/x86_64/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/armeabi-v7a/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/arm64-v8a/libscreen-sharing-agent.so
+ /opt/android-studio/plugins/android/resources/screen-sharing-agent/x86/libscreen-sharing-agent.so
  /opt/android-studio/plugins/android/resources/installer/x86_64/installer
- /opt/android-studio/plugins/android/resources/installer/arm64-v8a/installer
- /opt/android-studio/plugins/android/resources/installer/test-installer
  /opt/android-studio/plugins/android/resources/installer/armeabi-v7a/installer
- /opt/android-studio/plugins/android/resources/transport/native/agent/arm64-v8a/libjvmtiagent.so
+ /opt/android-studio/plugins/android/resources/installer/arm64-v8a/installer
+ /opt/android-studio/plugins/android/resources/installer/x86/installer
+ /opt/android-studio/plugins/android/resources/transport/x86_64/transport
+ /opt/android-studio/plugins/android/resources/transport/native/agent/x86_64/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/native/agent/armeabi-v7a/libjvmtiagent.so
+ /opt/android-studio/plugins/android/resources/transport/native/agent/arm64-v8a/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/native/agent/x86/libjvmtiagent.so
- /opt/android-studio/plugins/android/resources/transport/native/agent/x86_64/libjvmtiagent.so
  /opt/android-studio/plugins/android/resources/transport/armeabi-v7a/transport
- /opt/android-studio/plugins/android/resources/transport/x86/transport
  /opt/android-studio/plugins/android/resources/transport/arm64-v8a/transport
- /opt/android-studio/plugins/android/lib/libwebp_jni.so
- /opt/android-studio/plugins/android/lib/libwebp_jni64.so"
+ /opt/android-studio/plugins/android/resources/transport/x86/transport
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/traced
+ /opt/android-studio/plugins/android/resources/perfetto/x86_64/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/traced
+ /opt/android-studio/plugins/android/resources/perfetto/armeabi-v7a/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/traced
+ /opt/android-studio/plugins/android/resources/perfetto/arm64-v8a/perfetto
+ /opt/android-studio/plugins/android/resources/perfetto/x86/libperfetto.so
+ /opt/android-studio/plugins/android/resources/perfetto/x86/traced_probes
+ /opt/android-studio/plugins/android/resources/perfetto/x86/traced
+ /opt/android-studio/plugins/android/resources/perfetto/x86/perfetto
+ /opt/android-studio/plugins/android-ndk/resources/lldb/lib/python3.10/lib-dynload/_curses.cpython-310-x86_64-linux-gnu.so
+ /opt/android-studio/plugins/android-ndk/resources/lldb/lib/python3.10/lib-dynload/_curses_panel.cpython-310-x86_64-linux-gnu.so"
 
 do_install() {
 	vmkdir opt/${pkgname}
 	vcopy bin opt/${pkgname}/
 	vcopy lib opt/${pkgname}/
-	vcopy jre opt/${pkgname}/
+	vcopy jbr opt/${pkgname}/
 	vcopy plugins opt/${pkgname}/
 	vcopy build.txt opt/${pkgname}/ # read as IDE version information
 	vcopy product-info.json opt/${pkgname}/
 	vmkdir usr/bin
 	ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio
 
-	# The version of host-side simpleperf bundled with Android Studio (as of 3.4.2) requires
-	# libncurses.so.5, which is not provided by Void Linux. However, as host-side simpleperf
-	# parsing is a fairly recent addition, we can just disable it...
-
-	rm -r ${DESTDIR}/opt/android-studio/plugins/android/resources/simpleperf/linux-x86_64
-	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio.vmoptions
-	echo "-Dprofiler.cpu.simpleperf.host=false" >> ${DESTDIR}/opt/android-studio/bin/studio64.vmoptions
-
 	vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/
 	chmod -R ugo+rX ${DESTDIR}/opt
 }

Re: [PR PATCH] [Merged]: android-studio: update to 2022.3.1.18, orphan

[classabbyamp]

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

There's a merged pull request on the void-packages repository

android-studio: update to 2022.3.1.18, orphan
https://github.com/void-linux/void-packages/pull/45676

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **Not sure, template already exist** 

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

This PR is based on #41215