fix building with old tolua++

This commit is contained in:
Miroslav Lichvar 2010-10-06 17:19:00 +02:00
parent f5ed9df7ba
commit 9d26841e7f
2 changed files with 16 additions and 0 deletions

14
conky-1.8.1-outside.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up conky-1.8.1/lua/libcairo.c.outside conky-1.8.1/lua/libcairo.c
--- conky-1.8.1/lua/libcairo.c.outside 2010-10-05 23:29:51.000000000 +0200
+++ conky-1.8.1/lua/libcairo.c 2010-10-06 17:09:47.000000000 +0200
@@ -20,6 +20,10 @@ TOLUA_API int tolua_cairo_open (lua_Sta
#include <X11/Xlib.h>
#include "libcairo-helper.h"
+#ifndef tolua_outside
+#define tolua_outside
+#endif
+
/* function to release collected object via destructor */
#ifdef __cplusplus

View File

@ -22,6 +22,7 @@ Group: User Interface/X
License: GPLv3+
URL: http://conky.sf.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Patch0: conky-1.8.1-outside.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libXft-devel
@ -46,6 +47,7 @@ It just keeps on given'er. Yeah.
%prep
%setup -q
%patch0 -p1 -b .outside
for i in AUTHORS; do
iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}