net/routinator: avoid patching the routinator-ui build.rs and instead

extract the Vue.js components in the directory where they are expected
to be.

ok sthen
This commit is contained in:
tb 2022-10-03 20:53:51 +00:00
parent b52cd4fd4d
commit ca50169a16
2 changed files with 5 additions and 17 deletions

View File

@ -13,8 +13,11 @@ ROUTINATOR_UI_VERSION = 0.3.4
MASTER_SITES0 = ${ROUTINATOR_UI_URL}/v${ROUTINATOR_UI_VERSION}/
DISTFILES += routinator-ui-${ROUTINATOR_UI_VERSION}{routinator-ui-build}.tar.gz:0
SUBST_VARS += ROUTINATOR_UI_VERSION
SUBST_VARS += DISTDIR
# The routinator-ui crate expects its Vue.js parts to be in ../dist
EXTRACT_CASES += routinator-ui-*.tar.gz) \
mkdir -p ${MODCARGO_VENDOR_DIR}/dist; \
${GZIP_CMD} -d <${FULLDISTDIR}/$$archive | \
${TAR} -C ${MODCARGO_VENDOR_DIR}/dist -xf - -- ${EXTRACT_FILES};;
CATEGORIES = net
@ -39,9 +42,6 @@ DISTFILES += ${DISTNAME}{${GH_TAGNAME}}${EXTRACT_SUFX}
.include "crates.inc"
post-patch:
${SUBST_CMD} ${WRKSRC}/modcargo-crates/routinator-ui-${ROUTINATOR_UI_VERSION}/build.rs
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/routinator
${INSTALL_DATA} ${WRKSRC}/doc/routinator.1 ${PREFIX}/man/man1/

View File

@ -1,12 +0,0 @@
Index: modcargo-crates/routinator-ui-0.3.4/build.rs
--- modcargo-crates/routinator-ui-0.3.4/build.rs.orig
+++ modcargo-crates/routinator-ui-0.3.4/build.rs
@@ -110,6 +110,8 @@ impl Assets {
}
fn _download_ui_release_build() -> Result<Vec<u8>, reqwest::Error> {
+ let fname = format!("{}/routinator-ui-{}.tar.gz", "${DISTDIR}", "${ROUTINATOR_UI_VERSION}");
+ return Ok(std::fs::read(&fname).expect("could not read routinator ui file"));
let version = env!("CARGO_PKG_VERSION");
let mut headers = header::HeaderMap::new();