components/desktop/lgi/patches/01-lua-version.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Sun, 12 Jun 2016 20:44:00 -0700
changeset 6197 83e434d46fbc
permissions -rw-r--r--
23245650 Deliver lgi 0.9.0 in Solaris PSARC/2016/381 LGI
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6197
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     1
components/lua is 5.2.1 - not suitable for upstream
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     2
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     3
--- lgi-0.9.0/lgi/Makefile	2015-03-23 15:48:44.000000000 -0700
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     4
+++ lgi-0.9.0/lgi/Makefile	2015-06-25 23:19:24.655402429 -0700
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     5
@@ -15,16 +15,16 @@
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     6
 VERSION_FILE = version.lua
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     7
 
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     8
 ifneq ($(filter CYGWIN%, $(shell uname -s)),)
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     9
-CORE = corelgilua51.dll
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    10
+CORE = corelgilua52.dll
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    11
 LIBFLAG = -shared
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    12
 LIBS += -llua
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    13
 else
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    14
 ifeq ($(shell uname -s),Darwin)
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    15
-CORE = corelgilua51.so
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    16
+CORE = corelgilua52.so
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    17
 LIBFLAG = -bundle -undefined dynamic_lookup
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    18
 CCSHARED = -fno-common
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    19
 else
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    20
-CORE = corelgilua51.so
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    21
+CORE = corelgilua52.so
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    22
 LIBFLAG = -shared
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    23
 CCSHARED = -fPIC
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    24
 endif
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    25
--- lgi-0.9.0/lgi/core.c	2015-03-23 15:48:44.000000000 -0700
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    26
+++ lgi-0.9.0/lgi/core.c	2015-06-25 23:32:45.937122965 -0700
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    27
@@ -655,7 +655,7 @@
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    28
 }
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    29
 
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    30
 int
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    31
-luaopen_lgi_corelgilua51 (lua_State* L)
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    32
+luaopen_lgi_corelgilua52 (lua_State* L)
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    33
 {
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    34
   LgiStateMutex *mutex;
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    35
   gint state_id;
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    36
--- lgi-0.9.0/lgi/core.lua	2015-03-23 15:48:44.000000000 -0700
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    37
+++ lgi-0.9.0/lgi/core.lua	2015-06-25 23:32:50.067448193 -0700
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    38
@@ -11,7 +11,7 @@
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    39
 -- This module decides what kind of core routines should be loaded.
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    40
 -- Currently only one implementation exists, standard-Lua C-side
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    41
 -- implementation, LuaJIT-FFI-based one is planned.
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    42
-local core = require 'lgi.corelgilua51'
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    43
+local core = require 'lgi.corelgilua52'
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    44
 
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    45
 -- Helper methods for converting between CamelCase and uscore_delim
83e434d46fbc 23245650 Deliver lgi 0.9.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    46
 -- names.