Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d3685ec57f97c572dfc72704fe2f9be4fce9f125
commit d3685ec57f97c572dfc72704fe2f9be4fce9f125 Author: DeX77 <[email protected]> Date: Fri Jan 27 19:23:34 2017 +0100 conky-1.10.6-1-x86_64 * version bump diff --git a/source/xapps-extra/conky/FrugalBuild b/source/xapps-extra/conky/FrugalBuild index bdf53da..6dacf16 100644 --- a/source/xapps-extra/conky/FrugalBuild +++ b/source/xapps-extra/conky/FrugalBuild @@ -4,31 +4,27 @@ # Contributor: DNAku <[email protected]> pkgname=conky -pkgver=1.9.0 -pkgrel=3 +pkgver=1.10.6 +pkgrel=1 pkgdesc="Light-weight system monitor." -_F_sourceforge_ext=".tar.bz2" -Finclude sourceforge -depends=('wireless_tools' 'imlib2' 'libxdamage' 'libxft' 'glib2' 'curl' \ - 'alsa-lib' 'toluapp>=1.0.93-3' 'cairo' 'nghttp2' 'ncurses>=6.0-3') -makedepends=('x11-protos') +_F_github_author="brndnmtthws" +_F_github_tag_v=yes +depends=('lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' 'imlib2' 'libxml2' 'libpulse') +makedepends+=('x11-protos' 'git') groups=('xapps-extra') -archs=('i686' 'x86_64') +archs=('x86_64') backup=(etc/conky/conky.conf etc/conky/conky_no_x11.conf) -sha1sums=('2069cbdb8e7224fcbf3c6b1ddebf64a51634b4cc') - -build() -{ - Fbuild --enable-xft \ - --enable-own-window \ - --enable-wlan \ - --enable-rss \ - --enable-ibm \ - --enable-imlib2 \ - --enable-lua \ - --enable-lua-cairo \ - --enable-lua-imlib2 - Fdocrel doc/*.html -} +source=("${source[@]}" lua53.patch) +sha1sums=('a3a74542b6524e5663ad37aaba292b48e8bea3b1' \ + '54cb3322dc3a969f1fda03383012c61d57261345') +_F_cmake_confopts=" -DBUILD_WLAN=ON \ + -DBUILD_XDBE=ON \ + -DBUILD_IMLIB2=ON \ + -DBUILD_CURL=ON \ + -DBUILD_RSS=ON \ + -DBUILD_WEATHER_METAR=ON \ + -DBUILD_WEATHER_XOAP=ON \ + -DBUILD_PULSEAUDIO=ON" +Finclude github cmake # optimization OK diff --git a/source/xapps-extra/conky/lua53.patch b/source/xapps-extra/conky/lua53.patch new file mode 100644 index 0000000..daab126 --- /dev/null +++ b/source/xapps-extra/conky/lua53.patch @@ -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); + } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
