once-cell - new upstream release.

diff --git a/src/once-cell/debian/changelog b/src/once-cell/debian/changelog
index d57613111e4d40b113cd4e526ac2ce4d8888cdbc..b91ef1343bbb225401baa1fc954a38715be12e06 100644 (file)
--- a/src/once-cell/debian/changelog
+++ b/src/once-cell/debian/changelog
@@ -1,3 +1,13 @@
+rust-once-cell (1.16.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package once_cell 1.16.0 from crates.io using debcargo 2.5.0 (Closes: #1023813)
+  * Update patches for new upstream.
+  * Remove optional dependency on critical-section, it's not in Debian and it
+    doesn't build with Debian's current rustc.
+
+ -- Peter Michael Green <plugwash@debian.org>  Thu, 10 Nov 2022 15:31:55 +0000
+
 rust-once-cell (1.14.0-2) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/once-cell/debian/patches/disable-atomic-pollyfill.diff b/src/once-cell/debian/patches/disable-atomic-pollyfill.diff
index fe5e90d60e9003d42936c837b3ba08ebd0cc435e..1dc4e37bc96dbbe8213adcdceac53f18a139d6de 100644 (file)
--- a/src/once-cell/debian/patches/disable-atomic-pollyfill.diff
+++ b/src/once-cell/debian/patches/disable-atomic-pollyfill.diff
@@ -1,15 +1,31 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -65,9 +65,9 @@
+Index: once-cell/Cargo.toml
+===================================================================
+--- once-cell.orig/Cargo.toml
++++ once-cell/Cargo.toml
+@@ -66,10 +66,10 @@ required-features = ["std"]
  name = "test_synchronization"
  required-features = ["std"]
  
--[dependencies.atomic-polyfill]
+-[dependencies.atomic_polyfill]
 -version = "1"
 -optional = true
-+#[dependencies.atomic-polyfill]
+-package = "atomic-polyfill"
++#[dependencies.atomic_polyfill]
 +#version = "1"
 +#optional = true
++#package = "atomic-polyfill"
  
- [dependencies.parking_lot_core]
- version = "0.9.3"
+ [dependencies.critical_section]
+ version = "1"
+@@ -97,11 +97,6 @@ version = "1.2.0"
+ 
+ [features]
+ alloc = ["race"]
+-atomic-polyfill = ["critical-section"]
+-critical-section = [
+-    "critical_section",
+-    "atomic_polyfill",
+-]
+ default = ["std"]
+ parking_lot = ["parking_lot_core"]
+ race = []

diff --git a/src/once-cell/debian/patches/disable-critical-section.diff b/src/once-cell/debian/patches/disable-critical-section.diff
new file mode 100644 (file)
index 0000000..3069cc1
--- /dev/null
+++ b/src/once-cell/debian/patches/disable-critical-section.diff
@@ -0,0 +1,33 @@
+Index: once-cell/Cargo.toml
+===================================================================
+--- once-cell.orig/Cargo.toml
++++ once-cell/Cargo.toml
+@@ -71,20 +71,20 @@ required-features = ["std"]
+ #optional = true
+ #package = "atomic-polyfill"
+ 
+-[dependencies.critical_section]
+-version = "1"
+-optional = true
+-package = "critical-section"
++#[dependencies.critical_section]
++#version = "1"
++#optional = true
++#package = "critical-section"
+ 
+ [dependencies.parking_lot_core]
+ version = "0.9.3"
+ optional = true
+ default_features = false
+ 
+-[dev-dependencies.critical_section]
+-version = "1.1.1"
+-features = ["std"]
+-package = "critical-section"
++#[dev-dependencies.critical_section]
++#version = "1.1.1"
++#features = ["std"]
++#package = "critical-section"
+ 
+ [dev-dependencies.crossbeam-utils]
+ version = "0.8.7"

diff --git a/src/once-cell/debian/patches/relax-test.diff b/src/once-cell/debian/patches/relax-test.diff
index 3603cccd89cf7c837830fa03c4f1c44646709b59..ee851730dfc0f6a7305141cc373d85ab76f3e451 100644 (file)
--- a/src/once-cell/debian/patches/relax-test.diff
+++ b/src/once-cell/debian/patches/relax-test.diff
@@ -1,20 +1,12 @@
 --- a/tests/it.rs
 +++ b/tests/it.rs
-@@ -393,7 +393,7 @@
-         );
-     }
+@@ -395,3 +395,3 @@
  
 -    #[test]
 +    /*#[test]
      #[cfg_attr(miri, ignore)] // miri doesn't support processes
-     fn reentrant_init() {
-         let examples_dir = {
-@@ -420,7 +420,7 @@
-                 let _ = self.child.kill();
-             }
+@@ -422,3 +422,3 @@
          }
 -    }
 +    }*/
  
-     #[test]
-     fn lazy_new() {

diff --git a/src/once-cell/debian/patches/series b/src/once-cell/debian/patches/series
index 5dcc940cc947a8722b2c750caf01bda92ef01794..a86fc4be7e55c7d500adaf8ebee8271cf1a05c4e 100644 (file)
--- a/src/once-cell/debian/patches/series
+++ b/src/once-cell/debian/patches/series
@@ -1,2 +1,3 @@
 relax-test.diff
 disable-atomic-pollyfill.diff
+disable-critical-section.diff