conkywx_SIX

2 files changed, 77 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e21ab55e36f6..59a67c476f0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = conkywx
 	pkgdesc = To display weather from multiple sources using conky
-	pkgver = 5.0.0
-	pkgrel = 2
+	pkgver = 6.0.0
+	pkgrel = 1
 	url = https://bitbucket.org/plikhari/conkywx_pub/downloads
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	depends = wget
 	depends = perl
-	source = https://bitbucket.org/plikhari/conkywx_pub/downloads/conkywx_5.0.0.a.tar.xz
-	md5sums = fe82e74da7e3d12985b087d9c2333b1b
+	source = https://bitbucket.org/plikhari/conkywx_pub/downloads/conkywx_6.0.0.tar.xz
+	md5sums = 228fd80c15170302bdd995f5cdedd1c4
 
 pkgname = conkywx
 
diff --git a/PKGBUILD b/PKGBUILD
index 00039c6b2ea7..2f06d292c088 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,93 +1,94 @@
+
 # Contributer: Paramvir Likhari <plikhari at gmail dot com>
 # Maintainer: Paramvir Likhari <plikhari at gmail dot com>
 
 pkgname=conkywx
-pkgver=5.0.0
-pkgrel=2
-pkgdesc="To display weather from multiple sources using conky"
+pkgver=6.0.0
+pkgrel=1
+pkgdesc='To display weather from multiple sources using conky'
 arch=('i686' 'x86_64')
 url='https://bitbucket.org/plikhari/conkywx_pub/downloads'
 license=('GPL3')
 depends=( wget perl )
-source=("${url}/${pkgname}_${pkgver}.a.tar.xz")
-md5sums=('fe82e74da7e3d12985b087d9c2333b1b')
-_conkyvar="usr/share/conkywx"
+source=(${url}/${pkgname}_${pkgver}.tar.xz)
+md5sums=('228fd80c15170302bdd995f5cdedd1c4')
+_conkyvar='usr/share/conkywx'
 
 
 build() {
-	cd "${srcdir}/${pkgname}_${pkgver}/lib/magellan_source/"
-	make
-
-	cd "${srcdir}/${pkgname}_${pkgver}/lib/taglib-1.10beta_source/"
-	cmake \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D BUILD_EXAMPLES=ON  \
-		-D ENABLE_STATIC=ON  \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		.
-	make
+    cd ${srcdir}/${pkgname}_${pkgver}/lib/magellan_source/
+    make
 }
 
 
 package()
 {
-  cd "${srcdir}/${pkgname}_${pkgver}"
-
-  # install script
-  install -D -m755 conkywx.bin "${pkgdir}/usr/bin/conkywx"
-  install -D -m755 ./lib/wxmp.bin "${pkgdir}/usr/bin/wxmp"
-
-  mkdir -p ${pkgdir}/${_conkyvar}/images/windrose-2
-  mkdir -p ${pkgdir}/${_conkyvar}/images/lua_windvane
-  mkdir -p ${pkgdir}/${_conkyvar}/images/bgrounds
-  mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-1
-  mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-5
-  mkdir -p ${pkgdir}/${_conkyvar}/images/windrose-1
-  mkdir -p ${pkgdir}/${_conkyvar}/images/windrose-3
-  mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-2
-  mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-3
-  mkdir -p ${pkgdir}/${_conkyvar}/images/lua_clock
-  mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-4
-  mkdir -p ${pkgdir}/${_conkyvar}/images/moonicons
-  mkdir -p ${pkgdir}/${_conkyvar}/help
-  mkdir -p ${pkgdir}/${_conkyvar}/lang
-  mkdir -p ${pkgdir}/${_conkyvar}/lib
-  mkdir -p ${pkgdir}/usr/share/fonts/TTF/conkywx
-  mkdir -p ${pkgdir}/${_conkyvar}/examples
-  mkdir -p ${pkgdir}/usr/share/applications
-
-  install -D -m755 conkywx.sh ${pkgdir}/${_conkyvar}/
-  install -D -m755 conky-restart.sh ${pkgdir}/${_conkyvar}/
-  install -D -m755 run-conkywx.sh ${pkgdir}/${_conkyvar}/
-  install -D -m644 stations.txt ${pkgdir}/${_conkyvar}
-
-  install -D -m644 images/windrose-2/* ${pkgdir}/${_conkyvar}/images/windrose-2/
-  install -D -m644 images/lua_windvane/* ${pkgdir}/${_conkyvar}/images/lua_windvane/
-  install -D -m644 images/bgrounds/* ${pkgdir}/${_conkyvar}/images/bgrounds/
-  install -D -m644 images/wxicons-1/* ${pkgdir}/${_conkyvar}/images/wxicons-1/
-  install -D -m644 images/wxicons-5/* ${pkgdir}/${_conkyvar}/images/wxicons-5/
-  install -D -m644 images/windrose-1/* ${pkgdir}/${_conkyvar}/images/windrose-1/
-  install -D -m644 images/windrose-3/* ${pkgdir}/${_conkyvar}/images/windrose-3/
-  install -D -m644 images/wxicons-2/* ${pkgdir}/${_conkyvar}/images/wxicons-2/
-  install -D -m644 images/wxicons-3/* ${pkgdir}/${_conkyvar}/images/wxicons-3/
-  install -D -m644 images/lua_clock/* ${pkgdir}/${_conkyvar}/images/lua_clock/
-  install -D -m644 images/wxicons-4/* ${pkgdir}/${_conkyvar}/images/wxicons-4/
-  install -D -m644 images/moonicons/* ${pkgdir}/${_conkyvar}/images/moonicons/
-  install -D -m644 help/* ${pkgdir}/${_conkyvar}/help/
-  install -D -m644 lang/* ${pkgdir}/${_conkyvar}/lang/
-  install -D -m755 lib/*.pl ${pkgdir}/${_conkyvar}/lib/
-  install -D -m755 lib/*.lua ${pkgdir}/${_conkyvar}/lib/
-  install -D -m755 lib/*.sh ${pkgdir}/${_conkyvar}/lib/
-  install -D -m755 lib/magellan_source/magellan ${pkgdir}/${_conkyvar}/lib/
-  install -D -m755 lib/taglib-1.10beta_source/examples/tagreader ${pkgdir}/${_conkyvar}/lib/
-  install -D -m644 fonts/* ${pkgdir}/usr/share/fonts/TTF/conkywx/
-  install -D -m644 examples/* ${pkgdir}/${_conkyvar}/examples/
-  install -D -m644 examples/wxmp.desktop ${pkgdir}/usr/share/applications
+    cd ${srcdir}/${pkgname}_${pkgver}
 
+    # install script
+    install -D -m755 conkywx.bin ${pkgdir}/usr/bin/conkywx
+    install -D -m755 ./lib/wxmp.bin ${pkgdir}/usr/bin/wxmp
+     
+    mkdir -p ${pkgdir}/${_conkyvar}/images/windrose-2
+    mkdir -p ${pkgdir}/${_conkyvar}/images/lua_windvane
+    mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-6
+    mkdir -p ${pkgdir}/${_conkyvar}/images/bgrounds
+    mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-1
+    mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-5
+    mkdir -p ${pkgdir}/${_conkyvar}/images/windrose-1
+    mkdir -p ${pkgdir}/${_conkyvar}/images/windrose-3
+    mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-2
+    mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-3
+    mkdir -p ${pkgdir}/${_conkyvar}/images/lua_clock
+    mkdir -p ${pkgdir}/${_conkyvar}/images/wxicons-4
+    mkdir -p ${pkgdir}/${_conkyvar}/images/moonicons
+    mkdir -p ${pkgdir}/${_conkyvar}/images/daynight
+    mkdir -p ${pkgdir}/${_conkyvar}/help
+    mkdir -p ${pkgdir}/${_conkyvar}/lang
+    mkdir -p ${pkgdir}/${_conkyvar}/lib
+    mkdir -p ${pkgdir}/${_conkyvar}/lib/json
+    mkdir -p ${pkgdir}/${_conkyvar}/lib/json/PP
+    mkdir -p ${pkgdir}/${_conkyvar}/lib/xml
+    mkdir -p ${pkgdir}/${_conkyvar}/lib/wxDate
+    mkdir -p ${pkgdir}/usr/share/fonts/TTF/conkywx
+    mkdir -p ${pkgdir}/${_conkyvar}/examples
+    mkdir -p ${pkgdir}/usr/share/applications
 
+    install -D -m755 conkywx.sh ${pkgdir}/${_conkyvar}/
+    install -D -m755 conky-restart.sh ${pkgdir}/${_conkyvar}/
+    install -D -m755 run-conkywx.sh ${pkgdir}/${_conkyvar}/
+    install -D -m644 stations.txt ${pkgdir}/${_conkyvar}
+     
+    install -D -m644 images/windrose-2/* ${pkgdir}/${_conkyvar}/images/windrose-2/
+    install -D -m644 images/lua_windvane/* ${pkgdir}/${_conkyvar}/images/lua_windvane/
+    install -D -m644 images/wxicons-6/* ${pkgdir}/${_conkyvar}/images/wxicons-6/
+    install -D -m644 images/bgrounds/* ${pkgdir}/${_conkyvar}/images/bgrounds/
+    install -D -m644 images/wxicons-1/* ${pkgdir}/${_conkyvar}/images/wxicons-1/
+    install -D -m644 images/wxicons-5/* ${pkgdir}/${_conkyvar}/images/wxicons-5/
+    install -D -m644 images/windrose-1/* ${pkgdir}/${_conkyvar}/images/windrose-1/
+    install -D -m644 images/windrose-3/* ${pkgdir}/${_conkyvar}/images/windrose-3/
+    install -D -m644 images/wxicons-2/* ${pkgdir}/${_conkyvar}/images/wxicons-2/
+    install -D -m644 images/wxicons-3/* ${pkgdir}/${_conkyvar}/images/wxicons-3/
+    install -D -m644 images/lua_clock/* ${pkgdir}/${_conkyvar}/images/lua_clock/
+    install -D -m644 images/wxicons-4/* ${pkgdir}/${_conkyvar}/images/wxicons-4/
+    install -D -m644 images/moonicons/* ${pkgdir}/${_conkyvar}/images/moonicons/
+    install -D -m644 images/daynight/* ${pkgdir}/${_conkyvar}/images/daynight/
+    install -D -m644 help/* ${pkgdir}/${_conkyvar}/help/
+    install -D -m644 lang/* ${pkgdir}/${_conkyvar}/lang/
+    install -D -m755 lib/*.pl ${pkgdir}/${_conkyvar}/lib/
+    install -D -m755 lib/*.lua ${pkgdir}/${_conkyvar}/lib/
+    install -D -m755 lib/*.sh ${pkgdir}/${_conkyvar}/lib/
+    install -D -m755 lib/magellan_source/magellan ${pkgdir}/${_conkyvar}/lib/
+    install -D -m755 lib/xml/*.pm ${pkgdir}/${_conkyvar}/lib/xml/
+    install -D -m755 lib/json/*.pm ${pkgdir}/${_conkyvar}/lib/json/
+    install -D -m755 lib/json/PP/*.pm ${pkgdir}/${_conkyvar}/lib/json/PP/
+    install -D -m755 lib/wxDate/*.pm ${pkgdir}/${_conkyvar}/lib/wxDate/
+    install -D -m644 fonts/* ${pkgdir}/usr/share/fonts/TTF/conkywx/
+    install -D -m644 examples/* ${pkgdir}/${_conkyvar}/examples/
+    install -D -m644 examples/wxmp.desktop ${pkgdir}/usr/share/applications
 
-  # install man page
-  gzip -c -9 conkywx.1 > conkywx.1.gz
-  install -D -m644 conkywx.1.gz "${pkgdir}/usr/share/man/man1/conkywx.1.gz"
+    # install man page
+    gzip -c -9 conkywx.1 > conkywx.1.gz
+    install -D -m644 conkywx.1.gz ${pkgdir}/usr/share/man/man1/conkywx.1.gz
 
 }