mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-24 09:25:01 +00:00
Code Issues Releases Activity

sysutils/upower: Replace my patch with upstream fix

Browse Source 
PR:		262885
Obtained from:	https://cgit.freedesktop.org/upower/commit/?id=1003d5c2a69e6c28dcf68adf10181b5180b5defa
This commit is contained in:
Guido Falsi 2022-03-28 21:42:17 +02:00
parent c082a3e1e1
commit 2be3335123
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sysutils/upower/files/patch-doc_meson.build Normal file
View File

@ -0,0 +1,44 @@
--- doc/meson.build.orig 2022-03-09 17:46:34 UTC
+++ 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: get_option('gtk-doc')
+ )
+endif

15
sysutils/upower/files/patch-meson.build
View File

@ -1,19 +1,6 @@
--- meson.build.orig 2022-03-09 17:46:34 UTC
+++ meson.build
@@ -47,7 +47,11 @@ m_dep = cc.find_library('m', required: true)
gio_unix_dep = dependency('gio-unix-2.0', version: '>=' + glib_min_version)
m_dep = cc.find_library('m', required: true)
-xsltproc = find_program('xsltproc', disabler: true, required: get_option('gtk-doc') or get_option('man'))
+if get_option('gtk-doc') or get_option('man')
+ xsltproc = find_program('xsltproc', disabler: true, required: get_option('gtk-doc') or get_option('man'))
+else
+ xsltproc = disabler()
+endif
# Resolve OS backend
os_backend = get_option('os_backend')
@@ -105,7 +109,7 @@ subdir('etc')
@@ -105,7 +105,7 @@ subdir('etc')
config_h = configure_file(output: 'config.h', configuration: cdata)
subdir('etc')