From ff8f085eaf2e9e201797303f6a793a0ae8be0926 Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Tue, 16 Jan 2024 07:57:29 +0100 Subject: [PATCH] intltool: drop dependency on developer/gnome/gettext --- components/text/intltool/Makefile | 3 +-- components/text/intltool/patches/intltool-01-msgfmt.patch | 6 +++--- components/text/intltool/intltool.p5m | 2 -- components/text/intltool/manifests/sample-manifest.p5m | 2 +- components/text/intltool/pkg5 | 7 ++----- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/components/text/intltool/Makefile b/components/text/intltool/Makefile index de97745..5a22c12 100644 --- a/components/text/intltool/Makefile +++ b/components/text/intltool/Makefile @@ -16,7 +16,7 @@ COMPONENT_NAME= intltool COMPONENT_VERSION= 0.51.0 -COMPONENT_REVISION = 1 +COMPONENT_REVISION = 2 COMPONENT_FMRI= text/intltool COMPONENT_PROJECT_URL= https://freedesktop.org/wiki/Software/intltool/ COMPONENT_SUMMARY= Set of tools to centralize translation of many different file formats using GNU gettext-compatible PO files @@ -36,6 +36,5 @@ PATH=$(PATH.gnu) # Auto-generated dependencies -REQUIRED_PACKAGES += developer/gnome/gettext REQUIRED_PACKAGES += runtime/perl REQUIRED_PACKAGES += shell/ksh93 diff --git a/components/text/intltool/intltool.p5m b/components/text/intltool/intltool.p5m index c70272f..cc1ba6c 100644 --- a/components/text/intltool/intltool.p5m +++ b/components/text/intltool/intltool.p5m @@ -23,8 +23,6 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' -depend type=optional fmri=pkg:/developer/gnome/gettext@2.30.0,5.11-0.151.1.8.1 - file path=usr/bin/intltool-extract file path=usr/bin/intltool-merge file path=usr/bin/intltool-prepare diff --git a/components/text/intltool/manifests/sample-manifest.p5m b/components/text/intltool/manifests/sample-manifest.p5m index 8e74b1c..6eefdb6 100644 --- a/components/text/intltool/manifests/sample-manifest.p5m +++ b/components/text/intltool/manifests/sample-manifest.p5m @@ -10,7 +10,7 @@ # # -# Copyright 2022 <contributor> +# Copyright 2024 <contributor> # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) diff --git a/components/text/intltool/patches/intltool-01-msgfmt.patch b/components/text/intltool/patches/intltool-01-msgfmt.patch index fdc1647..5f589bb 100644 --- a/components/text/intltool/patches/intltool-01-msgfmt.patch +++ b/components/text/intltool/patches/intltool-01-msgfmt.patch @@ -1,6 +1,6 @@ ---- intltool-0.36.3/intltool.m4.orig 2007-12-18 09:33:58.086429298 +0000 -+++ intltool-0.36.3/intltool.m4 2007-12-18 09:34:45.003756401 +0000 -@@ -96,8 +96,7 @@ +--- intltool-0.51.0/intltool.m4.orig ++++ intltool-0.51.0/intltool.m4 +@@ -126,8 +126,7 @@ fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" diff --git a/components/text/intltool/pkg5 b/components/text/intltool/pkg5 index cd0166d..1294b7e 100644 --- a/components/text/intltool/pkg5 +++ b/components/text/intltool/pkg5 @@ -1,13 +1,10 @@ { "dependencies": [ - "SUNWcs", - "developer/gnome/gettext", "runtime/perl", - "shell/ksh93", - "system/library" + "shell/ksh93" ], "fmris": [ "text/intltool" ], "name": "intltool" -} \ No newline at end of file +} -- Gitblit v1.9.3