diff options
Diffstat (limited to 'community')
50 files changed, 1318 insertions, 262 deletions
diff --git a/community/atanks/PKGBUILD b/community/atanks/PKGBUILD index 1e27f67ec..7cf9b9c64 100644 --- a/community/atanks/PKGBUILD +++ b/community/atanks/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76226 2012-09-14 12:01:49Z spupykin $ +# $Id: PKGBUILD 81091 2012-12-11 19:04:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com> # Contributor: Charlie Cox <ccoxiv@yahoo.com> pkgname=atanks -pkgver=5.5 +pkgver=5.7 pkgrel=1 pkgdesc="Atomic Tanks" url="http://atanks.sourceforge.net" @@ -13,7 +13,7 @@ arch=('i686' 'x86_64') makedepends=('sed') depends=('allegro4>=4.4.0.1' 'gcc-libs') source=("http://downloads.sourceforge.net/project/atanks/atanks/atanks-${pkgver}/atanks-${pkgver}.tar.gz") -md5sums=('1ba5a8bae3e7e49a0fdb7d21a480e70d') +md5sums=('135f8cb55e99a4a7b34996f260a9de6a') build() { cd atanks-${pkgver} diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD index fc03070bb..873b1483d 100644 --- a/community/awesome/PKGBUILD +++ b/community/awesome/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73742 2012-07-15 11:16:56Z seblu $ +# $Id: PKGBUILD 81099 2012-12-12 00:47:25Z eric $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Ronald van Haren <ronald.archlinux.org> @@ -6,7 +6,7 @@ pkgname=awesome pkgver=3.4.13 -pkgrel=1 +pkgrel=2 pkgdesc='Highly configurable framework window manager' arch=('i686' 'x86_64') url='http://awesome.naquadah.org/' @@ -17,7 +17,7 @@ depends=( 'imlib2' 'libev' 'libxdg-basedir' - 'lua' + 'lua51' 'pango' 'startup-notification' 'xcb-util-image' @@ -32,12 +32,14 @@ makedepends=( 'doxygen' 'gperf' 'imagemagick' - 'luadoc' + 'lua51-doc' 'xmlto' ) optdepends=( 'rlwrap: readline support for awesome-client' 'feh: image background setter for awsetbg' + 'dex: autostart your desktop files' + 'vicious: widgets for the Awesome window manager' ) provides=('notification-daemon') source=("$url/download/$pkgname-$pkgver.tar.xz" diff --git a/community/btanks/PKGBUILD b/community/btanks/PKGBUILD index 530c3bd98..838429b61 100644 --- a/community/btanks/PKGBUILD +++ b/community/btanks/PKGBUILD @@ -1,32 +1,38 @@ -# $Id: PKGBUILD 59272 2011-11-22 09:39:15Z spupykin $ +# $Id: PKGBUILD 81100 2012-12-12 00:47:26Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Nick B <Shirakawasuna at gmail _dot_ com> pkgname=btanks pkgver=0.9.8083 -pkgrel=3 +pkgrel=4 pkgdesc="Fast 2d tank arcade game with multiplayer and split-screen modes." arch=('i686' 'x86_64') url="http://btanks.sourceforge.net" license=('GPL') depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image' - 'smpeg' "btanks-data=$pkgver") + 'smpeg' 'glu' "btanks-data=$pkgver") makedepends=('scons' 'chrpath' 'mesa') source=(http://downloads.sourceforge.net/btanks/btanks-$pkgver.tar.bz2 btanks_desktop btanks_script bted_script - gcc-4.6.patch) + gcc-4.6.patch + lua52.patch) install=btanks.install md5sums=('49cb95c0eec47d3436c4fdf65e7c9d12' 'a2ddeb1e79dff8d3fd702984c8d3aab5' '07657cfa71b1de1d008cc5e3ade9749b' '91a61c0f581ea27281bdaecb7a3cd58b' - '173f0ffe46bb1bab2c8aa240fe5331f3') + 'b816c5f3ae2d6cd954c15569d4baf123' + 'e7af4af59255166bee530cbabd953226') build() { cd $srcdir/$pkgname-$pkgver + + sed -i '1,1i#include <sys/types.h>' mrt/base_file.h patch -p1 <$srcdir/gcc-4.6.patch + patch -p1 <$srcdir/lua52.patch + python2 engine/sl08/sl08.py >engine/sl08/sl08.h scons diff --git a/community/btanks/gcc-4.6.patch b/community/btanks/gcc-4.6.patch index d371abd53..c944378fd 100644 --- a/community/btanks/gcc-4.6.patch +++ b/community/btanks/gcc-4.6.patch @@ -1,10 +1,7 @@ -From: Ansgar Burchardt <ansgar@debian.org> -Bug-Debian: http://bugs.debian.org/624916 -Subject: Fix FTBFS with gcc-4.6 - ---- btanks-0.9.8083.orig/engine/sl08/sl08.py -+++ btanks-0.9.8083/engine/sl08/sl08.py -@@ -152,8 +152,8 @@ class Generator(object): +diff -wbBur btanks-0.9.8083/engine/sl08/sl08.py btanks-0.9.8083.my/engine/sl08/sl08.py +--- btanks-0.9.8083/engine/sl08/sl08.py 2008-08-13 13:10:45.000000000 +0400 ++++ btanks-0.9.8083.my/engine/sl08/sl08.py 2012-11-15 18:04:44.002524495 +0400 +@@ -152,11 +152,11 @@ typedef base_signalXXX %s signal_type; typedef return_type (object_type::*func_t) %s; @@ -14,8 +11,23 @@ Subject: Fix FTBFS with gcc-4.6 + inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {} inline void assign(object_type *o, func_t f) { object = o; func = f; } - inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } -@@ -187,7 +187,7 @@ class Generator(object): +- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } ++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; base_slotXXX%s::connect(signal_ref); } + + inline return_type operator() %s const { + return (object->*func) %s ; +@@ -175,7 +175,9 @@ + self.template_declaration('slot'), + self.template_parameters('base-slot'), + self.template_parameters('base-slot'), +- self.prototype(True), self.prototype(True), self.prototype(False), ++ self.prototype(True), ++ self.template_parameters('base-signal'), ++ self.prototype(True), self.prototype(False), + ) + + #specialized version of the slot +@@ -187,10 +189,10 @@ typedef base_signalXXX %s signal_type; typedef void (object_type::*func_t) %s ; @@ -23,4 +35,36 @@ Subject: Fix FTBFS with gcc-4.6 + inline slotXXX () : object(0), func(0) {} inline slotXXX (object_type *object, func_t func) : object(object), func(func) {} inline void assign(object_type *o, func_t f) { object = o; func = f; } - inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } +- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } ++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; base_slotXXX%s::connect(signal_ref); } + + inline void operator() %s const { + (object->*func) %s; +@@ -206,6 +208,7 @@ + self.template_parameters('base-slot', True), + self.template_parameters('base-slot', True), + self.prototype(True), ++ self.template_parameters('base-slot', True), + self.prototype(True), + self.prototype(False), + ) +diff -wbBur btanks-0.9.8083/math/range_list.h btanks-0.9.8083.my/math/range_list.h +--- btanks-0.9.8083/math/range_list.h 2008-10-24 18:15:55.000000000 +0400 ++++ btanks-0.9.8083.my/math/range_list.h 2012-11-15 18:11:52.049236706 +0400 +@@ -53,14 +53,14 @@ + return; + } + +- typename parent_type::iterator i = lower_bound(value); ++ typename parent_type::iterator i = std::map<const T, T>::lower_bound(value); + if (i != parent_type::end()) { + if (i->first == value) + return; + + if (value + 1 == i->first) { + T e = i->second; +- erase(i); ++ std::map<const T, T>::erase(i); + i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning + i = pack_left(i); + } diff --git a/community/btanks/lua52.patch b/community/btanks/lua52.patch new file mode 100644 index 000000000..e27d5fdb7 --- /dev/null +++ b/community/btanks/lua52.patch @@ -0,0 +1,21 @@ +diff -wbBur btanks-0.9.8083/engine/luaxx/state.cpp btanks-0.9.8083.my/engine/luaxx/state.cpp +--- btanks-0.9.8083/engine/luaxx/state.cpp 2008-06-08 13:02:39.000000000 +0400 ++++ btanks-0.9.8083.my/engine/luaxx/state.cpp 2012-11-15 18:59:07.000000000 +0400 +@@ -59,7 +59,7 @@ + void State::load(const std::string &fname, const mrt::Chunk &data) { + //throw_ex(("implement me[%s]", fname.c_str())); + reader_state x(data); +- int err = lua_load(state, chunk_reader, &x, fname.c_str()); ++ int err = lua_load(state, chunk_reader, &x, fname.c_str(), NULL); + check_error(state, err); + } + +@@ -81,7 +81,7 @@ + assert(state == NULL); + + //state = lua_newstate(l_alloc, this); +- state = lua_open(); ++ state = luaL_newstate(); + if (state == NULL) + throw_ex(("cannot create lua interpreter")); + diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 29ef0d959..69d0f79b9 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79010 2012-10-29 03:17:07Z svenstaro $ +# $Id: PKGBUILD 81101 2012-12-12 00:47:27Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -7,17 +7,17 @@ pkgbase=cegui pkgname=('cegui' 'cegui-docs') pkgver=0.7.7 -pkgrel=3 +pkgrel=4 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" #options=('!libtool') license=("MIT") -depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') -makedepends=('python2' 'doxygen' 'ogre' 'irrlicht' 'gtk2' 'boost' 'graphviz') +depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua51' 'silly') +makedepends=('python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz') optdepends=("python2: python bindings" - "ogre: ogre module" - "irrlicht: irrlicht module") + "ogre: ogre module") + #"irrlicht: irrlicht module") maybe again at some point options=(!libtool) source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) md5sums=('8b83577f86eaa1581765dd155c7c8f24') diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD index e6dbde9c8..732ed1e12 100644 --- a/community/cgminer/PKGBUILD +++ b/community/cgminer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81029 2012-12-10 12:02:49Z fyan $ +# $Id: PKGBUILD 81049 2012-12-11 07:09:49Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer pkgver=2.10.0 _build= -pkgrel=1 +pkgrel=2 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer." url='http://forum.bitcoin.org/index.php?topic=28402.0' license=('GPL3') @@ -53,4 +53,4 @@ package() { md5sums=('93437f0a26a409d9c06f7361befe9d0f' 'fe4a243fabe24608f5c05e40f0f118f6' 'ee39698273671fee0e98d4af16014c36' - 'c2bb974adf92cc234fbf0136ebcb355d') + 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/community/cgminer/cgminer.service b/community/cgminer/cgminer.service index 9d6595047..84461879f 100644 --- a/community/cgminer/cgminer.service +++ b/community/cgminer/cgminer.service @@ -2,7 +2,7 @@ Description=Multi-threaded multi-pool CPU and GPU miner for bitcoin [Service] -ExecStart=/usr/bin/cgminer -T --config /etc/cgminer.conf +ExecStart=/usr/bin/cgminer -T --config /etc/cgminer.conf --syslog [Install] WantedBy=multi-user.target diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 9c1689761..5cef5fb09 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80581 2012-11-26 09:25:03Z spupykin $ +# $Id: PKGBUILD 81093 2012-12-11 19:04:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.1 +pkgver=1.1.1 _pkgver=1.1 pkgrel=1 pkgdesc="Utility to organize and develop raw images" @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) -md5sums=('1b399636a0386f2167521a0d30c29032') +md5sums=('735b9c42f4a4c93a482a195800002b10') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index 719e1926e..28b4c2b78 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 74059 2012-07-19 05:01:20Z ebelanger $ +# $Id: PKGBUILD 81103 2012-12-12 00:47:29Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b33 -pkgrel=3 +pkgrel=4 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64') url="http://community.electricsheep.org/" license=('GPL') -depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua' 'libgtop' 'boost-libs' 'freeglut' 'glee') -makedepends=('boost' 'tinyxml') +depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee') +makedepends=('boost' 'mesa' 'glu' 'tinyxml') optdepends=('xscreensaver: to use electricsheep with xscreensaver') options=('!emptydirs') source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) @@ -40,7 +40,8 @@ build() { sed -i '12 i\ #include <cstdio>' Common/Singleton.h ./autogen.sh - ./configure --prefix=/usr + CPPFLAGS+="-I/usr/include/lua5.1" ./configure --prefix=/usr + sed -i 's|-I /usr/include/libavutil||' MSVC/SettingsGUI/Makefile make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1" } diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD index 3ed1b04bf..6b6f6cd7a 100644 --- a/community/elinks/PKGBUILD +++ b/community/elinks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72041 2012-06-06 18:55:27Z kkeen $ +# $Id: PKGBUILD 81104 2012-12-12 00:47:30Z eric $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -8,12 +8,12 @@ pkgname=elinks pkgver=0.13 _commit="9313aae9062e1d9ff084858fa6844259cd8237d6" -pkgrel=10 +pkgrel=11 pkgdesc="An advanced and well-established feature-rich text mode web browser." arch=("i686" "x86_64") url="http://elinks.or.cz" license=('GPL') -depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua>=5.1.1' 'libidn' 'js' +depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js' 'gc' 'tre') makedepends=('git') source=() diff --git a/community/fcitx-hangul/PKGBUILD b/community/fcitx-hangul/PKGBUILD index d0732f8ff..9cadde6a5 100644 --- a/community/fcitx-hangul/PKGBUILD +++ b/community/fcitx-hangul/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 80966 2012-12-08 01:28:14Z fyan $ +# $Id: PKGBUILD 81140 2012-12-12 01:20:35Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-hangul -pkgver=0.1.2 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="Hangul (Korean) support for fcitx" arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" license=('GPL2') -depends=('fcitx>=4.2.2' 'libhangul') +depends=('fcitx>=4.2.3' 'libhangul') makedepends=('cmake' 'intltool') -install="$pkgname.install" +install=$pkgname.install source=("http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz") -sha1sums=('30648e569ea75e2a734ed98f8cc90b0a656a6bf5') build() { cd "$srcdir/$pkgname-$pkgver" @@ -33,3 +32,4 @@ package() { } +md5sums=('168b51487797879cf41ed6f6d086694a') diff --git a/community/fillets-ng/PKGBUILD b/community/fillets-ng/PKGBUILD index 9e4741e72..33688a017 100644 --- a/community/fillets-ng/PKGBUILD +++ b/community/fillets-ng/PKGBUILD @@ -1,39 +1,41 @@ -# $Id: PKGBUILD 65307 2012-02-20 20:47:47Z jlichtblau $ +# $Id: PKGBUILD 81105 2012-12-12 00:47:31Z eric $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=fillets-ng pkgver=1.0.1 -pkgrel=1 -pkgdesc="A port of the wonderful puzzle game Fish Fillets" +pkgrel=3 +pkgdesc="Port of the wonderful puzzle game Fish Fillets" url="http://fillets.sf.net/" arch=('i686' 'x86_64') license=('GPL') -depends=('fillets-ng-data' 'lua' 'fribidi' 'gcc-libs' 'libx11' 'sdl_mixer' 'sdl_ttf' 'sdl_image' 'desktop-file-utils') +depends=('fillets-ng-data' 'lua51' 'fribidi' 'gcc-libs' 'libx11' 'sdl_mixer' 'sdl_ttf' 'sdl_image' 'desktop-file-utils') +makedepends=('gendesk') install=$pkgname.install changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/fillets/$pkgname-$pkgver.tar.gz \ - http://fillets.sourceforge.net/img/icon.png \ - $pkgname.desktop) +source=("http://downloads.sourceforge.net/fillets/$pkgname-$pkgver.tar.gz" + "$pkgname.png::http://img.1mobile.com/market/i/4/9/49ec5e5520844b66c189c7e0ef6eedfc.png" + 'lua-config') sha256sums=('329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da' - 'dec9d93c33b8e0f039e14228aad6be142109b0689bd216bcda2d91265500e2a0' - '6283237a582c90cb9734ee420e79cfccaa5c8c35aae9a19000202ceb96ad3254') + '338c9e1b8ac4ef5bb167f4a6090c341897bd2c7f8b4e5afc3ac3131a57bb8c88' + '849fb1410387dc7df0617e12a9472cfbe3b1179600011c0365f9099ff5af6214') build() { - cd ${srcdir}/$pkgname-$pkgver - + gendesk + export PATH=$PATH:$PWD + chmod a+rx lua-config + cd $pkgname-$pkgver ./configure --prefix=/usr --datadir=/usr/share/$pkgname make } package() { - cd ${srcdir}/$pkgname-$pkgver - - make DESTDIR=${pkgdir} install + cd $pkgname-$pkgver -#.desktop and icon files - install -D -m644 ${srcdir}/icon.png \ - ${pkgdir}/usr/share/pixmaps/$pkgname.png - install -D -m644 ${srcdir}/$pkgname.desktop \ - ${pkgdir}/usr/share/applications/$pkgname.desktop + make DESTDIR="${pkgdir}" install + # desktop and icon files + install -D -m644 "${srcdir}/$pkgname.png" \ + "${pkgdir}/usr/share/pixmaps/$pkgname.png" + install -D -m644 "${srcdir}/$pkgname.desktop" \ + "${pkgdir}/usr/share/applications/$pkgname.desktop" } diff --git a/community/fillets-ng/lua-config b/community/fillets-ng/lua-config new file mode 100644 index 000000000..ef9b96b71 --- /dev/null +++ b/community/fillets-ng/lua-config @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ $1 == --include ]]; then + pkg-config --cflags lua5.1 + exit 0 +elif [[ $1 == --static ]]; then + pkg-config --libs lua5.1 +fi + +exit 1 diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index c97fc866f..1c03c88b3 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79259 2012-11-01 23:43:48Z arodseth $ +# $Id: PKGBUILD 81106 2012-12-12 00:47:32Z eric $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera @@ -6,7 +6,7 @@ pkgname=geany-plugins pkgver=1.22 -pkgrel=3 +pkgrel=4 pkgdesc='Combined plugins release for Geany' arch=('x86_64' 'i686') url='http://plugins.geany.org/' @@ -22,7 +22,7 @@ sha256sums=('a0dcf0cb00ac260670ef8fae682aade60c7c3075c88121fd21f3aecdff84e1ce') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --libexecdir=/usr/lib + ./configure --prefix=/usr --libexecdir=/usr/lib --disable-geanylua make } diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD index 698ac86bd..54107a1e3 100644 --- a/community/grafx2/PKGBUILD +++ b/community/grafx2/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 77732 2012-10-14 01:28:09Z arodseth $ +# $Id: PKGBUILD 81107 2012-12-12 00:47:33Z eric $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Simon Parzer <simon.parzer@gmail.com> pkgname=grafx2 pkgver=2.4 -pkgrel=1 -_pkgrev=2027 +pkgrel=2 +_pkgrev=2035 pkgdesc='Pixelart-oriented painting program' arch=('x86_64' 'i686') url='http://code.google.com/p/grafx2/' license=('GPL2') install=grafx2.install -depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils') +depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils' 'gtk-update-icon-cache') makedepends=('gendesk' 'setconf') options=('!emptydirs') source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.$_pkgrev-src.tgz") -sha256sums=('97088d07f1bcd668c619da9f1efe7c5782da707306c90c05564df91f51afe9d7') +sha256sums=('5818caea63cd3cf3318baf01dd20f81ec61e4514443000c80a41b68ab3f17a6b') _name=('GrafX2') _exec=('grafx2 %U') _genericname=('Drawing program') diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 51668779b..5b28b10c8 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 79325 2012-11-02 19:21:48Z spupykin $ +# $Id: PKGBUILD 81108 2012-12-12 00:47:34Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.18 -pkgrel=3 +pkgrel=4 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64') url="http://hedgewars.org" license=('GPL' 'custom') -depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua') +depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51') makedepends=('fpc' 'cmake' # haskell specific 'ghc' @@ -25,6 +25,7 @@ md5sums=('02465736fdcf48feea1cacaa0aa5960e' build() { cd $pkgname-src-$pkgver sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs +# sed -i 's|lua51 lua5.1 lua-5.1|lua lua51 lua5.1 lua-5.1|g' cmake_modules/FindLua.cmake cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATA_INSTALL_DIR=/usr/share \ diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 4548d4343..1d46f082a 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 77163 2012-10-06 07:36:47Z bluewind $ +# $Id: PKGBUILD 81109 2012-12-12 00:47:35Z eric $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) pkgver=3.12 -pkgrel=1 +pkgrel=2 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64') -makedepends=(qt lua boost) -source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2) -md5sums=('4b3f01e86a6b3fa25f3c4905a9cd63c7') +makedepends=(qt lua51 boost) +source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc}) +md5sums=('4b3f01e86a6b3fa25f3c4905a9cd63c7' + 'b784cd3f264a0f281da36f26c0c7f2c2') build() { cd "$srcdir/$pkgbase-$pkgver" + sed -i 's#pkg-config --cflags lua#pkg-config --cflags lua5.1#' src/makefile + sed -i 's#pkg-config --libs lua#pkg-config --libs lua5.1#' src/makefile + sed -i 's#lua#lua5.1#g' src/gui-qt/highlight.pro + make make gui } diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD index cdca22018..f43c3f0a5 100644 --- a/community/ibus-pinyin/PKGBUILD +++ b/community/ibus-pinyin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79511 2012-11-06 12:01:15Z arodseth $ +# $Id: PKGBUILD 81110 2012-12-12 00:47:35Z eric $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.maRS<leemars at gmail.com> @@ -7,12 +7,12 @@ pkgname=ibus-pinyin pkgver=1.4.99.20120808 -pkgrel=1 +pkgrel=2 pkgdesc='Pinyin (Chinese) input method for the IBus framework' arch=('i686' 'x86_64') license=('GPL') url='http://ibus.googlecode.com' -depends=('ibus' 'pyzy' 'lua') +depends=('ibus' 'pyzy' 'lua51') makedepends=('intltool') source=("https://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") sha1sums=('aa298212d9f63acab48cf9f6370c94cdc6920c2a') diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD index 5cc378466..9a132bcea 100644 --- a/community/instead/PKGBUILD +++ b/community/instead/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76494 2012-09-19 14:03:04Z spupykin $ +# $Id: PKGBUILD 81111 2012-12-12 00:47:36Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Peter Kosyh <p.kosyhgmail.com> pkgname=instead -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="instead quest interpreter" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua') optdepends=('instead-launcher: install and update INSTEAD games from net') source=(http://instead.googlecode.com/files/instead_${pkgver}.tar.gz) -md5sums=('08acf9f7de60b8e1c23d6e9368093d1f') +md5sums=('a26dd0b2785787639dd1bbfed66af77a') build() { cd "${srcdir}/instead-${pkgver}" diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD index 38e8a455b..0d67dc101 100644 --- a/community/lua-zlib/PKGBUILD +++ b/community/lua-zlib/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66222 2012-02-23 03:34:22Z spupykin $ +# $Id: PKGBUILD 81123 2012-12-12 00:49:35Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=lua-zlib pkgver=0.2 -pkgrel=2 +pkgrel=3 _gitver=8d07669 -_luaver=5.1 +_luaver=5.2 url="http://github.com/brimworks/lua-zlib" pkgdesc='Simple streaming interface to zlib for Lua.' arch=('i686' 'x86_64') @@ -14,17 +14,17 @@ depends=('lua' 'zlib') makedepends=('cmake') conflicts=('lua-lzlib') source=("lua-zlib-$pkgver.zip::https://github.com/brimworks/lua-zlib/zipball/v$pkgver") -md5sums=('d7ca7d12b6e50e3ec4c2057f65ca87d1') +md5sums=('28ce556fccb2d364bc5392f63c6f89ee') build() { - cd $srcdir/brimworks-lua-zlib-${_gitver} - sed -i "s#share/lua/cmod#lib/lua/${_luaver}#" CMakeLists.txt - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr . + cd $srcdir/brimworks-lua-zlib-${_gitver} + sed -i "s#share/lua/cmod#lib/lua/${_luaver}#" CMakeLists.txt + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr . } package() { - cd $srcdir/brimworks-lua-zlib-${_gitver} - make DESTDIR="$pkgdir" install - install -D -m644 "README" "$pkgdir/usr/share/licenses/lua-zlib/README" + cd $srcdir/brimworks-lua-zlib-${_gitver} + make DESTDIR="$pkgdir" install + install -D -m644 "README" "$pkgdir/usr/share/licenses/lua-zlib/README" } diff --git a/community/luabitop/PKGBUILD b/community/luabitop/PKGBUILD index 9e8a83683..ee67163f4 100644 --- a/community/luabitop/PKGBUILD +++ b/community/luabitop/PKGBUILD @@ -1,26 +1,45 @@ -# $Id: PKGBUILD 73728 2012-07-14 17:39:06Z seblu $ +# $Id: PKGBUILD 81112 2012-12-12 00:47:37Z eric $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Lucas Hermann Negri <kkndrox@gmail.com> -pkgname=luabitop +pkgbase=luabitop +pkgname=(lua-bitop lua51-bitop) pkgver=1.0.2 pkgrel=1 pkgdesc='C extension adding bitwise operations on numbers' arch=(i686 x86_64) url='http://bitop.luajit.org/index.html' -depends=('lua') +makedepends=('lua' 'lua51') +conflicts=('luabitop') +replaces=('luabitop') source=("http://bitop.luajit.org/download/LuaBitOp-$pkgver.tar.gz") md5sums=('d0c1080fe0c844e8477279668e2d0d06') license=('MIT') build() { + cp -a LuaBitOp-$pkgver LuaBitOp51-$pkgver + msg2 'Building with lua 5.2' cd LuaBitOp-$pkgver - make + make INCLUDES=' -I/usr/include' LUA='lua' + msg2 'Building with lua 5.1' + cd ../LuaBitOp51-$pkgver + make INCLUDES=' -I/usr/include/lua5.1' LUA='lua5.1' } -package() { +package_lua-bitop() { + depends=('lua') cd LuaBitOp-$pkgver + install -Dm 644 bit.so "$pkgdir/usr/lib/lua/5.2/bit.so" + install -dm 755 "$pkgdir/usr/share/licenses/$pkgname" + ln -s '../lua/COPYRIGHT' "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" +} + +package_lua51-bitop() { + depends=('lua51') + cd LuaBitOp51-$pkgver install -Dm 644 bit.so "$pkgdir/usr/lib/lua/5.1/bit.so" + install -dm 755 "$pkgdir/usr/share/licenses/$pkgname" + ln -s '../lua51/COPYRIGHT' "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" } # vim:set ts=2 sw=2 et: diff --git a/community/luaexpat/PKGBUILD b/community/luaexpat/PKGBUILD index 4b5663271..b46e7bc75 100644 --- a/community/luaexpat/PKGBUILD +++ b/community/luaexpat/PKGBUILD @@ -1,30 +1,36 @@ -# $Id: PKGBUILD 66195 2012-02-23 03:06:28Z spupykin $ +# $Id: PKGBUILD 81114 2012-12-12 00:47:39Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Lucas Hermann Negri <kkndrox@gmail.com> -pkgname=luaexpat +pkgbase=luaexpat +pkgname=(lua-expat) pkgver=1.2.0 -pkgrel=2 -pkgdesc='LuaExpat is a SAX XML parser based on the Expat library. LuaExpat is free software and uses the same license as Lua 5.0.' +pkgrel=1 +pkgdesc='SAX XML parser based on the Expat library' arch=('i686' 'x86_64') url='http://code.matthewwild.co.uk/lua-expat' license=('MIT') -makedepends=('gcc' 'lua>=5.1' 'expat>=2') -depends=('lua' 'expat') +makedepends=('gcc' 'lua' 'expat>=2') +replaces=(luaexpat) +conflicts=(luaexpat) source=("http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz" - 'newconfig') + 'newconfig' + 'lua52.patch') md5sums=('03efe50c7f30a34580701e6527d7bfee' - 'b89a09379d3e46e6496255e44cecc316') + '60ae0633ac6f829cc3359f3533252eb0' + '21da93cbf0d3cef80d00e2380b7c2679') build() { - cd $srcdir/ - mv newconfig $pkgname-$pkgver/config - cd $pkgname-$pkgver + cd $pkgbase-$pkgver + patch -p1 < "$srcdir/lua52.patch" + cp -L "$srcdir/newconfig" config make } -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - mv usr $pkgdir +package_lua-expat() { + depends=('lua' 'expat') + cd $pkgbase-$pkgver + 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/lua52.patch b/community/luaexpat/lua52.patch new file mode 100644 index 000000000..8b418e3a7 --- /dev/null +++ b/community/luaexpat/lua52.patch @@ -0,0 +1,372 @@ +diff -wbBur luaexpat-1.2.0/config lua-expat-b4e6b167e020/config +--- luaexpat-1.2.0/config 2011-06-03 18:17:04.000000000 +0400 ++++ lua-expat-b4e6b167e020/config 2012-07-28 04:59:45.000000000 +0400 +@@ -17,8 +17,7 @@ + # (according to Lua 5.1 definition: + # first version digit * 100 + second version digit + # e.g. Lua 5.0.2 => 500, Lua 5.1 => 501, Lua 5.1.1 => 501) +-LUA_VERSION_NUM= 500 +-COMPAT_DIR= ../compat/src ++LUA_VERSION_NUM= 502 + + # Compilation parameters + CWARNS = -Wall -pedantic \ +@@ -31,6 +30,6 @@ + -Wshadow \ + -Wwrite-strings + +-CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \ +- -I$(COMPAT_DIR) -I$(EXPAT_INC) ++CFLAGS = $(CWARNS) -ansi -O2 -fPIC -I$(LUA_INC) \ ++ -I$(EXPAT_INC) + CC = gcc +diff -wbBur luaexpat-1.2.0/.hg_archival.txt lua-expat-b4e6b167e020/.hg_archival.txt +--- luaexpat-1.2.0/.hg_archival.txt 2011-06-03 18:17:04.000000000 +0400 ++++ lua-expat-b4e6b167e020/.hg_archival.txt 2012-07-28 04:59:45.000000000 +0400 +@@ -1,4 +1,5 @@ + repo: 24d141cb2d1e66a1bb42b445f049fcc037972f2b +-node: 30c2491fe44a485caf2dd24643052670c91b91e3 ++node: b4e6b167e020ba1bd9402acd0a142ef6e91d912a + branch: default +-tag: 1.2.0 ++latesttag: 1.2.0 ++latesttagdistance: 7 +diff -wbBur luaexpat-1.2.0/makefile lua-expat-b4e6b167e020/makefile +--- luaexpat-1.2.0/makefile 2011-06-03 18:17:04.000000000 +0400 ++++ lua-expat-b4e6b167e020/makefile 2012-07-28 04:59:45.000000000 +0400 +@@ -1,22 +1,15 @@ + T= lxp +-V= 1.2.0 ++V= 1.3.0 + CONFIG= ./config + + include $(CONFIG) + +-ifeq "$(LUA_VERSION_NUM)" "500" +-COMPAT_O= $(COMPAT_DIR)/compat-5.1.o +-endif +- +-OBJS= src/lxplib.o $(COMPAT_O) ++OBJS= src/lxplib.o + lib: src/$(LIBNAME) + + src/$(LIBNAME) : $(OBJS) + export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat + +-$(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c +- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c +- + install: + mkdir -p $(LUA_LIBDIR) + cp src/$(LIBNAME) $(LUA_LIBDIR) +diff -wbBur luaexpat-1.2.0/README lua-expat-b4e6b167e020/README +--- luaexpat-1.2.0/README 2011-06-03 18:17:04.000000000 +0400 ++++ lua-expat-b4e6b167e020/README 2012-07-28 04:59:45.000000000 +0400 +@@ -47,11 +47,11 @@ + + Credits + +-Version 1.0 was designed by Roberto Ierusalimschy, André Carregal and Tomás Guisasola ++Version 1.0 was designed by Roberto Ierusalimschy, André Carregal and Tomás Guisasola + as part of the Kepler Project which holds its copyright. The implementation was coded + by Roberto Ierusalimschy, based on a previous design by Jay Carlson. + +-LuaExpat development was sponsored by Fábrica Digital and FINEP. ++LuaExpat development was sponsored by Fábrica Digital and FINEP. + + Contact + +diff -wbBur luaexpat-1.2.0/src/lxp/lom.lua lua-expat-b4e6b167e020/src/lxp/lom.lua +--- luaexpat-1.2.0/src/lxp/lom.lua 2011-06-03 18:17:04.000000000 +0400 ++++ lua-expat-b4e6b167e020/src/lxp/lom.lua 2012-07-28 04:59:45.000000000 +0400 +@@ -1,13 +1,11 @@ + -- See Copyright Notice in license.html + -- $Id: lom.lua,v 1.6 2005/06/09 19:18:40 tuler Exp $ + +-require "lxp" ++local lxp = require "lxp" + +-local tinsert, tremove, getn = table.insert, table.remove, table.getn ++local tinsert, tremove = table.insert, table.remove + local assert, type, print = assert, type, print +-local lxp = lxp + +-module ("lxp.lom") + + local function starttag (p, tag, attr) + local stack = p:getcallbacks().stack +@@ -19,14 +17,14 @@ + local stack = p:getcallbacks().stack + local element = tremove(stack) + assert(element.tag == tag) +- local level = getn(stack) ++ local level = #stack + tinsert(stack[level], element) + end + + local function text (p, txt) + local stack = p:getcallbacks().stack +- local element = stack[getn(stack)] +- local n = getn(element) ++ local element = stack[#stack] ++ local n = #element + if type(element[n]) == "string" then + element[n] = element[n] .. txt + else +@@ -34,7 +32,7 @@ + end + end + +-function parse (o) ++local function parse (o) + local c = { StartElement = starttag, + EndElement = endtag, + CharacterData = text, +@@ -47,7 +45,7 @@ + status, err = p:parse(o) + if not status then return nil, err end + else +- for l in o do ++ for l in pairs(o) do + status, err = p:parse(l) + if not status then return nil, err end + end +@@ -58,3 +56,4 @@ + return c.stack[1][1] + end + ++return { parse = parse } +diff -wbBur luaexpat-1.2.0/src/lxplib.c lua-expat-b4e6b167e020/src/lxplib.c +--- luaexpat-1.2.0/src/lxplib.c 2011-06-03 18:17:04.000000000 +0400 ++++ lua-expat-b4e6b167e020/src/lxplib.c 2012-07-28 04:59:45.000000000 +0400 +@@ -13,14 +13,16 @@ + + #include "lua.h" + #include "lauxlib.h" +-#if ! defined (LUA_VERSION_NUM) || LUA_VERSION_NUM < 501 +-#include "compat-5.1.h" +-#endif + + + #include "lxplib.h" + + ++#if !defined(lua_pushliteral) ++#define lua_pushliteral(L, s) \ ++ lua_pushstring(L, "" s, (sizeof(s)/sizeof(char))-1) ++#endif ++ + + enum XPState { + XPSpre, /* parser just initialized */ +@@ -66,7 +68,7 @@ + + + static void lxpclose (lua_State *L, lxp_userdata *xpu) { +- lua_unref(L, xpu->tableref); ++ luaL_unref(L, LUA_REGISTRYINDEX, xpu->tableref); + xpu->tableref = LUA_REFNIL; + if (xpu->parser) + XML_ParserFree(xpu->parser); +@@ -225,7 +227,7 @@ + child->parser = XML_ExternalEntityParserCreate(p, context, NULL); + if (!child->parser) + luaL_error(L, "XML_ParserCreate failed"); +- lua_getref(L, xpu->tableref); /* child uses the same table of its father */ ++ lua_rawgeti(L, LUA_REGISTRYINDEX, xpu->tableref); /*lua_getref(L, xpu->tableref); */ /* child uses the same table of its father */ + child->tableref = luaL_ref(L, LUA_REGISTRYINDEX); + lua_pushstring(L, base); + lua_pushstring(L, systemId); +@@ -449,7 +451,7 @@ + xpu->state = XPSok; + xpu->b = &b; + lua_settop(L, 2); +- lua_getref(L, xpu->tableref); /* to be used by handlers */ ++ lua_rawgeti(L, LUA_REGISTRYINDEX, xpu->tableref); /*lua_getref(L, xpu->tableref);*/ /* to be used by handlers */ + status = XML_Parse(xpu->parser, s, (int)len, s == NULL); + if (xpu->state == XPSstring) dischargestring(xpu); + if (xpu->state == XPSerror) { /* callback error? */ +@@ -517,7 +519,12 @@ + return 1; + } + +-static const struct luaL_reg lxp_meths[] = { ++#if !defined LUA_VERSION_NUM ++/* Lua 5.0 */ ++#define luaL_Reg luaL_reg ++#endif ++ ++static const struct luaL_Reg lxp_meths[] = { + {"parse", lxp_parse}, + {"close", lxp_close}, + {"__gc", parser_gc}, +@@ -530,7 +537,7 @@ + {NULL, NULL} + }; + +-static const struct luaL_reg lxp_funcs[] = { ++static const struct luaL_Reg lxp_funcs[] = { + {"new", lxp_make_parser}, + {NULL, NULL} + }; +@@ -541,19 +548,39 @@ + */ + static void set_info (lua_State *L) { + lua_pushliteral (L, "_COPYRIGHT"); +- lua_pushliteral (L, "Copyright (C) 2003-2007 Kepler Project"); ++ lua_pushliteral (L, "Copyright (C) 2003-2012 Kepler Project"); + lua_settable (L, -3); + lua_pushliteral (L, "_DESCRIPTION"); + lua_pushliteral (L, "LuaExpat is a SAX XML parser based on the Expat library"); + lua_settable (L, -3); + lua_pushliteral (L, "_VERSION"); +- lua_pushliteral (L, "LuaExpat 1.2.0"); ++ lua_pushliteral (L, "LuaExpat 1.3.0"); + lua_settable (L, -3); + } + + ++#if !defined LUA_VERSION_NUM || LUA_VERSION_NUM==501 ++/* ++** Adapted from Lua 5.2.0 ++*/ ++static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) { ++ luaL_checkstack(L, nup, "too many upvalues"); ++ for (; l->name != NULL; l++) { /* fill the table with given functions */ ++ int i; ++ for (i = 0; i < nup; i++) /* copy upvalues to the top */ ++ lua_pushvalue(L, -nup); ++ lua_pushstring(L, l->name); ++ lua_pushcclosure(L, l->func, nup); /* closure with those upvalues */ ++ lua_settable(L, -(nup + 3)); ++ } ++ lua_pop(L, nup); /* remove upvalues */ ++} ++#endif ++ ++ + int luaopen_lxp (lua_State *L) { + luaL_newmetatable(L, ParserType); ++ + lua_pushliteral(L, "__index"); + lua_pushvalue(L, -2); + lua_rawset(L, -3); +@@ -557,9 +584,12 @@ + lua_pushliteral(L, "__index"); + lua_pushvalue(L, -2); + lua_rawset(L, -3); +- luaL_openlib (L, NULL, lxp_meths, 0); +- luaL_openlib (L, "lxp", lxp_funcs, 0); +- set_info (L); + ++ luaL_setfuncs (L, lxp_meths, 0); ++ lua_pop (L, 1); /* remove metatable */ ++ ++ lua_newtable (L); ++ luaL_setfuncs (L, lxp_funcs, 0); ++ set_info (L); + return 1; + } +diff -wbBur luaexpat-1.2.0/tests/test.lua lua-expat-b4e6b167e020/tests/test.lua +--- luaexpat-1.2.0/tests/test.lua 2011-06-03 18:17:04.000000000 +0400 ++++ lua-expat-b4e6b167e020/tests/test.lua 2012-07-28 04:59:45.000000000 +0400 +@@ -2,8 +2,14 @@ + -- See Copyright Notice in license.html + -- $Id: test.lua,v 1.6 2006/06/08 20:34:52 tomas Exp $ + +-require"lxp" ++if string.find(_VERSION, " 5.0") then ++ lxp = assert(loadlib("./lxp.so", "luaopen_lxp"))() ++else ++ lxp = require"lxp" ++ gcinfo = function () return collectgarbage"count" end ++end + print (lxp._VERSION) ++assert(lxp.new, "Cannot find function lxp.new ("..tostring(lxp.new)..")") + + -- basic test with no preamble + local p = lxp.new{} +@@ -35,9 +41,9 @@ + ]> + ]] + +-local X ++X = {} ++if string.find(_VERSION, " 5.0") then + function getargs (...) X = arg end +- + function xgetargs (c) + return function (...) + table.insert(arg, 1, c) +@@ -44,6 +50,35 @@ + table.insert(X, arg) + end + end ++else ++ (loadstring or load)[[ ++ function getargs (...) ++ X = { ... } ++ X.n = select('#', ...) ++ end ++ function xgetargs (c) ++ return function (...) ++ local arg = { ... } ++ arg.n = select('#', ...) + 1 ++ table.insert(arg, 1, c) ++ table.insert(X, arg) ++ end ++ end ++ table.getn = function (t) ++ if t.n then ++ return t.n ++ else ++ local n = 0 ++ for i in pairs(t) do ++ if type(i) == "number" then ++ n = math.max(n, i) ++ end ++ end ++ return n ++ end ++ end]]() ++end ++ + + + ------------------------------- +@@ -61,7 +96,7 @@ + assert(X.n == 3 and X[1] == p and X[2] == "to") + x = X[3] + assert(x.priority=="10" and x.xu=="hi" and x.method=="POST") +-assert(x[1] == "priority" and x[2] == "xu" and table.getn(x) == 2) ++assert(x[1] == "priority" and x[2] == "xu" and table.getn(x) == 2, "x[1] == "..tostring(x[1])..", x[2] == "..tostring(x[2])..", #x == "..tostring(table.getn(x))) + assert(p:parse("</to>")) + assert(p:parse()) + p:close() +@@ -95,7 +130,7 @@ + assert(p:parse"<to>") + assert(p:parse"<![CDATA[hi]]>") + assert(table.getn(X) == 3) +-assert(X[1][1] == "s" and X[1][2] == p) ++assert(X[1][1] == "s" and X[1][2] == p, "X[1][1] == "..tostring(X[1][1])..", X[1][2] == "..tostring(X[1][2])..", p == "..tostring(p)) + assert(X[2][1] == "c" and X[2][2] == p and X[2][3] == "hi") + assert(X[3][1] == "e" and X[3][2] == p) + assert(p:parse"</to>") +@@ -220,7 +255,7 @@ + ]]) + p:close() + x = X[1] +-assert(x[1] == "sn" and x[3] == "space" and x[4] == "a/namespace" and table.getn(x) == 4) ++assert(x[1] == "sn" and x[3] == "space" and x[4] == "a/namespace" and table.getn(x) == 4, "x[1] == "..tostring(x[1])..", x[3] == "..tostring(x[3])..", x[4] == "..tostring(x[4])..", #x == "..tostring(table.getn(x))) + x = X[3] + assert(x[1] == "s" and x[3] == "a/namespace?a") + x = X[4] +@@ -316,7 +351,7 @@ + local x = gcinfo() + for i=1,100000 do + -- due to a small bug in Lua... +- if math.mod(i, 100) == 0 then collectgarbage() end ++ if (math.mod or math.fmod)(i, 100) == 0 then collectgarbage() end + lxp.new({}) + end + collectgarbage(); collectgarbage() diff --git a/community/luaexpat/newconfig b/community/luaexpat/newconfig index 095c0800e..bc5b25d8f 100644 --- a/community/luaexpat/newconfig +++ b/community/luaexpat/newconfig @@ -1,5 +1,5 @@ -LUA_LIBDIR= usr/lib/lua/5.1 -LUA_DIR= usr/share/lua/5.1 +LUA_LIBDIR= usr/lib/lua/5.2 +LUA_DIR= usr/share/lua/5.2 LUA_INC= /usr/include EXPAT_INC= /usr/include @@ -7,7 +7,7 @@ EXPAT_INC= /usr/include LIB_OPTION= -shared LIBNAME= $T.so.$V -LUA_VERSION_NUM= 512 +LUA_VERSION_NUM= 521 COMPAT_DIR= ../compat/src # Compilation parameters diff --git a/community/luafilesystem/PKGBUILD b/community/luafilesystem/PKGBUILD index fb7abe438..987da03c9 100644 --- a/community/luafilesystem/PKGBUILD +++ b/community/luafilesystem/PKGBUILD @@ -1,28 +1,46 @@ -# $Id: PKGBUILD 78389 2012-10-17 16:41:35Z bpiotrowski $ +# $Id: PKGBUILD 81115 2012-12-12 00:47:40Z eric $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> -pkgname=luafilesystem +pkgbase=luafilesystem +pkgname=(lua-filesystem lua51-filesystem) pkgver=1.6.2 pkgrel=1 pkgdesc='File System Library for the Lua Programming Language' arch=('i686' 'x86_64') url='http://www.keplerproject.org/luafilesystem/' license=('MIT') -depends=('lua') -source=(http://github.com/downloads/keplerproject/$pkgname/$pkgname-$pkgver.tar.gz +replaces=(luafilesystem) +conflicts=(luafilesystem) +makedepends=(lua lua51) +source=(http://github.com/downloads/keplerproject/$pkgbase/$pkgbase-$pkgver.tar.gz LICENSE) md5sums=('4e7ec93678c760c4e42cea7d28aafa13' 'beb2b58c4b5c2782304a5b0267a5651b') build() { - cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir/usr + msg2 "Building $pkgbase with lua 5.1" + cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51 + cd $pkgbase-$pkgver-51 + make LUA_INC=/usr/include/lua5.1 + msg2 "Building $pkgbase with lua 5.2" + cd "$srcdir/$pkgbase-$pkgver" + make } -package() { - cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir/usr install +package_lua-filesystem() { + depends=('lua') + + cd $pkgbase-$pkgver + make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.2' install + install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +package_lua51-filesystem() { + depends=('lua51') + + cd $pkgbase-$pkgver-51 + make PREFIX=$pkgdir/usr LUA_LIBDIR='$(PREFIX)/lib/lua/5.1' install install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD index 330586843..a5a049dce 100644 --- a/community/luajit/PKGBUILD +++ b/community/luajit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79833 2012-11-13 17:51:21Z bpiotrowski $ +# $Id: PKGBUILD 81136 2012-12-12 00:57:15Z eric $ # Maintainer: Chris Brannon <chris@the-brannons.com> # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Paulo Matias <matiasΘarchlinux-br·org> @@ -6,7 +6,7 @@ pkgname=luajit pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc='A Just-In-Time Compiler for Lua' arch=('i686' 'x86_64') url='http://luajit.org/' diff --git a/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch b/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch index 0e5a9d1a2..8cccb88c1 100644 --- a/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch +++ b/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch @@ -4,7 +4,7 @@ Date: Thu, 12 Apr 2012 16:43:41 +0200 Subject: [PATCH] Don't mark desktop file as executable. --- - Makefile | 2 +- + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile @@ -12,13 +12,13 @@ index be1567b..50973d6 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ install: - install -d $(DESTDIR)/usr/share/pixmaps - install extras/luakit.png $(DESTDIR)/usr/share/pixmaps/ - install -d $(DESTDIR)/usr/share/applications -- install extras/luakit.desktop $(DESTDIR)/usr/share/applications/ -+ install -m0644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/ - install -d $(MANPREFIX)/man1/ - install -m644 luakit.1 $(MANPREFIX)/man1/ + install -d $(DESTDIR)/usr/share/pixmaps + install extras/luakit.png $(DESTDIR)/usr/share/pixmaps/ + install -d $(DESTDIR)/usr/share/applications +- install extras/luakit.desktop $(DESTDIR)/usr/share/applications/ ++ install -m0644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/ + install -d $(MANPREFIX)/man1/ + install -m644 luakit.1 $(MANPREFIX)/man1/ ---- +-- 1.7.10 diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD index 33cc23aa4..ca99340cb 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78446 2012-10-18 17:40:26Z bpiotrowski $ +# $Id: PKGBUILD 81116 2012-12-12 00:49:28Z eric $ # Maintainer: BartÅ‚omiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com> @@ -6,12 +6,12 @@ pkgname=luakit pkgver=2012.09.13.r1 _pkgver=2012.09.13-r1 -pkgrel=3 +pkgrel=5 pkgdesc='Fast, small, webkit based browser framework extensible by Lua' arch=('i686' 'x86_64') -url='http://www.luakit.org/projects/luakit' +url='http://mason-larobina.github.com/luakit/' license=('GPL3') -depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils' 'luajit') +depends=('libwebkit' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit') makedepends=('git' 'help2man') options=(!makeflags) install='luakit.install' @@ -20,10 +20,16 @@ md5sums=('77b02e6d19ba021409f1778fddd94a42') build() { cd mason-larobina-luakit-* + + # use luajit to run script needed at build + sed -i '1s,lua,luajit,' build-utils/gentokens.lua + make USE_LUAJIT=1 PREFIX=/usr all } package() { cd mason-larobina-luakit-* make PREFIX=/usr DESTDIR=$pkgdir install + + chmod -x $pkgdir/usr/share/pixmaps/luakit.png # FS#32938 } diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD index 627158879..124408cb5 100644 --- a/community/luaposix/PKGBUILD +++ b/community/luaposix/PKGBUILD @@ -1,41 +1,57 @@ -# $Id: PKGBUILD 77213 2012-10-07 01:13:25Z seblu $ +# $Id: PKGBUILD 81118 2012-12-12 00:49:30Z eric $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Laszlo Papp <djszapi at archlinux us> # Contributor: Donald Ephraim Curtis <dcurtis@gmail.com> -pkgname=luaposix +pkgbase=luaposix +pkgname=('lua-posix' 'lua51-posix') pkgver=5.1.23 pkgrel=1 pkgdesc='A POSIX library for Lua programming language' arch=('i686' 'x86_64') url='http://luaforge.net/projects/luaposix/' license=('GPL' 'LGPL') -depends=('lua' 'luabitop') -#checkdepends=('lunit') +makedepends=('lua' 'lua51' 'lua51-bitop') +conflicts=('luaposix') +replaces=('luaposix') options=('!libtool') -source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz") +source=("https://github.com/downloads/$pkgbase/$pkgbase/$pkgbase-$pkgver.tar.gz") md5sums=('ebe7d335741ca736e003a6844a0fbf92') build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --libdir=/usr/lib/lua/5.1 \ - --datadir=/usr/share/lua/5.1 + cd $pkgbase-$pkgver + mkdir build_51 build_52 + msg2 'Build with lua 5.2' + cd build_52 + ../configure \ + --prefix=/usr \ + --libdir=/usr/lib/lua/5.2 \ + --datadir=/usr/share/lua/5.2 \ + --docdir=/usr/share/doc/lua-posix make + msg2 'Build with lua 5.1' + cd ../build_51 + ../configure CFLAGS=-I/usr/include/lua5.1 \ + --prefix=/usr \ + --libdir=/usr/lib/lua/5.1 \ + --datadir=/usr/share/lua/5.1 \ + --docdir=/usr/share/doc/lua51-posix + make +} + +package_lua-posix() { + depends=('lua') + + cd $pkgbase-$pkgver/build_52 + make DESTDIR="$pkgdir/" install } -#check() { -# cd $pkgname-$pkgver -# make check -#} +package_lua51-posix() { + depends=('lua51' 'lua51-bitop') -package() { - cd $pkgname-$pkgver - make PREFIX=/usr DESTDIR="$pkgdir/" install - # examples - install -d "$pkgdir/usr/share/$pkgname/examples" - install -D -m 644 *.lua "$pkgdir/usr/share/$pkgname/examples" + cd $pkgbase-$pkgver/build_51 + make DESTDIR="$pkgdir/" install } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD index 5769e23ed..01d8ff1be 100644 --- a/community/luasec/PKGBUILD +++ b/community/luasec/PKGBUILD @@ -1,30 +1,48 @@ -# $Id: PKGBUILD 66219 2012-02-23 03:33:12Z spupykin $ +# $Id: PKGBUILD 81120 2012-12-12 00:49:31Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.1@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> -pkgname=luasec -pkgver=0.4 -pkgrel=3 -pkgdesc="Lua bindings for OpenSSL library to provide TLS/SSL communication." +pkgbase=luasec +pkgname=(lua-sec lua51-sec) +pkgver=0.4.1 +pkgrel=1 +pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.' arch=('i686' 'x86_64') -url="http://luasec.luaforge.net/" +url='http://luasec.luaforge.net/' license=('MIT') -depends=('openssl>=0.9.7' 'lua>=5.1' 'luasocket>=2.0.2') -source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/$pkgname-$pkgver.tar.gz" - 'luasec.patch') -md5sums=('712158d60207bdbb6215fc7e07d8db24' - '25e48c1115225d9884cdb7f5ca4949a9') +makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket') +conflicts=('luasec') +replaces=('luasec') +source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/$pkgbase-$pkgver.tar.gz") +md5sums=('b8a5fde3b3fdb6174f54cd51d7f53e12') build() { - install -d "$pkgdir/usr/share/lua/5.1" - install -d "$pkgdir/usr/lib/lua/5.1" - install -d "$pkgdir/usr/share/licenses/$pkgname" - - cd "$srcdir/$pkgname-$pkgver" - patch -p1 Makefile "$srcdir/luasec.patch" + cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51 + msg2 'Building with lua 5.2' + cd $pkgbase-$pkgver make linux - make DESTDIR=$pkgdir install + msg2 'Building with lua 5.1' + cd ../$pkgbase-$pkgver-51 + make INCDIR=-I/usr/include/lua5.1 linux +} - install -m644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +package_lua-sec() { + depends=('openssl' 'lua' 'lua-socket') + + install -dm755 "$pkgdir/usr/lib/lua/5.2" + cd $pkgbase-$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 $pkgbase-$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/luasocket/PKGBUILD b/community/luasocket/PKGBUILD index 21e96f09d..88c9d5714 100644 --- a/community/luasocket/PKGBUILD +++ b/community/luasocket/PKGBUILD @@ -1,27 +1,52 @@ -# $Id: PKGBUILD 49637 2011-06-18 20:20:18Z foutrelis $ +# $Id: PKGBUILD 81121 2012-12-12 00:49:32Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Anders Bergh <anders1@gmail.com> -pkgname=luasocket +pkgbase=luasocket +pkgname=(lua-socket lua51-socket) pkgver=2.0.2 -pkgrel=5 -pkgdesc="Luasocket is the most comprehensive networking support library for the Lua language." +pkgrel=1 +pkgdesc='Networking support library for the Lua language' arch=('i686' 'x86_64') -url="http://www.cs.princeton.edu/~diego/professional/luasocket/" +url='http://www.cs.princeton.edu/~diego/professional/luasocket/' license=('MIT') -depends=(lua) +replaces=('luasocket') +conflicts=('luasocket') +makedepends=('lua' 'lua51') source=(http://luaforge.net/frs/download.php/2664/luasocket-$pkgver.tar.gz - luasocket-arch.patch - luasocket-unixsocket.patch) + luasocket-unixsocket.patch + lua52.patch) md5sums=('41445b138deb7bcfe97bff957503da8e' - '3270f42ff374f230c6450f49132f8625' - '8d116bb70bd7a2fa15cbe949d4cfc35e') + '8d116bb70bd7a2fa15cbe949d4cfc35e' + '6f9c6416dd70a7bc1a867003f08c2752') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 < $srcdir/luasocket-arch.patch - patch -p1 < $srcdir/luasocket-unixsocket.patch + msg2 'Building with lua 5.2' + cp -a $pkgbase-$pkgver $pkgbase-$pkgver-52 + cd $pkgbase-$pkgver-52 + patch -Np1 -i "$srcdir/luasocket-unixsocket.patch" + patch -Np1 -i "$srcdir/lua52.patch" make - make DESTDIR="$pkgdir" install - install -D -m0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + msg2 'Building with lua 5.1' + cd ../$pkgbase-$pkgver + patch -Np1 -i "$srcdir/luasocket-unixsocket.patch" + make LUAINC=-I/usr/include/lua5.1 +} + +package_lua-socket() { + depends=('lua') + cd $pkgbase-$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 $pkgbase-$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/luasocket/lua52.patch b/community/luasocket/lua52.patch new file mode 100644 index 000000000..4eef574ee --- /dev/null +++ b/community/luasocket/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/luasql/PKGBUILD b/community/luasql/PKGBUILD index 54aff4c20..399192c50 100644 --- a/community/luasql/PKGBUILD +++ b/community/luasql/PKGBUILD @@ -1,22 +1,60 @@ -# $Id: PKGBUILD 61380 2011-12-29 16:34:45Z spupykin $ +# $Id: PKGBUILD 81122 2012-12-12 00:49:33Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Anders Bergh <anders1@gmail.com> +# Contributor: Sébastien Luttringer <seblu@archlinux.org> +# Contributor: Anders Bergh <anders1@gmail.com> -pkgname=luasql-mysql +pkgbase=luasql +pkgname=('lua-sql-mysql' 'lua-sql-postgres' 'lua-sql-sqlite') pkgver=2.2.0 pkgrel=1 -pkgdesc="MySQL module for Lua" arch=('i686' 'x86_64') -url="http://www.keplerproject.org/luasql/" +url='http://www.keplerproject.org/luasql/' license=('MIT') -depends=('lua' 'libmysqlclient') -source=(https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz) -md5sums=('59d72db444c6369c936d4f03694db6b7') +conflicts=('luasql-mysql') +makedepends=('lua' 'libmysqlclient' 'postgresql-libs' 'sqlite') +source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz" + 'lua52.patch') +md5sums=('59d72db444c6369c936d4f03694db6b7' + 'a1d6083215e7a83cfc08621b6998914c') build() { - cd "$srcdir/luasql-$pkgver" + cd $pkgbase-$pkgver + patch -p1 < "$srcdir/lua52.patch" + msg2 'Building sqlite support' + make T=sqlite3 PREFIX=/usr DRIVER_LIBS='-lsqlite3' DRIVER_INCS='-fPIC -std=c99' + msg2 'Building PostgreSQL support' + make T=postgres PREFIX=/usr DRIVER_LIBS='-lpq' DRIVER_INCS='-fPIC' + msg2 'Building MySQL support' make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \ - DRIVER_INCS="$(mysql_config --include) -fPIC" - install -Dm644 src/mysql.so $pkgdir/usr/lib/lua/5.1/luasql/mysql.so - install -Dm644 doc/us/license.html $pkgdir/usr/share/licenses/$pkgname/license.html + DRIVER_INCS="$(mysql_config --include) -fPIC" } + +package_lua-sql-mysql() { + pkgdesc='MySQL module for Lua' + depends=('lua' 'libmysqlclient') + replaces=('luasql-mysql') + + cd $pkgbase-$pkgver + install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.2/luasql/mysql.so" + install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html" +} + +package_lua-sql-postgres() { + pkgdesc='PostgreSQL module for Lua' + depends=('lua' 'postgresql-libs') + + cd $pkgbase-$pkgver + install -Dm644 src/postgres.so "$pkgdir/usr/lib/lua/5.2/luasql/postgres.so" + install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html" +} + +package_lua-sql-sqlite() { + pkgdesc='SQLite module for Lua' + depends=('lua' 'sqlite') + + cd $pkgbase-$pkgver + install -Dm644 src/sqlite3.so "$pkgdir/usr/lib/lua/5.2/luasql/sqlite3.so" + install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/luasql/lua52.patch b/community/luasql/lua52.patch new file mode 100644 index 000000000..6f4eb59e0 --- /dev/null +++ b/community/luasql/lua52.patch @@ -0,0 +1,283 @@ +diff -wbBur luasql-2.2.0/src/ls_firebird.c luasql-2.2.0.my/src/ls_firebird.c +--- luasql-2.2.0/src/ls_firebird.c 2009-10-20 20:38:38.000000000 +0400 ++++ luasql-2.2.0.my/src/ls_firebird.c 2012-11-14 19:06:50.508901839 +0400 +@@ -1008,13 +1008,13 @@ + ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+- struct luaL_reg environment_methods[] = {
++ struct luaL_Reg environment_methods[] = {
+ {"__gc", env_gc},
+ {"close", env_close},
+ {"connect", env_connect},
+ {NULL, NULL},
+ };
+- struct luaL_reg connection_methods[] = {
++ struct luaL_Reg connection_methods[] = {
+ {"__gc", conn_gc},
+ {"close", conn_close},
+ {"execute", conn_execute},
+@@ -1024,7 +1024,7 @@ + {"escape", conn_escape},
+ {NULL, NULL},
+ };
+- struct luaL_reg cursor_methods[] = {
++ struct luaL_Reg cursor_methods[] = {
+ {"__gc", cur_gc},
+ {"close", cur_close},
+ {"fetch", cur_fetch},
+@@ -1043,7 +1043,7 @@ + ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_firebird (lua_State *L) {
+- struct luaL_reg driver[] = {
++ struct luaL_Reg driver[] = {
+ {"firebird", create_environment},
+ {NULL, NULL},
+ };
+diff -wbBur luasql-2.2.0/src/ls_mysql.c luasql-2.2.0.my/src/ls_mysql.c +--- luasql-2.2.0/src/ls_mysql.c 2009-10-20 20:38:38.000000000 +0400 ++++ luasql-2.2.0.my/src/ls_mysql.c 2012-11-14 19:06:56.782236770 +0400 +@@ -511,13 +511,13 @@ + ** Create metatables for each class of object. + */ + static void create_metatables (lua_State *L) { +- struct luaL_reg environment_methods[] = { ++ struct luaL_Reg environment_methods[] = { + {"__gc", env_close}, + {"close", env_close}, + {"connect", env_connect}, + {NULL, NULL}, + }; +- struct luaL_reg connection_methods[] = { ++ struct luaL_Reg connection_methods[] = { + {"__gc", conn_close}, + {"close", conn_close}, + {"escape", escape_string}, +@@ -528,7 +528,7 @@ + {"getlastautoid", conn_getlastautoid}, + {NULL, NULL}, + }; +- struct luaL_reg cursor_methods[] = { ++ struct luaL_Reg cursor_methods[] = { + {"__gc", cur_close}, + {"close", cur_close}, + {"getcolnames", cur_getcolnames}, +@@ -562,7 +562,7 @@ + ** driver open method. + */ + LUASQL_API int luaopen_luasql_mysql (lua_State *L) { +- struct luaL_reg driver[] = { ++ struct luaL_Reg driver[] = { + {"mysql", create_environment}, + {NULL, NULL}, + }; +diff -wbBur luasql-2.2.0/src/ls_oci8.c luasql-2.2.0.my/src/ls_oci8.c +--- luasql-2.2.0/src/ls_oci8.c 2009-10-20 20:38:38.000000000 +0400 ++++ luasql-2.2.0.my/src/ls_oci8.c 2012-11-14 19:06:39.182232288 +0400 +@@ -814,13 +814,13 @@ + ** Create metatables for each class of object. + */ + static void create_metatables (lua_State *L) { +- struct luaL_reg environment_methods[] = { ++ struct luaL_Reg environment_methods[] = { + {"__gc", env_close}, + {"close", env_close}, + {"connect", env_connect}, + {NULL, NULL}, + }; +- struct luaL_reg connection_methods[] = { ++ struct luaL_Reg connection_methods[] = { + {"__gc", conn_close}, + {"close", conn_close}, + {"execute", conn_execute}, +@@ -829,7 +829,7 @@ + {"setautocommit", conn_setautocommit}, + {NULL, NULL}, + }; +- struct luaL_reg cursor_methods[] = { ++ struct luaL_Reg cursor_methods[] = { + {"__gc", cur_close}, + {"close", cur_close}, + {"getcolnames", cur_getcolnames}, +@@ -850,7 +850,7 @@ + ** driver open method. + */ + LUASQL_API int luaopen_luasql_oci8 (lua_State *L) { +- struct luaL_reg driver[] = { ++ struct luaL_Reg driver[] = { + {"oci8", create_environment}, + {NULL, NULL}, + }; +diff -wbBur luasql-2.2.0/src/ls_odbc.c luasql-2.2.0.my/src/ls_odbc.c +--- luasql-2.2.0/src/ls_odbc.c 2009-10-20 20:38:38.000000000 +0400 ++++ luasql-2.2.0.my/src/ls_odbc.c 2012-11-14 19:06:53.652235973 +0400 +@@ -638,13 +638,13 @@ + ** Create metatables for each class of object. + */ + static void create_metatables (lua_State *L) { +- struct luaL_reg environment_methods[] = { ++ struct luaL_Reg environment_methods[] = { + {"__gc", env_close}, + {"close", env_close}, + {"connect", env_connect}, + {NULL, NULL}, + }; +- struct luaL_reg connection_methods[] = { ++ struct luaL_Reg connection_methods[] = { + {"__gc", conn_close}, + {"close", conn_close}, + {"execute", conn_execute}, +@@ -653,7 +653,7 @@ + {"setautocommit", conn_setautocommit}, + {NULL, NULL}, + }; +- struct luaL_reg cursor_methods[] = { ++ struct luaL_Reg cursor_methods[] = { + {"__gc", cur_close}, + {"close", cur_close}, + {"fetch", cur_fetch}, +@@ -701,7 +701,7 @@ + ** driver open method. + */ + LUASQL_API int luaopen_luasql_odbc (lua_State *L) { +- struct luaL_reg driver[] = { ++ struct luaL_Reg driver[] = { + {"odbc", create_environment}, + {NULL, NULL}, + }; +diff -wbBur luasql-2.2.0/src/ls_postgres.c luasql-2.2.0.my/src/ls_postgres.c +--- luasql-2.2.0/src/ls_postgres.c 2009-10-20 20:38:38.000000000 +0400 ++++ luasql-2.2.0.my/src/ls_postgres.c 2012-11-14 19:06:47.275567683 +0400 +@@ -551,13 +551,13 @@ + ** Create metatables for each class of object. + */ + static void create_metatables (lua_State *L) { +- struct luaL_reg environment_methods[] = { ++ struct luaL_Reg environment_methods[] = { + {"__gc", env_gc}, + {"close", env_close}, + {"connect", env_connect}, + {NULL, NULL}, + }; +- struct luaL_reg connection_methods[] = { ++ struct luaL_Reg connection_methods[] = { + {"__gc", conn_gc}, + {"close", conn_close}, + {"escape", conn_escape}, +@@ -567,7 +567,7 @@ + {"setautocommit", conn_setautocommit}, + {NULL, NULL}, + }; +- struct luaL_reg cursor_methods[] = { ++ struct luaL_Reg cursor_methods[] = { + {"__gc", cur_gc}, + {"close", cur_close}, + {"getcolnames", cur_getcolnames}, +@@ -600,7 +600,7 @@ + ** driver open method. + */ + LUASQL_API int luaopen_luasql_postgres (lua_State *L) { +- struct luaL_reg driver[] = { ++ struct luaL_Reg driver[] = { + {"postgres", create_environment}, + {NULL, NULL}, + }; +diff -wbBur luasql-2.2.0/src/ls_sqlite3.c luasql-2.2.0.my/src/ls_sqlite3.c +--- luasql-2.2.0/src/ls_sqlite3.c 2009-10-20 20:38:38.000000000 +0400 ++++ luasql-2.2.0.my/src/ls_sqlite3.c 2012-11-14 19:06:26.115562295 +0400 +@@ -560,13 +560,13 @@ + */ + static void create_metatables (lua_State *L) + { +- struct luaL_reg environment_methods[] = { ++ struct luaL_Reg environment_methods[] = { + {"__gc", env_close}, + {"close", env_close}, + {"connect", env_connect}, + {NULL, NULL}, + }; +- struct luaL_reg connection_methods[] = { ++ struct luaL_Reg connection_methods[] = { + {"__gc", conn_close}, + {"close", conn_close}, + {"escape", conn_escape}, +@@ -577,7 +577,7 @@ + {"getlastautoid", conn_getlastautoid}, + {NULL, NULL}, + }; +- struct luaL_reg cursor_methods[] = { ++ struct luaL_Reg cursor_methods[] = { + {"__gc", cur_close}, + {"close", cur_close}, + {"getcolnames", cur_getcolnames}, +@@ -611,7 +611,7 @@ + */ + LUASQL_API int luaopen_luasql_sqlite3(lua_State *L) + { +- struct luaL_reg driver[] = { ++ struct luaL_Reg driver[] = { + {"sqlite3", create_environment}, + {NULL, NULL}, + }; +diff -wbBur luasql-2.2.0/src/ls_sqlite.c luasql-2.2.0.my/src/ls_sqlite.c +--- luasql-2.2.0/src/ls_sqlite.c 2009-10-20 20:38:38.000000000 +0400 ++++ luasql-2.2.0.my/src/ls_sqlite.c 2012-11-14 19:06:43.845566808 +0400 +@@ -518,13 +518,13 @@ + */ + static void create_metatables (lua_State *L) + { +- struct luaL_reg environment_methods[] = { ++ struct luaL_Reg environment_methods[] = { + {"__gc", env_close}, + {"close", env_close}, + {"connect", env_connect}, + {NULL, NULL}, + }; +- struct luaL_reg connection_methods[] = { ++ struct luaL_Reg connection_methods[] = { + {"__gc", conn_close}, + {"close", conn_close}, + {"escape", conn_escape}, +@@ -534,7 +534,7 @@ + {"setautocommit", conn_setautocommit}, + {NULL, NULL}, + }; +- struct luaL_reg cursor_methods[] = { ++ struct luaL_Reg cursor_methods[] = { + {"__gc", cur_close}, + {"close", cur_close}, + {"getcolnames", cur_getcolnames}, +@@ -568,7 +568,7 @@ + */ + LUASQL_API int luaopen_luasql_sqlite(lua_State *L) + { +- struct luaL_reg driver[] = { ++ struct luaL_Reg driver[] = { + {"sqlite", create_environment}, + {NULL, NULL}, + }; +diff -wbBur luasql-2.2.0/src/luasql.c luasql-2.2.0.my/src/luasql.c +--- luasql-2.2.0/src/luasql.c 2009-10-20 20:38:38.000000000 +0400 ++++ luasql-2.2.0.my/src/luasql.c 2012-11-14 19:06:32.412230565 +0400 +@@ -60,7 +60,7 @@ + /* + ** Create a metatable and leave it on top of the stack. + */ +-LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_reg *methods) { ++LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_Reg *methods) { + if (!luaL_newmetatable (L, name)) + return 0; + +diff -wbBur luasql-2.2.0/src/luasql.h luasql-2.2.0.my/src/luasql.h +--- luasql-2.2.0/src/luasql.h 2009-10-20 20:38:38.000000000 +0400 ++++ luasql-2.2.0.my/src/luasql.h 2012-11-14 19:06:29.002229695 +0400 +@@ -22,7 +22,7 @@ + + LUASQL_API int luasql_faildirect (lua_State *L, const char *err); + LUASQL_API int luasql_failmsg (lua_State *L, const char *err, const char *m); +-LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_reg *methods); ++LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_Reg *methods); + LUASQL_API void luasql_setmeta (lua_State *L, const char *name); + LUASQL_API void luasql_set_info (lua_State *L); + diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 32b62368a..f7bac3aa8 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 78936 2012-10-27 23:45:03Z ebelanger $ +# $Id: PKGBUILD 81124 2012-12-12 00:49:36Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.6.0.3 -pkgrel=5 +pkgver=3.7.1 +pkgrel=1 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') url="http://sourceforge.net/projects/megaglest/" license=('GPL3') -depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew' +depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl' 'glew' 'libircclient' 'miniupnpc' 'wxgtk' 'glu') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz" lol.patch) -md5sums=('5a4a2429435031d9f9cc5d9535a9de9d' +md5sums=('e7a960ec73784aa0f7b951d2ad963456' '68fd326b73ed1c75981004fbdef6b73a') build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ - patch -Np1 < "$srcdir/lol.patch" + #patch -Np1 < "$srcdir/lol.patch" [[ -d build ]] && rm -r build mkdir build && cd build diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index e56fa63ec..7baeaa3d5 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79563 2012-11-07 15:09:45Z spupykin $ +# $Id: PKGBUILD 81125 2012-12-12 00:49:36Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20121107 +pkgver=20121114 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD index 7bc68c282..b6e1a6dc1 100644 --- a/community/ntop/PKGBUILD +++ b/community/ntop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79619 2012-11-08 23:54:27Z lfleischer $ +# $Id: PKGBUILD 81126 2012-12-12 00:49:38Z eric $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=ntop pkgver=5.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='A network traffic probe that shows the network usage.' arch=('i686' 'x86_64') url='http://www.ntop.org/' diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD index ca1450341..1d52dd8af 100644 --- a/community/pdns/PKGBUILD +++ b/community/pdns/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79811 2012-11-12 22:20:45Z arodseth $ +# $Id: PKGBUILD 81127 2012-12-12 00:49:39Z eric $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kevin Mihelich <kevin@archlinuxarm.org> pkgname=pdns pkgver=3.1 -pkgrel=3 +pkgrel=5 pkgdesc="Modern, advanced and high performance authoritative-only nameserver" arch=('x86_64' 'i686') url='http://www.powerdns.com/' @@ -31,11 +31,6 @@ build() { cd "$srcdir/$pkgname-$pkgver" touch AUTHORS NEWS - libtoolize --force --copy - aclocal - autoconf - automake --add-missing - sed -i 's/BOOST/#BOOST/g' configure ./configure --prefix=/usr \ --sysconfdir=/etc/powerdns \ --libexecdir=/usr/lib \ @@ -45,8 +40,7 @@ build() { --with-dynmodules="ldap pipe gmysql gpgsql gsqlite3 geo" \ --disable-recursor \ --disable-static - make \ - CXXFLAGS=" -lboost_serialization -lboost_program_options $CXXFLAGS" + make } package() { diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index dc75eefe0..24e13634e 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79088 2012-10-30 10:54:31Z mtorromeo $ +# $Id: PKGBUILD 81055 2012-12-11 09:51:48Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.28_rel29.1 -pkgrel=2 +pkgver=5.5.28_rel29.2 +pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64') @@ -102,7 +102,7 @@ package() { install -dm700 "${pkgdir}"/var/lib/mysql } -sha256sums=('2cacf3bd0f059c7ae3cb391bf2e4a2bdcbf490ed3465bfd4db9a02f0944f2d51' +sha256sums=('4f2ca2b4bf8ebdde0d5c643cc382fd7242492c084715b5c7d83619a9ff7a40a4' 'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4' 'dd5dc155de468d4ab26971109861ae19b53574f28785bac5ff7b717fb65c0760' '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32' diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 5e9855861..451c93cb2 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78387 2012-10-17 16:24:59Z spupykin $ +# $Id: PKGBUILD 81128 2012-12-12 00:49:40Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.0@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> pkgname=prosody pkgver=0.8.2 -pkgrel=5 +pkgrel=6 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." arch=('i686' 'x86_64') url="http://prosody.im/" diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD index f611e82e6..b35cb720a 100644 --- a/community/rawstudio/PKGBUILD +++ b/community/rawstudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74841 2012-08-06 23:09:31Z andrea $ +# $Id: PKGBUILD 81067 2012-12-11 14:37:23Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ pkgname=rawstudio pkgver=2.0 -pkgrel=7 +pkgrel=8 pkgdesc="An open source raw-image converter written in GTK+" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 14a61356c..578cc10f5 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80877 2012-12-05 06:02:30Z bgyorgy $ +# $Id: PKGBUILD 81068 2012-12-11 14:37:24Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell pkgver=0.13.1 -pkgrel=4 +pkgrel=5 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index f2dfc58ed..b559c9b6c 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80766 2012-12-03 10:12:25Z spupykin $ +# $Id: PKGBUILD 81053 2012-12-11 09:28:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=squid -pkgver=3.2.4 +pkgver=3.2.5 pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') @@ -24,7 +24,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.2/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('5fd7d120c429aaeacdf008938a36cb94' +md5sums=('ddb329f92056aa58a56db6a2eeea0c02' '02f7b5bd793f778e40834fd6457d2199' '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 17177714b..fb3ce0f59 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -2,12 +2,12 @@ pkgname=stone-soup pkgver=0.11.0 -pkgrel=2 +pkgrel=3 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') url='http://crawl.develz.org/' -depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'glu' 'freetype2' 'ttf-dejavu') -makedepends=('bison' 'flex' 'gendesk') +depends=('lua51' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'glu' 'freetype2' 'ttf-dejavu') +makedepends=('bison' 'flex' 'gendesk' 'mesa') conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') license=('custom') install=stone-soup.install diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD index 8aacbce70..9a8700cb9 100644 --- a/community/task/PKGBUILD +++ b/community/task/PKGBUILD @@ -6,7 +6,7 @@ pkgname=task pkgver=2.1.2 -pkgrel=1 +pkgrel=3 pkgdesc="A command-line todo list manager" arch=('i686' 'x86_64') url="http://taskwarrior.org/projects/show/taskwarrior/" diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 74de24601..4963b8e0c 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75679 2012-08-29 05:52:39Z spupykin $ +# $Id: PKGBUILD 81096 2012-12-11 19:14:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=33.3.0 +pkgver=33.4.0 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64') @@ -16,11 +16,12 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('5830f177056d65f74ac52c97f5637815' +md5sums=('5e553e3061b978b368e1dc70ee369c8d' '377ace3363124f4c086de0babb820761') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|i + j|(int)(i + j)|' textproc.cpp qmake PREFIX=/usr/bin make } diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD index cf9a95311..6e6436642 100644 --- a/community/wesnoth/PKGBUILD +++ b/community/wesnoth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75697 2012-08-29 08:31:11Z svenstaro $ +# $Id: PKGBUILD 81132 2012-12-12 00:49:44Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,13 +6,13 @@ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=wesnoth -pkgver=1.10.4 +pkgver=1.10.5 pkgrel=1 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64') license=('GPL') url="http://www.wesnoth.org/" -depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data" 'dbus-core' 'python2') +depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data>=$pkgver" 'dbus-core' 'python2') makedepends=('boost' 'cmake') install=wesnoth.install options=(!emptydirs) @@ -20,7 +20,7 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t wesnothd.tmpfiles.conf wesnothd.rc.d wesnothd.service) -md5sums=('1a673f12e4521fc66e60ec584fa7c98f' +md5sums=('03d9683cd83d17c6536bdf5c4940bbc8' '2d2fea6b3d86dfd589f5ad35a3be1f97' '85659b47d22dfdf4e4d046556973fc3e' 'd1b6bf1d3dc05086ee6a370adff0ae4a') diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index b4a28fd15..0a1957a0b 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 78944 2012-10-27 23:46:00Z ebelanger $ +# $Id: PKGBUILD 81133 2012-12-12 00:49:45Z eric $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,12 +6,12 @@ pkgname=widelands pkgver=17 _realver=build17 -pkgrel=5 +pkgrel=6 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64') url="http://widelands.org/" license=('GPL') -depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2') +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua51' 'glew' 'python2') makedepends=('cmake' 'boost' 'mesa') source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2" $pkgname.desktop diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD index ad1c581a8..685a94b44 100644 --- a/community/xmoto/PKGBUILD +++ b/community/xmoto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77670 2012-10-13 11:46:18Z allan $ +# $Id: PKGBUILD 81134 2012-12-12 00:49:46Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Denis (dtonator@gmail.com) pkgname=xmoto pkgver=0.5.10 -pkgrel=2 +pkgrel=3 pkgdesc="A challenging 2D motocross platform game, where physics play an important role." arch=('i686' 'x86_64') url="http://xmoto.tuxfamily.org" |