[gentoo-commits] repo/gentoo:master commit in: dev-util/umockdev/, dev-util/umockdev/files/

2024-01-07 Thread Sam James
commit: 34cf0a8d2ab1c37cbe725117a8e3edc565b1ef1c
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  7 17:23:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  7 17:23:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34cf0a8d

dev-util/umockdev: drop -Werror=unused-variable (for Vala)

Exposed by a change in Meson to stop inhibiting Vala warnings, e.g.
```
umockdev-record.p/src/umockdev-pcap.c: At top level:
umockdev-record.p/src/umockdev-pcap.c:101:20: error: 
‘umockdev_ioctl_usb_pcap_handler_properties’ defined but not used 
[-Werror=unused-variable]
  101 | static GParamSpec* 
umockdev_ioctl_usb_pcap_handler_properties[UMOCKDEV_IOCTL_USB_PCAP_HANDLER_NUM_PROPERTIES];
  |^~
```

See 
https://github.com/mesonbuild/meson/commit/5f659af870011e74299d1455a65c2cd5f5ace51f.

Closes: https://bugs.gentoo.org/919380
Signed-off-by: Sam James  gentoo.org>

 ...ckdev-0.17.18-vala-unused-variable-werror.patch | 22 ++
 dev-util/umockdev/umockdev-0.17.18.ebuild  |  6 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git 
a/dev-util/umockdev/files/umockdev-0.17.18-vala-unused-variable-werror.patch 
b/dev-util/umockdev/files/umockdev-0.17.18-vala-unused-variable-werror.patch
new file mode 100644
index ..69023f08e5e2
--- /dev/null
+++ b/dev-util/umockdev/files/umockdev-0.17.18-vala-unused-variable-werror.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/919380
+
+Exposed by a change in Meson to stop inhibiting Vala warnings, e.g.
+```
+umockdev-record.p/src/umockdev-pcap.c: At top level:
+umockdev-record.p/src/umockdev-pcap.c:101:20: error: 
‘umockdev_ioctl_usb_pcap_handler_properties’ defined but not used 
[-Werror=unused-variable]
+  101 | static GParamSpec* 
umockdev_ioctl_usb_pcap_handler_properties[UMOCKDEV_IOCTL_USB_PCAP_HANDLER_NUM_PROPERTIES];
+  |^~
+```
+
+See 
https://github.com/mesonbuild/meson/commit/5f659af870011e74299d1455a65c2cd5f5ace51f.
+--- a/meson.build
 b/meson.build
+@@ -21,7 +21,7 @@ add_project_arguments(
+   '-Werror=format-security',
+   '-Werror=format=2',
+   #'-Werror=missing-include-dirs',
+-  '-Werror=unused-variable',
++  #'-Werror=unused-variable',
+   '-Werror=return-type',
+   '-Werror=uninitialized',
+   # experimental: first check this on all Debian architectures

diff --git a/dev-util/umockdev/umockdev-0.17.18.ebuild 
b/dev-util/umockdev/umockdev-0.17.18.ebuild
index d195c94f4c13..b627c3aa9f25 100644
--- a/dev-util/umockdev/umockdev-0.17.18.ebuild
+++ b/dev-util/umockdev/umockdev-0.17.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,6 +40,10 @@ BDEPEND="
virtual/pkgconfig
 "
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.17.18-vala-unused-variable-werror.patch
+)
+
 pkg_setup() {
use test && python-any-r1_pkg_setup
 }



[gentoo-commits] repo/gentoo:master commit in: dev-util/umockdev/, dev-util/umockdev/files/

2022-05-23 Thread Matt Turner
commit: b1ad5fd3e3a9ed71f4fa80c9d38a5954f70f3335
Author: Matt Turner  gentoo  org>
AuthorDate: Mon May 23 19:23:06 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon May 23 19:45:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ad5fd3

dev-util/umockdev: Version bump to 0.17.12

* Add upstream patch to skip test that fails under sandbox (bug #843656)

Closes: https://bugs.gentoo.org/843656
Signed-off-by: Matt Turner  gentoo.org>

 dev-util/umockdev/Manifest |  1 +
 ...umockdev-run-umockdev-record-null-roundtr.patch | 35 +
 dev-util/umockdev/umockdev-0.17.12.ebuild  | 57 ++
 3 files changed, 93 insertions(+)

diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 0a50ce13e851..245b0e55e850 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,4 +1,5 @@
 DIST umockdev-0.17.10.tar.xz 489200 BLAKE2B 
9dcdc2564398ecfb92f6ba7f164b1cced6e0cdb20025025a61d69c654fa1f709c42ec543c313b37961d87d567ce7f287daea82141a7365f7804069e74d55b5ac
 SHA512 
9baad9a6b4ee010ad7b5502da5ba69a23dbdd60164fed7227181607ea12d585936616870962e552a358c4043aea532e6757213c13a7caa9c9fd5979c9b6fef1a
+DIST umockdev-0.17.12.tar.xz 489400 BLAKE2B 
442887e8a62f8320d544039d87d77b9bff78aa5b0d7639320ed5b40973c21d8e2cc7f9492a96cda7edc3fec50af29b017c1d1be4a85cb99a19599780ba790372
 SHA512 
034be0705b0990e68dff9741d40012a53064bf3f1be0f414d478d36ed03ca0b0ca08e482e1902e6d424b87471a482d3f2166d811d0f558391ca0a58e1e9e4336
 DIST umockdev-0.17.6.tar.xz 486668 BLAKE2B 
973c195b8fccd1c080665b65ffd47f8fe110118de9c541d5dda383e51e4dbcc36f77eeda6af5c774f4570a7b839190130fe95559fb3148e9937dae19dace6331
 SHA512 
05a86e2a583972d02fb3cfa26b017d44600831b6ed1415769d7cc7344357f484d34228b1593de2cfbfcce302611c0c22f045ee9fbd7fea76d8ae0b4ccd28d6ef
 DIST umockdev-0.17.7.tar.xz 486964 BLAKE2B 
f3c4021198c8adea47383f3d0c111f921c35550ca9b70c0711e71799ba89a44031356a687b88cc80aa51b1bf4606cfcf48a1d24d16501b0ea08f805e4e30cf83
 SHA512 
6fc611787c9679f450ce7cdf7dccb93a5d7435470b0b5f5cb1803036cf3c8ce73521af9ebec68485834cddfddba0ed9379a0818bfb072bb643cf6419c17d
 DIST umockdev-0.17.8.tar.xz 487220 BLAKE2B 
6a5cb31462ef5836f6a4329fe0e612dd6bb6f00ecc899cb3d1b093771727361bfbc952c7cf7acb7943b78989cacb1faa2d7a2ee62d9c752ed959ac7b1931333c
 SHA512 
e5e6ba2934e1df9323a4e64ee1fc066ab4abeaf75ad0d7f1f6d387b06315f30877f48664e5992f4b138fe1b76d08860359599249d5b9de516777cf8bdb1b228f

diff --git 
a/dev-util/umockdev/files/0.17.12-tests-Skip-umockdev-run-umockdev-record-null-roundtr.patch
 
b/dev-util/umockdev/files/0.17.12-tests-Skip-umockdev-run-umockdev-record-null-roundtr.patch
new file mode 100644
index ..22c8ebc7fb75
--- /dev/null
+++ 
b/dev-util/umockdev/files/0.17.12-tests-Skip-umockdev-run-umockdev-record-null-roundtr.patch
@@ -0,0 +1,35 @@
+From 9396f753179ae68bb275072021db95a994bd7273 Mon Sep 17 00:00:00 2001
+From: Martin Pitt 
+Date: Fri, 20 May 2022 20:19:59 +0200
+Subject: [PATCH] tests: Skip /umockdev-run/umockdev-record-null-roundtrip
+
+Running stat or any other program crashes in Gentoo's sandbox when
+running umockdev-run. Skip this new test for the time being, to avoid a
+package build failure.
+
+Fixes #182
+---
+ tests/test-umockdev-run.vala | 7 +++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/tests/test-umockdev-run.vala b/tests/test-umockdev-run.vala
+index 9407ce9..cc9d03d 100644
+--- a/tests/test-umockdev-run.vala
 b/tests/test-umockdev-run.vala
+@@ -317,6 +317,13 @@ t_run_record_null ()
+ return;
+ }
+ 
++// stat or other programs segfault under Gentoo's sandbox in umockdev
++if (Environ.get_variable(Environ.get(), "SANDBOX_ON") == "1") {
++stdout.printf ("[SKIP: crashes in Gentoo's sandbox] ");
++stdout.flush ();
++return;
++}
++
+ Posix.close (checked_open_tmp ("null.XX.umockdev", out 
umockdev_file));
+ assert (get_program_out ("true", umockdev_record_command + "/dev/null", 
out sout, out serr, out exit));
+ assert_cmpstr (serr, CompareOperator.EQ, "");
+-- 
+2.35.1
+

diff --git a/dev-util/umockdev/umockdev-0.17.12.ebuild 
b/dev-util/umockdev/umockdev-0.17.12.ebuild
new file mode 100644
index ..5aa4330d732c
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.17.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/;
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz;
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   net-libs/libpcap[${MULTILIB_USEDEP}]
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/umockdev/, dev-util/umockdev/files/

2021-09-12 Thread Mike Gilbert
commit: ff21acef711a9a7c6f686d131bf87ebad89593c2
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Sep 12 19:45:36 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Sep 12 19:45:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff21acef

dev-util/umockdev: drop -Werror from project arguments

Closes: https://bugs.gentoo.org/812461
Signed-off-by: Mike Gilbert  gentoo.org>

 .../umockdev/files/umockdev-0.16.1-Werror.patch| 24 ++
 dev-util/umockdev/umockdev-0.16.1-r1.ebuild|  3 +++
 dev-util/umockdev/umockdev-0.16.2.ebuild   |  3 +++
 3 files changed, 30 insertions(+)

diff --git a/dev-util/umockdev/files/umockdev-0.16.1-Werror.patch 
b/dev-util/umockdev/files/umockdev-0.16.1-Werror.patch
new file mode 100644
index 000..4bb2f28f46b
--- /dev/null
+++ b/dev-util/umockdev/files/umockdev-0.16.1-Werror.patch
@@ -0,0 +1,24 @@
+From 623286923d88990cf5f723004539b6d6d8a4a475 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert 
+Date: Sun, 12 Sep 2021 15:41:35 -0400
+Subject: [PATCH] Drop -Werror from project arguments
+
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 37509a9..7931a9c 100644
+--- a/meson.build
 b/meson.build
+@@ -7,7 +7,6 @@ testsdir = meson.current_source_dir() / 'tests'
+ lib_version = '0.3.0'
+ 
+ add_project_arguments(
+-  '-Werror',
+   '-Werror=missing-prototypes',
+   '-Werror=strict-prototypes',
+   '-Werror=nested-externs',
+-- 
+2.33.0
+

diff --git a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild 
b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
index cf5dc5f74cd..3021562deeb 100644
--- a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
+++ b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
@@ -39,6 +39,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+   local PATCHES=(
+   "${FILESDIR}/umockdev-0.16.1-Werror.patch"
+   )
default
vala_src_prepare
 }

diff --git a/dev-util/umockdev/umockdev-0.16.2.ebuild 
b/dev-util/umockdev/umockdev-0.16.2.ebuild
index b91966d64e1..b13e0b4cd36 100644
--- a/dev-util/umockdev/umockdev-0.16.2.ebuild
+++ b/dev-util/umockdev/umockdev-0.16.2.ebuild
@@ -39,6 +39,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+   local PATCHES=(
+   "${FILESDIR}/umockdev-0.16.1-Werror.patch"
+   )
default
vala_src_prepare
 }



[gentoo-commits] repo/gentoo:master commit in: dev-util/umockdev/, dev-util/umockdev/files/

2017-11-05 Thread Tim Harder
commit: b69b1eb73e94e14a939e03854b347d8858b5b5ab
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Nov  4 04:42:33 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Nov  6 07:45:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b69b1eb7

dev-util/umockdev: version bump to 0.9.4

 dev-util/umockdev/Manifest |  1 +
 .../umockdev/files/umockdev-0.9.4-sysmacros.patch  | 20 +
 dev-util/umockdev/umockdev-0.9.4.ebuild| 34 ++
 3 files changed, 55 insertions(+)

diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 7b425a951cc..d625e2fcaf3 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1 +1,2 @@
 DIST umockdev-0.8.11.tar.xz 741812 SHA256 
222518a634c57b1d6d9f51b042e8c80641251260d9c43e6c6273d446d577ccb7 SHA512 
dd6aa23873060c2778796f7300b61aa46e6f9bed8b2b2dc107eb747ade93f9d9027385a414f2107f3da4932065e1f7ec488cc91c6f24c3204a7abbbdf4cb8e84
 WHIRLPOOL 
b736ca9d9f73294e5aabc3be75e006efcfdba8f8ecb96cdeb2fb88a12cc3ba53870c416c82c315acc7da7929d07a9efcdc6ceadaa324e0c63a9a60589d66148c
+DIST umockdev-0.9.4.tar.xz 754856 SHA256 
968cea51804d1de7a1db1c96958326e2f2207a0fdaae18940445e29430e94468 SHA512 
c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
 WHIRLPOOL 
76ffb5c7d0ce53f1a7126247d8d7e9e99f7fafb537b19ef8ae48b794664a713c6ade3565abf20a1bbc10857dc8c4c20d3d75a4543dba7e010b63d4fe2a62f3a5

diff --git a/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch 
b/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch
new file mode 100644
index 000..bfc8bc9ed53
--- /dev/null
+++ b/dev-util/umockdev/files/umockdev-0.9.4-sysmacros.patch
@@ -0,0 +1,20 @@
+--- umockdev-0.9.4/src/umockdev-record.c
 umockdev-0.9.4/src/umockdev-record.c
+@@ -30,6 +30,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+--- umockdev-0.9.4/tests/test-umockdev-vala.c
 umockdev-0.9.4/tests/test-umockdev-vala.c
+@@ -36,6 +36,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free 
(var), NULL)))

diff --git a/dev-util/umockdev/umockdev-0.9.4.ebuild 
b/dev-util/umockdev/umockdev-0.9.4.ebuild
new file mode 100644
index 000..56a4b358cf1
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.9.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-any-r1
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/;
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz;
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="virtual/libgudev:=
+   virtual/libudev:=
+   >=dev-libs/glib-2.32:2"
+DEPEND="${RDEPEND}
+   test? ( ${PYTHON_DEPS} )
+   app-arch/xz-utils
+   virtual/pkgconfig"
+
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-sysmacros.patch #579988
+)
+
+src_configure() {
+   econf $(use_enable static-libs static)
+}