View | Details | Raw Unified | Return to bug 240138 | Differences between
and this patch

Collapse All | Expand All

(-)sysutils/libudisks/Makefile (+54 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PORTNAME=	libudisks
4
PORTVERSION=	2.8.4
5
CATEGORIES=	sysutils
6
7
MAINTAINER=	pauamma@gundo.com
8
COMMENT=	Library to manipulate storage devices, from udisks
9
10
LICENSE=	LGPL20+
11
LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING
12
13
# pkaction takes care of libpolkit-agent-1 and libpolkit-gobject-1
14
# which are what we really want (see UDISKSCTL_LIB_DEPENDS).
15
BUILD_DEPENDS=	bash:shells/bash gtkdocize:textproc/gtk-doc \
16
		pkaction:sysutils/polkit
17
18
USES=		autoreconf:build gettext-runtime gettext-tools:build gmake \
19
		gnome libtool:build pkgconfig
20
21
USE_GITHUB=	yes
22
GH_ACCOUNT=	storaged-project
23
GH_PROJECT=	udisks
24
GH_TAGNAME=	udisks-2.8.4
25
26
USE_GNOME=	glib20 introspection
27
28
USE_LDCONFIG=	yes
29
30
OPTIONS_DEFINE=	UDISKSCTL
31
OPTIONS_SUB=	yes
32
UDISKSCTL_DESC=	Install udisksctl command line utility
33
UDISKSCTL_LIB_DEPENDS=	libpolkit-agent-1.so:sysutils/polkit \
34
			libpolkit-gobject-1.so:sysutils/polkit
35
36
# config.status errors out without --disable-dependency-tracking, with or
37
# without USES=gmake.
38
do-configure:
39
	cd ${WRKSRC} && \
40
	./autogen.sh --disable-daemon --disable-gtk-doc --disable-nls \
41
		--disable-dependency-tracking --prefix=${PREFIX} \
42
		--mandir=${MANPREFIX}/man
43
44
post-install:
45
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libudisks2.so.0.0.0
46
47
post-install-UDISKSCTL-on:
48
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/udisksctl
49
50
# Pacify "make stage-qa".
51
post-install-UDISKSCTL-off:
52
	${RM} ${STAGEDIR}${PREFIX}/bin/udisksctl
53
54
.include <bsd.port.mk>
(-)sysutils/libudisks/distinfo (+3 lines)
Line 0 Link Here
1
TIMESTAMP = 1567127492
2
SHA256 (storaged-project-udisks-2.8.4-udisks-2.8.4_GH0.tar.gz) = 46cc88f26d26818b719a0070587f9d3fe13828b063edb1f0dfc8443d86b94d97
3
SIZE (storaged-project-udisks-2.8.4-udisks-2.8.4_GH0.tar.gz) = 1377390
(-)sysutils/libudisks/files/patch-Makefile.am (+24 lines)
Line 0 Link Here
1
--- Makefile.am.orig	2019-07-22 16:24:44 UTC
2
+++ Makefile.am
3
@@ -1,13 +1,19 @@
4
 ## Process this file with automake to produce Makefile.in
5
 
6
-SHELL = /bin/bash
7
+SHELL = @BASH@
8
 .SHELLFLAGS = -o pipefail -c
9
 
10
 PYTHON ?= python3
11
 
12
 NULL =
13
 
14
-SUBDIRS = data udisks src tools modules po doc
15
+SUBDIRS = data udisks
16
+
17
+if ENABLE_DAEMON
18
+SUBDIRS += src
19
+endif
20
+
21
+SUBDIRS += tools modules po doc
22
 
23
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
24
 
(-)sysutils/libudisks/files/patch-configure.ac (+388 lines)
Line 0 Link Here
1
--- configure.ac.orig	2019-07-22 16:24:44 UTC
2
+++ configure.ac
3
@@ -33,6 +33,10 @@ AC_ISC_POSIX
4
 AC_HEADER_STDC
5
 AC_PROG_LIBTOOL
6
 
7
+AC_PATH_PROG([BASH], [bash])
8
+if test -z "$BASH"; then
9
+  AC_MSG_ERROR([bash is required to run Makefile])
10
+fi
11
 
12
 # Compilation
13
 #
14
@@ -113,6 +117,12 @@ AS_IF([test "$enable_man" != no], [
15
 ])
16
 AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
17
 
18
+AC_ARG_ENABLE(daemon,
19
+              [AS_HELP_STRING([--enable-daemon],
20
+                              [build udisks daemon [default=yes]])],,
21
+              enable_daemon=yes)
22
+AM_CONDITIONAL(ENABLE_DAEMON, test "$enable_daemon" != no)
23
+
24
 GOBJECT_INTROSPECTION_CHECK([0.6.2])
25
 
26
 # Behavior
27
@@ -132,10 +142,6 @@ fi
28
 # Libraries
29
 #
30
 
31
-PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 165])
32
-AC_SUBST(GUDEV_CFLAGS)
33
-AC_SUBST(GUDEV_LIBS)
34
-
35
 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.50])
36
 AC_SUBST(GLIB_CFLAGS)
37
 AC_SUBST(GLIB_LIBS)
38
@@ -144,14 +150,6 @@ PKG_CHECK_MODULES(GIO, [gio-unix-2.0 >= 2.50])
39
 AC_SUBST(GIO_CFLAGS)
40
 AC_SUBST(GIO_LIBS)
41
 
42
-PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
43
-AC_SUBST(GMODULE_CFLAGS)
44
-AC_SUBST(GMODULE_LIBS)
45
-
46
-PKG_CHECK_MODULES(BLOCKDEV, [blockdev >= 2.19])
47
-AC_SUBST(BLOCKDEV_CFLAGS)
48
-AC_SUBST(BLOCKDEV_LIBS)
49
-
50
 PKG_CHECK_MODULES(POLKIT_GOBJECT_1, [polkit-gobject-1 >= 0.102])
51
 AC_SUBST(POLKIT_GOBJECT_1_CFLAGS)
52
 AC_SUBST(POLKIT_GOBJECT_1_LIBS)
53
@@ -160,43 +158,61 @@ PKG_CHECK_MODULES(POLKIT_AGENT_1, [polkit-agent-1 >= 0
54
 AC_SUBST(POLKIT_AGENT_1_CFLAGS)
55
 AC_SUBST(POLKIT_AGENT_1_LIBS)
56
 
57
-PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.17])
58
-AC_SUBST(LIBATASMART_CFLAGS)
59
-AC_SUBST(LIBATASMART_LIBS)
60
+if test "x$enable_daemon" = "xyes"; then
61
+  PKG_CHECK_MODULES(GUDEV, [gudev-1.0 >= 165])
62
+  AC_SUBST(GUDEV_CFLAGS)
63
+  AC_SUBST(GUDEV_LIBS)
64
 
65
-PKG_CHECK_MODULES(LIBMOUNT, [mount >= 2.30],
66
-                  [have_libmount=yes],
67
-                  [have_libmount=no])
68
-AM_CONDITIONAL(HAVE_LIBMOUNT, test x$have_libmount = xyes)
69
-if test "x$have_libmount" = "xyes"; then
70
-  AC_DEFINE([HAVE_LIBMOUNT], 1, [Define to 1 if libmount >= 2.30 is available])
71
-fi
72
-AC_SUBST(HAVE_LIBMOUNT)
73
-AC_SUBST(LIBMOUNT_CFLAGS)
74
-AC_SUBST(LIBMOUNT_LIBS)
75
+  PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
76
+  AC_SUBST(GMODULE_CFLAGS)
77
+  AC_SUBST(GMODULE_LIBS)
78
 
79
-PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd >= 209], [have_libsystemd_login=yes],
80
-                  [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44 libsystemd-daemon],
81
-                  [have_libsystemd_login=yes],
82
-                  [have_libsystemd_login=no])])
83
-AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes)
84
-if test "x$have_libsystemd_login" = "xyes"; then
85
-  AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
86
-fi
87
-AC_SUBST(HAVE_LIBSYSTEMD_LOGIN)
88
-AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS)
89
-AC_SUBST(LIBSYSTEMD_LOGIN_LIBS)
90
+  PKG_CHECK_MODULES(BLOCKDEV, [blockdev >= 2.19])
91
+  AC_SUBST(BLOCKDEV_CFLAGS)
92
+  AC_SUBST(BLOCKDEV_LIBS)
93
 
94
-PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219],
95
-                  [have_libelogind=yes],
96
-                  [have_libelogins=no])
97
-AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes)
98
-if test "x$have_libelogind" = "xyes"; then
99
-  AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available])
100
+  PKG_CHECK_MODULES(LIBATASMART, [libatasmart >= 0.17])
101
+  AC_SUBST(LIBATASMART_CFLAGS)
102
+  AC_SUBST(LIBATASMART_LIBS)
103
+
104
+  PKG_CHECK_MODULES(LIBMOUNT, [mount >= 2.30],
105
+                    [have_libmount=yes],
106
+                    [have_libmount=no])
107
+  if test "x$have_libmount" = "xyes"; then
108
+    AC_DEFINE([HAVE_LIBMOUNT], 1, [Define to 1 if libmount >= 2.30 is available])
109
+  fi
110
+  AC_SUBST(HAVE_LIBMOUNT)
111
+  AC_SUBST(LIBMOUNT_CFLAGS)
112
+  AC_SUBST(LIBMOUNT_LIBS)
113
+
114
+  PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd >= 209], [have_libsystemd_login=yes],
115
+                    [PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44 libsystemd-daemon],
116
+                    [have_libsystemd_login=yes],
117
+                    [have_libsystemd_login=no])])
118
+  if test "x$have_libsystemd_login" = "xyes"; then
119
+    AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
120
+  fi
121
+  AC_SUBST(HAVE_LIBSYSTEMD_LOGIN)
122
+  AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS)
123
+  AC_SUBST(LIBSYSTEMD_LOGIN_LIBS)
124
+
125
+  PKG_CHECK_MODULES(LIBELOGIND, [libelogind >= 219],
126
+                    [have_libelogind=yes],
127
+                    [have_libelogind=no])
128
+  if test "x$have_libelogind" = "xyes"; then
129
+    AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available])
130
+  fi
131
+  AC_SUBST(HAVE_LIBELOGIND)
132
+  AC_SUBST(LIBELOGIND_CFLAGS)
133
+  AC_SUBST(LIBELOGIND_LIBS)
134
+else
135
+  have_libmount=no
136
+  have_libsystemd_login=no
137
+  have_libelogind=no
138
 fi
139
-AC_SUBST(HAVE_LIBELOGIND)
140
-AC_SUBST(LIBELOGIND_CFLAGS)
141
-AC_SUBST(LIBELOGIND_LIBS)
142
+AM_CONDITIONAL(HAVE_LIBMOUNT, test x$have_libmount = xyes)
143
+AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes)
144
+AM_CONDITIONAL(HAVE_LIBELOGIND, test x$have_libelogind = xyes)
145
 
146
 # udevdir
147
 AC_ARG_WITH([udevdir],
148
@@ -537,124 +553,126 @@ if test "x$enable_vdo" = "xyes" \
149
 fi
150
 AM_CONDITIONAL(HAVE_VDO, [test "x$have_vdo" = "xyes"])
151
 
152
-# libblockdev part
153
-SAVE_CFLAGS=$CFLAGS
154
-SAVE_LDFLAGS=$LDFLAGS
155
+if test "x$enable_daemon" = "xyes"; then
156
+  # libblockdev part
157
+  SAVE_CFLAGS=$CFLAGS
158
+  SAVE_LDFLAGS=$LDFLAGS
159
 
160
-CFLAGS="$GLIB_CFLAGS"
161
-LDFLAGS="$GLIB_LIBS"
162
-AC_MSG_CHECKING([libblockdev-part presence])
163
-AC_TRY_COMPILE([#include <blockdev/part.h>], [],
164
-               [AC_MSG_RESULT([yes])
165
-               have_part=yes],
166
-               [AC_MSG_RESULT([no])
167
-               have_part=no])
168
+  CFLAGS="$GLIB_CFLAGS"
169
+  LDFLAGS="$GLIB_LIBS"
170
+  AC_MSG_CHECKING([libblockdev-part presence])
171
+  AC_TRY_COMPILE([#include <blockdev/part.h>], [],
172
+                 [AC_MSG_RESULT([yes])
173
+                 have_part=yes],
174
+                 [AC_MSG_RESULT([no])
175
+                 have_part=no])
176
 
177
-CFLAGS=$SAVE_CFLAGS
178
-LDFLAGS=$SAVE_LDFLAGS
179
+  CFLAGS=$SAVE_CFLAGS
180
+  LDFLAGS=$SAVE_LDFLAGS
181
 
182
-if test "x$have_part" = "xno"; then
183
-  AC_MSG_ERROR([BlockDev part support requested but header or library not found])
184
-fi
185
+  if test "x$have_part" = "xno"; then
186
+    AC_MSG_ERROR([BlockDev part support requested but header or library not found])
187
+  fi
188
 
189
-# libblockdev loop
190
-SAVE_CFLAGS=$CFLAGS
191
-SAVE_LDFLAGS=$LDFLAGS
192
+  # libblockdev loop
193
+  SAVE_CFLAGS=$CFLAGS
194
+  SAVE_LDFLAGS=$LDFLAGS
195
 
196
-CFLAGS="$GLIB_CFLAGS"
197
-LDFLAGS="$GLIB_LIBS"
198
-AC_MSG_CHECKING([libblockdev-loop presence])
199
-AC_TRY_COMPILE([#include <blockdev/loop.h>], [],
200
-               [AC_MSG_RESULT([yes])
201
-               have_loop=yes],
202
-               [AC_MSG_RESULT([no])
203
-               have_loop=no])
204
+  CFLAGS="$GLIB_CFLAGS"
205
+  LDFLAGS="$GLIB_LIBS"
206
+  AC_MSG_CHECKING([libblockdev-loop presence])
207
+  AC_TRY_COMPILE([#include <blockdev/loop.h>], [],
208
+                 [AC_MSG_RESULT([yes])
209
+                 have_loop=yes],
210
+                 [AC_MSG_RESULT([no])
211
+                 have_loop=no])
212
 
213
-CFLAGS=$SAVE_CFLAGS
214
-LDFLAGS=$SAVE_LDFLAGS
215
+  CFLAGS=$SAVE_CFLAGS
216
+  LDFLAGS=$SAVE_LDFLAGS
217
 
218
-if test "x$have_loop" = "xno"; then
219
-  AC_MSG_ERROR([Loop support requested but header or library not found])
220
-fi
221
+  if test "x$have_loop" = "xno"; then
222
+    AC_MSG_ERROR([Loop support requested but header or library not found])
223
+  fi
224
 
225
-# libblockdev swap
226
-SAVE_CFLAGS=$CFLAGS
227
-SAVE_LDFLAGS=$LDFLAGS
228
+  # libblockdev swap
229
+  SAVE_CFLAGS=$CFLAGS
230
+  SAVE_LDFLAGS=$LDFLAGS
231
 
232
-CFLAGS="$GLIB_CFLAGS"
233
-LDFLAGS="$GLIB_LIBS"
234
-AC_MSG_CHECKING([libblockdev-swap presence])
235
-AC_TRY_COMPILE([#include <blockdev/swap.h>], [],
236
-               [AC_MSG_RESULT([yes])
237
-               have_swap=yes],
238
-               [AC_MSG_RESULT([no])
239
-               have_swap=no])
240
+  CFLAGS="$GLIB_CFLAGS"
241
+  LDFLAGS="$GLIB_LIBS"
242
+  AC_MSG_CHECKING([libblockdev-swap presence])
243
+  AC_TRY_COMPILE([#include <blockdev/swap.h>], [],
244
+                 [AC_MSG_RESULT([yes])
245
+                 have_swap=yes],
246
+                 [AC_MSG_RESULT([no])
247
+                 have_swap=no])
248
 
249
-CFLAGS=$SAVE_CFLAGS
250
-LDFLAGS=$SAVE_LDFLAGS
251
+  CFLAGS=$SAVE_CFLAGS
252
+  LDFLAGS=$SAVE_LDFLAGS
253
 
254
-if test "x$have_swap" = "xno"; then
255
-  AC_MSG_ERROR([SWAP support requested but header or library not found])
256
-fi
257
+  if test "x$have_swap" = "xno"; then
258
+    AC_MSG_ERROR([SWAP support requested but header or library not found])
259
+  fi
260
 
261
-# libblockdev mdraid
262
-SAVE_CFLAGS=$CFLAGS
263
-SAVE_LDFLAGS=$LDFLAGS
264
+  # libblockdev mdraid
265
+  SAVE_CFLAGS=$CFLAGS
266
+  SAVE_LDFLAGS=$LDFLAGS
267
 
268
-CFLAGS="$GLIB_CFLAGS"
269
-LDFLAGS="$GLIB_LIBS"
270
-AC_MSG_CHECKING([libblockdev-mdraid presence])
271
-AC_TRY_COMPILE([#include <blockdev/mdraid.h>], [],
272
-               [AC_MSG_RESULT([yes])
273
-               have_mdraid=yes],
274
-               [AC_MSG_RESULT([no])
275
-               have_mdraid=no])
276
+  CFLAGS="$GLIB_CFLAGS"
277
+  LDFLAGS="$GLIB_LIBS"
278
+  AC_MSG_CHECKING([libblockdev-mdraid presence])
279
+  AC_TRY_COMPILE([#include <blockdev/mdraid.h>], [],
280
+                 [AC_MSG_RESULT([yes])
281
+                 have_mdraid=yes],
282
+                 [AC_MSG_RESULT([no])
283
+                 have_mdraid=no])
284
 
285
-CFLAGS=$SAVE_CFLAGS
286
-LDFLAGS=$SAVE_LDFLAGS
287
+  CFLAGS=$SAVE_CFLAGS
288
+  LDFLAGS=$SAVE_LDFLAGS
289
 
290
-if test "x$have_mdraid" = "xno"; then
291
-  AC_MSG_ERROR([BLOCKDEV MDRAID support requested but header or library not found])
292
-fi
293
+  if test "x$have_mdraid" = "xno"; then
294
+    AC_MSG_ERROR([BLOCKDEV MDRAID support requested but header or library not found])
295
+  fi
296
 
297
-# libblockdev fs
298
-SAVE_CFLAGS=$CFLAGS
299
-SAVE_LDFLAGS=$LDFLAGS
300
+  # libblockdev fs
301
+  SAVE_CFLAGS=$CFLAGS
302
+  SAVE_LDFLAGS=$LDFLAGS
303
 
304
-CFLAGS="$GLIB_CFLAGS"
305
-LDFLAGS="$GLIB_LIBS"
306
-AC_MSG_CHECKING([libblockdev-fs presence])
307
-AC_TRY_COMPILE([#include <blockdev/fs.h>], [],
308
-               [AC_MSG_RESULT([yes])
309
-               have_fs=yes],
310
-               [AC_MSG_RESULT([no])
311
-               have_fs=no])
312
+  CFLAGS="$GLIB_CFLAGS"
313
+  LDFLAGS="$GLIB_LIBS"
314
+  AC_MSG_CHECKING([libblockdev-fs presence])
315
+  AC_TRY_COMPILE([#include <blockdev/fs.h>], [],
316
+                 [AC_MSG_RESULT([yes])
317
+                 have_fs=yes],
318
+                 [AC_MSG_RESULT([no])
319
+                 have_fs=no])
320
 
321
-CFLAGS=$SAVE_CFLAGS
322
-LDFLAGS=$SAVE_LDFLAGS
323
+  CFLAGS=$SAVE_CFLAGS
324
+  LDFLAGS=$SAVE_LDFLAGS
325
 
326
-if test "x$have_fs" = "xno"; then
327
-  AC_MSG_ERROR([BLOCKDEV FS support requested but header or library not found])
328
-fi
329
+  if test "x$have_fs" = "xno"; then
330
+    AC_MSG_ERROR([BLOCKDEV FS support requested but header or library not found])
331
+  fi
332
 
333
-# libblockdev crypto
334
-SAVE_CFLAGS=$CFLAGS
335
-SAVE_LDFLAGS=$LDFLAGS
336
+  # libblockdev crypto
337
+  SAVE_CFLAGS=$CFLAGS
338
+  SAVE_LDFLAGS=$LDFLAGS
339
 
340
-CFLAGS="$GLIB_CFLAGS"
341
-LDFLAGS="$GLIB_LIBS"
342
-AC_MSG_CHECKING([libblockdev-crypto presence])
343
-AC_TRY_COMPILE([#include <blockdev/crypto.h>], [],
344
-               [AC_MSG_RESULT([yes])
345
-               have_crypto=yes],
346
-               [AC_MSG_RESULT([no])
347
-               have_crypto=no])
348
+  CFLAGS="$GLIB_CFLAGS"
349
+  LDFLAGS="$GLIB_LIBS"
350
+  AC_MSG_CHECKING([libblockdev-crypto presence])
351
+  AC_TRY_COMPILE([#include <blockdev/crypto.h>], [],
352
+                 [AC_MSG_RESULT([yes])
353
+                 have_crypto=yes],
354
+                 [AC_MSG_RESULT([no])
355
+                 have_crypto=no])
356
 
357
-CFLAGS=$SAVE_CFLAGS
358
-LDFLAGS=$SAVE_LDFLAGS
359
+  CFLAGS=$SAVE_CFLAGS
360
+  LDFLAGS=$SAVE_LDFLAGS
361
 
362
-if test "x$have_crypto" = "xno"; then
363
-  AC_MSG_ERROR([BLOCKDEV CRYPTO support requested but header or library not found])
364
+  if test "x$have_crypto" = "xno"; then
365
+    AC_MSG_ERROR([BLOCKDEV CRYPTO support requested but header or library not found])
366
+  fi
367
 fi
368
 
369
 
370
@@ -721,6 +739,10 @@ doc/man/udisksctl.xml
371
 doc/man/umount.udisks2.xml
372
 doc/man/udisks2.conf.5.xml.in
373
 doc/man/udisks2_lsm.conf.5.xml.in
374
+doc/udisks2-docs.xml.daemon.man
375
+doc/udisks2-docs.xml.daemon.part
376
+doc/udisks2-sections.txt.daemon.sections
377
+doc/udisks2.types.daemon
378
 doc/udisks2-docs.xml.iscsi.dbus
379
 doc/udisks2-docs.xml.iscsi.generated
380
 doc/udisks2-sections.txt.iscsi.sections
381
@@ -787,6 +809,7 @@ echo "
382
         Building api docs:          ${enable_gtk_doc}
383
         Building man pages:         ${enable_man}
384
 
385
+        Enable daemon:              ${enable_daemon}
386
         Enable modules:             ${enable_modules_info}
387
 
388
         BTRFS module:               ${have_btrfs}
(-)sysutils/libudisks/files/patch-data_Makefile.am (+18 lines)
Line 0 Link Here
1
--- data/Makefile.am.orig	2019-07-22 16:24:44 UTC
2
+++ data/Makefile.am
3
@@ -1,6 +1,7 @@
4
 
5
 NULL =
6
 
7
+if ENABLE_DAEMON
8
 SUBDIRS = tmpfiles.d
9
 
10
 dbusservicedir       = $(datadir)/dbus-1/system-services
11
@@ -36,6 +37,7 @@ polkit_DATA      = $(polkit_in_files:.policy.in=.polic
12
 
13
 $(polkit_DATA): $(polkit_in_files)
14
 	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
15
+endif
16
 
17
 completionsdir = $(datadir)/bash-completion/completions
18
 completions_DATA =                                                             \
(-)sysutils/libudisks/files/patch-doc_Makefile.am (+213 lines)
Line 0 Link Here
1
--- doc/Makefile.am.orig	2019-07-22 16:24:44 UTC
2
+++ doc/Makefile.am
3
@@ -21,17 +21,29 @@ UDISKS_TYPES=$(DOC_MODULE).types
4
 UDISKS_SECTIONS=$(DOC_MODULE)-sections.txt
5
 
6
 # The directory containing the source code. Relative to $(srcdir)
7
-DOC_SOURCE_DIR = $(top_srcdir)
8
+DOC_SOURCE_DIR = $(top_srcdir) $(top_builddir)
9
 
10
 HFILE_GLOB =                                                                   \
11
 	$(top_srcdir)/udisks/*.h                                               \
12
-	$(top_srcdir)/src/*.h                                                  \
13
-	$(top_srcdir)/modules/*.h
14
+	$(top_builddir)/udisks/*.h                                             \
15
+	$(NULL)
16
 
17
 CFILE_GLOB =                                                                   \
18
 	$(top_srcdir)/udisks/*.c                                               \
19
+	$(top_builddir)/udisks/*.c                                             \
20
+	$(NULL)
21
+
22
+if ENABLE_DAEMON
23
+HFILE_GLOB +=                                                                  \
24
+	$(top_srcdir)/src/*.h                                                  \
25
+	$(top_srcdir)/modules/*.h                                              \
26
+	$(NULL)
27
+
28
+CFILE_GLOB +=                                                                  \
29
 	$(top_srcdir)/src/*.c                                                  \
30
-	$(top_srcdir)/modules/*.c
31
+	$(top_srcdir)/modules/*.c                                              \
32
+	$(NULL)
33
+endif # ENABLE_DAEMON
34
 
35
 # Headers to ignore
36
 IGNORE_HFILES=                                                                 \
37
@@ -52,8 +64,13 @@ GTKDOC_LIBS =                                         
38
 	$(GLIB_LIBS)                                                           \
39
 	$(GIO_LIBS)                                                            \
40
 	$(top_builddir)/udisks/libudisks2.la                                   \
41
+	$(NULL)
42
+
43
+if ENABLE_DAEMON
44
+GTKDOC_LIBS +=                                                                 \
45
 	$(top_builddir)/src/libudisks-daemon.la                                \
46
 	$(NULL)
47
+endif # ENABLE_DAEMON
48
 
49
 # Extra options to supply to gtkdoc-mkdb
50
 MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=udisks
51
@@ -73,7 +90,9 @@ extra_files =                                         
52
 
53
 # ------------------------------------------------------------------------------
54
 
55
+if ENABLE_GTK_DOC
56
 all-local: generate-main-sgml-file
57
+endif
58
 
59
 # New gtk-doc 2.16 for some reason automatically creates a no-op
60
 # "$(DOC_MAIN_SGML_FILE)" make target that overrides our target
61
@@ -85,61 +104,69 @@ generate-main-sgml-file: $(DOC_MAIN_SGML_FILE).in $(UD
62
 	cp $(DOC_MAIN_SGML_FILE).in $(builddir)/$(DOC_MAIN_SGML_FILE) && \
63
 	cp $(UDISKS_SECTIONS).in $(builddir)/$(UDISKS_SECTIONS) && \
64
 	cp $(UDISKS_TYPES).in $(builddir)/$(UDISKS_TYPES)
65
+if ENABLE_DAEMON
66
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).daemon.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
67
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).daemon.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
68
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).daemon.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
69
+else
70
+	$(AM_V_at) $(SED) "/<\!-- DAEMON_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
71
+	$(AM_V_at) $(SED) "/\# DAEMON_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
72
+endif # ENABLE_DAEMON
73
 if HAVE_LVM2
74
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lvm2.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
75
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).lvm2.sed $(builddir)/$(UDISKS_SECTIONS)
76
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).lvm2.sed $(builddir)/$(UDISKS_TYPES)
77
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lvm2.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
78
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).lvm2.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
79
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).lvm2.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
80
 else
81
-	$(AM_V_at) $(SED) -i "/<\!-- LVM2_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
82
-	$(AM_V_at) $(SED) -i "/\# LVM2_TYPES/d" $(builddir)/$(UDISKS_TYPES)
83
+	$(AM_V_at) $(SED) "/<\!-- LVM2_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
84
+	$(AM_V_at) $(SED) "/\# LVM2_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
85
 endif # HAVE_LVM2
86
 if HAVE_LSM
87
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lsm.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
88
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).lsm.sed $(builddir)/$(UDISKS_SECTIONS)
89
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).lsm.sed $(builddir)/$(UDISKS_TYPES)
90
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).lsm.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
91
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).lsm.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
92
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).lsm.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
93
 else
94
-	$(AM_V_at) $(SED) -i "/<\!-- LSM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
95
-	$(AM_V_at) $(SED) -i "/\# LSM_TYPES/d" $(builddir)/$(UDISKS_TYPES)
96
+	$(AM_V_at) $(SED) "/<\!-- LSM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
97
+	$(AM_V_at) $(SED) "/\# LSM_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
98
 endif # HAVE_LSM
99
 if HAVE_ISCSI
100
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).iscsi.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
101
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).iscsi.sed $(builddir)/$(UDISKS_SECTIONS)
102
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).iscsi.sed $(builddir)/$(UDISKS_TYPES)
103
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).iscsi.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
104
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).iscsi.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
105
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).iscsi.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
106
 else
107
-	$(AM_V_at) $(SED) -i "/<\!-- ISCSI_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
108
-	$(AM_V_at) $(SED) -i "/\# ISCSI_TYPES/d" $(builddir)/$(UDISKS_TYPES)
109
+	$(AM_V_at) $(SED) "/<\!-- ISCSI_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
110
+	$(AM_V_at) $(SED) "/\# ISCSI_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
111
 endif # HAVE_ISCSI
112
 if HAVE_BTRFS
113
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).btrfs.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
114
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).btrfs.sed $(builddir)/$(UDISKS_SECTIONS)
115
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).btrfs.sed $(builddir)/$(UDISKS_TYPES)
116
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).btrfs.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
117
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).btrfs.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
118
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).btrfs.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
119
 else
120
-	$(AM_V_at) $(SED) -i "/<\!-- BTRFS_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
121
-	$(AM_V_at) $(SED) -i "/\# BTRFS_TYPES/d" $(builddir)/$(UDISKS_TYPES)
122
+	$(AM_V_at) $(SED) "/<\!-- BTRFS_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
123
+	$(AM_V_at) $(SED) "/\# BTRFS_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
124
 endif # HAVE_BTRFS
125
 if HAVE_ZRAM
126
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).zram.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
127
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).zram.sed $(builddir)/$(UDISKS_SECTIONS)
128
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).zram.sed $(builddir)/$(UDISKS_TYPES)
129
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).zram.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
130
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).zram.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
131
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).zram.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
132
 else
133
-	$(AM_V_at) $(SED) -i "/<\!-- ZRAM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
134
-	$(AM_V_at) $(SED) -i "/\# ZRAM_TYPES/d" $(builddir)/$(UDISKS_TYPES)
135
+	$(AM_V_at) $(SED) "/<\!-- ZRAM_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
136
+	$(AM_V_at) $(SED) "/\# ZRAM_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
137
 endif # HAVE_ZRAM
138
 if HAVE_BCACHE
139
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).bcache.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
140
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).bcache.sed $(builddir)/$(UDISKS_SECTIONS)
141
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).bcache.sed $(builddir)/$(UDISKS_TYPES)
142
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).bcache.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
143
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).bcache.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
144
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).bcache.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
145
 else
146
-	$(AM_V_at) $(SED) -i "/<\!-- BCACHE_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
147
-	$(AM_V_at) $(SED) -i "/\# BCACHE_TYPES/d" $(builddir)/$(UDISKS_TYPES)
148
+	$(AM_V_at) $(SED) "/<\!-- BCACHE_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
149
+	$(AM_V_at) $(SED) "/\# BCACHE_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
150
 endif # HAVE_BCACHE
151
 if HAVE_VDO
152
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).vdo.sed $(builddir)/$(DOC_MAIN_SGML_FILE)
153
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_SECTIONS).vdo.sed $(builddir)/$(UDISKS_SECTIONS)
154
-	$(AM_V_at) $(SED) -i -f $(DOC_DIR)/$(UDISKS_TYPES).vdo.sed $(builddir)/$(UDISKS_TYPES)
155
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(DOC_MAIN_SGML_FILE).vdo.sed $(builddir)/$(DOC_MAIN_SGML_FILE) > $(builddir)/$(DOC_MAIN_SGML_FILE).tmp && mv -f $(builddir)/$(DOC_MAIN_SGML_FILE).tmp $(builddir)/$(DOC_MAIN_SGML_FILE)
156
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_SECTIONS).vdo.sed $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
157
+	$(AM_V_at) $(SED) -f $(DOC_DIR)/$(UDISKS_TYPES).vdo.sed $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
158
 else
159
-	$(AM_V_at) $(SED) -i "/<\!-- VDO_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS)
160
-	$(AM_V_at) $(SED) -i "/\# VDO_TYPES/d" $(builddir)/$(UDISKS_TYPES)
161
+	$(AM_V_at) $(SED) "/<\!-- VDO_GENERATED_SECTIONS -->/d" $(builddir)/$(UDISKS_SECTIONS) > $(builddir)/$(UDISKS_SECTIONS).tmp && mv -f $(builddir)/$(UDISKS_SECTIONS).tmp $(builddir)/$(UDISKS_SECTIONS)
162
+	$(AM_V_at) $(SED) "/\# VDO_TYPES/d" $(builddir)/$(UDISKS_TYPES) > $(builddir)/$(UDISKS_TYPES).tmp && mv -f $(builddir)/$(UDISKS_TYPES).tmp $(builddir)/$(UDISKS_TYPES)
163
 endif # HAVE_VDO
164
 
165
 # GTKDOC for LVM2
166
@@ -212,12 +239,14 @@ include $(top_srcdir)/gtk-doc.make
167
 EXTRA_DIST +=                                                                  \
168
 	$(DOC_MAIN_SGML_FILE).in.in                                            \
169
 	$(DOC_MAIN_SGML_FILE).in                                               \
170
-        $(DOC_MAIN_SGML_FILE).bcache.dbus.in                                   \
171
-        $(DOC_MAIN_SGML_FILE).bcache.generated.in                              \
172
-        $(DOC_MAIN_SGML_FILE).bcache.sed                                       \
173
+	$(DOC_MAIN_SGML_FILE).bcache.dbus.in                                   \
174
+	$(DOC_MAIN_SGML_FILE).bcache.generated.in                              \
175
+	$(DOC_MAIN_SGML_FILE).bcache.sed                                       \
176
 	$(DOC_MAIN_SGML_FILE).btrfs.dbus.in                                    \
177
 	$(DOC_MAIN_SGML_FILE).btrfs.generated.in                               \
178
 	$(DOC_MAIN_SGML_FILE).btrfs.sed                                        \
179
+	$(DOC_MAIN_SGML_FILE).daemon.part.in                                   \
180
+	$(DOC_MAIN_SGML_FILE).daemon.sed                                       \
181
 	$(DOC_MAIN_SGML_FILE).iscsi.dbus.in                                    \
182
 	$(DOC_MAIN_SGML_FILE).iscsi.generated.in                               \
183
 	$(DOC_MAIN_SGML_FILE).iscsi.sed                                        \
184
@@ -236,10 +265,12 @@ EXTRA_DIST +=                                         
185
 	$(DOC_MAIN_SGML_FILE).zram.sed                                         \
186
 	$(UDISKS_TYPES).in.in                                                  \
187
 	$(UDISKS_TYPES).in                                                     \
188
-        $(UDISKS_TYPES).bcache.in                                              \
189
-        $(UDISKS_TYPES).bcache.sed                                             \
190
+	$(UDISKS_TYPES).bcache.in                                              \
191
+	$(UDISKS_TYPES).bcache.sed                                             \
192
 	$(UDISKS_TYPES).btrfs.in                                               \
193
 	$(UDISKS_TYPES).btrfs.sed                                              \
194
+	$(UDISKS_TYPES).daemon.in                                              \
195
+	$(UDISKS_TYPES).daemon.sed                                             \
196
 	$(UDISKS_TYPES).iscsi.in                                               \
197
 	$(UDISKS_TYPES).iscsi.sed                                              \
198
 	$(UDISKS_TYPES).lsm.in                                                 \
199
@@ -252,10 +283,12 @@ EXTRA_DIST +=                                         
200
 	$(UDISKS_TYPES).zram.sed                                               \
201
 	$(UDISKS_SECTIONS).in.in                                               \
202
 	$(UDISKS_SECTIONS).in                                                  \
203
-        $(UDISKS_SECTIONS).bcache.sections.in                                  \
204
-        $(UDISKS_SECTIONS).bcache.sed                                          \
205
+	$(UDISKS_SECTIONS).bcache.sections.in                                  \
206
+	$(UDISKS_SECTIONS).bcache.sed                                          \
207
 	$(UDISKS_SECTIONS).btrfs.sections.in                                   \
208
 	$(UDISKS_SECTIONS).btrfs.sed                                           \
209
+	$(UDISKS_SECTIONS).daemon.sections.in                                  \
210
+	$(UDISKS_SECTIONS).daemon.sed                                          \
211
 	$(UDISKS_SECTIONS).iscsi.sections.in                                   \
212
 	$(UDISKS_SECTIONS).iscsi.sed                                           \
213
 	$(UDISKS_SECTIONS).lsm.sections.in                                     \
(-)sysutils/libudisks/files/patch-doc_man_Makefile.am (+19 lines)
Line 0 Link Here
1
--- doc/man/Makefile.am.orig	2019-07-22 16:24:44 UTC
2
+++ doc/man/Makefile.am
3
@@ -6,11 +6,16 @@ man_MANS =
4
 if ENABLE_MAN
5
 man_MANS +=                                                                    \
6
 	udisksctl.1                                                            \
7
+	$(NULL)
8
+
9
+if ENABLE_DAEMON
10
+man_MANS +=                                                                    \
11
 	udisksd.8                                                              \
12
 	udisks.8                                                               \
13
 	umount.udisks2.8                                                       \
14
 	udisks2.conf.5                                                         \
15
 	$(NULL)
16
+endif # ENABLE_DAEMON
17
 
18
 if HAVE_LSM
19
 man_MANS += udisks2_lsm.conf.5
(-)sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.man.in (+7 lines)
Line 0 Link Here
1
--- doc/udisks2-docs.xml.daemon.man.in.orig	2019-10-03 03:15:30 UTC
2
+++ doc/udisks2-docs.xml.daemon.man.in
3
@@ -0,0 +1,4 @@
4
+    <xi:include href="man/udisksd.xml"/>
5
+    <xi:include href="man/udisks.xml"/>
6
+    <xi:include href="man/umount.udisks2.xml"/>
7
+    <xi:include href="man/udisks2.conf.5.xml"/>
(-)sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.part.in (+58 lines)
Line 0 Link Here
1
--- doc/udisks2-docs.xml.daemon.part.in.orig	2019-10-03 03:15:30 UTC
2
+++ doc/udisks2-docs.xml.daemon.part.in
3
@@ -0,0 +1,55 @@
4
+  <part id="ref-daemon">
5
+    <title>Daemon Implementation Details</title>
6
+    <chapter id="ref-daemon-core">
7
+      <title>Core</title>
8
+      <xi:include href="xml/udisksdaemonutil.xml"/>
9
+      <xi:include href="xml/udiskslogging.xml"/>
10
+      <xi:include href="xml/udisksdaemon.xml"/>
11
+      <xi:include href="xml/udisksprovider.xml"/>
12
+      <xi:include href="xml/udisksstate.xml"/>
13
+      <xi:include href="xml/udisksata.xml"/>
14
+      <xi:include href="xml/UDisksModuleManager.xml"/>
15
+    </chapter>
16
+    <chapter id="ref-daemon-monitoring">
17
+      <title>State and Configuration</title>
18
+      <xi:include href="xml/udisksmountmonitor.xml"/>
19
+      <xi:include href="xml/udisksfstabmonitor.xml"/>
20
+      <xi:include href="xml/udiskscrypttabmonitor.xml"/>
21
+      <xi:include href="xml/udisksutabmonitor.xml"/>
22
+    </chapter>
23
+    <chapter id="ref-daemon-jobs">
24
+      <title>Jobs</title>
25
+      <xi:include href="xml/udisksbasejob.xml"/>
26
+      <xi:include href="xml/udiskssimplejob.xml"/>
27
+      <xi:include href="xml/udisksthreadedjob.xml"/>
28
+      <xi:include href="xml/udisksspawnedjob.xml"/>
29
+    </chapter>
30
+    <chapter id="ref-daemon-linux-types">
31
+      <title>Linux-specific types</title>
32
+      <xi:include href="xml/udiskslinuxmanager.xml"/>
33
+      <xi:include href="xml/udiskslinuxprovider.xml"/>
34
+      <xi:include href="xml/udiskslinuxdevice.xml"/>
35
+    </chapter>
36
+    <chapter id="ref-daemon-drives">
37
+      <title>Drives on Linux</title>
38
+      <xi:include href="xml/udiskslinuxdrive.xml"/>
39
+      <xi:include href="xml/udiskslinuxdriveata.xml"/>
40
+      <xi:include href="xml/udiskslinuxdriveobject.xml"/>
41
+    </chapter>
42
+    <chapter id="ref-daemon-mdraid">
43
+      <title>Linux RAID</title>
44
+      <xi:include href="xml/udiskslinuxmdraid.xml"/>
45
+      <xi:include href="xml/udiskslinuxmdraidobject.xml"/>
46
+    </chapter>
47
+    <chapter id="ref-daemon-block-devices">
48
+      <title>Block devices on Linux</title>
49
+      <xi:include href="xml/udiskslinuxblock.xml"/>
50
+      <xi:include href="xml/udiskslinuxpartition.xml"/>
51
+      <xi:include href="xml/udiskslinuxpartitiontable.xml"/>
52
+      <xi:include href="xml/udiskslinuxfilesystem.xml"/>
53
+      <xi:include href="xml/udiskslinuxencrypted.xml"/>
54
+      <xi:include href="xml/udiskslinuxswapspace.xml"/>
55
+      <xi:include href="xml/udiskslinuxloop.xml"/>
56
+      <xi:include href="xml/udiskslinuxblockobject.xml"/>
57
+    </chapter>
58
+  </part>
(-)sysutils/libudisks/files/patch-doc_udisks2-docs.xml.daemon.sed (+10 lines)
Line 0 Link Here
1
--- doc/udisks2-docs.xml.daemon.sed.orig	2019-10-03 03:15:30 UTC
2
+++ doc/udisks2-docs.xml.daemon.sed
3
@@ -0,0 +1,7 @@
4
+/<!-- DAEMON_MAN_PAGE -->/ {
5
+    r udisks2-docs.xml.daemon.man
6
+    d }
7
+
8
+/<!-- DAEMON_PART -->/ {
9
+    r udisks2-docs.xml.daemon.part
10
+    d }
(-)sysutils/libudisks/files/patch-doc_udisks2-docs.xml.in.in (+80 lines)
Line 0 Link Here
1
--- doc/udisks2-docs.xml.in.in.orig	2019-07-22 16:24:44 UTC
2
+++ doc/udisks2-docs.xml.in.in
3
@@ -15,12 +15,9 @@
4
 
5
   <part id="overview">
6
     <title>Manual pages and Overview</title>
7
-    <xi:include href="man/udisksd.xml"/>
8
-    <!-- LVM2_MAN_PAGE -->
9
-    <xi:include href="man/udisks.xml"/>
10
     <xi:include href="man/udisksctl.xml"/>
11
-    <xi:include href="man/umount.udisks2.xml"/>
12
-    <xi:include href="man/udisks2.conf.5.xml"/>
13
+    <!-- DAEMON_MAN_PAGE -->
14
+    <!-- LVM2_MAN_PAGE -->
15
     <!-- LSM_MAN_PAGE -->
16
   </part>
17
 
18
@@ -416,61 +413,7 @@
19
     </chapter>
20
   </part>
21
 
22
-  <part id="ref-daemon">
23
-    <title>Daemon Implementation Details</title>
24
-    <chapter id="ref-daemon-core">
25
-      <title>Core</title>
26
-      <xi:include href="xml/udisksdaemonutil.xml"/>
27
-      <xi:include href="xml/udiskslogging.xml"/>
28
-      <xi:include href="xml/udisksdaemon.xml"/>
29
-      <xi:include href="xml/udisksprovider.xml"/>
30
-      <xi:include href="xml/udisksstate.xml"/>
31
-      <xi:include href="xml/udisksata.xml"/>
32
-      <xi:include href="xml/UDisksModuleManager.xml"/>
33
-    </chapter>
34
-    <chapter id="ref-daemon-monitoring">
35
-      <title>State and Configuration</title>
36
-      <xi:include href="xml/udisksmountmonitor.xml"/>
37
-      <xi:include href="xml/udisksfstabmonitor.xml"/>
38
-      <xi:include href="xml/udiskscrypttabmonitor.xml"/>
39
-      <xi:include href="xml/udisksutabmonitor.xml"/>
40
-    </chapter>
41
-    <chapter id="ref-daemon-jobs">
42
-      <title>Jobs</title>
43
-      <xi:include href="xml/udisksbasejob.xml"/>
44
-      <xi:include href="xml/udiskssimplejob.xml"/>
45
-      <xi:include href="xml/udisksthreadedjob.xml"/>
46
-      <xi:include href="xml/udisksspawnedjob.xml"/>
47
-    </chapter>
48
-    <chapter id="ref-daemon-linux-types">
49
-      <title>Linux-specific types</title>
50
-      <xi:include href="xml/udiskslinuxmanager.xml"/>
51
-      <xi:include href="xml/udiskslinuxprovider.xml"/>
52
-      <xi:include href="xml/udiskslinuxdevice.xml"/>
53
-    </chapter>
54
-    <chapter id="ref-daemon-drives">
55
-      <title>Drives on Linux</title>
56
-      <xi:include href="xml/udiskslinuxdrive.xml"/>
57
-      <xi:include href="xml/udiskslinuxdriveata.xml"/>
58
-      <xi:include href="xml/udiskslinuxdriveobject.xml"/>
59
-    </chapter>
60
-    <chapter id="ref-daemon-mdraid">
61
-      <title>Linux RAID</title>
62
-      <xi:include href="xml/udiskslinuxmdraid.xml"/>
63
-      <xi:include href="xml/udiskslinuxmdraidobject.xml"/>
64
-    </chapter>
65
-    <chapter id="ref-daemon-block-devices">
66
-      <title>Block devices on Linux</title>
67
-      <xi:include href="xml/udiskslinuxblock.xml"/>
68
-      <xi:include href="xml/udiskslinuxpartition.xml"/>
69
-      <xi:include href="xml/udiskslinuxpartitiontable.xml"/>
70
-      <xi:include href="xml/udiskslinuxfilesystem.xml"/>
71
-      <xi:include href="xml/udiskslinuxencrypted.xml"/>
72
-      <xi:include href="xml/udiskslinuxswapspace.xml"/>
73
-      <xi:include href="xml/udiskslinuxloop.xml"/>
74
-      <xi:include href="xml/udiskslinuxblockobject.xml"/>
75
-    </chapter>
76
-  </part>
77
+  <!-- DAEMON_PART -->
78
 
79
   <index id="api-index">
80
     <title>Index</title>
(-)sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sections.in (+563 lines)
Line 0 Link Here
1
--- doc/udisks2-sections.txt.daemon.sections.in.orig	2019-10-03 03:15:30 UTC
2
+++ doc/udisks2-sections.txt.daemon.sections.in
3
@@ -0,0 +1,560 @@
4
+<SECTION>
5
+<FILE>udisksdaemon</FILE>
6
+<TITLE>UDisksDaemon</TITLE>
7
+UDisksDaemon
8
+udisks_daemon_new
9
+udisks_daemon_get_connection
10
+udisks_daemon_get_object_manager
11
+udisks_daemon_get_mount_monitor
12
+udisks_daemon_get_fstab_monitor
13
+udisks_daemon_get_crypttab_monitor
14
+udisks_daemon_get_linux_provider
15
+udisks_daemon_get_authority
16
+udisks_daemon_get_state
17
+UDisksDaemonWaitFunc
18
+udisks_daemon_wait_for_object_sync
19
+udisks_daemon_get_objects
20
+udisks_daemon_find_object
21
+udisks_daemon_find_block
22
+udisks_daemon_find_block_by_device_file
23
+udisks_daemon_find_block_by_sysfs_path
24
+udisks_daemon_launch_simple_job
25
+udisks_daemon_launch_spawned_job
26
+udisks_daemon_launch_spawned_job_sync
27
+udisks_daemon_launch_threaded_job
28
+udisks_daemon_get_disable_modules
29
+udisks_daemon_get_force_load_modules
30
+udisks_daemon_get_module_manager
31
+<SUBSECTION Standard>
32
+UDISKS_TYPE_DAEMON
33
+UDISKS_DAEMON
34
+UDISKS_IS_DAEMON
35
+<SUBSECTION Private>
36
+udisks_daemon_get_type
37
+udisks_daemon_marshal_BOOLEAN__BOOLEAN_BOXED
38
+udisks_daemon_marshal_BOOLEAN__BOXED_INT_BOXED_BOXED
39
+</SECTION>
40
+
41
+<SECTION>
42
+<FILE>udisksbasejob</FILE>
43
+<TITLE>UDisksBaseJob</TITLE>
44
+UDisksBaseJob
45
+UDisksBaseJobClass
46
+udisks_base_job_get_daemon
47
+udisks_base_job_get_cancellable
48
+udisks_base_job_get_auto_estimate
49
+udisks_base_job_set_auto_estimate
50
+udisks_base_job_add_object
51
+udisks_base_job_remove_object
52
+<SUBSECTION Standard>
53
+UDISKS_TYPE_BASE_JOB
54
+UDISKS_BASE_JOB
55
+UDISKS_IS_BASE_JOB
56
+UDISKS_BASE_JOB_CLASS
57
+UDISKS_BASE_JOB_GET_CLASS
58
+UDISKS_IS_BASE_JOB_CLASS
59
+UDisksBaseJobPrivate
60
+<SUBSECTION Private>
61
+udisks_base_job_get_type
62
+</SECTION>
63
+
64
+<SECTION>
65
+<FILE>udisksspawnedjob</FILE>
66
+<TITLE>UDisksSpawnedJob</TITLE>
67
+UDisksSpawnedJob
68
+udisks_spawned_job_new
69
+udisks_spawned_job_get_command_line
70
+udisks_spawned_job_start
71
+<SUBSECTION Standard>
72
+UDISKS_TYPE_SPAWNED_JOB
73
+UDISKS_SPAWNED_JOB
74
+UDISKS_IS_SPAWNED_JOB
75
+<SUBSECTION Private>
76
+udisks_spawned_job_get_type
77
+</SECTION>
78
+
79
+<SECTION>
80
+<FILE>udisksthreadedjob</FILE>
81
+<TITLE>UDisksThreadedJob</TITLE>
82
+UDisksThreadedJob
83
+UDisksThreadedJobFunc
84
+udisks_threaded_job_new
85
+udisks_threaded_job_start
86
+udisks_threaded_job_run_sync
87
+udisks_threaded_job_get_user_data
88
+<SUBSECTION Standard>
89
+UDISKS_TYPE_THREADED_JOB
90
+UDISKS_THREADED_JOB
91
+UDISKS_IS_THREADED_JOB
92
+<SUBSECTION Private>
93
+udisks_threaded_job_get_type
94
+</SECTION>
95
+
96
+<SECTION>
97
+<FILE>udiskssimplejob</FILE>
98
+<TITLE>UDisksSimpleJob</TITLE>
99
+UDisksSimpleJob
100
+udisks_simple_job_new
101
+udisks_simple_job_complete
102
+<SUBSECTION Standard>
103
+UDISKS_TYPE_SIMPLE_JOB
104
+UDISKS_SIMPLE_JOB
105
+UDISKS_IS_SIMPLE_JOB
106
+<SUBSECTION Private>
107
+udisks_simple_job_get_type
108
+</SECTION>
109
+
110
+<SECTION>
111
+<FILE>udiskslinuxdriveobject</FILE>
112
+<TITLE>UDisksLinuxDriveObject</TITLE>
113
+UDisksLinuxDriveObject
114
+udisks_linux_drive_object_new
115
+udisks_linux_drive_object_uevent
116
+udisks_linux_drive_object_get_daemon
117
+udisks_linux_drive_object_get_block
118
+udisks_linux_drive_object_get_device
119
+udisks_linux_drive_object_get_devices
120
+udisks_linux_drive_object_get_siblings
121
+udisks_linux_drive_object_housekeeping
122
+udisks_linux_drive_object_is_not_in_use
123
+<SUBSECTION Standard>
124
+UDISKS_TYPE_LINUX_DRIVE_OBJECT
125
+UDISKS_LINUX_DRIVE_OBJECT
126
+UDISKS_IS_LINUX_DRIVE_OBJECT
127
+<SUBSECTION Private>
128
+udisks_linux_drive_object_get_type
129
+udisks_linux_drive_object_should_include_device
130
+</SECTION>
131
+
132
+<SECTION>
133
+<FILE>udiskslinuxdrive</FILE>
134
+UDisksLinuxDrive
135
+udisks_linux_drive_new
136
+udisks_linux_drive_update
137
+<SUBSECTION Standard>
138
+UDISKS_LINUX_DRIVE
139
+UDISKS_IS_LINUX_DRIVE
140
+UDISKS_TYPE_LINUX_DRIVE
141
+<SUBSECTION Private>
142
+udisks_linux_drive_get_type
143
+</SECTION>
144
+
145
+<SECTION>
146
+<FILE>udiskslinuxdriveata</FILE>
147
+UDisksLinuxDriveAta
148
+udisks_linux_drive_ata_new
149
+udisks_linux_drive_ata_update
150
+udisks_linux_drive_ata_refresh_smart_sync
151
+udisks_linux_drive_ata_smart_selftest_sync
152
+udisks_linux_drive_ata_apply_configuration
153
+udisks_linux_drive_ata_secure_erase_sync
154
+udisks_linux_drive_ata_get_pm_state
155
+UDISKS_LINUX_DRIVE_ATA_IS_AWAKE
156
+<SUBSECTION Standard>
157
+UDISKS_LINUX_DRIVE_ATA
158
+UDISKS_IS_LINUX_DRIVE_ATA
159
+UDISKS_TYPE_LINUX_DRIVE_ATA
160
+<SUBSECTION Private>
161
+udisks_linux_drive_ata_get_type
162
+</SECTION>
163
+
164
+<SECTION>
165
+<FILE>udisksprovider</FILE>
166
+<TITLE>UDisksProvider</TITLE>
167
+UDisksProvider
168
+UDisksProviderClass
169
+udisks_provider_start
170
+udisks_provider_get_daemon
171
+<SUBSECTION Standard>
172
+UDISKS_TYPE_PROVIDER
173
+UDISKS_PROVIDER
174
+UDISKS_PROVIDER_GET_CLASS
175
+UDISKS_PROVIDER_CLASS
176
+UDISKS_IS_PROVIDER
177
+UDISKS_IS_PROVIDER_CLASS
178
+<SUBSECTION Private>
179
+udisks_provider_get_type
180
+UDisksProviderPrivate
181
+</SECTION>
182
+
183
+<SECTION>
184
+<FILE>udiskslinuxprovider</FILE>
185
+<TITLE>UDisksLinuxProvider</TITLE>
186
+UDisksLinuxProvider
187
+udisks_linux_provider_new
188
+udisks_linux_provider_get_udev_client
189
+udisks_linux_provider_get_coldplug
190
+<SUBSECTION Standard>
191
+UDISKS_TYPE_LINUX_PROVIDER
192
+UDISKS_LINUX_PROVIDER
193
+UDISKS_IS_LINUX_PROVIDER
194
+<SUBSECTION Private>
195
+udisks_linux_provider_get_type
196
+</SECTION>
197
+
198
+<SECTION>
199
+<FILE>udisksmountmonitor</FILE>
200
+<TITLE>UDisksMountMonitor</TITLE>
201
+UDisksMount
202
+UDisksMountType
203
+udisks_mount_get_dev
204
+udisks_mount_get_mount_type
205
+udisks_mount_get_mount_path
206
+udisks_mount_compare
207
+UDisksMountMonitor
208
+udisks_mount_monitor_new
209
+udisks_mount_monitor_get_mounts_for_dev
210
+udisks_mount_monitor_is_dev_in_use
211
+<SUBSECTION Standard>
212
+UDISKS_TYPE_MOUNT
213
+UDISKS_MOUNT
214
+UDISKS_IS_MOUNT
215
+UDISKS_TYPE_MOUNT_MONITOR
216
+UDISKS_MOUNT_MONITOR
217
+UDISKS_IS_MOUNT_MONITOR
218
+<SUBSECTION Private>
219
+udisks_mount_get_type
220
+udisks_mount_monitor_get_type
221
+</SECTION>
222
+
223
+<SECTION>
224
+<FILE>udisksstate</FILE>
225
+<TITLE>UDisksState</TITLE>
226
+UDisksState
227
+udisks_state_new
228
+udisks_state_start_cleanup
229
+udisks_state_stop_cleanup
230
+udisks_state_check
231
+udisks_state_check_sync
232
+udisks_state_get_daemon
233
+<SUBSECTION>
234
+udisks_state_add_mounted_fs
235
+udisks_state_find_mounted_fs
236
+<SUBSECTION>
237
+udisks_state_add_unlocked_crypto_dev
238
+udisks_state_find_unlocked_crypto_dev
239
+<SUBSECTION>
240
+udisks_state_add_loop
241
+udisks_state_has_loop
242
+<SUBSECTION>
243
+udisks_state_add_mdraid
244
+udisks_state_has_mdraid
245
+<SUBSECTION Standard>
246
+UDISKS_TYPE_STATE
247
+UDISKS_STATE
248
+UDISKS_IS_STATE
249
+<SUBSECTION Private>
250
+udisks_state_get_type
251
+</SECTION>
252
+
253
+<SECTION>
254
+<FILE>udisksata</FILE>
255
+UDisksAtaCommandProtocol
256
+UDisksAtaCommandInput
257
+UDisksAtaCommandOutput
258
+udisks_ata_send_command_sync
259
+</SECTION>
260
+
261
+<SECTION>
262
+<FILE>udiskslinuxdevice</FILE>
263
+<TITLE>UDisksLinuxDevice</TITLE>
264
+UDisksLinuxDevice
265
+udisks_linux_device_new_sync
266
+udisks_linux_device_reprobe_sync
267
+<SUBSECTION Standard>
268
+UDISKS_TYPE_LINUX_DEVICE
269
+UDISKS_LINUX_DEVICE
270
+UDISKS_IS_LINUX_DEVICE
271
+<SUBSECTION Private>
272
+udisks_linux_device_get_type
273
+</SECTION>
274
+
275
+<SECTION>
276
+<FILE>udisksdaemonutil</FILE>
277
+udisks_decode_udev_string
278
+udisks_safe_append_to_object_path
279
+udisks_daemon_util_block_get_size
280
+udisks_daemon_util_resolve_link
281
+udisks_daemon_util_resolve_links
282
+udisks_daemon_util_check_authorization_sync
283
+udisks_daemon_util_get_caller_uid_sync
284
+udisks_daemon_util_get_caller_pid_sync
285
+udisks_daemon_util_setup_by_user
286
+udisks_daemon_util_dup_object
287
+udisks_daemon_util_escape
288
+udisks_daemon_util_escape_and_quote
289
+UDisksInhibitCookie
290
+udisks_daemon_util_inhibit_system_sync
291
+udisks_daemon_util_uninhibit_system_sync
292
+udisks_daemon_util_hexdump
293
+udisks_daemon_util_hexdump_debug
294
+udisks_daemon_util_file_set_contents
295
+udisks_daemon_util_on_user_seat
296
+udisks_daemon_util_get_free_mdraid_device
297
+udisks_ata_identify_get_word
298
+</SECTION>
299
+
300
+<SECTION>
301
+<FILE>udiskslinuxblockobject</FILE>
302
+<TITLE>UDisksLinuxBlockObject</TITLE>
303
+UDisksLinuxBlockObject
304
+udisks_linux_block_object_new
305
+udisks_linux_block_object_uevent
306
+udisks_linux_block_object_get_daemon
307
+udisks_linux_block_object_get_device
308
+udisks_linux_block_object_trigger_uevent
309
+udisks_linux_block_object_reread_partition_table
310
+<SUBSECTION Standard>
311
+UDISKS_TYPE_LINUX_BLOCK_OBJECT
312
+UDISKS_LINUX_BLOCK_OBJECT
313
+UDISKS_IS_LINUX_BLOCK_OBJECT
314
+<SUBSECTION Private>
315
+udisks_linux_block_object_get_type
316
+</SECTION>
317
+
318
+<SECTION>
319
+<FILE>udiskslinuxblock</FILE>
320
+UDisksLinuxBlock
321
+udisks_linux_block_new
322
+udisks_linux_block_update
323
+<SUBSECTION Standard>
324
+UDISKS_LINUX_BLOCK
325
+UDISKS_IS_LINUX_BLOCK
326
+UDISKS_TYPE_LINUX_BLOCK
327
+<SUBSECTION Private>
328
+udisks_linux_block_get_type
329
+</SECTION>
330
+
331
+<SECTION>
332
+<FILE>udiskslinuxfilesystem</FILE>
333
+UDisksLinuxFilesystem
334
+udisks_linux_filesystem_new
335
+udisks_linux_filesystem_update
336
+<SUBSECTION Standard>
337
+UDISKS_LINUX_FILESYSTEM
338
+UDISKS_IS_LINUX_FILESYSTEM
339
+UDISKS_TYPE_LINUX_FILESYSTEM
340
+<SUBSECTION Private>
341
+udisks_linux_filesystem_get_type
342
+</SECTION>
343
+
344
+<SECTION>
345
+<FILE>udiskslinuxencrypted</FILE>
346
+UDisksLinuxEncrypted
347
+udisks_linux_encrypted_new
348
+udisks_linux_encrypted_update
349
+<SUBSECTION Standard>
350
+UDISKS_LINUX_ENCRYPTED
351
+UDISKS_IS_LINUX_ENCRYPTED
352
+UDISKS_TYPE_LINUX_ENCRYPTED
353
+<SUBSECTION Private>
354
+udisks_linux_encrypted_get_type
355
+</SECTION>
356
+
357
+<SECTION>
358
+<FILE>udiskslinuxswapspace</FILE>
359
+UDisksLinuxSwapspace
360
+udisks_linux_swapspace_new
361
+udisks_linux_swapspace_update
362
+<SUBSECTION Standard>
363
+UDISKS_LINUX_SWAPSPACE
364
+UDISKS_IS_LINUX_SWAPSPACE
365
+UDISKS_TYPE_LINUX_SWAPSPACE
366
+<SUBSECTION Private>
367
+udisks_linux_swapspace_get_type
368
+</SECTION>
369
+
370
+<SECTION>
371
+<FILE>udiskslinuxloop</FILE>
372
+UDisksLinuxLoop
373
+udisks_linux_loop_new
374
+udisks_linux_loop_update
375
+<SUBSECTION Standard>
376
+UDISKS_LINUX_LOOP
377
+UDISKS_IS_LINUX_LOOP
378
+UDISKS_TYPE_LINUX_LOOP
379
+<SUBSECTION Private>
380
+udisks_linux_loop_get_type
381
+</SECTION>
382
+
383
+<SECTION>
384
+<FILE>udiskslinuxmanager</FILE>
385
+<TITLE>UDisksLinuxManager</TITLE>
386
+UDisksLinuxManager
387
+udisks_linux_manager_new
388
+udisks_linux_manager_get_daemon
389
+<SUBSECTION Standard>
390
+UDISKS_TYPE_LINUX_MANAGER
391
+UDISKS_LINUX_MANAGER
392
+UDISKS_IS_LINUX_MANAGER
393
+<SUBSECTION Private>
394
+udisks_linux_manager_get_type
395
+</SECTION>
396
+
397
+<SECTION>
398
+<FILE>udisksfstabmonitor</FILE>
399
+<TITLE>UDisksFstabMonitor</TITLE>
400
+UDisksFstabEntry
401
+udisks_fstab_entry_get_fsname
402
+udisks_fstab_entry_get_dir
403
+udisks_fstab_entry_get_fstype
404
+udisks_fstab_entry_get_opts
405
+udisks_fstab_entry_get_freq
406
+udisks_fstab_entry_get_passno
407
+udisks_fstab_entry_compare
408
+UDisksFstabMonitor
409
+udisks_fstab_monitor_new
410
+udisks_fstab_monitor_get_entries
411
+<SUBSECTION Standard>
412
+UDISKS_TYPE_FSTAB_ENTRY
413
+UDISKS_FSTAB_ENTRY
414
+UDISKS_IS_FSTAB_ENTRY
415
+UDISKS_TYPE_FSTAB_MONITOR
416
+UDISKS_FSTAB_MONITOR
417
+UDISKS_IS_FSTAB_MONITOR
418
+<SUBSECTION Private>
419
+udisks_fstab_entry_get_type
420
+udisks_fstab_monitor_get_type
421
+</SECTION>
422
+
423
+<SECTION>
424
+<FILE>udiskscrypttabmonitor</FILE>
425
+<TITLE>UDisksCrypttabMonitor</TITLE>
426
+UDisksCrypttabEntry
427
+udisks_crypttab_entry_get_name
428
+udisks_crypttab_entry_get_device
429
+udisks_crypttab_entry_get_passphrase_path
430
+udisks_crypttab_entry_get_options
431
+udisks_crypttab_entry_compare
432
+UDisksCrypttabMonitor
433
+udisks_crypttab_monitor_new
434
+udisks_crypttab_monitor_get_entries
435
+<SUBSECTION Standard>
436
+UDISKS_TYPE_CRYPTTAB_ENTRY
437
+UDISKS_CRYPTTAB_ENTRY
438
+UDISKS_IS_CRYPTTAB_ENTRY
439
+UDISKS_TYPE_CRYPTTAB_MONITOR
440
+UDISKS_CRYPTTAB_MONITOR
441
+UDISKS_IS_CRYPTTAB_MONITOR
442
+<SUBSECTION Private>
443
+udisks_crypttab_entry_get_type
444
+udisks_crypttab_monitor_get_type
445
+</SECTION>
446
+
447
+<SECTION>
448
+<FILE>udisksutabmonitor</FILE>
449
+<TITLE>UDisksUtabMonitor</TITLE>
450
+UDisksUtabEntry
451
+udisks_utab_entry_get_source
452
+udisks_utab_entry_get_opts
453
+UDisksUtabMonitor
454
+udisks_utab_monitor_new
455
+udisks_utab_monitor_get_entries
456
+<SUBSECTION Standard>
457
+UDISKS_TYPE_UTAB_ENTRY
458
+UDISKS_UTAB_ENTRY
459
+UDISKS_IS_UTAB_ENTRY
460
+UDISKS_TYPE_UTAB_MONITOR
461
+UDISKS_UTAB_MONITOR
462
+UDISKS_IS_UTAB_MONITOR
463
+<SUBSECTION Private>
464
+udisks_utab_entry_get_type
465
+udisks_utab_monitor_get_type
466
+</SECTION>
467
+
468
+<SECTION>
469
+<FILE>udiskslinuxpartition</FILE>
470
+UDisksLinuxPartition
471
+udisks_linux_partition_new
472
+udisks_linux_partition_update
473
+udisks_linux_partition_set_type_sync
474
+<SUBSECTION Standard>
475
+UDISKS_LINUX_PARTITION
476
+UDISKS_IS_LINUX_PARTITION
477
+UDISKS_TYPE_LINUX_PARTITION
478
+<SUBSECTION Private>
479
+udisks_linux_partition_get_type
480
+</SECTION>
481
+
482
+<SECTION>
483
+<FILE>udiskslinuxpartitiontable</FILE>
484
+UDisksLinuxPartitionTable
485
+udisks_linux_partition_table_new
486
+udisks_linux_partition_table_update
487
+<SUBSECTION Standard>
488
+UDISKS_LINUX_PARTITION_TABLE
489
+UDISKS_IS_LINUX_PARTITION_TABLE
490
+UDISKS_TYPE_LINUX_PARTITION_TABLE
491
+<SUBSECTION Private>
492
+udisks_linux_partition_table_get_type
493
+</SECTION>
494
+
495
+<SECTION>
496
+<FILE>udiskslinuxmdraidobject</FILE>
497
+UDisksLinuxMDRaidObject
498
+udisks_linux_mdraid_object_new
499
+udisks_linux_mdraid_object_uevent
500
+udisks_linux_mdraid_object_have_devices
501
+udisks_linux_mdraid_object_get_daemon
502
+udisks_linux_mdraid_object_get_device
503
+udisks_linux_mdraid_object_get_members
504
+udisks_linux_mdraid_object_get_uuid
505
+<SUBSECTION Standard>
506
+UDISKS_LINUX_MDRAID_OBJECT
507
+UDISKS_IS_LINUX_MDRAID_OBJECT
508
+UDISKS_TYPE_LINUX_MDRAID_OBJECT
509
+<SUBSECTION Private>
510
+udisks_linux_mdraid_object_get_type
511
+</SECTION>
512
+
513
+<SECTION>
514
+<FILE>udiskslinuxmdraid</FILE>
515
+UDisksLinuxMDRaid
516
+udisks_linux_mdraid_new
517
+udisks_linux_mdraid_update
518
+<SUBSECTION Standard>
519
+UDISKS_LINUX_MDRAID
520
+UDISKS_IS_LINUX_MDRAID
521
+UDISKS_TYPE_LINUX_MDRAID
522
+<SUBSECTION Private>
523
+udisks_linux_mdraid_get_type
524
+</SECTION>
525
+
526
+<SECTION>
527
+<FILE>UDisksModuleManager</FILE>
528
+UDisksModuleManager
529
+UDisksModuleInterfaceInfo
530
+UDisksObjectHasInterfaceFunc
531
+UDisksObjectConnectInterfaceFunc
532
+UDisksObjectUpdateInterfaceFunc
533
+UDisksModuleObjectNewFunc
534
+UDisksModuleNewManagerIfaceFunc
535
+UDisksModuleInitFunc
536
+UDisksModuleIfaceSetupFunc
537
+UDisksModuleObjectNewSetupFunc
538
+UDisksModuleNewManagerIfaceSetupFunc
539
+UDisksModuleObject
540
+UDisksModuleObjectIface
541
+udisks_module_manager_new
542
+udisks_module_manager_get_modules_available
543
+udisks_module_manager_load_modules
544
+udisks_module_manager_get_module_state_pointer
545
+udisks_module_manager_set_module_state_pointer
546
+udisks_module_manager_get_block_object_iface_infos
547
+udisks_module_manager_get_drive_object_iface_infos
548
+udisks_module_manager_get_module_object_new_funcs
549
+udisks_module_manager_get_new_manager_iface_funcs
550
+udisks_module_object_process_uevent
551
+udisks_module_object_housekeeping
552
+<SUBSECTION Standard>
553
+UDISKS_IS_MODULE_MANAGER
554
+UDISKS_IS_MODULE_OBJECT
555
+UDISKS_MODULE_MANAGER
556
+UDISKS_MODULE_OBJECT
557
+UDISKS_MODULE_OBJECT_GET_IFACE
558
+UDISKS_TYPE_MODULE_MANAGER
559
+UDISKS_TYPE_MODULE_OBJECT
560
+<SUBSECTION Private>
561
+udisks_module_manager_get_type
562
+udisks_module_object_get_type
563
+</SECTION>
(-)sysutils/libudisks/files/patch-doc_udisks2-sections.txt.daemon.sed (+6 lines)
Line 0 Link Here
1
--- doc/udisks2-sections.txt.daemon.sed.orig	2019-10-03 03:15:30 UTC
2
+++ doc/udisks2-sections.txt.daemon.sed
3
@@ -0,0 +1,3 @@
4
+/<!-- DAEMON_GENERATED_SECTIONS -->/ {
5
+    r udisks2-sections.txt.daemon.sections
6
+    d }
(-)sysutils/libudisks/files/patch-doc_udisks2-sections.txt.in.in (+605 lines)
Line 0 Link Here
1
--- doc/udisks2-sections.txt.in.in.orig	2019-07-22 16:24:44 UTC
2
+++ doc/udisks2-sections.txt.in.in
3
@@ -108,385 +108,6 @@ udisks_object_info_get_type
4
 </SECTION>
5
 
6
 <SECTION>
7
-<FILE>udisksdaemon</FILE>
8
-<TITLE>UDisksDaemon</TITLE>
9
-UDisksDaemon
10
-udisks_daemon_new
11
-udisks_daemon_get_connection
12
-udisks_daemon_get_object_manager
13
-udisks_daemon_get_mount_monitor
14
-udisks_daemon_get_fstab_monitor
15
-udisks_daemon_get_crypttab_monitor
16
-udisks_daemon_get_linux_provider
17
-udisks_daemon_get_authority
18
-udisks_daemon_get_state
19
-UDisksDaemonWaitFunc
20
-udisks_daemon_wait_for_object_sync
21
-udisks_daemon_get_objects
22
-udisks_daemon_find_object
23
-udisks_daemon_find_block
24
-udisks_daemon_find_block_by_device_file
25
-udisks_daemon_find_block_by_sysfs_path
26
-udisks_daemon_launch_simple_job
27
-udisks_daemon_launch_spawned_job
28
-udisks_daemon_launch_spawned_job_sync
29
-udisks_daemon_launch_threaded_job
30
-udisks_daemon_get_disable_modules
31
-udisks_daemon_get_force_load_modules
32
-udisks_daemon_get_module_manager
33
-<SUBSECTION Standard>
34
-UDISKS_TYPE_DAEMON
35
-UDISKS_DAEMON
36
-UDISKS_IS_DAEMON
37
-<SUBSECTION Private>
38
-udisks_daemon_get_type
39
-udisks_daemon_marshal_BOOLEAN__BOOLEAN_BOXED
40
-udisks_daemon_marshal_BOOLEAN__BOXED_INT_BOXED_BOXED
41
-</SECTION>
42
-
43
-<SECTION>
44
-<FILE>udisksbasejob</FILE>
45
-<TITLE>UDisksBaseJob</TITLE>
46
-UDisksBaseJob
47
-UDisksBaseJobClass
48
-udisks_base_job_get_daemon
49
-udisks_base_job_get_cancellable
50
-udisks_base_job_get_auto_estimate
51
-udisks_base_job_set_auto_estimate
52
-udisks_base_job_add_object
53
-udisks_base_job_remove_object
54
-<SUBSECTION Standard>
55
-UDISKS_TYPE_BASE_JOB
56
-UDISKS_BASE_JOB
57
-UDISKS_IS_BASE_JOB
58
-UDISKS_BASE_JOB_CLASS
59
-UDISKS_BASE_JOB_GET_CLASS
60
-UDISKS_IS_BASE_JOB_CLASS
61
-UDisksBaseJobPrivate
62
-<SUBSECTION Private>
63
-udisks_base_job_get_type
64
-</SECTION>
65
-
66
-<SECTION>
67
-<FILE>udisksspawnedjob</FILE>
68
-<TITLE>UDisksSpawnedJob</TITLE>
69
-UDisksSpawnedJob
70
-udisks_spawned_job_new
71
-udisks_spawned_job_get_command_line
72
-udisks_spawned_job_start
73
-<SUBSECTION Standard>
74
-UDISKS_TYPE_SPAWNED_JOB
75
-UDISKS_SPAWNED_JOB
76
-UDISKS_IS_SPAWNED_JOB
77
-<SUBSECTION Private>
78
-udisks_spawned_job_get_type
79
-</SECTION>
80
-
81
-<SECTION>
82
-<FILE>udisksthreadedjob</FILE>
83
-<TITLE>UDisksThreadedJob</TITLE>
84
-UDisksThreadedJob
85
-UDisksThreadedJobFunc
86
-udisks_threaded_job_new
87
-udisks_threaded_job_start
88
-udisks_threaded_job_run_sync
89
-udisks_threaded_job_get_user_data
90
-<SUBSECTION Standard>
91
-UDISKS_TYPE_THREADED_JOB
92
-UDISKS_THREADED_JOB
93
-UDISKS_IS_THREADED_JOB
94
-<SUBSECTION Private>
95
-udisks_threaded_job_get_type
96
-</SECTION>
97
-
98
-<SECTION>
99
-<FILE>udiskssimplejob</FILE>
100
-<TITLE>UDisksSimpleJob</TITLE>
101
-UDisksSimpleJob
102
-udisks_simple_job_new
103
-udisks_simple_job_complete
104
-<SUBSECTION Standard>
105
-UDISKS_TYPE_SIMPLE_JOB
106
-UDISKS_SIMPLE_JOB
107
-UDISKS_IS_SIMPLE_JOB
108
-<SUBSECTION Private>
109
-udisks_simple_job_get_type
110
-</SECTION>
111
-
112
-<SECTION>
113
-<FILE>udiskslinuxdriveobject</FILE>
114
-<TITLE>UDisksLinuxDriveObject</TITLE>
115
-UDisksLinuxDriveObject
116
-udisks_linux_drive_object_new
117
-udisks_linux_drive_object_uevent
118
-udisks_linux_drive_object_get_daemon
119
-udisks_linux_drive_object_get_block
120
-udisks_linux_drive_object_get_device
121
-udisks_linux_drive_object_get_devices
122
-udisks_linux_drive_object_get_siblings
123
-udisks_linux_drive_object_housekeeping
124
-udisks_linux_drive_object_is_not_in_use
125
-<SUBSECTION Standard>
126
-UDISKS_TYPE_LINUX_DRIVE_OBJECT
127
-UDISKS_LINUX_DRIVE_OBJECT
128
-UDISKS_IS_LINUX_DRIVE_OBJECT
129
-<SUBSECTION Private>
130
-udisks_linux_drive_object_get_type
131
-udisks_linux_drive_object_should_include_device
132
-</SECTION>
133
-
134
-<SECTION>
135
-<FILE>udiskslinuxdrive</FILE>
136
-UDisksLinuxDrive
137
-udisks_linux_drive_new
138
-udisks_linux_drive_update
139
-<SUBSECTION Standard>
140
-UDISKS_LINUX_DRIVE
141
-UDISKS_IS_LINUX_DRIVE
142
-UDISKS_TYPE_LINUX_DRIVE
143
-<SUBSECTION Private>
144
-udisks_linux_drive_get_type
145
-</SECTION>
146
-
147
-<SECTION>
148
-<FILE>udiskslinuxdriveata</FILE>
149
-UDisksLinuxDriveAta
150
-udisks_linux_drive_ata_new
151
-udisks_linux_drive_ata_update
152
-udisks_linux_drive_ata_refresh_smart_sync
153
-udisks_linux_drive_ata_smart_selftest_sync
154
-udisks_linux_drive_ata_apply_configuration
155
-udisks_linux_drive_ata_secure_erase_sync
156
-udisks_linux_drive_ata_get_pm_state
157
-UDISKS_LINUX_DRIVE_ATA_IS_AWAKE
158
-<SUBSECTION Standard>
159
-UDISKS_LINUX_DRIVE_ATA
160
-UDISKS_IS_LINUX_DRIVE_ATA
161
-UDISKS_TYPE_LINUX_DRIVE_ATA
162
-<SUBSECTION Private>
163
-udisks_linux_drive_ata_get_type
164
-</SECTION>
165
-
166
-<SECTION>
167
-<FILE>udisksprovider</FILE>
168
-<TITLE>UDisksProvider</TITLE>
169
-UDisksProvider
170
-UDisksProviderClass
171
-udisks_provider_start
172
-udisks_provider_get_daemon
173
-<SUBSECTION Standard>
174
-UDISKS_TYPE_PROVIDER
175
-UDISKS_PROVIDER
176
-UDISKS_PROVIDER_GET_CLASS
177
-UDISKS_PROVIDER_CLASS
178
-UDISKS_IS_PROVIDER
179
-UDISKS_IS_PROVIDER_CLASS
180
-<SUBSECTION Private>
181
-udisks_provider_get_type
182
-UDisksProviderPrivate
183
-</SECTION>
184
-
185
-<SECTION>
186
-<FILE>udiskslinuxprovider</FILE>
187
-<TITLE>UDisksLinuxProvider</TITLE>
188
-UDisksLinuxProvider
189
-udisks_linux_provider_new
190
-udisks_linux_provider_get_udev_client
191
-udisks_linux_provider_get_coldplug
192
-<SUBSECTION Standard>
193
-UDISKS_TYPE_LINUX_PROVIDER
194
-UDISKS_LINUX_PROVIDER
195
-UDISKS_IS_LINUX_PROVIDER
196
-<SUBSECTION Private>
197
-udisks_linux_provider_get_type
198
-</SECTION>
199
-
200
-<SECTION>
201
-<FILE>udisksmountmonitor</FILE>
202
-<TITLE>UDisksMountMonitor</TITLE>
203
-UDisksMount
204
-UDisksMountType
205
-udisks_mount_get_dev
206
-udisks_mount_get_mount_type
207
-udisks_mount_get_mount_path
208
-udisks_mount_compare
209
-UDisksMountMonitor
210
-udisks_mount_monitor_new
211
-udisks_mount_monitor_get_mounts_for_dev
212
-udisks_mount_monitor_is_dev_in_use
213
-<SUBSECTION Standard>
214
-UDISKS_TYPE_MOUNT
215
-UDISKS_MOUNT
216
-UDISKS_IS_MOUNT
217
-UDISKS_TYPE_MOUNT_MONITOR
218
-UDISKS_MOUNT_MONITOR
219
-UDISKS_IS_MOUNT_MONITOR
220
-<SUBSECTION Private>
221
-udisks_mount_get_type
222
-udisks_mount_monitor_get_type
223
-</SECTION>
224
-
225
-<SECTION>
226
-<FILE>udisksstate</FILE>
227
-<TITLE>UDisksState</TITLE>
228
-UDisksState
229
-udisks_state_new
230
-udisks_state_start_cleanup
231
-udisks_state_stop_cleanup
232
-udisks_state_check
233
-udisks_state_check_sync
234
-udisks_state_get_daemon
235
-<SUBSECTION>
236
-udisks_state_add_mounted_fs
237
-udisks_state_find_mounted_fs
238
-<SUBSECTION>
239
-udisks_state_add_unlocked_crypto_dev
240
-udisks_state_find_unlocked_crypto_dev
241
-<SUBSECTION>
242
-udisks_state_add_loop
243
-udisks_state_has_loop
244
-<SUBSECTION>
245
-udisks_state_add_mdraid
246
-udisks_state_has_mdraid
247
-<SUBSECTION Standard>
248
-UDISKS_TYPE_STATE
249
-UDISKS_STATE
250
-UDISKS_IS_STATE
251
-<SUBSECTION Private>
252
-udisks_state_get_type
253
-</SECTION>
254
-
255
-<SECTION>
256
-<FILE>udisksata</FILE>
257
-UDisksAtaCommandProtocol
258
-UDisksAtaCommandInput
259
-UDisksAtaCommandOutput
260
-udisks_ata_send_command_sync
261
-</SECTION>
262
-
263
-<SECTION>
264
-<FILE>udiskslinuxdevice</FILE>
265
-<TITLE>UDisksLinuxDevice</TITLE>
266
-UDisksLinuxDevice
267
-udisks_linux_device_new_sync
268
-udisks_linux_device_reprobe_sync
269
-<SUBSECTION Standard>
270
-UDISKS_TYPE_LINUX_DEVICE
271
-UDISKS_LINUX_DEVICE
272
-UDISKS_IS_LINUX_DEVICE
273
-<SUBSECTION Private>
274
-udisks_linux_device_get_type
275
-</SECTION>
276
-
277
-<SECTION>
278
-<FILE>udisksdaemonutil</FILE>
279
-udisks_decode_udev_string
280
-udisks_safe_append_to_object_path
281
-udisks_daemon_util_block_get_size
282
-udisks_daemon_util_resolve_link
283
-udisks_daemon_util_resolve_links
284
-udisks_daemon_util_check_authorization_sync
285
-udisks_daemon_util_get_caller_uid_sync
286
-udisks_daemon_util_get_caller_pid_sync
287
-udisks_daemon_util_setup_by_user
288
-udisks_daemon_util_dup_object
289
-udisks_daemon_util_escape
290
-udisks_daemon_util_escape_and_quote
291
-UDisksInhibitCookie
292
-udisks_daemon_util_inhibit_system_sync
293
-udisks_daemon_util_uninhibit_system_sync
294
-udisks_daemon_util_hexdump
295
-udisks_daemon_util_hexdump_debug
296
-udisks_daemon_util_file_set_contents
297
-udisks_daemon_util_on_user_seat
298
-udisks_daemon_util_get_free_mdraid_device
299
-udisks_ata_identify_get_word
300
-</SECTION>
301
-
302
-<SECTION>
303
-<FILE>udiskslinuxblockobject</FILE>
304
-<TITLE>UDisksLinuxBlockObject</TITLE>
305
-UDisksLinuxBlockObject
306
-udisks_linux_block_object_new
307
-udisks_linux_block_object_uevent
308
-udisks_linux_block_object_get_daemon
309
-udisks_linux_block_object_get_device
310
-udisks_linux_block_object_trigger_uevent
311
-udisks_linux_block_object_reread_partition_table
312
-<SUBSECTION Standard>
313
-UDISKS_TYPE_LINUX_BLOCK_OBJECT
314
-UDISKS_LINUX_BLOCK_OBJECT
315
-UDISKS_IS_LINUX_BLOCK_OBJECT
316
-<SUBSECTION Private>
317
-udisks_linux_block_object_get_type
318
-</SECTION>
319
-
320
-<SECTION>
321
-<FILE>udiskslinuxblock</FILE>
322
-UDisksLinuxBlock
323
-udisks_linux_block_new
324
-udisks_linux_block_update
325
-<SUBSECTION Standard>
326
-UDISKS_LINUX_BLOCK
327
-UDISKS_IS_LINUX_BLOCK
328
-UDISKS_TYPE_LINUX_BLOCK
329
-<SUBSECTION Private>
330
-udisks_linux_block_get_type
331
-</SECTION>
332
-
333
-<SECTION>
334
-<FILE>udiskslinuxfilesystem</FILE>
335
-UDisksLinuxFilesystem
336
-udisks_linux_filesystem_new
337
-udisks_linux_filesystem_update
338
-<SUBSECTION Standard>
339
-UDISKS_LINUX_FILESYSTEM
340
-UDISKS_IS_LINUX_FILESYSTEM
341
-UDISKS_TYPE_LINUX_FILESYSTEM
342
-<SUBSECTION Private>
343
-udisks_linux_filesystem_get_type
344
-</SECTION>
345
-
346
-<SECTION>
347
-<FILE>udiskslinuxencrypted</FILE>
348
-UDisksLinuxEncrypted
349
-udisks_linux_encrypted_new
350
-udisks_linux_encrypted_update
351
-<SUBSECTION Standard>
352
-UDISKS_LINUX_ENCRYPTED
353
-UDISKS_IS_LINUX_ENCRYPTED
354
-UDISKS_TYPE_LINUX_ENCRYPTED
355
-<SUBSECTION Private>
356
-udisks_linux_encrypted_get_type
357
-</SECTION>
358
-
359
-<SECTION>
360
-<FILE>udiskslinuxswapspace</FILE>
361
-UDisksLinuxSwapspace
362
-udisks_linux_swapspace_new
363
-udisks_linux_swapspace_update
364
-<SUBSECTION Standard>
365
-UDISKS_LINUX_SWAPSPACE
366
-UDISKS_IS_LINUX_SWAPSPACE
367
-UDISKS_TYPE_LINUX_SWAPSPACE
368
-<SUBSECTION Private>
369
-udisks_linux_swapspace_get_type
370
-</SECTION>
371
-
372
-<SECTION>
373
-<FILE>udiskslinuxloop</FILE>
374
-UDisksLinuxLoop
375
-udisks_linux_loop_new
376
-udisks_linux_loop_update
377
-<SUBSECTION Standard>
378
-UDISKS_LINUX_LOOP
379
-UDISKS_IS_LINUX_LOOP
380
-UDISKS_TYPE_LINUX_LOOP
381
-<SUBSECTION Private>
382
-udisks_linux_loop_get_type
383
-</SECTION>
384
-
385
-<SECTION>
386
 <FILE>UDisksObject</FILE>
387
 <TITLE>UDisksObject</TITLE>
388
 UDisksObject
389
@@ -1310,20 +931,6 @@ udisks_manager_skeleton_get_type
390
 </SECTION>
391
 
392
 <SECTION>
393
-<FILE>udiskslinuxmanager</FILE>
394
-<TITLE>UDisksLinuxManager</TITLE>
395
-UDisksLinuxManager
396
-udisks_linux_manager_new
397
-udisks_linux_manager_get_daemon
398
-<SUBSECTION Standard>
399
-UDISKS_TYPE_LINUX_MANAGER
400
-UDISKS_LINUX_MANAGER
401
-UDISKS_IS_LINUX_MANAGER
402
-<SUBSECTION Private>
403
-udisks_linux_manager_get_type
404
-</SECTION>
405
-
406
-<SECTION>
407
 <FILE>UDisksLoop</FILE>
408
 UDisksLoop
409
 UDisksLoopIface
410
@@ -1379,6 +986,8 @@ udisks_loop_proxy_get_type
411
 udisks_loop_skeleton_get_type
412
 </SECTION>
413
 
414
+<!-- DAEMON_GENERATED_SECTIONS -->
415
+
416
 <!-- LSM_GENERATED_SECTIONS -->
417
 
418
 <!-- LVM2_GENERATED_SECTIONS -->
419
@@ -1394,77 +1003,6 @@ udisks_loop_skeleton_get_type
420
 <!-- VDO_GENERATED_SECTIONS -->
421
 
422
 <SECTION>
423
-<FILE>udisksfstabmonitor</FILE>
424
-<TITLE>UDisksFstabMonitor</TITLE>
425
-UDisksFstabEntry
426
-udisks_fstab_entry_get_fsname
427
-udisks_fstab_entry_get_dir
428
-udisks_fstab_entry_get_fstype
429
-udisks_fstab_entry_get_opts
430
-udisks_fstab_entry_get_freq
431
-udisks_fstab_entry_get_passno
432
-udisks_fstab_entry_compare
433
-UDisksFstabMonitor
434
-udisks_fstab_monitor_new
435
-udisks_fstab_monitor_get_entries
436
-<SUBSECTION Standard>
437
-UDISKS_TYPE_FSTAB_ENTRY
438
-UDISKS_FSTAB_ENTRY
439
-UDISKS_IS_FSTAB_ENTRY
440
-UDISKS_TYPE_FSTAB_MONITOR
441
-UDISKS_FSTAB_MONITOR
442
-UDISKS_IS_FSTAB_MONITOR
443
-<SUBSECTION Private>
444
-udisks_fstab_entry_get_type
445
-udisks_fstab_monitor_get_type
446
-</SECTION>
447
-
448
-<SECTION>
449
-<FILE>udiskscrypttabmonitor</FILE>
450
-<TITLE>UDisksCrypttabMonitor</TITLE>
451
-UDisksCrypttabEntry
452
-udisks_crypttab_entry_get_name
453
-udisks_crypttab_entry_get_device
454
-udisks_crypttab_entry_get_passphrase_path
455
-udisks_crypttab_entry_get_options
456
-udisks_crypttab_entry_compare
457
-UDisksCrypttabMonitor
458
-udisks_crypttab_monitor_new
459
-udisks_crypttab_monitor_get_entries
460
-<SUBSECTION Standard>
461
-UDISKS_TYPE_CRYPTTAB_ENTRY
462
-UDISKS_CRYPTTAB_ENTRY
463
-UDISKS_IS_CRYPTTAB_ENTRY
464
-UDISKS_TYPE_CRYPTTAB_MONITOR
465
-UDISKS_CRYPTTAB_MONITOR
466
-UDISKS_IS_CRYPTTAB_MONITOR
467
-<SUBSECTION Private>
468
-udisks_crypttab_entry_get_type
469
-udisks_crypttab_monitor_get_type
470
-</SECTION>
471
-
472
-<SECTION>
473
-<FILE>udisksutabmonitor</FILE>
474
-<TITLE>UDisksUtabMonitor</TITLE>
475
-UDisksUtabEntry
476
-udisks_utab_entry_get_source
477
-udisks_utab_entry_get_opts
478
-UDisksUtabMonitor
479
-udisks_utab_monitor_new
480
-udisks_utab_monitor_get_entries
481
-<SUBSECTION Standard>
482
-UDISKS_TYPE_UTAB_ENTRY
483
-UDISKS_UTAB_ENTRY
484
-UDISKS_IS_UTAB_ENTRY
485
-UDISKS_TYPE_UTAB_MONITOR
486
-UDISKS_UTAB_MONITOR
487
-UDISKS_IS_UTAB_MONITOR
488
-<SUBSECTION Private>
489
-udisks_utab_entry_get_type
490
-udisks_utab_monitor_get_type
491
-</SECTION>
492
-
493
-<SECTION>
494
 <FILE>UDisksPartition</FILE>
495
 UDisksPartition
496
 UDisksPartitionIface
497
@@ -1601,64 +1139,6 @@ udisks_partition_table_skeleton_get_type
498
 </SECTION>
499
 
500
 <SECTION>
501
-<FILE>udiskslinuxpartition</FILE>
502
-UDisksLinuxPartition
503
-udisks_linux_partition_new
504
-udisks_linux_partition_update
505
-udisks_linux_partition_set_type_sync
506
-<SUBSECTION Standard>
507
-UDISKS_LINUX_PARTITION
508
-UDISKS_IS_LINUX_PARTITION
509
-UDISKS_TYPE_LINUX_PARTITION
510
-<SUBSECTION Private>
511
-udisks_linux_partition_get_type
512
-</SECTION>
513
-
514
-<SECTION>
515
-<FILE>udiskslinuxpartitiontable</FILE>
516
-UDisksLinuxPartitionTable
517
-udisks_linux_partition_table_new
518
-udisks_linux_partition_table_update
519
-<SUBSECTION Standard>
520
-UDISKS_LINUX_PARTITION_TABLE
521
-UDISKS_IS_LINUX_PARTITION_TABLE
522
-UDISKS_TYPE_LINUX_PARTITION_TABLE
523
-<SUBSECTION Private>
524
-udisks_linux_partition_table_get_type
525
-</SECTION>
526
-
527
-<SECTION>
528
-<FILE>udiskslinuxmdraidobject</FILE>
529
-UDisksLinuxMDRaidObject
530
-udisks_linux_mdraid_object_new
531
-udisks_linux_mdraid_object_uevent
532
-udisks_linux_mdraid_object_have_devices
533
-udisks_linux_mdraid_object_get_daemon
534
-udisks_linux_mdraid_object_get_device
535
-udisks_linux_mdraid_object_get_members
536
-udisks_linux_mdraid_object_get_uuid
537
-<SUBSECTION Standard>
538
-UDISKS_LINUX_MDRAID_OBJECT
539
-UDISKS_IS_LINUX_MDRAID_OBJECT
540
-UDISKS_TYPE_LINUX_MDRAID_OBJECT
541
-<SUBSECTION Private>
542
-udisks_linux_mdraid_object_get_type
543
-</SECTION>
544
-
545
-<SECTION>
546
-<FILE>udiskslinuxmdraid</FILE>
547
-UDisksLinuxMDRaid
548
-udisks_linux_mdraid_new
549
-udisks_linux_mdraid_update
550
-<SUBSECTION Standard>
551
-UDISKS_LINUX_MDRAID
552
-UDISKS_IS_LINUX_MDRAID
553
-UDISKS_TYPE_LINUX_MDRAID
554
-<SUBSECTION Private>
555
-udisks_linux_mdraid_get_type
556
-</SECTION>
557
-
558
-<SECTION>
559
 <FILE>UDisksMDRaid</FILE>
560
 UDisksMDRaid
561
 UDisksMDRaidIface
562
@@ -1757,43 +1237,4 @@ UDisksMDRaidSkeletonPrivate
563
 udisks_mdraid_get_type
564
 udisks_mdraid_proxy_get_type
565
 udisks_mdraid_skeleton_get_type
566
-</SECTION>
567
-
568
-<SECTION>
569
-<FILE>UDisksModuleManager</FILE>
570
-UDisksModuleManager
571
-UDisksModuleInterfaceInfo
572
-UDisksObjectHasInterfaceFunc
573
-UDisksObjectConnectInterfaceFunc
574
-UDisksObjectUpdateInterfaceFunc
575
-UDisksModuleObjectNewFunc
576
-UDisksModuleNewManagerIfaceFunc
577
-UDisksModuleInitFunc
578
-UDisksModuleIfaceSetupFunc
579
-UDisksModuleObjectNewSetupFunc
580
-UDisksModuleNewManagerIfaceSetupFunc
581
-UDisksModuleObject
582
-UDisksModuleObjectIface
583
-udisks_module_manager_new
584
-udisks_module_manager_get_modules_available
585
-udisks_module_manager_load_modules
586
-udisks_module_manager_get_module_state_pointer
587
-udisks_module_manager_set_module_state_pointer
588
-udisks_module_manager_get_block_object_iface_infos
589
-udisks_module_manager_get_drive_object_iface_infos
590
-udisks_module_manager_get_module_object_new_funcs
591
-udisks_module_manager_get_new_manager_iface_funcs
592
-udisks_module_object_process_uevent
593
-udisks_module_object_housekeeping
594
-<SUBSECTION Standard>
595
-UDISKS_IS_MODULE_MANAGER
596
-UDISKS_IS_MODULE_OBJECT
597
-UDISKS_MODULE_MANAGER
598
-UDISKS_MODULE_OBJECT
599
-UDISKS_MODULE_OBJECT_GET_IFACE
600
-UDISKS_TYPE_MODULE_MANAGER
601
-UDISKS_TYPE_MODULE_OBJECT
602
-<SUBSECTION Private>
603
-udisks_module_manager_get_type
604
-udisks_module_object_get_type
605
 </SECTION>
(-)sysutils/libudisks/files/patch-doc_udisks2.types.daemon.in (+32 lines)
Line 0 Link Here
1
--- doc/udisks2.types.daemon.in.orig	2019-10-03 03:15:30 UTC
2
+++ doc/udisks2.types.daemon.in
3
@@ -0,0 +1,29 @@
4
+udisks_daemon_get_type
5
+udisks_linux_device_get_type
6
+udisks_linux_block_object_get_type
7
+udisks_linux_block_get_type
8
+udisks_linux_drive_object_get_type
9
+udisks_linux_drive_get_type
10
+udisks_linux_drive_ata_get_type
11
+udisks_base_job_get_type
12
+udisks_spawned_job_get_type
13
+udisks_threaded_job_get_type
14
+udisks_simple_job_get_type
15
+udisks_mount_get_type
16
+udisks_mount_monitor_get_type
17
+udisks_provider_get_type
18
+udisks_linux_provider_get_type
19
+udisks_linux_filesystem_get_type
20
+udisks_linux_partition_get_type
21
+udisks_linux_partition_table_get_type
22
+udisks_linux_encrypted_get_type
23
+udisks_linux_swapspace_get_type
24
+udisks_linux_loop_get_type
25
+udisks_linux_manager_get_type
26
+udisks_state_get_type
27
+udisks_fstab_entry_get_type
28
+udisks_fstab_monitor_get_type
29
+udisks_crypttab_entry_get_type
30
+udisks_crypttab_monitor_get_type
31
+udisks_linux_mdraid_object_get_type
32
+udisks_linux_mdraid_get_type
(-)sysutils/libudisks/files/patch-doc_udisks2.types.daemon.sed (+6 lines)
Line 0 Link Here
1
--- doc/udisks2.types.daemon.sed.orig	2019-10-03 03:15:30 UTC
2
+++ doc/udisks2.types.daemon.sed
3
@@ -0,0 +1,3 @@
4
+/\# DAEMON_TYPES/ {
5
+    r udisks2.types.daemon
6
+    d }
(-)sysutils/libudisks/files/patch-doc_udisks2.types.in.in (+48 lines)
Line 0 Link Here
1
--- doc/udisks2.types.in.in.orig	2019-07-22 16:24:44 UTC
2
+++ doc/udisks2.types.in.in
3
@@ -3,36 +3,6 @@ udisks_object_info_get_type
4
 udisks_partition_type_info_get_type
5
 udisks_partition_type_info_flags_get_type
6
 
7
-udisks_daemon_get_type
8
-udisks_linux_device_get_type
9
-udisks_linux_block_object_get_type
10
-udisks_linux_block_get_type
11
-udisks_linux_drive_object_get_type
12
-udisks_linux_drive_get_type
13
-udisks_linux_drive_ata_get_type
14
-udisks_base_job_get_type
15
-udisks_spawned_job_get_type
16
-udisks_threaded_job_get_type
17
-udisks_simple_job_get_type
18
-udisks_mount_get_type
19
-udisks_mount_monitor_get_type
20
-udisks_provider_get_type
21
-udisks_linux_provider_get_type
22
-udisks_linux_filesystem_get_type
23
-udisks_linux_partition_get_type
24
-udisks_linux_partition_table_get_type
25
-udisks_linux_encrypted_get_type
26
-udisks_linux_swapspace_get_type
27
-udisks_linux_loop_get_type
28
-udisks_linux_manager_get_type
29
-udisks_state_get_type
30
-udisks_fstab_entry_get_type
31
-udisks_fstab_monitor_get_type
32
-udisks_crypttab_entry_get_type
33
-udisks_crypttab_monitor_get_type
34
-udisks_linux_mdraid_object_get_type
35
-udisks_linux_mdraid_get_type
36
-
37
 udisks_drive_get_type
38
 udisks_drive_proxy_get_type
39
 udisks_drive_skeleton_get_type
40
@@ -67,6 +37,8 @@ udisks_object_get_type
41
 udisks_object_proxy_get_type
42
 udisks_object_skeleton_get_type
43
 udisks_object_manager_client_get_type
44
+
45
+# DAEMON_TYPES
46
 
47
 # LVM2_TYPES
48
 
(-)sysutils/libudisks/files/patch-tools_Makefile.am (+18 lines)
Line 0 Link Here
1
--- tools/Makefile.am.orig	2019-07-22 16:24:44 UTC
2
+++ tools/Makefile.am
3
@@ -38,6 +38,7 @@ udisksctl_LDADD =                                     
4
 
5
 # ------------------------------------------------------------------------------
6
 
7
+if ENABLE_DAEMON
8
 sbin_PROGRAMS = umount.udisks2
9
 
10
 umount_udisks2_SOURCES =                                                       \
11
@@ -54,6 +55,7 @@ umount_udisks2_LDADD =                                
12
 	$(GIO_LIBS)                                                            \
13
 	$(top_builddir)/udisks/libudisks2.la                                   \
14
 	$(NULL)
15
+endif
16
 
17
 # ------------------------------------------------------------------------------
18
 
(-)sysutils/libudisks/files/patch-udisks_Makefile.am (+52 lines)
Line 0 Link Here
1
--- udisks/Makefile.am.orig	2019-07-22 16:24:44 UTC
2
+++ udisks/Makefile.am
3
@@ -4,9 +4,11 @@ SUBDIRS = modules.conf.d
4
 
5
 NULL =
6
 
7
+if ENABLE_DAEMON
8
 moduleconfdir = $(sysconfdir)/udisks2/
9
 
10
 moduleconf_DATA = udisks2.conf
11
+endif
12
 
13
 AM_CPPFLAGS = \
14
 	-I$(top_builddir) -I$(top_srcdir)	 		\
15
@@ -39,13 +41,13 @@ udisksenumtypes.h: udisksenums.h udisksenumtypes.h.tem
16
 	( top_builddir=`cd $(top_builddir) && pwd`; 						\
17
 	 cd $(srcdir) && glib-mkenums --template udisksenumtypes.h.template udisksenums.h ) | 	\
18
 	   sed 's,U_TYPE_DISKS,UDISKS_TYPE,' | sed 's,u_disks,udisks,' > 			\
19
-	   udisksenumtypes.h.tmp && mv udisksenumtypes.h.tmp udisksenumtypes.h
20
+	   udisksenumtypes.h.tmp && mv -f udisksenumtypes.h.tmp udisksenumtypes.h
21
 
22
 udisksenumtypes.c: udisksenums.h udisksenumtypes.c.template
23
 	( top_builddir=`cd $(top_builddir) && pwd`; 						\
24
 	 cd $(srcdir) && glib-mkenums --template udisksenumtypes.c.template udisksenums.h ) | 	\
25
 	   sed 's,U_TYPE_DISKS,UDISKS_TYPE,' | sed 's,u_disks,udisks,' > 			\
26
-	   udisksenumtypes.c.tmp && mv udisksenumtypes.c.tmp udisksenumtypes.c
27
+	   udisksenumtypes.c.tmp && mv -f udisksenumtypes.c.tmp udisksenumtypes.c
28
 
29
 enum_built_sources =									\
30
 	udisksenumtypes.h			udisksenumtypes.c			\
31
@@ -56,7 +58,7 @@ dbus_built_sources =									\
32
 	$(NULL)
33
 
34
 udisksversion.h: $(top_srcdir)/udisks/udisksversion.h.in
35
-	   sed -e 's/@MAJOR_VERSION@/$(UDISKS_MAJOR_VERSION)/' -e 's/@MINOR_VERSION@/$(UDISKS_MINOR_VERSION)/' -e 's/@MICRO_VERSION@/$(UDISKS_MICRO_VERSION)/' $(top_srcdir)/udisks/udisksversion.h.in > udisksversion.h.tmp && mv udisksversion.h.tmp udisksversion.h
36
+	   sed -e 's/@MAJOR_VERSION@/$(UDISKS_MAJOR_VERSION)/' -e 's/@MINOR_VERSION@/$(UDISKS_MINOR_VERSION)/' -e 's/@MICRO_VERSION@/$(UDISKS_MICRO_VERSION)/' $(top_srcdir)/udisks/udisksversion.h.in > udisksversion.h.tmp && mv -f udisksversion.h.tmp udisksversion.h
37
 
38
 BUILT_SOURCES =										\
39
 	$(enum_built_sources)								\
40
@@ -115,10 +117,10 @@ if HAVE_INTROSPECTION
41
 
42
 INTROSPECTION_GIRS = UDisks-2.0.gir
43
 
44
-girdir = $(INTROSPECTION_GIRDIR)
45
+girdir = $(datadir)/gir-1.0
46
 gir_DATA = UDisks-2.0.gir
47
 
48
-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
49
+typelibsdir = $(libdir)/girepository-1.0
50
 typelibs_DATA = UDisks-2.0.typelib
51
 
52
 UDisks_2_0_gir_SCANNERFLAGS = 			\
(-)sysutils/libudisks/files/patch-udisks_udisksclient.c (+44 lines)
Line 0 Link Here
1
--- udisks/udisksclient.c.orig	2019-07-22 16:24:44 UTC
2
+++ udisks/udisksclient.c
3
@@ -19,6 +19,7 @@
4
  */
5
 
6
 #include "config.h"
7
+#include <glib.h>
8
 #include <glib/gi18n-lib.h>
9
 
10
 #include "udisksclient.h"
11
@@ -26,11 +27,6 @@
12
 #include "udisks-generated.h"
13
 #include "udisksobjectinfo.h"
14
 
15
-/* For __GNUC_PREREQ usage below */
16
-#ifdef __GNUC__
17
-# include <features.h>
18
-#endif
19
-
20
 /**
21
  * SECTION:udisksclient
22
  * @title: UDisksClient
23
@@ -1983,8 +1979,8 @@ udisks_client_get_id_for_display (UDisksClient *client
24
                    (g_strcmp0 (id_type[n].version, "*") == 0 && strlen (version) > 0))
25
             {
26
               /* we know better than the compiler here */
27
-#if defined( __GNUC_PREREQ) || defined(__clang__)
28
-# if __GNUC_PREREQ(4,6) || __clang__
29
+#if defined(__GNUC__) || defined(__clang__)
30
+# if G_GNUC_CHECK_VERSION(4, 6) || __clang__
31
 #  pragma GCC diagnostic push
32
 #  pragma GCC diagnostic ignored "-Wformat-nonliteral"
33
 # endif
34
@@ -1994,8 +1990,8 @@ udisks_client_get_id_for_display (UDisksClient *client
35
               else
36
                 ret = g_strdup_printf (g_dpgettext2 (GETTEXT_PACKAGE, "fs-type", id_type[n].short_name), version);
37
               goto out;
38
-#if defined( __GNUC_PREREQ) || defined(__clang__)
39
-# if __GNUC_PREREQ(4,6) || __clang__
40
+#if defined(__GNUC__) || defined(__clang__)
41
+# if G_GNUC_CHECK_VERSION(4, 6) || __clang__
42
 #  pragma GCC diagnostic pop
43
 # endif
44
 #endif
(-)sysutils/libudisks/pkg-descr (+12 lines)
Line 0 Link Here
1
Udisks provides interfaces to enumerate and perform operations on disks
2
and storage devices. Any application (including unprivileged ones) can
3
access the udisks(8) daemon via the name org.freedesktop.Udisks2 on the
4
system message bus. In addition to the D-bus API, a library, libudisks2,
5
is also provided. This library can be used from C/C++ and any high-level
6
language with GObjectIntrospection support such as Javascript and
7
Python.
8
9
This port provides the libudisks library only and is meant for use with
10
sysutils/bsdisks.
11
12
WWW: https://www.freedesktop.org/wiki/Software/udisks/
(-)sysutils/libudisks/pkg-plist (+19 lines)
Line 0 Link Here
1
%%UDISKSCTL%%bin/udisksctl
2
include/udisks2/udisks/udisks-generated.h
3
include/udisks2/udisks/udisks.h
4
include/udisks2/udisks/udisksclient.h
5
include/udisks2/udisks/udisksenums.h
6
include/udisks2/udisks/udisksenumtypes.h
7
include/udisks2/udisks/udiskserror.h
8
include/udisks2/udisks/udisksobjectinfo.h
9
include/udisks2/udisks/udiskstypes.h
10
include/udisks2/udisks/udisksversion.h
11
lib/girepository-1.0/UDisks-2.0.typelib
12
lib/libudisks2.a
13
lib/libudisks2.so
14
lib/libudisks2.so.0
15
lib/libudisks2.so.0.0.0
16
libdata/pkgconfig/udisks2.pc
17
%%UDISKSCTL%%share/bash-completion/completions/udisksctl
18
share/gir-1.0/UDisks-2.0.gir
19
%%UDISKSCTL%%man/man1/udisksctl.1.gz

Return to bug 240138