Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] android-studio: update to 2022.3.1.18
@ 2023-08-19 18:34 Luciogi
  2023-08-19 18:41 ` Luciogi
                   ` (35 more replies)
  0 siblings, 36 replies; 37+ messages in thread
From: Luciogi @ 2023-08-19 18:34 UTC (permalink / raw)
  To: ml

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

^ permalink raw reply	[flat|nested] 37+ messages in thread

end of thread, other threads:[~2023-09-27 23:22 UTC | newest]

Thread overview: 37+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-19 18:34 [PR PATCH] android-studio: update to 2022.3.1.18 Luciogi
2023-08-19 18:41 ` Luciogi
2023-08-19 18:43 ` Luciogi
2023-08-20 11:10 ` [PR REVIEW] " Bnyro
2023-08-20 11:11 ` Bnyro
2023-08-20 11:19 ` Bnyro
2023-08-20 12:41 ` [PR PATCH] [Updated] " Luciogi
2023-08-20 12:54 ` Luciogi
2023-08-20 13:00 ` Bnyro
2023-08-20 13:00 ` Bnyro
2023-08-20 13:03 ` Luciogi
2023-08-20 13:07 ` Bnyro
2023-08-20 13:09 ` Bnyro
2023-08-20 13:19 ` [PR REVIEW] " ahesford
2023-08-20 13:27 ` Luciogi
2023-08-20 13:27 ` Luciogi
2023-08-20 14:48 ` ahesford
2023-08-20 16:25 ` Luciogi
2023-08-20 17:50 ` ahesford
2023-08-20 19:09 ` Luciogi
2023-08-20 19:10 ` Luciogi
2023-08-20 19:15 ` Luciogi
2023-08-20 19:21 ` Luciogi
2023-08-20 21:50 ` ahesford
2023-08-20 21:50 ` ahesford
2023-08-21  6:12 ` [PR PATCH] [Updated] " Luciogi
2023-08-21  6:17 ` Luciogi
2023-08-21  6:21 ` Bnyro
2023-08-21  6:23 ` Luciogi
2023-08-21  6:27 ` Luciogi
2023-08-21  6:34 ` Bnyro
2023-08-21  6:43 ` [PR PATCH] [Updated] " Luciogi
2023-08-21  6:52 ` Luciogi
2023-08-21  6:53 ` Bnyro
2023-08-21  6:57 ` Luciogi
2023-08-21  7:22 ` [PR PATCH] [Updated] " Luciogi
2023-09-27 23:22 ` [PR PATCH] [Merged]: android-studio: update to 2022.3.1.18, orphan classabbyamp

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).