commit: 3269008fd531f61c35c0bffbb6656381673a7855 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Mar 19 23:31:16 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Mar 19 23:49:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3269008f
dev-util/umockdev: add 0.19.1 Bug: https://bugs.gentoo.org/935573 Closes: https://bugs.gentoo.org/847850 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/umockdev/Manifest | 1 + .../files/umockdev-0.19.1-tests-ioctl.patch | 28 ++++++++++++++++++++++ ...umockdev-9999.ebuild => umockdev-0.19.1.ebuild} | 8 +++++-- dev-util/umockdev/umockdev-9999.ebuild | 4 ++-- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest index c67ae4ebf176..3a041b9a2eca 100644 --- a/dev-util/umockdev/Manifest +++ b/dev-util/umockdev/Manifest @@ -1 +1,2 @@ DIST umockdev-0.18.3.tar.xz 493724 BLAKE2B 989391474b7204a228a323244b75dc81992c69cd79a499ea701344311a890383eb6d589769df2006727c371757e4bf807831b9ccabde0fcbfd1b99054042fdc6 SHA512 565fedc4367b7896ac4fd9cee19d704d1f3f8b382c31069ceef81d0a0e8f3a38b775f28bd7a3652a7bb9c5cb62dd1f616ea81d7fc2ee7fda933bad44b32627d2 +DIST umockdev-0.19.1.tar.xz 496652 BLAKE2B 92f9c6f069dc1e0c5f389c0a6ac914a92b83a2ab4a255385e5dab30cf223580f4f96551b95021b1a42bdb7911732e81088ee1d6c7afcccc3d845e0ff687ed1ed SHA512 3e7c892d0999b6a61f802445851d83bff7c5a2ddc9d0b673bebe2a130b3782d7788082f21bf3c4064e3bbf867c43cde9a583bdd54e2eea467ee430c8b5d4db1c diff --git a/dev-util/umockdev/files/umockdev-0.19.1-tests-ioctl.patch b/dev-util/umockdev/files/umockdev-0.19.1-tests-ioctl.patch new file mode 100644 index 000000000000..d374af96c5bb --- /dev/null +++ b/dev-util/umockdev/files/umockdev-0.19.1-tests-ioctl.patch @@ -0,0 +1,28 @@ +https://github.com/martinpitt/umockdev/commit/9e68706bfbc4185c7b65550fdc94dd14a6e5ffd6 + +From 9e68706bfbc4185c7b65550fdc94dd14a6e5ffd6 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <[email protected]> +Date: Sun, 5 Jan 2025 14:58:52 +0100 +Subject: [PATCH] tests: Fix ioctl data type + +The `0xdeadbeef` constant in Vala is implicitly an int64. On 32 bit +big-endian architectures like powerpc this argument vanishes during its +interpretation through varargs and long (i.e. gets shifted to the second +argument, which we never look at). Explicitly make it an int. +--- a/tests/test-umockdev-vala.vala ++++ b/tests/test-umockdev-vala.vala +@@ -1140,10 +1140,11 @@ E: SUBSYSTEM=test + int fd = Posix.open ("/dev/test", Posix.O_RDWR, 0); + assert_cmpint (fd, CompareOperator.GE, 0); + +- assert_cmpint (Posix.ioctl (fd, 1, 0xdeadbeef), CompareOperator.EQ, (int) 0xdeadbeef); ++ int value = (int) 0xdeadbeef; ++ assert_cmpint (Posix.ioctl (fd, 1, value), CompareOperator.EQ, value); + assert_cmpint (Posix.errno, CompareOperator.EQ, 0); + +- assert_cmpint (Posix.ioctl (fd, 2, 0xdeadbeef), CompareOperator.EQ, -1); ++ assert_cmpint (Posix.ioctl (fd, 2, value), CompareOperator.EQ, -1); + assert_cmpint (Posix.errno, CompareOperator.EQ, Posix.ENOMEM); + + assert_cmpint (Posix.ioctl (fd, 3, &ioctl_target), CompareOperator.EQ, 0); + diff --git a/dev-util/umockdev/umockdev-9999.ebuild b/dev-util/umockdev/umockdev-0.19.1.ebuild similarity index 91% copy from dev-util/umockdev/umockdev-9999.ebuild copy to dev-util/umockdev/umockdev-0.19.1.ebuild index 7c01707f81b2..21684c8d13fd 100644 --- a/dev-util/umockdev/umockdev-9999.ebuild +++ b/dev-util/umockdev/umockdev-0.19.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit flag-o-matic meson-multilib python-any-r1 vala @@ -40,6 +40,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${P}-tests-ioctl.patch +) + pkg_setup() { use test && python-any-r1_pkg_setup } diff --git a/dev-util/umockdev/umockdev-9999.ebuild b/dev-util/umockdev/umockdev-9999.ebuild index 7c01707f81b2..c1fa33c426d3 100644 --- a/dev-util/umockdev/umockdev-9999.ebuild +++ b/dev-util/umockdev/umockdev-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit flag-o-matic meson-multilib python-any-r1 vala
