diff options
| author | Michael Pulliam | 2016-03-30 18:38:24 -0600 |
|---|---|---|
| committer | Michael Pulliam | 2016-03-30 18:38:24 -0600 |
| commit | 7abc8108f905b474ff12aac9535ca63503fee168 (patch) | |
| tree | 747267343e85a595a66e8338efe775049b7888f0 | |
| parent | 1f937eb1c5143dfd1dffd7f40a95b9e08aae4467 (diff) | |
| download | aur-7abc8108f905b474ff12aac9535ca63503fee168.tar.gz | |
Fixed SEGFAULT
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | fix_build.patch | 34 |
3 files changed, 37 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = conky-lua pkgdesc = Lightweight system monitor for X, with Lua support enabled pkgver = 1.10.1 - pkgrel = 4 + pkgrel = 5 url = http://github.com/brndnmtthws/conky arch = i686 arch = x86_64 @@ -3,7 +3,7 @@ pkgname=conky-lua _pkgname=conky pkgver=1.10.1 -pkgrel=4 +pkgrel=5 pkgdesc='Lightweight system monitor for X, with Lua support enabled' url='http://github.com/brndnmtthws/conky' license=('BSD' 'GPL3') @@ -53,5 +53,5 @@ package() { prepare() { cd "${srcdir}/${_pkgname}-${pkgver}/cmake" - sed -i "s|tolua++ |toluapp |g" ConkyPlatformChecks.cmake + patch -p1 -i ../fix_build.patch } diff --git a/fix_build.patch b/fix_build.patch new file mode 100644 index 000000000000..d7d9c5ea6b43 --- /dev/null +++ b/fix_build.patch @@ -0,0 +1,34 @@ +--- orig/cmake/ConkyPlatformChecks.cmake 2015-12-03 12:52:37.391221762 +0200 ++++ new/cmake/ConkyPlatformChecks.cmake 2015-12-03 12:53:30.102200472 +0200 +@@ -249,7 +249,7 @@ + endif(X11_FOUND) + endif(BUILD_X11) + +-pkg_search_module(LUA REQUIRED lua5.2 lua-5.2 lua>=5.1 lua5.1 lua-5.1) ++pkg_search_module(LUA REQUIRED lua=5.1 lua5.1 lua-5.1) + set(conky_libs ${conky_libs} ${LUA_LIBRARIES}) + set(conky_includes ${conky_includes} ${LUA_INCLUDE_DIRS}) + link_directories(${LUA_LIBRARY_DIRS}) +@@ -332,7 +332,7 @@ + find_library(XNVCtrl_LIB NAMES XNVCtrl) + if(XNVCtrl_INCLUDE_PATH AND XNVCtrl_LIB) + set(XNVCtrl_FOUND true) +- set(conky_libs ${conky_libs} ${XNVCtrl_LIB}) ++ set(conky_libs ${XNVCtrl_LIB} ${conky_libs}) + set(conky_includes ${conky_includes} ${XNVCtrl_INCLUDE_PATH}) + else(XNVCtrl_INCLUDE_PATH AND XNVCtrl_LIB) + message(FATAL_ERROR "Unable to find XNVCtrl library") +@@ -365,11 +365,11 @@ + endif(WANT_LIBXML2) + + if(WANT_TOLUA) +- find_program(APP_TOLUA NAMES tolua++ tolua++5.1 tolua++-5.1) ++ find_program(APP_TOLUA NAMES toluapp tolua++ tolua++5.1 tolua++-5.1) + if(NOT APP_TOLUA) + message(FATAL_ERROR "Unable to find program 'tolua++'") + endif(NOT APP_TOLUA) +- find_library(TOLUA_LIBS NAMES tolua++ tolua++5.1 tolua++-5.1) ++ find_library(TOLUA_LIBS NAMES toluapp tolua++ tolua++5.1 tolua++-5.1) + find_path(TOLUA_INCLUDE_PATH tolua++.h ${INCLUDE_SEARCH_PATH}) + if(TOLUA_INCLUDE_PATH AND TOLUA_LIBS) + set(TOLUA_FOUND true) |