# HG changeset patch
# User Niveditha Rau <Niveditha.Rau@Oracle.COM>
# Date 1465789440 25200
# Node ID 83e434d46fbccf582880fc10de683b618d45f724
# Parent  92a092dbd0f693e31c6595cd50388f64944ebd99
23245650 Deliver lgi 0.9.0 in Solaris
PSARC/2016/381 LGI

diff -r 92a092dbd0f6 -r 83e434d46fbc components/desktop/lgi/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/lgi/Makefile	Sun Jun 12 20:44:00 2016 -0700
@@ -0,0 +1,62 @@
+#
+# 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_and_32
+COMPILER =              gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=         lgi
+COMPONENT_VERSION=      0.9.0
+COMPONENT_PROJECT_URL=  https://github.com/pavouk/lgi
+COMPONENT_ARCHIVE_HASH= \
+        sha256:87c7870f8a1c60b48c4d5587b7fab46863e1cb9e76a68520f47e9ef2764cfe24
+COMPONENT_ARCHIVE_URL=  https://github.com/pavouk/lgi/archive/$(COMPONENT_VERSION).tar.gz
+COMPONENT_BUGDB=        gnome/libraries
+
+TPNO=                   27458
+
+# Tests do not build on Solaris yet
+TEST_TARGET= $(SKIP_TEST)
+
+BUILD_STYLE= justmake
+
+# Needs gobject-introspection, not available on S11.
+ifeq ($(BUILD_TYPE), evaluation)
+BUILD_32_and_64=
+INSTALL_32_and_64=
+PUBLISH_STAMP=
+endif
+
+include $(WS_MAKE_RULES)/common.mk
+
+LDFLAGS += $(CC_BITS)
+
+COMPONENT_INSTALL_ARGS += LUA_VERSION=5.2 PREFIX=$(USRDIR)
+COMPONENT_INSTALL_ARGS.64 += LUA_LIBDIR=$(USRDIR)/lib/lua/5.2/64
+
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libffi
+REQUIRED_PACKAGES += runtime/lua
diff -r 92a092dbd0f6 -r 83e434d46fbc components/desktop/lgi/lgi.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/lgi/lgi.p5m	Sun Jun 12 20:44:00 2016 -0700
@@ -0,0 +1,72 @@
+#
+# 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) 2011, 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:/library/lua/lgi-52@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Dynamic Lua binding to GObject libraries using GObject-Introspection"
+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:Development/Other Languages"
+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/381
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/lua/5.2/64/lgi/corelgilua52.so
+file path=usr/lib/lua/5.2/lgi/corelgilua52.so
+file path=usr/share/lua/5.2/lgi.lua
+file path=usr/share/lua/5.2/lgi/class.lua
+file path=usr/share/lua/5.2/lgi/component.lua
+file path=usr/share/lua/5.2/lgi/core.lua
+file path=usr/share/lua/5.2/lgi/enum.lua
+file path=usr/share/lua/5.2/lgi/ffi.lua
+file path=usr/share/lua/5.2/lgi/init.lua
+file path=usr/share/lua/5.2/lgi/log.lua
+file path=usr/share/lua/5.2/lgi/namespace.lua
+file path=usr/share/lua/5.2/lgi/override/Clutter.lua
+file path=usr/share/lua/5.2/lgi/override/GLib-Bytes.lua
+file path=usr/share/lua/5.2/lgi/override/GLib-Error.lua
+file path=usr/share/lua/5.2/lgi/override/GLib-Markup.lua
+file path=usr/share/lua/5.2/lgi/override/GLib-Timer.lua
+file path=usr/share/lua/5.2/lgi/override/GLib-Variant.lua
+file path=usr/share/lua/5.2/lgi/override/GLib.lua
+file path=usr/share/lua/5.2/lgi/override/GObject-Closure.lua
+file path=usr/share/lua/5.2/lgi/override/GObject-Object.lua
+file path=usr/share/lua/5.2/lgi/override/GObject-Type.lua
+file path=usr/share/lua/5.2/lgi/override/GObject-Value.lua
+file path=usr/share/lua/5.2/lgi/override/Gdk.lua
+file path=usr/share/lua/5.2/lgi/override/Gio-DBus.lua
+file path=usr/share/lua/5.2/lgi/override/Gio.lua
+file path=usr/share/lua/5.2/lgi/override/Gst.lua
+file path=usr/share/lua/5.2/lgi/override/Gtk.lua
+file path=usr/share/lua/5.2/lgi/override/Pango.lua
+file path=usr/share/lua/5.2/lgi/override/PangoCairo.lua
+file path=usr/share/lua/5.2/lgi/override/cairo.lua
+file path=usr/share/lua/5.2/lgi/package.lua
+file path=usr/share/lua/5.2/lgi/record.lua
+file path=usr/share/lua/5.2/lgi/version.lua
+license LICENSE license=MIT
+depend type=require fmri=runtime/lua
diff -r 92a092dbd0f6 -r 83e434d46fbc components/desktop/lgi/patches/01-lua-version.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/lgi/patches/01-lua-version.patch	Sun Jun 12 20:44:00 2016 -0700
@@ -0,0 +1,46 @@
+components/lua is 5.2.1 - not suitable for upstream
+
+--- lgi-0.9.0/lgi/Makefile	2015-03-23 15:48:44.000000000 -0700
++++ lgi-0.9.0/lgi/Makefile	2015-06-25 23:19:24.655402429 -0700
+@@ -15,16 +15,16 @@
+ VERSION_FILE = version.lua
+ 
+ ifneq ($(filter CYGWIN%, $(shell uname -s)),)
+-CORE = corelgilua51.dll
++CORE = corelgilua52.dll
+ LIBFLAG = -shared
+ LIBS += -llua
+ else
+ ifeq ($(shell uname -s),Darwin)
+-CORE = corelgilua51.so
++CORE = corelgilua52.so
+ LIBFLAG = -bundle -undefined dynamic_lookup
+ CCSHARED = -fno-common
+ else
+-CORE = corelgilua51.so
++CORE = corelgilua52.so
+ LIBFLAG = -shared
+ CCSHARED = -fPIC
+ endif
+--- lgi-0.9.0/lgi/core.c	2015-03-23 15:48:44.000000000 -0700
++++ lgi-0.9.0/lgi/core.c	2015-06-25 23:32:45.937122965 -0700
+@@ -655,7 +655,7 @@
+ }
+ 
+ int
+-luaopen_lgi_corelgilua51 (lua_State* L)
++luaopen_lgi_corelgilua52 (lua_State* L)
+ {
+   LgiStateMutex *mutex;
+   gint state_id;
+--- lgi-0.9.0/lgi/core.lua	2015-03-23 15:48:44.000000000 -0700
++++ lgi-0.9.0/lgi/core.lua	2015-06-25 23:32:50.067448193 -0700
+@@ -11,7 +11,7 @@
+ -- This module decides what kind of core routines should be loaded.
+ -- Currently only one implementation exists, standard-Lua C-side
+ -- implementation, LuaJIT-FFI-based one is planned.
+-local core = require 'lgi.corelgilua51'
++local core = require 'lgi.corelgilua52'
+ 
+ -- Helper methods for converting between CamelCase and uscore_delim
+ -- names.