Attachment 256102 Details for Bug 283551 – Patch to update textproc/gtk-doc

[patch] Patch to update textproc/gtk-doc

0001-textproc-gtk-doc-update-to-1.34.0.patch (text/plain), 10.77 KB, created by Olivier Duchateau on 2024-12-24 14:54:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2024-12-24 14:54:28 UTC

Size: 10.77 KB

patch

obsolete

>From b81fa2ade8c2e12708ffe650d45100a1ecd8e960 Mon Sep 17 00:00:00 2001
>From: Olivier Duchateau <duchateau.olivier@gmail.com>
>Date: Tue, 24 Dec 2024 15:57:00 +0100
>Subject: [PATCH] textproc/gtk-doc: update to 1.34.0
>
>---
> textproc/gtk-doc/Makefile                | 28 ++++---
> textproc/gtk-doc/distinfo                |  6 +-
> textproc/gtk-doc/files/patch-meson.build | 20 ++---
> textproc/gtk-doc/pkg-plist               | 96 ++++++++----------------
> 4 files changed, 58 insertions(+), 92 deletions(-)
>
>diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
>index 65fc1965c50a..b1175d29ebaf 100644
>--- a/textproc/gtk-doc/Makefile
>+++ b/textproc/gtk-doc/Makefile
>@@ -1,30 +1,28 @@
> PORTNAME=	gtk-doc
>-DISTVERSION=	1.33.2
>-PORTREVISION=	3
>+DISTVERSION=	1.34.0
> CATEGORIES=	textproc
> MASTER_SITES=	GNOME
>+DIST_SUBDIR=	gnome
> 
> MAINTAINER=	desktop@FreeBSD.org
>-COMMENT=	Code documentation system, originally for GTK
>-WWW=		https://www.gtk.org/
>+COMMENT=	Documentation generator for GLib/GTK based code
>+WWW=		https://gitlab.gnome.org/GNOME/gtk-doc
> 
>-LICENSE=	GPLv2
>+LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
> 		docbook-xml>0:textproc/docbook-xml \
>-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
>-		itstool:textproc/itstool \
>-		yelp-tools>=0:textproc/yelp-tools \
>-		xsltproc:textproc/libxslt
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
>+		docbook-xsl>0:textproc/docbook-xsl
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
> 		docbook-xml>0:textproc/docbook-xml \
>-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
>-		xsltproc:textproc/libxslt
>+		docbook-xsl>0:textproc/docbook-xsl
> 
>-USES=		gettext-tools meson python pkgconfig tar:xz
>+USES=		gettext-tools gnome meson python pkgconfig tar:xz
>+USE_GNOME=	libxslt
> 
>-MESON_ARGS=	-Dtests=false
>+MESON_ARGS=	-Dtests=false \
>+		-Dyelp_manual=false
> 
> NO_ARCH=	yes
> 
>diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
>index f942cdfd553d..86f56c6700f7 100644
>--- a/textproc/gtk-doc/distinfo
>+++ b/textproc/gtk-doc/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1611398512
>-SHA256 (gtk-doc-1.33.2.tar.xz) = cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43
>-SIZE (gtk-doc-1.33.2.tar.xz) = 507852
>+TIMESTAMP = 1735034545
>+SHA256 (gnome/gtk-doc-1.34.0.tar.xz) = b20b72b32a80bc18c7f975c9d4c16460c2276566a0b50f87d6852dff3aa7861c
>+SIZE (gnome/gtk-doc-1.34.0.tar.xz) = 494116
>diff --git a/textproc/gtk-doc/files/patch-meson.build b/textproc/gtk-doc/files/patch-meson.build
>index f9f92a6a8e19..c436ad75abe2 100644
>--- a/textproc/gtk-doc/files/patch-meson.build
>+++ b/textproc/gtk-doc/files/patch-meson.build
>@@ -1,20 +1,20 @@
>---- meson.build.orig	2020-11-17 13:56:44 UTC
>+--- meson.build.orig	2024-03-05 18:09:52 UTC
> +++ meson.build
>-@@ -7,7 +7,7 @@ project('gtk-doc', 'c',
>+@@ -7,7 +7,7 @@ python = import('python')
>  gnome = import('gnome')
>- python = import('python') # Meson new Python module https://mesonbuild.com/Python-module.html
>+ python = import('python')
>  
>--python3 = python.find_installation('python3')
>-+python3 = python.find_installation()
>+-python3 = python.find_installation('python3', modules: ['pygments'])
>++python3 = python.find_installation(python.find_installation().full_path(), modules: ['pygments'])
>  
>- version = meson.project_version()
>- package_name = meson.project_name()
>-@@ -163,7 +163,7 @@ configure_file(
>+ # Paths
>+ srcdir = meson.current_source_dir()
>+@@ -134,7 +134,7 @@ configure_file(
>    output: 'gtk-doc.pc',
>    configuration: gtkdoc_pc,
>    install: true,
>--  install_dir: pkgconfigdir,
>-+  install_dir: join_paths(libdir, 'pkgconfig'),
>+-  install_dir: get_option('datadir') / 'pkgconfig',
>++  install_dir: join_paths(get_option('prefix'), 'libdata', 'pkgconfig'),
>  )
>  
>  subdir('help')
>diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
>index 4bcaf8b8934a..438c55adeb83 100644
>--- a/textproc/gtk-doc/pkg-plist
>+++ b/textproc/gtk-doc/pkg-plist
>@@ -32,38 +32,38 @@ share/aclocal/gtk-doc.m4
> %%DATADIR%%/data/up.png
> %%DATADIR%%/data/version-greater-or-equal.xsl
> %%DATADIR%%/python/gtkdoc/__init__.py
>-%%DATADIR%%/python/gtkdoc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/check.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/check.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/config_data.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/config_data.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/highlight.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/highlight.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/mkdb.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/mkdb.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml2.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml2.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/mkman.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/mkman.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/mkpdf.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/mkpdf.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/rebase.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/rebase.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/scan.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/scan.cpython-%%PYTHON_SUFFIX%%.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/scangobj.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
>-%%DATADIR%%/python/gtkdoc/__pycache__/scangobj.cpython-%%PYTHON_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/check%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/check%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/common%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/common%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/config_data%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/config_data%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/fixxref%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/fixxref%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/highlight%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/highlight%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/mkdb%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/mkdb%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml2%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/mkhtml2%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/mkman%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/mkman%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/mkpdf%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/mkpdf%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/rebase%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/rebase%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/scan%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/scan%%PYTHON_EXT_SUFFIX%%.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/scangobj%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
>+%%DATADIR%%/python/gtkdoc/__pycache__/scangobj%%PYTHON_EXT_SUFFIX%%.pyc
> %%DATADIR%%/python/gtkdoc/check.py
> %%DATADIR%%/python/gtkdoc/common.py
> %%DATADIR%%/python/gtkdoc/config.py
>@@ -79,35 +79,3 @@ share/aclocal/gtk-doc.m4
> %%DATADIR%%/python/gtkdoc/rebase.py
> %%DATADIR%%/python/gtkdoc/scan.py
> %%DATADIR%%/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
>-share/help/el/gtk-doc-manual/index.docbook
>-share/help/en_GB/gtk-doc-manual/fdl-appendix.xml
>-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/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
>-share/help/pt_BR/gtk-doc-manual/index.docbook
>-share/help/sl/gtk-doc-manual/fdl-appendix.xml
>-share/help/sl/gtk-doc-manual/index.docbook
>-share/help/sv/gtk-doc-manual/fdl-appendix.xml
>-share/help/sv/gtk-doc-manual/index.docbook
>-share/help/ta/gtk-doc-manual/fdl-appendix.xml
>-share/help/ta/gtk-doc-manual/index.docbook
>-share/help/te/gtk-doc-manual/fdl-appendix.xml
>-share/help/te/gtk-doc-manual/index.docbook
>-share/help/zh_CN/gtk-doc-manual/fdl-appendix.xml
>-share/help/zh_CN/gtk-doc-manual/index.docbook
>-- 
>2.47.1
>

Actions: View | Diff

Attachments on bug 283551: 256102