diff options
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | CMakeLists.txt.patch | 28 | ||||
-rw-r--r-- | FindLua.cmake.patch | 54 | ||||
-rw-r--r-- | PKGBUILD | 41 |
4 files changed, 115 insertions, 24 deletions
@@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Thu Feb 11 22:00:16 UTC 2016 pkgbase = lsyncd pkgdesc = Live Syncing (Mirror) Daemon - pkgver = 2.1.5 - pkgrel = 2 + pkgver = 2.1.6 + pkgrel = 1 url = https://github.com/axkibe/lsyncd arch = i686 arch = x86_64 @@ -10,12 +12,14 @@ pkgbase = lsyncd makedepends = lua52 depends = lua52 depends = rsync - source = https://github.com/axkibe/lsyncd/archive/release-2.1.5.tar.gz + source = https://github.com/axkibe/lsyncd/archive/release-2.1.6.tar.gz + source = CMakeLists.txt.patch + source = FindLua.cmake.patch source = lsyncd.service - source = configure-a2x-fix.patch - sha256sums = aa82fd9bf5737395e374650720c02f033d74a7101b57878ac92f5720ae9e7ece + sha256sums = 02c241ee71b6abb23a796ac994a414e1229f530c249b838ae72d2ef74ae0f775 + sha256sums = 72ad10f3e06b932713dd92e6ad8f5931ead34135d48e8a2e6dfd2e20bb1a9a87 + sha256sums = 60bc61193c367adef43e0e376507e4a88e93b1b266146aa4e0768ba83e0a668d sha256sums = 538072a4505abbdf8c4d16c9200810d4a2253f892a71fc16b5cd7f35ebe1ae57 - sha256sums = dff13f88a2fe7103ba4daa22b45c1fb188142571ae064209ec5b956cd6aae6e7 pkgname = lsyncd diff --git a/CMakeLists.txt.patch b/CMakeLists.txt.patch new file mode 100644 index 000000000000..678a41147f7c --- /dev/null +++ b/CMakeLists.txt.patch @@ -0,0 +1,28 @@ +--- lsyncd-release-2.1.6/CMakeLists.txt 2015-10-15 08:29:47.000000000 +0200 ++++ ../lsyncd-release-2.1.6/CMakeLists.txt 2016-02-11 12:57:52.894941796 +0100 +@@ -54,7 +54,7 @@ + # this supposes the Lua compiler 'luac' is sitting right next to the Lua interpreter 'lua' + add_custom_command( OUTPUT runner.out + COMMAND ${CMAKE_COMMAND} -E echo "Compiling built-in runner" +- COMMAND ${LUA_EXECUTABLE}c -o runner.out ${PROJECT_SOURCE_DIR}/lsyncd.lua ++ COMMAND ${LUA_COMPILER} -o runner.out ${PROJECT_SOURCE_DIR}/lsyncd.lua + DEPENDS ${PROJECT_SOURCE_DIR}/lsyncd.lua + ) + +@@ -75,14 +75,14 @@ + + add_custom_command( OUTPUT defaults.out + COMMAND ${CMAKE_COMMAND} -E echo "Compiling built-in default configs" +- COMMAND ${LUA_EXECUTABLE}c -o defaults.out ${DEFAULT_CONFIGS} ++ COMMAND ${LUA_COMPILER} -o defaults.out ${DEFAULT_CONFIGS} + DEPENDS ${DEFAULT_CONFIGS} + ) + + # the manpage + add_custom_command( OUTPUT doc/lsyncd.1 + COMMAND ${CMAKE_COMMAND} -E echo "Updating the manpage" +- COMMAND a2x --format=manpage doc/lsyncd.1.txt ++ COMMAND a2x --format=manpage ${PROJECT_SOURCE_DIR}/doc/lsyncd.1.txt + DEPENDS doc/lsyncd.1.txt + ) + add_custom_target( manpage ALL DEPENDS doc/lsyncd.1 ) diff --git a/FindLua.cmake.patch b/FindLua.cmake.patch new file mode 100644 index 000000000000..90fc58d03550 --- /dev/null +++ b/FindLua.cmake.patch @@ -0,0 +1,54 @@ +--- lsyncd-release-2.1.6/cmake/FindLua.cmake 2015-10-15 08:29:47.000000000 +0200 ++++ ../lsyncd-release-2.1.6/cmake/FindLua.cmake 2016-02-11 12:57:45.838387588 +0100 +@@ -32,21 +32,23 @@ + # Otherwise the module will search for any available Lua implementation + + # Always search for non-versioned lua first (recommended) +-SET(_POSSIBLE_LUA_INCLUDE include include/lua) +-SET(_POSSIBLE_LUA_EXECUTABLE lua) +-SET(_POSSIBLE_LUA_LIBRARY lua) ++SET(_POSSIBLE_LUA_INCLUDE) ++SET(_POSSIBLE_LUA_EXECUTABLE) ++SET(_POSSIBLE_LUA_COMPILER) ++SET(_POSSIBLE_LUA_LIBRARY) + + # Determine possible naming suffixes (there is no standard for this) + IF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR) + SET(_POSSIBLE_SUFFIXES "${Lua_FIND_VERSION_MAJOR}${Lua_FIND_VERSION_MINOR}" "${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}" "-${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR}") + ELSE(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR) +- SET(_POSSIBLE_SUFFIXES "52" "5.2" "-5.2" "51" "5.1" "-5.1") ++ SET(_POSSIBLE_SUFFIXES "52" "5.2" "-5.2") + ENDIF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINOR) + + # Set up possible search names and locations + FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES}) + LIST(APPEND _POSSIBLE_LUA_INCLUDE "include/lua${_SUFFIX}") + LIST(APPEND _POSSIBLE_LUA_EXECUTABLE "lua${_SUFFIX}") ++ LIST(APPEND _POSSIBLE_LUA_COMPILER "luac${_SUFFIX}") + LIST(APPEND _POSSIBLE_LUA_LIBRARY "lua${_SUFFIX}") + ENDFOREACH(_SUFFIX) + +@@ -55,11 +57,16 @@ + NAMES ${_POSSIBLE_LUA_EXECUTABLE} + ) + ++FIND_PROGRAM(LUA_COMPILER ++ NAMES ${_POSSIBLE_LUA_COMPILER} ++) ++ + # Find the lua header + FIND_PATH(LUA_INCLUDE_DIR lua.h + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES ${_POSSIBLE_LUA_INCLUDE} ++ NO_DEFAULT_PATH + PATHS + ~/Library/Frameworks + /Library/Frameworks +@@ -114,5 +121,5 @@ + REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR + VERSION_VAR LUA_VERSION_STRING) + +-MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY LUA_EXECUTABLE) ++MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY LUA_EXECUTABLE LUA_COMPLIER) + @@ -1,31 +1,36 @@ ## Maintainer: Thermi <noel[ at ] familie-kuntze.de> # Submitter: nullie pkgname=lsyncd -pkgver=2.1.5 -pkgrel=2 +pkgver=2.1.6 +pkgrel=1 pkgdesc="Live Syncing (Mirror) Daemon" arch=('i686' 'x86_64') url="https://github.com/axkibe/lsyncd" license=('GPL2') -depends=('lua51' 'rsync') -makedepends=('asciidoc' 'lua51') +depends=('lua52' 'rsync') +makedepends=('asciidoc' 'lua52') source=("https://github.com/axkibe/lsyncd/archive/release-$pkgver.tar.gz" - "lsyncd.service" - "configure-a2x-fix.patch") + "CMakeLists.txt.patch" + "FindLua.cmake.patch" + "lsyncd.service") + +sha256sums=('02c241ee71b6abb23a796ac994a414e1229f530c249b838ae72d2ef74ae0f775' + '72ad10f3e06b932713dd92e6ad8f5931ead34135d48e8a2e6dfd2e20bb1a9a87' + '60bc61193c367adef43e0e376507e4a88e93b1b266146aa4e0768ba83e0a668d' + '538072a4505abbdf8c4d16c9200810d4a2253f892a71fc16b5cd7f35ebe1ae57') -sha256sums=('aa82fd9bf5737395e374650720c02f033d74a7101b57878ac92f5720ae9e7ece' - '538072a4505abbdf8c4d16c9200810d4a2253f892a71fc16b5cd7f35ebe1ae57' - 'dff13f88a2fe7103ba4daa22b45c1fb188142571ae064209ec5b956cd6aae6e7') build() { - cd $srcdir/$pkgname-release-$pkgver - patch -Np1 -i ../configure-a2x-fix.patch - ./autogen.sh --prefix=/usr - ./configure --prefix=/usr - make + cd $srcdir/$pkgname-release-$pkgver + patch -p1 < $srcdir/CMakeLists.txt.patch + patch -p1 < $srcdir/FindLua.cmake.patch + mkdir -p build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make } - + package() { - cd $srcdir/$pkgname-release-$pkgver - make DESTDIR=$pkgdir install - install -D ${srcdir}/lsyncd.service ${pkgdir}/usr/lib/systemd/system/lsyncd.service + cd $srcdir/$pkgname-release-$pkgver/build + make DESTDIR=$pkgdir install + install -D ${srcdir}/lsyncd.service ${pkgdir}/usr/lib/systemd/system/lsyncd.service } |