From 7851c02115b35e64fc3b827b29c79023d4518f6f Mon Sep 17 00:00:00 2001 From: root Date: Thu, 27 Jun 2013 01:08:30 -0700 Subject: Thu Jun 27 01:08:30 PDT 2013 --- community/bitcoin/PKGBUILD | 8 +++---- community/darktable/PKGBUILD | 8 +++---- community/lua-zlib/PKGBUILD | 11 +++++----- community/megaglest/PKGBUILD | 22 +++++++++---------- community/megaglest/lol.patch | 43 -------------------------------------- community/python-psycopg2/PKGBUILD | 6 +++--- 6 files changed, 27 insertions(+), 71 deletions(-) delete mode 100644 community/megaglest/lol.patch (limited to 'community') diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index e3040c51b..572ddd10c 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 92952 2013-06-20 11:00:24Z tredaelli $ +# $Id: PKGBUILD 93162 2013-06-26 14:39:47Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: shahid pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.8.2 -pkgrel=2 +pkgver=0.8.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc') license=('MIT') source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz) -sha256sums=('e15d3134f4efd8d60e243c7177edba06ac471619674ca07a42a1dced5f498728') +sha256sums=('c6003a6af947e6978b13ab55d7bb7ec97aedc55022fb4924d08792a8d4f83a35') build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 27b69d8da..ba15607a6 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 92273 2013-06-03 13:36:04Z spupykin $ +# $Id: PKGBUILD 93153 2013-06-26 11:50:34Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Christian Himpel # Contributor: Johannes Hanika pkgname=darktable -pkgver=1.2.1 +pkgver=1.2.2 _pkgver=1.2 -pkgrel=2 +pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('f970573777752b1b4447997d1f1f65fa') +md5sums=('df2a2b02d6d855cfd8f1cf77c7e12995') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD index 8243438d4..d5c789cdf 100644 --- a/community/lua-zlib/PKGBUILD +++ b/community/lua-zlib/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 93120 2013-06-25 09:38:45Z spupykin $ +# $Id: PKGBUILD 93160 2013-06-26 13:34:20Z spupykin $ # Maintainer: Sergej Pupykin -pkgname=(lua-zlib lua51-zlib) +#pkgname=(lua-zlib lua51-zlib) +pkgname=(lua51-zlib) pkgbase=lua-zlib pkgver=0.2 -pkgrel=6 +pkgrel=8 _gitver=8d07669 url="http://github.com/brimworks/lua-zlib" pkgdesc='Simple streaming interface to zlib for Lua.' @@ -19,10 +20,10 @@ build() { cp -a $srcdir/brimworks-lua-zlib-${_gitver} $srcdir/brimworks-lua51-zlib-${_gitver} cd $srcdir/brimworks-lua-zlib-${_gitver} - gcc -o zlib.so -O2 -fPIC -shared lua_zlib.c -llua + gcc -o zlib.so -O2 -fPIC -shared lua_zlib.c -llua -lz cd $srcdir/brimworks-lua51-zlib-${_gitver} - gcc -o zlib.so -O2 -fPIC -shared -I/usr/include/lua5.1 lua_zlib.c -llua5.1 + gcc -o zlib.so -O2 -fPIC -shared -I/usr/include/lua5.1 lua_zlib.c -llua5.1 -lz } package_lua-zlib() { diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index d38a1aee6..30c6d9479 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 90059 2013-05-06 19:38:20Z foutrelis $ +# $Id: PKGBUILD 93166 2013-06-26 17:55:13Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Larry Hajali pkgname=megaglest -pkgver=3.7.1 -pkgrel=2 +pkgver=3.8.0beta1 +_pkgver=3.8.0-beta1 +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/" @@ -12,27 +13,24 @@ license=('GPL3') 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=('e7a960ec73784aa0f7b951d2ad963456' - '68fd326b73ed1c75981004fbdef6b73a') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${_pkgver}.tar.xz") +md5sums=('1da8707d435ffb2342f03ca466d4eeed') build() { - cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ - - #patch -Np1 < "$srcdir/lol.patch" + cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/ [[ -d build ]] && rm -r build mkdir build && cd build + cmake .. \ -DWANT_SVN_STAMP=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version + -DCMAKE_BUILD_TYPE=Release make } package() { - cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ + cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/ cd build make DESTDIR="$pkgdir" install diff --git a/community/megaglest/lol.patch b/community/megaglest/lol.patch deleted file mode 100644 index 56f94c852..000000000 --- a/community/megaglest/lol.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h -index 8fcfb27..3cb7a41 100644 ---- a/source/shared_lib/include/graphics/math_util.h -+++ b/source/shared_lib/include/graphics/math_util.h -@@ -184,10 +184,10 @@ public: - - Rect2 computeBoundingRect() const{ - return Rect2i( -- min(p[0].x, p[1].x), -- min(p[0].y, p[2].y), -- max(p[2].x, p[3].x), -- max(p[1].y, p[3].y)); -+ std::min(p[0].x, p[1].x), -+ std::min(p[0].y, p[2].y), -+ std::max(p[2].x, p[3].x), -+ std::max(p[1].y, p[3].y)); - } - - bool isInside(const Vec2 &pt) const{ -diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp -index b09c972..ddebd03 100644 ---- a/source/shared_lib/sources/platform/posix/ircclient.cpp -+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp -@@ -13,6 +13,7 @@ - #include "ircclient.h" - #include "util.h" - #include "platform_common.h" -+#include "libirc_rfcnumeric.h" - #include "libircclient.h" - - #include -diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp -index 05478fc..c27aa62 100644 ---- a/source/shared_lib/sources/util/util.cpp -+++ b/source/shared_lib/sources/util/util.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include // for open() -+#include - - #ifdef WIN32 - #include // for open() diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD index 9dc317d66..2cdabb5cf 100644 --- a/community/python-psycopg2/PKGBUILD +++ b/community/python-psycopg2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87852 2013-04-08 09:24:14Z spupykin $ +# $Id: PKGBUILD 93151 2013-06-26 09:20:17Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Angel 'angvp' Velasquez # Maintainer: Douglas Soares de Andrade pkgbase=python-psycopg2 pkgname=('python-psycopg2' 'python2-psycopg2') -pkgver=2.5 +pkgver=2.5.1 pkgrel=1 pkgdesc="A PostgreSQL database adapter for the Python programming language." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://initd.org/psycopg/" license=('LGPL3') makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-$pkgver.tar.gz) -md5sums=('facd82faa067e99b80146a0ee2f842f6') +md5sums=('1b433f83d50d1bc61e09026e906d84c7') build() { cd "$srcdir/psycopg2-$pkgver" -- cgit v1.2.3-54-g00ecf