From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 06D4F15810F for ; Sat, 10 Jun 2023 10:56:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAA3AE0930; Sat, 10 Jun 2023 10:56:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A84C7E0930 for ; Sat, 10 Jun 2023 10:56:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A6AD33C1C2 for ; Sat, 10 Jun 2023 10:56:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF0A3A9B for ; Sat, 10 Jun 2023 10:56:16 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1686285823.b11268e393931a4f87c507824053894b834b0a95.flow@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: app-editors/pulsar-bin/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-editors/pulsar-bin/Manifest app-editors/pulsar-bin/pulsar-bin-1.105.0-r1.ebuild app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild X-VCS-Directories: app-editors/pulsar-bin/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: b11268e393931a4f87c507824053894b834b0a95 X-VCS-Branch: master Date: Sat, 10 Jun 2023 10:56:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3aa38c85-714f-4d24-af53-9b10b6404744 X-Archives-Hash: ddf9c04e51b5e83df2c1d4d6cc4fd959 commit: b11268e393931a4f87c507824053894b834b0a95 Author: YiFei Zhu gmail com> AuthorDate: Fri Jun 9 04:43:43 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Fri Jun 9 04:43:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b11268e3 app-editors/pulsar-bin: Support arm64 Tested ebuild on an arm64 prefix. Couldn't do a proper run test because that machine is awfully slow. Also removed the redundant chmods, if we could simply mv the files into image instead of using doins, the modes from the original tarball are kept and we don't need to chmod. Signed-off-by: YiFei Zhu gmail.com> app-editors/pulsar-bin/Manifest | 3 +- ...1.105.0.ebuild => pulsar-bin-1.105.0-r1.ebuild} | 40 ++++++++++++---------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app-editors/pulsar-bin/Manifest b/app-editors/pulsar-bin/Manifest index 762558a4e..c4c1d31ad 100644 --- a/app-editors/pulsar-bin/Manifest +++ b/app-editors/pulsar-bin/Manifest @@ -1 +1,2 @@ -DIST pulsar-bin-1.105.0.tar.gz 228995179 BLAKE2B b4b185a161374590b68e2efbd5b2f37ec59278f71cc30ef519c3a67ae546ea9b73f2e2e50eabd8b07855e291704f4d994428f58dca24e144713e4996fe053b03 SHA512 f2ed05bebe81735c21ac80ff82ec051aebc9ec54e8f2ffce0e4e17f0fc6b221992ca5909271f04334211e494647cfef9f1555f0f439ee77c63488585f255f810 +DIST pulsar-bin-1.105.0-amd64.tar.gz 228995179 BLAKE2B b4b185a161374590b68e2efbd5b2f37ec59278f71cc30ef519c3a67ae546ea9b73f2e2e50eabd8b07855e291704f4d994428f58dca24e144713e4996fe053b03 SHA512 f2ed05bebe81735c21ac80ff82ec051aebc9ec54e8f2ffce0e4e17f0fc6b221992ca5909271f04334211e494647cfef9f1555f0f439ee77c63488585f255f810 +DIST pulsar-bin-1.105.0-arm64.tar.gz 190376758 BLAKE2B 4901f01497f7a015f95f77126f91f7817ffa8bd82d10066f741dd53dd67ec6f43bec1f7a34d949f00f2efed9f36b0f19745fb71abbc6074ca248f08d4159062a SHA512 e201118befcc14308f1383309fd0a7a258f72d1aa31b59da8ffb863ab9a43b821b5285dfe4fde1ccdf8f92121c1898b8022f604362e7415dcf7d8fc05d8de512 diff --git a/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild b/app-editors/pulsar-bin/pulsar-bin-1.105.0-r1.ebuild similarity index 67% rename from app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild rename to app-editors/pulsar-bin/pulsar-bin-1.105.0-r1.ebuild index 9dcaab44b..949a77857 100644 --- a/app-editors/pulsar-bin/pulsar-bin-1.105.0.ebuild +++ b/app-editors/pulsar-bin/pulsar-bin-1.105.0-r1.ebuild @@ -7,12 +7,14 @@ inherit desktop xdg DESCRIPTION="A Community-led Hyper-Hackable Text Editor" HOMEPAGE="https://pulsar-edit.dev/" -SRC_URI="https://github.com/pulsar-edit/pulsar/releases/download/v${PV}/Linux.pulsar-${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + amd64? ( https://github.com/pulsar-edit/pulsar/releases/download/v${PV}/Linux.pulsar-${PV}.tar.gz -> ${P}-amd64.tar.gz ) + arm64? ( https://github.com/pulsar-edit/pulsar/releases/download/v${PV}/ARM.Linux.pulsar-${PV}-arm64.tar.gz -> ${P}-arm64.tar.gz ) +" LICENSE="MIT" SLOT="0" -# Need different downloads for other architectures; untested -KEYWORDS="-* ~amd64" +KEYWORDS="-* ~amd64 ~arm64" RESTRICT="test" S="${WORKDIR}/pulsar-${PV}" @@ -50,6 +52,14 @@ RDEPEND=" QA_PREBUILT="/opt/Pulsar/*" QA_PRESTRIPPED="/opt/Pulsar/resources/*" # Files are already stripped +src_unpack(){ + default + + if use arm64; then + mv "pulsar-${PV}-arm64" "pulsar-${PV}" || die + fi +} + src_prepare(){ default @@ -58,26 +68,18 @@ src_prepare(){ } src_install(){ - insinto /opt/Pulsar - doins -r "${S}"/* - dosym ../../opt/Pulsar/resources/pulsar.sh "${EPREFIX}"/usr/bin/pulsar - fperms +x /opt/Pulsar/resources/pulsar.sh - fperms +x /opt/Pulsar/pulsar - - # I will use only npm provided with package itself - # as nodejs is not required to make it working (and it is really big). - fperms +x /opt/Pulsar/resources/app/ppm/bin/{apm,node,npm} + dodir /opt/Pulsar + mv "${S}"/* "${ED}"/opt/Pulsar - # Bug 798459 - fperms +x /opt/Pulsar/resources/app.asar.unpacked/node_modules/{vscode-ripgrep/bin/rg,dugite/git/bin/git} - fperms +x /opt/Pulsar/resources/app.asar.unpacked/node_modules/fuzzy-finder/node_modules/vscode-ripgrep/bin/rg - fperms +x /opt/Pulsar/resources/app.asar.unpacked/node_modules/whats-my-line/node_modules/dugite/git/bin/git + dosym ../../opt/Pulsar/resources/pulsar.sh /usr/bin/pulsar # Bug #906939 - rm "${ED}"/opt/Pulsar/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3 - rmdir "${ED}"/opt/Pulsar/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins + if use amd64; then + rm "${ED}"/opt/Pulsar/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins/python3 + rmdir "${ED}"/opt/Pulsar/resources/app.asar.unpacked/node_modules/tree-sitter-bash/build/node_gyp_bins + fi - doicon resources/pulsar.png + doicon "${ED}"/opt/Pulsar/resources/pulsar.png make_desktop_entry "/usr/bin/pulsar %F" "Pulsar" "pulsar" \ "GNOME;GTK;Utility;TextEditor;Development;" \ "GenericName=Text Editor\nStartupNotify=true\nStartupWMClass=pulsar\n" \