gnome-connection-manager: deliver 1.2.1 from github release

components/desktop/gnome2/gnome-connection-manager/Makefile

@@ -19,33 +19,19 @@ COMPONENT_NAME_LONG=	gnome-connection-manager
 COMPONENT_NAME_SHORT=	gcm
 # The value below should match the .p5m and .license filenames, in particular:
 COMPONENT_NAME=  		$(COMPONENT_NAME_LONG)
-COMPONENT_VERSION=	1.2.0
-COMPONENT_REVISION=	2
+COMPONENT_VERSION=	1.2.1
 COMPONENT_PROJECT_URL=	http://kuthulu.com/gcm
-# The new GCM release should bring support for Gtk3 and Python3,
-# and is expected to work in OI unlike the venerable 1.1.0 made
-# for Gtk2 which just stopped working. So far it is unreleased,
-# hence the GitHub latest-commit fetching and tweaked definitions
-# of COMPONENT_SRC and COMPONENT_ARCHIVE below:
-COMPONENT_COMMIT_ID=	87ca05a933a35e6b14ab9dac68b2b1c3cb3bd52c
-COMPONENT_SRC=		$(COMPONENT_NAME_LONG)-$(COMPONENT_COMMIT_ID)
-###COMPONENT_SRC=		$(COMPONENT_NAME_SHORT)-$(COMPONENT_VERSION)
+
+COMPONENT_SRC=		$(COMPONENT_NAME_LONG)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:a6b25be9ce15aaa4ee1cee1b823999f9e0af23bc60ac384d84d06490b9c46ef7
+    sha256:a78f90fc1b5ea5c3c0f068d51c5db75cfe5b77eff1bed0f910ac9d484b29f3a3
 
 ### How the original sites name the archive:
-#COMPONENT_ARCHIVE_ORIG=	$(COMPONENT_NAME_LONG)_$(COMPONENT_VERSION)_all.tgz
-###COMPONENT_ARCHIVE_ORIG=	$(COMPONENT_NAME_LONG)_$(COMPONENT_VERSION).orig.tar.gz
-COMPONENT_ARCHIVE_ORIG=	$(COMPONENT_COMMIT_ID).zip
-
-### Project site is gone, use a mirror for now
-#COMPONENT_ARCHIVE_URL=	http://ftp.heanet.ie/mirrors/www.getdeb.net/getdeb/ubuntu/pool/apps/g/$(COMPONENT_NAME_LONG)/$(COMPONENT_ARCHIVE_ORIG)
-#COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/$(COMPONENT_ARCHIVE_ORIG)
+COMPONENT_ARCHIVE_ORIG=	v$(COMPONENT_VERSION).tar.gz
 COMPONENT_ARCHIVE_URL=	https://github.com/kuthulux/$(COMPONENT_NAME_LONG)/archive/$(COMPONENT_ARCHIVE_ORIG)
 
 ### How we name the archive to store on build hosts:
-#COMPONENT_ARCHIVE=	$(COMPONENT_ARCHIVE_ORIG)
-COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-$(COMPONENT_VERSION)-$(COMPONENT_COMMIT_ID).zip
+COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.gz
 
 COMPONENT_SUMMARY=	GCM - an Advanced SSH connections manager for X/Windows
 COMPONENT_FMRI=		terminal/$(COMPONENT_NAME)
@@ -57,7 +43,9 @@ include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/ips.mk
 
 PYTHON_VERSION =	3.5
+PYV =	$(subst .,,$(PYTHON_VERSION))
 PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
+PKG_MACROS +=		PYV=$(PYV)
 
 CLEAN_PATHS+= $(BUILD_DIR)
 
@@ -82,6 +70,7 @@ test:		$(NO_TESTS)
 
 REQUIRED_PACKAGES += SUNWcs
 REQUIRED_PACKAGES += library/desktop/vte-291
-REQUIRED_PACKAGES += library/python/pygobject-3-35
-REQUIRED_PACKAGES += runtime/python-35
+REQUIRED_PACKAGES += library/python/pygobject-3-$(PYV)
+REQUIRED_PACKAGES += library/python/pycairo-$(PYV)
+REQUIRED_PACKAGES += runtime/python-$(PYV)
 REQUIRED_PACKAGES += shell/expect

components/desktop/gnome2/gnome-connection-manager/gnome-connection-manager.p5m

@@ -24,15 +24,15 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 <transform file path=usr/share/applications/.* ->  default restart_fmri svc:/application/desktop-cache/desktop-mime-cache:default>
 <transform file path=usr/share/applications/.* ->  default restart_fmri svc:/application/desktop-cache/mime-types-cache:default>
 
-# Add-on files for this package
+# Add-on files for this package - wrapper script and resources
 file files/gcm path=usr/bin/gcm mode=555
 file files/gcm.desktop path=usr/share/applications/gcm.desktop
 file icon.png path=usr/share/pixmaps/gcm.png
 # Deliver the icon into the path expected by script as well
 # 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-35.pyc path=usr/share/gnome-connection-manager/__pycache__/gnome_connection_manager.cpython-35.pyc
+file __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,8 +56,10 @@ file lang/pt/LC_MESSAGES/gcm-lang.mo path=usr/share/gnome-connection-manager/lan
 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-35.pyc path=usr/share/gnome-connection-manager/__pycache__/pyAES.cpython-35.pyc
+file __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-35.pyc path=usr/share/gnome-connection-manager/__pycache__/SimpleGladeApp.cpython-35.pyc
+file __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 ssh.expect path=usr/share/gnome-connection-manager/ssh.expect mode=0555

components/desktop/gnome2/gnome-connection-manager/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
 #
 
 #
-# Copyright 2018 <contributor>
+# Copyright 2020 <contributor>
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

components/desktop/gnome2/gnome-connection-manager/pkg5

@@ -1,6 +1,7 @@
 {
     "dependencies": [
         "library/desktop/vte-291",
+        "library/python/pycairo-35",
         "library/python/pygobject-3-35",
         "runtime/python-35",
         "shell/expect",