[PR PATCH] upower: update to 0.99.17

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] upower: update to 0.99.17
@ 2022-04-03  1:53 oreo639
  2022-04-03  2:10 ` [PR PATCH] [Updated] " oreo639
                   ` (26 more replies)
  0 siblings, 27 replies; 28+ messages in thread
From: oreo639 @ 2022-04-03  1:53 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From 9edbf7be62170a5d7d9f8c996ff3a4e701cebd10 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH] upower: update to 0.99.17

---
 srcpkgs/upower/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..c3c73de42620 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,15 +1,15 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="automake gettext gettext-devel glib-devel gobject-introspection gtk-doc
+ libtool libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
@ 2022-04-03  2:10 ` oreo639
  2022-04-03  2:11 ` oreo639
                   ` (25 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-03  2:10 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From 9edbf7be62170a5d7d9f8c996ff3a4e701cebd10 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH 1/2] upower: update to 0.99.17

---
 srcpkgs/upower/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..c3c73de42620 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,15 +1,15 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="automake gettext gettext-devel glib-devel gobject-introspection gtk-doc
+ libtool libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 9f76e5ad7afa1387a8ab285def989a967b58a400 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 19:10:14 -0700
Subject: [PATCH 2/2] meson: fix traceback when gtkdoc doesn't have an
 exe_wrapper

---
 .../patches/fix-python-traceback-gtkdoc.patch | 45 +++++++++++++++++++
 srcpkgs/meson/template                        |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/meson/patches/fix-python-traceback-gtkdoc.patch

diff --git a/srcpkgs/meson/patches/fix-python-traceback-gtkdoc.patch b/srcpkgs/meson/patches/fix-python-traceback-gtkdoc.patch
new file mode 100644
index 000000000000..2743c3d98a3b
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-python-traceback-gtkdoc.patch
@@ -0,0 +1,45 @@
+From 266e8acb5807b38a550cb5145cea0e19545a21d7 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 18 Jan 2022 07:44:18 -0500
+Subject: [PATCH] fix python traceback when gtkdoc needs an exe_wrapper but
+ doesn't have one
+
+In commit c88bfdbefc2f79ac2dfa9bff5847c350de5f5db8 we added support for
+an exe_wrapper to gtkdoc, which checked twice whether the environment
+says it is needed, and didn't check at all whether one was provided.
+
+The result:
+
+  File "/usr/lib/python3/dist-packages/mesonbuild/modules/gnome.py", line 1354, in gtkdoc
+    t_args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
+AttributeError: 'NoneType' object has no attribute 'get_command'
+
+Instead, check whether we have a valid exe_wrapper (if we don't need
+one, then even when one is defined in the cross file, we get an
+EmptyExternalProgram) and if we do, use it.
+
+If we don't have one, but need one, then we revert back to the behavior
+before commit c88bfdbefc2f79ac2dfa9bff5847c350de5f5db8, which probably
+means "executing the doc target causes the command to error out with
+"Exec format error".
+---
+ mesonbuild/modules/gnome.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 59e84eccd08..2dbfb29e1f8 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -1417,8 +1417,10 @@ def abs_filenames(files: T.Iterable['FileOrString']) -> T.Iterator[str]:
+             t_args.append(f'--{program_name}={path}')
+         if namespace:
+             t_args.append('--namespace=' + namespace)
+-        if state.environment.need_exe_wrapper() and not isinstance(state.environment.get_exe_wrapper(), EmptyExternalProgram):
+-            t_args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
++        # if not need_exe_wrapper, we get an EmptyExternalProgram. If none provided, we get NoneType
++        exe_wrapper = state.environment.get_exe_wrapper()
++        if not isinstance(exe_wrapper, (NoneType, EmptyExternalProgram)):
++            t_args.append('--run=' + ' '.join(exe_wrapper.get_command()))
+         t_args.append(f'--htmlargs={"@@".join(kwargs["html_args"])}')
+         t_args.append(f'--scanargs={"@@".join(kwargs["scan_args"])}')
+         t_args.append(f'--scanobjsargs={"@@".join(kwargs["scanobjs_args"])}')
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index adfa2d52f7ab..ae056d9c2fcc 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
 version=0.61.4
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
  2022-04-03  2:10 ` [PR PATCH] [Updated] " oreo639
@ 2022-04-03  2:11 ` oreo639
  2022-04-03  2:26 ` oreo639
                   ` (24 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-03  2:11 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From 9edbf7be62170a5d7d9f8c996ff3a4e701cebd10 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH 1/2] upower: update to 0.99.17

---
 srcpkgs/upower/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..c3c73de42620 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,15 +1,15 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="automake gettext gettext-devel glib-devel gobject-introspection gtk-doc
+ libtool libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
@@ -17,8 +17,8 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
@@ -27,14 +27,6 @@ replaces="upower0>=0"
 build_options="gir"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From c6f51c2879ce50e0f620f24ca3d3a05928e36e8b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 19:10:14 -0700
Subject: [PATCH 2/2] meson: fix traceback when gtkdoc doesn't have an
 exe_wrapper

---
 .../patches/fix-gtkdoc-exe_wrapper.patch      | 45 +++++++++++++++++++
 srcpkgs/meson/template                        |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch

diff --git a/srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch b/srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch
new file mode 100644
index 000000000000..2743c3d98a3b
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch
@@ -0,0 +1,45 @@
+From 266e8acb5807b38a550cb5145cea0e19545a21d7 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 18 Jan 2022 07:44:18 -0500
+Subject: [PATCH] fix python traceback when gtkdoc needs an exe_wrapper but
+ doesn't have one
+
+In commit c88bfdbefc2f79ac2dfa9bff5847c350de5f5db8 we added support for
+an exe_wrapper to gtkdoc, which checked twice whether the environment
+says it is needed, and didn't check at all whether one was provided.
+
+The result:
+
+  File "/usr/lib/python3/dist-packages/mesonbuild/modules/gnome.py", line 1354, in gtkdoc
+    t_args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
+AttributeError: 'NoneType' object has no attribute 'get_command'
+
+Instead, check whether we have a valid exe_wrapper (if we don't need
+one, then even when one is defined in the cross file, we get an
+EmptyExternalProgram) and if we do, use it.
+
+If we don't have one, but need one, then we revert back to the behavior
+before commit c88bfdbefc2f79ac2dfa9bff5847c350de5f5db8, which probably
+means "executing the doc target causes the command to error out with
+"Exec format error".
+---
+ mesonbuild/modules/gnome.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 59e84eccd08..2dbfb29e1f8 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -1417,8 +1417,10 @@ def abs_filenames(files: T.Iterable['FileOrString']) -> T.Iterator[str]:
+             t_args.append(f'--{program_name}={path}')
+         if namespace:
+             t_args.append('--namespace=' + namespace)
+-        if state.environment.need_exe_wrapper() and not isinstance(state.environment.get_exe_wrapper(), EmptyExternalProgram):
+-            t_args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
++        # if not need_exe_wrapper, we get an EmptyExternalProgram. If none provided, we get NoneType
++        exe_wrapper = state.environment.get_exe_wrapper()
++        if not isinstance(exe_wrapper, (NoneType, EmptyExternalProgram)):
++            t_args.append('--run=' + ' '.join(exe_wrapper.get_command()))
+         t_args.append(f'--htmlargs={"@@".join(kwargs["html_args"])}')
+         t_args.append(f'--scanargs={"@@".join(kwargs["scan_args"])}')
+         t_args.append(f'--scanobjsargs={"@@".join(kwargs["scanobjs_args"])}')
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index adfa2d52f7ab..ae056d9c2fcc 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
 version=0.61.4
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
  2022-04-03  2:10 ` [PR PATCH] [Updated] " oreo639
  2022-04-03  2:11 ` oreo639
@ 2022-04-03  2:26 ` oreo639
  2022-04-03  2:51 ` oreo639
                   ` (23 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-03  2:26 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From 909a6aa1888f21781821a7218fbe4b9190cb4682 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH 1/2] upower: update to 0.99.17

---
 srcpkgs/upower/template | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..f612793345bf 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,15 +1,15 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="automake gettext gettext-devel glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) libtool libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
@@ -17,24 +17,16 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
-
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {
@@ -49,9 +41,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 8ec0468588f7c84474370ef268ba4a4bdc31c0d1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 19:10:14 -0700
Subject: [PATCH 2/2] meson: fix traceback when gtkdoc doesn't have an
 exe_wrapper

---
 .../patches/fix-gtkdoc-exe_wrapper.patch      | 45 +++++++++++++++++++
 srcpkgs/meson/template                        |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch

diff --git a/srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch b/srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch
new file mode 100644
index 000000000000..2743c3d98a3b
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch
@@ -0,0 +1,45 @@
+From 266e8acb5807b38a550cb5145cea0e19545a21d7 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 18 Jan 2022 07:44:18 -0500
+Subject: [PATCH] fix python traceback when gtkdoc needs an exe_wrapper but
+ doesn't have one
+
+In commit c88bfdbefc2f79ac2dfa9bff5847c350de5f5db8 we added support for
+an exe_wrapper to gtkdoc, which checked twice whether the environment
+says it is needed, and didn't check at all whether one was provided.
+
+The result:
+
+  File "/usr/lib/python3/dist-packages/mesonbuild/modules/gnome.py", line 1354, in gtkdoc
+    t_args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
+AttributeError: 'NoneType' object has no attribute 'get_command'
+
+Instead, check whether we have a valid exe_wrapper (if we don't need
+one, then even when one is defined in the cross file, we get an
+EmptyExternalProgram) and if we do, use it.
+
+If we don't have one, but need one, then we revert back to the behavior
+before commit c88bfdbefc2f79ac2dfa9bff5847c350de5f5db8, which probably
+means "executing the doc target causes the command to error out with
+"Exec format error".
+---
+ mesonbuild/modules/gnome.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 59e84eccd08..2dbfb29e1f8 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -1417,8 +1417,10 @@ def abs_filenames(files: T.Iterable['FileOrString']) -> T.Iterator[str]:
+             t_args.append(f'--{program_name}={path}')
+         if namespace:
+             t_args.append('--namespace=' + namespace)
+-        if state.environment.need_exe_wrapper() and not isinstance(state.environment.get_exe_wrapper(), EmptyExternalProgram):
+-            t_args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
++        # if not need_exe_wrapper, we get an EmptyExternalProgram. If none provided, we get NoneType
++        exe_wrapper = state.environment.get_exe_wrapper()
++        if not isinstance(exe_wrapper, (NoneType, EmptyExternalProgram)):
++            t_args.append('--run=' + ' '.join(exe_wrapper.get_command()))
+         t_args.append(f'--htmlargs={"@@".join(kwargs["html_args"])}')
+         t_args.append(f'--scanargs={"@@".join(kwargs["scan_args"])}')
+         t_args.append(f'--scanobjsargs={"@@".join(kwargs["scanobjs_args"])}')
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index adfa2d52f7ab..ae056d9c2fcc 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
 version=0.61.4
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (2 preceding siblings ...)
  2022-04-03  2:26 ` oreo639
@ 2022-04-03  2:51 ` oreo639
  2022-04-03  3:02 ` oreo639
                   ` (22 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-03  2:51 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From ccb8273042694f9a7b232fbae07e313ce6edf99b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH 1/2] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 35 +++++------
 2 files changed, 73 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..2e9ec285c8af 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,15 +1,15 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="automake gettext gettext-devel glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) libtool docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
@@ -17,23 +17,15 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
-build_options_default="gir"
-
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+build_options="gir gtk_doc"
+build_options_default="gir" # gtk_doc build fails on ARM with meson 0.61.4
 
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
@@ -49,9 +41,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 33a22eb132d0ff61cbd4abcea407d488e5b4b791 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 19:10:14 -0700
Subject: [PATCH 2/2] meson: fix traceback when gtkdoc doesn't have an
 exe_wrapper

---
 .../patches/fix-gtkdoc-exe_wrapper.patch      | 45 +++++++++++++++++++
 srcpkgs/meson/template                        |  2 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch

diff --git a/srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch b/srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch
new file mode 100644
index 000000000000..2743c3d98a3b
--- /dev/null
+++ b/srcpkgs/meson/patches/fix-gtkdoc-exe_wrapper.patch
@@ -0,0 +1,45 @@
+From 266e8acb5807b38a550cb5145cea0e19545a21d7 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 18 Jan 2022 07:44:18 -0500
+Subject: [PATCH] fix python traceback when gtkdoc needs an exe_wrapper but
+ doesn't have one
+
+In commit c88bfdbefc2f79ac2dfa9bff5847c350de5f5db8 we added support for
+an exe_wrapper to gtkdoc, which checked twice whether the environment
+says it is needed, and didn't check at all whether one was provided.
+
+The result:
+
+  File "/usr/lib/python3/dist-packages/mesonbuild/modules/gnome.py", line 1354, in gtkdoc
+    t_args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
+AttributeError: 'NoneType' object has no attribute 'get_command'
+
+Instead, check whether we have a valid exe_wrapper (if we don't need
+one, then even when one is defined in the cross file, we get an
+EmptyExternalProgram) and if we do, use it.
+
+If we don't have one, but need one, then we revert back to the behavior
+before commit c88bfdbefc2f79ac2dfa9bff5847c350de5f5db8, which probably
+means "executing the doc target causes the command to error out with
+"Exec format error".
+---
+ mesonbuild/modules/gnome.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 59e84eccd08..2dbfb29e1f8 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -1417,8 +1417,10 @@ def abs_filenames(files: T.Iterable['FileOrString']) -> T.Iterator[str]:
+             t_args.append(f'--{program_name}={path}')
+         if namespace:
+             t_args.append('--namespace=' + namespace)
+-        if state.environment.need_exe_wrapper() and not isinstance(state.environment.get_exe_wrapper(), EmptyExternalProgram):
+-            t_args.append('--run=' + ' '.join(state.environment.get_exe_wrapper().get_command()))
++        # if not need_exe_wrapper, we get an EmptyExternalProgram. If none provided, we get NoneType
++        exe_wrapper = state.environment.get_exe_wrapper()
++        if not isinstance(exe_wrapper, (NoneType, EmptyExternalProgram)):
++            t_args.append('--run=' + ' '.join(exe_wrapper.get_command()))
+         t_args.append(f'--htmlargs={"@@".join(kwargs["html_args"])}')
+         t_args.append(f'--scanargs={"@@".join(kwargs["scan_args"])}')
+         t_args.append(f'--scanobjsargs={"@@".join(kwargs["scanobjs_args"])}')
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index adfa2d52f7ab..ae056d9c2fcc 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
 version=0.61.4
-revision=2
+revision=3
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (3 preceding siblings ...)
  2022-04-03  2:51 ` oreo639
@ 2022-04-03  3:02 ` oreo639
  2022-04-03 15:50 ` paper42
                   ` (21 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-03  3:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From a9181ebe283e047de15f527ac757421c7c15393e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 35 ++++++-----
 2 files changed, 75 insertions(+), 18 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..dd722210ceb8 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,15 +1,15 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="automake gettext gettext-devel glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) libtool docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
@@ -17,23 +17,19 @@ short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
@@ -49,9 +45,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (4 preceding siblings ...)
  2022-04-03  3:02 ` oreo639
@ 2022-04-03 15:50 ` paper42
  2022-04-05  1:48 ` cinerea0
                   ` (20 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-03 15:50 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1086895731

Comment:
@cinerea0 does this look fine?

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (5 preceding siblings ...)
  2022-04-03 15:50 ` paper42
@ 2022-04-05  1:48 ` cinerea0
  2022-04-09  1:52 ` cinerea0
                   ` (19 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: cinerea0 @ 2022-04-05  1:48 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1088187684

Comment:
I'm currently testing this PR's changes and everything is working fine for me.

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (6 preceding siblings ...)
  2022-04-05  1:48 ` cinerea0
@ 2022-04-09  1:52 ` cinerea0
  2022-04-09  1:56 ` [PR PATCH] [Updated] " oreo639
                   ` (18 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: cinerea0 @ 2022-04-09  1:52 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1093577312

Comment:
@oreo639 Actually, could you change the homepage to https://gitlab.freedesktop.org/upower/upower? The homepage in the template right now points to deprecated tarballs.

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (7 preceding siblings ...)
  2022-04-09  1:52 ` cinerea0
@ 2022-04-09  1:56 ` oreo639
  2022-04-09  1:57 ` oreo639
                   ` (17 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09  1:56 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From cec0cb15fc35fee954d39aae6e7712da03876849 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 37 ++++++------
 2 files changed, 76 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..b4034d88bed7 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,39 +1,35 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="automake gettext gettext-devel glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) libtool docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
@@ -49,9 +45,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (8 preceding siblings ...)
  2022-04-09  1:56 ` [PR PATCH] [Updated] " oreo639
@ 2022-04-09  1:57 ` oreo639
  2022-04-09  9:29 ` [PR REVIEW] " paper42
                   ` (16 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09  1:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From e189a2636cb53dcd682ba096648580ae3c1c6da7 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 37 ++++++------
 2 files changed, 76 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..b4034d88bed7 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,39 +1,35 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="automake gettext gettext-devel glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) libtool docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
@@ -49,9 +45,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

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

* Re: [PR REVIEW] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (9 preceding siblings ...)
  2022-04-09  1:57 ` oreo639
@ 2022-04-09  9:29 ` paper42
  2022-04-09  9:29 ` paper42
                   ` (15 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-09  9:29 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#discussion_r846605678

Comment:
```suggestion
homepage="https://gitlab.freedesktop.org/upower/upower"
changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS"
distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
```

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

* Re: [PR REVIEW] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (10 preceding siblings ...)
  2022-04-09  9:29 ` [PR REVIEW] " paper42
@ 2022-04-09  9:29 ` paper42
  2022-04-09 10:19 ` [PR PATCH] [Updated] " oreo639
                   ` (14 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-09  9:29 UTC (permalink / raw)
  To: ml

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#discussion_r846606139

Comment:
```suggestion
hostmakedepends="gettext glib-devel gobject-introspection
 $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which"
```

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (11 preceding siblings ...)
  2022-04-09  9:29 ` paper42
@ 2022-04-09 10:19 ` oreo639
  2022-04-09 10:19 ` oreo639
                   ` (13 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 10:19 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From c6358d96210c2eb2d8d605ebb6a7562234a4bc0a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 36 +++++++-----
 2 files changed, 78 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..99eee0cb42c1 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,38 +1,39 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="gettext glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
 pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
+	sed -i 's/udev_dir/udevdir/g' meson.build
 }
 
 libupower-glib3_package() {
@@ -49,9 +50,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (12 preceding siblings ...)
  2022-04-09 10:19 ` [PR PATCH] [Updated] " oreo639
@ 2022-04-09 10:19 ` oreo639
  2022-04-09 10:27 ` oreo639
                   ` (12 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 10:19 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1093866202

Comment:
> I don't think this is correct:
> 
> ```diff
> @@ -1,9 +1,9 @@
>  /etc/UPower/UPower.conf
>  /usr/bin/upower
>  /usr/lib/girepository-1.0/UPowerGlib-1.0.typelib
> -/usr/lib/udev/rules.d/95-upower-hid.rules
> -/usr/lib/udev/rules.d/95-upower-wup.rules
>  /usr/libexec/upowerd
> +/usr/rules.d/95-upower-hid.rules
> +/usr/rules.d/95-upower-wup.rules
>  /usr/share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
>  /usr/share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
>  /usr/share/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml
> ```

Thanks for letting me know.
eudev has `udevdir`, but upower is looking for `udev_dir`. Not sure how best that should be fixed, but I just added a sed command to replace it for now.

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (13 preceding siblings ...)
  2022-04-09 10:19 ` oreo639
@ 2022-04-09 10:27 ` oreo639
  2022-04-09 10:27 ` oreo639
                   ` (11 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 10:27 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1093866202

Comment:
> I don't think this is correct:
> 
> ```diff
> @@ -1,9 +1,9 @@
>  /etc/UPower/UPower.conf
>  /usr/bin/upower
>  /usr/lib/girepository-1.0/UPowerGlib-1.0.typelib
> -/usr/lib/udev/rules.d/95-upower-hid.rules
> -/usr/lib/udev/rules.d/95-upower-wup.rules
>  /usr/libexec/upowerd
> +/usr/rules.d/95-upower-hid.rules
> +/usr/rules.d/95-upower-wup.rules
>  /usr/share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
>  /usr/share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
>  /usr/share/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml
> ```

Thanks for letting me know.
eudev has `udevdir`, but upower is looking for `udev_dir`. Not sure how best that should be fixed, but I just added a sed command to replace it for now.

Looking at systemd-udev, it has both `udevdir` and `udev_dir`: https://github.com/systemd/systemd/blob/main/src/udev/udev.pc.in

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (14 preceding siblings ...)
  2022-04-09 10:27 ` oreo639
@ 2022-04-09 10:27 ` oreo639
  2022-04-09 11:02 ` [PR PATCH] [Updated] " oreo639
                   ` (10 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 10:27 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1093866202

Comment:
> I don't think this is correct:
> 
> ```diff
> @@ -1,9 +1,9 @@
>  /etc/UPower/UPower.conf
>  /usr/bin/upower
>  /usr/lib/girepository-1.0/UPowerGlib-1.0.typelib
> -/usr/lib/udev/rules.d/95-upower-hid.rules
> -/usr/lib/udev/rules.d/95-upower-wup.rules
>  /usr/libexec/upowerd
> +/usr/rules.d/95-upower-hid.rules
> +/usr/rules.d/95-upower-wup.rules
>  /usr/share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
>  /usr/share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
>  /usr/share/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml
> ```

Thanks for letting me know.
eudev has `udevdir`, but upower is looking for `udev_dir`. Not sure how best that should be fixed, but I just added a sed command to replace it for now.

Looking at systemd-udev, it provides both `udevdir` and `udev_dir`: https://github.com/systemd/systemd/blob/main/src/udev/udev.pc.in

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (15 preceding siblings ...)
  2022-04-09 10:27 ` oreo639
@ 2022-04-09 11:02 ` oreo639
  2022-04-09 12:56 ` oreo639
                   ` (9 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 11:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From 0f3aa160662199f4f82fed4a368e14d8cdebb513 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 38 ++++++------
 2 files changed, 79 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..c4a9b340ae63 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,38 +1,39 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="gettext glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
+post_patch() {
+	vsed -i 's/udev_dir/udevdir/g' meson.build
 }
 
 libupower-glib3_package() {
@@ -49,9 +50,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (16 preceding siblings ...)
  2022-04-09 11:02 ` [PR PATCH] [Updated] " oreo639
@ 2022-04-09 12:56 ` oreo639
  2022-04-09 12:56 ` oreo639
                   ` (8 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 12:56 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1093998978

Comment:
I also tried patching udev_dir into upower and that worked as well, I sent it upstream:
https://github.com/eudev-project/eudev/pull/225

Just so you know for the future.

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (17 preceding siblings ...)
  2022-04-09 12:56 ` oreo639
@ 2022-04-09 12:56 ` oreo639
  2022-04-09 12:57 ` oreo639
                   ` (7 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 12:56 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1093998978

Comment:
I also tried patching udev_dir into upower and that worked as well, I sent the patch upstream:
https://github.com/eudev-project/eudev/pull/225

Just so you know for the future.

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (18 preceding siblings ...)
  2022-04-09 12:56 ` oreo639
@ 2022-04-09 12:57 ` oreo639
  2022-04-09 13:10 ` oreo639
                   ` (6 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 12:57 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1093998978

Comment:
I also tried patching udev_dir into upower and that worked as well, I sent the patch upstream:
https://github.com/eudev-project/eudev/pull/225

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (19 preceding siblings ...)
  2022-04-09 12:57 ` oreo639
@ 2022-04-09 13:10 ` oreo639
  2022-04-09 15:27 ` paper42
                   ` (5 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 13:10 UTC (permalink / raw)
  To: ml

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1093998978

Comment:
I also tried patching udev_dir into eudev and that worked as well, I sent the patch upstream:
https://github.com/eudev-project/eudev/pull/225

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

* Re: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (20 preceding siblings ...)
  2022-04-09 13:10 ` oreo639
@ 2022-04-09 15:27 ` paper42
  2022-04-09 16:03 ` [PR PATCH] [Updated] " oreo639
                   ` (4 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-09 15:27 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/36485#issuecomment-1094067608

Comment:
> I also tried patching udev_dir into eudev and that worked as well, I sent the patch upstream: [eudev-project/eudev#225](https://github.com/eudev-project/eudev/pull/225)

Thanks! I think we could backport that commit to our eudev to make sure other packages don't hit this issue and that we don't forget to remove the vsed when eudev is updated.

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (21 preceding siblings ...)
  2022-04-09 15:27 ` paper42
@ 2022-04-09 16:03 ` oreo639
  2022-04-09 16:08 ` oreo639
                   ` (3 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 16:03 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From 0541f1e28a2d18f560699fbd77b118c6226e354a Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 9 Apr 2022 09:02:28 -0700
Subject: [PATCH 1/2] eudev: add udev_dir pkg-config variable

---
 ...80239647d37e5cfe320c422cce879c2e0d2c.patch | 20 +++++++++++++++++++
 srcpkgs/eudev/template                        |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch

diff --git a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
new file mode 100644
index 000000000000..b36b84f75496
--- /dev/null
+++ b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
@@ -0,0 +1,20 @@
+From 9d9e80239647d37e5cfe320c422cce879c2e0d2c Mon Sep 17 00:00:00 2001
+From: oreo639 <31916379+Oreo639@users.noreply.github.com>
+Date: Sat, 9 Apr 2022 05:39:56 -0700
+Subject: [PATCH] udev: add udev_dir as synonym of udevdir
+
+---
+ src/udev/udev.pc.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in
+index 4a9d867b8..cccebb245 100644
+--- a/src/udev/udev.pc.in
++++ b/src/udev/udev.pc.in
+@@ -3,4 +3,5 @@ Description: eudev
+ Version: @UDEV_VERSION@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-udevdir=@udevlibexecdir@
++udev_dir=@udevlibexecdir@
++udevdir=${udev_dir}
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index df783c562bca..68c50149e028 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -4,7 +4,7 @@ _UDEV_VERSION="243" # compatible udev version provided
 
 pkgname=eudev
 version=3.2.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-hwdb --enable-manpages --disable-introspection"
 hostmakedepends="pkg-config gperf"

From a9e1d5ab8e919a849baa258c6c72f206948b648d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH 2/2] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 38 ++++++------
 2 files changed, 77 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..654c901f129e 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,39 +1,36 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="gettext glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
@@ -49,9 +46,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (22 preceding siblings ...)
  2022-04-09 16:03 ` [PR PATCH] [Updated] " oreo639
@ 2022-04-09 16:08 ` oreo639
  2022-04-09 16:15 ` oreo639
                   ` (2 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 16:08 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From 3093247997af6c82d65d3b11f6e4281c87b86da5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 38 ++++++------
 2 files changed, 79 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..c4a9b340ae63 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,38 +1,39 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="gettext glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
+post_patch() {
+	vsed -i 's/udev_dir/udevdir/g' meson.build
 }
 
 libupower-glib3_package() {
@@ -49,9 +50,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (23 preceding siblings ...)
  2022-04-09 16:08 ` oreo639
@ 2022-04-09 16:15 ` oreo639
  2022-04-09 19:42 ` oreo639
  2022-04-10  8:55 ` [PR PATCH] [Merged]: " paper42
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 16:15 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From 12d89d5a57f90d5884f666a363c19217e07849b0 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 39 +++++++------
 2 files changed, 80 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..a3e85564c6a8 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,38 +1,40 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="gettext glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
+post_patch() {
+	# fixed in next eudev update (current is 3.2.10)
+	vsed -i 's/udev_dir/udevdir/g' meson.build
 }
 
 libupower-glib3_package() {
@@ -49,9 +51,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

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

* Re: [PR PATCH] [Updated] upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (24 preceding siblings ...)
  2022-04-09 16:15 ` oreo639
@ 2022-04-09 19:42 ` oreo639
  2022-04-10  8:55 ` [PR PATCH] [Merged]: " paper42
  26 siblings, 0 replies; 28+ messages in thread
From: oreo639 @ 2022-04-09 19:42 UTC (permalink / raw)
  To: ml

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

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

https://github.com/oreo639/void-packages upower
https://github.com/void-linux/void-packages/pull/36485

upower: update to 0.99.17
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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/36485.patch is attached

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

From 4731d688168295d8fdf515d6abe252e2fe61d4f5 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 38 ++++++------
 2 files changed, 77 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..654c901f129e 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,39 +1,36 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="gettext glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
@@ -49,9 +46,12 @@ upower-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
-		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

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

* Re: [PR PATCH] [Merged]: upower: update to 0.99.17
  2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
                   ` (25 preceding siblings ...)
  2022-04-09 19:42 ` oreo639
@ 2022-04-10  8:55 ` paper42
  26 siblings, 0 replies; 28+ messages in thread
From: paper42 @ 2022-04-10  8:55 UTC (permalink / raw)
  To: ml

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

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

upower: update to 0.99.17
https://github.com/void-linux/void-packages/pull/36485

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

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

<!--
#### 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] 28+ messages in thread

end of thread, other threads:[~2022-04-10  8:55 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-03  1:53 [PR PATCH] upower: update to 0.99.17 oreo639
2022-04-03  2:10 ` [PR PATCH] [Updated] " oreo639
2022-04-03  2:11 ` oreo639
2022-04-03  2:26 ` oreo639
2022-04-03  2:51 ` oreo639
2022-04-03  3:02 ` oreo639
2022-04-03 15:50 ` paper42
2022-04-05  1:48 ` cinerea0
2022-04-09  1:52 ` cinerea0
2022-04-09  1:56 ` [PR PATCH] [Updated] " oreo639
2022-04-09  1:57 ` oreo639
2022-04-09  9:29 ` [PR REVIEW] " paper42
2022-04-09  9:29 ` paper42
2022-04-09 10:19 ` [PR PATCH] [Updated] " oreo639
2022-04-09 10:19 ` oreo639
2022-04-09 10:27 ` oreo639
2022-04-09 10:27 ` oreo639
2022-04-09 11:02 ` [PR PATCH] [Updated] " oreo639
2022-04-09 12:56 ` oreo639
2022-04-09 12:56 ` oreo639
2022-04-09 12:57 ` oreo639
2022-04-09 13:10 ` oreo639
2022-04-09 15:27 ` paper42
2022-04-09 16:03 ` [PR PATCH] [Updated] " oreo639
2022-04-09 16:08 ` oreo639
2022-04-09 16:15 ` oreo639
2022-04-09 19:42 ` oreo639
2022-04-10  8:55 ` [PR PATCH] [Merged]: " paper42

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).