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/Makefile | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 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 -- Gitblit v1.9.3