Gentoo Archives: gentoo-commits

From: "Romain Perier (mrpouet)" <mrpouet@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-themes/gtk-engines/files: gtk-engines-2.18.2-system-lua.patch
Date: Thu, 03 Sep 2009 05:37:44
Message-Id: E1Mj9pc-0003eT-Jr@stork.gentoo.org
1 mrpouet 09/09/03 10:46:20
2
3 Modified: gtk-engines-2.18.2-system-lua.patch
4 Log:
5 Add lua USE-flag per bug #283407, Fix the patch which did not work with --enable-animation --disable-lua --without-system-lua.
6 (Portage version: 2.2_rc40/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 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.2&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.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch?r1=1.1&r2=1.2
14
15 Index: gtk-engines-2.18.2-system-lua.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- gtk-engines-2.18.2-system-lua.patch 31 Aug 2009 19:09:30 -0000 1.1
22 +++ gtk-engines-2.18.2-system-lua.patch 3 Sep 2009 10:46:20 -0000 1.2
23 @@ -1,23 +1,26 @@
24 -From 7508e8941bc664df0e7b8c952d82d901f9a95c75 Mon Sep 17 00:00:00 2001
25 -From: Ihar Hrachyshka <ihar.hrachyshka@×××××.com>
26 -Date: Mon, 31 Aug 2009 16:09:55 +0300
27 -Subject: [PATCH] Added configure option to use system liblua for Lua engine.
28 +From 832010dc4c679a35103d2add5c7e6a28bf5f8b07 Mon Sep 17 00:00:00 2001
29 +From: Romain Perier <mrpouet@g.o>
30 +Date: Thu, 3 Sep 2009 12:35:15 +0200
31 +Subject: [PATCH] Add configure option to use lua system library instead of embedded version
32 +
33 +Fixed version: Replaced $enableval by $withval in AC_ARG_WITH(system-lua...),
34 +otherwises it was impossible to exec the configure script correctly with the following options:
35 +--enable-animation --disable-lua --without-system-lua, because LUA was checked anyway.
36
37 -Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@×××××.com>
38 ---
39 configure.ac | 10 ++++
40 engines/lua/Makefile.am | 118 +++++++++++++++++++++++++----------------------
41 2 files changed, 73 insertions(+), 55 deletions(-)
42
43 diff --git a/configure.ac b/configure.ac
44 -index df673ed..3c3ce2a 100644
45 +index df673ed..6273675 100644
46 --- a/configure.ac
47 +++ b/configure.ac
48 @@ -45,6 +45,9 @@ AC_ARG_ENABLE(paranoia, [ --enable-paranoia use wall, werror, ansi, peda
49 AC_ARG_ENABLE(deprecated, [ --disable-deprecated disable deprecated functions in gtk et al], [deprecated=$enableval], [deprecated="no"])
50
51 AC_ARG_ENABLE(schemas, [ --disable-schema disable engine schemas], [schemas=$enableval], [schemas="yes"])
52 -+AC_ARG_WITH(system-lua, [ --with-system-lua link with system Lua library], [system_lua=$enableval], [system_lua="no"])
53 ++AC_ARG_WITH(system-lua, [ --with-system-lua link with system Lua library], [system_lua=$withval], [system_lua="no"])
54 +
55 +AM_CONDITIONAL([SYSTEM_LUA], [test x$system_lua = xtrue])
56
57 @@ -179,5 +182,5 @@
58 -include $(top_srcdir)/git.mk
59
60 --
61 -1.6.3.3
62 +1.6.4.2