diff options
author | Erich Eckner <git@eckner.net> | 2018-07-09 09:20:40 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2018-07-09 09:20:40 +0200 |
commit | f9fb1ca05f1a0ce5c76cbafc000f46e67db3b965 (patch) | |
tree | 47ee1f01229738324907a74b141d47912baab281 /conky | |
parent | d1f97e05fea7cec80d1842942ada3e38c96c9c9a (diff) | |
download | archlinuxewe-f9fb1ca05f1a0ce5c76cbafc000f46e67db3b965.tar.xz |
conky -> conky-irc
Diffstat (limited to 'conky')
-rw-r--r-- | conky/MAX_SP.patch | 12 | ||||
-rw-r--r-- | conky/PKGBUILD | 63 | ||||
-rw-r--r-- | conky/lua53.patch | 46 |
3 files changed, 0 insertions, 121 deletions
diff --git a/conky/MAX_SP.patch b/conky/MAX_SP.patch deleted file mode 100644 index 9c75fbc99..000000000 --- a/conky/MAX_SP.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 @@ - * 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 - - /****************************************** - * Process class * diff --git a/conky/PKGBUILD b/conky/PKGBUILD deleted file mode 100644 index 4b4904424..000000000 --- a/conky/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Erich Eckner <arch at eckner dot net> -# Contributor: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: James Rayner <james@archlinux.org> -# Contributor: Partha Chowdhury <kira.laucas@gmail.com> - -pkgname=conky -pkgver=1.10.8 -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' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' - 'imlib2' 'libxml2' 'libpulse' 'libircclient') -optdepends=('mounted') -source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz" - 'lua53.patch' - 'MAX_SP.patch') -sha512sums=('743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a' - 'a8f7184b0e21daaff137a07431c736269a94b654f50b45ac531cdb0d0edbfa8509def72254c36dce0ca4a1ee5ebae62aac5894f89cda2feae3d54cfcbd85377b' - 'ca23309b45a471b075fbebd2f6ec34b1d7b3198528056ddb3018af4010623a5de83a80ecfc98677b48676fd2600224c33772f55b515c897a3cc917997c70bb38') - -options=('!strip' 'debug') - -prepare() { - cd "${srcdir}/${pkgname}-${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' -} - -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 BUILD_IRC=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 -} diff --git a/conky/lua53.patch b/conky/lua53.patch deleted file mode 100644 index daab12646..000000000 --- a/conky/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); - } |