Date: Mon, 23 Mar 2026 23:37:30 +0000 From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d8dfedd9c2bb - main - devel/RStudio: Improve Makefile by adding ELECTRON_VERSION variable Message-ID: <69c1ceba.3336c.410ca155@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8dfedd9c2bb9a4f06a67a7a9100073bd03b5bdb commit d8dfedd9c2bb9a4f06a67a7a9100073bd03b5bdb Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2026-03-23 23:35:55 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2026-03-23 23:37:28 +0000 devel/RStudio: Improve Makefile by adding ELECTRON_VERSION variable This port was a bit fragile, but it builds and works fine when electron37 is available. (electron37 is currently broken). --- devel/RStudio/Makefile | 21 +++++++++++---------- devel/RStudio/distinfo.desktop | 21 --------------------- 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/devel/RStudio/Makefile b/devel/RStudio/Makefile index 3eaac0c7eb6f..0bc5a92cf642 100644 --- a/devel/RStudio/Makefile +++ b/devel/RStudio/Makefile @@ -87,9 +87,10 @@ MAKE_ENV= HOME=${WRKDIR} \ ANT_OPTS="-Duser.home=${WRKDIR}" LDFLAGS+= -lexecinfo -GWT_VERSION= 2.12.2 # GWT_VER in src/gwt/tools/build-gwt -GIN_VERSION= 2.1.2 -QUARTO_VERSION= 1.7.32 # Version expected by RStudio for panmirror build +GWT_VERSION= 2.12.2 # GWT_VER in src/gwt/tools/build-gwt +GIN_VERSION= 2.1.2 +ELECTRON_VERSION= 37 +QUARTO_VERSION= 1.7.32 # Version expected by RStudio for panmirror build QUARTO_MONO_COMMIT= 591b3520eafbb4da7b26b9f31aac6948801f19d8 # Commit from quarto monorepo with panmirror .if ${FLAVOR:U} == desktop @@ -99,9 +100,9 @@ FETCH_DEPENDS+= npm:www/npm \ yarn:www/yarn BUILD_DEPENDS+= npm:www/npm \ yarn:www/yarn \ - electron37:devel/electron37 \ + electron${ELECTRON_VERSION}:devel/electron${ELECTRON_VERSION} \ zip:archivers/zip -RUN_DEPENDS+= electron37:devel/electron37 +RUN_DEPENDS+= electron${ELECTRON_VERSION}:devel/electron${ELECTRON_VERSION} CMAKE_ARGS+= -DRSTUDIO_TARGET=Electron MAKE_ENV+= ELECTRON_SKIP_BINARY_DOWNLOAD=1 \ npm_config_nodedir=${WRKDIR}/.electron-headers \ @@ -242,17 +243,17 @@ pre-build: # Create proper electron headers structure for node-gyp # node-gyp expects common.gypi at root and headers at include/node @${MKDIR} ${WRKDIR}/.electron-headers - @${LN} -sf ${LOCALBASE}/share/electron37/node_headers/include ${WRKDIR}/.electron-headers/include - @${LN} -sf ${LOCALBASE}/share/electron37/node_headers/include/node/common.gypi ${WRKDIR}/.electron-headers/common.gypi + @${LN} -sf ${LOCALBASE}/share/electron${ELECTRON_VERSION}/node_headers/include ${WRKDIR}/.electron-headers/include + @${LN} -sf ${LOCALBASE}/share/electron${ELECTRON_VERSION}/node_headers/include/node/common.gypi ${WRKDIR}/.electron-headers/common.gypi # Create electron ZIP for electron-packager (expects electron-v{VERSION}-linux-x64.zip) @${MKDIR} ${WRKDIR}/.electron-zip - @cd ${LOCALBASE}/share/electron37 && zip -rq ${WRKDIR}/.electron-zip/electron-v37.6.1-linux-x64.zip \ + @cd ${LOCALBASE}/share/electron${ELECTRON_VERSION} && zip -rq ${WRKDIR}/.electron-zip/electron-v37.6.1-linux-x64.zip \ electron chromedriver *.so *.pak *.bin *.json locales resources version LICENSE LICENSES.chromium.html .endif post-install: .if ${FLAVOR:U} == desktop - # Desktop flavor: create launcher script that uses electron37 + # Desktop flavor: create launcher script that uses electronXX @(echo "#!/bin/sh"; \ echo ""; \ echo "if ! [ -d /proc/curproc ]; then"; \ @@ -266,7 +267,7 @@ post-install: echo "export ELECTRON_IS_DEV=0"; \ echo "export ELECTRON_FORCE_IS_PACKAGED=true"; \ echo ""; \ - echo "exec ${PREFIX}/bin/electron37 ${PREFIX}/resources/app \"\$$@\"" \ + echo "exec ${PREFIX}/bin/electron${ELECTRON_VERSION} ${PREFIX}/resources/app \"\$$@\"" \ ) > ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE} @${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${EXECUTABLE} -${REINPLACE_CMD} -i '' -e 's|^Exec=.*/rstudio|Exec=${PREFIX}/bin/${EXECUTABLE}|' ${STAGEDIR}${PREFIX}/share/applications/${EXECUTABLE}.desktop 2>/dev/null || true diff --git a/devel/RStudio/distinfo.desktop b/devel/RStudio/distinfo.desktop deleted file mode 100644 index b1946b2c9306..000000000000 --- a/devel/RStudio/distinfo.desktop +++ /dev/null @@ -1,21 +0,0 @@ -TIMESTAMP = 1766267269 -SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 -SIZE (core-dictionaries.zip) = 876339 -SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a -SIZE (gin-2.1.2.zip) = 1341053 -SHA256 (gwt-2.12.2.tar.gz) = 27284accdad05ff8919a7ac6dc5f939a511a90842a35f6393517506d74809e76 -SIZE (gwt-2.12.2.tar.gz) = 96737661 -SHA256 (mathjax-27.zip) = c56cbaa6c4ce03c1fcbaeb2b5ea3c312d2fb7626a360254770cbcb88fb204176 -SIZE (mathjax-27.zip) = 3285230 -SHA256 (591b3520eafbb4da7b26b9f31aac6948801f19d8.tar.gz) = 443f0003c06cc451b47650944b55494825e4378fd3554b50e52e4c204e2de7a2 -SIZE (591b3520eafbb4da7b26b9f31aac6948801f19d8.tar.gz) = 5855683 -SHA256 (RStudio-rstudio-v2025.09.2+418_GH0.tar.gz) = 7e64e65bd3457855e981698dfb61f84e23de0d8bfcb2b1ffc28a38b5b964a769 -SIZE (RStudio-rstudio-v2025.09.2+418_GH0.tar.gz) = 192101135 -SHA256 (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 6355a7632134c8c9487056019a9c458db2c98d10388cf66b018d5461d0a947af -SIZE (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 21977747 -SHA256 (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = b6f6f48dd9930514204739d8957c2737f0b1d110aebf9f89fa31de10598cb29b -SIZE (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = 2087615 -SHA256 (rstudio-rsconnect-03c379b_GH0.tar.gz) = d24b6ee49f32f650f6d10bbfc7b2f61aee258f2fbf45a43c006f9e0a726bcea6 -SIZE (rstudio-rsconnect-03c379b_GH0.tar.gz) = 220711 -SHA256 (trestletech-plumber-v0.4.6_GH0.tar.gz) = 7bcbfdf5a8a2e3a051d2c673ac5ac51a483ed888afe73116cba7741dbb5f63a6 -SIZE (trestletech-plumber-v0.4.6_GH0.tar.gz) = 83332home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c1ceba.3336c.410ca155>