Marcel Telka
2023-02-13 788f79683870ef2c4fa85358e53c33c77f2a066b
gnome-connection-manager: rebuild for Python 3.9

4 files modified
1 files renamed
63 ■■■■■ changed files
components/desktop/gnome2/gnome-connection-manager/Makefile 40 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-connection-manager/gnome-connection-manager.p5m 9 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-connection-manager/manifests/sample-manifest.p5m 3 ●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-connection-manager/patches/01-gcmpy-hardcode-python39.patch 4 ●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-connection-manager/pkg5 7 ●●●●● patch | view | raw | blame | history
components/desktop/gnome2/gnome-connection-manager/Makefile
@@ -13,6 +13,8 @@
# Copyright (c) 2015-2021 Jim Klimov
#
BUILD_STYLE = justmake
include ../../../../make-rules/shared-macros.mk
COMPONENT_NAME_LONG=    gnome-connection-manager
@@ -20,6 +22,7 @@
# The value below should match the .p5m and .license filenames, in particular:
COMPONENT_NAME=          $(COMPONENT_NAME_LONG)
COMPONENT_VERSION=    1.2.1
COMPONENT_REVISION=    1
# Currently the latest release is a bit behind the Git HEAD on features
# Comment away when switching to future "vanilla" release
COMPONENT_GIT_ORG=    kuthulux
@@ -54,38 +57,21 @@
COMPONENT_LICENSE=    GPLv3
COMPONENT_LICENSE_FILE=    $(COMPONENT_NAME).license
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/ips.mk
TEST_TARGET = $(NO_TESTS)
PYTHON_VERSION =    3.5
PYV =    $(subst .,,$(PYTHON_VERSION))
PKG_MACROS +=        PYVER=$(PYTHON_VERSION)
PKG_MACROS +=        PYV=$(PYV)
CLEAN_PATHS+= $(BUILD_DIR)
include $(WS_MAKE_RULES)/common.mk
# rules are very simple, because the project is a script - just deliver and run
# unpacked directory is among search paths for the p5m installation anyway
$(BUILD_DIR)/.built:    $(SOURCE_DIR)/.prep
    $(RM) -r $(@D) ; $(MKDIR) $(@D)
    $(CLONEY) $(SOURCE_DIR) $(@D)
    find $(@D) -name '*.pyc' -exec rm -f '{}' \;
    $(PYTHON) -m compileall $(@D)
    $(TOUCH) $@
COMPONENT_PRE_BUILD_ACTION =    find $(@D) -name '*.pyc' -exec rm -f '{}' \;
COMPONENT_BUILD_ACTION =    $(PYTHON) -m compileall $(@D)
$(BUILD_DIR)/.installed:    $(BUILD_DIR)/.built
    $(TOUCH) $@
COMPONENT_INSTALL_ACTION =    true
build:        $(BUILD_DIR)/.built files/gcm Makefile
install:    $(BUILD_DIR)/.installed Makefile
test:        $(NO_TESTS)
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += library/desktop/vte-291
REQUIRED_PACKAGES += library/python/pygobject-3-$(PYV)
REQUIRED_PACKAGES += library/python/pycairo-$(PYV)
REQUIRED_PACKAGES += runtime/python-$(PYV)
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/pycairo
PYTHON_REQUIRED_PACKAGES += library/python/pygobject-3
PYTHON_REQUIRED_PACKAGES += runtime/python
REQUIRED_PACKAGES += shell/expect
REQUIRED_PACKAGES += shell/ksh93
components/desktop/gnome2/gnome-connection-manager/gnome-connection-manager.p5m
@@ -13,6 +13,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=$(COMPONENT_PROJECT_URL)
@@ -32,7 +33,7 @@
# so it goes well into the window title bar (TODO: sym/hard-link?)
file icon.png path=usr/share/gnome-connection-manager/icon.png
# PYC files here and below are not from tarball but compiled by our Makefile
file __pycache__/gnome_connection_manager.cpython-$(PYV).pyc path=usr/share/gnome-connection-manager/__pycache__/gnome_connection_manager.cpython-$(PYV).pyc
file $(MACH64)/__pycache__/gnome_connection_manager.cpython-$(PYV).pyc path=usr/share/gnome-connection-manager/__pycache__/gnome_connection_manager.cpython-$(PYV).pyc
# Files delivered by source tarball, as of version 1.1.0, listed via:
#   find . -type f | sed 's,^./\(.*\)$,file \1 path=usr/share/gnome-connection-manager/\1,'
@@ -56,11 +57,11 @@
file lang/ru_RU.po path=usr/share/gnome-connection-manager/lang/ru_RU.po
file lang/ru/LC_MESSAGES/gcm-lang.mo path=usr/share/gnome-connection-manager/lang/ru/LC_MESSAGES/gcm-lang.mo
file pyAES.py path=usr/share/gnome-connection-manager/pyAES.py
file __pycache__/pyAES.cpython-$(PYV).pyc path=usr/share/gnome-connection-manager/__pycache__/pyAES.cpython-$(PYV).pyc
file $(MACH64)/__pycache__/pyAES.cpython-$(PYV).pyc path=usr/share/gnome-connection-manager/__pycache__/pyAES.cpython-$(PYV).pyc
file files/README.txt path=usr/share/gnome-connection-manager/README.txt
file SimpleGladeApp.py path=usr/share/gnome-connection-manager/SimpleGladeApp.py
file __pycache__/SimpleGladeApp.cpython-$(PYV).pyc path=usr/share/gnome-connection-manager/__pycache__/SimpleGladeApp.cpython-$(PYV).pyc
file $(MACH64)/__pycache__/SimpleGladeApp.cpython-$(PYV).pyc path=usr/share/gnome-connection-manager/__pycache__/SimpleGladeApp.cpython-$(PYV).pyc
file urlregex.py path=usr/share/gnome-connection-manager/urlregex.py
file __pycache__/urlregex.cpython-$(PYV).pyc path=usr/share/gnome-connection-manager/__pycache__/urlregex.cpython-$(PYV).pyc
file $(MACH64)/__pycache__/urlregex.cpython-$(PYV).pyc path=usr/share/gnome-connection-manager/__pycache__/urlregex.cpython-$(PYV).pyc
file ssh.expect path=usr/share/gnome-connection-manager/ssh.expect mode=0555
file style.css path=usr/share/gnome-connection-manager/style.css
components/desktop/gnome2/gnome-connection-manager/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2021 <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)
components/desktop/gnome2/gnome-connection-manager/patches/01-gcmpy-hardcode-python39.patch
File was renamed from components/desktop/gnome2/gnome-connection-manager/patches/01-gcmpy-hardcode-python35.patch
@@ -1,4 +1,4 @@
Our packaging manifest relies on "35" in pathnames and dependency package
Our packaging manifest relies on "39" in pathnames and dependency package
names. Probably that can be played around by macros at a later point, but
for now it is easier to bolt the version.
@@ -6,7 +6,7 @@
+++ gcm-1.1.0/gnome_connection_manager.py    2012-07-05 23:59:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python3.5
+#!/usr/bin/python3.9
 # -*- coding: UTF-8 -*-
 
 # Python module gnome_connection_manager.py
components/desktop/gnome2/gnome-connection-manager/pkg5
@@ -1,10 +1,9 @@
{
    "dependencies": [
        "SUNWcs",
        "library/desktop/vte-291",
        "library/python/pycairo-35",
        "library/python/pygobject-3-35",
        "runtime/python-35",
        "library/python/pycairo-39",
        "library/python/pygobject-3-39",
        "runtime/python-39",
        "shell/expect",
        "shell/ksh93",
        "system/library"