Merged TidestManager1 pkgbuild

1 files changed, 28 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ff2081e32f95..068f350b1c1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
 
 pkgname=conky-lua
 _pkgname=conky
-pkgver=1.9.0
+pkgver=1.10.1
 pkgrel=2
 pkgdesc='Lightweight system monitor for X, with Lua support enabled'
-url='http://conky.sourceforge.net/'
-license=('BSD' 'GPL')
+url='http://github.com/brndnmtthws/conky'
+license=('BSD' 'GPL3')
 arch=('i686' 'x86_64')
 options=('!emptydirs')
-makedepends=('docbook2x' 'tolua++' 'perl-xml-libxml')
+makedepends=('docbook2x' 'tolua++' 'perl-xml-libxml' 'cmake' 'docbook-xsl' 'docbook-xml' 'perl-xml-libxml')
 depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2' 'lua51' 'cairo')
-provides=('conky=1.9.0')
+provides=('conky=1.10.1')
 conflicts=('conky')
 backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
-source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz")
-sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d')
+source=("https://github.com/brndnmtthws/${_pkgname}/archive/v${pkgver}.tar.gz")
+sha1sums=('97b59ec1daf54126b30516e8663a9cf1f218d8ae')
 
 replaces=('torsmo')
 
@@ -23,18 +23,20 @@ build() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 
 	CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" LUA_LIBS="-llua5.1" LUA_CFLAGS="-I/usr/include/lua5.1" \
-        ./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-ibm \
-		--enable-curl \
-		--enable-rss \
-		--enable-weather-xoap \
-		--enable-imlib2 \
-		--enable-wlan \
-        --enable-lua \
-        --enable-lua-cairo \
-        --enable-lua-imlib2
+        cmake \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D MAINTAINER_MODE=ON \
+		-D BUILD_CURL=ON \
+		-D BUILD_LUA_RSVG=ON \
+		-D BUILD_LUA_CAIRO=ON \
+		-D BUILD_LUA_IMLIB2=ON \
+		-D BUILD_IMLIB2=ON \
+		-D BUILD_RSS=ON \
+		-D BUILD_WEATHER_METAR=ON \
+		-D BUILD_WEATHER_XOAP=ON \
+		-D BUILD_XDBE=ON \
+		. 
 
 
 	make
@@ -43,7 +45,13 @@ build() {
 package() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 LICENSE.BSD ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.BSD
 	install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
 	install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
 }
+
+prepare() {
+	cd "${srcdir}/${_pkgname}-${pkgver}/cmake"
+	sed -i "s|tolua++ |toluapp |g" ConkyPlatformChecks.cmake
+}