From d0318b94d61f9dbad85f40d65f7618742bcf8cf2 Mon Sep 17 00:00:00 2001
From: James Morris <james@jwm-art.net>
Date: Sat, 12 Jan 2013 18:20:59 +0000
Subject: [PATCH 1/3] .gitignore ignore cmake files + others

---
 .gitignore | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.gitignore b/.gitignore
index 961d3bb7..5dc47eae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,16 @@ doc/conky.1
 README
 build*
 doc/*.html
+
+Makefile
+CMakeCache.txt
+CMakeFiles
+*.cmake
+data/convertconf.h
+data/defconfig.h
+lua/libcairo-orig.c
+lua/libcairo.c
+lua/libimlib2.c
+*.so
+*.a
+/config.h

From 710646c101d6d9c5c1911bc063c3ca70fc35c21d Mon Sep 17 00:00:00 2001
From: James Morris <james@jwm-art.net>
Date: Sat, 12 Jan 2013 20:26:39 +0000
Subject: [PATCH 2/3] fix to force usage of lua 5.1 when both 5.1 and 5.2
 installed

---
 cmake/ConkyPlatformChecks.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
index 526df10b..7d36728e 100644
--- a/cmake/ConkyPlatformChecks.cmake
+++ b/cmake/ConkyPlatformChecks.cmake
@@ -233,7 +233,7 @@ if(BUILD_X11)
 	endif(X11_FOUND)
 endif(BUILD_X11)
 
-pkg_search_module(LUA REQUIRED lua>=5.1 lua-5.1>=5.1 lua5.1>=5.1)
+pkg_search_module(LUA REQUIRED lua5.1 lua-5.1 lua=5.1)
 set(conky_libs ${conky_libs} ${LUA_LIBRARIES})
 set(conky_includes ${conky_includes} ${LUA_INCLUDE_DIRS})
 if(BUILD_LUA_CAIRO)

From 2a1afbbbbab23bd4f2757b8ead6f0db2be21555c Mon Sep 17 00:00:00 2001
From: James Morris <james@jwm-art.net>
Date: Tue, 15 Jan 2013 00:02:25 +0000
Subject: [PATCH 3/3] fix lua/cairo/imlib2 linkage issues

---
 lua/CMakeLists.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt
index af2897c9..20dcaeaf 100644
--- a/lua/CMakeLists.txt
+++ b/lua/CMakeLists.txt
@@ -34,20 +34,22 @@ if(BUILD_LUA_CAIRO)
 	# if you have a better solution, please let me know
 	wrap_tolua(luacairo_src cairo.pkg libcairo.patch)
 
-	add_library(cairo SHARED ${luacairo_src})
+	add_library(conky-cairo SHARED ${luacairo_src})
+	set_target_properties(conky-cairo PROPERTIES OUTPUT_NAME "cairo")
 
-	target_link_libraries(cairo ${luacairo_libs} ${TOLUA_LIBS})
-	set(lua_libs ${lua_libs} cairo)
+	target_link_libraries(conky-cairo ${luacairo_libs} ${TOLUA_LIBS})
+	set(lua_libs ${lua_libs} conky-cairo)
 endif(BUILD_LUA_CAIRO)
 
 if(BUILD_LUA_IMLIB2)
 	include_directories(${luaimlib2_includes} ${CMAKE_CURRENT_SOURCE_DIR})
 	wrap_tolua(luaimlib2_src imlib2.pkg)
 
-	add_library(imlib2 SHARED ${luaimlib2_src})
+	add_library(conky-imlib2 SHARED ${luaimlib2_src})
+	set_target_properties(conky-imlib2 PROPERTIES OUTPUT_NAME "imlib2")
 
-	target_link_libraries(imlib2 ${luaimlib2_libs} ${TOLUA_LIBS})
-	set(lua_libs ${lua_libs} imlib2)
+	target_link_libraries(conky-imlib2 ${luaimlib2_libs} ${TOLUA_LIBS})
+	set(lua_libs ${lua_libs} conky-imlib2)
 endif(BUILD_LUA_IMLIB2)
 
 install(TARGETS