From 879ec52b12c214a2b6e40af5e5d4420f98d4070b Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 24 Jul 2022 18:53:49 -0700 Subject: [PATCH 1/2] New package: umockdev-0.17.13 --- common/shlibs | 1 + srcpkgs/libumockdev | 1 + srcpkgs/libumockdev-devel | 1 + srcpkgs/umockdev-devel | 1 + srcpkgs/umockdev/template | 44 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 48 insertions(+) create mode 120000 srcpkgs/libumockdev create mode 120000 srcpkgs/libumockdev-devel create mode 120000 srcpkgs/umockdev-devel create mode 100644 srcpkgs/umockdev/template diff --git a/common/shlibs b/common/shlibs index c3dd63f542db..ebc269f296b8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -217,6 +217,7 @@ libgirepository-everything-1.0.so libgirepository-1.30_1 libgirepository-1.0.so.1 libgirepository-1.30_1 libudev.so.1 eudev-libudev-1.6_1 libgudev-1.0.so.0 libgudev-230_1 +libumockdev.so.0 libumockdev-0.17.6_1 libext2fs.so.2 e2fsprogs-libs-1.41.5_1 libcom_err.so.2 e2fsprogs-libs-1.41.5_1 libe2p.so.2 e2fsprogs-libs-1.41.5_1 diff --git a/srcpkgs/libumockdev b/srcpkgs/libumockdev new file mode 120000 index 000000000000..6ea0730d6c1c --- /dev/null +++ b/srcpkgs/libumockdev @@ -0,0 +1 @@ +umockdev \ No newline at end of file diff --git a/srcpkgs/libumockdev-devel b/srcpkgs/libumockdev-devel new file mode 120000 index 000000000000..6ea0730d6c1c --- /dev/null +++ b/srcpkgs/libumockdev-devel @@ -0,0 +1 @@ +umockdev \ No newline at end of file diff --git a/srcpkgs/umockdev-devel b/srcpkgs/umockdev-devel new file mode 120000 index 000000000000..6ea0730d6c1c --- /dev/null +++ b/srcpkgs/umockdev-devel @@ -0,0 +1 @@ +umockdev \ No newline at end of file diff --git a/srcpkgs/umockdev/template b/srcpkgs/umockdev/template new file mode 100644 index 000000000000..7dc2f5126958 --- /dev/null +++ b/srcpkgs/umockdev/template @@ -0,0 +1,44 @@ +# Template file for 'umockdev' +pkgname=umockdev +version=0.17.13 +revision=1 +build_style=meson +hostmakedepends="pkg-config vala" +makedepends="vala-devel eudev-libudev-devel libpcap-devel gobject-introspection" +checkdepends="eudev which gphoto2 libgudev-devel python3-gobject usbutils xz" +short_desc="Mock hardware devices for creating unit tests and bug reporting" +maintainer="oreo639 " +license="LGPL-2.1-or-later" +homepage="https://github.com/martinpitt/umockdev" +distfiles="https://github.com/martinpitt/umockdev/releases/download/${version}/umockdev-${version}.tar.xz" +checksum=6c6ebf6e6209b6a49746e0d91a448d027b54271bab82ed70a132ecf294ca13cf + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" gobject-introspection qemu-user-static" +fi + +umockdev-devel_package() { + depends="umockdev>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove /usr/share/gir-1.0/ + vmove /usr/share/vala/vapi/ + } +} + +libumockdev_package() { + short_desc+=" - library" + pkg_install() { + vmove /usr/lib/*.so.* + } +} + +libumockdev-devel_package() { + depends="libumockdev>=${version}_${revision}" + short_desc+=" - library development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove /usr/lib/*.so + } +} From 3fc05d4b2aabbf65799a1c6a7614ad88b3329527 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Sun, 24 Jul 2022 18:54:55 -0700 Subject: [PATCH 2/2] iio-sensor-proxy: update to 3.4. --- .../files/iio-sensor-proxy/run | 2 +- srcpkgs/iio-sensor-proxy/template | 30 ++++++++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run b/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run index 63277320d304..5d3c8e9747ca 100755 --- a/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run +++ b/srcpkgs/iio-sensor-proxy/files/iio-sensor-proxy/run @@ -1,2 +1,2 @@ #!/bin/sh -exec iio-sensor-proxy +exec /usr/libexec/iio-sensor-proxy diff --git a/srcpkgs/iio-sensor-proxy/template b/srcpkgs/iio-sensor-proxy/template index 203fda432c3c..0c2b3d184a60 100644 --- a/srcpkgs/iio-sensor-proxy/template +++ b/srcpkgs/iio-sensor-proxy/template @@ -1,23 +1,33 @@ # Template file for 'iio-sensor-proxy' pkgname=iio-sensor-proxy -version=3.3 +version=3.4 revision=1 build_style=meson -configure_args="-Dsystemdsystemunitdir=false" -hostmakedepends="gtk-doc pkg-config git gnome-common autoconf-archive glib-devel libtool" -makedepends="libgudev-devel gtk+3-devel" -checkdepends="dbus python3-dbus python3-psutil" +configure_args="-Dsystemdsystemunitdir=/usr/lib/systemd/system/ + -Dgeoclue-user=_geoclue2" +hostmakedepends="pkg-config glib-devel libxml2" +makedepends="libgudev-devel polkit-devel" +checkdepends="python3-dbusmock python3-psutil umockdev-devel" short_desc="IIO accelerometer sensor to input device proxy" maintainer="Andrea Brancaleoni " license="GPL-3.0-or-later" homepage="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy" -distfiles="${homepage}/-/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=3f761f3603b3c5b76125f96a48d4001c24f368b6021ba1e06414cac6a5d17c44 +changelog="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/raw/master/NEWS" +distfiles="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=9339af3bc83994a43ab25231a8ffe9ada6d9afbc16edc44d575dd9f2a69ede3c -do_check() { - dbus-run-session ninja -C build test +if [ "$XBPS_CHECK_PKGS" ]; then +configure_args+=" -Dtests=true" +fi + +post_patch() { + # Tests expect a fr_FR.UTF-8 locale + vsed -i -e "/env\['LC_NUMERIC'\]/d" tests/integration-test.py + vsed -i -e 's/scale: 0,000010,0,000010,0,000010/scale: 0.000010,0.000010,0.000010/g' \ + -e 's/scale 0,000001,0,000001,0,000001/scale 0.000001,0.000001,0.000001/g' \ + tests/integration-test.py } + post_install() { vsv iio-sensor-proxy - mv $DESTDIR/usr/libexec/* $DESTDIR/usr/bin }