chrono: update to 0.4.22, update patches

diff --git a/src/chrono/debian/RFS b/src/chrono/debian/RFS
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/chrono/debian/changelog b/src/chrono/debian/changelog
index 37dcde26208548f2ccebec46c035ec8ef4584d25..2d5f852dcf74f875c91d9f8921a14c7fdd3f2fcf 100644 (file)
--- a/src/chrono/debian/changelog
+++ b/src/chrono/debian/changelog
@@ -1,5 +1,12 @@
-rust-chrono (0.4.21-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-chrono (0.4.22-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
+  * Team upload.
+  * Package chrono 0.4.22 from crates.io using debcargo 2.5.0
+  * Drop strip-wasm.patch, js-sys and wasm-bindgen are packaged, but keep
+    wasm-bindgen-test off
+  * Patch out Windows dep
+
+  [ Peter Michael Green ]
   * Team upload.
   * Package chrono 0.4.21 from crates.io using debcargo 2.5.0
     (Closes: #996913, #1017084)
@@ -8,7 +15,7 @@ rust-chrono (0.4.21-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
   * Drop update-bincode-to-1.0.patch, upstream now depends on bincode 1.3
   * Update remaining patches for new upstream.
 
- -- Peter Michael Green <plugwash@debian.org>  Sat, 13 Aug 2022 13:00:51 +0000
+ -- Blair Noctis <n@sail.ng>  Tue, 01 Nov 2022 03:27:37 +0000
 
 rust-chrono (0.4.19-3) unstable; urgency=medium
 

diff --git a/src/chrono/debian/patches/drop-windows-dep.patch b/src/chrono/debian/patches/drop-windows-dep.patch
new file mode 100644 (file)
index 0000000..cefaea7
--- /dev/null
+++ b/src/chrono/debian/patches/drop-windows-dep.patch
@@ -0,0 +1,28 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -92,7 +92,6 @@
+ alloc = []
+ clock = [
+     "std",
+-    "winapi",
+     "iana-time-zone",
+ ]
+ default = [
+@@ -115,17 +114,6 @@
+ version = "0.2"
+ optional = true
+ 
+-
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.0"
+-features = [
+-    "std",
+-    "minwinbase",
+-    "minwindef",
+-    "timezoneapi",
+-]
+-optional = true
+-
+ [badges.appveyor]
+ repository = "chronotope/chrono"
+ 

diff --git a/src/chrono/debian/patches/remove-benchmarks.patch b/src/chrono/debian/patches/remove-benchmarks.patch
index 946beeb1def9dd1cf312e6f0625fed5b97f0e7b7..543f7ff76b704de4c35523e04db77e0512ade7f2 100644 (file)
--- a/src/chrono/debian/patches/remove-benchmarks.patch
+++ b/src/chrono/debian/patches/remove-benchmarks.patch
@@ -1,10 +1,16 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -25,2 +25,3 @@
+@@ -31,6 +31,7 @@
+ categories = ["date-and-time"]
+ license = "MIT/Apache-2.0"
  repository = "https://github.com/chronotope/chrono"
 +autobenches = false
  
-@@ -34,14 +35,2 @@
+ [package.metadata.docs.rs]
+ features = ["serde"]
+@@ -41,22 +42,6 @@
+ [lib]
+ name = "chrono"
  
 -[[bench]]
 -name = "chrono"
@@ -18,13 +24,18 @@
 -    "__internal_bench",
 -    "serde",
 -]
- 
-@@ -70,4 +62,0 @@
+-
 -[dependencies.criterion]
 -version = "0.3"
 -optional = true
--
-@@ -89,3 +78,2 @@
+ 
+ [dependencies.iana-time-zone]
+ version = "0.1.44"
+@@ -107,7 +92,6 @@
+ 
+ [features]
  __doctest = []
 -__internal_bench = ["criterion"]
  alloc = []
+ clock = [
+     "std",

diff --git a/src/chrono/debian/patches/remove-time.patch b/src/chrono/debian/patches/remove-time.patch
index 639ff24203056611f7d9835e74d2869232a7d85e..7cfc9857c926ab6fc96fc42057fbab904827ebc7 100644 (file)
--- a/src/chrono/debian/patches/remove-time.patch
+++ b/src/chrono/debian/patches/remove-time.patch
@@ -4,11 +4,9 @@ Description: Remove dependency on time crate.
  See: https://github.com/chronotope/chrono/commit/5115c6f5f93d112d48b618edfa1b47d004c39d10
 Author: Peter Michael Green <plugwash@debian.org>
 
-Index: chrono/Cargo.toml
-===================================================================
---- chrono.orig/Cargo.toml
-+++ chrono/Cargo.toml
-@@ -64,9 +64,6 @@ version = "1.0.99"
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -69,9 +69,6 @@
  optional = true
  default-features = false
  
@@ -18,14 +16,15 @@ Index: chrono/Cargo.toml
  
  [dev-dependencies.bincode]
  version = "1.3.0"
-@@ -96,10 +93,8 @@ clock = [
+@@ -101,11 +98,9 @@
  default = [
      "clock",
      "std",
 -    "oldtime",
+     "wasmbind",
  ]
  libc = []
 -oldtime = ["time"]
  std = []
- 
- [target."cfg(not(any(target_os = \"emscripten\", target_os = \"wasi\", target_os = \"solaris\")))".dependencies.iana-time-zone]
+ wasmbind = [
+     "wasm-bindgen",

diff --git a/src/chrono/debian/patches/remove-unstable-locales.patch b/src/chrono/debian/patches/remove-unstable-locales.patch
index 0e745446b9158c0a91c9ac2fc8e3d634a27d4494..88e4572c6f3ddaeb1ed570c5f1570094946ea1df 100644 (file)
--- a/src/chrono/debian/patches/remove-unstable-locales.patch
+++ b/src/chrono/debian/patches/remove-unstable-locales.patch
@@ -1,12 +1,24 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -56,4 +55,0 @@
+@@ -71,10 +71,6 @@
+ version = "0.2"
+ default-features = false
+ 
 -[dependencies.pure-rust-locales]
 -version = "0.5.2"
 -optional = true
 -
-@@ -100,4 +95,0 @@
+ [dependencies.rkyv]
+ version = "0.7"
+ optional = true
+@@ -127,10 +123,6 @@
+ libc = []
+ oldtime = ["time"]
+ std = []
 -unstable-locales = [
 -    "pure-rust-locales",
 -    "alloc",
 -]
+ wasmbind = [
+     "wasm-bindgen",
+     "js-sys",

diff --git a/src/chrono/debian/patches/remove-wasm-bindgen-test.patch b/src/chrono/debian/patches/remove-wasm-bindgen-test.patch
new file mode 100644 (file)
index 0000000..c370f12
--- /dev/null
+++ b/src/chrono/debian/patches/remove-wasm-bindgen-test.patch
@@ -0,0 +1,11 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -136,8 +136,6 @@
+ version = "0.2"
+ optional = true
+ 
+-[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dev-dependencies.wasm-bindgen-test]
+-version = "0.3"
+ 
+ [target."cfg(windows)".dependencies.winapi]
+ version = "0.3.0"

diff --git a/src/chrono/debian/patches/series b/src/chrono/debian/patches/series
index 8f38a15a23f5fb1bf4024ec714bdb2623ad8c957..ad3abf58bd43fe6e4230e867497e3706b9f2f206 100644 (file)
--- a/src/chrono/debian/patches/series
+++ b/src/chrono/debian/patches/series
@@ -1,4 +1,5 @@
 remove-unstable-locales.patch
-strip-wasm.patch
+remove-wasm-bindgen-test.patch
 remove-benchmarks.patch
 remove-time.patch
+drop-windows-dep.patch

diff --git a/src/chrono/debian/patches/strip-wasm.patch b/src/chrono/debian/patches/strip-wasm.patch
deleted file mode 100644 (file)
index add68d0..0000000
--- a/src/chrono/debian/patches/strip-wasm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -96,10 +95,0 @@
--wasmbind = []
--
--[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.js-sys]
--version = "0.3"
--
--[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dependencies.wasm-bindgen]
--version = "0.2"
--
--[target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dev-dependencies.wasm-bindgen-test]
--version = "0.3"