CVS commit: pkgsrc/textproc/gtk-doc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat May 11 18:58:52 UTC 2024

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

Log Message:
gtk-doc: updated to 1.34.0

GTK-Doc 1.34.0 (Mar 5 2024)

Maintenance, some bug fixes
Meson: fix some warnings, simplifications
Translation updates


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/textproc/gtk-doc/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/gtk-doc/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/gtk-doc/buildlink3.mk
cvs rdiff -u -r1.30 -r1.31 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.96 pkgsrc/textproc/gtk-doc/Makefile:1.97
--- pkgsrc/textproc/gtk-doc/Makefile:1.96       Wed Nov  8 13:21:04 2023
+++ pkgsrc/textproc/gtk-doc/Makefile    Sat May 11 18:58:52 2024
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2023/11/08 13:21:04 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2024/05/11 18:58:52 adam Exp $
 
-DISTNAME=      gtk-doc-1.32
-PKGREVISION=   15
+DISTNAME=      gtk-doc-1.34.0
 CATEGORIES=    textproc gnome
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk-doc/${PKGVERSION_NOREV}/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk-doc/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -20,26 +19,34 @@ DEPENDS+=   ${PYPKGPREFIX}-pygments-[0-9]*
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-parameterized-[0-9]*:../../devel/py-parameterized
 
-GNU_CONFIGURE=         YES
+MESON_REQD+=           0.55
+USE_TOOLS+=            itstool msgfmt pkg-config:run
 PKGCONFIG_OVERRIDE=    gtk-doc.pc.in
-CONFIGURE_ARGS+=       --with-xml-catalog=${XML_DEFAULT_CATALOG:Q}
-USE_TOOLS+=            gmake pkg-config:run msgfmt
-USE_TOOLS+=            itstool
+
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/tests/gobject/src
+# For Darwin
+TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/output/tests/gobject/src
+TEST_TARGET=   check
 
 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_FILES.fix-pc+=   gtkdoc/config_data.py.in
 SUBST_SED.fix-pc=      -e 's,@PKG_CONFIG@,pkg-config,g'
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
+SUBST_CLASSES+=                python3
+SUBST_STAGE.python3=   pre-configure
+SUBST_MESSAGE.python3= Fix python binary name.
+SUBST_FILES.python3=   meson.build
+SUBST_SED.python3=     -e "s,find_installation('python3',find_installation('${PYTHONBIN}',"
 
-TEST_TARGET=   check
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-.include "../../lang/python/application.mk"
 # needed together with pkg-config by gtkdoc-depscan at runtime
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../lang/python/application.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/gtk-doc/PLIST
diff -u pkgsrc/textproc/gtk-doc/PLIST:1.24 pkgsrc/textproc/gtk-doc/PLIST:1.25
--- pkgsrc/textproc/gtk-doc/PLIST:1.24  Wed Nov 13 21:17:47 2019
+++ pkgsrc/textproc/gtk-doc/PLIST       Sat May 11 18:58:52 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2019/11/13 21:17:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2024/05/11 18:58:52 adam Exp $
 bin/gtkdoc-check
 bin/gtkdoc-depscan
 bin/gtkdoc-fixxref
@@ -11,10 +11,10 @@ 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/cmake/GtkDoc/GtkDocConfig.cmake
-share/cmake/GtkDoc/GtkDocConfigVersion.cmake
-share/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake
 share/gtk-doc/data/devhelp2.xsd
 share/gtk-doc/data/devhelp2.xsl
 share/gtk-doc/data/gtk-doc.flat.make
@@ -35,6 +35,7 @@ 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/config_data.py
 share/gtk-doc/python/gtkdoc/fixxref.py
 share/gtk-doc/python/gtkdoc/highlight.py
 share/gtk-doc/python/gtkdoc/md_to_db.py
@@ -60,12 +61,16 @@ share/help/en_GB/gtk-doc-manual/fdl-appe
 share/help/en_GB/gtk-doc-manual/index.docbook
 share/help/es/gtk-doc-manual/fdl-appendix.xml
 share/help/es/gtk-doc-manual/index.docbook
+share/help/eu/gtk-doc-manual/fdl-appendix.xml
+share/help/eu/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/hu/gtk-doc-manual/fdl-appendix.xml
+share/help/hu/gtk-doc-manual/index.docbook
 share/help/pt_BR/gtk-doc-manual/fdl-appendix.xml
 share/help/pt_BR/gtk-doc-manual/index.docbook
 share/help/sl/gtk-doc-manual/fdl-appendix.xml

Index: pkgsrc/textproc/gtk-doc/buildlink3.mk
diff -u pkgsrc/textproc/gtk-doc/buildlink3.mk:1.12 pkgsrc/textproc/gtk-doc/buildlink3.mk:1.13
--- pkgsrc/textproc/gtk-doc/buildlink3.mk:1.12  Wed Nov 29 11:06:05 2023
+++ pkgsrc/textproc/gtk-doc/buildlink3.mk       Sat May 11 18:58:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2023/11/29 11:06:05 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2024/05/11 18:58:52 adam Exp $
 #
 # provided mostly for pkg-config
 
@@ -8,7 +8,7 @@ BUILDLINK_TREE+=        gtk-doc
 GTK_DOC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtk-doc+=        gtk-doc>=1.18
-BUILDLINK_ABI_DEPENDS.gtk-doc?=        gtk-doc>=1.32nb13
+BUILDLINK_ABI_DEPENDS.gtk-doc+=        gtk-doc>=1.32nb13
 BUILDLINK_PKGSRCDIR.gtk-doc?=  ../../textproc/gtk-doc
 BUILDLINK_DEPMETHOD.gtk-doc?=  build
 

Index: pkgsrc/textproc/gtk-doc/distinfo
diff -u pkgsrc/textproc/gtk-doc/distinfo:1.30 pkgsrc/textproc/gtk-doc/distinfo:1.31
--- pkgsrc/textproc/gtk-doc/distinfo:1.30       Tue Oct 26 11:21:56 2021
+++ pkgsrc/textproc/gtk-doc/distinfo    Sat May 11 18:58:52 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.30 2021/10/26 11:21:56 nia Exp $
+$NetBSD: distinfo,v 1.31 2024/05/11 18:58:52 adam Exp $
 
-BLAKE2s (gtk-doc-1.32.tar.xz) = 031d70e7973f5941b4984c86443ec70b234f134e9c0483641b1217e7ce883fe6
-SHA512 (gtk-doc-1.32.tar.xz) = 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28
-Size (gtk-doc-1.32.tar.xz) = 762000 bytes
+BLAKE2s (gtk-doc-1.34.0.tar.xz) = ed134892a8af63ee29ec80a18b06a8fbd23e70ec5bb48bd53b8fae61c99d3d12
+SHA512 (gtk-doc-1.34.0.tar.xz) = d962fe31949b5f7c70122c7ebbd98f4d21725697804bf5dd75fd7a6662753a91c9350fd1e8bed22a58a957b173f35e200fcbb4c7c2ebc45ccbc0db2e916b27ea
+Size (gtk-doc-1.34.0.tar.xz) = 494116 bytes