CVS commit: pkgsrc/textproc/gtk-doc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Oct 11 15:46:46 UTC 2017

Modified Files:
        pkgsrc/textproc/gtk-doc: Makefile PLIST distinfo

Log Message:
gtk-doc: update to 1.26.

GTK-Doc 1.26  (Aug 11 2017)
==============

Remove tmpl support (gtkdoc-mktmpl). Port all tools from bash/perl to python.

 Changes

 o 773879 :  -    scangobj: Do not generate unused parameters
 o 780789 : Convert gtkdoc-scan from Perl to Python
 o 752126 : Add support for inline program documentation
 o 753052 : _() causes element a: validity error : ID idx already defined
 o 758137 : GtkLabel and GtkShortcutsShortcut notes on escaping character entities don't render properly
 o 764407 : Broken links to structs in function definitions
 o 764543 : /usr/bin/gtkdoc-mkpdf always exits with an error
 o 768675 : make check fails on master
 o 769125 : gtkdoc-mkhtml/pdf fails on spaces in search path
 o 769341 : gtkdoc-mkdb line 3966 triggers " Negative repeat count does nothing " warnings
 o 771255 :  " Symbol name not found at the start of comment block " warning with " attributes " annotation.
 o 773151 : configure: Lower perl dependency to 5.16.0
 o 774168 : gobject introspection annotations and gtk-doc parser do not agree
 o 774812 : Error messages from xsltproc are hidden by gtkdoc-mkhtml
 o 778144 : Allow disabling introspection for ancillary property mechanisms
 o 779566 : Replace shell executables with Python

GTK-Doc 1.25  (Mar 21 2016)
==============

 Changes

 o 763465 :  -    released version of gtk-doc no longer understands cross-reference data in gtk+
 o 742404 : unify index.sgml and *.devhelp2 + change gtkdoc-fixxref to use *.devhelp2
 o 743182 : Automatically support PACKAGE variables as XML entities
 o 744061 : Skip standard g_iface, parent_instance and parent_class struct members
 o 751479 : help: Document the Stability tag for documentation comments
 o 751777 : gtk-doc -sections.txt file documentation is a bit confusing
 o 751783 : Creating master xml document documentation is a bit lacking
 o 751906 : help: Fix incorrect example syntax for embedded images
 o 752795 : documentation is not rebuilt when only content of doc comments change
 o 753145 : gtkdoc-mkhtml fails on spaces in file names
 o 753348 : gtkdocize does not handle -flat flavours
 o 756297 : Add CMake module
 o 756368 : gtkdocize mistakenly parses options from comments in configure.ac
 o 756519 : `make check' fails - Sequence (?R...) not recognized in regex
 o 756684 : Support (not nullable) annotation
 o 756998 : Support |[ <!-- language= " plain " --> ]|
 o 758996 : gtkdoc-mkdb: ensure macros appear in the correct section
 o 759017 : autogenerated ids in return and parameter blocks

GTK-Doc 1.24  (May 29 2015)
============

 This is another quick bugfix release for a regression, see bug #749591

 Changes

 o 749591 : gtk-doc 1.23 no longer includes xml namespace in .devhelp2 files
 o 749706 : .gitignore files should not be under version control
 o 749816 : Support syntax highlighting of different languages (patch included)
 o 749901 : Strip common indent when highlighting with vim

GTK-Doc 1.23  (May 17 2015)
============

 This is a quick bugfix release for a regression, see bug #749142.

 Changes

 o 749142 : Can't build totem-pl-parser from master using gtk-doc 1.22
 o 749210 : mkman: Use full URL to refer to the docbook manpages stylesheet

GTK-Doc 1.22    (May 07 2015)
============

 Important notice - starting with the next release these long deprecated
 features will be removed - you'll now see a warning if you actually use these
 features. Please write to gtk-doc-list%gnome.org@localhost and tell us your concerns:
 o gtkdoc-mktmpl - please move all the comments into the sources.
 o generating html via sgml tools (jade/openjade), using xsltproc and
   docbook-xslt is pretty common and preferred since version 1.6

 Changes

 o 727778 :  -    gtk-doc doesn't understand annotations for GList-contained types
 o 729911 : Using #TypeName inshort_description makes " - " in HTML index disappear
 o 732689 : strange result on a generated html page
 o 734689 :  " Specific -> General " document title format
 o 736073 : Regression: problems with enum constants
 o 736725 : Documentation consists mostly of empty space
 o 741305 : Scanner issue with enum containing value ='{'
 o 741763 : Example Makefile.am improvements
 o 741941 : Last function argument missing in docs (possibly due to macro in code)
 o 743879 : special case G_DECLARE_*_TYPE
 o 743967 : Make build results reproducible
 o 744075 : Missing struct members if forward declared in another header
 o 744368 : gtkdoc-depscan doesn't handle unicode in .devhelp2 files correctly
 o 746118 : gtkdoc-scan: fix regex for get_type() functions
 o 746120 : Expand annotation recognition on symbol lines
 o 746121 : gtkdoc-mkdb: don't warn on 'deprecated entities'
 o 747207 : Typos in documentation
 o 747298 : Test still tries to check gtkdoc-scanobj
 o 748456 : xsl: Enable ToC generation on empty <toc/> elements


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/textproc/gtk-doc/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/textproc/gtk-doc/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/gtk-doc/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/gtk-doc/Makefile
diff -u pkgsrc/textproc/gtk-doc/Makefile:1.62 pkgsrc/textproc/gtk-doc/Makefile:1.63
--- pkgsrc/textproc/gtk-doc/Makefile:1.62       Wed Aug 16 20:21:15 2017
+++ pkgsrc/textproc/gtk-doc/Makefile    Wed Oct 11 15:46:46 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2017/08/16 20:21:15 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2017/10/11 15:46:46 wiz Exp $
 
-DISTNAME=      gtk-doc-1.21
-PKGREVISION=   3
+DISTNAME=      gtk-doc-1.26
 CATEGORIES=    textproc gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk-doc/${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=  .tar.xz
@@ -11,16 +10,32 @@ HOMEPAGE=   https://www.gtk.org/gtk-doc/
 COMMENT=       Tools for authors of the GTK+ reference documentation
 LICENSE=       gnu-gpl-v3 AND gnu-fdl-v1.1
 
-BUILD_DEPENDS+=        itstool-[0-9]*:../../textproc/itstool
 DEPENDS+=      docbook-xml>=4.4nb1:../../textproc/docbook-xml
 DEPENDS+=      docbook-xsl>=1.68.1:../../textproc/docbook-xsl
+DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+BUILD_DEPENDS+=        itstool-[0-9]*:../../textproc/itstool
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 
 GNU_CONFIGURE=         YES
 PKGCONFIG_OVERRIDE=    gtk-doc.pc.in
 CONFIGURE_ARGS+=       --with-xml-catalog=${XML_DEFAULT_CATALOG:Q}
-USE_TOOLS+=            gmake perl:run pkg-config:run msgfmt
+USE_TOOLS+=            gmake pkg-config:run msgfmt
+
+# one test failure that's not there with python-2.x as of 1.26
+PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36
 
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 1.21
+SUBST_CLASSES+=                fix-pc
+SUBST_STAGE.fix-pc=    pre-configure
+SUBST_MESSAGE.fix-pc=  Unwrapping pkg-config path in installed helper tools.
+SUBST_FILES.fix-pc+=   gtkdoc-depscan.in
+SUBST_FILES.fix-pc+=   gtkdoc/config.py.in
+SUBST_SED.fix-pc=      -e 's,@PKG_CONFIG@,pkg-config,g'
+
+TEST_TARGET=   check
+
+REPLACE_PYTHON=                tests/check.py
+REPLACE_PYTHON+=       tests/common.py
+REPLACE_PYTHON+=       tests/mk_to_db.py
 
 .include "../../lang/python/application.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
@@ -30,3 +45,4 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 #
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
+TEST_ENV+=     LC_ALL=en_US.UTF-8

Index: pkgsrc/textproc/gtk-doc/PLIST
diff -u pkgsrc/textproc/gtk-doc/PLIST:1.21 pkgsrc/textproc/gtk-doc/PLIST:1.22
--- pkgsrc/textproc/gtk-doc/PLIST:1.21  Sat Jan 10 15:21:41 2015
+++ pkgsrc/textproc/gtk-doc/PLIST       Wed Oct 11 15:46:46 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2015/01/10 15:21:41 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.22 2017/10/11 15:46:46 wiz Exp $
 bin/gtkdoc-check
 bin/gtkdoc-depscan
 bin/gtkdoc-fixxref
@@ -6,21 +6,19 @@ bin/gtkdoc-mkdb
 bin/gtkdoc-mkhtml
 bin/gtkdoc-mkman
 bin/gtkdoc-mkpdf
-bin/gtkdoc-mktmpl
 bin/gtkdoc-rebase
 bin/gtkdoc-scan
 bin/gtkdoc-scangobj
 bin/gtkdocize
+lib/cmake/GtkDoc/GtkDocConfig.cmake
+lib/cmake/GtkDoc/GtkDocConfigVersion.cmake
+lib/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake
 share/aclocal/gtk-doc.m4
+share/gtk-doc/data/devhelp2.xsd
 share/gtk-doc/data/devhelp2.xsl
-share/gtk-doc/data/gtk-doc.dcl
-share/gtk-doc/data/gtk-doc.dsl
 share/gtk-doc/data/gtk-doc.flat.make
 share/gtk-doc/data/gtk-doc.make
-share/gtk-doc/data/gtk-doc.notmpl-flat.make
-share/gtk-doc/data/gtk-doc.notmpl.make
 share/gtk-doc/data/gtk-doc.xsl
-share/gtk-doc/data/gtkdoc-common.pl
 share/gtk-doc/data/home.png
 share/gtk-doc/data/left-insensitive.png
 share/gtk-doc/data/left.png
@@ -30,10 +28,25 @@ share/gtk-doc/data/style.css
 share/gtk-doc/data/up-insensitive.png
 share/gtk-doc/data/up.png
 share/gtk-doc/data/version-greater-or-equal.xsl
+share/gtk-doc/python/gtkdoc/__init__.py
+share/gtk-doc/python/gtkdoc/check.py
+share/gtk-doc/python/gtkdoc/common.py
+share/gtk-doc/python/gtkdoc/config.py
+share/gtk-doc/python/gtkdoc/fixxref.py
+share/gtk-doc/python/gtkdoc/md_to_db.py
+share/gtk-doc/python/gtkdoc/mkdb.py
+share/gtk-doc/python/gtkdoc/mkhtml.py
+share/gtk-doc/python/gtkdoc/mkman.py
+share/gtk-doc/python/gtkdoc/mkpdf.py
+share/gtk-doc/python/gtkdoc/rebase.py
+share/gtk-doc/python/gtkdoc/scan.py
+share/gtk-doc/python/gtkdoc/scangobj.py
 share/help/C/gtk-doc-manual/fdl-appendix.xml
 share/help/C/gtk-doc-manual/index.docbook
 share/help/bn_IN/gtk-doc-manual/fdl-appendix.xml
 share/help/bn_IN/gtk-doc-manual/index.docbook
+share/help/cs/gtk-doc-manual/fdl-appendix.xml
+share/help/cs/gtk-doc-manual/index.docbook
 share/help/de/gtk-doc-manual/fdl-appendix.xml
 share/help/de/gtk-doc-manual/index.docbook
 share/help/el/gtk-doc-manual/fdl-appendix.xml
@@ -44,6 +57,8 @@ share/help/es/gtk-doc-manual/fdl-appendi
 share/help/es/gtk-doc-manual/index.docbook
 share/help/fr/gtk-doc-manual/fdl-appendix.xml
 share/help/fr/gtk-doc-manual/index.docbook
+share/help/gl/gtk-doc-manual/fdl-appendix.xml
+share/help/gl/gtk-doc-manual/index.docbook
 share/help/gu/gtk-doc-manual/fdl-appendix.xml
 share/help/gu/gtk-doc-manual/index.docbook
 share/help/pt_BR/gtk-doc-manual/fdl-appendix.xml
@@ -59,4 +74,3 @@ share/help/te/gtk-doc-manual/index.docbo
 share/help/zh_CN/gtk-doc-manual/fdl-appendix.xml
 share/help/zh_CN/gtk-doc-manual/index.docbook
 share/pkgconfig/gtk-doc.pc
-share/sgml/gtk-doc/gtk-doc.cat

Index: pkgsrc/textproc/gtk-doc/distinfo
diff -u pkgsrc/textproc/gtk-doc/distinfo:1.23 pkgsrc/textproc/gtk-doc/distinfo:1.24
--- pkgsrc/textproc/gtk-doc/distinfo:1.23       Wed Nov  4 01:59:30 2015
+++ pkgsrc/textproc/gtk-doc/distinfo    Wed Oct 11 15:46:46 2017
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.23 2015/11/04 01:59:30 agc Exp $
+$NetBSD: distinfo,v 1.24 2017/10/11 15:46:46 wiz Exp $
 
-SHA1 (gtk-doc-1.21.tar.xz) = 49b4fc9d4cf618c53f39f35f4cf2fc27b7b3dae4
-RMD160 (gtk-doc-1.21.tar.xz) = a746d8aeac6472f63912507f3a556121fe9fa21e
-SHA512 (gtk-doc-1.21.tar.xz) = caef8f6fd42f2961b6703af6d8b9f003b6e6ba2e9e955b94d9c0ecce8d267b7f4c2315d273dbdca1aff244e81867e675434b09a9410248e93101e86105f60f9d
-Size (gtk-doc-1.21.tar.xz) = 647484 bytes
+SHA1 (gtk-doc-1.26.tar.xz) = a34d5c4730c64c164d34dd3b16ed30f6e2451b1d
+RMD160 (gtk-doc-1.26.tar.xz) = 133a3d66d02ddf901dd4d514f15f7dff1b54a070
+SHA512 (gtk-doc-1.26.tar.xz) = 91f0e0e51d9f77794c0ab57bad5c2da242252f029ab2d4252f8740ccf8b18fed49a7f010f654f5ba60ebed74f7b65a5ef1f762c8661eebfcacfe15dc3bc3c52c
+Size (gtk-doc-1.26.tar.xz) = 706432 bytes