From 1517345ab70f42a5e050f3dc9b498038118f9ff1 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 13 Dec 2012 02:32:08 -0800 Subject: Thu Dec 13 02:27:45 PST 2012 --- community/c++-gtk-utils/PKGBUILD | 6 +- community/codeblocks/PKGBUILD | 8 +- community/i3-wm/PKGBUILD | 8 +- community/knemo/PKGBUILD | 6 +- community/lua-sec/PKGBUILD | 48 +++++++ community/lua-socket/PKGBUILD | 52 ++++++++ community/lua-socket/lua52.patch | 168 ++++++++++++++++++++++++ community/lua-socket/luasocket-unixsocket.patch | 33 +++++ community/luaexpat/PKGBUILD | 36 +++-- community/luaexpat/config.51 | 26 ++++ community/luaexpat/config.52 | 26 ++++ community/me-tv/PKGBUILD | 4 +- community/nginx/PKGBUILD | 9 +- community/pcsc-tools/PKGBUILD | 6 +- community/pcsclite/PKGBUILD | 8 +- community/pdns-recursor/PKGBUILD | 4 +- community/prosody/PKGBUILD | 14 +- community/spacefm/PKGBUILD | 5 +- community/supertuxkart/PKGBUILD | 27 ++-- community/udevil/PKGBUILD | 5 +- extra/gparted/PKGBUILD | 8 +- extra/help2man/PKGBUILD | 6 +- extra/htop/PKGBUILD | 14 +- extra/htop/tree-crash.patch | 13 ++ extra/mercurial/PKGBUILD | 6 +- extra/perl-net-ssleay/PKGBUILD | 6 +- extra/swt/PKGBUILD | 16 +-- 27 files changed, 476 insertions(+), 92 deletions(-) create mode 100644 community/lua-sec/PKGBUILD create mode 100644 community/lua-socket/PKGBUILD create mode 100644 community/lua-socket/lua52.patch create mode 100644 community/lua-socket/luasocket-unixsocket.patch create mode 100644 community/luaexpat/config.51 create mode 100644 community/luaexpat/config.52 create mode 100644 extra/htop/tree-crash.patch diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 7b7cde8b3..4e47ef25f 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 78397 2012-10-17 18:44:11Z giovanni $ +# $Id: PKGBUILD 81205 2012-12-13 02:29:34Z giovanni $ # Maintainer: Giovanni Scafora pkgname=c++-gtk-utils -pkgver=2.0.12 +pkgver=2.0.13 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('0b85fb1726a8b6fb60292372e6bae7b8') +md5sums=('9b505145b64903c684b6289af1f625e5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD index 5e6b2eafa..15aceaa03 100644 --- a/community/codeblocks/PKGBUILD +++ b/community/codeblocks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80953 2012-12-07 20:15:05Z bpiotrowski $ +# $Id: PKGBUILD 81177 2012-12-12 19:46:48Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Robert Hollencamp # Contributor: Daniel J Griffiths @@ -6,14 +6,14 @@ pkgname=codeblocks pkgver=12.11 -pkgrel=1 +pkgrel=2 pkgdesc='Open source and cross-platform C/C++ IDE' arch=('i686' 'x86_64') url="http://www.codeblocks.org" license=('GPL3') -depends=('boost' 'bzip2' 'desktop-file-utils' 'gamin' 'gtk-update-icon-cache' +depends=('boost-libs' 'bzip2' 'desktop-file-utils' 'gamin' 'gtk-update-icon-cache' 'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk') -makedepends=('zip') +makedepends=('boost' 'zip') options=('!libtool') install=codeblocks.install source=(http://download.berlios.de/$pkgname/${pkgname}_${pkgver}-1.tar.gz) diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index e08248257..b59fdb11d 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76540 2012-09-22 15:17:46Z ttopper $ +# $Id: PKGBUILD 81166 2012-12-12 17:43:14Z ttoepper $ # Maintainer: Thorsten Töpper pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.3 -pkgrel=2 +pkgver=4.4 +pkgrel=1 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64') url="http://i3wm.org/" @@ -19,7 +19,7 @@ optdepends=('dmenu: As menu.' 'perl: To migrate your configuration to v4 format.') options=('docs' '!strip') source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2") -md5sums=('6e0258e08f644532497cc97bde937a6c') +md5sums=('fa2b8aae3d2e10c5ee480bd370366f5b') build() { cd "$srcdir/$_pkgsourcename-$pkgver" diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD index b7b1a870a..d33df7be1 100644 --- a/community/knemo/PKGBUILD +++ b/community/knemo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79688 2012-11-11 05:39:50Z lcarlier $ +# $Id: PKGBUILD 81173 2012-12-12 18:41:15Z lcarlier $ # Maintainer: Laurent Carlier # Contributor: Andrea Scarpino # Contributor: Sergej Pupykin # Contributor: Stefano Zamprogno pkgname=knemo -pkgver=0.7.5 +pkgver=0.7.6 pkgrel=1 pkgdesc="The KDE Network Monitor" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install options=('libtool') source=("http://www.kde-apps.org/CONTENT/content-files/12956-${pkgname}-${pkgver}.tar.bz2") -md5sums=('fc316e8492d97ffc00fc2e2c6caf136d') +md5sums=('42b35d4d48698a2f514adeb2ca872408') build() { cd ${srcdir} diff --git a/community/lua-sec/PKGBUILD b/community/lua-sec/PKGBUILD new file mode 100644 index 000000000..e930bf140 --- /dev/null +++ b/community/lua-sec/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 81161 2012-12-12 13:10:36Z spupykin $ +# Maintainer: Sergej Pupykin +# Maintainer: Dwayne Bent +# Contributor: Paul-Sebastian Manole + +pkgbase=lua-sec +pkgname=(lua-sec lua51-sec) +pkgver=0.4.1 +pkgrel=2 +pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.' +arch=('i686' 'x86_64') +url='http://luasec.luaforge.net/' +license=('MIT') +makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket') +conflicts=('luasec') +replaces=('luasec') +source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/luasec-$pkgver.tar.gz") +md5sums=('b8a5fde3b3fdb6174f54cd51d7f53e12') + +build() { + cp -a luasec-$pkgver luasec-$pkgver-51 + msg2 'Building with lua 5.2' + cd luasec-$pkgver + make linux + msg2 'Building with lua 5.1' + cd ../luasec-$pkgver-51 + make INCDIR=-I/usr/include/lua5.1 linux +} + +package_lua-sec() { + depends=('openssl' 'lua' 'lua-socket') + + install -dm755 "$pkgdir/usr/lib/lua/5.2" + cd luasec-$pkgver + make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_lua51-sec() { + depends=('openssl' 'lua51' 'lua51-socket') + + install -dm755 "$pkgdir/usr/lib/lua/5.1" + cd luasec-$pkgver-51 + make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install + install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=4 sw=4 et: diff --git a/community/lua-socket/PKGBUILD b/community/lua-socket/PKGBUILD new file mode 100644 index 000000000..f4be7a699 --- /dev/null +++ b/community/lua-socket/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 81162 2012-12-12 13:10:55Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Anders Bergh + +pkgbase=lua-socket +pkgname=(lua-socket lua51-socket) +pkgver=2.0.2 +pkgrel=2 +pkgdesc='Networking support library for the Lua language' +arch=('i686' 'x86_64') +url='http://www.cs.princeton.edu/~diego/professional/luasocket/' +license=('MIT') +replaces=('luasocket') +conflicts=('luasocket') +makedepends=('lua' 'lua51') +source=(http://luaforge.net/frs/download.php/2664/luasocket-$pkgver.tar.gz + luasocket-unixsocket.patch + lua52.patch) +md5sums=('41445b138deb7bcfe97bff957503da8e' + '8d116bb70bd7a2fa15cbe949d4cfc35e' + '6f9c6416dd70a7bc1a867003f08c2752') + +build() { + msg2 'Building with lua 5.2' + cp -a luasocket-$pkgver luasocket-$pkgver-52 + cd luasocket-$pkgver-52 + patch -Np1 -i "$srcdir/luasocket-unixsocket.patch" + patch -Np1 -i "$srcdir/lua52.patch" + make + msg2 'Building with lua 5.1' + cd ../luasocket-$pkgver + patch -Np1 -i "$srcdir/luasocket-unixsocket.patch" + make LUAINC=-I/usr/include/lua5.1 +} + +package_lua-socket() { + depends=('lua') + cd luasocket-$pkgver + make DESTDIR="$pkgdir/" \ + INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.1' \ + INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.1' install + install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_lua51-socket() { + depends=('lua51') + cd luasocket-$pkgver + make DESTDIR="$pkgdir/" \ + INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.2' \ + INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.2' install + install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/lua-socket/lua52.patch b/community/lua-socket/lua52.patch new file mode 100644 index 000000000..4eef574ee --- /dev/null +++ b/community/lua-socket/lua52.patch @@ -0,0 +1,168 @@ +diff -wbBur luasocket-2.0.2/src/auxiliar.c luasocket-2.0.2.my/src/auxiliar.c +--- luasocket-2.0.2/src/auxiliar.c 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/auxiliar.c 2012-11-14 18:23:14.000000000 +0400 +@@ -24,7 +24,7 @@ + * Creates a new class with given methods + * Methods whose names start with __ are passed directly to the metatable. + \*-------------------------------------------------------------------------*/ +-void auxiliar_newclass(lua_State *L, const char *classname, luaL_reg *func) { ++void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) { + luaL_newmetatable(L, classname); /* mt */ + /* create __index table to place methods */ + lua_pushstring(L, "__index"); /* mt,"__index" */ +diff -wbBur luasocket-2.0.2/src/auxiliar.h luasocket-2.0.2.my/src/auxiliar.h +--- luasocket-2.0.2/src/auxiliar.h 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/auxiliar.h 2012-11-14 18:23:42.000000000 +0400 +@@ -35,7 +35,7 @@ + #include "lauxlib.h" + + int auxiliar_open(lua_State *L); +-void auxiliar_newclass(lua_State *L, const char *classname, luaL_reg *func); ++void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func); + void auxiliar_add2group(lua_State *L, const char *classname, const char *group); + void auxiliar_setclass(lua_State *L, const char *classname, int objidx); + void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx); +diff -wbBur luasocket-2.0.2/src/except.c luasocket-2.0.2.my/src/except.c +--- luasocket-2.0.2/src/except.c 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/except.c 2012-11-14 18:23:23.000000000 +0400 +@@ -21,7 +21,7 @@ + static int do_nothing(lua_State *L); + + /* except functions */ +-static luaL_reg func[] = { ++static luaL_Reg func[] = { + {"newtry", global_newtry}, + {"protect", global_protect}, + {NULL, NULL} +diff -wbBur luasocket-2.0.2/src/inet.c luasocket-2.0.2.my/src/inet.c +--- luasocket-2.0.2/src/inet.c 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/inet.c 2012-11-14 18:23:47.000000000 +0400 +@@ -21,7 +21,7 @@ + static int inet_global_gethostname(lua_State *L); + + /* DNS functions */ +-static luaL_reg func[] = { ++static luaL_Reg func[] = { + { "toip", inet_global_toip }, + { "tohostname", inet_global_tohostname }, + { "gethostname", inet_global_gethostname}, +diff -wbBur luasocket-2.0.2/src/luasocket.c luasocket-2.0.2.my/src/luasocket.c +--- luasocket-2.0.2/src/luasocket.c 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/luasocket.c 2012-11-14 18:23:26.000000000 +0400 +@@ -47,7 +47,7 @@ + /*-------------------------------------------------------------------------*\ + * Modules and functions + \*-------------------------------------------------------------------------*/ +-static const luaL_reg mod[] = { ++static const luaL_Reg mod[] = { + {"auxiliar", auxiliar_open}, + {"except", except_open}, + {"timeout", timeout_open}, +@@ -59,7 +59,7 @@ + {NULL, NULL} + }; + +-static luaL_reg func[] = { ++static luaL_Reg func[] = { + {"skip", global_skip}, + {"__unload", global_unload}, + {NULL, NULL} +diff -wbBur luasocket-2.0.2/src/mime.c luasocket-2.0.2.my/src/mime.c +--- luasocket-2.0.2/src/mime.c 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/mime.c 2012-11-14 18:23:31.000000000 +0400 +@@ -48,7 +48,7 @@ + static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer); + + /* code support functions */ +-static luaL_reg func[] = { ++static luaL_Reg func[] = { + { "dot", mime_global_dot }, + { "b64", mime_global_b64 }, + { "eol", mime_global_eol }, +diff -wbBur luasocket-2.0.2/src/select.c luasocket-2.0.2.my/src/select.c +--- luasocket-2.0.2/src/select.c 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/select.c 2012-11-14 18:23:35.000000000 +0400 +@@ -27,7 +27,7 @@ + static int global_select(lua_State *L); + + /* functions in library namespace */ +-static luaL_reg func[] = { ++static luaL_Reg func[] = { + {"select", global_select}, + {NULL, NULL} + }; +diff -wbBur luasocket-2.0.2/src/tcp.c luasocket-2.0.2.my/src/tcp.c +--- luasocket-2.0.2/src/tcp.c 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/tcp.c 2012-11-14 18:23:38.000000000 +0400 +@@ -38,7 +38,7 @@ + static int meth_dirty(lua_State *L); + + /* tcp object methods */ +-static luaL_reg tcp[] = { ++static luaL_Reg tcp[] = { + {"__gc", meth_close}, + {"__tostring", auxiliar_tostring}, + {"accept", meth_accept}, +@@ -73,7 +73,7 @@ + }; + + /* functions in library namespace */ +-static luaL_reg func[] = { ++static luaL_Reg func[] = { + {"tcp", global_create}, + {NULL, NULL} + }; +diff -wbBur luasocket-2.0.2/src/timeout.c luasocket-2.0.2.my/src/timeout.c +--- luasocket-2.0.2/src/timeout.c 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/timeout.c 2012-11-14 18:23:21.000000000 +0400 +@@ -33,7 +33,7 @@ + static int timeout_lua_gettime(lua_State *L); + static int timeout_lua_sleep(lua_State *L); + +-static luaL_reg func[] = { ++static luaL_Reg func[] = { + { "gettime", timeout_lua_gettime }, + { "sleep", timeout_lua_sleep }, + { NULL, NULL } +diff -wbBur luasocket-2.0.2/src/udp.c luasocket-2.0.2.my/src/udp.c +--- luasocket-2.0.2/src/udp.c 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/udp.c 2012-11-14 18:23:44.000000000 +0400 +@@ -43,7 +43,7 @@ + static int meth_dirty(lua_State *L); + + /* udp object methods */ +-static luaL_reg udp[] = { ++static luaL_Reg udp[] = { + {"__gc", meth_close}, + {"__tostring", auxiliar_tostring}, + {"close", meth_close}, +@@ -76,7 +76,7 @@ + }; + + /* functions in library namespace */ +-static luaL_reg func[] = { ++static luaL_Reg func[] = { + {"udp", global_create}, + {NULL, NULL} + }; +diff -wbBur luasocket-2.0.2/src/unix.c luasocket-2.0.2.my/src/unix.c +--- luasocket-2.0.2/src/unix.c 2007-10-15 08:21:05.000000000 +0400 ++++ luasocket-2.0.2.my/src/unix.c 2012-11-14 18:23:17.000000000 +0400 +@@ -39,7 +39,7 @@ + static const char *unix_trybind(p_unix un, const char *path); + + /* unix object methods */ +-static luaL_reg un[] = { ++static luaL_Reg un[] = { + {"__gc", meth_close}, + {"__tostring", auxiliar_tostring}, + {"accept", meth_accept}, +@@ -71,7 +71,7 @@ + }; + + /* our socket creation function */ +-static luaL_reg func[] = { ++static luaL_Reg func[] = { + {"unix", global_create}, + {NULL, NULL} + }; diff --git a/community/lua-socket/luasocket-unixsocket.patch b/community/lua-socket/luasocket-unixsocket.patch new file mode 100644 index 000000000..07c9401fa --- /dev/null +++ b/community/lua-socket/luasocket-unixsocket.patch @@ -0,0 +1,33 @@ +diff -wbBur luasocket-2.0.2/makefile luasocket-2.0.2.my/makefile +--- luasocket-2.0.2/makefile 2007-10-15 04:21:05.000000000 +0000 ++++ luasocket-2.0.2.my/makefile 2011-03-09 12:00:54.000000000 +0000 +@@ -10,6 +10,8 @@ + INSTALL_SOCKET_LIB=$(INSTALL_TOP_LIB)/socket + INSTALL_MIME_SHARE=$(INSTALL_TOP_SHARE)/mime + INSTALL_MIME_LIB=$(INSTALL_TOP_LIB)/mime ++# ++INSTALL_UNIX_LIB=$(INSTALL_SOCKET_LIB) + + all clean: + cd src; $(MAKE) $@ +@@ -45,6 +47,8 @@ + #cd src; $(INSTALL_DATA) $(TO_MIME_SHARE) $(INSTALL_MIME_SHARE) + cd src; mkdir -p $(INSTALL_MIME_LIB) + cd src; $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_LIB)/core.$(EXT) ++ cd src; mkdir -p $(INSTALL_UNIX_LIB) ++ cd src; $(INSTALL_EXEC) $(UNIX_SO) $(INSTALL_UNIX_LIB)/$(UNIX_SO) + + #------ + # End of makefile +diff -wbBur luasocket-2.0.2/src/makefile luasocket-2.0.2.my/src/makefile +--- luasocket-2.0.2/src/makefile 2007-10-15 04:21:05.000000000 +0000 ++++ luasocket-2.0.2.my/src/makefile 2011-03-09 12:02:25.000000000 +0000 +@@ -47,7 +47,7 @@ + usocket.o \ + unix.o + +-all: $(SOCKET_SO) $(MIME_SO) ++all: $(SOCKET_SO) $(MIME_SO) $(UNIX_SO) + + $(SOCKET_SO): $(SOCKET_OBJS) + $(LD) $(LDFLAGS) -o $@ $(SOCKET_OBJS) diff --git a/community/luaexpat/PKGBUILD b/community/luaexpat/PKGBUILD index b46e7bc75..1e438dfa9 100644 --- a/community/luaexpat/PKGBUILD +++ b/community/luaexpat/PKGBUILD @@ -1,29 +1,39 @@ -# $Id: PKGBUILD 81114 2012-12-12 00:47:39Z eric $ +# $Id: PKGBUILD 81199 2012-12-13 02:04:44Z seblu $ # Maintainer: Sergej Pupykin # Contributor: Lucas Hermann Negri pkgbase=luaexpat -pkgname=(lua-expat) +pkgname=(lua-expat lua51-expat) pkgver=1.2.0 -pkgrel=1 +pkgrel=3 pkgdesc='SAX XML parser based on the Expat library' arch=('i686' 'x86_64') -url='http://code.matthewwild.co.uk/lua-expat' +url='http://matthewwild.co.uk/projects/luaexpat/' license=('MIT') -makedepends=('gcc' 'lua' 'expat>=2') +makedepends=('gcc' 'lua' 'lua51' 'expat') replaces=(luaexpat) conflicts=(luaexpat) source=("http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz" - 'newconfig' - 'lua52.patch') + 'config.51' + 'config.52' + 'lua52.patch') md5sums=('03efe50c7f30a34580701e6527d7bfee' + '64abbf5b602e0e31b68db2925a5e6b2f' '60ae0633ac6f829cc3359f3533252eb0' '21da93cbf0d3cef80d00e2380b7c2679') build() { - cd $pkgbase-$pkgver + # 5.1 + msg2 "Building $pkgbase with lua 5.1" + cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51 + cd $pkgbase-$pkgver-51 + cp -L "$srcdir/config.51" config + make LUA_INC=/usr/include/lua5.1 + # 5.2 + msg2 "Building $pkgbase with lua 5.2" + cd "$srcdir/$pkgbase-$pkgver" patch -p1 < "$srcdir/lua52.patch" - cp -L "$srcdir/newconfig" config + cp -L "$srcdir/config.52" config make } @@ -34,3 +44,11 @@ package_lua-expat() { mv usr "$pkgdir" install -Dm0644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html" } + +package_lua51-expat() { + depends=('lua51' 'expat') + cd $pkgbase-$pkgver-51 + make DESTDIR="$pkgdir" install + mv usr "$pkgdir" + install -Dm0644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html" +} diff --git a/community/luaexpat/config.51 b/community/luaexpat/config.51 new file mode 100644 index 000000000..64afe1cca --- /dev/null +++ b/community/luaexpat/config.51 @@ -0,0 +1,26 @@ +LUA_LIBDIR= usr/lib/lua/5.1 +LUA_DIR= usr/share/lua/5.1 +LUA_INC= /usr/include/lua5.1 +EXPAT_INC= /usr/include + +# OS dependent +LIB_OPTION= -shared + +LIBNAME= $T.so.$V +LUA_VERSION_NUM= 515 +COMPAT_DIR= ../compat/src + +# Compilation parameters +CWARNS = -Wall -pedantic \ + -Waggregate-return \ + -Wcast-align \ + -Wmissing-prototypes \ + -Wstrict-prototypes \ + -Wnested-externs \ + -Wpointer-arith \ + -Wshadow \ + -Wwrite-strings + +CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \ + -I$(COMPAT_DIR) -I$(EXPAT_INC) -fPIC +CC = gcc diff --git a/community/luaexpat/config.52 b/community/luaexpat/config.52 new file mode 100644 index 000000000..bc5b25d8f --- /dev/null +++ b/community/luaexpat/config.52 @@ -0,0 +1,26 @@ +LUA_LIBDIR= usr/lib/lua/5.2 +LUA_DIR= usr/share/lua/5.2 +LUA_INC= /usr/include +EXPAT_INC= /usr/include + +# OS dependent +LIB_OPTION= -shared + +LIBNAME= $T.so.$V +LUA_VERSION_NUM= 521 +COMPAT_DIR= ../compat/src + +# Compilation parameters +CWARNS = -Wall -pedantic \ + -Waggregate-return \ + -Wcast-align \ + -Wmissing-prototypes \ + -Wstrict-prototypes \ + -Wnested-externs \ + -Wpointer-arith \ + -Wshadow \ + -Wwrite-strings + +CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \ + -I$(COMPAT_DIR) -I$(EXPAT_INC) -fPIC +CC = gcc diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD index d0d6c1d33..eb15b07a1 100644 --- a/community/me-tv/PKGBUILD +++ b/community/me-tv/PKGBUILD @@ -5,7 +5,7 @@ #Previous Contributor: Jeff Bailes pkgname=me-tv -pkgver=1.4.0.10 +pkgver=1.4.0.12 pkgrel=1 epoch=1 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" @@ -49,4 +49,4 @@ package() { } -md5sums=('842953c4e9eb37f79704ebd8bb23608a') +md5sums=('28c7fd5523fd6ea8f5de89b297eb1391') diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index b8d09e6af..9362cd561 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80209 2012-11-17 16:39:31Z bpiotrowski $ +# $Id: PKGBUILD 81170 2012-12-12 18:31:06Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Miroslaw Szot @@ -7,13 +7,12 @@ _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.2.5 -pkgrel=2 +pkgver=1.2.6 +pkgrel=1 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl' 'geoip') makedepends=('passenger') -optdepends=('passenger') url="http://nginx.org" license=('custom') install=nginx.install @@ -31,7 +30,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz rc.d service nginx.logrotate) -md5sums=('4f5a55187a3d45fa37d99d07ddd90800' +md5sums=('1350d26eb9b66364d9143fb3c4366ab6' 'f62c7c9b5a53471d4666a4c49ad363fb' '62d494d23aef31d0b867161f9fffa6eb' 'b38744739022876554a0444d92e6603b') diff --git a/community/pcsc-tools/PKGBUILD b/community/pcsc-tools/PKGBUILD index a4e8a089f..7bbb5a918 100644 --- a/community/pcsc-tools/PKGBUILD +++ b/community/pcsc-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73087 2012-06-30 14:26:59Z giovanni $ +# $Id: PKGBUILD 81203 2012-12-13 02:21:32Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Lorenzo Nizzi Grifi Gargiolli # Contributor: marc0s pkgname=pcsc-tools -pkgver=1.4.20 +pkgver=1.4.21 pkgrel=1 pkgdesc="PC/SC Architecture smartcard tools" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL') depends=('pcsclite' 'pcsc-perl' 'gtk2-perl' 'glib-perl') makedepends=('pkg-config') source=("http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('c85f8b983e4b9a9dcd373725f024c6b8') +md5sums=('c5ec17124aab4e933d537d6253046423') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 1d6bedf17..d444de55d 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75800 2012-08-31 19:26:09Z giovanni $ +# $Id: PKGBUILD 81201 2012-12-13 02:14:39Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Daniel Plaza pkgname=pcsclite -pkgver=1.8.6 +pkgver=1.8.7 pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') @@ -12,9 +12,9 @@ license=('BSD') depends=('python2' 'systemd-tools') makedepends=('pkg-config') options=('!libtool' '!docs') -source=("https://alioth.debian.org/frs/download.php/3757/pcsc-lite-${pkgver}.tar.bz2" +source=("https://alioth.debian.org/frs/download.php/3842/pcsc-lite-${pkgver}.tar.bz2" 'pcscd') -md5sums=('3e4b777231d35ce35c15c0704f936eaa' +md5sums=('744f4b437492ce22ae23aa483a76becf' 'c97b6bce695222efb0f003d8e8369010') build() { diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD index f404607e9..19e4172e7 100644 --- a/community/pdns-recursor/PKGBUILD +++ b/community/pdns-recursor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80083 2012-11-15 22:19:08Z arodseth $ +# $Id: PKGBUILD 81192 2012-12-12 22:04:27Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Jan de Groot pkgname=pdns-recursor pkgver=3.3 -pkgrel=4 +pkgrel=6 pkgdesc='PowerDNS recursor' url='http://www.powerdns.com' license=('GPL') diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 451c93cb2..071bdf72a 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 81128 2012-12-12 00:49:40Z eric $ +# $Id: PKGBUILD 81207 2012-12-13 02:54:35Z seblu $ # Maintainer: Sergej Pupykin # Maintainer: Dwayne Bent # Contributor: Paul-Sebastian Manole pkgname=prosody pkgver=0.8.2 -pkgrel=6 +pkgrel=8 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." arch=('i686' 'x86_64') url="http://prosody.im/" license=('MIT') -depends=('lua>=5.1' 'luasocket' 'luaexpat' 'luafilesystem' 'libidn>=0.5.18' 'openssl') -optdepends=('luasec: TLS encryption support' - 'lua-zlib: compression support' - 'luadbi: SQL storage support') +depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn' 'openssl') +optdepends=('lua51-sec: TLS encryption support') install=prosody.install backup=('etc/logrotate.d/prosody' 'etc/prosody/prosody.cfg.lua') @@ -33,8 +31,10 @@ md5sums=('6e907bf0d0acf24f1011083020ba6ffb' build() { cd "$srcdir/prosody-$pkgver" patch -p1 <$srcdir/fix-config.patch + find . -type f -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)lua$,#!/usr/bin/lua5.1,' {} \; ./configure --prefix=/usr --sysconfdir=/etc/prosody \ - --datadir=/var/lib/prosody + --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1 make } diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index ff3588e52..141c92db8 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80587 2012-11-26 14:57:25Z bpiotrowski $ +# $Id: PKGBUILD 81186 2012-12-12 20:10:52Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat pkgname=spacefm pkgver=0.8.3 -pkgrel=1 +pkgrel=2 pkgdesc='Multi-panel tabbed file manager' arch=('i686' 'x86_64') url='http://ignorantguru.github.com/spacefm/' @@ -17,7 +17,6 @@ optdepends=('lsof: device processes' 'eject: eject media' 'wget: plugin download' 'gksu: perform as root functionality' - 'pmount: mount as non-root user' 'udevil: mount as non-root user and mount networks' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD index 19fb3bf3c..b2f3f8d79 100644 --- a/community/supertuxkart/PKGBUILD +++ b/community/supertuxkart/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 65315 2012-02-20 23:23:12Z svenstaro $ +# $Id: PKGBUILD 81143 2012-12-12 06:53:44Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Daenyth # Contributor: Allan McRae # Contributor: rabyte pkgname=supertuxkart -pkgver=0.7.3 -pkgrel=2 +pkgver=0.8 +pkgrel=1 pkgdesc="A kart racing game featuring Tux and his friends" arch=('i686' 'x86_64') url="http://supertuxkart.sourceforge.net/" @@ -14,19 +14,16 @@ license=('GPL2') depends=('openal' 'libvorbis' 'libgl' 'fribidi' 'curl') makedepends=('cmake' 'subversion' 'mesa') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2) -md5sums=('502664b2ec9ad5ab88b1882fef4c074d') +md5sums=('0b939ce601374758938119e0b0dd1fec') build() { - cd "$srcdir" + cd ${srcdir}/SuperTuxKart-${pkgver} - svn co -r 3900 https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk irrlicht - - cd irrlicht/source/Irrlicht + cd lib/irrlicht/source/Irrlicht NDEBUG=1 make - cd ${srcdir}/${pkgname}-${pkgver} - - sed -i "s|share/games|share|g" CMakeLists.txt + cd ${srcdir}/SuperTuxKart-${pkgver} + #sed -i "s|share/games|share|g" CMakeLists.txt [[ -d build ]] && rm -r build mkdir build && cd build @@ -41,16 +38,16 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/SuperTuxKart-${pkgver} cd build make DESTDIR=${pkgdir} install # fix executable location... - install -Dm755 ${pkgdir}/usr/games/supertuxkart ${pkgdir}/usr/bin/supertuxkart - rm -r ${pkgdir}/usr/games + #install -Dm755 ${pkgdir}/usr/games/supertuxkart ${pkgdir}/usr/bin/supertuxkart + #rm -r ${pkgdir}/usr/games - sed -i "s#usr/games/supertuxkart#usr/bin/supertuxkart#" ${pkgdir}/usr/share/applications/supertuxkart.desktop + #sed -i "s#usr/games/supertuxkart#usr/bin/supertuxkart#" ${pkgdir}/usr/share/applications/supertuxkart.desktop } # vim:set ts=2 sw=2 et: diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD index ae4d65460..211f56533 100644 --- a/community/udevil/PKGBUILD +++ b/community/udevil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80589 2012-11-26 14:58:37Z bpiotrowski $ +# $Id: PKGBUILD 81184 2012-12-12 20:04:46Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ pkgname=udevil pkgver=0.3.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc='Mount and unmount without password' url='http://ignorantguru.github.com/udevil/' @@ -17,7 +17,6 @@ optdepends=('nfs-utils: mount nfs shares' 'cifs-utils: mount samba shares' 'eject: eject via devmon' 'zenity: devmon popups' - 'pmount: devmon mount without suid udevil' 'udisks: devmon mount without suid udevil' 'udisks2: devmon mount without suid udevil') provides=('devmon') diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 97a596b82..5de0ed500 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172015 2012-11-26 14:36:27Z giovanni $ +# $Id: PKGBUILD 173201 2012-12-13 00:53:58Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Andrew Simmons # Contributor: György Balló pkgname=gparted -pkgver=0.14.0 -pkgrel=3 +pkgver=0.14.1 +pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64') url="http://gparted.sourceforge.net" @@ -24,7 +24,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions' install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy') -md5sums=('fc3507479e930967a2049c533907384d' +md5sums=('1ffe859c70e102a776dffb1ff0a2164a' '27c264cfad8fa413d75954dda7a2dd50') build() { diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index d8e173d35..335e5ee3d 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165837 2012-08-31 19:58:16Z giovanni $ +# $Id: PKGBUILD 173203 2012-12-13 02:36:19Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Paul Mattal pkgname=help2man -pkgver=1.40.12 +pkgver=1.40.13 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('perl-locale-gettext') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('6a37675ce2b0897cd8c6c19106e510a3') +md5sums=('ecbc98f1f146e404e85d7bef520b34d8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD index 93b4db608..509980f30 100644 --- a/extra/htop/PKGBUILD +++ b/extra/htop/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 170397 2012-11-07 01:25:17Z dreisner $ +# $Id: PKGBUILD 173197 2012-12-12 17:29:21Z heftig $ # Maintainer: Angel Velasquez # Contributor: Eric Belanger # Contributor: Daniel J Griffiths pkgname=htop pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Interactive process viewer" arch=('i686' 'x86_64') url="http://htop.sourceforge.net/" @@ -15,8 +15,10 @@ makedepends=('python2') optdepends=('lsof: show files opened by a process' 'strace: attach to a running process') options=('!emptydirs') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('0d01cca8df3349c74569cefebbd9919e') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + tree-crash.patch) +md5sums=('0d01cca8df3349c74569cefebbd9919e' + '48eba3c0303bfd19d761b859bc69d713') build() { cd "$pkgname-$pkgver" @@ -24,6 +26,10 @@ build() { sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure sed -i 's|python|python2|' scripts/MakeHeader.py + # Boost field buffer size - crashes when trying to draw very deep UTF-8 trees + # Test by nesting 30 shells + patch -N -i ../tree-crash.patch + ./configure \ --prefix=/usr \ --enable-unicode \ diff --git a/extra/htop/tree-crash.patch b/extra/htop/tree-crash.patch new file mode 100644 index 000000000..b949e262d --- /dev/null +++ b/extra/htop/tree-crash.patch @@ -0,0 +1,13 @@ +Index: Process.c +=================================================================== +--- Process.c (revision 302) ++++ Process.c (working copy) +@@ -371,7 +371,7 @@ + } + + static void Process_writeField(Process* this, RichString* str, ProcessField field) { +- char buffer[128]; buffer[127] = '\0'; ++ char buffer[256]; buffer[255] = '\0'; + int attr = CRT_colors[DEFAULT_COLOR]; + int baseattr = CRT_colors[PROCESS_BASENAME]; + int n = sizeof(buffer) - 1; diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 7d5e3f18c..4b3e63a6f 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170371 2012-11-06 17:48:48Z giovanni $ +# $Id: PKGBUILD 173199 2012-12-13 00:42:44Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=2.4 +pkgver=2.4.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('c1fc9bec6951dd3c913092c3c72da014' +md5sums=('31b328679951158a05f22c3323644b51' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 8d548ad5d..526271f38 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167980 2012-10-04 16:11:02Z giovanni $ +# $Id: PKGBUILD 173205 2012-12-13 02:46:32Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.49 +pkgver=1.50 pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('9e05acd6773ff5e94c5a1dcd7c0ec4a7') +md5sums=('5e239c5aae70dece79fcd6a4307fc53e') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD index b5000d64f..94c7bc9ec 100644 --- a/extra/swt/PKGBUILD +++ b/extra/swt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168613 2012-10-13 11:49:41Z andyrtr $ +# $Id: PKGBUILD 173193 2012-12-12 16:57:29Z guillaume $ # Maintainer: Guillaume ALAUX pkgname=swt -pkgver=4.2 -pkgrel=2 -_date=201206081400 +pkgver=4.2.1 +pkgrel=1 +_date=201209141800 pkgdesc="An open source widget toolkit for Java" arch=('i686' 'x86_64') url="http://www.eclipse.org/swt/" @@ -13,13 +13,13 @@ optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit') makedepends=('java-environment' 'libxtst' 'mesa' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') if [ "${CARCH}" = "i686" ]; then _carch=x86 - md5sums=('3efe0404f6129183abae46f7620fe14f' - '2f556ab534fc2488c6e8c0ee6c02825c') + sha256sums=('6198cd749ec25303a8c3a044e7680d643209862d2947f9efdda20bf7467575ba' + '6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923') fi if [ "${CARCH}" = "x86_64" ]; then _carch=x86_64 - md5sums=('9e06b576116ff409f395571603582827' - '2f556ab534fc2488c6e8c0ee6c02825c') + sha256sums=('e89e330df24ca72c57a381e81590293ce3f475d855258183179436bd5dcd85c8' + '6bb48007a95e3d8c6b577cc9cc4b61a51ce928b04f4fcd393cf72f8f727fe923') fi source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip build-swt.xml) -- cgit v1.2.3-54-g00ecf