Fix bug #255773, use liblua system library instead of embedded version, patch import from upstream bug #593674, thanks to Ihar Hrachyshka <ihar.hrachyshka@gmail.com> for his work

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 233 insertions, 1 deletions

diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog
index ab76f8ee6798..71504a35076f 100644
--- a/x11-themes/gtk-engines/ChangeLog
+++ b/x11-themes/gtk-engines/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/gtk-engines
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.144 2009/08/08 23:13:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.145 2009/08/31 19:09:29 mrpouet Exp $
+
+*gtk-engines-2.18.2-r1 (31 Aug 2009)
+
+  31 Aug 2009; Romain Perier <mrpouet@gentoo.org>
+  +gtk-engines-2.18.2-r1.ebuild, +files/gtk-engines-2.18.2-system-lua.patch:
+  Fix bug #255773, use liblua system library instead of embedded version,
+  patch import from upstream bug #593674, thanks to Ihar Hrachyshka
+  <ihar.hrachyshka@gmail.com> for his work
 
   08 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -gtk-engines-2.18.1.ebuild, gtk-engines-2.18.2.ebuild:
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch b/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch
new file mode 100644
index 000000000000..418fbd3c9c4c
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch
@@ -0,0 +1,183 @@
+From 7508e8941bc664df0e7b8c952d82d901f9a95c75 Mon Sep 17 00:00:00 2001
+From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
+Date: Mon, 31 Aug 2009 16:09:55 +0300
+Subject: [PATCH] Added configure option to use system liblua for Lua engine.
+
+Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
+---
+ configure.ac            |   10 ++++
+ engines/lua/Makefile.am |  118 +++++++++++++++++++++++++----------------------
+ 2 files changed, 73 insertions(+), 55 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index df673ed..3c3ce2a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,6 +45,9 @@ AC_ARG_ENABLE(paranoia, 	[  --enable-paranoia       use wall, werror, ansi, peda
+ AC_ARG_ENABLE(deprecated,	[  --disable-deprecated    disable deprecated functions in gtk et al],	[deprecated=$enableval],		[deprecated="no"])
+ 
+ AC_ARG_ENABLE(schemas,		[  --disable-schema        disable engine schemas],	[schemas=$enableval],	[schemas="yes"])
++AC_ARG_WITH(system-lua,	[  --with-system-lua        link with system Lua library], 		[system_lua=$enableval], 	[system_lua="no"])
++
++AM_CONDITIONAL([SYSTEM_LUA], [test x$system_lua = xtrue])
+ 
+ BUILD_ENGINES=""
+ BUILD_THEMES=""
+@@ -126,6 +129,13 @@ AC_SUBST(GTK_LIBS)
+ GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+ AC_SUBST(GTK_VERSION)
+ 
++if test $system_lua = "yes"; then
++	PKG_CHECK_MODULES(LUA, lua,,
++                  AC_MSG_ERROR([--with-system-lua specified but no system liblua found]))
++	AC_SUBST(LUA_CFLAGS)
++	AC_SUBST(LUA_LIBS)
++fi
++
+ AC_SUBST(BUILD_ENGINES)
+ AC_SUBST(BUILD_THEMES)
+ AC_SUBST(BUILD_SCHEMAS)
+diff --git a/engines/lua/Makefile.am b/engines/lua/Makefile.am
+index 736154d..6243e5a 100644
+--- a/engines/lua/Makefile.am
++++ b/engines/lua/Makefile.am
+@@ -21,10 +21,69 @@
+ 
+ NULL =
+ 
++if SYSTEM_LUA
++	LIBLUA_SOURCES =
++	LIBLUA_CFLAGS = $(LUA_CFLAGS)
++else
++	LIBLUA_CFLAGS = -I$(top_srcdir)/engines/lua/src/liblua
++	LIBLUA_SOURCES = \
++		./src/liblua/lapi.h \
++		./src/liblua/lauxlib.h \
++		./src/liblua/lcode.h \
++		./src/liblua/ldebug.h \
++		./src/liblua/ldo.h \
++		./src/liblua/lfunc.h \
++		./src/liblua/lgc.h \
++		./src/liblua/llex.h \
++		./src/liblua/llimits.h \
++		./src/liblua/lmem.h \
++		./src/liblua/lobject.h \
++		./src/liblua/lopcodes.h \
++		./src/liblua/lparser.h \
++		./src/liblua/lstate.h \
++		./src/liblua/lstring.h \
++		./src/liblua/ltable.h \
++		./src/liblua/ltm.h \
++		./src/liblua/lua.h \
++		./src/liblua/luaconf.h \
++		./src/liblua/lualib.h \
++		./src/liblua/lundump.h \
++		./src/liblua/lvm.h \
++		./src/liblua/lzio.h \
++		./src/liblua/lapi.c \
++		./src/liblua/lcode.c \
++		./src/liblua/ldebug.c \
++		./src/liblua/ldo.c \
++		./src/liblua/ldump.c \
++		./src/liblua/lfunc.c \
++		./src/liblua/lgc.c \
++		./src/liblua/liolib.c \
++		./src/liblua/llex.c \
++		./src/liblua/lmem.c \
++		./src/liblua/lobject.c \
++		./src/liblua/lopcodes.c \
++		./src/liblua/loslib.c \
++		./src/liblua/lparser.c \
++		./src/liblua/lstate.c \
++		./src/liblua/lstring.c \
++		./src/liblua/lstrlib.c \
++		./src/liblua/ltable.c \
++		./src/liblua/ltablib.c \
++		./src/liblua/ltm.c \
++		./src/liblua/lundump.c \
++		./src/liblua/lvm.c \
++		./src/liblua/lzio.c \
++		./src/liblua/lauxlib.c \
++		./src/liblua/lbaselib.c \
++		./src/liblua/ldblib.c \
++		./src/liblua/lmathlib.c \
++		./src/liblua/loadlib.c \
++		./src/liblua/linit.c
++endif
++
+ INCLUDES = \
+ 	-I$(top_srcdir)/engines/support \
+-	-I$(top_srcdir)/engines/lua/src/liblua \
+-	$(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) \
++	$(LIBLUA_CFLAGS) $(GTK_CFLAGS) $(DEVELOPMENT_CFLAGS) \
+ 	$(NULL)
+ 
+ enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+@@ -44,62 +103,11 @@ libluaengine_la_SOURCES = \
+ 	./src/main.c \
+ 	./src/misc_utils.c \
+ 	./src/misc_utils.h \
+-	./src/liblua/lapi.h \
+-	./src/liblua/lauxlib.h \
+-	./src/liblua/lcode.h \
+-	./src/liblua/ldebug.h \
+-	./src/liblua/ldo.h \
+-	./src/liblua/lfunc.h \
+-	./src/liblua/lgc.h \
+-	./src/liblua/llex.h \
+-	./src/liblua/llimits.h \
+-	./src/liblua/lmem.h \
+-	./src/liblua/lobject.h \
+-	./src/liblua/lopcodes.h \
+-	./src/liblua/lparser.h \
+-	./src/liblua/lstate.h \
+-	./src/liblua/lstring.h \
+-	./src/liblua/ltable.h \
+-	./src/liblua/ltm.h \
+-	./src/liblua/lua.h \
+-	./src/liblua/luaconf.h \
+-	./src/liblua/lualib.h \
+-	./src/liblua/lundump.h \
+-	./src/liblua/lvm.h \
+-	./src/liblua/lzio.h \
+-	./src/liblua/lapi.c \
+-	./src/liblua/lcode.c \
+-	./src/liblua/ldebug.c \
+-	./src/liblua/ldo.c \
+-	./src/liblua/ldump.c \
+-	./src/liblua/lfunc.c \
+-	./src/liblua/lgc.c \
+-	./src/liblua/liolib.c \
+-	./src/liblua/llex.c \
+-	./src/liblua/lmem.c \
+-	./src/liblua/lobject.c \
+-	./src/liblua/lopcodes.c \
+-	./src/liblua/loslib.c \
+-	./src/liblua/lparser.c \
+-	./src/liblua/lstate.c \
+-	./src/liblua/lstring.c \
+-	./src/liblua/lstrlib.c \
+-	./src/liblua/ltable.c \
+-	./src/liblua/ltablib.c \
+-	./src/liblua/ltm.c \
+-	./src/liblua/lundump.c \
+-	./src/liblua/lvm.c \
+-	./src/liblua/lzio.c \
+-	./src/liblua/lauxlib.c \
+-	./src/liblua/lbaselib.c \
+-	./src/liblua/ldblib.c \
+-	./src/liblua/lmathlib.c \
+-	./src/liblua/loadlib.c \
+-	./src/liblua/linit.c \
++	$(LIBLUA_SOURCES) \
+ 	$(NULL)
+ 
+ libluaengine_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols $(top_srcdir)/engines/engine.symbols
+-libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS)
++libluaengine_la_LIBADD = $(top_builddir)/engines/support/libsupport.la $(GTK_LIBS) $(LUA_LIBS)
+ 
+ -include $(top_srcdir)/git.mk
+ 
+-- 
+1.6.3.3
+
diff --git a/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild b/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild
new file mode 100644
index 000000000000..bf78f2f72360
--- /dev/null
+++ b/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild,v 1.1 2009/08/31 19:09:29 mrpouet Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GTK+2 standard engines and themes"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="accessibility"
+
+RDEPEND=">=x11-libs/gtk+-2.12
+	dev-lang/lua"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.31
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-animation --enable-lua --with-system-lua"
+	use accessibility || G2CONF="${G2CONF} --disable-hc"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+	# Don't use liblua embedded version, use system lib instead
+	# fix bug #255773, import from upstream bug #593674
+	epatch "${FILESDIR}"/${P}-system-lua.patch
+	eautoreconf
+}