From c80552b41838a5668458ebb1eb9b0f44ea6fe879 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 18 Jun 2011 23:03:19 +0000 Subject: Sat Jun 18 23:03:19 UTC 2011 --- community/calibre/PKGBUILD | 8 ++-- community/calibre/desktop_integration.patch | 6 +-- community/camlp5/PKGBUILD | 60 ++++++++++++++++++----------- community/dosbox/PKGBUILD | 37 +++++++++++------- community/dosbox/gcc46.patch | 12 ++++++ community/ginac/PKGBUILD | 15 ++++---- community/gnofract4d/PKGBUILD | 18 ++++----- community/intel-tbb/PKGBUILD | 6 +-- community/mediatomb/PKGBUILD | 15 +++++--- community/mediatomb/gcc46.patch | 10 +++++ community/mongodb/PKGBUILD | 24 ++++-------- 11 files changed, 123 insertions(+), 88 deletions(-) create mode 100644 community/dosbox/gcc46.patch create mode 100644 community/mediatomb/gcc46.patch (limited to 'community') diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 14ae58ba1..cb05d8e31 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49119 2011-06-11 10:20:21Z giovanni $ +# $Id: PKGBUILD 49493 2011-06-17 22:21:07Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.5 +pkgver=0.8.6 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,8 +20,8 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('b6b07a35afe4dbf188f42e932536cca3' - 'f4b80e3b34e34bce68b3f052ff52dee8') +md5sums=('859d856bdcbd12189ffb91c581928ed9' + '253ce4fe5d01f8ff76b63cd3825755ea') build() { cd "${srcdir}/${pkgname}" diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch index 40d48c03e..4dbf53757 100644 --- a/community/calibre/desktop_integration.patch +++ b/community/calibre/desktop_integration.patch @@ -1,6 +1,6 @@ ---- a/src/calibre/linux.py 2011-05-27 18:42:14.000000000 +0200 -+++ b/src/calibre/linux.py 2011-05-29 14:57:49.000000000 +0200 -@@ -340,51 +340,39 @@ +--- a/src/calibre/linux.py 2011-06-17 19:56:05.000000000 +0200 ++++ b/src/calibre/linux.py 2011-06-18 00:07:46.000000000 +0200 +@@ -339,51 +339,39 @@ with TemporaryDirectory() as tdir: with CurrentDir(tdir): diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD index 6c2216d1a..348a197d0 100644 --- a/community/camlp5/PKGBUILD +++ b/community/camlp5/PKGBUILD @@ -1,46 +1,62 @@ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Nathan Owe +# Contributor: George Giorgidze +# Contributor: Massimiliano Brocchini -pkgname=camlp5 -pkgver=6.02.2 +pkgname=('camlp5' 'camlp5-transitional') +pkgver=6.02.3 pkgrel=1 -pkgdesc='A preprocessor-pretty-printer of OCaml.' arch=('i686' 'x86_64') url='http://pauillac.inria.fr/~ddr/camlp5/' license=('BSD') depends=('sh') makedepends=('ocaml') -conflicts=('camlp5-transitional') options=('!makeflags') -source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/${pkgname}-${pkgver}.tgz" - 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-1' - 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-2' - 'http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.02.2-3') -md5sums=('b495bf26355451186c6725ee01add0da' - '3acab547f3c0acb3c09d1d707e6c5ee3' - '2e911c01e7da967bf68deee13e9712c8' - '6fa59ec7c684919b6c8e2eb2bcabcf93') +source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${pkgver}.tgz") +md5sums=('a4f5e0dc13c43d50eb655c8e929f556e') build() { - cd ${pkgname}-${pkgver} + cp -r camlp5-${pkgver} camlp5-transitional-${pkgver} - patch -Np0 -i ${srcdir}/patch-6.02.2-1 - patch -Np0 -i ${srcdir}/patch-6.02.2-2 - patch -Np0 -i ${srcdir}/patch-6.02.2-3 + cd ${srcdir}/camlp5-${pkgver} ./configure \ -prefix '/usr' \ -mandir '/usr/share/man' \ - -strict + -strict - make world.opt + make world.opt + + cd ${srcdir}/camlp5-transitional-${pkgver} + + ./configure \ + -prefix '/usr' \ + -mandir '/usr/share/man' \ + -transitional + + make world.opt } -package() { - cd ${pkgname}-${pkgver} +package_camlp5() { + pkgdesc='A preprocessor-pretty-printer of OCaml.' + conflicts=('camlp5-transitional') + + cd camlp5-${pkgver} + + make DESTDIR=${pkgdir} install + + install -D -m644 LICENSE \ + ${pkgdir}/usr/share/licenses/camlp5/LICENSE +} + +package_camlp5-transitional() { + pkgdesc='A preprocessor-pretty-printer of OCaml. (transitional)' + conflicts=('camlp5') + + cd camlp5-transitional-${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} install install -D -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + ${pkgdir}/usr/share/licenses/camlp5-transitional/LICENSE } diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD index 4358f1a53..1f88ecec8 100644 --- a/community/dosbox/PKGBUILD +++ b/community/dosbox/PKGBUILD @@ -1,37 +1,46 @@ -# $Id: PKGBUILD 46953 2011-05-13 20:41:08Z andrea $ +# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $ # Maintainer : +# Contribute : Jelle van der Waa # Contributor: James Rayner # Contributor: Ben pkgname=dosbox pkgver=0.74 -pkgrel=1 +pkgrel=2 pkgdesc="An emulator with builtin DOS for running DOS Games" arch=('i686' 'x86_64') url="http://dosbox.sourceforge.net/" license=('GPL') -depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') +depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') makedepends=('mesa') source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" - 'dosbox.png' 'dosbox.desktop') -md5sums=('b9b240fa87104421962d14eee71351e8' - '2aac25fc06979e375953fcc36824dc5e' - '85169ca599028bee8e29e0b3b7b34dd8') + 'dosbox.png' 'dosbox.desktop' 'gcc46.patch') build(){ cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's/png_check_sig/png_sig_cmp/' configure || return 1 - ./configure --prefix=/usr \ - --sysconfdir=/etc/dosbox || return 1 - make || return 1 + patch -Np1 -i $srcdir/gcc46.patch + sed -i 's/png_check_sig/png_sig_cmp/' configure + ./configure --prefix=/usr \ + --sysconfdir=/etc/dosbox + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install + + + # install docs, make does not install them + install -d $pkgdir/usr/share/doc/$pkgname + install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README + install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video install -Dm644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1 + ${pkgdir}/usr/share/pixmaps/${pkgname}.png install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1 + ${pkgdir}/usr/share/applications/${pkgname}.desktop } +md5sums=('b9b240fa87104421962d14eee71351e8' + '2aac25fc06979e375953fcc36824dc5e' + '85169ca599028bee8e29e0b3b7b34dd8' + '3fba2e3c7c43290319b2928f40ed30e5') diff --git a/community/dosbox/gcc46.patch b/community/dosbox/gcc46.patch new file mode 100644 index 000000000..eae9ae63e --- /dev/null +++ b/community/dosbox/gcc46.patch @@ -0,0 +1,12 @@ +diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h +--- dosbox-0.74/include/dos_inc.h 2010-05-10 17:43:54.000000000 +0000 ++++ dosbox-0.74.new//include/dos_inc.h 2011-06-17 20:42:43.982548979 +0000 +@@ -28,6 +28,8 @@ + #include "mem.h" + #endif + ++#include //for offsetof ++ + #ifdef _MSC_VER + #pragma pack (1) + #endif diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD index f66f426a0..432ccbef4 100644 --- a/community/ginac/PKGBUILD +++ b/community/ginac/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 38846 2011-02-02 01:49:37Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Thomas Baechler pkgname=ginac -pkgver=1.5.8 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 pkgdesc='A set of libraries that allow the creation of integrated systems that embed symbolic manipulations.' arch=('i686' 'x86_64') url='http://www.ginac.de' @@ -12,11 +11,11 @@ license=('GPL') depends=('cln') makedepends=('transfig') options=('!libtool') -source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8693b3c9c3467694032ce9c8b3063d4c') +source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2") +md5sums=('6d1385b440c00705a368ad51d60a292d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ginac-${pkgver} ./configure \ --prefix=/usr @@ -27,7 +26,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ginac-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR=${pkgdir} install } diff --git a/community/gnofract4d/PKGBUILD b/community/gnofract4d/PKGBUILD index 28e11bcea..4d8b5b0dd 100644 --- a/community/gnofract4d/PKGBUILD +++ b/community/gnofract4d/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Angelo Theodorou pkgname=gnofract4d -pkgver=3.13 -pkgrel=2 +pkgver=3.14 +pkgrel=1 pkgdesc='A fractal browser with PyGTK gui' arch=('i686' 'x86_64') url='http://gnofract4d.sourceforge.net' @@ -11,24 +11,20 @@ license=('custom') depends=('pygtk' 'libjpeg' 'libpng' 'shared-mime-info') options=('!strip') install='gnofract4d.install' -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'imageIO.cpp.patch') -md5sums=('d739eb0a61bc518ada8f5b8952298166' - 'ff29a621a27a3836de211c577f6ab9a4') +source=("http://downloads.sourceforge.net/sourceforge/gnofract4d/gnofract4d-${pkgver}.tar.gz") +md5sums=('5c4956ff9aed37b5ad8b984e3673937d') build() { - cd ${pkgname}-${pkgver} - - patch -p0 < ${srcdir}/imageIO.cpp.patch + cd gnofract4d-${pkgver} python2 setup.py build } package() { - cd ${pkgname}-${pkgver} + cd gnofract4d-${pkgver} python2 setup.py install --root=${pkgdir} --optimize=1 install -D -m644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + ${pkgdir}/usr/share/licenses/gnofract4d/COPYING } diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD index f3f1c41d0..3cc26cea6 100644 --- a/community/intel-tbb/PKGBUILD +++ b/community/intel-tbb/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Denis Martinez pkgname=intel-tbb -pkgver=3.0_20101215 +pkgver=3.0_20110427 pkgrel=1 pkgdesc='An award-winning C++ runtime library that abstracts the low-level threading details necessary for optimal multi-core performance.' arch=('i686' 'x86_64') url='http://www.threadingbuildingblocks.org/' license=('GPL') -source=("http://www.threadingbuildingblocks.org/uploads/77/164/3.0%20Update%205/tbb30_20101215oss_src.tgz") -md5sums=('d1f65b7ba8bafda5a8616dfc8159ea05') +source=("http://threadingbuildingblocks.org/uploads/77/171/3.0%20update%207/tbb30_20110427oss_src.tgz") +md5sums=('ba406f4767592179e7930e790036f00a') build() { cd tbb${pkgver/\./}oss diff --git a/community/mediatomb/PKGBUILD b/community/mediatomb/PKGBUILD index 56780af99..4b1245ce6 100644 --- a/community/mediatomb/PKGBUILD +++ b/community/mediatomb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 36085 2010-12-27 00:44:09Z jconder $ +# $Id: PKGBUILD 49488 2011-06-17 21:55:59Z jelle $ # Contributor: William Rea # Contributor: Nikhil Bysani # Contributor: Mika Hynnä @@ -6,23 +6,26 @@ pkgname=mediatomb pkgver=0.12.1 -pkgrel=3 +pkgrel=4 pkgdesc="Free UPnP/DLNA media server" arch=('i686' 'x86_64') url="http://mediatomb.cc/" license=('GPL') -depends=('libexif' 'taglib' 'sqlite3' 'spidermonkey' 'curl' 'ffmpegthumbnailer') +depends=('libexif' 'libmp4v2' 'taglib' 'sqlite3' 'spidermonkey' 'curl' 'ffmpegthumbnailer') backup=('etc/conf.d/mediatomb') install=mediatomb.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'mediatomb.rc' - 'mediatomb.conf') + 'mediatomb.conf' + 'gcc46.patch') md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2' 'aa1191ec508d8bd4b3b9a5fe48efc079' - 'bec297e4178332a26b42bbde873b94cd') + 'bec297e4178332a26b42bbde873b94cd' + '0ae34c0d73b76e3d215887834c3c08cf') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/gcc46.patch ./configure --prefix=/usr \ --disable-mysql \ @@ -39,5 +42,5 @@ package() { install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb" install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb" - mkdir -p "$pkgdir/var/lib/mediatomb" + install -d "$pkgdir/var/lib/mediatomb" } diff --git a/community/mediatomb/gcc46.patch b/community/mediatomb/gcc46.patch new file mode 100644 index 000000000..0f4fe490f --- /dev/null +++ b/community/mediatomb/gcc46.patch @@ -0,0 +1,10 @@ +--- a/src/zmm/object.h ++++ b/src/zmm/object.h +@@ -33,6 +33,7 @@ + #define __ZMM_OBJECT_H__ + + #include // for size_t ++#include + #include "atomic.h" + + namespace zmm diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index c3e44c8fa..c19206216 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.2 +pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64') url='http://www.mongodb.org' @@ -16,25 +16,15 @@ backup=('etc/mongodb.conf') install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' - 'mongodb.conf' - 'gcc46fixes.diff' - 'gcc46fixes2.diff') -md5sums=('e75a5cae641a53760df8cb866ad5d929' + 'mongodb.conf') +md5sums=('951fb1a75d90fc822cf4528585a970cf' '859f8f9bb32ef2bd21fec55ae9a87d0a' - '9e0ea3f96732bb7811f0b64dace56440' - 'e90c78350e25df2d24f98e4767677d4b' - '5097de6ce2c347c3703ab8cf5a611052') + '9e0ea3f96732bb7811f0b64dace56440') build() { export SCONSFLAGS="$MAKEFLAGS" - cd ${pkgname}-src-r${pkgver} - - patch -Np1 -i ${srcdir}/gcc46fixes.diff - patch -Np1 -i ${srcdir}/gcc46fixes2.diff - - # scons is "special" - sed -i 's/-Wall -Wsign-compare/& -DBOOST_FILESYSTEM_VERSION=2/' SConstruct + cd mongodb-src-r${pkgver} scons \ all \ @@ -42,7 +32,7 @@ build() { } package() { - cd ${pkgname}-src-r${pkgver} + cd mongodb-src-r${pkgver} scons \ install \ -- cgit v1.2.3-54-g00ecf