Update mozo 1.22.0

OpenIndiana · May 4, 2019 · 45a409f · 45a409f
1 parent 5974ea1
commit 45a409f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 23 deletions.
diff --git a/components/desktop/mate/mozo/Makefile b/components/desktop/mate/mozo/Makefile
@@ -10,21 +10,23 @@
 
 #
 # Copyright 2016 Alexander Pyhalov
-# Copyright 2018 Michal Nowak
+# Copyright 2019 Michal Nowak
 #
 
+PREFERRED_BITS=		64
+
 include ../../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		mozo
-COMPONENT_MJR_VERSION=	1.20
-COMPONENT_MNR_VERSION=	2
+COMPONENT_MJR_VERSION=	1.22
+COMPONENT_MNR_VERSION=	1
 COMPONENT_VERSION=	$(COMPONENT_MJR_VERSION).$(COMPONENT_MNR_VERSION)
 COMPONENT_PROJECT_URL=	http://www.mate-desktop.org
 COMPONENT_SUMMARY=	Simple menu editor for MATE
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-	sha256:0deeda3637cf5428853f633378f5d7006184e928cdf78e94d8aad7f822c490e0
+	sha256:105368e49f62afdec2a950795b5519340178aaa73388c98ebbd69b35eeb9ce79
 COMPONENT_ARCHIVE_URL=	http://pub.mate-desktop.org/releases/$(COMPONENT_MJR_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_FMRI=		desktop/xdg/menu-editor/mozo
 COMPONENT_CLASSIFICATION=	Applications/Configuration and Preferences
@@ -39,18 +41,17 @@ PATH=$(PATH.gnu)
 
 CONFIGURE_OPTIONS+=	--sysconfdir=/etc
 
-CONFIGURE_ENV+= PYTHON=$(PYTHON)
-CONFIGURE_ENV+= am_cv_python_pythondir="$(PYTHON_VENDOR_PACKAGES)"
+CONFIGURE_ENV+= PYTHON=$(PYTHON.3.5.64)
+CONFIGURE_ENV+= am_cv_python_pythondir="$(PYTHON.3.5.VENDOR_PACKAGES.64)"
 
-# common targets
-build:		$(BUILD_32)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
 # Build requirements
 REQUIRED_PACKAGES += library/python/pygobject-3
-REQUIRED_PACKAGES += library/python/pygobject-3-27
+REQUIRED_PACKAGES += library/python/pygobject-3-35
 # Auto-generated dependencies
-REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += runtime/python-35
diff --git a/components/desktop/mate/mozo/manifests/sample-manifest.p5m b/components/desktop/mate/mozo/manifests/sample-manifest.p5m
@@ -23,11 +23,11 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 
 file path=usr/bin/mozo
-file path=usr/lib/python2.7/vendor-packages/Mozo/MainWindow.py
-file path=usr/lib/python2.7/vendor-packages/Mozo/MenuEditor.py
-file path=usr/lib/python2.7/vendor-packages/Mozo/__init__.py
-file path=usr/lib/python2.7/vendor-packages/Mozo/config.py
-file path=usr/lib/python2.7/vendor-packages/Mozo/util.py
+file path=usr/lib/python3.5/vendor-packages/Mozo/MainWindow.py
+file path=usr/lib/python3.5/vendor-packages/Mozo/MenuEditor.py
+file path=usr/lib/python3.5/vendor-packages/Mozo/__init__.py
+file path=usr/lib/python3.5/vendor-packages/Mozo/config.py
+file path=usr/lib/python3.5/vendor-packages/Mozo/util.py
 file path=usr/share/applications/mozo.desktop
 file path=usr/share/icons/hicolor/16x16/apps/mozo.png
 file path=usr/share/icons/hicolor/22x22/apps/mozo.png
@@ -80,6 +80,7 @@ file path=usr/share/locale/frp/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/fur/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/fy/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/ga/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/gd/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/gl/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/gu/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/ha/LC_MESSAGES/mozo.mo

diff --git a/components/desktop/mate/mozo/mozo.p5m b/components/desktop/mate/mozo/mozo.p5m
@@ -11,7 +11,7 @@
 
 #
 # Copyright 2016 Alexander Pyhalov
-# Copyright 2018 Michal Nowak
+# Copyright 2019 Michal Nowak
 #
 
 set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -23,14 +23,14 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 
-depend type=require fmri=library/python/pygobject-3-27
+depend type=require fmri=library/python/pygobject-3-35
 
 file path=usr/bin/mozo
-file path=usr/lib/python2.7/vendor-packages/Mozo/MainWindow.py
-file path=usr/lib/python2.7/vendor-packages/Mozo/MenuEditor.py
-file path=usr/lib/python2.7/vendor-packages/Mozo/__init__.py
-file path=usr/lib/python2.7/vendor-packages/Mozo/config.py
-file path=usr/lib/python2.7/vendor-packages/Mozo/util.py
+file path=usr/lib/python3.5/vendor-packages/Mozo/MainWindow.py
+file path=usr/lib/python3.5/vendor-packages/Mozo/MenuEditor.py
+file path=usr/lib/python3.5/vendor-packages/Mozo/__init__.py
+file path=usr/lib/python3.5/vendor-packages/Mozo/config.py
+file path=usr/lib/python3.5/vendor-packages/Mozo/util.py
 file path=usr/share/applications/mozo.desktop
 file path=usr/share/icons/hicolor/16x16/apps/mozo.png
 file path=usr/share/icons/hicolor/22x22/apps/mozo.png
@@ -83,6 +83,7 @@ file path=usr/share/locale/frp/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/fur/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/fy/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/ga/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/gd/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/gl/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/gu/LC_MESSAGES/mozo.mo
 file path=usr/share/locale/ha/LC_MESSAGES/mozo.mo