| 1 |
mrpouet 09/08/31 19:09:30 |
| 2 |
|
| 3 |
Added: gtk-engines-2.18.2-system-lua.patch |
| 4 |
Log: |
| 5 |
Fix bug #255773, use liblua system library instead of embedded version, patch import from upstream bug #593674, thanks to Ihar Hrachyshka <ihar.hrachyshka@×××××.com> for his work |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gtk-engines-2.18.2-system-lua.patch |
| 15 |
=================================================================== |
| 16 |
From 7508e8941bc664df0e7b8c952d82d901f9a95c75 Mon Sep 17 00:00:00 2001 |
| 17 |
From: Ihar Hrachyshka <ihar.hrachyshka@×××××.com> |
| 18 |
Date: Mon, 31 Aug 2009 16:09:55 +0300 |
| 19 |
Subject: [PATCH] Added configure option to use system liblua for Lua engine. |
| 20 |
|
| 21 |
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@×××××.com> |
| 22 |
--- |
| 23 |
configure.ac | 10 ++++ |
| 24 |
engines/lua/Makefile.am | 118 +++++++++++++++++++++++++---------------------- |
| 25 |
2 files changed, 73 insertions(+), 55 deletions(-) |
| 26 |
|
| 27 |
diff --git a/configure.ac b/configure.ac |
| 28 |
index df673ed..3c3ce2a 100644 |
| 29 |
--- a/configure.ac |
| 30 |
+++ b/configure.ac |
| 31 |
@@ -45,6 +45,9 @@ AC_ARG_ENABLE(paranoia, [ --enable-paranoia use wall, werror, ansi, peda |
| 32 |
AC_ARG_ENABLE(deprecated, [ --disable-deprecated disable deprecated functions in gtk et al], [deprecated=$enableval], [deprecated="no"]) |
| 33 |
|
| 34 |
AC_ARG_ENABLE(schemas, [ --disable-schema disable engine schemas], [schemas=$enableval], [schemas="yes"]) |
| 35 |
+AC_ARG_WITH(system-lua, [ --with-system-lua link with system Lua library], [system_lua=$enableval], [system_lua="no"]) |
| 36 |
+ |
| 37 |
+AM_CONDITIONAL([SYSTEM_LUA], [test x$system_lua = xtrue]) |
| 38 |
|
| 39 |
BUILD_ENGINES="" |
| 40 |
BUILD_THEMES="" |
| 41 |
@@ -126,6 +129,13 @@ AC_SUBST(GTK_LIBS) |
| 42 |
GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` |
| 43 |
AC_SUBST(GTK_VERSION) |
| 44 |
|
| 45 |
+if test $system_lua = "yes"; then |
| 46 |
+ PKG_CHECK_MODULES(LUA, lua,, |
| 47 |
+ AC_MSG_ERROR([--with-system-lua specified but no system liblua found])) |
| 48 |
+ AC_SUBST(LUA_CFLAGS) |
| 49 |
+ AC_SUBST(LUA_LIBS) |
| 50 |
+fi |
| 51 |
+ |
| 52 |
AC_SUBST(BUILD_ENGINES) |
| 53 |
AC_SUBST(BUILD_THEMES) |
| 54 |
AC_SUBST(BUILD_SCHEMAS) |
| 55 |
diff --git a/engines/lua/Makefile.am b/engines/lua/Makefile.am |
| 56 |
index 736154d..6243e5a 100644 |
| 57 |
--- a/engines/lua/Makefile.am |
| 58 |
+++ b/engines/lua/Makefile.am |
| 59 |
@@ -21,10 +21,69 @@ |
| 60 |
|
| 61 |
NULL = |
| 62 |
|
| 63 |
+if SYSTEM_LUA |
| 64 |
+ LIBLUA_SOURCES = |
| 65 |
+ LIBLUA_CFLAGS = $(LUA_CFLAGS) |
| 66 |
+else |
| 67 |
+ LIBLUA_CFLAGS = -I$(top_srcdir)/engines/lua/src/liblua |
| 68 |
+ LIBLUA_SOURCES = \ |
| 69 |
+ ./src/liblua/lapi.h \ |
| 70 |
+ ./src/liblua/lauxlib.h \ |
| 71 |
+ ./src/liblua/lcode.h \ |
| 72 |
+ ./src/liblua/ldebug.h \ |
| 73 |
+ ./src/liblua/ldo.h \ |
| 74 |
+ ./src/liblua/lfunc.h \ |
| 75 |
+ ./src/liblua/lgc.h \ |
| 76 |
+ ./src/liblua/llex.h \ |
| 77 |
+ ./src/liblua/llimits.h \ |
| 78 |
+ ./src/liblua/lmem.h \ |
| 79 |
+ ./src/liblua/lobject.h \ |
| 80 |
+ ./src/liblua/lopcodes.h \ |
| 81 |
+ ./src/liblua/lparser.h \ |
| 82 |
+ ./src/liblua/lstate.h \ |
| 83 |
+ ./src/liblua/lstring.h \ |
| 84 |
+ ./src/liblua/ltable.h \ |
| 85 |
+ ./src/liblua/ltm.h \ |
| 86 |
+ ./src/liblua/lua.h \ |
| 87 |
+ ./src/liblua/luaconf.h \ |
| 88 |
+ ./src/liblua/lualib.h \ |
| 89 |
+ ./src/liblua/lundump.h \ |
| 90 |
+ ./src/liblua/lvm.h \ |
| 91 |
+ ./src/liblua/lzio.h \ |
| 92 |
+ ./src/liblua/lapi.c \ |
| 93 |
+ ./src/liblua/lcode.c \ |
| 94 |
+ ./src/liblua/ldebug.c \ |
| 95 |
+ ./src/liblua/ldo.c \ |
| 96 |
+ ./src/liblua/ldump.c \ |
| 97 |
+ ./src/liblua/lfunc.c \ |
| 98 |
+ ./src/liblua/lgc.c \ |
| 99 |
+ ./src/liblua/liolib.c \ |
| 100 |
+ ./src/liblua/llex.c \ |
| 101 |
+ ./src/liblua/lmem.c \ |
| 102 |
+ ./src/liblua/lobject.c \ |
| 103 |
+ ./src/liblua/lopcodes.c \ |
| 104 |
+ ./src/liblua/loslib.c \ |
| 105 |
+ ./src/liblua/lparser.c \ |
| 106 |
+ ./src/liblua/lstate.c \ |
| 107 |
+ ./src/liblua/lstring.c \ |
| 108 |
+ ./src/liblua/lstrlib.c \ |
| 109 |
+ ./src/liblua/ltable.c \ |
| 110 |
+ ./src/liblua/ltablib.c \ |
| 111 |
+ ./src/liblua/ltm.c \ |
| 112 |
+ ./src/liblua/lundump.c \ |
| 113 |
+ ./src/liblua/lvm.c \ |
| 114 |
+ ./src/liblua/lzio.c \ |
| 115 |
+ ./src/liblua/lauxlib.c \ |
| 116 |
+ ./src/liblua/lbaselib.c \ |
| 117 |
+ ./src/liblua/ldblib.c \ |
| 118 |
+ ./src/liblua/lmathlib.c \ |
| 119 |
+ ./src/liblua/loadlib.c \ |
| 120 |
+ ./src/liblua/linit.c |
| 121 |
+endif |
| 122 |
+ |
| 123 |
INCLUDES = \ |
| 124 |
-I$(top_srcdir)/engines/support \ |
| 125 |
- -I$(top_srcdir)/engines/lua/src/liblua \ |
| 126 |
- $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) \ |
| 127 |
+ $(LIBLUA_CFLAGS) $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) \ |
| 128 |
$(NULL) |
| 129 |
|
| 130 |
enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines |
| 131 |
@@ -44,62 +103,11 @@ libluaengine_la_SOURCES = \ |
| 132 |
./src/main.c \ |
| 133 |
./src/misc_utils.c \ |
| 134 |
./src/misc_utils.h \ |
| 135 |
- ./src/liblua/lapi.h \ |
| 136 |
- ./src/liblua/lauxlib.h \ |
| 137 |
- ./src/liblua/lcode.h \ |
| 138 |
- ./src/liblua/ldebug.h \ |
| 139 |
- ./src/liblua/ldo.h \ |
| 140 |
- ./src/liblua/lfunc.h \ |
| 141 |
- ./src/liblua/lgc.h \ |
| 142 |
- ./src/liblua/llex.h \ |
| 143 |
- ./src/liblua/llimits.h \ |
| 144 |
- ./src/liblua/lmem.h \ |
| 145 |
- ./src/liblua/lobject.h \ |
| 146 |
- ./src/liblua/lopcodes.h \ |
| 147 |
- ./src/liblua/lparser.h \ |
| 148 |
- ./src/liblua/lstate.h \ |
| 149 |
- ./src/liblua/lstring.h \ |
| 150 |
- ./src/liblua/ltable.h \ |
| 151 |
- ./src/liblua/ltm.h \ |
| 152 |
- ./src/liblua/lua.h \ |
| 153 |
- ./src/liblua/luaconf.h \ |
| 154 |
- ./src/liblua/lualib.h \ |
| 155 |
- ./src/liblua/lundump.h \ |
| 156 |
- ./src/liblua/lvm.h \ |
| 157 |
- ./src/liblua/lzio.h \ |
| 158 |
- ./src/liblua/lapi.c \ |
| 159 |
- ./src/liblua/lcode.c \ |
| 160 |
- ./src/liblua/ldebug.c \ |
| 161 |
- ./src/liblua/ldo.c \ |
| 162 |
- ./src/liblua/ldump.c \ |
| 163 |
- ./src/liblua/lfunc.c \ |
| 164 |
- ./src/liblua/lgc.c \ |
| 165 |
- ./src/liblua/liolib.c \ |
| 166 |
- ./src/liblua/llex.c \ |
| 167 |
- ./src/liblua/lmem.c \ |
| 168 |
- ./src/liblua/lobject.c \ |
| 169 |
- ./src/liblua/lopcodes.c \ |
| 170 |
- ./src/liblua/loslib.c \ |
| 171 |
- ./src/liblua/lparser.c \ |
| 172 |
- ./src/liblua/lstate.c \ |
| 173 |
- ./src/liblua/lstring.c \ |
| 174 |
- ./src/liblua/lstrlib.c \ |
| 175 |
- ./src/liblua/ltable.c \ |
| 176 |
- ./src/liblua/ltablib.c \ |
| 177 |
- ./src/liblua/ltm.c \ |
| 178 |
- ./src/liblua/lundump.c \ |
| 179 |
- ./src/liblua/lvm.c \ |
| 180 |
- ./src/liblua/lzio.c \ |
| 181 |
- ./src/liblua/lauxlib.c \ |
| 182 |
- ./src/liblua/lbaselib.c \ |
| 183 |
- ./src/liblua/ldblib.c \ |
| 184 |
- ./src/liblua/lmathlib.c \ |
| 185 |
- ./src/liblua/loadlib.c \ |
| 186 |
- ./src/liblua/linit.c \ |
| 187 |
+ $(LIBLUA_SOURCES) \ |
| 188 |
$(NULL) |
| 189 |
|
| 190 |
libluaengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols |
| 191 |
-libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) |
| 192 |
+libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LUA_LIBS) |
| 193 |
|
| 194 |
-include $(top_srcdir)/git.mk |
| 195 |
|
| 196 |
-- |
| 197 |
1.6.3.3 |
Archives