[gentoo-commits] repo/proj/guru:dev commit in: www-apps/code-server-bin/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Leonardo Hernandez" <leohdz172@outlook.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: www-apps/code-server-bin/
Date: Thu, 14 Apr 2022 23:54:29 +0000 (UTC)	[thread overview]
Message-ID: <1649980429.fba7fc2a759942fe61da56f07e12b695d2bf6c17.leohdz172@gentoo> (raw)

commit:     fba7fc2a759942fe61da56f07e12b695d2bf6c17
Author:     Leonardo Hernández Hernández <leohdz172 <AT> outlook <DOT> com>
AuthorDate: Thu Apr 14 23:30:47 2022 +0000
Commit:     Leonardo Hernandez <leohdz172 <AT> outlook <DOT> com>
CommitDate: Thu Apr 14 23:53:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fba7fc2a

www-apps/code-server-bin: fix CFLAGS/LDFLAGS QA notice

Closes: https://bugs.gentoo.org/834755
Closes: https://bugs.gentoo.org/834756
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> outlook.com>

 .../code-server-bin/code-server-bin-4.1.0.ebuild   | 64 ++++++++++++----------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild b/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild
index ae11684ad..36b720788 100644
--- a/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-4.1.0.ebuild
@@ -28,7 +28,7 @@ IUSE="gnome-keyring"
 
 RDEPEND="
 	${DEPEND}
-	>=net-libs/nodejs-14.0[ssl]
+	>=net-libs/nodejs-14[ssl]
 	sys-apps/ripgrep
 	gnome-keyring? (
 		app-crypt/libsecret
@@ -41,29 +41,37 @@ PATCHES=( "${FILESDIR}/${PN}-node.patch" )
 
 DOCS=( "README.md" "ThirdPartyNotices.txt" )
 
+# Relative to parent
+CODE_OSS_MODULES="vendor/modules/code-oss-dev/node_modules"
+
 QA_PREBUILT="
-	/opt/code-server-bin/lib/coder-cloud-agent
-	/opt/code-server-bin/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node
-	/opt/code-server-bin/node_modules/@node-rs/argon2-linux-x64-gnu/argon2.linux-x64-gnu.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/native-is-elevated/build/Release/obj.target/iselevated.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/native-is-elevated/build/Release/iselevated.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/node-pty/build/Release/pty.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/native-watchdog/build/Release/obj.target/watchdog.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/native-watchdog/build/Release/watchdog.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/spdlog/build/Release/obj.target/spdlog.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/spdlog/build/Release/spdlog.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/vscode-nsfw/build/Release/obj.target/nsfw.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/vscode-nsfw/build/Release/nsfw.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@vscode/sqlite3/build/Release/obj.target/sqlite.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@vscode/sqlite3/build/Release/sqlite.node
+	/opt/${PN}/lib/coder-cloud-agent
+	/opt/${PN}/node_modules/argon2/lib/binding/napi-v3/argon2.node
+	/opt/${PN}/node_modules/argon2/build-tmp-napi-v3/Release/argon2.node
+	/opt/${PN}/node_modules/argon2/build-tmp-napi-v3/Release/obj.target/argon2.node
+	/opt/${PN}/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node
+	/opt/${PN}/node_modules/@node-rs/argon2-linux-x64-gnu/argon2.linux-x64-gnu.node
+	/opt/${PN}/${CODE_OSS_MODULES}/native-is-elevated/build/Release/obj.target/iselevated.node
+	/opt/${PN}/${CODE_OSS_MODULES}/native-is-elevated/build/Release/iselevated.node
+	/opt/${PN}/${CODE_OSS_MODULES}/node-pty/build/Release/pty.node
+	/opt/${PN}/${CODE_OSS_MODULES}/native-watchdog/build/Release/obj.target/watchdog.node
+	/opt/${PN}/${CODE_OSS_MODULES}/native-watchdog/build/Release/watchdog.node
+	/opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node
+	/opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node
+	/opt/${PN}/${CODE_OSS_MODULES}/spdlog/build/Release/obj.target/spdlog.node
+	/opt/${PN}/${CODE_OSS_MODULES}/spdlog/build/Release/spdlog.node
+	/opt/${PN}/${CODE_OSS_MODULES}/vscode-nsfw/build/Release/obj.target/nsfw.node
+	/opt/${PN}/${CODE_OSS_MODULES}/vscode-nsfw/build/Release/nsfw.node
+	/opt/${PN}/${CODE_OSS_MODULES}/@vscode/sqlite3/build/Release/obj.target/sqlite.node
+	/opt/${PN}/${CODE_OSS_MODULES}/@vscode/sqlite3/build/Release/sqlite.node
+	/opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/build/Release/watcher.node
+	/opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/build/Release/obj.target/watcher.node
 "
 
 QA_PRESTRIPPED="
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node
-	/opt/code-server-bin/vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node
-	/opt/code-server-bin/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node
+	/opt/${PN}/node_modules/@node-rs/argon2-linux-x64-musl/argon2.linux-x64-musl.node
+	/opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node
+	/opt/${PN}/${CODE_OSS_MODULES}/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node
 "
 
 src_prepare() {
@@ -78,7 +86,7 @@ src_prepare() {
 		|| die "Failed to remove bundled nodejs"
 
 	# remove bundled ripgrep binary
-	rm ./vendor/modules/code-oss-dev/node_modules/vscode-ripgrep/bin/rg \
+	rm ./"${CODE_OSS_MODULES}"/vscode-ripgrep/bin/rg \
 		|| die "Failed to remove bundled ripgrep"
 
 	# not needed
@@ -89,19 +97,19 @@ src_prepare() {
 	rm ./LICENSE.txt || die
 
 	# For windows
-	rm -rf ./vendor/modules/code-oss-dev/node_modules/windows-foreground-love || die
-	rm -rf .vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/win32-x64 || die
+	rm -rf ./"${CODE_OSS_MODULES}"/windows-foreground-love || die
+	rm -rf ."${CODE_OSS_MODULES}"/@parcel/watcher/prebuilds/win32-x64 || die
 
 	if [[ $ELIBC != "musl" ]]; then
 		rm -rf ./node_modules/@node-rs/argon2-linux-x64-musl || die
-		rm ./vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node || die
+		rm ./"${CODE_OSS_MODULES}"/@parcel/watcher/prebuilds/linux-x64/node.napi.musl.node || die
 	elif [[ $ELIBC != "glibc" ]]; then
-		rm ./vendor/modules/code-oss-dev/node_modules/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node || die
+		rm ./"${CODE_OSS_MODULES}"/@parcel/watcher/prebuilds/linux-x64/node.napi.glibc.node || die
 	fi
 
 	# We don't need electron
-	rm -rf ./vendor/modules/code-oss-dev/node_modules/electron || die
-	rm ./vendor/modules/code-oss-dev/node_modules/.bin/electron
+	rm -rf ./"${CODE_OSS_MODULES}"/electron || die
+	rm ./"${CODE_OSS_MODULES}"/.bin/electron
 }
 
 src_install() {
@@ -113,7 +121,7 @@ src_install() {
 	dosym -r "/opt/${PN}/bin/${MY_PN}" "${EPREFIX}/usr/bin/${PN}"
 
 	dosym -r "/usr/bin/rg" \
-		"${EPREFIX}/opt/${PN}/vendor/modules/code-oss-dev/node_modules/vscode-ripgrep/bin/rg"
+		"${EPREFIX}/opt/${PN}/${CODE_OSS_MODULES}/vscode-ripgrep/bin/rg"
 
 	systemd_douserunit "${FILESDIR}/${MY_PN}.service"
 }

next             reply	other threads:[~2022-04-14 23:54 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-14 23:54 Leonardo Hernandez [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-10  6:39 [gentoo-commits] repo/proj/guru:dev commit in: www-apps/code-server-bin/ Leonardo Hernandez
2024-07-10  6:39 Leonardo Hernandez
2024-07-10  6:39 Leonardo Hernandez
2023-11-29 22:18 Leonardo Hernandez
2023-11-01 19:20 Leonardo Hernandez
2023-10-02  5:24 Leonardo Hernandez
2023-09-24 19:08 Leonardo Hernandez
2023-07-31 20:14 Leonardo Hernandez
2023-07-31 20:14 Leonardo Hernandez
2023-07-30 20:17 Leonardo Hernandez
2023-07-22  1:43 Leonardo Hernandez
2023-07-22  1:43 Leonardo Hernandez
2023-06-27  4:51 Leonardo Hernandez
2023-06-22  5:12 Leonardo Hernandez
2023-06-22  5:12 Leonardo Hernandez
2023-05-19 21:42 Leonardo Hernandez
2023-05-19 21:42 Leonardo Hernandez
2023-04-21 22:12 Leonardo Hernandez
2023-04-21 22:12 Leonardo Hernandez
2023-01-18  5:48 Leonardo Hernandez
2023-01-12 20:58 Leonardo Hernandez
2023-01-12 20:58 Leonardo Hernandez
2022-12-30 21:27 Leonardo Hernandez
2022-12-02 18:16 Leonardo Hernandez
2022-12-02 18:16 Leonardo Hernandez
2022-10-01 21:29 Leonardo Hernandez
2022-09-22  5:40 Leonardo Hernandez
2022-09-09  2:57 Leonardo Hernandez
2022-04-15 15:02 Leonardo Hernandez
2022-04-14 23:54 Leonardo Hernandez
2022-04-14 23:54 Leonardo Hernandez
2022-03-04  3:50 Leonardo Hernandez
2022-03-04  3:50 Leonardo Hernandez
2022-02-12  2:31 Leonardo Hernandez
2022-01-28 21:55 Leonardo Hernandez
2022-01-28 21:55 Leonardo Hernandez
2022-01-24 20:08 Leonardo Hernandez
2021-09-26 15:55 Leonardo Hernandez
2021-09-25  4:55 Leonardo Hernandez
2021-09-25  4:55 Leonardo Hernandez
2021-09-25  4:55 Leonardo Hernandez
2021-05-21 18:18 Maciej Barć
2021-05-10 22:03 Maciej Barć
2021-05-10 22:03 Maciej Barć
2021-04-08 21:50 Maciej Barć
2021-04-08 21:37 Maciej Barć
2021-03-28 11:43 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2021-03-28 11:14 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2021-03-26  7:47 Maciej Barć
2021-03-25 23:14 Maciej Barć
2021-03-25 23:13 Maciej Barć
2021-03-08 18:32 Maciej Barć
2021-02-13  2:08 Maciej Barć
2021-02-13  2:07 Maciej Barć
2021-02-05 23:59 Maciej Barć
2021-02-05 23:59 Maciej Barć
2020-12-27 16:07 Maciej Barć
2020-10-24 10:36 Maciej Barć
2020-08-03 22:42 Maciej Barć
2020-07-26 21:53 Maciej Barć

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:ae11684a dfblob:36b72078 )
 OR (
bs:"[gentoo-commits] repo/proj/guru:dev commit in: www-apps/code-server-bin/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1649980429.fba7fc2a759942fe61da56f07e12b695d2bf6c17.leohdz172@gentoo \
    --to=leohdz172@outlook.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox