[conky/f12/master: 16/16] fix building with old tolua++
Miroslav Lichvar
mlichvar at fedoraproject.org
Wed Oct 6 15:19:42 UTC 2010
commit 9d26841e7f74eb8ea4ccd64b2872610baa57c576
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Wed Oct 6 17:19:00 2010 +0200
fix building with old tolua++
conky-1.8.1-outside.patch | 14 ++++++++++++++
conky.spec | 2 ++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/conky-1.8.1-outside.patch b/conky-1.8.1-outside.patch
new file mode 100644
index 0000000..a524a52
--- /dev/null
+++ b/conky-1.8.1-outside.patch
@@ -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
+
diff --git a/conky.spec b/conky.spec
index 0a4106b..459b70b 100644
--- a/conky.spec
+++ b/conky.spec
@@ -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}{_,}
More information about the scm-commits
mailing list