Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] iio-sensor-proxy: update to 3.4.
@ 2022-07-25  1:56 oreo639
  2022-07-25  1:57 ` classabbyamp
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: oreo639 @ 2022-07-25  1:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1317 bytes --]

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages isp
https://github.com/void-linux/void-packages/pull/38259

iio-sensor-proxy: update to 3.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Depends: https://github.com/void-linux/void-packages/pull/38258

cc: @thypon 

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38259.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-isp-38259.patch --]
[-- Type: text/x-diff, Size: 5965 bytes --]

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 <oreo6391@gmail.com>"
+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 b977885566afb80b59e1ae647b183e748f7f9989 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..53cc200e0d7f 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/"
+hostmakedepends="pkg-config glib-devel"
+makedepends="libgudev-devel polkit-devel"
+checkdepends="python3-dbusmock python3-psutil umockdev-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 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/-/blob/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=9339af3bc83994a43ab25231a8ffe9ada6d9afbc16edc44d575dd9f2a69ede3c
+make_check_pre=""
 
-do_check() {
-	dbus-run-session ninja -C build test
+if [ "$XBPS_CHECK_PKGS" ]; then
+configure_args+=" -Dtests=true"
+fi
+
+post_patch() {
+	# Expects 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
 }

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: iio-sensor-proxy: update to 3.4.
  2022-07-25  1:56 [PR PATCH] iio-sensor-proxy: update to 3.4 oreo639
@ 2022-07-25  1:57 ` classabbyamp
  2022-07-25  1:58 ` oreo639
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-07-25  1:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 245 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/38259#issuecomment-1193471011

Comment:
> Depends: https://github.com/void-linux/void-packages/pull/38258

they should be in the same PR

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: iio-sensor-proxy: update to 3.4.
  2022-07-25  1:56 [PR PATCH] iio-sensor-proxy: update to 3.4 oreo639
  2022-07-25  1:57 ` classabbyamp
@ 2022-07-25  1:58 ` oreo639
  2022-07-25  2:13 ` [PR PATCH] [Updated] " oreo639
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2022-07-25  1:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/38259#issuecomment-1193471360

Comment:
> they should be in the same PR

I have another package that also depends on it. (unless it doesn't matter)

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] iio-sensor-proxy: update to 3.4.
  2022-07-25  1:56 [PR PATCH] iio-sensor-proxy: update to 3.4 oreo639
  2022-07-25  1:57 ` classabbyamp
  2022-07-25  1:58 ` oreo639
@ 2022-07-25  2:13 ` oreo639
  2022-07-25  3:58 ` oreo639
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2022-07-25  2:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1326 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages isp
https://github.com/void-linux/void-packages/pull/38259

iio-sensor-proxy: update to 3.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Depends: https://github.com/void-linux/void-packages/pull/38258

cc: @thypon 

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38259.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-isp-38259.patch --]
[-- Type: text/x-diff, Size: 5948 bytes --]

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 <oreo6391@gmail.com>"
+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 f1425be5a5ab82651d23533281ec048dc642fdcb 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             | 29 ++++++++++++-------
 2 files changed, 20 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..21762291d4be 100644
--- a/srcpkgs/iio-sensor-proxy/template
+++ b/srcpkgs/iio-sensor-proxy/template
@@ -1,23 +1,32 @@
 # 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/"
+hostmakedepends="pkg-config glib-devel"
+makedepends="libgudev-devel polkit-devel"
+checkdepends="python3-dbusmock python3-psutil umockdev-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 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/-/blob/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() {
+	# Expects 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
 }

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] iio-sensor-proxy: update to 3.4.
  2022-07-25  1:56 [PR PATCH] iio-sensor-proxy: update to 3.4 oreo639
                   ` (2 preceding siblings ...)
  2022-07-25  2:13 ` [PR PATCH] [Updated] " oreo639
@ 2022-07-25  3:58 ` oreo639
  2022-07-25  4:20 ` oreo639
  2022-09-08  0:37 ` [PR PATCH] [Merged]: " classabbyamp
  5 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2022-07-25  3:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1326 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages isp
https://github.com/void-linux/void-packages/pull/38259

iio-sensor-proxy: update to 3.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

Depends: https://github.com/void-linux/void-packages/pull/38258

cc: @thypon 

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38259.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-isp-38259.patch --]
[-- Type: text/x-diff, Size: 5987 bytes --]

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 <oreo6391@gmail.com>"
+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 <abc@pompel.me>"
 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
 }

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Updated] iio-sensor-proxy: update to 3.4.
  2022-07-25  1:56 [PR PATCH] iio-sensor-proxy: update to 3.4 oreo639
                   ` (3 preceding siblings ...)
  2022-07-25  3:58 ` oreo639
@ 2022-07-25  4:20 ` oreo639
  2022-09-08  0:37 ` [PR PATCH] [Merged]: " classabbyamp
  5 siblings, 0 replies; 7+ messages in thread
From: oreo639 @ 2022-07-25  4:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1322 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages isp
https://github.com/void-linux/void-packages/pull/38259

iio-sensor-proxy: update to 3.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Depends: https://github.com/void-linux/void-packages/pull/38258

cc: @thypon 

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/38259.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-isp-38259.patch --]
[-- Type: text/x-diff, Size: 6016 bytes --]

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 <oreo6391@gmail.com>"
+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 ac2052d4e9acb1355862e386ed74e14b757d1377 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..d76a6f58b327 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 gtk+3-devel"
 short_desc="IIO accelerometer sensor to input device proxy"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 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 -Dgtk-tests=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
 }

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PR PATCH] [Merged]: iio-sensor-proxy: update to 3.4.
  2022-07-25  1:56 [PR PATCH] iio-sensor-proxy: update to 3.4 oreo639
                   ` (4 preceding siblings ...)
  2022-07-25  4:20 ` oreo639
@ 2022-09-08  0:37 ` classabbyamp
  5 siblings, 0 replies; 7+ messages in thread
From: classabbyamp @ 2022-09-08  0:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1350 bytes --]

There's a merged pull request on the void-packages repository

iio-sensor-proxy: update to 3.4.
https://github.com/void-linux/void-packages/pull/38259

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

Depends: https://github.com/void-linux/void-packages/pull/38258

I tested it and afaik, screen rotation and the light sensor seem to work.

This also fixes an issue with it placing systemd units in `/usr/false/` and fixes geoclue username.

cc: @thypon 

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-09-08  0:37 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-25  1:56 [PR PATCH] iio-sensor-proxy: update to 3.4 oreo639
2022-07-25  1:57 ` classabbyamp
2022-07-25  1:58 ` oreo639
2022-07-25  2:13 ` [PR PATCH] [Updated] " oreo639
2022-07-25  3:58 ` oreo639
2022-07-25  4:20 ` oreo639
2022-09-08  0:37 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).