From c872754e34013d0a4e07e1f74ed86038f7803310 Mon Sep 17 00:00:00 2001
From: Alexander Pyhalov <apyhalov@gmail.com>
Date: Wed, 27 Jul 2016 22:51:46 +0200
Subject: [PATCH] Merge pull request #2278 from pyhalov/mate

---
 components/desktop/mate/mate-desktop/Makefile                    |    1 
 components/desktop/mate/mate-desktop/mate-desktop.p5m            |    1 
 components/desktop/mate/mozo/mozo.p5m                            |  144 ++++++++++++++++++++++++++++++++++++
 components/desktop/mate/mate-desktop/patches/03-background.patch |   11 ++
 components/desktop/mate/mozo/Makefile                            |   51 ++++++++++++
 5 files changed, 208 insertions(+), 0 deletions(-)

diff --git a/components/desktop/mate/mate-desktop/Makefile b/components/desktop/mate/mate-desktop/Makefile
index 61ad871..bf71835 100644
--- a/components/desktop/mate/mate-desktop/Makefile
+++ b/components/desktop/mate/mate-desktop/Makefile
@@ -18,6 +18,7 @@
 
 COMPONENT_NAME=		mate-desktop
 COMPONENT_VERSION=	1.14.1
+COMPONENT_REVISION=	1
 COMPONENT_PROJECT_URL=	http://www.mate-desktop.org
 COMPONENT_SUMMARY=	Additional UI API for MATE Desktop
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
diff --git a/components/desktop/mate/mate-desktop/mate-desktop.p5m b/components/desktop/mate/mate-desktop/mate-desktop.p5m
index fa37190..30d563b 100644
--- a/components/desktop/mate/mate-desktop/mate-desktop.p5m
+++ b/components/desktop/mate/mate-desktop/mate-desktop.p5m
@@ -22,6 +22,7 @@
 
 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 
+depend type=require fmri=gnome/theme/background/os-backgrounds
 
 file path=usr/bin/$(MACH64)/mate-about
 file path=usr/bin/$(MACH64)/mate-color-select
diff --git a/components/desktop/mate/mate-desktop/patches/03-background.patch b/components/desktop/mate/mate-desktop/patches/03-background.patch
new file mode 100644
index 0000000..c805d09
--- /dev/null
+++ b/components/desktop/mate/mate-desktop/patches/03-background.patch
@@ -0,0 +1,11 @@
+--- mate-desktop-1.14.1/schemas/org.mate.background.gschema.xml.in.1	2016-07-27 23:05:33.255959034 +0300
++++ mate-desktop-1.14.1/schemas/org.mate.background.gschema.xml.in	2016-07-27 23:07:44.108797523 +0300
+@@ -34,7 +34,7 @@
+       <description>Determines how the image set by wallpaper_filename is rendered.  Possible values are "wallpaper", "centered", "scaled", "stretched", "zoom", "spanned".</description>
+     </key>
+     <key name="picture-filename" type="s">
+-      <default>'@datadir@/backgrounds/mate/desktop/Stripes.png'</default>
++      <default>'/usr/share/pixmaps/backgrounds/openindiana/openindiana-default.jpg'</default>
+       <summary>Picture Filename</summary>
+       <description>File to use for the background image.</description>
+     </key>
diff --git a/components/desktop/mate/mozo/Makefile b/components/desktop/mate/mozo/Makefile
new file mode 100644
index 0000000..7ef6c18
--- /dev/null
+++ b/components/desktop/mate/mozo/Makefile
@@ -0,0 +1,51 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL)". You may
+# only use this file in accordance with the terms of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2016 Alexander Pyhalov
+#
+
+include ../../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		mozo
+COMPONENT_VERSION=	1.14.0
+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:07808ceffa7b63c7971ce44c3a714ed74f85061a3e08a203bfddb166826e593c
+COMPONENT_ARCHIVE_URL=	http://pub.mate-desktop.org/releases/1.14/$(COMPONENT_ARCHIVE)
+COMPONENT_FMRI=		desktop/xdg/menu-editor/mozo
+COMPONENT_CLASSIFICATION=	Applications/Configuration and Preferences
+COMPONENT_LICENSE= LGPLv2
+COMPONENT_LICENSE_FILE= COPYING
+
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+
+PATH=/usr/gnu/bin:/usr/bin
+
+CONFIGURE_OPTIONS+=	--sysconfdir=/etc
+
+CONFIGURE_ENV+= PYTHON=$(PYTHON)
+CONFIGURE_ENV+= am_cv_python_pythondir="$(PYTHON_VENDOR_PACKAGES)"
+
+# common targets
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32)
+
+test:		$(NO_TESTS)
+
+REQUIRED_PACKAGES += library/python/pygobject-3
+REQUIRED_PACKAGES += library/python/pygobject-3-27
+REQUIRED_PACKAGES += runtime/python-27
diff --git a/components/desktop/mate/mozo/mozo.p5m b/components/desktop/mate/mozo/mozo.p5m
new file mode 100644
index 0000000..acb8500
--- /dev/null
+++ b/components/desktop/mate/mozo/mozo.p5m
@@ -0,0 +1,144 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2016 Alexander Pyhalov
+#
+
+set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="$(COMPONENT_SUMMARY)"
+set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
+
+depend type=require fmri=library/python/pygobject-3-27
+
+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/share/applications/mozo.desktop
+file path=usr/share/icons/hicolor/16x16/apps/mozo.png
+file path=usr/share/icons/hicolor/22x22/apps/mozo.png
+file path=usr/share/icons/hicolor/24x24/apps/mozo.png
+file path=usr/share/icons/hicolor/256x256/apps/mozo.png
+file path=usr/share/icons/hicolor/32x32/apps/mozo.png
+file path=usr/share/icons/hicolor/48x48/apps/mozo.png
+file path=usr/share/locale/af/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/am/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/an/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ar/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/as/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ast/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/be/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/be@latin/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/bem/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/bg/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/bn/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/br/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ca/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/cmn/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/crh/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/cs/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/cy/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/da/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/de/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/dz/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/el/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/en@shaw/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/en_AU/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/en_CA/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/eo/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/es/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/es_AR/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/es_CL/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/es_CO/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/es_MX/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/et/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/eu/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/fa/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/fi/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/fr/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/fr_CA/LC_MESSAGES/mozo.mo
+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/gl/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/gu/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/he/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/hi/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/hr/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/hu/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/hy/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/id/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/io/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/is/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/it/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ja/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ka/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/kk/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/kn/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ko/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ku/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ku_IQ/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ky/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/lt/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/lv/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/mai/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/mg/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/mk/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ml/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/mn/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/mr/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ms/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/nb/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/nds/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/nl/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/nn/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/oc/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/or/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/pa/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/pl/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ps/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/pt/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ro/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ru/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/si/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/sk/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/sl/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/sq/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/sr/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/sr@latin/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/sv/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ta/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/te/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/th/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/tr/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/ug/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/uk/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/uz/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/uz@cyrillic/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/vi/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/mozo.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/mozo.mo
+file path=usr/share/man/man1/mozo.1
+file path=usr/share/mozo/mozo.ui

--
Gitblit v1.9.3