Adding debian version 1.64.0+dfsg1-1.debian/1.64.0+dfsg1-1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 93 insertions, 0 deletions

diff --git a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch
new file mode 100644
index 000000000..db66e2c34
--- /dev/null
+++ b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch
@@ -0,0 +1,93 @@
+From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+Date: Sat, 2 Oct 2021 01:08:00 +0100
+Subject: d-0001-pkg-config-no-special-snowflake
+
+---
+ vendor/pkg-config/src/lib.rs    | 25 ++++++++++---------------
+ vendor/pkg-config/tests/test.rs |  2 --
+ 2 files changed, 10 insertions(+), 17 deletions(-)
+
+diff --git a/vendor/pkg-config/src/lib.rs b/vendor/pkg-config/src/lib.rs
+index a28304e..11f9460 100644
+--- a/vendor/pkg-config/src/lib.rs
++++ b/vendor/pkg-config/src/lib.rs
+@@ -111,11 +111,8 @@ pub enum Error {
+     /// Contains the name of the responsible environment variable.
+     EnvNoPkgConfig(String),
+ 
+-    /// Detected cross compilation without a custom sysroot.
+-    ///
+-    /// Ignore the error with `PKG_CONFIG_ALLOW_CROSS=1`,
+-    /// which may let `pkg-config` select libraries
+-    /// for the host's architecture instead of the target's.
++    /// Cross compilation detected. Kept for compatibility;
++    /// the Debian package never emits this.
+     CrossCompilation,
+ 
+     /// Failed to run `pkg-config`.
+@@ -155,14 +152,6 @@ impl fmt::Display for Error {
+     fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+         match *self {
+             Error::EnvNoPkgConfig(ref name) => write!(f, "Aborted because {} is set", name),
+-            Error::CrossCompilation => f.write_str(
+-                "pkg-config has not been configured to support cross-compilation.\n\
+-                \n\
+-                Install a sysroot for the target platform and configure it via\n\
+-                PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_PATH, or install a\n\
+-                cross-compiling wrapper for pkg-config and set it via\n\
+-                PKG_CONFIG environment variable.",
+-            ),
+             Error::Command {
+                 ref command,
+                 ref cause,
+@@ -219,7 +208,7 @@ impl fmt::Display for Error {
+                 )?;
+                 format_output(output, f)
+             }
+-            Error::__Nonexhaustive => panic!(),
++            Error::CrossCompilation | Error::__Nonexhaustive => panic!(),
+         }
+     }
+ }
+@@ -411,6 +400,8 @@ impl Config {
+         if host == target {
+             return true;
+         }
++        // always enable PKG_CONFIG_ALLOW_CROSS override in Debian
++        return true;
+ 
+         // pkg-config may not be aware of cross-compilation, and require
+         // a wrapper script that sets up platform-specific prefixes.
+@@ -470,7 +461,11 @@ impl Config {
+     fn command(&self, name: &str, args: &[&str]) -> Command {
+         let exe = self
+             .targetted_env_var("PKG_CONFIG")
+-            .unwrap_or_else(|| OsString::from("pkg-config"));
++            .unwrap_or_else(|| {
++                self.env_var_os("DEB_HOST_GNU_TYPE")
++                    .map(|mut t| { t.push(OsString::from("-pkg-config")); t })
++                    .unwrap_or_else(|| OsString::from("pkg-config"))
++            });
+         let mut cmd = Command::new(exe);
+         if self.is_static(name) {
+             cmd.arg("--static");
+diff --git a/vendor/pkg-config/tests/test.rs b/vendor/pkg-config/tests/test.rs
+index 4e04ac0..f884e46 100644
+--- a/vendor/pkg-config/tests/test.rs
++++ b/vendor/pkg-config/tests/test.rs
+@@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> {
+     pkg_config::probe_library(name)
+ }
+ 
+-#[test]
+ fn cross_disabled() {
+     let _g = LOCK.lock();
+     reset();
+@@ -46,7 +45,6 @@ fn cross_disabled() {
+     }
+ }
+ 
+-#[test]
+ fn cross_enabled() {
+     let _g = LOCK.lock();
+     reset();