diff options
| author | Erich Eckner <git@eckner.net> | 2018-12-02 22:24:37 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-12-02 22:24:37 +0100 |
| commit | 330a01d42d919c7a6ce2019b970621c6dd0ee44c (patch) | |
| tree | 21863fc3d51277fbb9cf279f5b488815ac773c41 /conky-irc | |
| parent | 0a55ce1ae63987c889eed192424159f8e82cdad2 (diff) | |
| download | archlinuxewe-330a01d42d919c7a6ce2019b970621c6dd0ee44c.tar.xz | |
conky-irc: 1.10.8-1 -> 1.11.0-1
Diffstat (limited to 'conky-irc')
| -rw-r--r-- | conky-irc/MAX_SP.patch | 11 | ||||
| -rw-r--r-- | conky-irc/PKGBUILD | 9 | ||||
| -rw-r--r-- | conky-irc/lua53.patch | 46 |
3 files changed, 8 insertions, 58 deletions
diff --git a/conky-irc/MAX_SP.patch b/conky-irc/MAX_SP.patch index 9c75fbc99..29145a07e 100644 --- a/conky-irc/MAX_SP.patch +++ b/conky-irc/MAX_SP.patch @@ -1,12 +1,11 @@ -diff -ru3 conky-1.10.1/src/top.h ../conky-1.10.1/src/top.h ---- conky-1.10.1/src/top.h 2015-11-18 16:47:45.000000000 +0100 -+++ ../conky-1.10.1/src/top.h 2015-11-20 20:29:25.993328891 +0100 -@@ -75,7 +75,7 @@ +--- conky-1.11.0/src/top.h 2018-12-02 19:26:02.000000000 +0100 ++++ conky-1.11.0/src/top.h 2018-12-02 22:11:18.515668790 +0100 +@@ -73,7 +73,7 @@ * and it'll take me a while to write a replacement. */ #define BUFFER_LEN 1024 --#define MAX_SP 10 // number of elements to sort -+#define MAX_SP 20 // number of elements to sort +-#define MAX_SP 10 // number of elements to sort ++#define MAX_SP 20 // number of elements to sort /****************************************** * Process class * diff --git a/conky-irc/PKGBUILD b/conky-irc/PKGBUILD index 77b4252f4..d662d0a47 100644 --- a/conky-irc/PKGBUILD +++ b/conky-irc/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Partha Chowdhury <kira.laucas@gmail.com> pkgname=conky-irc -pkgver=1.10.8 +pkgver=1.11.0 provides=("conky=${pkgver}") conflicts=('conky') pkgrel=1 @@ -19,17 +19,14 @@ depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' 'imlib2' 'libxml2' 'libpulse' 'libircclient') optdepends=('mounted') source=("${pkgname%-irc}-${pkgver}.tar.gz::https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz" - 'lua53.patch' 'MAX_SP.patch') -sha512sums=('743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a' - 'a8f7184b0e21daaff137a07431c736269a94b654f50b45ac531cdb0d0edbfa8509def72254c36dce0ca4a1ee5ebae62aac5894f89cda2feae3d54cfcbd85377b' - 'ca23309b45a471b075fbebd2f6ec34b1d7b3198528056ddb3018af4010623a5de83a80ecfc98677b48676fd2600224c33772f55b515c897a3cc917997c70bb38') +sha512sums=('785707fe34d72c84e26799cf07a15349d803dc5f37a910059f98026dae32fe371063578a5e9e98e7b378ac02622c4d66ab550004f5c785fdd3f7da78cbf03e98' + '1ea39f88b5f2620fc0c4485cc16645dbad91f97be17b4b13a732205dde6265d621c7f2bc92be33b65f9db2815312beb42b516ddebbba90cfe947104e1a410a52') options=('!strip' 'debug') prepare() { cd "${srcdir}/${pkgname%-irc}-${pkgver}" - patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3 patch -p1 -i ../MAX_SP.patch sed '/^#include / s,<libircclient\.h>,<libircclient/libircclient.h>,' -i 'src/irc.cc' sed '/check_include_files(/ s,libircclient\.h,libircclient/libircclient.h,' -i 'cmake/ConkyPlatformChecks.cmake' diff --git a/conky-irc/lua53.patch b/conky-irc/lua53.patch deleted file mode 100644 index daab12646..000000000 --- a/conky-irc/lua53.patch +++ /dev/null @@ -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); - } |