| 1 |
leio 09/05/04 00:29:10 |
| 2 |
|
| 3 |
Added: gtk-doc-1.11-tests-fixes.patch |
| 4 |
gtk-doc-1.11-quote-filenames-with-space.patch |
| 5 |
gtk-doc-1.11-fix-index-id-gen.patch |
| 6 |
Log: |
| 7 |
New version with various bug fixes and improvements. User documentation is installed again, viewable with yelp. Remove old versions |
| 8 |
(Portage version: 2.2_rc22/cvs/Linux 2.6.29-gentoo-r2 x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gtk-doc/files/gtk-doc-1.11-tests-fixes.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: gtk-doc-1.11-tests-fixes.patch |
| 17 |
=================================================================== |
| 18 |
From 7ef64f1d7d3309612a14c22dba59a3a4a34bc381 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Stefan Kost <stefkost@×××××××××.org> |
| 20 |
Date: Sun, 4 Jan 2009 12:08:02 +0000 |
| 21 |
Subject: [PATCH 2/3] Fix running tests, if no gtk-doc is installed yet. |
| 22 |
|
| 23 |
* gtkdoc-mkhtml.in: |
| 24 |
* tests/Makefile.am: |
| 25 |
* tests/gtk-doc.make: |
| 26 |
* tests/gtk-doc.notmpl.make: |
| 27 |
* tests/gtkdoctest.sh: |
| 28 |
Fix running tests, if no gtk-doc is installed yet. |
| 29 |
|
| 30 |
svn path=/trunk/; revision=630 |
| 31 |
(cherry picked from commit 0ceaa25cb719bda5205627819fa170a41783cafc) |
| 32 |
|
| 33 |
Now aall tests pass. |
| 34 |
|
| 35 |
* tests/gtk-doc.make: |
| 36 |
* tests/gtk-doc.notmpl.make: |
| 37 |
Now aall tests pass. |
| 38 |
|
| 39 |
svn path=/trunk/; revision=631 |
| 40 |
(cherry picked from commit b3305a943c1dfe522fdc222d495a4a449d37d30c) |
| 41 |
--- |
| 42 |
ChangeLog | 15 +++++++++++++++ |
| 43 |
gtkdoc-mkhtml.in | 12 ++++++------ |
| 44 |
tests/Makefile.am | 4 +++- |
| 45 |
tests/gtk-doc.make | 12 ++++++------ |
| 46 |
tests/gtk-doc.notmpl.make | 10 +++++----- |
| 47 |
tests/gtkdoctest.sh | 2 +- |
| 48 |
6 files changed, 36 insertions(+), 19 deletions(-) |
| 49 |
|
| 50 |
diff --git a/ChangeLog b/ChangeLog |
| 51 |
index 63fa517..bc14efa 100644 |
| 52 |
--- a/ChangeLog |
| 53 |
+++ b/ChangeLog |
| 54 |
@@ -1,3 +1,18 @@ |
| 55 |
+2009-01-04 Stefan Kost <ensonic@××××××××.net> |
| 56 |
+ |
| 57 |
+ * tests/gtk-doc.make: |
| 58 |
+ * tests/gtk-doc.notmpl.make: |
| 59 |
+ Now aall tests pass. |
| 60 |
+ |
| 61 |
+2009-01-04 Stefan Kost <ensonic@××××××××.net> |
| 62 |
+ |
| 63 |
+ * gtkdoc-mkhtml.in: |
| 64 |
+ * tests/Makefile.am: |
| 65 |
+ * tests/gtk-doc.make: |
| 66 |
+ * tests/gtk-doc.notmpl.make: |
| 67 |
+ * tests/gtkdoctest.sh: |
| 68 |
+ Fix running tests, if no gtk-doc is installed yet. |
| 69 |
+ |
| 70 |
2008-12-01 Stefan Kost <ensonic@××××××××.net> |
| 71 |
|
| 72 |
patch by: Matthias Clasen <mclasen@××××××.com> |
| 73 |
diff --git a/gtkdoc-mkhtml.in b/gtkdoc-mkhtml.in |
| 74 |
index 1671cf0..d18b10e 100644 |
| 75 |
--- a/gtkdoc-mkhtml.in |
| 76 |
+++ b/gtkdoc-mkhtml.in |
| 77 |
@@ -29,16 +29,16 @@ shift |
| 78 |
document=$1 |
| 79 |
shift |
| 80 |
|
| 81 |
-# FIXME: this is a hack to run uninstalled |
| 82 |
-if test "x$0" = "x../../../gtkdoc-mkhtml" ; then |
| 83 |
- # uninstalled |
| 84 |
- gtkdocdir=`dirname $0` |
| 85 |
-else |
| 86 |
- # installed |
| 87 |
+# FIXME: this is a hack to detect uninstalled |
| 88 |
+if test "x$0" = "x@prefix@/bin/gtkdoc-mkhtml" ; then |
| 89 |
+ #echo "installed" |
| 90 |
# the first two are needed to resolve datadir |
| 91 |
prefix=@prefix@ |
| 92 |
datarootdir=@datarootdir@ |
| 93 |
gtkdocdir=@datadir@/gtk-doc/data |
| 94 |
+else |
| 95 |
+ #echo "uninstalled" |
| 96 |
+ gtkdocdir=`dirname $0` |
| 97 |
fi |
| 98 |
|
| 99 |
if head -n 1 $document | grep "<?xml" > /dev/null; then |
| 100 |
diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 101 |
index 4281c5c..1b05e7a 100644 |
| 102 |
--- a/tests/Makefile.am |
| 103 |
+++ b/tests/Makefile.am |
| 104 |
@@ -5,7 +5,9 @@ SUBDIRS = gobject bugs annotations . |
| 105 |
if BUILD_TESTS |
| 106 |
|
| 107 |
TESTS = gobject.sh bugs.sh annotations.sh |
| 108 |
-TESTS_ENVIRONMENT = PATH=$(top_builddir):$(srcdir):$(PATH) |
| 109 |
+TESTS_ENVIRONMENT = \ |
| 110 |
+ PATH=$(abs_top_builddir):$(srcdir):$(PATH) \ |
| 111 |
+ PERL5LIB=$(abs_top_builddir):$(PERL5LIB) |
| 112 |
|
| 113 |
endif |
| 114 |
|
| 115 |
diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make |
| 116 |
index 1c37e9b..b18c405 100644 |
| 117 |
--- a/tests/gtk-doc.make |
| 118 |
+++ b/tests/gtk-doc.make |
| 119 |
@@ -59,10 +59,10 @@ $(REPORT_FILES): sgml-build.stamp |
| 120 |
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) |
| 121 |
@echo 'gtk-doc: Scanning header files' |
| 122 |
@-chmod -R u+w $(srcdir) |
| 123 |
- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ |
| 124 |
+ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ |
| 125 |
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) |
| 126 |
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ |
| 127 |
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \ |
| 128 |
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \ |
| 129 |
else \ |
| 130 |
cd $(srcdir) ; \ |
| 131 |
for i in $(SCANOBJ_FILES) ; do \ |
| 132 |
@@ -79,7 +79,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE) |
| 133 |
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt |
| 134 |
@echo 'gtk-doc: Rebuilding template files' |
| 135 |
@-chmod -R u+w $(srcdir) |
| 136 |
- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ |
| 137 |
+ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ |
| 138 |
gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) |
| 139 |
touch tmpl-build.stamp |
| 140 |
|
| 141 |
@@ -94,7 +94,7 @@ tmpl/*.sgml: |
| 142 |
sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) |
| 143 |
@echo 'gtk-doc: Building XML' |
| 144 |
@-chmod -R u+w $(srcdir) |
| 145 |
- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ |
| 146 |
+ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ |
| 147 |
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) |
| 148 |
touch sgml-build.stamp |
| 149 |
|
| 150 |
@@ -108,11 +108,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) |
| 151 |
@-chmod -R u+w $(srcdir) |
| 152 |
rm -rf $(srcdir)/html |
| 153 |
mkdir $(srcdir)/html |
| 154 |
- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \ |
| 155 |
+ @cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ |
| 156 |
gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) |
| 157 |
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) |
| 158 |
@echo 'gtk-doc: Fixing cross-references' |
| 159 |
- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ |
| 160 |
+ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ |
| 161 |
gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) |
| 162 |
touch html-build.stamp |
| 163 |
|
| 164 |
diff --git a/tests/gtk-doc.notmpl.make b/tests/gtk-doc.notmpl.make |
| 165 |
index 1f4c518..46bdb41 100644 |
| 166 |
--- a/tests/gtk-doc.notmpl.make |
| 167 |
+++ b/tests/gtk-doc.notmpl.make |
| 168 |
@@ -59,10 +59,10 @@ $(REPORT_FILES): sgml-build.stamp |
| 169 |
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) |
| 170 |
@echo 'gtk-doc: Scanning header files' |
| 171 |
@-chmod -R u+w $(srcdir) |
| 172 |
- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ |
| 173 |
+ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ |
| 174 |
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) |
| 175 |
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ |
| 176 |
- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" $(top_builddir)/gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \ |
| 177 |
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(SCANGOBJ_OPTIONS); \ |
| 178 |
else \ |
| 179 |
cd $(srcdir) ; \ |
| 180 |
for i in $(SCANOBJ_FILES) ; do \ |
| 181 |
@@ -79,7 +79,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE) |
| 182 |
sgml-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) |
| 183 |
@echo 'gtk-doc: Building XML' |
| 184 |
@-chmod -R u+w $(srcdir) |
| 185 |
- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ |
| 186 |
+ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ |
| 187 |
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) |
| 188 |
touch sgml-build.stamp |
| 189 |
|
| 190 |
@@ -93,11 +93,11 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) |
| 191 |
@-chmod -R u+w $(srcdir) |
| 192 |
rm -rf $(srcdir)/html |
| 193 |
mkdir $(srcdir)/html |
| 194 |
- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir)/html && \ |
| 195 |
+ @cd $(srcdir)/html && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ |
| 196 |
gtkdoc-mkhtml --path="$(srcdir)" $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) $(MKHTML_OPTIONS) |
| 197 |
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) |
| 198 |
@echo 'gtk-doc: Fixing cross-references' |
| 199 |
- @PATH=$(top_builddir):$(PATH) PERL5LIB=$(top_builddir):$(PERL5LIB) && cd $(srcdir) && \ |
| 200 |
+ @cd $(srcdir) && PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \ |
| 201 |
gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) |
| 202 |
touch html-build.stamp |
| 203 |
|
| 204 |
diff --git a/tests/gtkdoctest.sh b/tests/gtkdoctest.sh |
| 205 |
index 2b92d57..694c4c5 100755 |
| 206 |
--- a/tests/gtkdoctest.sh |
| 207 |
+++ b/tests/gtkdoctest.sh |
| 208 |
@@ -3,7 +3,7 @@ |
| 209 |
suite=$1 |
| 210 |
dir=`dirname $0` |
| 211 |
|
| 212 |
-PATH=`pwd`:$PATH PERL5LIB=`pwd`:$PERL5LIB && cd $dir/$suite/docs && gtkdoc-check |
| 213 |
+cd $dir/$suite/docs && gtkdoc-check |
| 214 |
|
| 215 |
# xmllint --noout --nonet --schema ../devhelp2.xsd ./bugs/docs/html/tester.devhelp2 |
| 216 |
# |
| 217 |
-- |
| 218 |
1.6.1.3 |
| 219 |
|
| 220 |
|
| 221 |
|
| 222 |
|
| 223 |
1.1 dev-util/gtk-doc/files/gtk-doc-1.11-quote-filenames-with-space.patch |
| 224 |
|
| 225 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gtk-doc/files/gtk-doc-1.11-quote-filenames-with-space.patch?rev=1.1&view=markup |
| 226 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gtk-doc/files/gtk-doc-1.11-quote-filenames-with-space.patch?rev=1.1&content-type=text/plain |
| 227 |
|
| 228 |
Index: gtk-doc-1.11-quote-filenames-with-space.patch |
| 229 |
=================================================================== |
| 230 |
From d31d3e9a0733ccf229526b70b38b73889240b0ba Mon Sep 17 00:00:00 2001 |
| 231 |
From: Stefan Kost <stefkost@×××××××××.org> |
| 232 |
Date: Tue, 17 Mar 2009 11:20:01 +0000 |
| 233 |
Subject: [PATCH 3/3] patch by: Vincent Untz <vuntz@××××.org> |
| 234 |
* gtkdoc-common.pl.in: |
| 235 |
Be more friendly for files with a space in their name. Fixes #575574. |
| 236 |
|
| 237 |
svn path=/trunk/; revision=705 |
| 238 |
(cherry picked from commit 390599e14a7fc65945e3966e32ae06e2148089e2) |
| 239 |
--- |
| 240 |
ChangeLog | 8 ++++++++ |
| 241 |
gtkdoc-common.pl.in | 2 +- |
| 242 |
2 files changed, 9 insertions(+), 1 deletions(-) |
| 243 |
|
| 244 |
diff --git a/ChangeLog b/ChangeLog |
| 245 |
index bc14efa..25430b8 100644 |
| 246 |
--- a/ChangeLog |
| 247 |
+++ b/ChangeLog |
| 248 |
@@ -1,3 +1,11 @@ |
| 249 |
+2009-03-17 Stefan Kost <ensonic@××××××××.net> |
| 250 |
+ |
| 251 |
+ patch by: Vincent Untz <vuntz@××××.org> |
| 252 |
+ |
| 253 |
+ * gtkdoc-common.pl.in: |
| 254 |
+ Be more friendly for files with a space in their name. Fixes #575574. |
| 255 |
+ |
| 256 |
+ |
| 257 |
2009-01-04 Stefan Kost <ensonic@××××××××.net> |
| 258 |
|
| 259 |
* tests/gtk-doc.make: |
| 260 |
diff --git a/gtkdoc-common.pl.in b/gtkdoc-common.pl.in |
| 261 |
index 972644d..8cd7614 100644 |
| 262 |
--- a/gtkdoc-common.pl.in |
| 263 |
+++ b/gtkdoc-common.pl.in |
| 264 |
@@ -51,7 +51,7 @@ sub UpdateFileIfChanged { |
| 265 |
my $exit_code = 1; |
| 266 |
|
| 267 |
if (-e $old_file) { |
| 268 |
- `cmp -s $old_file $new_file`; |
| 269 |
+ `cmp -s "$old_file" "$new_file"`; |
| 270 |
$exit_code = $? >> 8; |
| 271 |
# print " cmp exit code: $exit_code ($?)\n"; |
| 272 |
} |
| 273 |
-- |
| 274 |
1.6.1.3 |
| 275 |
|
| 276 |
|
| 277 |
|
| 278 |
|
| 279 |
1.1 dev-util/gtk-doc/files/gtk-doc-1.11-fix-index-id-gen.patch |
| 280 |
|
| 281 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gtk-doc/files/gtk-doc-1.11-fix-index-id-gen.patch?rev=1.1&view=markup |
| 282 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/gtk-doc/files/gtk-doc-1.11-fix-index-id-gen.patch?rev=1.1&content-type=text/plain |
| 283 |
|
| 284 |
Index: gtk-doc-1.11-fix-index-id-gen.patch |
| 285 |
=================================================================== |
| 286 |
From 420db2513f558083f9b8c35315d7708b8a3700d8 Mon Sep 17 00:00:00 2001 |
| 287 |
From: Stefan Kost <stefkost@×××××××××.org> |
| 288 |
Date: Mon, 1 Dec 2008 09:22:32 +0000 |
| 289 |
Subject: [PATCH 1/3] patch by: Matthias Clasen <mclasen@××××××.com> |
| 290 |
* gtkdoc-mkdb.in: |
| 291 |
Fix index-id generation for child and style properties. Fixes #562064. |
| 292 |
|
| 293 |
svn path=/trunk/; revision=621 |
| 294 |
(cherry picked from commit 455a93571bf807f0a273c57fda81bb4956e4bcca) |
| 295 |
--- |
| 296 |
ChangeLog | 7 +++++++ |
| 297 |
gtkdoc-mkdb.in | 18 ++++++++++++------ |
| 298 |
2 files changed, 19 insertions(+), 6 deletions(-) |
| 299 |
|
| 300 |
diff --git a/ChangeLog b/ChangeLog |
| 301 |
index b315ad5..63fa517 100644 |
| 302 |
--- a/ChangeLog |
| 303 |
+++ b/ChangeLog |
| 304 |
@@ -1,3 +1,10 @@ |
| 305 |
+2008-12-01 Stefan Kost <ensonic@××××××××.net> |
| 306 |
+ |
| 307 |
+ patch by: Matthias Clasen <mclasen@××××××.com> |
| 308 |
+ |
| 309 |
+ * gtkdoc-mkdb.in: |
| 310 |
+ Fix index-id generation for child and style properties. Fixes #562064. |
| 311 |
+ |
| 312 |
2008-11-16 Stefan Kost <ensonic@××××××××.net> |
| 313 |
|
| 314 |
* HACKING: |
| 315 |
diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in |
| 316 |
index fa67316..bd2f465 100755 |
| 317 |
--- a/gtkdoc-mkdb.in |
| 318 |
+++ b/gtkdoc-mkdb.in |
| 319 |
@@ -311,6 +311,13 @@ for my $dir (@SOURCE_DIRS) { |
| 320 |
&ReadSourceDocumentation ($dir); |
| 321 |
} |
| 322 |
|
| 323 |
+# FIXME: can we scan for a common prefix? |
| 324 |
+# DEBUG |
| 325 |
+# check $Declarations{$key} to first '_', we would need to count |
| 326 |
+#my %prefixes = map { m/^(.*?)\_.*/;uc($1) => 1 } grep { m/\_/ } keys (%Declarations); |
| 327 |
+#foreach (keys %prefixes) { print "$_\n"; } |
| 328 |
+# DEBUG |
| 329 |
+ |
| 330 |
my $changed = &OutputSGML ("$ROOT_DIR/$MODULE-sections.txt"); |
| 331 |
|
| 332 |
# If any of the DocBook SGML files have changed, update the timestamp file (so |
| 333 |
@@ -823,15 +830,15 @@ sub OutputIndex { |
| 334 |
$short_symbol = $symbol; |
| 335 |
} |
| 336 |
|
| 337 |
- my $xref = &MakeXRef ($symbol); |
| 338 |
my $curletter = uc(substr($short_symbol,0,1)); |
| 339 |
my $id = $apiindex{$symbol}; |
| 340 |
- |
| 341 |
+ my $xref = &MakeXRef ($id, $symbol); |
| 342 |
+ |
| 343 |
#print " add symbol $symbol with $id to index in section $curletter\n"; |
| 344 |
|
| 345 |
if ($curletter ne $lastletter) { |
| 346 |
$lastletter = $curletter; |
| 347 |
- |
| 348 |
+ |
| 349 |
if ($divopen == 1) { |
| 350 |
print (OUTPUT "</indexdiv>\n"); |
| 351 |
} |
| 352 |
@@ -2122,12 +2129,11 @@ EOF |
| 353 |
sub CreateValidSGMLID { |
| 354 |
my ($id) = $_[0]; |
| 355 |
|
| 356 |
- # Append ":CAPS" to all all-caps identifiers |
| 357 |
- |
| 358 |
# Special case, '_' would end up as '' so we use 'gettext-macro' instead. |
| 359 |
if ($id eq "_") { return "gettext-macro"; } |
| 360 |
|
| 361 |
- if ($id !~ /[a-z]/) { $id .= ":CAPS" }; |
| 362 |
+ # Append ":CAPS" to all all-caps identifiers |
| 363 |
+ if ($id !~ /[a-z]/ && $id !~ /-CAPS$/) { $id .= ":CAPS" }; |
| 364 |
|
| 365 |
$id =~ s/[_ ]/-/g; |
| 366 |
$id =~ s/[,\.]//g; |
| 367 |
-- |
| 368 |
1.6.1.3 |
Archives