From cfb9319aeb57b9935660c6a1db61e4871fff1b90 Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Tue, 23 Aug 2022 10:13:24 +0200 Subject: [PATCH] gtk-doc: remove perl form REQUIRED_PACKAGES --- components/developer/gtk-doc/manifests/sample-manifest.p5m | 3 ++- components/developer/gtk-doc/Makefile | 8 +++----- components/developer/gtk-doc/pkg5 | 1 - components/developer/gtk-doc/gtk-doc.p5m | 1 + 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/components/developer/gtk-doc/Makefile b/components/developer/gtk-doc/Makefile index c3bf289..c5ebc99 100644 --- a/components/developer/gtk-doc/Makefile +++ b/components/developer/gtk-doc/Makefile @@ -13,15 +13,13 @@ # Copyright 2016 Alexander Pyhalov # -BUILD_BITS= 64 - include ../../../make-rules/shared-macros.mk COMPONENT_NAME= gtk-doc COMPONENT_MAJOR_VERSION= 1.33 COMPONENT_MINOR_VERSION= 2 COMPONENT_VERSION= $(COMPONENT_MAJOR_VERSION).$(COMPONENT_MINOR_VERSION) -COMPONENT_REVISION= 2 +COMPONENT_REVISION= 3 COMPONENT_PROJECT_URL= http://www.gtk.org/gtk-doc/ COMPONENT_SUMMARY= GTK+ DocBook Documentation Generator COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) @@ -57,11 +55,11 @@ CONFIGURE_OPTIONS+= --sbindir=$(USRSBINDIR) CONFIGURE_OPTIONS+= --sysconfdir=$(ETCDIR) CONFIGURE_ENV+= PYTHON=$(PYTHON) -CONFIGURE_ENV+= PERL=$(PERL) # Manually added dependencies REQUIRED_PACKAGES += SUNWcs REQUIRED_PACKAGES += text/itstool -REQUIRED_PACKAGES += runtime/perl-522 REQUIRED_PACKAGES += runtime/python-37 REQUIRED_PACKAGES += library/python/pygments-37 + +# Auto-generated dependencies diff --git a/components/developer/gtk-doc/gtk-doc.p5m b/components/developer/gtk-doc/gtk-doc.p5m index f3e0e44..24b404e 100644 --- a/components/developer/gtk-doc/gtk-doc.p5m +++ b/components/developer/gtk-doc/gtk-doc.p5m @@ -13,6 +13,7 @@ # set name=pkg.fmri value=pkg:/developer/documentation-tool/gtk-doc@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(HUMAN_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" set name=info.classification value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) diff --git a/components/developer/gtk-doc/manifests/sample-manifest.p5m b/components/developer/gtk-doc/manifests/sample-manifest.p5m index 2606aac..08d1938 100644 --- a/components/developer/gtk-doc/manifests/sample-manifest.p5m +++ b/components/developer/gtk-doc/manifests/sample-manifest.p5m @@ -10,10 +10,11 @@ # # -# Copyright 2021 <contributor> +# Copyright 2022 <contributor> # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.human-version value=$(HUMAN_VERSION) set name=pkg.summary value="$(COMPONENT_SUMMARY)" set name=info.classification value="$(COMPONENT_CLASSIFICATION)" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) diff --git a/components/developer/gtk-doc/pkg5 b/components/developer/gtk-doc/pkg5 index e776ff3..ec3c309 100644 --- a/components/developer/gtk-doc/pkg5 +++ b/components/developer/gtk-doc/pkg5 @@ -2,7 +2,6 @@ "dependencies": [ "SUNWcs", "library/python/pygments-37", - "runtime/perl-522", "runtime/python-37", "shell/ksh93", "system/library", -- Gitblit v1.9.3