From eefdbdd47709a9b082bdbe528c76d320f0bfb815 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Fri, 01 Dec 2023 16:38:53 +0100
Subject: [PATCH] openindiana-welcome: switch to Python 3.9
---
components/openindiana/openindiana-welcome/os-welcome.p5m | 1 +
components/openindiana/openindiana-welcome/pkg5 | 7 ++-----
components/openindiana/openindiana-welcome/Makefile | 11 +++--------
components/openindiana/openindiana-welcome/manifests/sample-manifest.p5m | 3 ++-
4 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/components/openindiana/openindiana-welcome/Makefile b/components/openindiana/openindiana-welcome/Makefile
index 47933ac..8aee6be 100644
--- a/components/openindiana/openindiana-welcome/Makefile
+++ b/components/openindiana/openindiana-welcome/Makefile
@@ -35,14 +35,9 @@
PATH=$(PATH.gnu)
-PYTHON_VERSION=3.5
-
COMPONENT_PREP_GIT=no
include $(WS_TOP)/make-rules/prep.mk
include $(WS_TOP)/make-rules/configure.mk
-
-# Make sure the binaries will be in /usr/bin instead of /usr/bin/$(MACH64):
-CONFIGURE_BINDIR.64 = $(CONFIGURE_BINDIR.32)
CONFIGURE_ENV += PYTHON=$(PYTHON)
@@ -71,7 +66,7 @@
$(SOURCE_DIR)/.prep: $(SOURCE_DIR)/.downloaded Makefile
cd $(@D) &&\
touch config.rpath src/config.h.in&&\
- libtoolize --force &&\
+ PATH="$(PATH)" libtoolize --force &&\
aclocal -Im4 &&\
intltoolize --copy --force --automake &&\
automake --add-missing -f -i &&\
@@ -85,5 +80,5 @@
download:: $(SOURCE_DIR)/.downloaded
# Auto-generated dependencies
-REQUIRED_PACKAGES += library/python/pygobject-3-35
-REQUIRED_PACKAGES += runtime/python-35
+PYTHON_REQUIRED_PACKAGES += library/python/pygobject-3
+PYTHON_REQUIRED_PACKAGES += runtime/python
diff --git a/components/openindiana/openindiana-welcome/manifests/sample-manifest.p5m b/components/openindiana/openindiana-welcome/manifests/sample-manifest.p5m
index a2de909..f452819 100644
--- a/components/openindiana/openindiana-welcome/manifests/sample-manifest.p5m
+++ b/components/openindiana/openindiana-welcome/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
-# Copyright 2020 <contributor>
+# Copyright 2023 <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/openindiana/openindiana-welcome/os-welcome.p5m b/components/openindiana/openindiana-welcome/os-welcome.p5m
index 8127771..d0bdc3b 100644
--- a/components/openindiana/openindiana-welcome/os-welcome.p5m
+++ b/components/openindiana/openindiana-welcome/os-welcome.p5m
@@ -15,6 +15,7 @@
#
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=$(GIT_REPO)
diff --git a/components/openindiana/openindiana-welcome/pkg5 b/components/openindiana/openindiana-welcome/pkg5
index 8f9bb3c..31a74d8 100644
--- a/components/openindiana/openindiana-welcome/pkg5
+++ b/components/openindiana/openindiana-welcome/pkg5
@@ -1,10 +1,7 @@
{
"dependencies": [
- "SUNWcs",
- "library/python/pygobject-3-35",
- "runtime/python-35",
- "shell/ksh93",
- "system/library"
+ "library/python/pygobject-3-39",
+ "runtime/python-39"
],
"fmris": [
"release/os-welcome"
--
Gitblit v1.9.3