Github messages for voidlinux
 help / color / mirror / Atom feed
* Re: [PR PATCH] [Updated] [DO NOT MERGE] android-studio: update to 3.4.0
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-11219@inbox.vuxu.org>
  2019-06-09 11:30 ` [DO NOT MERGE] android-studio: update to 3.4.0 voidlinux-github
  2019-07-19 15:46 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-07-19 15:46 ` voidlinux-github
  2019-07-19 15:47 ` voidlinux-github
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2019-07-19 15:46 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mustaqimM/void-packages android-studio-update-branch
https://github.com/void-linux/void-packages/pull/11219

[DO NOT MERGE] android-studio: update to 3.4.0
Please don't merge yet, I'm getting the following error when trying to install:
```zsh
$> sudo xbps-install --repository=hostdir/binpkgs/android-studio-update-branch/nonfree android-studio
Password:
android-studio-3.4.0_1: broken, unresolvable shlib `ld-linux.so.2'
android-studio-3.4.0_1: broken, unresolvable shlib `libncurses.so.5'
Transaction aborted due to unresolved shlibs.
```

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

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

From cdb349b1f3da2a1b9fd082649b9bacf1ce0f871c Mon Sep 17 00:00:00 2001
From: mustaqim <mustaqim@pm.me>
Date: Fri, 19 Jul 2019 17:37:37 +0200
Subject: [PATCH] android-studio: update to 3.4.2

---
 srcpkgs/android-studio/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 4ccbb3e2221..b9f5d431d67 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,23 +1,21 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=3.3.2
+version=3.4.2
 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=182.5314842
+_studio_build=183.5692245
 _studio_rev=0
 archs="x86_64 i686"
 create_wrksrc=yes
-build_style=fetch
-hostmakedepends="unzip"
 depends="gtk+ libGL"
 short_desc="Official Android IDE"
 maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
 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.zip"
-checksum=8257d3eab61c3da088e26689888a13e53e210c109a4e775ed71158b4471bb06a
+distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz"
+checksum=35eb8c74837d1aab59229101fc91568a607ac04854a40209f7a0ba7ac0601924
 repository=nonfree
 nopie=yes
 nostrip=yes
@@ -34,14 +32,17 @@ skiprdeps="/opt/android-studio/plugins/android/resources/installer/arm64-v8a/ins
  /opt/android-studio/plugins/android/resources/perfd/armeabi-v7a/perfd
  /opt/android-studio/plugins/android/resources/perfd/x86/perfd"
 
+do_extract() {
+	tar xfz ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-ide-183.5692245-linux.tar.gz --strip-components=1 -C ${wrksrc}
+}
+
 do_install() {
-	unzip android-studio-ide-${_studio_build}-linux.zip
 	vmkdir opt/${pkgname}
-	vcopy android-studio/bin opt/${pkgname}/
-	vcopy android-studio/gradle opt/${pkgname}/
-	vcopy android-studio/lib opt/${pkgname}/
-	vcopy android-studio/jre opt/${pkgname}/
-	vcopy android-studio/plugins opt/${pkgname}/
+	vcopy bin opt/${pkgname}/
+	vcopy gradle opt/${pkgname}/
+	vcopy lib opt/${pkgname}/
+	vcopy jre opt/${pkgname}/
+	vcopy plugins opt/${pkgname}/
 	vmkdir usr/bin
 	ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio
 	vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/

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

* Re: [PR PATCH] [Updated] [DO NOT MERGE] android-studio: update to 3.4.0
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-11219@inbox.vuxu.org>
  2019-06-09 11:30 ` [DO NOT MERGE] android-studio: update to 3.4.0 voidlinux-github
@ 2019-07-19 15:46 ` voidlinux-github
  2019-07-19 15:46 ` voidlinux-github
  2019-07-19 15:47 ` voidlinux-github
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2019-07-19 15:46 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mustaqimM/void-packages android-studio-update-branch
https://github.com/void-linux/void-packages/pull/11219

[DO NOT MERGE] android-studio: update to 3.4.0
Please don't merge yet, I'm getting the following error when trying to install:
```zsh
$> sudo xbps-install --repository=hostdir/binpkgs/android-studio-update-branch/nonfree android-studio
Password:
android-studio-3.4.0_1: broken, unresolvable shlib `ld-linux.so.2'
android-studio-3.4.0_1: broken, unresolvable shlib `libncurses.so.5'
Transaction aborted due to unresolved shlibs.
```

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

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

From cdb349b1f3da2a1b9fd082649b9bacf1ce0f871c Mon Sep 17 00:00:00 2001
From: mustaqim <mustaqim@pm.me>
Date: Fri, 19 Jul 2019 17:37:37 +0200
Subject: [PATCH] android-studio: update to 3.4.2

---
 srcpkgs/android-studio/template | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/android-studio/template b/srcpkgs/android-studio/template
index 4ccbb3e2221..b9f5d431d67 100644
--- a/srcpkgs/android-studio/template
+++ b/srcpkgs/android-studio/template
@@ -1,23 +1,21 @@
 # Template file for 'android-studio'
 pkgname=android-studio
-version=3.3.2
+version=3.4.2
 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=182.5314842
+_studio_build=183.5692245
 _studio_rev=0
 archs="x86_64 i686"
 create_wrksrc=yes
-build_style=fetch
-hostmakedepends="unzip"
 depends="gtk+ libGL"
 short_desc="Official Android IDE"
 maintainer="Jordyn Carattini <onlinecloud1@gmail.com>"
 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.zip"
-checksum=8257d3eab61c3da088e26689888a13e53e210c109a4e775ed71158b4471bb06a
+distfiles="https://dl.google.com/dl/android/studio/ide-zips/${version}.${_studio_rev}/android-studio-ide-${_studio_build}-linux.tar.gz"
+checksum=35eb8c74837d1aab59229101fc91568a607ac04854a40209f7a0ba7ac0601924
 repository=nonfree
 nopie=yes
 nostrip=yes
@@ -34,14 +32,17 @@ skiprdeps="/opt/android-studio/plugins/android/resources/installer/arm64-v8a/ins
  /opt/android-studio/plugins/android/resources/perfd/armeabi-v7a/perfd
  /opt/android-studio/plugins/android/resources/perfd/x86/perfd"
 
+do_extract() {
+	tar xfz ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-ide-183.5692245-linux.tar.gz --strip-components=1 -C ${wrksrc}
+}
+
 do_install() {
-	unzip android-studio-ide-${_studio_build}-linux.zip
 	vmkdir opt/${pkgname}
-	vcopy android-studio/bin opt/${pkgname}/
-	vcopy android-studio/gradle opt/${pkgname}/
-	vcopy android-studio/lib opt/${pkgname}/
-	vcopy android-studio/jre opt/${pkgname}/
-	vcopy android-studio/plugins opt/${pkgname}/
+	vcopy bin opt/${pkgname}/
+	vcopy gradle opt/${pkgname}/
+	vcopy lib opt/${pkgname}/
+	vcopy jre opt/${pkgname}/
+	vcopy plugins opt/${pkgname}/
 	vmkdir usr/bin
 	ln -s /opt/android-studio/bin/studio.sh ${DESTDIR}/usr/bin/android-studio
 	vinstall "${FILESDIR}/android-studio.desktop" 644 usr/share/applications/

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

* Re: [DO NOT MERGE] android-studio: update to 3.4.0
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-11219@inbox.vuxu.org>
                   ` (2 preceding siblings ...)
  2019-07-19 15:46 ` voidlinux-github
@ 2019-07-19 15:47 ` voidlinux-github
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2019-07-19 15:47 UTC (permalink / raw)
  To: ml

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

New comment by mustaqimM on void-packages repository

https://github.com/void-linux/void-packages/pull/11219#issuecomment-513279396
Comment:
@gemath Both of them are already linked:
https://github.com/void-linux/void-packages/blob/f19f9f9cf7ef89b294ab4a37340f33d41a55c6a8/common/shlibs#L26
https://github.com/void-linux/void-packages/blob/f19f9f9cf7ef89b294ab4a37340f33d41a55c6a8/common/shlibs#L72

Currently it's only aborting on:
```zsh
android-studio-3.4.0_1: broken, unresolvable shlib `libncurses.so.5'
```

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

* Re: [DO NOT MERGE] android-studio: update to 3.4.0
       [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-11219@inbox.vuxu.org>
@ 2019-06-09 11:30 ` voidlinux-github
  2019-07-19 15:46 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2019-06-09 11:30 UTC (permalink / raw)
  To: ml

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

New comment by gemath on void-packages repository

https://github.com/void-linux/void-packages/pull/11219#issuecomment-500204989
Comment:
We may have the libraries we need on Void:
`ld-linux.so.2` is called `ld-2.xx.so` and is linked as `ld-linux-x86-64.so.2`
`libncurses.so.5` could probably be replaced with `libncursesw.so.5` which basically just adds unicode support.

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

end of thread, other threads:[~2019-07-19 15:47 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-11219@inbox.vuxu.org>
2019-06-09 11:30 ` [DO NOT MERGE] android-studio: update to 3.4.0 voidlinux-github
2019-07-19 15:46 ` [PR PATCH] [Updated] " voidlinux-github
2019-07-19 15:46 ` voidlinux-github
2019-07-19 15:47 ` voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).