Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23245360 Move vino to Userland and update to 3.18.0
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Sun, 23 Oct 2016 23:54:15 -0700
changeset 7198 337a99283a60
parent 7197 5001d53d2e77
child 7199 6688ad419cab
23245360 Move vino to Userland and update to 3.18.0 22144547 problem in GNOME/REMOTE-DESKTOP PSARC/2016/483 Vino v.3.18
components/gnome/vino/Makefile file | annotate | diff | comparison | revisions
components/gnome/vino/vino.p5m file | annotate | diff | comparison | revisions
components/meta-packages/history/history file | annotate | diff | comparison | revisions
components/meta-packages/incorporation-cache file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/vino/Makefile	Sun Oct 23 23:54:15 2016 -0700
@@ -0,0 +1,96 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS=		64
+COMPILER=		gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		vino
+COMPONENT_VERSION=	3.18.0
+COMPONENT_PROJECT_URL=	https://wiki.gnome.org/Projects/Vino
+COMPONENT_ARCHIVE_HASH= \
+	sha256:52be0b036389713eab224abf27f2ca2a067ba5bd1f6b526592703576005e0919
+COMPONENT_BUGDB=        gnome/remote-desktop
+
+TPNO=			24888
+
+TEST_TARGET = $(NO_TESTS)
+
+# Needs updated glib2, not available on S11.
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Force use of gnutls-3 pkgconfig during 2.x->3.x transition
+PKG_CONFIG_PATHS.32 += $(PKG_CONFIG_PATH.32)/gnutls-3
+PKG_CONFIG_PATHS.64 += $(PKG_CONFIG_PATH.64)/gnutls-3
+PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
+LD_OPTIONS.32 += -L $(USRLIB.32)/gnutls-3 -R $(USRLIB.32)/gnutls-3
+LD_OPTIONS.64 += -L $(USRLIB.64)/gnutls-3 -R $(USRLIB.64)/gnutls-3
+LD_OPTIONS += $(LD_OPTIONS.$(BITS))
+
+PKG_CONFIG_PATHS.32 += $(PKG_CONFIG_PATH.32)/libnotify-4
+PKG_CONFIG_PATHS.64 += $(PKG_CONFIG_PATH.64)/libnotify-4
+PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
+LD_OPTIONS.32 += -L $(USRLIB.32)/libnotify-4 -R $(USRLIB.32)/libnotify-4
+LD_OPTIONS.64 += -L $(USRLIB.64)/libnotify-4 -R $(USRLIB.64)/libnotify-4
+LD_OPTIONS += $(LD_OPTIONS.$(BITS))
+
+CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
+
+CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --enable-shared
+CONFIGURE_OPTIONS += --with-avahi
+CONFIGURE_OPTIONS += --with-gcrypt
+CONFIGURE_OPTIONS += --with-gnutls
+CONFIGURE_OPTIONS += --with-jpeg
+CONFIGURE_OPTIONS += --with-pic
+CONFIGURE_OPTIONS += --with-secret
+CONFIGURE_OPTIONS += --with-telepathy
+CONFIGURE_OPTIONS += --with-x
+CONFIGURE_OPTIONS += --with-zlib
+CONFIGURE_OPTIONS += --libexecdir=$(USRLIBDIR)
+
+REQUIRED_PACKAGES += image/library/libjpeg
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
+REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/desktop/libnotify
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/gnome/libsecret
+REQUIRED_PACKAGES += library/gnutls-3
+REQUIRED_PACKAGES += library/telepathy-glib
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += system/library/libdbus
+REQUIRED_PACKAGES += system/library/libdbus-glib
+REQUIRED_PACKAGES += system/library/security/libgcrypt
+REQUIRED_PACKAGES += system/network/avahi
+REQUIRED_PACKAGES += x11/library/libice
+REQUIRED_PACKAGES += x11/library/libsm
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxdamage
+REQUIRED_PACKAGES += x11/library/libxext
+REQUIRED_PACKAGES += x11/library/libxfixes
+REQUIRED_PACKAGES += x11/library/libxtst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/vino/vino.p5m	Sun Oct 23 23:54:15 2016 -0700
@@ -0,0 +1,132 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/desktop/remote-desktop/vino@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The GNOME desktop sharing server"
+set name=com.oracle.info.description value=$(COMPONENT_NAME)
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification value=org.opensolaris.category.2008:System/Services
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/483
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/vino-server mode=0555
+file path=usr/share/applications/vino-server.desktop
+file path=usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
+file path=usr/share/glib-2.0/schemas/org.gnome.Vino.enums.xml
+file path=usr/share/glib-2.0/schemas/org.gnome.Vino.gschema.xml
+file path=usr/share/locale/an/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ar/LC_MESSAGES/vino.mo
+file path=usr/share/locale/as/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ast/LC_MESSAGES/vino.mo
+file path=usr/share/locale/az/LC_MESSAGES/vino.mo
+file path=usr/share/locale/be/LC_MESSAGES/vino.mo
+file path=usr/share/locale/be@latin/LC_MESSAGES/vino.mo
+file path=usr/share/locale/bg/LC_MESSAGES/vino.mo
+file path=usr/share/locale/bn/LC_MESSAGES/vino.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/vino.mo
+file path=usr/share/locale/bs/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ca/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/vino.mo
+file path=usr/share/locale/cs/LC_MESSAGES/vino.mo
+file path=usr/share/locale/cy/LC_MESSAGES/vino.mo
+file path=usr/share/locale/da/LC_MESSAGES/vino.mo
+file path=usr/share/locale/de/LC_MESSAGES/vino.mo
+file path=usr/share/locale/dz/LC_MESSAGES/vino.mo
+file path=usr/share/locale/el/LC_MESSAGES/vino.mo
+file path=usr/share/locale/en@shaw/LC_MESSAGES/vino.mo
+file path=usr/share/locale/en_CA/LC_MESSAGES/vino.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/vino.mo
+file path=usr/share/locale/eo/LC_MESSAGES/vino.mo
+file path=usr/share/locale/es/LC_MESSAGES/vino.mo
+file path=usr/share/locale/et/LC_MESSAGES/vino.mo
+file path=usr/share/locale/eu/LC_MESSAGES/vino.mo
+file path=usr/share/locale/fa/LC_MESSAGES/vino.mo
+file path=usr/share/locale/fi/LC_MESSAGES/vino.mo
+file path=usr/share/locale/fr/LC_MESSAGES/vino.mo
+file path=usr/share/locale/fur/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ga/LC_MESSAGES/vino.mo
+file path=usr/share/locale/gl/LC_MESSAGES/vino.mo
+file path=usr/share/locale/gu/LC_MESSAGES/vino.mo
+file path=usr/share/locale/he/LC_MESSAGES/vino.mo
+file path=usr/share/locale/hi/LC_MESSAGES/vino.mo
+file path=usr/share/locale/hr/LC_MESSAGES/vino.mo
+file path=usr/share/locale/hu/LC_MESSAGES/vino.mo
+file path=usr/share/locale/id/LC_MESSAGES/vino.mo
+file path=usr/share/locale/it/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ja/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ka/LC_MESSAGES/vino.mo
+file path=usr/share/locale/kk/LC_MESSAGES/vino.mo
+file path=usr/share/locale/km/LC_MESSAGES/vino.mo
+file path=usr/share/locale/kn/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ko/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ku/LC_MESSAGES/vino.mo
+file path=usr/share/locale/lt/LC_MESSAGES/vino.mo
+file path=usr/share/locale/lv/LC_MESSAGES/vino.mo
+file path=usr/share/locale/mai/LC_MESSAGES/vino.mo
+file path=usr/share/locale/mk/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ml/LC_MESSAGES/vino.mo
+file path=usr/share/locale/mn/LC_MESSAGES/vino.mo
+file path=usr/share/locale/mr/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ms/LC_MESSAGES/vino.mo
+file path=usr/share/locale/nb/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ne/LC_MESSAGES/vino.mo
+file path=usr/share/locale/nl/LC_MESSAGES/vino.mo
+file path=usr/share/locale/nn/LC_MESSAGES/vino.mo
+file path=usr/share/locale/oc/LC_MESSAGES/vino.mo
+file path=usr/share/locale/or/LC_MESSAGES/vino.mo
+file path=usr/share/locale/pa/LC_MESSAGES/vino.mo
+file path=usr/share/locale/pl/LC_MESSAGES/vino.mo
+file path=usr/share/locale/pt/LC_MESSAGES/vino.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ro/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ru/LC_MESSAGES/vino.mo
+file path=usr/share/locale/rw/LC_MESSAGES/vino.mo
+file path=usr/share/locale/si/LC_MESSAGES/vino.mo
+file path=usr/share/locale/sk/LC_MESSAGES/vino.mo
+file path=usr/share/locale/sl/LC_MESSAGES/vino.mo
+file path=usr/share/locale/sq/LC_MESSAGES/vino.mo
+file path=usr/share/locale/sr/LC_MESSAGES/vino.mo
+file path=usr/share/locale/sr@latin/LC_MESSAGES/vino.mo
+file path=usr/share/locale/sv/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ta/LC_MESSAGES/vino.mo
+file path=usr/share/locale/te/LC_MESSAGES/vino.mo
+file path=usr/share/locale/tg/LC_MESSAGES/vino.mo
+file path=usr/share/locale/th/LC_MESSAGES/vino.mo
+file path=usr/share/locale/tr/LC_MESSAGES/vino.mo
+file path=usr/share/locale/ug/LC_MESSAGES/vino.mo
+file path=usr/share/locale/uk/LC_MESSAGES/vino.mo
+file path=usr/share/locale/vi/LC_MESSAGES/vino.mo
+file path=usr/share/locale/wa/LC_MESSAGES/vino.mo
+file path=usr/share/locale/xh/LC_MESSAGES/vino.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/vino.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/vino.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/vino.mo
+file path=usr/share/telepathy/clients/Vino.client
+license COPYING license=GPLv2
+# vino was previously in the gnome-remote-desktop package for GNOME 2,
+# so avoid conflict with it
+depend type=optional \
+    fmri=pkg:/gnome/[email protected],5.12-5.12.0.0.0.112.0
--- a/components/meta-packages/history/history	Fri Oct 28 14:58:48 2016 -0700
+++ b/components/meta-packages/history/history	Sun Oct 23 23:54:15 2016 -0700
@@ -844,6 +844,7 @@
 gnome/[email protected],5.12-5.12.0.0.0.90.0
 gnome/[email protected],5.12-5.12.0.0.0.90.0
 gnome/[email protected],5.12-5.12.0.0.0.112.0 gnome/preferences/[email protected]
+gnome/[email protected],5.12-5.12.0.0.0.112.0 desktop/remote-desktop/vino
 gnome/locale/[email protected],5.11-0.175.0.0.0.0.0
 gnome/locale/[email protected],5.11-0.175.0.0.0.0.0
 gnome/locale/[email protected],5.11-0.175.0.0.0.0.0
--- a/components/meta-packages/incorporation-cache	Fri Oct 28 14:58:48 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Sun Oct 23 23:54:15 2016 -0700
@@ -83,7 +83,6 @@
 consolidation/userland/userland-incorporation:gnome/[email protected]
 consolidation/userland/userland-incorporation:gnome/[email protected]
 consolidation/userland/userland-incorporation:gnome/[email protected]
-consolidation/userland/userland-incorporation:gnome/[email protected]
 consolidation/userland/userland-incorporation:gnome/[email protected]
 consolidation/userland/userland-incorporation:gnome/security/seahorse/[email protected]
 consolidation/userland/userland-incorporation:gnome/security/[email protected]
upstream/oracle/userland-gate