1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
From: Simon McVittie <smcv@debian.org>
Date: Mon, 10 Feb 2020 14:11:46 +0000
Subject: Port from obsolete gnome-doc-utils to yelp-tools
Signed-off-by: Simon McVittie <smcv@debian.org>
Bug-Debian: https://bugs.debian.org/947528
Forwarded: no
---
configure.ac | 10 ++++++++--
doc/Makefile.am | 2 ++
doc/Mallard/Makefile.am | 15 ++++++++-------
src/browsers/playlist3-file-browser.c | 2 +-
src/main.c | 2 +-
src/playlist3.c | 2 +-
6 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 96ad6a2..8b7c9d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,7 +397,13 @@ if test x$enable_shave = xyes; then
SHAVE_INIT([./])
fi
-GNOME_DOC_INIT([0.18.0], [have_gdu=yes], [have_gdu=no])
+AC_ARG_WITH([help],
+ [AS_HELP_STRING],
+ [have_yelp="$withval"],
+ [have_yelp=yes])
+AS_IF([test "x$have_yelp" != xno],
+ [YELP_HELP_INIT])
+AM_CONDITIONAL([HAVE_YELP], [test x"$have_yelp" = xyes])
AC_OUTPUT([
shave
@@ -538,7 +544,7 @@ if test "x$unique" = "xtrue"; then
else
echo "Use unique library: disabled"
fi
-if test "x$have_gdu" = "xyes"; then
+if test "x$have_yelp" = "xyes"; then
echo "Use Gnome Documentation: enabled"
else
echo "Use Gnome Documentation: disabled"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1deb85f..a9b10a7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,9 @@
man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1
EXTRA_DIST = $(man_MANS)
+if HAVE_YELP
SUBDIRS=Mallard
+endif
.PHONY: doc
doc: Manual.txt
diff --git a/doc/Mallard/Makefile.am b/doc/Mallard/Makefile.am
index 10bfdc9..f6939f9 100644
--- a/doc/Mallard/Makefile.am
+++ b/doc/Mallard/Makefile.am
@@ -1,9 +1,10 @@
-include ../../gnome-doc-utils.make
-DOC_ID = @PACKAGE@
-DOC_INCLUDES = legal.xml
-DOC_LINGUAS=
+@YELP_HELP_RULES@
-DOC_PAGES = \
+HELP_ID = @PACKAGE@
+HELP_EXTRA = legal.xml
+HELP_LINGUAS=
+
+HELP_FILES = \
AboutThisDocument.page\
BrowserArtistBrowser.page\
BrowserDatabase.page\
@@ -34,7 +35,7 @@ DOC_PAGES = \
ProblemSolving.page\
TipsAndTricks.page
-DOC_FIGURES=\
+HELP_MEDIA=\
Images/browser-pane-double.png\
Images/browser-pane-single.png\
Images/database-columns.png\
@@ -108,5 +109,5 @@ create-xhtml-pages:
@mkdir html;\
for a in $(DOC_PAGES);\
do\
- bash gnome-doc-tool xhtml --copy-graphics --css-file="style.css" "C/$$a" -o html/;\
+ yelp-build xhtml "C/$$a" -o html/;\
done
diff --git a/src/browsers/playlist3-file-browser.c b/src/browsers/playlist3-file-browser.c
index 8518566..3bd6ca8 100644
--- a/src/browsers/playlist3-file-browser.c
+++ b/src/browsers/playlist3-file-browser.c
@@ -157,7 +157,7 @@ static void playtime_changed(GmpcMpdDataModel * model, gulong playtime)
}
static void pl3_file_support_help_button_clicked(GObject *a)
{
- open_uri("ghelp:gmpc#ProblemSolving");
+ open_uri("help:gmpc#ProblemSolving");
}
static void pl3_file_browser_init(void)
{
diff --git a/src/main.c b/src/main.c
index 0c8f8e3..6b88742 100644
--- a/src/main.c
+++ b/src/main.c
@@ -881,7 +881,7 @@ void send_password(void)
static void playlist_support_help_button_clicked(GObject *a)
{
- open_uri("ghelp:gmpc#ProblemSolving");
+ open_uri("help:gmpc#ProblemSolving");
}
diff --git a/src/playlist3.c b/src/playlist3.c
index 3dac409..c0cb272 100644
--- a/src/playlist3.c
+++ b/src/playlist3.c
@@ -2504,6 +2504,6 @@ void open_local_file(void)
void show_user_manual(void);
void show_user_manual(void)
{
- open_uri("ghelp:gmpc");
+ open_uri("help:gmpc");
}
/* vim: set noexpandtab ts=4 sw=4 sts=4 tw=80: */
|
