Date: Saturday, July 23, 2016 @ 10:09:02 Author: bisson Revision: 272160
archrelease: copy trunk to extra-i686, extra-x86_64 Added: conky/repos/extra-i686/PKGBUILD (from rev 272159, conky/trunk/PKGBUILD) conky/repos/extra-i686/lua53.patch (from rev 272159, conky/trunk/lua53.patch) conky/repos/extra-x86_64/PKGBUILD (from rev 272159, conky/trunk/PKGBUILD) conky/repos/extra-x86_64/lua53.patch (from rev 272159, conky/trunk/lua53.patch) Deleted: conky/repos/extra-i686/PKGBUILD conky/repos/extra-i686/lua53.patch conky/repos/extra-x86_64/PKGBUILD conky/repos/extra-x86_64/lua53.patch --------------------------+ /PKGBUILD | 110 +++++++++++++++++++++++++++++++++++++++++++++ /lua53.patch | 92 +++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 53 --------------------- extra-i686/lua53.patch | 46 ------------------ extra-x86_64/PKGBUILD | 53 --------------------- extra-x86_64/lua53.patch | 46 ------------------ 6 files changed, 202 insertions(+), 198 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-07-23 10:07:40 UTC (rev 272159) +++ extra-i686/PKGBUILD 2016-07-23 10:09:02 UTC (rev 272160) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> -# Contributor: James Rayner <ja...@archlinux.org> -# Contributor: Partha Chowdhury <kira.lau...@gmail.com> - -pkgname=conky -pkgver=1.10.3 -pkgrel=1 -pkgdesc='Lightweight system monitor for X' -url='https://github.com/brndnmtthws/conky' -license=('BSD' 'GPL') -arch=('i686' 'x86_64') -makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db' 'git') -depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 'imlib2' 'libxinerama') -source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz" - 'lua53.patch') -sha1sums=('971b20be2d8c2e676374441469e8525708500776' - 'a3a74542b6524e5663ad37aaba292b48e8bea3b1') - -options=('!strip' 'debug') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3 -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D MAINTAINER_MODE=ON \ - -D BUILD_CURL=ON \ - -D BUILD_XDBE=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 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - 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 -} Copied: conky/repos/extra-i686/PKGBUILD (from rev 272159, conky/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-07-23 10:09:02 UTC (rev 272160) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: James Rayner <ja...@archlinux.org> +# Contributor: Partha Chowdhury <kira.lau...@gmail.com> + +pkgname=conky +pkgver=1.10.3 +pkgrel=2 +pkgdesc='Lightweight system monitor for X' +url='https://github.com/brndnmtthws/conky' +license=('BSD' 'GPL') +arch=('i686' 'x86_64') +makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db' 'git') +depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' + 'imlib2' 'libxml2' 'libpulse') +source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz" + 'lua53.patch') +sha1sums=('971b20be2d8c2e676374441469e8525708500776' + 'a3a74542b6524e5663ad37aaba292b48e8bea3b1') + +options=('!strip' 'debug') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3 +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + cmake \ + -D CMAKE_BUILD_TYPE=Release \ + -D MAINTAINER_MODE=ON \ + -D BUILD_WLAN=ON \ + -D BUILD_XDBE=ON \ + -D BUILD_IMLIB2=ON \ + -D BUILD_CURL=ON \ + -D BUILD_RSS=ON \ + -D BUILD_WEATHER_METAR=ON \ + -D BUILD_WEATHER_XOAP=ON \ + -D BUILD_PULSEAUDIO=ON \ + -D CMAKE_INSTALL_PREFIX=/usr \ + . + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + 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 +} Deleted: extra-i686/lua53.patch =================================================================== --- extra-i686/lua53.patch 2016-07-23 10:07:40 UTC (rev 272159) +++ extra-i686/lua53.patch 2016-07-23 10:09:02 UTC (rev 272160) @@ -1,46 +0,0 @@ -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); - } Copied: conky/repos/extra-i686/lua53.patch (from rev 272159, conky/trunk/lua53.patch) =================================================================== --- extra-i686/lua53.patch (rev 0) +++ extra-i686/lua53.patch 2016-07-23 10:09:02 UTC (rev 272160) @@ -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); + } Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-07-23 10:07:40 UTC (rev 272159) +++ extra-x86_64/PKGBUILD 2016-07-23 10:09:02 UTC (rev 272160) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Giovanni Scafora <giova...@archlinux.org> -# Contributor: James Rayner <ja...@archlinux.org> -# Contributor: Partha Chowdhury <kira.lau...@gmail.com> - -pkgname=conky -pkgver=1.10.3 -pkgrel=1 -pkgdesc='Lightweight system monitor for X' -url='https://github.com/brndnmtthws/conky' -license=('BSD' 'GPL') -arch=('i686' 'x86_64') -makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db' 'git') -depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 'imlib2' 'libxinerama') -source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz" - 'lua53.patch') -sha1sums=('971b20be2d8c2e676374441469e8525708500776' - 'a3a74542b6524e5663ad37aaba292b48e8bea3b1') - -options=('!strip' 'debug') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3 -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - cmake \ - -D CMAKE_BUILD_TYPE=Release \ - -D MAINTAINER_MODE=ON \ - -D BUILD_CURL=ON \ - -D BUILD_XDBE=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 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - 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 -} Copied: conky/repos/extra-x86_64/PKGBUILD (from rev 272159, conky/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-07-23 10:09:02 UTC (rev 272160) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Giovanni Scafora <giova...@archlinux.org> +# Contributor: James Rayner <ja...@archlinux.org> +# Contributor: Partha Chowdhury <kira.lau...@gmail.com> + +pkgname=conky +pkgver=1.10.3 +pkgrel=2 +pkgdesc='Lightweight system monitor for X' +url='https://github.com/brndnmtthws/conky' +license=('BSD' 'GPL') +arch=('i686' 'x86_64') +makedepends=('cmake' 'docbook2x' 'docbook-xml' 'man-db' 'git') +depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' + 'imlib2' 'libxml2' 'libpulse') +source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz" + 'lua53.patch') +sha1sums=('971b20be2d8c2e676374441469e8525708500776' + 'a3a74542b6524e5663ad37aaba292b48e8bea3b1') + +options=('!strip' 'debug') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3 +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + cmake \ + -D CMAKE_BUILD_TYPE=Release \ + -D MAINTAINER_MODE=ON \ + -D BUILD_WLAN=ON \ + -D BUILD_XDBE=ON \ + -D BUILD_IMLIB2=ON \ + -D BUILD_CURL=ON \ + -D BUILD_RSS=ON \ + -D BUILD_WEATHER_METAR=ON \ + -D BUILD_WEATHER_XOAP=ON \ + -D BUILD_PULSEAUDIO=ON \ + -D CMAKE_INSTALL_PREFIX=/usr \ + . + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + 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 +} Deleted: extra-x86_64/lua53.patch =================================================================== --- extra-x86_64/lua53.patch 2016-07-23 10:07:40 UTC (rev 272159) +++ extra-x86_64/lua53.patch 2016-07-23 10:09:02 UTC (rev 272160) @@ -1,46 +0,0 @@ -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); - } Copied: conky/repos/extra-x86_64/lua53.patch (from rev 272159, conky/trunk/lua53.patch) =================================================================== --- extra-x86_64/lua53.patch (rev 0) +++ extra-x86_64/lua53.patch 2016-07-23 10:09:02 UTC (rev 272160) @@ -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); + }