From fab211f4756e62c7db4c4a3252d20ca5339b02c4 Mon Sep 17 00:00:00 2001
From: Gary Mills <gary_mills@fastmail.fm>
Date: Sun, 13 Jun 2021 11:21:06 +0200
Subject: [PATCH] Upgrade of gtk-doc to 1.33.2 and python 3.7
---
components/developer/gtk-doc/manifests/sample-manifest.p5m | 36 ++++++++++++-----
components/developer/gtk-doc/Makefile | 40 +++++++++++--------
components/developer/gtk-doc/pkg5 | 4 +-
components/developer/gtk-doc/gtk-doc.p5m | 37 +++++++++++++-----
4 files changed, 77 insertions(+), 40 deletions(-)
diff --git a/components/developer/gtk-doc/Makefile b/components/developer/gtk-doc/Makefile
index cc716cb..426b790 100644
--- a/components/developer/gtk-doc/Makefile
+++ b/components/developer/gtk-doc/Makefile
@@ -9,38 +9,45 @@
#
#
+# Copyright 2021 Gary Mills
# Copyright 2016 Alexander Pyhalov
#
+
+BUILD_BITS= 64
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= gtk-doc
-COMPONENT_VERSION= 1.25
-COMPONENT_REVISION= 1
+COMPONENT_MAJOR_VERSION= 1.33
+COMPONENT_MINOR_VERSION= 2
+COMPONENT_VERSION= $(COMPONENT_MAJOR_VERSION).$(COMPONENT_MINOR_VERSION)
+# COMPONENT_REVISION= 0
COMPONENT_PROJECT_URL= http://www.gtk.org/gtk-doc/
COMPONENT_SUMMARY= GTK+ DocBook Documentation Generator
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH= \
- sha256:1ea46ed400e6501f975acaafea31479cea8f32f911dca4dff036f59e6464fd42
-COMPONENT_ARCHIVE_URL= http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+ sha256:cc1b709a20eb030a278a1f9842a362e00402b7f834ae1df4c1998a723152bf43
+COMPONENT_ARCHIVE_URL= http://ftp.gnome.org/pub/GNOME/sources/$(COMPONENT_NAME)/$(COMPONENT_MAJOR_VERSION)/$(COMPONENT_ARCHIVE)
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+# Set python version used by this product
+PYTHON_VERSION= 3.7
+
+# The built-in tests assume the package has already been installed
+TEST_TARGET= $(NO_TESTS)
+
+include $(WS_MAKE_RULES)/common.mk
PATH=$(PATH.gnu)
-CONFIGURE_OPTIONS+= --sysconfdir=/etc
+# Build configure script
+COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv)
+
+CONFIGURE_OPTIONS+= --bindir=$(USRBINDIR)
+CONFIGURE_OPTIONS+= --sbindir=$(USRSBINDIR)
+CONFIGURE_OPTIONS+= --sysconfdir=$(ETCDIR)
CONFIGURE_ENV+= PYTHON=$(PYTHON)
CONFIGURE_ENV+= PERL=$(PERL)
-
-# common targets
-build: $(BUILD_32)
-
-install: $(INSTALL_32)
-
-test: $(NO_TESTS)
# Auto-generated dependencies
REQUIRED_PACKAGES += text/itstool
@@ -48,5 +55,4 @@
# Auto-generated dependencies
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += runtime/perl-522
-REQUIRED_PACKAGES += runtime/python-27
-REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += runtime/python-37
diff --git a/components/developer/gtk-doc/gtk-doc.p5m b/components/developer/gtk-doc/gtk-doc.p5m
index 83efe0a..8f03f10 100644
--- a/components/developer/gtk-doc/gtk-doc.p5m
+++ b/components/developer/gtk-doc/gtk-doc.p5m
@@ -21,6 +21,9 @@
license gtk-doc.license license='GPLv3, FDLv1.1'
+# Python scripts are broken
+<transform file path=usr/bin/ -> set pkg.depend.bypass-generate .*>
+
file path=usr/bin/gtkdoc-check
file path=usr/bin/gtkdoc-depscan
file path=usr/bin/gtkdoc-fixxref
@@ -28,25 +31,22 @@
file path=usr/bin/gtkdoc-mkhtml
file path=usr/bin/gtkdoc-mkman
file path=usr/bin/gtkdoc-mkpdf
-file path=usr/bin/gtkdoc-mktmpl
+file path=usr/bin/gtkdoc-mkhtml2
file path=usr/bin/gtkdoc-rebase
file path=usr/bin/gtkdoc-scan
file path=usr/bin/gtkdoc-scangobj
file path=usr/bin/gtkdocize
-file path=usr/lib/cmake/GtkDoc/GtkDocConfig.cmake
-file path=usr/lib/cmake/GtkDoc/GtkDocConfigVersion.cmake
-file path=usr/lib/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake
+file path=usr/share/cmake/GtkDoc/GtkDocConfig.cmake
+file path=usr/share/cmake/GtkDoc/GtkDocConfigVersion.cmake
+file path=usr/share/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake
file path=usr/share/aclocal/gtk-doc.m4
file path=usr/share/gtk-doc/data/devhelp2.xsd
file path=usr/share/gtk-doc/data/devhelp2.xsl
-file path=usr/share/gtk-doc/data/gtk-doc.dcl
-file path=usr/share/gtk-doc/data/gtk-doc.dsl
file path=usr/share/gtk-doc/data/gtk-doc.flat.make
file path=usr/share/gtk-doc/data/gtk-doc.make
-file path=usr/share/gtk-doc/data/gtk-doc.notmpl-flat.make
-file path=usr/share/gtk-doc/data/gtk-doc.notmpl.make
+file path=usr/share/gtk-doc/data/gtk-doc.no-xslt-flat.make
+file path=usr/share/gtk-doc/data/gtk-doc.no-xslt.make
file path=usr/share/gtk-doc/data/gtk-doc.xsl
-file path=usr/share/gtk-doc/data/gtkdoc-common.pl
file path=usr/share/gtk-doc/data/home.png
file path=usr/share/gtk-doc/data/left-insensitive.png
file path=usr/share/gtk-doc/data/left.png
@@ -56,10 +56,28 @@
file path=usr/share/gtk-doc/data/up-insensitive.png
file path=usr/share/gtk-doc/data/up.png
file path=usr/share/gtk-doc/data/version-greater-or-equal.xsl
+file path=usr/share/gtk-doc/python/gtkdoc/__init__.py
+file path=usr/share/gtk-doc/python/gtkdoc/check.py
+file path=usr/share/gtk-doc/python/gtkdoc/common.py
+file path=usr/share/gtk-doc/python/gtkdoc/config.py
+file path=usr/share/gtk-doc/python/gtkdoc/config_data.py
+file path=usr/share/gtk-doc/python/gtkdoc/fixxref.py
+file path=usr/share/gtk-doc/python/gtkdoc/highlight.py
+file path=usr/share/gtk-doc/python/gtkdoc/md_to_db.py
+file path=usr/share/gtk-doc/python/gtkdoc/mkdb.py
+file path=usr/share/gtk-doc/python/gtkdoc/mkhtml.py
+file path=usr/share/gtk-doc/python/gtkdoc/mkhtml2.py
+file path=usr/share/gtk-doc/python/gtkdoc/mkman.py
+file path=usr/share/gtk-doc/python/gtkdoc/mkpdf.py
+file path=usr/share/gtk-doc/python/gtkdoc/rebase.py
+file path=usr/share/gtk-doc/python/gtkdoc/scan.py
+file path=usr/share/gtk-doc/python/gtkdoc/scangobj.py
file path=usr/share/help/C/gtk-doc-manual/fdl-appendix.xml
file path=usr/share/help/C/gtk-doc-manual/index.docbook
file path=usr/share/help/bn_IN/gtk-doc-manual/fdl-appendix.xml
file path=usr/share/help/bn_IN/gtk-doc-manual/index.docbook
+file path=usr/share/help/cs/gtk-doc-manual/fdl-appendix.xml
+file path=usr/share/help/cs/gtk-doc-manual/index.docbook
file path=usr/share/help/de/gtk-doc-manual/fdl-appendix.xml
file path=usr/share/help/de/gtk-doc-manual/index.docbook
file path=usr/share/help/el/gtk-doc-manual/fdl-appendix.xml
@@ -87,4 +105,3 @@
file path=usr/share/help/zh_CN/gtk-doc-manual/fdl-appendix.xml
file path=usr/share/help/zh_CN/gtk-doc-manual/index.docbook
file path=usr/share/pkgconfig/gtk-doc.pc
-file path=usr/share/sgml/gtk-doc/gtk-doc.cat
diff --git a/components/developer/gtk-doc/manifests/sample-manifest.p5m b/components/developer/gtk-doc/manifests/sample-manifest.p5m
index 018fe52..2606aac 100644
--- a/components/developer/gtk-doc/manifests/sample-manifest.p5m
+++ b/components/developer/gtk-doc/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2016 <contributor>
+# Copyright 2021 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,27 +27,24 @@
file path=usr/bin/gtkdoc-fixxref
file path=usr/bin/gtkdoc-mkdb
file path=usr/bin/gtkdoc-mkhtml
+file path=usr/bin/gtkdoc-mkhtml2
file path=usr/bin/gtkdoc-mkman
file path=usr/bin/gtkdoc-mkpdf
-file path=usr/bin/gtkdoc-mktmpl
file path=usr/bin/gtkdoc-rebase
file path=usr/bin/gtkdoc-scan
file path=usr/bin/gtkdoc-scangobj
file path=usr/bin/gtkdocize
-file path=usr/lib/cmake/GtkDoc/GtkDocConfig.cmake
-file path=usr/lib/cmake/GtkDoc/GtkDocConfigVersion.cmake
-file path=usr/lib/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake
file path=usr/share/aclocal/gtk-doc.m4
+file path=usr/share/cmake/GtkDoc/GtkDocConfig.cmake
+file path=usr/share/cmake/GtkDoc/GtkDocConfigVersion.cmake
+file path=usr/share/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake
file path=usr/share/gtk-doc/data/devhelp2.xsd
file path=usr/share/gtk-doc/data/devhelp2.xsl
-file path=usr/share/gtk-doc/data/gtk-doc.dcl
-file path=usr/share/gtk-doc/data/gtk-doc.dsl
file path=usr/share/gtk-doc/data/gtk-doc.flat.make
file path=usr/share/gtk-doc/data/gtk-doc.make
-file path=usr/share/gtk-doc/data/gtk-doc.notmpl-flat.make
-file path=usr/share/gtk-doc/data/gtk-doc.notmpl.make
+file path=usr/share/gtk-doc/data/gtk-doc.no-xslt-flat.make
+file path=usr/share/gtk-doc/data/gtk-doc.no-xslt.make
file path=usr/share/gtk-doc/data/gtk-doc.xsl
-file path=usr/share/gtk-doc/data/gtkdoc-common.pl
file path=usr/share/gtk-doc/data/home.png
file path=usr/share/gtk-doc/data/left-insensitive.png
file path=usr/share/gtk-doc/data/left.png
@@ -57,10 +54,28 @@
file path=usr/share/gtk-doc/data/up-insensitive.png
file path=usr/share/gtk-doc/data/up.png
file path=usr/share/gtk-doc/data/version-greater-or-equal.xsl
+file path=usr/share/gtk-doc/python/gtkdoc/__init__.py
+file path=usr/share/gtk-doc/python/gtkdoc/check.py
+file path=usr/share/gtk-doc/python/gtkdoc/common.py
+file path=usr/share/gtk-doc/python/gtkdoc/config.py
+file path=usr/share/gtk-doc/python/gtkdoc/config_data.py
+file path=usr/share/gtk-doc/python/gtkdoc/fixxref.py
+file path=usr/share/gtk-doc/python/gtkdoc/highlight.py
+file path=usr/share/gtk-doc/python/gtkdoc/md_to_db.py
+file path=usr/share/gtk-doc/python/gtkdoc/mkdb.py
+file path=usr/share/gtk-doc/python/gtkdoc/mkhtml.py
+file path=usr/share/gtk-doc/python/gtkdoc/mkhtml2.py
+file path=usr/share/gtk-doc/python/gtkdoc/mkman.py
+file path=usr/share/gtk-doc/python/gtkdoc/mkpdf.py
+file path=usr/share/gtk-doc/python/gtkdoc/rebase.py
+file path=usr/share/gtk-doc/python/gtkdoc/scan.py
+file path=usr/share/gtk-doc/python/gtkdoc/scangobj.py
file path=usr/share/help/C/gtk-doc-manual/fdl-appendix.xml
file path=usr/share/help/C/gtk-doc-manual/index.docbook
file path=usr/share/help/bn_IN/gtk-doc-manual/fdl-appendix.xml
file path=usr/share/help/bn_IN/gtk-doc-manual/index.docbook
+file path=usr/share/help/cs/gtk-doc-manual/fdl-appendix.xml
+file path=usr/share/help/cs/gtk-doc-manual/index.docbook
file path=usr/share/help/de/gtk-doc-manual/fdl-appendix.xml
file path=usr/share/help/de/gtk-doc-manual/index.docbook
file path=usr/share/help/el/gtk-doc-manual/fdl-appendix.xml
@@ -88,4 +103,3 @@
file path=usr/share/help/zh_CN/gtk-doc-manual/fdl-appendix.xml
file path=usr/share/help/zh_CN/gtk-doc-manual/index.docbook
file path=usr/share/pkgconfig/gtk-doc.pc
-file path=usr/share/sgml/gtk-doc/gtk-doc.cat
diff --git a/components/developer/gtk-doc/pkg5 b/components/developer/gtk-doc/pkg5
index cad902a..23d187b 100644
--- a/components/developer/gtk-doc/pkg5
+++ b/components/developer/gtk-doc/pkg5
@@ -1,9 +1,9 @@
{
"dependencies": [
"SUNWcs",
- "developer/documentation-tool/gtk-doc",
"runtime/perl-522",
- "runtime/python-27",
+ "runtime/python-37",
+ "shell/ksh93",
"system/library",
"text/itstool"
],
--
Gitblit v1.9.3