atk-sys - Don't fail the tests if the C value of ATK_STATE_LAST_DEFINED is greater...

diff --git a/src/atk-sys/debian/changelog b/src/atk-sys/debian/changelog
index adee3cda6415ead58a1873346fdc91489ea6ed04..b6ea56daeb39dd95c5cce530109936f2ef526550 100644 (file)
--- a/src/atk-sys/debian/changelog
+++ b/src/atk-sys/debian/changelog
@@ -1,3 +1,12 @@
+rust-atk-sys (0.14.0-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package atk-sys 0.14.0 from crates.io using debcargo 2.5.0
+  * Don't fail the tests if the C value of ATK_STATE_LAST_DEFINED is greater
+    than the rust value.
+
+ -- Peter Michael Green <plugwash@debian.org>  Sun, 03 Apr 2022 22:04:21 +0000
+
 rust-atk-sys (0.14.0-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/atk-sys/debian/copyright b/src/atk-sys/debian/copyright
index b2356a6a672acfaa1fd67de7bfd492e8563c074a..15873b47c06036cc9ac03366a532ab20e3ad4320 100644 (file)
--- a/src/atk-sys/debian/copyright
+++ b/src/atk-sys/debian/copyright
@@ -4,12 +4,12 @@ Upstream-Contact: The Gtk-rs Project Developers
 Source: https://github.com/gtk-rs/sys
 
 Files: *
-Copyright: 2013-2019 The Gtk-rs Project Developers
+Copyright: 2013-2021 The Gtk-rs Project Developers
 License: MIT
 
 Files: debian/*
 Copyright:
- 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
  2018-2019 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: MIT
 

diff --git a/src/atk-sys/debian/copyright.debcargo.hint b/src/atk-sys/debian/copyright.debcargo.hint
index 22ec1780a871961739d3142f7eb66e5d4eeaeb9b..457e123cf6e8e5fbfbdfbf2fa275cef7ee801b0a 100644 (file)
--- a/src/atk-sys/debian/copyright.debcargo.hint
+++ b/src/atk-sys/debian/copyright.debcargo.hint
@@ -14,8 +14,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2021 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: MIT
 
 License: MIT

diff --git a/src/atk-sys/debian/patches/allow-increase-in-c-value-of-atk-state-last-defined.patch b/src/atk-sys/debian/patches/allow-increase-in-c-value-of-atk-state-last-defined.patch
new file mode 100644 (file)
index 0000000..abbb196
--- /dev/null
+++ b/src/atk-sys/debian/patches/allow-increase-in-c-value-of-atk-state-last-defined.patch
@@ -0,0 +1,29 @@
+Description: allow increase in c value of ATK_STATE_LAST_DEFINED
+ The new version of atk increased the value of ATK_STATE_LAST_DEFINED,
+ upstream did not bump the soversion, so clearly they do not consider
+ this a change that is likely to break downstream applictions.
+
+ Futhermore the only rust code I can find that actually uses the
+ constant in question is some code in rust-atk that translates it
+ to an enum I cannot find any rust code that makes use of the 
+ corresponding enum value either.
+
+Author: Peter Michael Green <plugwash@debian.org>
+
+--- rust-atk-sys-0.14.0.orig/tests/abi.rs
++++ rust-atk-sys-0.14.0/tests/abi.rs
+@@ -134,6 +134,14 @@ fn cross_validate_constants_with_c() {
+             continue;
+         }
+ 
++        if *rust_name == "(gint) ATK_STATE_LAST_DEFINED" {
++            // ATK_STATE_LAST_DEFINED may increase in newer versions of the atk library.
++            if c_value.parse::<i32>().unwrap_or(0) > rust_value.parse::<i32>().unwrap_or(i32::MAX) {
++                results.record_passed();
++                continue;
++            }
++        }
++
+         if rust_value != c_value {
+             results.record_failed();
+             eprintln!(

diff --git a/src/atk-sys/debian/patches/series b/src/atk-sys/debian/patches/series
new file mode 100644 (file)
index 0000000..e9189c7
--- /dev/null
+++ b/src/atk-sys/debian/patches/series
@@ -0,0 +1 @@
+allow-increase-in-c-value-of-atk-state-last-defined.patch