diff options
| author |   Daniel Pielmeier <billie@gentoo.org> | 2012-03-10 07:20:33 +0000 |
|---|---|---|
| committer | Daniel Pielmeier <billie@gentoo.org> | 2012-03-10 07:20:33 +0000 |
| commit | d815a09f620f01e6922166274f152c9fc4e0e8fb (patch) | |
| tree | 9b58aee68c4d8dce4ae78e987b21af4f1ef3a749 /app-admin/conky | |
| parent | Version bump. (diff) | |
| download | gentoo-2-d815a09f620f01e6922166274f152c9fc4e0e8fb.tar.gz gentoo-2-d815a09f620f01e6922166274f152c9fc4e0e8fb.tar.bz2 gentoo-2-d815a09f620f01e6922166274f152c9fc4e0e8fb.zip | |
Fix building against lua-5.2 (bug #407089). Thanks to Amadeusz Żołnowski for the report and Brenden Matthews for the fix.
(Portage version: 2.1.10.44/cvs/Linux i686)
Diffstat (limited to 'app-admin/conky')
| -rw-r--r-- | app-admin/conky/ChangeLog | 7 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.8.1-r6.ebuild | 5 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.8.1-lua-5.2.patch | 26 |
3 files changed, 35 insertions, 3 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 98a0f1907d74..ab0918503603 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/conky # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.174 2012/03/06 21:38:44 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.175 2012/03/10 07:20:33 billie Exp $ + + 10 Mar 2012; Daniel Pielmeier <billie@gentoo.org> conky-1.8.1-r6.ebuild, + +files/conky-1.8.1-lua-5.2.patch: + Fix building against lua-5.2 (bug #407089). Thanks to Amadeusz Żołnowski + for the report and Brenden Matthews for the fix. 06 Mar 2012; Brent Baude <ranger@gentoo.org> conky-1.8.1-r6.ebuild: Marking conky-1.8.1-r6 ppc64 for bug 400795 diff --git a/app-admin/conky/conky-1.8.1-r6.ebuild b/app-admin/conky/conky-1.8.1-r6.ebuild index 73d7942d4579..960213573cd7 100644 --- a/app-admin/conky/conky-1.8.1-r6.ebuild +++ b/app-admin/conky/conky-1.8.1-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r6.ebuild,v 1.5 2012/03/06 21:38:44 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r6.ebuild,v 1.6 2012/03/10 07:20:33 billie Exp $ EAPI=2 @@ -60,7 +60,8 @@ src_prepare() { "${FILESDIR}/${P}-curl-headers.patch" \ "${FILESDIR}/${P}-maxinterfaces.patch" \ "${FILESDIR}/${P}-utf8-scroll.patch" \ - "${FILESDIR}/${P}-battery-time.patch" + "${FILESDIR}/${P}-battery-time.patch" \ + "${FILESDIR}/${P}-lua-5.2.patch" eautoreconf } diff --git a/app-admin/conky/files/conky-1.8.1-lua-5.2.patch b/app-admin/conky/files/conky-1.8.1-lua-5.2.patch new file mode 100644 index 000000000000..956b0397d13e --- /dev/null +++ b/app-admin/conky/files/conky-1.8.1-lua-5.2.patch @@ -0,0 +1,26 @@ +From 83bf5e3f853918583e519fbba455a79242be9c7c Mon Sep 17 00:00:00 2001 +From: Brenden Matthews <brenden@diddyinc.com> +Date: Wed, 7 Mar 2012 11:11:12 -0800 +Subject: [PATCH] Build fix for Lua >=5.2. + +See Gentoo bug at https://bugs.gentoo.org/show_bug.cgi?id=407089. +--- + src/llua.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/llua.c b/src/llua.c +index 8f1df3c..383c279 100644 +--- a/src/llua.c ++++ b/src/llua.c +@@ -92,7 +92,7 @@ void llua_init(void) + const char *libs = PACKAGE_LIBDIR"/lib?.so;"; + char *old_path, *new_path; + if (lua_L) return; +- lua_L = lua_open(); ++ lua_L = luaL_newstate(); + + /* add our library path to the lua package.cpath global var */ + luaL_openlibs(lua_L); +-- +1.7.0.4 + |