Date: Monday, June 29, 2015 @ 22:21:09 Author: bisson Revision: 241400
upstream update Added: conky/trunk/ascii.patch conky/trunk/lua53.patch Modified: conky/trunk/PKGBUILD Deleted: conky/trunk/PKGBUILD.cmake ----------------+ PKGBUILD | 41 +++++++++++++++++++++++++---------------- PKGBUILD.cmake | 49 ------------------------------------------------- ascii.patch | 12 ++++++++++++ lua53.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 65 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-29 17:51:33 UTC (rev 241399) +++ PKGBUILD 2015-06-29 20:21:09 UTC (rev 241400) @@ -5,32 +5,41 @@ # Contributor: Partha Chowdhury <kira.lau...@gmail.com> pkgname=conky -pkgver=1.9.0 -pkgrel=7 +pkgver=1.10.0 +pkgrel=1 pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' license=('BSD' 'GPL') arch=('i686' 'x86_64') -makedepends=('docbook2x') +makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db') depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 'imlib2') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d') +source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz" + 'ascii.patch' + 'lua53.patch') +sha1sums=('d5863420150150002947180d0ee96c9ef56c43b1' + '96cdbc38e8706c8a3120601983df5c7265716128' + 'a3a74542b6524e5663ad37aaba292b48e8bea3b1') -backup=('etc/conky/'conky{,_no_x11}.conf) -options=('!emptydirs') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../ascii.patch # db2x_manxml fails on non-ascii chars + patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3 +} build() { cd "${srcdir}/${pkgname}-${pkgver}" - CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-ibm \ - --enable-curl \ - --enable-rss \ - --enable-weather-xoap \ - --enable-imlib2 \ - --enable-wlan \ + cmake \ + -D CMAKE_BUILD_TYPE=Release \ + -D MAINTAINER_MODE=ON \ + -D BUILD_CURL=ON \ + -D BUILD_IMLIB2=ON \ + -D BUILD_RSS=ON \ + -D BUILD_WEATHER_METAR=ON \ + -D BUILD_WEATHER_XOAP=ON \ + -D BUILD_WLAN=ON \ + -D CMAKE_INSTALL_PREFIX=/usr \ + . make } Deleted: PKGBUILD.cmake =================================================================== --- PKGBUILD.cmake 2015-06-29 17:51:33 UTC (rev 241399) +++ PKGBUILD.cmake 2015-06-29 20:21:09 UTC (rev 241400) @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $ -# Contributor: Giovanni Scafora <giova...@archlinux.org> -# Contributor: James Rayner <ja...@archlinux.org> -# Contributor: Partha Chowdhury <kira.lau...@gmail.com> -# Maintainer: Gaetan Bisson <bis...@archlinux.org> - -pkgname=conky -pkgver=1.8.2git20111021 -pkgrel=1 -pkgdesc='Lightweight system monitor for X' -url='http://conky.sourceforge.net/' -license=('BSD' 'GPL') -arch=('i686' 'x86_64') -makedepends=('pkg-config' 'cmake' 'git' 'docbook2x') -depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 'imlib2' 'lua') - -replaces=('torsmo') - -build() { - cd "${srcdir}" - - cd conky && { git pull origin; cd ..; } || git clone git://git.omp.am/conky.git - rm -fr build; mkdir build; cd build - - cmake \ - -D CMAKE_BUILD_TYPE:STRING="Release" \ - -D MAINTAINER_MODE:BOOL=ON \ - -D BUILD_CURL:BOOL=ON \ - -D BUILD_IMLIB2:BOOL=ON \ - -D BUILD_LUA_IMLIB2:BOOL=OFF \ - -D BUILD_MYSQL:BOOL=OFF \ - -D BUILD_RSS:BOOL=ON \ - -D BUILD_WEATHER_METAR:BOOL=ON \ - -D BUILD_WEATHER_XOAP:BOOL=ON \ - -D BUILD_WLAN:BOOL=ON \ - -D CMAKE_INSTALL_PREFIX:PATH=/usr \ - ../conky - - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}" - 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 -} Added: ascii.patch =================================================================== --- ascii.patch (rev 0) +++ ascii.patch 2015-06-29 20:21:09 UTC (rev 241400) @@ -0,0 +1,12 @@ +diff -aur old/doc/config_settings.xml new/doc/config_settings.xml +--- old/doc/config_settings.xml 2015-06-21 14:49:06.000000000 -1000 ++++ new/doc/config_settings.xml 2015-06-29 10:05:00.147318479 -1000 +@@ -80,7 +80,7 @@ + </term> + <listitem>A comma-separated list of strings to use as the bars of a graph output + to console/shell. The first list item is used for the minimum bar height and the +- last item is used for the maximum. Example: " ,_,▁,▂,▃,▄,▅,▆,▇,█". ++ last item is used for the maximum. + <para /></listitem> + </varlistentry> + <varlistentry> Added: lua53.patch =================================================================== --- lua53.patch (rev 0) +++ lua53.patch 2015-06-29 20:21:09 UTC (rev 241400) @@ -0,0 +1,46 @@ +diff -aur old/src/luamm.cc new/src/luamm.cc +--- old/src/luamm.cc 2015-06-28 16:38:47.793615922 -1000 ++++ new/src/luamm.cc 2015-06-29 09:05:44.646667638 -1000 +@@ -165,7 +165,14 @@ + } + + template<void (*misc)(lua_State *, int), int nresults> +- int safe_misc_trampoline(lua_State *l) ++ int safe_misc_trampoline_set(lua_State *l) ++ { ++ misc(l, 1); ++ return nresults; ++ } ++ ++ template<int (*misc)(lua_State *, int), int nresults> ++ int safe_misc_trampoline_get(lua_State *l) + { + misc(l, 1); + return nresults; +@@ -326,7 +333,7 @@ + if( rawequal(index1, index2) ) + return true; + +- return safe_compare(&safe_compare_trampoline<lua_equal>, index1, index2); ++ return safe_compare(&safe_compare_trampoline<&lua_equal>, index1, index2); + } + + int state::gc(int what, int data) +@@ -367,7 +374,7 @@ + checkstack(2); + pushvalue(index); + insert(-2); +- lua_pushcfunction(cobj.get(), (&safe_misc_trampoline<&lua_gettable, 1>)); ++ lua_pushcfunction(cobj.get(), (&safe_misc_trampoline_get<&lua_gettable, 1>)); + insert(-3); + call(2, 1, 0); + } +@@ -492,7 +499,7 @@ + checkstack(2); + pushvalue(index); + insert(-3); +- lua_pushcfunction(cobj.get(), (&safe_misc_trampoline<&lua_settable, 0>)); ++ lua_pushcfunction(cobj.get(), (&safe_misc_trampoline_set<&lua_settable, 0>)); + insert(-4); + call(3, 0, 0); + }