Attachment #234313 for bug #264333

View | Details | Raw Unified | Return to bug 264333
Collapse All | Expand All

Lines 1-8 Link Here

(-)b/sysutils/upower/Makefile (-2 / +2 lines)
1	# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>	1	# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
2		2
3	PORTNAME= upower	3	PORTNAME= upower
4	PORTVERSION= 0.99.17	4	PORTVERSION= 0.99.18
5	PORTREVISION= 1
6	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= https://gitlab.freedesktop.org/upower/upower/-/archive/${DISTVERSIONFULL}/	7	MASTER_SITES= https://gitlab.freedesktop.org/upower/upower/-/archive/${DISTVERSIONFULL}/
Lines 23-28 MESON_ARGS= -Dgtk-doc=false \ Link Here
23	-Dos_backend=freebsd \	22	-Dos_backend=freebsd \
24	-Dlocalstatedir=/var \	23	-Dlocalstatedir=/var \
25	-Dudevrulesdir=no \	24	-Dudevrulesdir=no \
		25	-Dudevhwdbdir=no \
26	-Dsystemdsystemunitdir=no \	26	-Dsystemdsystemunitdir=no \
27	-Didevice=disabled	27	-Didevice=disabled
28	LDFLAGS+= -lkvm	28	LDFLAGS+= -lkvm

Lines 1-3 Link Here

(-)b/sysutils/upower/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1648324308	1	TIMESTAMP = 1653839389
2	SHA256 (upower-v0.99.17.tar.bz2) = de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d	2	SHA256 (upower-v0.99.18.tar.bz2) = 125b005d1198fc2bfdd335335f9caf0c4069140a4e3848acbcd6bccebd972284
3	SIZE (upower-v0.99.17.tar.bz2) = 139108	3	SIZE (upower-v0.99.18.tar.bz2) = 141140




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

Return to bug 264333

Removed Link Here

(-)a/sysutils/upower/files/patch-doc_meson.build (-44 lines)
1	--- doc/meson.build.orig 2022-03-09 17:46:34 UTC
2	+++ doc/meson.build
3	@@ -27,21 +27,23 @@ version_xml = configure_file(
4	input: 'version.xml.in',
5	configuration: cdata)
6
7	-gnome.gtkdoc('UPower',
8	- main_xml: 'upower-docs.xml',
9	- src_dir: meson.source_root() / 'libupower-glib',
10	- dependencies: [ libupower_glib_dep ],
11	- scan_args: ['--rebuild-types', '--rebuild-sections'],
12	- content_files: [
13	- version_xml,
14	- ifaces_refs,
15	- 'man/UPower.xml',
16	- 'man/upowerd.xml',
17	- 'man/upower.xml',
18	- '../COPYING',
19	- ],
20	- ignore_headers: [
21	- 'config.h',
22	- ],
23	- install: get_option('gtk-doc')
24	-)
25	+if get_option('gtk-doc')
26	+ gnome.gtkdoc('UPower',
27	+ main_xml: 'upower-docs.xml',
28	+ src_dir: meson.source_root() / 'libupower-glib',
29	+ dependencies: [ libupower_glib_dep ],
30	+ scan_args: ['--rebuild-types', '--rebuild-sections'],
31	+ content_files: [
32	+ version_xml,
33	+ ifaces_refs,
34	+ 'man/UPower.xml',
35	+ 'man/upowerd.xml',
36	+ 'man/upower.xml',
37	+ '../COPYING',
38	+ ],
39	+ ignore_headers: [
40	+ 'config.h',
41	+ ],
42	+ install: get_option('gtk-doc')
43	+ )
44	+endif

Lines 7-14 include/libupower-glib/up-history-item.h Link Here

(-)b/sysutils/upower/pkg-plist (-3 lines)
7	include/libupower-glib/up-stats-item.h	7	include/libupower-glib/up-stats-item.h
8	include/libupower-glib/up-types.h	8	include/libupower-glib/up-types.h
9	include/libupower-glib/up-version.h	9	include/libupower-glib/up-version.h
10	include/libupower-glib/up-wakeup-item.h
11	include/libupower-glib/up-wakeups.h
12	include/libupower-glib/upower.h	10	include/libupower-glib/upower.h
13	lib/girepository-1.0/UPowerGlib-1.0.typelib	11	lib/girepository-1.0/UPowerGlib-1.0.typelib
14	lib/libupower-glib.so	12	lib/libupower-glib.so
Lines 21-27 libexec/upowerd Link Here
21	%%MANPAGES%%man/man8/upowerd.8.gz	19	%%MANPAGES%%man/man8/upowerd.8.gz
22	share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml	20	share/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
23	share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml	21	share/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
24	share/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml
25	share/dbus-1/interfaces/org.freedesktop.UPower.xml	22	share/dbus-1/interfaces/org.freedesktop.UPower.xml
26	share/dbus-1/system.d/org.freedesktop.UPower.conf	23	share/dbus-1/system.d/org.freedesktop.UPower.conf
27	share/dbus-1/system-services/org.freedesktop.UPower.service	24	share/dbus-1/system-services/org.freedesktop.UPower.service