pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

texlab: provide citeproc crates in ${WRKDIR}



Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Tue Apr 6 17:23:20 2021 +0200
Changeset:	aaac165c352547316a434b9024131b9b2225214f

Modified Files:
	texlab/Makefile
	texlab/distinfo
Added Files:
	texlab/patches/patch-Cargo.toml

Log Message:
texlab: provide citeproc crates in ${WRKDIR}

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aaac165c352547316a434b9024131b9b2225214f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 texlab/Makefile                 | 15 +++++++++++++--
 texlab/distinfo                 |  5 +++++
 texlab/patches/patch-Cargo.toml | 21 +++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diffs:
diff --git a/texlab/Makefile b/texlab/Makefile
index 0b53ce8a9d..d58a2bce9d 100644
--- a/texlab/Makefile
+++ b/texlab/Makefile
@@ -12,10 +12,21 @@ LICENSE=	gnu-gpl-v3
 
 .include "cargo-depends.mk"
 
-USE_LANGUAGES=		# none
+# Depends on an unpublished crate. Can't use cargo.mk to fetch it.
+CITEPROC_REV=	68c7a7c16088b5d7751641ab37299ad064cdb221
+DISTFILES=	${DEFAULT_DISTFILES}
+DISTFILES+=	citeproc-rs-${CITEPROC_REV}.tar.gz
+SITES.citeproc-rs-${CITEPROC_REV}.tar.gz+=	-${MASTER_SITE_GITHUB:=cormacrelf/}citeproc-rs/archive/${CITEPROC_REV}.tar.gz
+
+USE_LANGUAGES=		c c++	# Rust, but needs toolchain for linking
+INSTALLATION_DIRS=	bin
+
+post-extract:
+	mv ${WRKDIR}/citeproc-rs* ${WRKDIR}/citeproc-rs
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/target/release/texlab ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/target/release/texlab	\
+	  ${DESTDIR}${PREFIX}/bin
 
 .include "../../lang/rust/cargo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/texlab/distinfo b/texlab/distinfo
index 24178a9b86..a2bc616bd7 100644
--- a/texlab/distinfo
+++ b/texlab/distinfo
@@ -148,6 +148,10 @@ SHA1 (chashmap-2.2.2.crate) = 7a01ae32607fba85438515d9c720ab3189674beb
 RMD160 (chashmap-2.2.2.crate) = 4f5e589c3abe1b34cea373ba0304dfbc39381aee
 SHA512 (chashmap-2.2.2.crate) = e75213102946e63e499baee1316fdc1d9c7194358037ecae79184bf90183e192a148072cb2e4e47251d16bdc74edea28d7f4387fff24fa2ccefbfe16792ae813
 Size (chashmap-2.2.2.crate) = 14824 bytes
+SHA1 (citeproc-rs-68c7a7c16088b5d7751641ab37299ad064cdb221.tar.gz) = 3b8c021abf608c5de8064d0815cda00ebcced92a
+RMD160 (citeproc-rs-68c7a7c16088b5d7751641ab37299ad064cdb221.tar.gz) = c978f8f864454912d8dc7034466ca735f80b49e9
+SHA512 (citeproc-rs-68c7a7c16088b5d7751641ab37299ad064cdb221.tar.gz) = e3a3ab7916f9615b158627109512567270dcf089d4987a132bf3d9d7570b940ad53dfe3fc719adfa165962063ba361f27539bcff6cc26d4487dacc0b783bdaf6
+Size (citeproc-rs-68c7a7c16088b5d7751641ab37299ad064cdb221.tar.gz) = 433860 bytes
 SHA1 (clap-2.33.0.crate) = a46261c137ef5ae70c4e8b2bd2850d16707753ca
 RMD160 (clap-2.33.0.crate) = 348604c8483c354b6577ace03dc4ed9f115397cd
 SHA512 (clap-2.33.0.crate) = f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
@@ -1256,3 +1260,4 @@ SHA1 (xmlparser-0.10.0.crate) = 7654fe89bda2e79f2714a16a58b12f2e698cb49b
 RMD160 (xmlparser-0.10.0.crate) = 3abb1a45b192ac7ba7d9602a4bb940dfb275bd67
 SHA512 (xmlparser-0.10.0.crate) = a8470bef5c34a97ddc58849dfd06e3a737fa856ca8c341d82ba7d81cd7b3772b45f7326394551453c43a3f2470a6435b900a0d0a438694a449e2d1ff10a338da
 Size (xmlparser-0.10.0.crate) = 25005 bytes
+SHA1 (patch-Cargo.toml) = dde0c9b63389e8a5eb62dfa504df2c425cce3fd0
diff --git a/texlab/patches/patch-Cargo.toml b/texlab/patches/patch-Cargo.toml
new file mode 100644
index 0000000000..e76feafb39
--- /dev/null
+++ b/texlab/patches/patch-Cargo.toml
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Provide unpublished crate manually rather than fetch with git.
+
+--- Cargo.toml.orig	2021-01-10 13:55:04.000000000 +0000
++++ Cargo.toml
+@@ -63,10 +63,10 @@ byteorder = "1.3"
+ bytes = { version = "0.5", optional = true }
+ chashmap = "2.2"
+ cfg-if = "0.1"
+-citeproc = { git = "https://github.com/cormacrelf/citeproc-rs";, rev = "68c7a7c16088b5d7751641ab37299ad064cdb221", optional = true }
+-citeproc-db = { git = "https://github.com/cormacrelf/citeproc-rs";, rev = "68c7a7c16088b5d7751641ab37299ad064cdb221", optional = true }
+-citeproc-io = { git = "https://github.com/cormacrelf/citeproc-rs";, rev = "68c7a7c16088b5d7751641ab37299ad064cdb221", optional = true }
+-csl = { git = "https://github.com/cormacrelf/citeproc-rs";, rev = "68c7a7c16088b5d7751641ab37299ad064cdb221", optional = true }
++citeproc = { path = "../citeproc-rs/crates/citeproc", optional = true }
++citeproc-db = { path = "../citeproc-rs/crates/db", optional = true }
++citeproc-io = { path = "../citeproc-rs/crates/io", optional = true }
++csl = { path = "../citeproc-rs/crates/csl", optional = true }
+ fern = "0.6"
+ fnv = { version = "1.0", optional = true }
+ futures = "0.3"


Home | Main Index | Thread Index | Old Index