pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re-add --frozen and --locked

Module Name:	pkgsrc-wip
Committed By:	atomicules <base%atomicules.co.uk@localhost>
Pushed By:	atomicules
Date:		Thu Apr 4 16:04:18 2019 +0100
Changeset:	c7988d4c88b0d08ea75c46b2d825400b5d9b1950

Modified Files:
	spotifyd/Makefile
	spotifyd/distinfo
	spotifyd/patches/patch-Cargo.lock

Log Message:
Re-add --frozen and --locked

I had forgot I'd removed in the previous commit when updating to 0.2.5

- Add instructions to Makefile on how to deal with --frozen --locked
when updating
- Update Cargo.lock patch based on a cargo update

I've also (belatedly) realised that NetBSD is actually a supported Tier
via rustup and so perhaps I should just use that to keep rust up to date
instead of pkgsrc binaries?

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

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

diffstat:
 spotifyd/Makefile                 | 14 ++++++-
 spotifyd/distinfo                 |  2 +-
 spotifyd/patches/patch-Cargo.lock | 80 +++++++++++++++++++++++++++++----------
 3 files changed, 72 insertions(+), 24 deletions(-)

diffs:
diff --git a/spotifyd/Makefile b/spotifyd/Makefile
index db9c7a0ab5..0e5961158b 100644
--- a/spotifyd/Makefile
+++ b/spotifyd/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	spotifyd-0.2.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=Spotifyd/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -325,8 +325,18 @@ post-extract:
 	mv ${WRKDIR}/rust-alsa-${RUST_ALSA_REV} ${WRKDIR}/rust-alsa
 	mv ${WRKDIR}/dns-parser-${DNS_PARSER_REV} ${WRKDIR}/dns-parser
 
+# NOTE: To update this package I think you need to do:
+# 1. remove `--frozen --locked` below
+# 2. `make extract`
+# 3. `make patch`
+# 4. `cd` into working directory
+# 5. `cargo update` to update the lock file
+# 6. `pkgdiff Cargo.lock Cargo.lock.orig > patch-Cargo.lock
+# 7. Replace the file in `patches/` with that one
+# 8. Can then re-add `--frozen --locked` below
+#
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --no-default-features --features pulseaudio_backend --release
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --no-default-features --features pulseaudio_backend --release --frozen --locked
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/spotifyd ${DESTDIR}${PREFIX}/bin
diff --git a/spotifyd/distinfo b/spotifyd/distinfo
index 5513a89326..e66ce7d5b4 100644
--- a/spotifyd/distinfo
+++ b/spotifyd/distinfo
@@ -1100,7 +1100,7 @@ SHA1 (xdg-2.2.0.crate) = b6a79525f0c3b8b8cefcb308a96d89d543d74cb1
 RMD160 (xdg-2.2.0.crate) = e37d2c536ef45b1bfd42c0b2b09273f5b9d9754c
 SHA512 (xdg-2.2.0.crate) = 16342b8396b4a329801a0ce3b9db82c4c767d09339f895d9f000c64b7160df11019b320cda632f99d8d5b9f65c97894b09091ee4e2ccafac0cd671481fa5c61e
 Size (xdg-2.2.0.crate) = 13387 bytes
-SHA1 (patch-Cargo.lock) = 679ac3f552f0cf8ed82cfc38f442cbd91c469051
+SHA1 (patch-Cargo.lock) = d10f2b4f8ee2d16689c704ad894fdbb663f28661
 SHA1 (patch-Cargo.toml) = b98d64138acff003a3ca57ce317c966de0749828
 SHA1 (patch-librespot_Cargo.toml) = b2178694b6da775bd3341523e9213dd3da92e4fa
 SHA1 (patch-librespot_audio_Cargo.toml) = 6e0cd7a64efde293b3c1bbc33d476016276c691f
diff --git a/spotifyd/patches/patch-Cargo.lock b/spotifyd/patches/patch-Cargo.lock
index b0621ba3e9..53f49aebce 100644
--- a/spotifyd/patches/patch-Cargo.lock
+++ b/spotifyd/patches/patch-Cargo.lock
@@ -10,7 +10,22 @@ $NetBSD$
  dependencies = [
   "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
-@@ -368,7 +367,6 @@ dependencies = [
+@@ -124,14 +123,6 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "base64"
+-version = "0.10.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index";
+-dependencies = [
+- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+-]
+-
+-[[package]]
+ name = "bit-set"
+ version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+@@ -368,7 +359,6 @@ dependencies = [
  [[package]]
  name = "dns-parser"
  version = "0.3.2"
@@ -18,7 +33,7 @@ $NetBSD$
  dependencies = [
   "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -793,19 +791,18 @@ dependencies = [
+@@ -793,19 +783,18 @@ dependencies = [
  [[package]]
  name = "librespot"
  version = "0.1.0"
@@ -44,7 +59,7 @@ $NetBSD$
   "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
   "num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
   "protobuf 1.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -826,34 +823,32 @@ dependencies = [
+@@ -826,34 +815,32 @@ dependencies = [
  [[package]]
  name = "librespot-audio"
  version = "0.1.0"
@@ -85,7 +100,7 @@ $NetBSD$
   "num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
   "protobuf 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
   "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -868,7 +863,6 @@ dependencies = [
+@@ -868,7 +855,6 @@ dependencies = [
  [[package]]
  name = "librespot-core"
  version = "0.1.0"
@@ -93,7 +108,7 @@ $NetBSD$
  dependencies = [
   "base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -880,7 +874,7 @@ dependencies = [
+@@ -880,7 +866,7 @@ dependencies = [
   "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
   "hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -102,7 +117,7 @@ $NetBSD$
   "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
   "num-bigint 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
   "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -903,12 +897,11 @@ dependencies = [
+@@ -903,12 +889,11 @@ dependencies = [
  [[package]]
  name = "librespot-metadata"
  version = "0.1.0"
@@ -117,7 +132,7 @@ $NetBSD$
   "linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "protobuf 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
-@@ -916,16 +909,15 @@ dependencies = [
+@@ -916,16 +901,15 @@ dependencies = [
  [[package]]
  name = "librespot-playback"
  version = "0.1.0"
@@ -138,7 +153,7 @@ $NetBSD$
   "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
   "portaudio-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
-@@ -933,7 +925,6 @@ dependencies = [
+@@ -933,7 +917,6 @@ dependencies = [
  [[package]]
  name = "librespot-protocol"
  version = "0.1.0"
@@ -146,7 +161,7 @@ $NetBSD$
  dependencies = [
   "protobuf 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
   "protoc-rust 2.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -977,10 +968,9 @@ source = "registry+https://github.com/ru
+@@ -977,10 +960,9 @@ source = "registry+https://github.com/ru
  [[package]]
  name = "mdns"
  version = "0.2.0"
@@ -158,7 +173,7 @@ $NetBSD$
   "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
   "get_if_addrs 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1606,7 +1596,7 @@ dependencies = [
+@@ -1606,10 +1588,10 @@ dependencies = [
  
  [[package]]
  name = "reqwest"
@@ -166,8 +181,23 @@ $NetBSD$
 +version = "0.9.3"
  source = "registry+https://github.com/rust-lang/crates.io-index";
  dependencies = [
-  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1661,7 +1651,7 @@ dependencies = [
+- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+  "encoding_rs 0.8.14 (registry+https://github.com/rust-lang/crates.io-index)",
+  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+@@ -1625,10 +1607,7 @@ dependencies = [
+  "serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-threadpool 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tokio-timer 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+@@ -1661,7 +1640,7 @@ dependencies = [
   "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
   "random 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -176,7 +206,7 @@ $NetBSD$
   "serde 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
   "serde_derive 1.0.85 (registry+https://github.com/rust-lang/crates.io-index)",
   "serde_json 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1672,7 +1662,7 @@ dependencies = [
+@@ -1672,7 +1651,7 @@ dependencies = [
  [[package]]
  name = "rust-crypto"
  version = "0.2.36"
@@ -185,7 +215,7 @@ $NetBSD$
  dependencies = [
   "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
   "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1682,12 +1672,6 @@ dependencies = [
+@@ -1682,12 +1661,6 @@ dependencies = [
  ]
  
  [[package]]
@@ -198,7 +228,7 @@ $NetBSD$
  name = "rust-ini"
  version = "0.10.3"
  source = "registry+https://github.com/rust-lang/crates.io-index";
-@@ -1942,7 +1926,7 @@ dependencies = [
+@@ -1942,7 +1915,7 @@ dependencies = [
   "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
   "getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
   "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -207,7 +237,7 @@ $NetBSD$
   "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
   "rspotify 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
   "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2357,16 +2341,14 @@ dependencies = [
+@@ -2357,16 +2330,14 @@ dependencies = [
  [[package]]
  name = "tremor"
  version = "0.1.0"
@@ -225,7 +255,7 @@ $NetBSD$
  dependencies = [
   "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
   "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2605,7 +2587,6 @@ source = "registry+https://github.com/ru
+@@ -2605,7 +2576,6 @@ source = "registry+https://github.com/ru
  "checksum MacTypes-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f"
  "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
  "checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
@@ -233,7 +263,15 @@ $NetBSD$
  "checksum alsa 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fd5a75e70d45a943d2a0a818277e71d6ff777e97358529d6b460d3d4c4d0745"
  "checksum alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58"
  "checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
-@@ -2647,7 +2628,6 @@ source = "registry+https://github.com/ru
+@@ -2614,7 +2584,6 @@ source = "registry+https://github.com/ru
+ "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
+ "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+ "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
+-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
+ "checksum base64 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30e93c03064e7590d0466209155251b90c22e37fab1daf2771582598b5827557"
+ "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
+ "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
+@@ -2647,7 +2616,6 @@ source = "registry+https://github.com/ru
  "checksum derive-error-chain 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9ca9ade651388daad7c993f005d0d20c4f6fe78c1cdc93e95f161c6f5ede4a"
  "checksum derive_builder 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c998e6ab02a828dd9735c18f154e14100e674ed08cb4e1938f0e4177543f439"
  "checksum derive_builder_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "735e24ee9e5fa8e16b86da5007856e97d592e11867e45d76e0c0d0a164a0b757"
@@ -241,7 +279,7 @@ $NetBSD$
  "checksum dotenv 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d6f0e2bb24d163428d8031d3ebd2d2bd903ad933205a97d0f18c7c1aade380f3"
  "checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
  "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
-@@ -2696,19 +2676,11 @@ source = "registry+https://github.com/ru
+@@ -2696,19 +2664,11 @@ source = "registry+https://github.com/ru
  "checksum libdbus-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210"
  "checksum libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "bff3ac7d6f23730d3b533c35ed75eef638167634476a499feef16c428d74b57b"
  "checksum libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9bb11b06faf883500c1b625cf4453e6c7737e9df9c7ba01df3f84b22b083e4ac"
@@ -261,7 +299,7 @@ $NetBSD$
  "checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"
  "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
  "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
-@@ -2777,10 +2749,9 @@ source = "registry+https://github.com/ru
+@@ -2777,10 +2737,9 @@ source = "registry+https://github.com/ru
  "checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861"
  "checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a"
  "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
@@ -273,7 +311,7 @@ $NetBSD$
  "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
  "checksum rust-ini 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8a654c5bda722c699be6b0fe4c0d90de218928da5b724c3e467fc48865c37263"
  "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
-@@ -2849,8 +2820,6 @@ source = "registry+https://github.com/ru
+@@ -2849,8 +2808,6 @@ source = "registry+https://github.com/ru
  "checksum tokio-timer 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "21c04a314a1f69f73c0227beba6250e06cdc1e9a62e7eff912bf54a59b6d1b94"
  "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
  "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
Home | Main Index | Thread Index | Old Index