diff options
147 files changed, 4817 insertions, 275 deletions
diff --git a/community-testing/cclive/PKGBUILD b/community-testing/cclive/PKGBUILD new file mode 100644 index 000000000..5a1aa31de --- /dev/null +++ b/community-testing/cclive/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 59735 2011-11-30 06:33:49Z ibiru $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: joyfulgirl@archlinux.us +# Contributor: nathan owe ndowens04 at gmail dot com + +pkgname=cclive +pkgver=0.7.7 +pkgrel=2 +pkgdesc='Commandline downloader for popular video websites.' +arch=('i686' 'x86_64') +url='http://cclive.sourceforge.net/' +license=('GPL3') +depends=('boost-libs' 'pcre' 'curl' 'libquvi') +makedepends=('boost') +source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz") +md5sums=('8265be865a22fb477bcc050f0dc310dc') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/encfs/PKGBUILD b/community-testing/encfs/PKGBUILD new file mode 100644 index 000000000..6ef7f04e0 --- /dev/null +++ b/community-testing/encfs/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 59737 2011-11-30 06:33:54Z ibiru $ +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Sven Kauber, <celeon@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=encfs +pkgver=1.7.4 +pkgrel=6 +pkgdesc='Encrypted filesystem in user-space' +arch=('i686' 'x86_64') +url='http://www.arg0.net/encfs' +license=('GPL') +depends=('rlog' 'openssl' 'fuse' 'boost-libs') +makedepends=('boost') +options=('!libtool') +source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz") +md5sums=('ac90cc10b2e9fc7e72765de88321d617') + +build(){ + cd ${pkgname}-${pkgver} + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/fatrat/PKGBUILD b/community-testing/fatrat/PKGBUILD new file mode 100644 index 000000000..9dbaa161f --- /dev/null +++ b/community-testing/fatrat/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 59739 2011-11-30 06:33:58Z ibiru $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> + +pkgname=fatrat +pkgver=1.2.0_beta1 +pkgrel=2 +pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" +arch=('i686' 'x86_64') +url="http://fatrat.dolezel.info/" +license=('GPL') +depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net') +optdepends=('geoip: GeoIP support') +makedepends=('boost' 'cmake' 'java-environment') +source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) +md5sums=('7ce4d5e6318361f36ba5ac86a5755da9') + +build() { + cd $pkgname-$pkgver + + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + cmake \ + -DWITH_EVERYTHING=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + . + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/glob2/PKGBUILD b/community-testing/glob2/PKGBUILD new file mode 100644 index 000000000..d37bf3e08 --- /dev/null +++ b/community-testing/glob2/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 59741 2011-11-30 06:34:09Z ibiru $ +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> + +pkgname=glob2 +pkgver=0.9.4.4 +pkgrel=10 +pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" +arch=('i686' 'x86_64') +url="http://www.globulation2.org/" +license=('GPL3') +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' + 'fribidi' 'desktop-file-utils') +makedepends=('scons' 'boost') +install=glob2.install +source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz + glob2-0.9.4.1-gcc44.patch) +md5sums=('94c527325f355a29a2807f8f18a6e6a8' 'b13cb1f73ece23bfc6413773678d583e') +sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad' '3e5ae81d85a727387a7049c3a0dfb3db930391b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch" + scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share" +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + + scons install + find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \; + install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png" +} diff --git a/community-testing/glob2/glob2-0.9.4.1-gcc44.patch b/community-testing/glob2/glob2-0.9.4.1-gcc44.patch new file mode 100644 index 000000000..b425b25ec --- /dev/null +++ b/community-testing/glob2/glob2-0.9.4.1-gcc44.patch @@ -0,0 +1,87 @@ +diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h +--- libgag/include/StreamBackend.h.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/include/StreamBackend.h 2009-06-20 14:21:10.000000000 +0200 +@@ -43,7 +43,7 @@ namespace GAGCore + virtual void flush(void) = 0; + virtual void read(void *data, size_t size) = 0; + virtual void putc(int c) = 0; +- virtual int getc(void) = 0; ++ virtual int get_c(void) = 0; + virtual void seekFromStart(int displacement) = 0; + virtual void seekFromEnd(int displacement) = 0; + virtual void seekRelative(int displacement) = 0; +@@ -67,7 +67,7 @@ namespace GAGCore + virtual void flush(void) { assert(fp); fflush(fp); } + virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); } + virtual void putc(int c) { assert(fp); fputc(c, fp); } +- virtual int getc(void) { assert(fp); return fgetc(fp); } ++ virtual int get_c(void) { assert(fp); return fgetc(fp); } + virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); } + virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); } + virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); } +@@ -92,7 +92,7 @@ namespace GAGCore + virtual void flush(void); + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +@@ -117,7 +117,7 @@ namespace GAGCore + virtual void flush(void) { } + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp +--- libgag/src/StreamBackend.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/StreamBackend.cpp 2009-06-20 14:21:53.000000000 +0200 +@@ -75,9 +75,9 @@ namespace GAGCore + buffer->putc(c); + } + +- int ZLibStreamBackend::getc(void) ++ int ZLibStreamBackend::get_c(void) + { +- return buffer->getc(); ++ return buffer->get_c(); + } + + void ZLibStreamBackend::seekFromStart(int displacement) +@@ -147,7 +147,7 @@ namespace GAGCore + write(&ch, 1); + } + +- int MemoryStreamBackend::getc(void) ++ int MemoryStreamBackend::get_c(void) + { + Uint8 ch; + read(&ch, 1); +diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp +--- libgag/src/Stream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/Stream.cpp 2009-06-20 14:21:35.000000000 +0200 +@@ -60,7 +60,7 @@ namespace GAGCore
+ std::string s;
+ while (1)
+ {
+- int c = backend->getc();
++ int c = backend->get_c();
+ if(c=='\r')
+ continue;
+ if ((c >= 0) && (c != '\n'))
+diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp +--- libgag/src/TextStream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/TextStream.cpp 2009-06-20 14:21:22.000000000 +0200 +@@ -150,7 +150,7 @@ namespace GAGCore + + int nextChar(void) + { +- next = stream->getc(); ++ next = stream->get_c(); + if (next == '\n') + { + column = 0; diff --git a/community-testing/glob2/glob2.install b/community-testing/glob2/glob2.install new file mode 100644 index 000000000..7463b6e76 --- /dev/null +++ b/community-testing/glob2/glob2.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} + diff --git a/community-testing/glom/PKGBUILD b/community-testing/glom/PKGBUILD new file mode 100644 index 000000000..49a10f1cc --- /dev/null +++ b/community-testing/glom/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 59793 2011-11-30 10:06:16Z heftig $ +# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=glom +pkgver=1.20.1 +pkgrel=1 +pkgdesc="An easy-to-use database designer and user interface" +arch=('i686' 'x86_64') +url="http://www.glom.org/" +license=('GPL') +depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql') +makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('c76edc09d767eb2de8673fa8bb1cebbf8863fb3c8eb365e4a42fc430730f68d5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + + ./configure --prefix=/usr \ + --with-postgres-utils=/usr/bin \ + --disable-scrollkeeper \ + --disable-update-mime-database \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/glom/glom.install b/community-testing/glom/glom.install new file mode 100644 index 000000000..1ad77f9aa --- /dev/null +++ b/community-testing/glom/glom.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} diff --git a/community-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD new file mode 100644 index 000000000..8b5849e88 --- /dev/null +++ b/community-testing/gnash/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgbase=gnash +pkgname=(gnash-common gnash-gtk) +pkgver=0.8.9 +pkgrel=7 +arch=(i686 x86_64) +url="http://www.gnu.org/software/gnash/" +license=(GPL3) +makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool + speex fontconfig libva ffmpeg libxinerama + gstreamer0.10-base gstreamer0.10-ffmpeg + gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils + pkgconfig boost) +options=(!libtool !emptydirs) +source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 + gentoo-ffmpeg-0.8.patch xul8.patch) +md5sums=('5b2be6b04a1bcc5fb404cc377034499e' + '98dec9a5c1b1084245a3f46b4022a6e2' + '9b77325d0b8b9d4150c4097771482d26') + +build() { + cd "$srcdir/gnash-$pkgver" + + # Consolidated gentoo patches for ffmpeg compatibility + # as of 2011-10-31 + patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch" + + # Patch for compatibility with newer xulrunner headers + patch -Np1 -i "$srcdir/xul8.patch" + + ./autogen.sh + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-plugins-install=system \ + --with-npapi-plugindir=/usr/lib/mozilla/plugins \ + --enable-gui=sdl,gtk \ + --enable-renderer=agg \ + --enable-media=gst,ffmpeg \ + --enable-hwaccel=vaapi + + make +} + +package_gnash-common() { + pkgdesc="A GNU Flash movie player" + depends=(curl giflib libldap sdl agg libjpeg libpng libtool + speex fontconfig libva ffmpeg libxinerama + gstreamer0.10-base gstreamer0.10-ffmpeg + boost-libs) + backup=(etc/gnashrc) + + cd "$srcdir/gnash-$pkgver" + + make DESTDIR="$pkgdir" install + + # Split gnash-gtk + mkdir -p "$srcdir"/gtk/{bin,man1,share} + mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} "$srcdir/gtk/bin/" + mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 "$srcdir/gtk/man1/" + mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/share/" + mv "$pkgdir/etc/gnashpluginrc" "$srcdir/gtk/" +} + +package_gnash-gtk() { + pkgdesc="A GNU Flash movie player" + depends=("gnash-common=$pkgver" + gtk2 libldap hicolor-icon-theme desktop-file-utils) + install=gnash-gtk.install + backup=(etc/gnashpluginrc) + + cd "$srcdir/gnash-$pkgver" + + make DESTDIR="$pkgdir" install-plugin + + install -d "$pkgdir"/{etc,usr/{bin,share/man/man1}} + mv "$srcdir"/gtk/bin/* "$pkgdir/usr/bin/" + mv "$srcdir"/gtk/man1/* "$pkgdir/usr/share/man/man1/" + mv "$srcdir"/gtk/share/* "$pkgdir/usr/share/" + mv "$srcdir/gtk/gnashpluginrc" "$pkgdir/etc/" +} diff --git a/community-testing/gnash/gentoo-ffmpeg-0.8.patch b/community-testing/gnash/gentoo-ffmpeg-0.8.patch new file mode 100644 index 000000000..d74bcc8e0 --- /dev/null +++ b/community-testing/gnash/gentoo-ffmpeg-0.8.patch @@ -0,0 +1,204 @@ +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-10-31 17:25:56.057379760 +0100 +@@ -29,7 +29,7 @@ + + //#define GNASH_DEBUG_AUDIO_DECODING + +-#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2 ++#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3 + + namespace gnash { + namespace media { +@@ -549,8 +549,12 @@ + #endif + + // older ffmpeg versions didn't accept a const input.. ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = (uint8_t*) input; ++ pkt.size = inputSize; + int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize, +- input, inputSize); ++ &pkt); + + #ifdef GNASH_DEBUG_AUDIO_DECODING + log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) " +@@ -658,13 +662,13 @@ + { + if ( _needsParsing ) + { +- return av_parser_parse(_parser, _audioCodecCtx, ++ return av_parser_parse2(_parser, _audioCodecCtx, + // as of 2008-10-28 SVN, ffmpeg doesn't + // accept a pointer to pointer to const.. + const_cast<boost::uint8_t**>(outFrame), + outFrameSize, + input, inputSize, +- 0, 0); // pts & dts ++ 0, 0, AV_NOPTS_VALUE); // pts & dts + } + else + { +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-10-31 17:25:51.210668136 +0100 +@@ -46,8 +46,10 @@ + { + if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) { + if ( ! _context ) { +- _context = audio_resample_init( +- 2, ctx->channels, 44100, ctx->sample_rate ++ _context = av_audio_resample_init( ++ 2, ctx->channels, 44100, ctx->sample_rate, ++ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, ++ 16, 10, 0, 0.8 + ); + } + +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-10-31 17:25:57.720728522 +0100 +@@ -387,7 +387,7 @@ + + log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d", + _inputFmt->name, _formatCtx->nb_streams); +- ++ /* + if ( _formatCtx->title[0] ) + log_debug(_(" Title:'%s'"), _formatCtx->title); + if ( _formatCtx->author[0] ) +@@ -398,7 +398,7 @@ + log_debug(_(" Comment:'%s'"), _formatCtx->comment); + if ( _formatCtx->album[0] ) + log_debug(_(" Album:'%s'"), _formatCtx->album); +- ++ */ + // Find first audio and video stream + for (unsigned int i = 0; i < static_cast<unsigned int>(_formatCtx->nb_streams); i++) + { +@@ -415,7 +415,7 @@ + } + + switch (enc->codec_type) { +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + if (_audioStreamIndex < 0) { + _audioStreamIndex = i; + _audioStream = _formatCtx->streams[i]; +@@ -425,7 +425,7 @@ + } + break; + +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + if (_videoStreamIndex < 0) { + _videoStreamIndex = i; + _videoStream = _formatCtx->streams[i]; +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-10-31 17:25:54.590699488 +0100 +@@ -356,8 +356,12 @@ + + int bytes = 0; + // no idea why avcodec_decode_video wants a non-const input... +- avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes, +- input, input_size); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = (uint8_t*) input; ++ pkt.size = input_size; ++ avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes, ++ &pkt); + + if (!bytes) { + log_error("Decoding of a video frame failed"); +diff -u -Nr gnash-0.8.9/macros/ffmpeg.m4 gnash-0.8.9-ff/macros/ffmpeg.m4 +--- gnash-0.8.9/macros/ffmpeg.m4 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/macros/ffmpeg.m4 2011-10-31 17:25:49.700654130 +0100 +@@ -22,6 +22,7 @@ + backupLIBS="$LIBS" + backupCFLAGS="$CFLAGS" + avcodec_h="" ++ avcodec_version_h="" + ffmpeg_top_incl="" + + dnl If the user specify an path to include headers from, we assume it's the full +@@ -46,6 +47,9 @@ + else + AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header]) + fi ++ if test -f ${with_ffmpeg_incl}/version.h; then ++ avcodec_version_h=${with_ffmpeg_incl}/version.h ++ fi + fi + ]) + +@@ -66,6 +70,9 @@ + if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then + ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`" + avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h" ++ if test -f ${ffmpeg_top_incl}/${i}/version.h; then ++ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h ++ fi + break + fi + done +@@ -83,6 +90,9 @@ + if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then + ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`" + avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h ++ if test -f ${ffmpeg_top_incl}/${i}/version.h; then ++ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h ++ fi + break + fi + done +@@ -182,14 +192,24 @@ + dnl a modified form of grepping may be better, making sure all old kinds of + dnl version numbering fail gracefully. + ++ versionfile="" ++ + dnl Check avcodec version number, if it was found +- if test x"${avcodec_h}" != x; then ++ if test x"${avcodec_version_h}" != x; then ++ versionfile=${avcodec_version_h} ++ else ++ if test x"${avcodec_h}" != x; then ++ versionfile=${avcodec_h} ++ fi ++ fi ++ ++ if test x"${versionfile}" != x; then + + AC_MSG_CHECKING([ffmpeg version]) + +- ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` +- ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` +- ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"` + + if test x"${ffmpeg_major_version}" != x ; then + +@@ -198,15 +218,15 @@ + else + + dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1 +- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"` + + if test x"${ffmpeg_version}" = x ; then + + dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix +- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` + + if test x"${ffmpeg_version}" = x ; then +- ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'` + fi + fi + diff --git a/community-testing/gnash/gnash-gtk.install b/community-testing/gnash/gnash-gtk.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/community-testing/gnash/gnash-gtk.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/gnash/xul8.patch b/community-testing/gnash/xul8.patch new file mode 100644 index 000000000..7bd708b2d --- /dev/null +++ b/community-testing/gnash/xul8.patch @@ -0,0 +1,44 @@ +diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp +--- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-11-18 16:25:55.198007371 +0100 +@@ -238,7 +238,7 @@ + return NS_PluginInitialize(); + } + +-char * ++const char * + NP_GetMIMEDescription(void) + { + return NPP_GetMIMEDescription(); +diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp +--- gnash-0.8.9/plugin/npapi/plugin.cpp 2011-03-18 14:44:30.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp 2011-11-18 16:35:42.496794816 +0100 +@@ -128,10 +128,10 @@ + } + + /// \brief Return the MIME Type description for this plugin. +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- return const_cast<char *>(MIME_TYPES_DESCRIPTION); ++ return MIME_TYPES_DESCRIPTION; + } + + static bool waitforgdb = false; +diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp +--- gnash-0.8.9/plugin/npapi/test.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/test.cpp 2011-11-18 16:37:06.997539299 +0100 +@@ -408,10 +408,10 @@ + { + } + +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- char *x = 0; ++ const char *x = 0; + return x; + } + diff --git a/community-testing/gpsdrive/PKGBUILD b/community-testing/gpsdrive/PKGBUILD new file mode 100644 index 000000000..bdc6b9143 --- /dev/null +++ b/community-testing/gpsdrive/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 59747 2011-11-30 06:34:34Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Maintainer: damir <damir@archlinux.org> + +pkgname=gpsdrive +pkgver=2.11 +pkgrel=11 +pkgdesc="A car (bike, ship, plane) navigation system" +arch=("i686" "x86_64") +url="http://www.gpsdrive.de/" +license=('GPL2') +depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn' + 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri' + 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer' + ) # already in core ('sqlite3') +makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') +install="gpsdrive.install" +source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz" + "gpsd-2.96.patch") +md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c' + '5769e12c6d8932fb721212434c64f505') + +build() { + cd "$srcdir" + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done + + rm -rf build + mkdir build + cd build + + # fix the mapnik default values + sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" + sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" + + export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + unset LDFLAGS + + # see DefineOptions.cmake for a list of common options and defaults + # cmake -L for a more in-depth listing + cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \ + -DWITH_SCRIPTS=ON \ + -DWITH_MAPNIK=ON \ + -DWITH_POSTGIS=ON \ + -DWITH_GDAL=ON \ + -DWITH_BASEMAPS=ON \ + -DWITH_FRIENDSD=ON \ + -DWITH_KISMET=ON \ + -DWITH_NAVIGATION=ON \ + -DWITH_SPEECH=OFF \ + -DWITH_DBUS=OFF \ + -DLIBGPS_OLD=OFF \ + "$srcdir/gpsdrive-$pkgver" + (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch) + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/gpsdrive/gpsd-2.96.patch b/community-testing/gpsdrive/gpsd-2.96.patch new file mode 100644 index 000000000..bc6c7475f --- /dev/null +++ b/community-testing/gpsdrive/gpsd-2.96.patch @@ -0,0 +1,44 @@ +diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c +--- gpsdrive-2.11/src/gps_handler.c 2010-06-24 19:53:32.000000000 +0000 ++++ gpsdrive-2.11.my/src/gps_handler.c 2011-04-18 13:21:33.000000000 +0000 +@@ -264,7 +264,8 @@ + #define GPS_TIMER 500 + + static gint gps_timeout_source = 0; +-static struct gps_data_t *gpsdata; ++static struct gps_data_t __gd; ++static struct gps_data_t *gpsdata = &__gd; + + /* SYMBOLS USED IN LIBGPS: + * +@@ -410,9 +411,10 @@ + */ + gps_query (gpsdata, "oys\n"); + #else +- if (gps_waiting(gpsdata)) ++ if (gps_waiting(gpsdata, 1000000)) + { +- gps_poll (gpsdata); ++ gps_read (gpsdata); ++ gps_hook_cb(gpsdata, NULL); + } + #endif + +@@ -447,7 +449,7 @@ + } + + /* try to open connection */ +- gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port); ++ gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd; + if (!gpsdata) + { + g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n", +@@ -466,7 +468,7 @@ + gps_sats = g_new (gps_satellite_struct, MAXCHANNELS); + + /* set hook function to handle gps data */ +- gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); ++// gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); + + #ifndef LIBGPS_OLD + /* enable watch mode to get data stream from gpsd */ diff --git a/community-testing/gpsdrive/gpsdrive.install b/community-testing/gpsdrive/gpsdrive.install new file mode 100644 index 000000000..8ea63912e --- /dev/null +++ b/community-testing/gpsdrive/gpsdrive.install @@ -0,0 +1,4 @@ +post_install() { + echo "Don't forget to generate geoinfo.db with geoinfo.pl script" + echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive" +} diff --git a/community-testing/lightspark/PKGBUILD b/community-testing/lightspark/PKGBUILD new file mode 100644 index 000000000..f64e7e5d1 --- /dev/null +++ b/community-testing/lightspark/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=lightspark +pkgver=0.5.2.1 +pkgrel=3 +pkgdesc='An alternative Flash Player for Linux.' +arch=('i686' 'x86_64') +url='http://lightspark.sourceforge.net' +license=('LGPL3') +conflicts=('lightspark-git') +depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2') +makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig') +optdepends=('gnash-gtk: fallback support') +install="lightspark.install" +source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz" + 'llvm29.diff') +md5sums=('ac2233a83e8bf0b305563bbce322cd76' + '5f717d1d9ead478184ca68f6ac068099') + +build() { + cd lightspark-${pkgver} + patch -Np0 -i ${srcdir}/llvm29.diff + cd ${srcdir} + + rm -rf build + mkdir build + cd build + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCOMPILE_PLUGIN=1 \ + -DCMAKE_BUILD_TYPE=Release \ + -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ + ../lightspark-${pkgver} + + make +} + +package() { + cd build + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/lightspark/lightspark.install b/community-testing/lightspark/lightspark.install new file mode 100644 index 000000000..75e2b7b55 --- /dev/null +++ b/community-testing/lightspark/lightspark.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-testing/lightspark/llvm29.diff b/community-testing/lightspark/llvm29.diff new file mode 100644 index 000000000..f859852af --- /dev/null +++ b/community-testing/lightspark/llvm29.diff @@ -0,0 +1,12 @@ +--- CMakeLists.txt.old 2011-11-01 22:07:52.475608726 +0000 ++++ CMakeLists.txt 2011-11-01 22:08:52.046241925 +0000 +@@ -152,7 +152,8 @@ + MESSAGE(FATAL_ERROR "LLVM >=2.8 is required!") + ENDIF(${LLVM_STRING_VERSION} VERSION_LESS 2.8) + IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) +- MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") ++ #MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") ++ ADD_DEFINITIONS(-DLLVM_29) + ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) + IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8) + ADD_DEFINITIONS(-DLLVM_28) diff --git a/community-testing/luxrays/PKGBUILD b/community-testing/luxrays/PKGBUILD new file mode 100644 index 000000000..16b917a90 --- /dev/null +++ b/community-testing/luxrays/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 59751 2011-11-30 06:34:49Z ibiru $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +pkgname=luxrays +pkgver=0.8 +_pkgver=ed424ec77571 +pkgrel=7 +epoch=0 +pkgdesc="Accelerate the ray intersection process by using GPUs" +arch=('i686' 'x86_64') +url="http://www.luxrender.net/" +license=('GPL') +depends=('freeimage' 'freeglut' 'glew' 'libcl') +makedepends=('cmake' 'boost' 'opencl-headers') +source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \ + luxrays_opencl1.2_use_deprecated.diff) +md5sums=('2ac9c588675c5971c57f473ef10ac67d' + '27b3eb7c6332aa7f040cc4ca94dc3df6') + +build() { + cd "$srcdir/luxrender-$pkgname-$_pkgver" + + # fix the build with opencl-headers 1.2 + # they doesn't support OpenCL 1.1, so we have to use this ugly hack of using deprecated API + patch -Np1 < "$srcdir/luxrays_opencl1.2_use_deprecated.diff" + # fix the break caused by the change of the name of the namespace 'detail' to 'ipcdetail' + sed -i 's|::detail|::ipcdetail|' include/luxrays/utils/core/atomic.h + + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DLUXRAYS_DISABLE_OPENCL=OFF \ + . + make +} + +package() { + cd "$srcdir/luxrender-$pkgname-$_pkgver" + + install -d -m755 "$pkgdir"/usr/{bin,include,lib} + install -m755 bin/* "$pkgdir"/usr/bin + install -m644 lib/* "$pkgdir"/usr/lib + cp -a include/luxrays "$pkgdir"/usr/include +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/luxrays/luxrays_opencl1.2_use_deprecated.diff b/community-testing/luxrays/luxrays_opencl1.2_use_deprecated.diff new file mode 100644 index 000000000..0876628d7 --- /dev/null +++ b/community-testing/luxrays/luxrays_opencl1.2_use_deprecated.diff @@ -0,0 +1,12 @@ +diff -rup luxrender-luxrays-ed424ec77571.orig/include/luxrays/luxrays.h luxrender-luxrays-ed424ec77571/include/luxrays/luxrays.h +--- luxrender-luxrays-ed424ec77571.orig/include/luxrays/luxrays.h 2011-04-24 17:43:08.000000000 +0200 ++++ luxrender-luxrays-ed424ec77571/include/luxrays/luxrays.h 2011-11-26 11:38:00.336459874 +0100 +@@ -30,6 +30,8 @@ + + #define __CL_ENABLE_EXCEPTIONS + ++#define CL_USE_DEPRECATED_OPENCL_1_1_APIS ++ + #if defined(__APPLE__) + #include <OpenCL/cl.hpp> + #else diff --git a/community-testing/luxrender/PKGBUILD b/community-testing/luxrender/PKGBUILD new file mode 100644 index 000000000..94b0921d3 --- /dev/null +++ b/community-testing/luxrender/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 59753 2011-11-30 06:34:57Z ibiru $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Initial contributor: flixie <69one@gmx.net> +# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> +pkgname=luxrender +pkgver=0.8 +_pkgver=45d3e13eb94c +_luxblend=9cb3fcee0be8 +_blender=2.60 +pkgrel=10 +pkgdesc="Rendering system for physically correct, unbiased image synthesis" +arch=('i686' 'x86_64') +url="http://www.luxrender.net/" +license=('GPL') +depends=('boost-libs' 'freeimage' 'openexr' 'libcl') +optdepends=('blender: Blender exporter' 'qt: Qt GUI' \ + 'nvidia-utils: OpenCL support for nVidia GPUs' \ + 'amdstream: OpenCL support for AMD GPUs' \ + 'intel-opencl-sdk: OpenCL support for Intel CPUs') +makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python' 'opencl-headers') +source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2 \ + https://bitbucket.org/luxrender/luxblend25/get/v08-2.60.tar.bz2) +md5sums=('0f2d856385db72131f51e44a7ee527fa' + '004596f577bbe681358c40507b2583e8') + +build() { + cd "$srcdir"/luxrender-lux-$_pkgver + + sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt + + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUXRAYS_DISABLE_OPENCL=OFF \ + -DPYTHON_CUSTOM=ON \ + -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \ + . + make +} + +package() { + cd "$srcdir"/luxrender-lux-$_pkgver + make DESTDIR="$pkgdir" install + + # fix library path on x86_64 + [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib + + # install the blender exporter + install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons + cp -a "$srcdir"/luxrender-luxblend25-v08-2.60/src/luxrender \ + "$pkgdir"/usr/share/blender/$_blender/scripts/addons + cp -a "$srcdir"/luxrender-lux-$_pkgver/pylux.so "$pkgdir"/usr/share/blender/$_blender/scripts/addons/luxrender/ +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/mapnik/PKGBUILD b/community-testing/mapnik/PKGBUILD new file mode 100644 index 000000000..aa4e05fad --- /dev/null +++ b/community-testing/mapnik/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 59755 2011-11-30 06:35:07Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: David Dent <thewinch@gmail.com> +# Contributor: orbisvicis <orbisvicis@gmail.com> + +pkgname=mapnik +pkgver=0.7.1 +pkgrel=12 +pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." +arch=('i686' 'x86_64') +url="http://mapnik.org/" +license=('LGPL') +depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' + 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' + 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool') + # already in core ('zlib' 'sqlite3') +optdepends=('libxslt: Web Map Service' + 'python-lxml: Web Map Service' + 'python-imaging: Web Map Service' + 'python-nose: Web Map Service' + 'apache: Web Map Service' + 'mod_fastcgi: Web Map Service - or:' + 'mod_fcgid: Web Map Service - or:' + 'mod_wsgi: Web Map Service' + ) +makedepends=('scons' 'boost') # already in core ('pkg-config') +conflicts=('mapnik-svn') +install="mapnik.install" +source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('8f65fda2a792518d6f6be8a85f62fc73') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64 + sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct + + sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct + + scons configure \ + PREFIX="/usr" \ + INPUT_PLUGINS=all \ + DESTDIR="$pkgdir" + scons +} +package(){ + cd "$srcdir/$pkgname-$pkgver" + scons install + + # fix permissions on SCons-autogenerated files + chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py" +} diff --git a/community-testing/mapnik/mapnik.install b/community-testing/mapnik/mapnik.install new file mode 100644 index 000000000..46f265d5b --- /dev/null +++ b/community-testing/mapnik/mapnik.install @@ -0,0 +1,11 @@ +post_install() { + /sbin/ldconfig +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/mongodb/PKGBUILD b/community-testing/mongodb/PKGBUILD new file mode 100644 index 000000000..aac341450 --- /dev/null +++ b/community-testing/mongodb/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Mathias Stearn <mathias@10gen.com> +# Contributor: Alec Thomas + +pkgname=mongodb +pkgver=2.0.1 +pkgrel=3 +pkgdesc='A high-performance, open source, schema-free document-oriented database.' +arch=('i686' 'x86_64') +url='http://www.mongodb.org' +license=('AGPL3') +depends=('boost-libs') +makedepends=('scons' 'boost') +#checkdepends=('python2-pymongo') +optdepends=('libpcap: needed for mongosniff') +backup=('etc/mongodb.conf') +install="mongodb.install" +source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" + 'mongodb.rc' + 'mongodb.conf') +md5sums=('cb8579074b7c9752eb382a2094ac4523' + '9c67e00f4626ad761a8f7d4e037a54d7' + '4839fe1d638187ca3226e8267b947318') + +build() { + export SCONSFLAGS="$MAKEFLAGS" + + cd mongodb-src-r${pkgver} + + # fix python name for smoke tests + sed \ + -e 's/python/&2/' \ + -i SConstruct + + scons \ + all \ + --full +} + +<<COMMENT +check() { + export SCONSFLAGS="$MAKEFLAGS" + + cd mongodb-src-r${pkgver} + + scons \ + smokeAll \ + --smokedbprefix=${srcdir} +} +COMMENT + +package() { + export SCONSFLAGS="$MAKEFLAGS" + + cd mongodb-src-r${pkgver} + + scons \ + install \ + --full \ + --prefix=${pkgdir}/usr + + install -D -m755 ${srcdir}/mongodb.rc \ + ${pkgdir}/etc/rc.d/mongodb + install -D -m644 ${srcdir}/mongodb.conf \ + ${pkgdir}/etc/mongodb.conf + install -d -m700 ${pkgdir}/var/lib/mongodb + install -d -m755 ${pkgdir}/var/log/mongodb + + if [ -d ${pkgdir}/usr/lib64 ]; then + mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib + fi +} diff --git a/community-testing/mongodb/mongodb.conf b/community-testing/mongodb/mongodb.conf new file mode 100644 index 000000000..c5272b7f2 --- /dev/null +++ b/community-testing/mongodb/mongodb.conf @@ -0,0 +1,8 @@ +# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details +# Run mongod --help to see a list of options + +bind_ip = 127.0.0.1 +quiet = true +dbpath = /var/lib/mongodb +logpath = /var/log/mongodb/mongod.log +logappend = true diff --git a/community-testing/mongodb/mongodb.install b/community-testing/mongodb/mongodb.install new file mode 100755 index 000000000..3922c12ef --- /dev/null +++ b/community-testing/mongodb/mongodb.install @@ -0,0 +1,32 @@ +# vim: syntax=sh + +post_install() { + useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb + chown -R mongodb:daemon /var/lib/mongodb + chown -R mongodb:daemon /var/log/mongodb + + if [ "$(arch)" != "x86_64" ] + then + echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.' + echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations' + fi +} + +post_upgrade() { + chown -R mongodb:daemon /var/lib/mongodb + chown -R mongodb:daemon /var/log/mongodb + + if [ "$(vercmp $2 1.8.2-3)" -lt 0 ] + then + # have to fix my fudge up in 1.8.2-2 and 1.8.2-3 + # added july 5th, 2011 + usermod -s /bin/bash mongodb >& /dev/null + echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb' + echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb' + echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log' + fi +} + +pre_remove() { + userdel mongodb +} diff --git a/community-testing/mongodb/mongodb.rc b/community-testing/mongodb/mongodb.rc new file mode 100755 index 000000000..30f2bbf79 --- /dev/null +++ b/community-testing/mongodb/mongodb.rc @@ -0,0 +1,39 @@ +#!/bin/bash +# vim: syntax=sh + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof /usr/bin/mongod) +case "$1" in + start) + stat_busy "Starting mongodb" + [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon mongodb + stat_done + fi + ;; + stop) + stat_busy "Stopping mongodb" + [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon mongodb + while [ ! -z "$(pidof /usr/bin/mongod)" ]; do + sleep 1; + done + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/mygui/PKGBUILD b/community-testing/mygui/PKGBUILD new file mode 100644 index 000000000..b847f0e48 --- /dev/null +++ b/community-testing/mygui/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 59808 2011-11-30 13:49:11Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Andrew Belitsky <belitsky.a@gmail.com> +pkgbase=mygui +pkgname=('mygui' 'mygui-docs') +pkgver=3.2.0rc1 +pkgrel=10 +pkgdesc="A multilayer and overlappable GUI System for OGRE" +arch=('i686' 'x86_64') +url="http://mygui.info/" +license=('LGPL') +depends=('boost-libs' 'ogre' 'ois') +makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu') +install=mygui.install +source=("http://downloads.sourceforge.net/my-gui/MyGUI_3.2.0_RC1.zip") +md5sums=('1ac1340148e81ad49a26c8a87acefc6b') + +build() { + cd $srcdir/MyGUI_3.2.0_RC1 + + # change CMake config so demos install to /opt + sed -i 's:"bin:"../opt/MYGUI:' CMake/Utils/MyGUIConfigTargets.cmake + sed -i -e 's:../share:/usr/share:' \ + -e 's:"bin":"../opt/MYGUI":' \ + CMake/InstallResources.cmake + + # get a clean build dir + [[ -d build ]] && rm -rf build + mkdir build && cd build + + # generate CMake Makefile + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMYGUI_INSTALL_SAMPLES=TRUE \ + -DMYGUI_INSTALL_TOOLS=TRUE \ + -DMYGUI_INSTALL_DOCS=TRUE \ + -DMYGUI_INSTALL_MEDIA=TRUE \ + -DCMAKE_BUILD_TYPE=Release # set=Debug for debugging version + + # compile + make + + # generate docs + if [[ $(which dot) && $(which doxygen) ]]; then + make api-docs 2>/dev/null + fi +} + +package_mygui() { + optdepends=('mygui-docs: documentation') + + cd $srcdir/MyGUI_3.2.0_RC1 + + cd build + + # install the whole bunch + make DESTDIR="$pkgdir" install + + # make demos work + chown root:users $pkgdir/opt/MYGUI + chmod 775 $pkgdir/opt/MYGUI +} + +package_mygui-docs() { + pkgdesc="Documentation for mygui" + depends=() + + cd $srcdir/MyGUI_3.2.0_RC1 + + cd build + + # install docs + install -d $pkgdir/usr/share/doc/ + cp -r Docs/html $pkgdir/usr/share/doc/MYGUI +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/mygui/mygui.install b/community-testing/mygui/mygui.install new file mode 100644 index 000000000..8db799a0e --- /dev/null +++ b/community-testing/mygui/mygui.install @@ -0,0 +1,3 @@ +post_install() { + echo "To view the MyGUI samples, go to /opt/MYGUI/ and run the samples individually" +} diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD new file mode 100644 index 000000000..e73a71da4 --- /dev/null +++ b/community-testing/performous/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 59761 2011-11-30 06:35:33Z ibiru $ +# Maintainer : Laurent Carlier <lordheavym@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=performous +pkgver=0.6.1 +pkgrel=11 +pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' +arch=('i686' 'x86_64') +url="http://performous.org/" +license=('GPL') +depends=('boost-libs>=1.48' 'imagemagick' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg') +#depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ +# 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') +makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48') +optdepends=('performous-freesongs: free songs for performous') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 + boost-filesystem-v3.patch + ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a") +md5sums=('451a759de77984b5a699e91107fe52e2' + '42a8c825d80b0de16bd5752d2a80e585' + 'ff0ffa681dfaa09c4f42133a65309bf0') + +build() { + cd ${srcdir}/Performous-${pkgver}-Source + + # fix to built against boost 1.46 and later, upstream (git) now support v3 + patch -Np1 -i ../boost-filesystem-v3.patch + # fix with ffmpeg-0.8 + patch -Np1 -i ../ffmpeg-0.8.patch + + mkdir -p build + cd build + + # fix config loading with libxml++ + export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} + + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr .. + + make +} + +package() { + cd ${srcdir}/Performous-${pkgver}-Source/build + + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/performous/boost-filesystem-v3.patch b/community-testing/performous/boost-filesystem-v3.patch new file mode 100644 index 000000000..22dd07213 --- /dev/null +++ b/community-testing/performous/boost-filesystem-v3.patch @@ -0,0 +1,135 @@ +diff --git a/game/backgrounds.cc b/game/backgrounds.cc +index 7fd3cd0..cdedefb 100644 +--- a/game/backgrounds.cc ++++ b/game/backgrounds.cc +@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) { + for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { + fs::path p = dirIt->path(); + if (fs::is_directory(p)) { reload_internal(p); continue; } ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename + std::string path = p.directory_string(); // Path without filename ++#else ++ std::string name = p.filename().string(); // File basename ++ std::string path = p.string(); // Path without filename ++#endif + path.erase(path.size() - name.size()); + if (!regex_match(name.c_str(), match, expression)) continue; + { +diff --git a/game/cache.cc b/game/cache.cc +index 69974e2..0f1edd0 100644 +--- a/game/cache.cc ++++ b/game/cache.cc +@@ -9,7 +9,11 @@ namespace cache { + fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){ + fs::path cache_filename; + std::string const lod = (boost::format("%.2f") % factor).str(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png"; ++#else ++ std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png"; ++#endif + + if (isThemeResource(svgfilename)) { + std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s()); +diff --git a/game/filemagic.hh b/game/filemagic.hh +index bf87ded..29e81fe 100644 +--- a/game/filemagic.hh ++++ b/game/filemagic.hh +@@ -71,7 +71,11 @@ namespace filemagic { + // For now, just check the extension an assume it's not lying. + + // Get file extension in lower case ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string ext = filename.extension(); ++#else ++ std::string ext = filename.extension().string(); ++#endif + // somehow this does not convert the extension to lower case: + //std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower)); + std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower ); +diff --git a/game/fs.cc b/game/fs.cc +index e34a784..767a7ab 100644 +--- a/game/fs.cc ++++ b/game/fs.cc +@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) { + + bool isThemeResource(fs::path filename){ + try { ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string themefile = getThemePath(filename.filename()); ++#else ++ std::string themefile = getThemePath(filename.filename().string()); ++#endif + return themefile == filename; + } catch (...) { return false; } + } +diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc +index 38e163b..db15d79 100644 +--- a/game/songparser-ini.cc ++++ b/game/songparser-ini.cc +@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() { + // Search the dir for the music files + for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { + boost::filesystem::path p = dirIt->path(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename (notes.txt) ++#else ++ std::string name = p.filename().string(); // File basename (notes.txt) ++#endif + if (regex_match(name.c_str(), match, midifile)) { + s.midifilename = name; + } else if (regex_match(name.c_str(), match, audiofile_background)) { +diff --git a/game/songparser.cc b/game/songparser.cc +index 2b7b9b4..ac9f3f6 100644 +--- a/game/songparser.cc ++++ b/game/songparser.cc +@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s): + + for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { + boost::filesystem::path p = dirIt->path(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename ++#else ++ std::string name = p.filename().string(); // File basename ++#endif + if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) { + m_song.cover = name; + } else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) { +diff --git a/game/songs.cc b/game/songs.cc +index 62ab26d..afab383 100644 +--- a/game/songs.cc ++++ b/game/songs.cc +@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) { + for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { + fs::path p = dirIt->path(); + if (fs::is_directory(p)) { reload_internal(p); continue; } ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename (notes.txt) + std::string path = p.directory_string(); // Path without filename ++#else ++ std::string name = p.filename().string(); // File basename (notes.txt) ++ std::string path = p.string(); // Path without filename ++#endif + path.erase(path.size() - name.size()); + if (!regex_match(name.c_str(), match, expression)) continue; + try { +diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh +index 58e19dc..8895d94 100644 +--- a/tools/ss_helpers.hh ++++ b/tools/ss_helpers.hh +@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st + void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); } + void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); } + ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string filename(boost::filesystem::path const& p) { return *--p.end(); } ++#else ++std::string filename(boost::filesystem::path const& p) { return p.filename().string(); } ++#endif + + /** Fix Singstar's b0rked XML **/ + std::string xmlFix(std::vector<char> const& data) { +-- +1.7.4.1 + diff --git a/community-testing/pingus/ChangeLog b/community-testing/pingus/ChangeLog new file mode 100644 index 000000000..c182f92eb --- /dev/null +++ b/community-testing/pingus/ChangeLog @@ -0,0 +1,21 @@ +2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * pingus 0.7.2-8 + * Rebuilt against boost 1.41.0 + +2010-02-23 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-7 + * Rebuilt against boost 1.42.0 + +2010-01-20 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-6 + * Rebuilt against libpng 1.4/libjpeg 8 + +2009-07-13 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-2 + * Rebuilt against boost 1.39 + * Added gcc 4.4 patch + * Added ChangeLog diff --git a/community-testing/pingus/PKGBUILD b/community-testing/pingus/PKGBUILD new file mode 100644 index 000000000..a7ede784a --- /dev/null +++ b/community-testing/pingus/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 59763 2011-11-30 06:35:41Z ibiru $ +# Maintainer: Eric Belanger <eric@archlinux.org> + +pkgname=pingus +pkgver=0.7.5 +pkgrel=2 +pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." +arch=('i686' 'x86_64') +url="http://pingus.seul.org" +license=('GPL') +depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48') +makedepends=('scons' 'boost>=1.48' 'mesa') +source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) +md5sums=('68e0bd1327e0eedcaab64d64528540ba' + '9eec34047bdcff49e08f41e81764e20c') +sha1sums=('65493f9c9914bb401dbcfe1fe6bf2fad2388b755' + '579a1144f161ce89e6e024cea37210149b89c0c0') + +build() { + cd ${pkgname}-${pkgver} + + scons prefix=/usr +} + +package() { + cd ${pkgname}-${pkgver} + + make install DESTDIR="${pkgdir}" PREFIX="/usr" + + install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" +} diff --git a/community-testing/pingus/pingus.desktop b/community-testing/pingus/pingus.desktop new file mode 100644 index 000000000..276db36a4 --- /dev/null +++ b/community-testing/pingus/pingus.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Pingus +Comment=A free Lemmings[tm] clone +Exec=pingus +Terminal=false +Type=Application +Categories=Application;Game;LogicGame +Icon=/usr/share/pingus/images/core/editor/actions.png diff --git a/community-testing/pion-net/PKGBUILD b/community-testing/pion-net/PKGBUILD new file mode 100644 index 000000000..1b52ded4f --- /dev/null +++ b/community-testing/pion-net/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 59765 2011-11-30 06:35:48Z ibiru $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: David Watzke <david@watzke.cz> + +pkgname=pion-net +pkgver=4.0.7 +pkgrel=2 +pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" +url="http://www.pion.org/projects/pion-network-library" +arch=('i686' 'x86_64') +license=('custom:Boost') +depends=('boost-libs' 'openssl' 'log4cpp') +makedepends=('boost') +source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" + "$pkgname-4.0.5-build.patch") +md5sums=('761c8af8dc54102b637f8d91d162f987' + 'd75ea2af90163a81d2bc71fda00f0c00') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i "$srcdir/$pkgname-4.0.5-build.patch" + + # override configure bug (forces debug even when nobody asked for it) + sed -i "s/ -ggdb//g;s/ -DNDEBUG//g" configure + + ./configure --prefix=/usr --disable-doxygen-doc --with-log4cpp + + find -name Makefile -print0 | xargs -0 \ + sed -i -r '/^C(XX)?FLAGS/ s/$/ -DBOOST_FILESYSTEM_VERSION=2/' Makefile + + # override Makefile bug + sed -i "/docs:/ s/doxygen-doc//" Makefile + + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # install license + install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost" +} diff --git a/community-testing/pion-net/pion-net-4.0.5-build.patch b/community-testing/pion-net/pion-net-4.0.5-build.patch new file mode 100644 index 000000000..25fdca20b --- /dev/null +++ b/community-testing/pion-net/pion-net-4.0.5-build.patch @@ -0,0 +1,12 @@ +diff -ru pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp +--- pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp 2010-12-21 03:07:13.000000000 +0100 ++++ pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp 2011-07-31 09:01:38.445559768 +0200 +@@ -639,7 +639,7 @@ + + /// returns reference to the io_service used for async operations + inline boost::asio::io_service& getIOService(void) { +- return m_ssl_socket.lowest_layer().io_service(); ++ return m_ssl_socket.lowest_layer().get_io_service(); + } + + /// returns non-const reference to underlying TCP socket object diff --git a/community-testing/pokerth/PKGBUILD b/community-testing/pokerth/PKGBUILD new file mode 100644 index 000000000..0c4477ea2 --- /dev/null +++ b/community-testing/pokerth/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 59767 2011-11-30 06:35:56Z ibiru $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Contributor: Vasco Costa <vasco.costa@meiodigital.com> + +pkgname=pokerth +_realname=PokerTH +pkgver=0.8.3 +pkgrel=6 +pkgdesc="Poker game written in C++/QT4" +arch=('i686' 'x86_64') +url="http://www.pokerth.net/" +license=('GPL' 'custom') +depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls' 'qt' 'sdl_mixer') +makedepends=('boost') +source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2) +md5sums=('adbe56ad5f547eb255dad91de564bf1c') + +build() { + cd $_realname-$pkgver-src + + sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro + + + # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' + sed \ + -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ + -i zlib_compress.pro pokerth_game.pro pokerth_server.pro + + qmake $pkgname.pro + + make +} + +package() { + cd $_realname-$pkgver-src + + make INSTALL_ROOT="$pkgdir" install + + install -D $pkgname "$pkgdir/usr/bin/$pkgname" + install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1" + + install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt" + rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt" +} diff --git a/community-testing/qbittorrent/PKGBUILD b/community-testing/qbittorrent/PKGBUILD new file mode 100644 index 000000000..c64904198 --- /dev/null +++ b/community-testing/qbittorrent/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 59769 2011-11-30 06:36:04Z ibiru $ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + +pkgname=qbittorrent +pkgver=2.9.2 +pkgrel=4 +pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" +arch=('i686' 'x86_64') +url="http://www.qbittorrent.org/" +license=('GPL') +depends=('qt' 'libtorrent-rasterbar' 'xdg-utils') +makedepends=('boost' 'geoip') +optdepends=('python2: needed for search' + 'geoip: improves peer country resolution') +install='qbittorrent.install' +source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz") +md5sums=('0c2188e0065be57e50c06f5934d5f7a2') + +build() { + cd qbittorrent-${pkgver} + + sed -i \ + -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find ./ -name '*.py') + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd qbittorrent-${pkgver} + + make INSTALL_ROOT=${pkgdir} install +} diff --git a/community-testing/qbittorrent/qbittorrent.install b/community-testing/qbittorrent/qbittorrent.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/community-testing/qbittorrent/qbittorrent.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/schroot/PKGBUILD b/community-testing/schroot/PKGBUILD new file mode 100644 index 000000000..926c13cfe --- /dev/null +++ b/community-testing/schroot/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 59771 2011-11-30 06:36:21Z ibiru $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> + +pkgname=schroot +pkgver=1.4.23 +pkgrel=3 +pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." +url="http://packages.qa.debian.org/s/schroot.html" +license=('GPL3') +depends=('pam' 'lockdev' 'boost' 'e2fsprogs') +optdepends=('btrfs-progs-unstable' 'lvm2') +arch=('i686' 'x86_64') +conflicts=('dchroot') +replaces=('dchroot') +provides=('schroot' 'sbuild' 'dchroot') +backup=('etc/schroot/schroot.conf' + 'etc/schroot/arch32/config' + 'etc/schroot/arch32/copyfiles' + 'etc/schroot/arch32/mount' + 'etc/schroot/arch32/nssdatabases') +options=(!libtool) +source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2" + 'pam.d.schroot.patch' + 'arch32-example' + 'arch32-config' + 'arch32-copyfiles' + 'arch32-mount' + 'arch32-nssdatabases') +md5sums=('73873e0fee83a45655ed8efa246a1e26' + 'a8d77cac806a0a9adef3f93cdbeb280a' + '1e34db5387c4e5de911e15d8a9208bdb' + '5a3f7b839c7e0b8933748da7c5b6385b' + '06db41d42f9fce5449a28feb76ded556' + 'f0d5d5b5e34a860f6f90b5628c680f46' + 'af1da6edd8c8c0dafeeb2c2c4e0c840b') + +build() { + cd ${pkgname}-${pkgver} + export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-dchroot \ + --enable-lvm-snapshot \ + --enable-btrfs-snapshot \ + BTRFS=/sbin/btrfs \ + BTRFSCTL=/sbin/btrfsctl \ + LVCREATE=/sbin/lvcreate \ + LVREMOVE=/sbin/lvremove + # --enable-csbuild + make +} + +check() { + cd ${pkgname}-${pkgver} + make -k check +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=$pkgdir install + install -dm 755 ${pkgdir}/etc/schroot/arch32 + install -m 644 ${srcdir}/arch32-{config,mount,copyfiles,nssdatabases} ${pkgdir}/etc/schroot/arch32 + rename 'arch32-' '' ${pkgdir}/etc/schroot/arch32/* + install -m 644 ${srcdir}/arch32-example ${pkgdir}/etc/schroot/chroot.d/arch32.conf.example + patch -i ${srcdir}/pam.d.schroot.patch ${pkgdir}/etc/pam.d/schroot +} diff --git a/community-testing/schroot/arch32-config b/community-testing/schroot/arch32-config new file mode 100644 index 000000000..0ee72d522 --- /dev/null +++ b/community-testing/schroot/arch32-config @@ -0,0 +1,11 @@ +# Default settings for chroot setup and exec scripts. +# See schroot-script-config(5) for further details. + +# Filesystems to mount inside the chroot. +FSTAB="/etc/schroot/arch32/mount" + +# Files to copy from the host system into the chroot. +COPYFILES="/etc/schroot/arch32/copyfiles" + +# System databases to copy into the chroot +NSSDATABASES="/etc/schroot/arch32/nssdatabases" diff --git a/community-testing/schroot/arch32-copyfiles b/community-testing/schroot/arch32-copyfiles new file mode 100644 index 000000000..88f093ceb --- /dev/null +++ b/community-testing/schroot/arch32-copyfiles @@ -0,0 +1,7 @@ +/etc/group +/etc/hosts +/etc/passwd +/etc/resolv.conf +/etc/rc.conf +/etc/localtime +/etc/locale.gen diff --git a/community-testing/schroot/arch32-example b/community-testing/schroot/arch32-example new file mode 100644 index 000000000..3f059e3c0 --- /dev/null +++ b/community-testing/schroot/arch32-example @@ -0,0 +1,10 @@ +[arch32] +description=Arch32 +type=directory +directory=/opt/arch32 +#users=username +groups=users +root-groups=root +script-config=arch32/config +personality=linux32 +#aliases=32,i686 diff --git a/community-testing/schroot/arch32-mount b/community-testing/schroot/arch32-mount new file mode 100644 index 000000000..075d6e451 --- /dev/null +++ b/community-testing/schroot/arch32-mount @@ -0,0 +1,12 @@ +# mount.defaults: static file system information for chroots. +# Note that the mount point will be prefixed by the chroot path +# (CHROOT_PATH) +# +# <file system> <mount point> <type> <options> <dump> <pass> +proc /proc proc defaults 0 0 +/dev /dev none rw,bind 0 0 +#/dev/pts /dev/pts none rw,bind 0 0 +tmpfs /dev/shm tmpfs defaults 0 0 +/sys /sys none rw,bind 0 0 +/tmp /tmp none rw,bind 0 0 +/home /home none rw,bind 0 0 diff --git a/community-testing/schroot/arch32-nssdatabases b/community-testing/schroot/arch32-nssdatabases new file mode 100644 index 000000000..815ddce3f --- /dev/null +++ b/community-testing/schroot/arch32-nssdatabases @@ -0,0 +1,6 @@ +# System databases to copy into the chroot from the host system. +# +# <database name> +passwd +shadow +group diff --git a/community-testing/schroot/pam.d.schroot.patch b/community-testing/schroot/pam.d.schroot.patch new file mode 100644 index 000000000..528acb5f7 --- /dev/null +++ b/community-testing/schroot/pam.d.schroot.patch @@ -0,0 +1,15 @@ +@@ -23,13 +23,6 @@ + # time restrainst on schroot usage. + # account requisite pam_time.so + +-# The standard Unix authentication modules, used with +-# NIS (man nsswitch) as well as normal /etc/passwd and +-# /etc/shadow entries. +-@include common-auth +-@include common-account +-@include common-session +- + # Sets up user limits, please uncomment and read /etc/security/limits.conf + # to enable this functionality. + # session required pam_limits.so + diff --git a/community-testing/smc/PKGBUILD b/community-testing/smc/PKGBUILD new file mode 100644 index 000000000..c6c4a0a12 --- /dev/null +++ b/community-testing/smc/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 59773 2011-11-30 06:36:34Z ibiru $ +# Maintainer: +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Kritoke <typeolinux@yahoo.com> + +pkgname=smc +pkgver=1.9 +pkgrel=13 +pkgdesc="Secret Maryo Chronicles" +arch=('i686' 'x86_64') +url="http://www.secretmaryo.org/" +license=('GPL3') +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') +makedepends=('autoconf' 'automake' 'boost') +source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 + smc-for-cegui-v0-7.diff + smc.desktop + smc.png) +md5sums=('75ab7826303c49aec25b052a8b90287f' + '51dfea21b741ad19df14e738df52f1cf' + '80fe208132ff41dd7677a53ee429ecdb' + 'efca7580e28748625eb676c9d24ee122') + +build() { + cd $srcdir/$pkgname-$pkgver + + # to remove when smc will be compatible with cegui-0.7.x + patch -Np1 -i ${srcdir}/smc-for-cegui-v0-7.diff + # fix for boost-1.46 + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + ./autogen.sh + ./configure --prefix=/usr +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make install DESTDIR=$pkgdir + # install some freedesktop.org compatibility + install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop + install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png + + rm -rf $pkgdir/usr/share/smc/ +} diff --git a/community-testing/smc/smc-for-cegui-v0-7.diff b/community-testing/smc/smc-for-cegui-v0-7.diff new file mode 100644 index 000000000..a99cbce6c --- /dev/null +++ b/community-testing/smc/smc-for-cegui-v0-7.diff @@ -0,0 +1,437 @@ +diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac +--- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200 ++++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100 +@@ -53,7 +53,7 @@ + AC_MSG_ERROR([SDL_ttf library not found])) + + # Check for the CEGUI library +-PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) ++PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0) + CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" + LIBS="$LIBS $CEGUI_LIBS" + +diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp +--- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 ++++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 +@@ -118,16 +118,10 @@ + return tmp;
+ }
+
+-void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
++void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
+ {
+ // draw text
+- list_text->draw( position, alpha, clipper );
+-}
+-
+-void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
+-{
+- // draw text
+- list_text->draw( cache, targetRect, zBase, alpha, clipper );
++ list_text->draw( buffer, targetRect, alpha, clipper );
+ }
+
+ void cEditor_Item_Object :: Draw_Image( void )
+@@ -533,12 +527,12 @@ + if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
+ {
+ // Listbox dimension
+- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
+- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
++ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
++ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
+ // Vertical ScrollBar Position
+ float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
+ // font height
+- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
++ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
+
+ // draw items
+ for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
+diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h +--- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 ++++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 +@@ -62,8 +62,7 @@ + */
+ virtual CEGUI::Size getPixelSize( void ) const;
+ // draw
+- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
+- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
++ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
+ // draw image
+ void Draw_Image( void );
+
+diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp +--- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 ++++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 +@@ -265,7 +265,7 @@ +
+
+ // align text
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ // fixme : Can't handle multiple lines of text
+ float text_width = font->getTextExtent( text ) * global_downscalex;
+
+@@ -1182,7 +1182,7 @@ + text_default->setText( gui_text );
+
+ // align text
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ float text_width = font->getTextExtent( gui_text ) * global_downscalex;
+
+ text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
+@@ -1190,7 +1190,7 @@ + text_default->moveToFront();
+
+ // set window height
+- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
++ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
+
+ while( draw )
+ {
+diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp +--- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 ++++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 +@@ -444,13 +444,15 @@ + + if( pGuiSystem ) + { +- delete pGuiSystem; ++ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); ++ pGuiSystem->destroy(); + pGuiSystem = NULL; ++ delete rp; + } + + if( pGuiRenderer ) + { +- delete pGuiRenderer; ++ pGuiRenderer->destroy( *pGuiRenderer ); + pGuiRenderer = NULL; + } + +@@ -507,7 +509,7 @@ + } + case SDL_VIDEORESIZE: + { +- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); ++ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); + break; + } + case SDL_KEYDOWN: +diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp +--- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 ++++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 +@@ -946,7 +946,7 @@ + m_text_debug_text->setVisible( 1 );
+
+ // update position
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ float text_width = font->getTextExtent( gui_text ) * global_downscalex;
+
+ if( text_width > 800.0f )
+diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp +--- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 ++++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 +@@ -432,17 +432,12 @@ +
+ void cMouseCursor :: Render( void ) const
+ {
+- if( !m_active )
+- {
++ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
++
++ if ( m_active == mouse->isVisible() )
+ return;
+- }
+
+- // Render CEGUI Mouse
+- pGuiRenderer->setQueueingEnabled( 0 );
+- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
+- mouse->setVisible( 1 );
+- mouse->draw();
+- mouse->setVisible( 0 );
++ mouse->setVisible( m_active );
+ }
+
+ void cMouseCursor :: Update_Position( void )
+diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp +--- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 ++++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 +@@ -163,8 +163,8 @@ + editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
+ // preview window
+ CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
+- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
+- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
++ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
++ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
+
+ Update_BG_Colors( CEGUI::EventArgs() );
+
+@@ -555,8 +555,8 @@ +
+ // set default rect
+ CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
+- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
+- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
++ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
++ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
+
+ if( !File_Exists( filename ) )
+ {
+diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp +--- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 ++++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 +@@ -1663,7 +1663,7 @@ + window_name->setText( name );
+ window_name->setTooltipText( tooltip );
+ // get text width
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
+ // all names should have the same width
+ if( text_width > m_editor_window_name_width )
+diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp +--- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 ++++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 +@@ -103,15 +103,15 @@ +
+ /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
+
+-cFake_Renderer :: cFake_Renderer( void )
+-{
+- d_identifierString = "Fake Renderer";
+-}
++//cFake_Renderer :: cFake_Renderer( void )
++//{
++// d_identifierString = "Fake Renderer";
++//}
+
+-cFake_Renderer :: ~cFake_Renderer( void )
+-{
++//cFake_Renderer :: ~cFake_Renderer( void )
++//{
+
+-}
++//}
+
+ /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
+
+@@ -158,7 +158,7 @@ + std::string log_dump_dir = "/dev/null";
+ #endif
+ // create fake system and renderer
+- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
++ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
+ }
+
+ void cVideo :: Delete_CEGUI_Fake( void ) const
+@@ -166,7 +166,7 @@ + CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
+ CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
+
+- delete pGuiSystem;
++ pGuiSystem->destroy();
+ pGuiSystem = NULL;
+ delete renderer;
+ delete rp;
+@@ -177,7 +177,7 @@ + // create renderer
+ try
+ {
+- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
++ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
+ }
+ // catch CEGUI Exceptions
+ catch( CEGUI::Exception &ex )
+@@ -186,10 +186,10 @@ + exit( EXIT_FAILURE );
+ }
+
+- /* create Resource Provider
+- * no need to destroy it later since it is handled by the CEGUI renderer
+- */
+- CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
++ pGuiRenderer->enableExtraStateSettings(true);
++
++ // create Resource Provider
++ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
+
+ // set Resource Provider directories
+ rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
+@@ -215,7 +215,7 @@ + // create system
+ try
+ {
+- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
++ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
+ }
+ // catch CEGUI Exceptions
+ catch( CEGUI::Exception &ex )
+@@ -242,7 +242,7 @@ + // load the scheme file, which auto-loads the imageset
+ try
+ {
+- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
++ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
+ }
+ // catch CEGUI Exceptions
+ catch( CEGUI::Exception &ex )
+@@ -254,9 +254,7 @@ + // default mouse cursor
+ pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
+ // force new mouse image
+- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
+- // hide CEGUI mouse always because we render it manually
+- CEGUI::MouseCursor::getSingleton().hide();
++ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
+ // default tooltip
+ pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
+ // create default root window
+@@ -553,7 +551,7 @@ + pFont->Restore_Textures();
+
+ // send new size to CEGUI
+- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
++ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
+
+ // check if CEGUI is initialized
+ bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
+diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h +--- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 ++++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 +@@ -23,7 +23,7 @@ + #include "SDL_opengl.h"
+ // CEGUI
+ #include "CEGUI.h"
+-#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
++#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
+
+ namespace SMC
+ {
+@@ -129,31 +129,100 @@ + EFFECT_IN_AMOUNT
+ };
+
+-/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
++/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
++// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
++class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
++{
++ void draw() const {}
++ void setTranslation(const CEGUI::Vector3&) {}
++ void setRotation(const CEGUI::Vector3&) {}
++ void setPivot(const CEGUI::Vector3&) {}
++ void setClippingRegion(const CEGUI::Rect&) {}
++ void appendVertex(const CEGUI::Vertex&) {}
++ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
++ void setActiveTexture(CEGUI::Texture*) {}
++ void reset() {}
++ CEGUI::Texture* getActiveTexture() const { return 0; }
++ CEGUI::uint getVertexCount() const { return 0; }
++ CEGUI::uint getBatchCount() const { return 0; }
++ void setRenderEffect(CEGUI::RenderEffect*) {}
++ CEGUI::RenderEffect* getRenderEffect() { return 0; }
++};
+
+-class cFake_Renderer : public CEGUI::Renderer
++class cFake_Texture : public CEGUI::Texture
++{
++public:
++ cFake_Texture() :
++ m_size(1, 1),
++ m_scaling(1, 1) {}
++
++ const CEGUI::Size& getSize() const { return m_size; }
++ const CEGUI::Size& getOriginalDataSize() const { return m_size; }
++ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
++ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
++ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
++ void saveToMemory(void*) {}
++
++private:
++ CEGUI::Size m_size;
++ CEGUI::Vector2 m_scaling;
++};
++
++class cFake_RenderTarget : public CEGUI::RenderTarget
+ {
+ public:
+- cFake_Renderer( void );
+- virtual ~cFake_Renderer( void );
++ cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
++ void draw(const CEGUI::GeometryBuffer&) {}
++ void draw(const CEGUI::RenderQueue&) {}
++ void setArea(const CEGUI::Rect&) {}
++ const CEGUI::Rect& getArea() const { return m_area; }
++ bool isImageryCache() const { return false; }
++ void activate() {}
++ void deactivate() {}
++ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
++
++private:
++ CEGUI::Rect m_area;
++};
+
+- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
+- virtual void doRender(void) {};
+- virtual void clearRenderList(void) {};
+- virtual void setQueueingEnabled(bool setting) {};
+- virtual CEGUI::Texture *createTexture(void) { return NULL; };
+- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
+- virtual CEGUI::Texture *createTexture(float size) { return NULL; };
+- virtual void destroyTexture(CEGUI::Texture* texture) {};
+- virtual void destroyAllTextures(void) {};
+- virtual bool isQueueingEnabled(void) const { return 0; };
+- virtual float getWidth(void) const { return 0; };
+- virtual float getHeight(void) const { return 0; };
+- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
+- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
+- virtual unsigned int getMaxTextureSize(void) const { return 0; };
+- virtual unsigned int getHorzScreenDPI(void) const { return 0; };
+- virtual unsigned int getVertScreenDPI(void) const { return 0; };
++class cFake_Renderer : public CEGUI::Renderer
++{
++public:
++ cFake_Renderer( void ) :
++ m_size(0, 0),
++ m_dpi(0, 0),
++ m_identifierString("Fake Renderer"),
++ m_root(m_target) {}
++ ~cFake_Renderer( void ) {}
++
++ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
++ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
++ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
++ void destroyAllGeometryBuffers() {}
++ CEGUI::TextureTarget* createTextureTarget() { return 0; }
++ void destroyTextureTarget(CEGUI::TextureTarget*) {}
++ void destroyAllTextureTargets() {}
++ CEGUI::Texture& createTexture() { return m_texture; }
++ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
++ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
++ void destroyTexture(CEGUI::Texture&) {}
++ void destroyAllTextures() {}
++ void beginRendering() {}
++ void endRendering() {}
++ void setDisplaySize(const CEGUI::Size&) {}
++ const CEGUI::Size& getDisplaySize() const { return m_size; }
++ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
++ CEGUI::uint getMaxTextureSize() const { return 0; }
++ const CEGUI::String& getIdentifierString() const { return m_identifierString; }
++
++private:
++ CEGUI::Size m_size;
++ CEGUI::Vector2 m_dpi;
++ CEGUI::String m_identifierString;
++ cFake_GeometryBuffer m_geometry;
++ cFake_Texture m_texture;
++ cFake_RenderTarget m_target;
++ CEGUI::RenderingRoot m_root;
+ };
+
+ /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community-testing/smc/smc.desktop b/community-testing/smc/smc.desktop new file mode 100644 index 000000000..6cfe5b018 --- /dev/null +++ b/community-testing/smc/smc.desktop @@ -0,0 +1,9 @@ +[Desktop Entry]
+Name=Secret Maryo Chronicles
+GenericName=Arcade Game
+Exec=smc
+Icon=smc.png
+Terminal=false
+Type=Application
+Categories=Game;ArcadeGame;KidsGame;
+StartupNotify=false
\ No newline at end of file diff --git a/community-testing/smc/smc.png b/community-testing/smc/smc.png Binary files differnew file mode 100644 index 000000000..f02af1bfc --- /dev/null +++ b/community-testing/smc/smc.png diff --git a/community-testing/spring/PKGBUILD b/community-testing/spring/PKGBUILD new file mode 100644 index 000000000..d6dfe3d7f --- /dev/null +++ b/community-testing/spring/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 59775 2011-11-30 06:36:42Z ibiru $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=spring +pkgver=0.84.0 +_pkgver=84.0 +pkgrel=1 +pkgdesc='A free 3D real-time-strategy (RTS) game engine' +arch=('i686' 'x86_64') +url="http://springrts.com/" +license=('GPL') +depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') +makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2') +optdepends=('python2: python-based bots' + 'java-runtime: java-based bots') +source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) +md5sums=('2aae395c055adceec5326fb3faec92ba') + +build() { + bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma + + cd spring_${_pkgver} + + sed -i "s/FE_DFL_ENV/FE_DFL_ENV_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp rts/lib/streflop/SMath.cpp + sed -i "s/FE_INVALID/FE_INVALID_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/FE_DENORMAL/FE_DENORMAL_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/FE_DIVBYZERO/FE_DIVBYZERO_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/FE_OVERFLOW/FE_OVERFLOW_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/FE_UNDERFLOW/FE_UNDERFLOW_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/FE_INEXACT/FE_INEXACT_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/FE_ALL_EXCEPT/FE_ALL_EXCEPT_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/FE_DOWNWARD/FE_DOWNWARD_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/FE_TONEAREST/FE_TONEAREST_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/FE_TOWARDZERO/FE_TOWARDZERO_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/FE_UPWARD/FE_UPWARD_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + sed -i "s/feclearexcept/feclearexcept_/g" rts/lib/streflop/FPUSettings.h rts/System/Sync/FPUCheck.cpp rts/System/myMath.cpp rts/Lua/LuaParser.cpp + + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDATADIR=share/spring + make +} + +package() { + cd spring_${_pkgver} + + make DESTDIR=$pkgdir install + + install -d $pkgdir/etc/spring + echo '$HOME/.spring' > $pkgdir/etc/spring/datadir +} + +# vim sw=2:ts=2 et: diff --git a/community-testing/springlobby/PKGBUILD b/community-testing/springlobby/PKGBUILD new file mode 100644 index 000000000..af19ba490 --- /dev/null +++ b/community-testing/springlobby/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 59777 2011-11-30 06:36:57Z ibiru $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: DuGi <dugi@irc.pl> + +pkgname=springlobby +pkgver=0.139 +pkgrel=3 +pkgdesc="A free cross-platform lobby client for the Spring RTS project." +arch=('i686' 'x86_64') +url="http://springlobby.info/" +license=('GPL2') +depends=('wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs') +optdepends=('sdl' 'sdl_sound' 'sdl_mixer') +makedepends=('boost' 'asio' 'cmake') +source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 + springlobby.desktop + springlobby.png) +md5sums=('48c572117338277068c67ec1ff7d514f' + '45f8b59d033931d02e734fe3bd7777dd' + '1f388187539aeb0358b51995e26ed890') + +build() { + cd $srcdir/${pkgname}-$pkgver + + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt + + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOPTION_SOUND=false + make +} + +package() { + cd $srcdir/${pkgname}-$pkgver + + make DESTDIR=$pkgdir install + + install -m755 -d $pkgdir/usr/share/applications + install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications + + install -m755 -d -p $pkgdir/usr/share/pixmaps + install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps +} + +# vim: sw=2:ts=2 et: diff --git a/community-testing/springlobby/springlobby.desktop b/community-testing/springlobby/springlobby.desktop new file mode 100644 index 000000000..1dce96b90 --- /dev/null +++ b/community-testing/springlobby/springlobby.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=SpringLobby +Comment=Lobby for Spring. An open source RTS with similar gameplay to TA +Exec=springlobby +Icon=springlobby.png +Terminal=false +Type=Application +Categories=Application;Game;StrategyGame; diff --git a/community-testing/springlobby/springlobby.png b/community-testing/springlobby/springlobby.png Binary files differnew file mode 100644 index 000000000..89c7ab0ac --- /dev/null +++ b/community-testing/springlobby/springlobby.png diff --git a/community-testing/tagpy/PKGBUILD b/community-testing/tagpy/PKGBUILD new file mode 100644 index 000000000..a3b89c7e9 --- /dev/null +++ b/community-testing/tagpy/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 59779 2011-11-30 06:37:03Z ibiru $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Callan Barrett <wizzomafizzo@gmail.com> +# Contributor: Scott Horowitz <stonecrest@gmail.com> + +pkgname=tagpy +pkgver=0.94.8 +pkgrel=6 +pkgdesc="Python bindings for TagLib" +arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/tagpy" +license=('MIT') +depends=('python2' 'taglib' 'boost-libs') +makedepends=('python2-distribute' 'boost') +source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('6baff63318cf90b9bc5a2497a0597802') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + + ./configure.py --taglib-lib-dir=/usr/lib/ \ + --taglib-inc-dir=/usr/include/taglib/ \ + --boost-inc-dir=/usr/include/boost/ \ + --boost-lib-dir=/usr/lib/ \ + --boost-python-libname=boost_python + python2 setup.py build +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + python2 setup.py install --root="${pkgdir}" --optimize=1 + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community-testing/twinkle/PKGBUILD b/community-testing/twinkle/PKGBUILD new file mode 100644 index 000000000..d27cc8e1c --- /dev/null +++ b/community-testing/twinkle/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 59781 2011-11-30 06:37:12Z ibiru $ +# Maintainer: +# Contributor: Jeff Mickey <jeff@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> + +pkgname=twinkle +pkgver=1.4.2 +pkgrel=12 +pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol" +arch=('i686' 'x86_64') +url="http://www.twinklephone.com/" +license=('GPL') +depends=('file' 'speex' 'boost-libs' 'libsndfile' 'commoncpp2' 'libxml2' 'libx11' + 'qt3' 'libzrtpcpp') +makedepends=('pkg-config' 'boost') +source=(http://www.xs4all.nl/~mfnboer/${pkgname}/download/${pkgname}-${pkgver}.tar.gz) +md5sums=('d70c8972f296ffd998c7fb698774705b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + . /etc/profile.d/qt3.sh + ./configure --prefix=/usr \ + --without-kde \ + --with-speex + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -D -m644 twinkle.desktop ${pkgdir}/usr/share/applications/twinkle.desktop +} diff --git a/community-testing/twinkle/twinkle.desktop b/community-testing/twinkle/twinkle.desktop new file mode 100644 index 000000000..e85a32e51 --- /dev/null +++ b/community-testing/twinkle/twinkle.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Twinkle +Comment=A SIP softphone for Qt +Icon=/usr/share/twinkle/twinkle48.png +Exec=twinkle +Terminal=false +Type=Application +Categories=Network; +StartupNotify=false diff --git a/community-testing/wt/PKGBUILD b/community-testing/wt/PKGBUILD new file mode 100644 index 000000000..7af70f8ac --- /dev/null +++ b/community-testing/wt/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 59787 2011-11-30 09:15:33Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Denis Martinez <deuns.martinez@gmail.com> + +pkgname=wt +pkgver=3.2.0 +pkgrel=1 +pkgdesc="a C++ library and application server for developing and deploying web applications" +arch=('i686' 'x86_64') +url="http://www.webtoolkit.eu/" +license=('GPL') +depends=('boost-libs>=1.36') +makedepends=('boost>=1.36' 'cmake>=2.8' + 'postgresql-libs' 'zlib' 'fcgi' 'sqlite3' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt') +optdepends=('openssl: for SSL support in built-in webserver' + 'zlib: for compression in HTTP protocol' + 'fcgi: for FastCGI support' + 'postgresql-libs: for PostgreSQL Dbo support' + 'sqlite3: for Sqlite3 Dbo support' + 'libharu: for PDF generation (WPdfImage)' + 'graphicsmagick: for raster image support (WRasterImage)' + 'pango: for advanced font rendering (WRasterImage)' + 'mysql++: for the hangman example' + 'qt: for the Wt/Qt interopability example (wtwithqt)') +backup=('etc/wt/wt_config.xml') +source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz) +md5sums=('82ff039bccf7a941b37142c9d3fc7f32') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + mkdir -p build + cd build + cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \ + -DWEBUSER=http -DWEBGROUP=http -DRUNDIR=/var/run/wt -DDEPLOYROOT=/var/www/wt \ + -DUSE_SYSTEM_SQLITE3=ON -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \ + -DDESTDIR=${pkgdir} -DWT_CMAKE_FINDER_INSTALL_DIR="share/cmake-2.8/Modules" .. + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver}/build + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/wt/wt-boost-1.47.patch b/community-testing/wt/wt-boost-1.47.patch new file mode 100644 index 000000000..919e1371f --- /dev/null +++ b/community-testing/wt/wt-boost-1.47.patch @@ -0,0 +1,11 @@ +diff -wbBur wt-3.1.10.q/src/CMakeLists.txt wt-3.1.10/src/CMakeLists.txt +--- wt-3.1.10.q/src/CMakeLists.txt 2011-07-26 00:58:19.000000000 +0400 ++++ wt-3.1.10/src/CMakeLists.txt 2011-06-24 18:51:54.000000000 +0400 +@@ -236,6 +236,7 @@ + web/TimeUtil.C + web/XSSFilter.C + web/XSSUtils.C ++web/random_device.cpp + web/base64.cpp + Plain_html.C + Boot_html.C diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD index 21e070311..7ef622c93 100644 --- a/community/blueman/PKGBUILD +++ b/community/blueman/PKGBUILD @@ -1,45 +1,43 @@ -# $Id: PKGBUILD 56850 2011-10-14 21:12:20Z spupykin $ +# $Id: PKGBUILD 59799 2011-11-30 12:25:12Z spupykin $ # Maintainer : Ionut Biru <ibiru@archlinux.org # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=blueman pkgver=1.23 -pkgrel=1 +pkgrel=2 pkgdesc="GTK+ bluetooth manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://blueman-project.org" -depends=('python-notify' 'bluez' 'dbus-python' 'gtk2' 'pygobject' 'startup-notification' 'obex-data-server' 'polkit-gnome' 'xdg-utils' 'hicolor-icon-theme') +depends=('python-notify' 'bluez' 'dbus-python' 'gtk2' 'pygobject' 'startup-notification' + 'obex-data-server' 'polkit-gnome' 'xdg-utils' 'hicolor-icon-theme' 'libpulse') makedepends=('pyrex' 'intltool') optdepends=('dnsmasq: For creating PAN network' - 'gconf: For gconf configuration support' - 'pulseaudio: To use the pulseaudio plugin' - 'notification-daemon: for desktop notifications' - 'libnotify: for desktop notifications' - 'modemmanager: for modem management service' - 'gnome-icon-theme:icon theme') + 'gconf: For gconf configuration support' + 'pulseaudio: To use the pulseaudio plugin' + 'notification-daemon: for desktop notifications' + 'libnotify: for desktop notifications' + 'modemmanager: for modem management service' + 'gnome-icon-theme:icon theme') options=('!libtool') install=$pkgname.install -source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz - PulsePatch.patch) -md5sums=('f0bee59589f4c23e35bf08c2ef8acaef' - 'cdce55a57d7628ed8b6c7fcf4391f4f0') +source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz) +md5sums=('f0bee59589f4c23e35bf08c2ef8acaef') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" -# patch -Np1 -i "${srcdir}/PulsePatch.patch" + export PYTHON=python2 + for file in apps/blueman*; do + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + done + sed -i 's|"blueman-tray"|"blueman"|' blueman/plugins/applet/StatusIcon.py - # python2 fix - for file in apps/blueman*; do - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file - done - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/blueman \ - --with-no-runtime-deps-check - make - make DESTDIR="${pkgdir}" install - echo "OnlyShowIn=GNOME;XFCE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop + [ -f Makefile ] || ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/blueman \ + --with-no-runtime-deps-check + make + make DESTDIR="${pkgdir}" install + echo "OnlyShowIn=GNOME;XFCE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop } diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index dcb1cec73..0a2b48572 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59484 2011-11-26 14:33:23Z lfleischer $ +# $Id: PKGBUILD 59792 2011-11-30 10:03:59Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity pkgver=0.6.17 -pkgrel=1 +pkgrel=2 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' @@ -23,4 +23,8 @@ build() { done python2 setup.py install --root="$pkgdir" --optimize=1 + + chmod 644 $pkgdir/usr/share/man/man1/$pkgname.1 + chmod 644 $pkgdir/usr/share/man/man1/rdiffdir.1 + chmod 644 $pkgdir/usr/share/doc/$pkgname-$pkgver/* } diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index b253d453b..d5eab3b8d 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59254 2011-11-22 03:06:06Z ebelanger $ +# $Id: PKGBUILD 59840 2011-12-01 01:26:04Z ebelanger $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=fotoxx -pkgver=11.11.1 -pkgrel=3 +pkgver=11.12 +pkgrel=1 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/fotoxx" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils') optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning') install=fotoxx.install source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('c51f6682639bd7d2e5f1df4d03f09e53') +md5sums=('3734fc182c9002f45c664f7b0e42314d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/ghemical/PKGBUILD b/community/ghemical/PKGBUILD index 122c319b6..320a3aa7d 100644 --- a/community/ghemical/PKGBUILD +++ b/community/ghemical/PKGBUILD @@ -1,34 +1,27 @@ -# $Id: PKGBUILD 32528 2010-11-14 16:07:40Z xyne $ -# Maintainer: Abhishek Dasgupta <abhidg@gmail.com> +# Maintainer: Xyne <ac xunilhcra enyx, backwards> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=ghemical -pkgver=2.99.2 -pkgrel=5 +pkgver=3.0.0 +pkgrel=1 pkgdesc="Computational chemistry package." license=("GPL") arch=(i686 x86_64 'mips64el') url="http://bioinformatics.org/ghemical/ghemical/" -depends=('libghemical>=2.99' 'liboglappth>=0.98' 'mesa' 'libglade' 'libxmu' 'ttf-dejavu' 'gtkglext' 'openbabel') +depends=('libghemical>=3.0' 'liboglappth>=1.0' 'mesa' 'libglade' 'libxmu' 'ttf-dejavu' 'gtkglext' 'openbabel') makedepends=('pkgconfig' 'intltool>=0.40.0' 'gettext') - -source=(http://bioinformatics.org/ghemical/download/current/${pkgname}-${pkgver}.tar.gz ghemical.desktop ghemical.diff) +source=(http://bioinformatics.org/ghemical/download/release20111012/${pkgname}-${pkgver}.tar.gz ghemical.desktop) +md5sums=('becf98626f0eba73f7f042bc92aa60ac' + '7e8789d42d1318a427a30f3bf64cb5a6') build() { - cd ${srcdir}/${pkgname}-${pkgver}/ - patch -p1 -i ${srcdir}/ghemical.diff || return 1 - - for i in eldview gpcview oglview p1dview p2dview; do - sed -i "s/courier 12/monospace 10/g" "src/${i}_wcl.cpp" || return 1 - done - - install -D -m644 ../ghemical.desktop ${pkgdir}/usr/share/applications/ghemical.desktop + cd -- "$srcdir/$pkgname-$pkgver/" ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - + make } -md5sums=('30f29b21d2f0649fc79823a7042131b5' - '14742b5efb2ccb94716b17f209adfd9e' - '6cd605a689aab17b8f26249a42261569') +package() { + install -D -m644 "$srcdir"/ghemical.desktop "$pkgdir"/usr/share/applications/ghemical.desktop + cd -- "$srcdir/$pkgname-$pkgver/" + make DESTDIR="$pkgdir" install +} diff --git a/community/ghemical/ghemical.desktop b/community/ghemical/ghemical.desktop index 5b307b06e..eff450186 100644 --- a/community/ghemical/ghemical.desktop +++ b/community/ghemical/ghemical.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Application -Version=1.0 +Version=3.0.0 Name=Ghemical GenericName=Computational chemistry package GenericName[de]=Chemisches Berechnungsprogramm Comment=3D molecule editor and computing program Comment[de]=3D Moleküleditor und Berechnungsprogramm -Icon=/usr/share/ghemical/2.99.2/pixmaps/ghemical.png +Icon=/usr/share/ghemical/3.0.0/pixmaps/ghemical.png Exec=/usr/bin/ghemical Terminal=false Categories=Science;Chemistry;Education; diff --git a/community/libghemical/PKGBUILD b/community/libghemical/PKGBUILD index ff32e14ad..c94b7e300 100644 --- a/community/libghemical/PKGBUILD +++ b/community/libghemical/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 13759 2010-03-27 17:00:03Z xyne $ -# Maintainer: Abhishek Dasgupta <abhidg@gmail.com> +# Maintainer: Xyne <ac xunilhcra enyx, backwards> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=libghemical -pkgver=2.99.1 +pkgver=3.0.0 pkgrel=1 pkgdesc="Library containing computational chemistry facility of ghemical" license=("GPL") @@ -12,14 +11,16 @@ url="http://bioinformatics.org/ghemical/libghemical/" depends=('gcc-libs') makedepends=('openbabel' 'intltool>=0.40.0') options=(!libtool) -source=(http://bioinformatics.org/ghemical/download/current/${pkgname}-${pkgver}.tar.gz sasaeval.diff) -md5sums=('d2dae2d7d786d3cba335cb29d85033ea' - '4c520ded165acc14b5477a55541554ef') +source=(http://bioinformatics.org/ghemical/download/release20111012/${pkgname}-${pkgver}.tar.gz) +md5sums=('1d5c9c19bb119470d2bb41a7e681eafd') build() { - cd ${startdir}/src/${pkgname}-${pkgver}/ - #patch -p1 -i ${srcdir}/sasaeval.diff || return 1 + cd -- "$srcdir/$pkgname-$pkgver/" ./configure --prefix=/usr --enable-openbabel - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 -}
\ No newline at end of file + make +} + +package() { + cd -- "$srcdir/$pkgname-$pkgver/" + make DESTDIR="$pkgdir" install +} diff --git a/community/liboglappth/PKGBUILD b/community/liboglappth/PKGBUILD index d96dfba27..fd9809fb2 100644 --- a/community/liboglappth/PKGBUILD +++ b/community/liboglappth/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 17276 2010-05-22 17:07:31Z xyne $ -# Maintainer: Abhishek Dasgupta <abhidg@gmail.com> +# Maintainer: Xyne <ac xunilhcra enyx, backwards> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=liboglappth -pkgver=0.98 -pkgrel=2 +pkgver=1.0.0 +pkgrel=1 pkgdesc="Library containing computational chemistry facility of ghemical" license=("GPL") arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +11,16 @@ url="http://bioinformatics.org/ghemical/libghemical/" depends=('gcc-libs') makedepends=('mesa') options=(!libtool) -source=(http://bioinformatics.org/ghemical/download/current/${pkgname}-${pkgver}.tar.gz) +source=(http://bioinformatics.org/ghemical/download/release20111012/${pkgname}-${pkgver}.tar.gz) +md5sums=('48261e5f4cf99e113fb22e524f0b1eeb') build() { - cd ${srcdir}/${pkgname}-${pkgver}/ - ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + cd -- "$srcdir/$pkgname-$pkgver/" + ./configure --prefix=/usr --enable-openbabel + make +} + +package() { + cd -- "$srcdir/$pkgname-$pkgver/" + make DESTDIR="$pkgdir" install } -md5sums=('dd280286a51fcba6a47264a383a2f1fe') diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD new file mode 100644 index 000000000..34165dbe9 --- /dev/null +++ b/community/linux-tools/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 59838 2011-12-01 00:13:46Z seblu $ +# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> + +pkgbase=linux-tools +pkgname=('perf' 'cpupower') +pkgver=3.1.4 +pkgrel=1 +license=('GPL2') +arch=('i686' 'x86_64') +url='http://www.kernel.org' +options=('!strip') +makedepends=('asciidoc' 'xmlto') +# split packages need all package dependencies set manually in makedepends +makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils') +source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$pkgver.tar.xz" + 'cpupower.rc' + 'cpupower.conf') +md5sums=('e48e246675a3e790062d4fecf36cd6e3' + 'd8b119eff7dc1a2d655eb71a47fa6215' + '218fd36a7957d3170ed8bd1a0be1f62f') + +build() { + msg2 'Build perf' + cd linux-$pkgver/tools/perf + make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver \ + all man + + msg2 'Build cpupower' + # we cannot use --as-needed + LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} + cd "$srcdir/linux-$pkgver/tools/power/cpupower" + make +} + +package_perf() { + pkgdesc='Linux kernel perf tool' + depends=('python2' 'libnewt' 'elfutils') + + cd linux-${pkgver}/tools/perf + make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver \ + install install-man +} + +package_cpupower() { + pkgdesc='Linux kernel power tool' + backup=('etc/conf.d/cpupower') + depends=('pciutils') + conflicts=('cpufrequtils') + provides=("cpufrequtils=$pkgver") + + cd linux-$pkgver/tools/power/cpupower + make \ + DESTDIR="$pkgdir" \ + INSTALL='/bin/install -c' \ + mandir='/usr/share/man' \ + docdir='/usr/share/doc/cpupower' \ + install install-man + + # install rc.d script + install -D -m 755 "$srcdir/cpupower.rc" "$pkgdir/etc/rc.d/cpupower" + install -D -m 644 "$srcdir/cpupower.conf" "$pkgdir/etc/conf.d/cpupower" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/linux-tools/cpupower.conf b/community/linux-tools/cpupower.conf new file mode 100644 index 000000000..0f56836b1 --- /dev/null +++ b/community/linux-tools/cpupower.conf @@ -0,0 +1,14 @@ +# valid governors: +# ondemand, performance, powersave, +# conservative, userspace +#governor="ondemand" + +# limit frequency range (optional) +# valid suffixes: Hz, kHz (default), MHz, GHz, THz +#min_freq="2.25GHz" +#max_freq="3GHz" + +# use freq to set up the exact cpu frequency using it with userspace governor +#freq= + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/linux-tools/cpupower.rc b/community/linux-tools/cpupower.rc new file mode 100644 index 000000000..812637b61 --- /dev/null +++ b/community/linux-tools/cpupower.rc @@ -0,0 +1,31 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[[ -f /etc/conf.d/cpupower ]] && . /etc/conf.d/cpupower + +case "$1" in + start|restart) + stat_busy "Setting cpupower rules" + + declare params='' + if [[ "$governor" ]]; then + params="-g $governor " + params+="${min_freq:+-d $min_freq} " + params+="${max_freq:+-u $max_freq} " + params+="${freq:+-f $freq} " + cpupower frequency-set $params >/dev/null || { stat_fail; exit 1; } + stat_done + else + stat_append ': Invalid configuration' + stat_fail + fi + ;; + *) + echo "usage: $0 {start|restart}" +esac + +true + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/mxml/PKGBUILD b/community/mxml/PKGBUILD index 5356d74ba..df116ea61 100644 --- a/community/mxml/PKGBUILD +++ b/community/mxml/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57065 2011-10-20 07:22:50Z andrea $ +# $Id: PKGBUILD 59790 2011-11-30 09:27:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=mxml pkgver=2.6 -pkgrel=2 +pkgrel=4 pkgdesc="A small XML parsing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.minixml.org/" @@ -15,7 +15,8 @@ md5sums=('68977789ae64985dddbd1a1a1652642e') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr +# [ "$CARCH" = x86_64 ] && export CFLAGS="$CFLAGS -fPIC" + ./configure --prefix=/usr --enable-shared make } diff --git a/community/nvdock/PKGBUILD b/community/nvdock/PKGBUILD index 0a70eb271..cd8728d08 100644 --- a/community/nvdock/PKGBUILD +++ b/community/nvdock/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 8929 2010-01-22 18:37:23Z giovanni $ +# $Id: PKGBUILD 59826 2011-11-30 20:47:00Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Matthew Sharpe <matt.sharpe@gmail.com> pkgname=nvdock pkgver=1.02 -pkgrel=3 +pkgrel=4 pkgdesc="A tray icon for easy launching of the NVIDIA control panel" arch=('i686' 'x86_64' 'mips64el') url="http://www.opsat.net/user/bob/projects/nvdock" license=('BSD') depends=('gtk2') makedepends=('glib') -source=(http://bobmajdakjr.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2) +source=("http://bobmajdakjr.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") md5sums=('e18c4eeff936dc3b671fd8b5a9bb5145') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make || return 1 - install -D -m755 build/nvdock "${pkgdir}/usr/bin/nvdock" || return 1 - install -D -m644 data/nvdock.png "${pkgdir}/usr/share/pixmaps/nvdock.png" || return 1 - install -D -m644 data/nvdock.desktop "${pkgdir}/usr/share/applications/nvdock.desktop" || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -D -m755 build/nvdock "${pkgdir}/usr/bin/nvdock" + install -D -m644 data/nvdock.png "${pkgdir}/usr/share/pixmaps/nvdock.png" + install -D -m644 data/nvdock.desktop "${pkgdir}/usr/share/applications/nvdock.desktop" # Install license - install -D COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + install -D COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD index 366f9fc14..215a4ffb7 100644 --- a/community/ocaml-findlib/PKGBUILD +++ b/community/ocaml-findlib/PKGBUILD @@ -4,7 +4,7 @@ # scj <scj archlinux us> pkgname=ocaml-findlib pkgver=1.2.7 -pkgrel=1 +pkgrel=2 license=('MIT') arch=('i686' 'x86_64' 'mips64el') pkgdesc="Objective Caml (OCaml) package manager" diff --git a/community/pcsc-tools/PKGBUILD b/community/pcsc-tools/PKGBUILD index 5a9cb6066..a22b0529b 100644 --- a/community/pcsc-tools/PKGBUILD +++ b/community/pcsc-tools/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 44872 2011-04-12 10:42:15Z giovanni $ +# $Id: PKGBUILD 59828 2011-11-30 21:11:50Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Lorenzo Nizzi Grifi Gargiolli <lorenzo.nizzi.grifi@gmail.com> # Contributor: marc0s <marc0s@fsfe.org> pkgname=pcsc-tools pkgver=1.4.17 -pkgrel=4 +pkgrel=5 pkgdesc="PC/SC Architecture smartcard tools" arch=('i686' 'x86_64' 'mips64el') url="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/" license=('GPL') depends=('pcsclite' 'pcsc-perl' 'gtk2-perl' 'glib-perl') -makedepends=('pkgconfig') -source=(http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.gz) +makedepends=('pkg-config') +source=("http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('2767238e1e737f94d13a91bdab1174ca') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's:-Wall -O2:${CFLAGS}:g' Makefile make diff --git a/community/podofo/PKGBUILD b/community/podofo/PKGBUILD index ebee2b0a6..efb32fa9c 100644 --- a/community/podofo/PKGBUILD +++ b/community/podofo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45713 2011-04-27 19:09:19Z giovanni $ +# $Id: PKGBUILD 59830 2011-11-30 22:21:17Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > # Contributor: Preecha Patumchareonpol <yumyai at gmail.com> pkgname=podofo pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ library to work with the PDF file format" arch=('i686' 'x86_64' 'mips64el') url="http://podofo.sourceforge.net" diff --git a/community/psqlodbc/PKGBUILD b/community/psqlodbc/PKGBUILD index 890aef702..5b672e2c3 100644 --- a/community/psqlodbc/PKGBUILD +++ b/community/psqlodbc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 14188 2010-04-02 00:06:50Z andrea $ +# $Id: PKGBUILD 59801 2011-11-30 12:36:10Z spupykin $ # Maintainer: # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux-br.org> # Contributor: Rick Rein <jeebusroxors@gmail.com> pkgname=psqlodbc pkgver=08.04.0100 -pkgrel=2 +pkgrel=3 pkgdesc="PostgreSQL ODBC driver" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.postgresql.org" -depends=('unixodbc' 'postgresql-libs' 'libtool') +depends=('unixodbc' 'postgresql-libs') makedepends=('postgresql') options=('!libtool') source=(ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz @@ -20,11 +20,9 @@ md5sums=('2328c3e97e6a376620a5d317137515ff' build() { cd "$srcdir/$pkgname-$pkgver" - - patch -p1 -i "$srcdir/fix-function-declarations.patch" || return 1 - + patch -p1 -i "$srcdir/fix-function-declarations.patch" ./configure --prefix=/usr - make || return 1 + make } package() { diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index f4af9acf3..b9f3f0e1a 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58533 2011-11-13 16:05:39Z andrea $ +# $Id: PKGBUILD 59836 2011-11-30 22:56:23Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil pkgver=0.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A WYSIWYG ebook editor" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/sigil/" @@ -12,8 +12,8 @@ license=('GPL3') depends=('qt') makedepends=('cmake') install=sigil.install -source=(http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip - ${pkgname}.desktop) +source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip" + "${pkgname}.desktop") md5sums=('ce27976254236f8b11b787fd05be9acb' 'fef6aa492af487ccccd6b133635cee5a') diff --git a/community/sysvbanner/PKGBUILD b/community/sysvbanner/PKGBUILD new file mode 100644 index 000000000..44304f42a --- /dev/null +++ b/community/sysvbanner/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> + +pkgname=sysvbanner +pkgver=1.0.15 +pkgrel=1 +pkgdesc='System-V banner clone' +arch=('i686' 'x86_64') +url='http://packages.qa.debian.org/s/sysvbanner.html' +conflicts=('bsd-games') +license=('custom') +source=("http://cdn.debian.net/debian/pool/main/s/sysvbanner/${pkgname}_${pkgver}.tar.gz" + 'man.patch') +md5sums=('5a7bd216a42faa20bfd91268a77cc41d' + '003aa4532e00c32f747dfba6566c094d') + +build() { + cd $pkgname-$pkgver + patch -p 1 < ../man.patch + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -D -m444 "debian/copyright" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/sysvbanner/man.patch b/community/sysvbanner/man.patch new file mode 100644 index 000000000..3719d5ebf --- /dev/null +++ b/community/sysvbanner/man.patch @@ -0,0 +1,16 @@ +--- a/banner.1 2007-04-08 00:26:57.000000000 +0200 ++++ b/banner.1 2011-12-01 04:16:43.677157180 +0100 +@@ -3,12 +3,10 @@ + banner \- print large banner + .SH SYNOPSIS + .B banner +-.I text ++.B [\fItext\fB] + .br + .SH "DESCRIPTION" + .B banner + prints out the first 10 characters of + .I text + in large letters. +-.SH SEE ALSO +-.BR banner "(6)." diff --git a/community/texvc/PKGBUILD b/community/texvc/PKGBUILD index 0ec5e473c..a76b828bc 100644 --- a/community/texvc/PKGBUILD +++ b/community/texvc/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 52119 2011-07-20 10:22:26Z spupykin $ +# $Id: PKGBUILD 59805 2011-11-30 12:45:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=texvc -pkgver=1.17.0 +pkgver=1.18.0 +_svnrev=103240 pkgrel=1 pkgdesc="tex to HTML/MathML/png converter used by mediawiki" arch=(i686 x86_64 'mips64el') -url="http://www.mediawiki.org/" +url="http://www.mediawiki.org/wiki/Extension:Math" license=("GPL") depends=('imagemagick' 'ghostscript' 'texlive-core' 'texlive-latexextra') makedepends=('ocaml') -source=(http://download.wikimedia.org/mediawiki/1.17/mediawiki-$pkgver.tar.gz) -md5sums=('871a00a8eb6dcae1b7b654ae635af7cd') +source=(http://upload.wikimedia.org/ext-dist/Math-MW1.18-r${_svnrev}.tar.gz) +md5sums=('bd24346536339034b29e65341683a2c1') build() { - cd $srcdir/mediawiki-$pkgver/math + cd $srcdir/Math/math make install -d -m 0755 $pkgdir/usr/bin install -m 0755 texvc $pkgdir/usr/bin diff --git a/community/tls/PKGBUILD b/community/tls/PKGBUILD index c604b4237..a12e807fb 100644 --- a/community/tls/PKGBUILD +++ b/community/tls/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 14340 2010-04-02 23:21:39Z foutrelis $ +# $Id: PKGBUILD 59810 2011-11-30 14:40:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> -# Contributor: Mario Vazquez <mariovazq@gmail.com> +# Contributor: Mario Vazquez <mariovazq@gmail.com> pkgname=tls pkgver=1.6 -pkgrel=3 +pkgrel=4 pkgdesc="OpenSSL extension to Tcl" arch=('i686' 'x86_64' 'mips64el') url="http://tls.sourceforge.net/" license=('GPL') depends=('tcl' 'openssl' 'awk') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname$pkgver-src.tar.gz) +source=(http://downloads.sourceforge.net/project/tls/tls/$pkgver/tls$pkgver-src.tar.gz) md5sums=('eb326ff9e6fc3b9885aa5c72fb8df3bf') build() { - cd $startdir/src/tls$pkgver - + cd $srcdir/tls$pkgver ./configure --prefix=/usr --with-ssl-dir=/usr - make || return 1 - make test | awk '{print}/FAILED/{F=1}END{if(F)exit 1}' - make DESTDIR=$startdir/pkg install || return 1 -# sed -i 's|ifneeded tls 1.5|ifneeded tls 1.50|' $startdir/pkg/usr/lib/tls1.50/pkgIndex.tcl - ln -s tls1.6/libtls1.6.so $pkgdir/usr/lib/libtls1.6.so + make +} + +check() { + cd $srcdir/tls$pkgver +# make test | awk '{print}/FAILED/{F=1}END{if(F)exit 1}' +} + +package() { + cd $srcdir/tls$pkgver + make DESTDIR=$pkgdir install + ln -s tls$pkgver/libtls$pkgver.so $pkgdir/usr/lib/libtls$pkgver.so } diff --git a/extra/apricots/PKGBUILD b/extra/apricots/PKGBUILD index 409e7f7e2..36476601c 100644 --- a/extra/apricots/PKGBUILD +++ b/extra/apricots/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 137632 2011-09-10 08:59:53Z pierre $ +# $Id: PKGBUILD 143883 2011-11-30 13:08:53Z heftig $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=apricots pkgver=0.2.6 -pkgrel=4 +pkgrel=5 pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers" arch=("i686" "x86_64" 'mips64el') license=('GPL') url="http://www.fishies.org.uk/apricots.html" depends=('gcc-libs' 'openal' 'sdl' 'freealut') -source=("http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz" +#source=("http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz" +source=("ftp://ftp.archlinux.org/other/apricots/$pkgname-$pkgver.tar.gz" "apricots-0.2.6-freealut.patch") md5sums=('910828d717e46d8cbd9c24f702d09fbc' '5f9f74082dfe162ab3ba51f6ec628f99') diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index ee4fa8996..9217064dd 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 143685 2011-11-28 11:25:31Z eric $ +# $Id: PKGBUILD 143847 2011-11-30 06:23:25Z eric $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint -pkgver=0.25.0 +pkgver=1.0 pkgrel=1 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL' 'MIT') url="http://www.cinepaint.org" -depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'desktop-file-utils') +depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm') makedepends=('python2' 'gutenprint') optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins') options=('!libtool') install=cinepaint.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz - LICENSE cinepaint-0.22-gcc44.patch) -md5sums=('6ac099e3bc543e2460dfbffa7411d477' - '169085743f667c250ea2e4022efecf5f' - '368e820c27f525e3569d43388f1c119a') +source=(http://sourceforge.net/projects/cinepaint/files/CinePaint/${pkgname}-${pkgver}.tgz + LICENSE) +md5sums=('7dfdb005d246578392ac9bd500534804' + '169085743f667c250ea2e4022efecf5f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/cinepaint-0.22-gcc44.patch" + cd "${srcdir}/${pkgname}" find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in @@ -36,9 +34,9 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" install - sed -i -e "s|-I$srcdir/cinepaint-$pkgver||" -e "s|-I$srcdir/cinepaint-$pkgver/lib||" -e "/libcinepaint.la/d" \ - -e "s|$srcdir/cinepaint-$pkgver/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" + sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \ + -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/gimp-ufraw/PKGBUILD b/extra/gimp-ufraw/PKGBUILD index a9efc6192..ce7dfb73c 100644 --- a/extra/gimp-ufraw/PKGBUILD +++ b/extra/gimp-ufraw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139881 2011-10-05 19:06:39Z andrea $ +# $Id: PKGBUILD 143849 2011-11-30 06:25:30Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> pkgname=gimp-ufraw pkgver=0.18 -pkgrel=2 +pkgrel=3 pkgdesc="Standalone or gimp plugin converter for raw files" url="http://ufraw.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD index 5b2380e0c..42fe30077 100644 --- a/extra/lesstif/PKGBUILD +++ b/extra/lesstif/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137646 2011-09-10 10:03:09Z andrea $ +# $Id: PKGBUILD 143913 2011-11-30 20:33:57Z andrea $ # Maintainer: # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> @@ -6,21 +6,24 @@ pkgname=lesstif pkgver=0.95.2 -pkgrel=3 +pkgrel=4 pkgdesc="LGPL'd re-implementation of Motif" arch=('i686' 'x86_64' 'mips64el') url="http://www.lesstif.org/" license=('LGPL' 'MIT') depends=('freetype2' 'libxt' 'libxp') -options=('!libtool') +options=('!libtool' '!buildflags') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'LICENSE' '040_fedora_XxxxProperty-64bit.diff') + 'LICENSE' + '040_fedora_XxxxProperty-64bit.diff') md5sums=('754187dbac09fcf5d18296437e72a32f' 'b1f320192a9154f72d83e9d3d5a25a2f' '30e2c0babc84696af089d55cb9cb2908') build() { cd "${srcdir}"/${pkgname}-${pkgver} + + # https://bugs.archlinux.org/task/17712 patch -p1 -i "${srcdir}"/040_fedora_XxxxProperty-64bit.diff ./configure --prefix=/usr \ @@ -52,6 +55,6 @@ package() { make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif \ - DESTDIR=${pkgdir} install + DESTDIR="${pkgdir}" install install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD index 8db79470b..dff82cef1 100644 --- a/extra/libmatroska/PKGBUILD +++ b/extra/libmatroska/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138677 2011-09-27 15:10:51Z giovanni $ +# $Id: PKGBUILD 143895 2011-11-30 19:46:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor 03/08/04 <lefungus@altern.org> pkgname=libmatroska pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Matroska library" arch=('i686' 'x86_64' 'mips64el') url="http://dl.matroska.org/downloads/libmatroska/" diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD index 67ee93f18..c23c73b79 100644 --- a/extra/libvdpau/PKGBUILD +++ b/extra/libvdpau/PKGBUILD @@ -1,15 +1,15 @@ -# $Id$ +# $Id: PKGBUILD 143891 2011-11-30 19:04:39Z andrea $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libvdpau pkgver=0.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Nvidia VDPAU library" arch=(i686 x86_64 'mips64el') -url=http://cgit.freedesktop.org/~aplattner/libvdpau +url='http://cgit.freedesktop.org/~aplattner/libvdpau' depends=('gcc-libs') conflicts=('nvidia-utils<190.42-2') -options=('!libtool' 'force') +options=('!libtool') license=('custom') source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz) makedepends=('libx11') @@ -19,6 +19,10 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD index 8efc601e4..21f4de688 100644 --- a/extra/libxrandr/PKGBUILD +++ b/extra/libxrandr/PKGBUILD @@ -1,9 +1,11 @@ -# $Id: PKGBUILD 130687 2011-07-07 17:27:06Z andyrtr $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 143893 2011-11-30 19:05:26Z andrea $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=libxrandr pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -18,7 +20,12 @@ build() { cd "${srcdir}/libXrandr-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc make +} + +package() { + cd "${srcdir}/libXrandr-${pkgver}" make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index 6db503de5..410fd6601 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 116017 2011-03-22 15:50:13Z giovanni $ +# $Id: PKGBUILD 143897 2011-11-30 19:52:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar pkgver=4.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64' 'mips64el') url="http://www.abisource.com/downloads/link-grammar/" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 8a6bb1b31..5f5642c9e 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143082 2011-11-22 13:27:59Z giovanni $ +# $Id: PKGBUILD 143899 2011-11-30 19:57:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.11.20 +pkgver=2011.11.29 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('8e5ebefdf7d12ca9cfd7175ff3d7eef2') +md5sums=('ab422e32f2e0820ac5161cc3d842343d') build() { cd ${srcdir}/live diff --git a/extra/manedit/PKGBUILD b/extra/manedit/PKGBUILD index 194b4d474..fdd755c8f 100644 --- a/extra/manedit/PKGBUILD +++ b/extra/manedit/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 59169 2009-11-20 17:44:19Z giovanni $ +# $Id: PKGBUILD 143901 2011-11-30 20:13:10Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=manedit pkgver=1.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="An editor specifically tailored for UNIX manual pages" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -url="http://www.battlefieldlinux.com/wolfpack/ManEdit/" +url="http://freecode.com/projects/manedit" depends=('gcc-libs' 'bzip2' 'zlib' 'gtk') -source=(http://wolfsinger.com/~wolfpack/packages/${pkgname}-${pkgver}.tar.bz2 - manedit-1.2.1-fix-man-page.patch - manedit.desktop) +source=("http://wolfsinger.com/~wolfpack/packages/${pkgname}-${pkgver}.tar.bz2" + 'manedit-1.2.1-fix-man-page.patch' + 'manedit.desktop') md5sums=('a7ee1835e32ed3c9279412af7caf13ef' '60cb0c224a6659f8a8183006608f368b' 'bac6986fc25dda6f0e27e3673eef4600') @@ -21,7 +21,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" # Patch to fix generate man page - patch -Np1 -i ${srcdir}/manedit-1.2.1-fix-man-page.patch || return 1 + patch -Np1 -i ${srcdir}/manedit-1.2.1-fix-man-page.patch env CFLAGS="${CFLAGS}" \ ./configure Linux \ @@ -35,7 +35,11 @@ build() { --disable="arch-i686" \ --disable="arch-pentiumpro" - make all || return 1 + make all +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" # Fix strip error (tries to strip a shell script) cp manedit/Makefile.install.UNIX{,.orig} @@ -45,7 +49,7 @@ build() { # Set man dir too or FHS is violated make PREFIX="${pkgdir}/usr" \ MAN_DIR="${pkgdir}/usr/share/man/man1" \ - ICONS_DIR="${pkgdir}/usr/share/pixmaps" install || return 1 + ICONS_DIR="${pkgdir}/usr/share/pixmaps" install # Install desktop file install -Dm644 ${srcdir}/manedit.desktop "${pkgdir}/usr/share/applications/manedit.desktop" diff --git a/extra/minicom/PKGBUILD b/extra/minicom/PKGBUILD index f6fffb742..9501083fd 100644 --- a/extra/minicom/PKGBUILD +++ b/extra/minicom/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 108740 2011-02-02 18:46:01Z giovanni $ +# $Id: PKGBUILD 143903 2011-11-30 20:19:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=minicom pkgver=2.5 -pkgrel=1 +pkgrel=2 pkgdesc="A serial communication program" arch=('i686' 'x86_64' 'mips64el') +url="http://alioth.debian.org/projects/minicom/" license=('GPL') depends=('bash' 'ncurses') backup=('etc/minirc.dfl') source=("http://alioth.debian.org/frs/download.php/3487/${pkgname}-${pkgver}.tar.gz") -url="http://alioth.debian.org/projects/minicom/" md5sums=('a5117d4d21e2c9e825edb586ee2fe8d2') build() { @@ -20,12 +20,12 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/" install || return 1 - install -Dm644 doc/minirc.dfl ${pkgdir}/etc/minirc.dfl || return 1 + make DESTDIR="${pkgdir}/" install + install -Dm644 doc/minirc.dfl ${pkgdir}/etc/minirc.dfl } diff --git a/extra/mpck/PKGBUILD b/extra/mpck/PKGBUILD index 7348256f4..aa701f30c 100644 --- a/extra/mpck/PKGBUILD +++ b/extra/mpck/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 68070 2010-02-10 17:08:28Z giovanni $ +# $Id: PKGBUILD 143907 2011-11-30 20:27:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=mpck pkgver=0.19 -pkgrel=1 +pkgrel=2 license=('GPL') pkgdesc="Reads MP3 files and tries to determine if they are correct" arch=('i686' 'x86_64' 'mips64el') url="http://checkmate.gissen.nl/" depends=('glibc') -source=(http://checkmate.gissen.nl/checkmate-${pkgver}.tar.gz) +source=("http://checkmate.gissen.nl/checkmate-${pkgver}.tar.gz") md5sums=('f72114b0982a101b68ddeb65f99b84f7') build() { cd "${srcdir}/checkmate-${pkgver}" ./configure --prefix=/usr - make || return 1 - make prefix="${pkgdir}/usr" install || return 1 + make +} + +package() { + cd "${srcdir}/checkmate-${pkgver}" + + make prefix="${pkgdir}/usr" install } diff --git a/extra/mrtg/PKGBUILD b/extra/mrtg/PKGBUILD index 17bd8a4f0..00d32c17e 100644 --- a/extra/mrtg/PKGBUILD +++ b/extra/mrtg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 116027 2011-03-22 16:10:12Z giovanni $ +# $Id: PKGBUILD 143911 2011-11-30 20:31:37Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=mrtg pkgver=2.17.2 -pkgrel=1 +pkgrel=2 pkgdesc="Multi Router Traffic Grapher." arch=('i686' 'x86_64' 'mips64el') url="http://oss.oetiker.ch/mrtg/" diff --git a/extra/mtools/PKGBUILD b/extra/mtools/PKGBUILD index 1e9924ca9..1276e8fa8 100644 --- a/extra/mtools/PKGBUILD +++ b/extra/mtools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130005 2011-06-30 19:10:40Z giovanni $ +# $Id: PKGBUILD 143915 2011-11-30 20:36:32Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=mtools pkgver=4.0.17 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of utilities to access MS-DOS disks" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/mtools/" diff --git a/extra/muparser/PKGBUILD b/extra/muparser/PKGBUILD index 373a65616..8f80cc463 100644 --- a/extra/muparser/PKGBUILD +++ b/extra/muparser/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 102419 2010-12-07 19:36:22Z ronald $ +# $Id: PKGBUILD 143909 2011-11-30 20:28:47Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir.archlinux.org> pkgname=muparser pkgver=1.34 -pkgrel=1 -pkgdesc="a fast math parser library" +pkgrel=2 +pkgdesc="A fast math parser library" arch=('i686' 'x86_64' 'mips64el') url="http://muparser.sourceforge.net/" -depends=('glibc' 'gcc-libs') +depends=('gcc-libs') license=('custom') -source=(http://downloads.sourceforge.net/$pkgname/muparser_v134.tar.gz) +options=('!makeflags') +source=("http://downloads.sourceforge.net/$pkgname/${pkgname}_v134.tar.gz") md5sums=('0c4f4bf86aa2a5a737adc0e08cb77737') build() { @@ -25,6 +26,5 @@ package() { # license install -D -m644 License.txt \ - $pkgdir/usr/share/licenses/${pkgname}/License + $pkgdir/usr/share/licenses/${pkgname}/LICENSE } - diff --git a/extra/netkit-bsd-finger/PKGBUILD b/extra/netkit-bsd-finger/PKGBUILD index a07a0e0c1..5311af1c9 100644 --- a/extra/netkit-bsd-finger/PKGBUILD +++ b/extra/netkit-bsd-finger/PKGBUILD @@ -1,26 +1,35 @@ -# $Id: PKGBUILD 78053 2010-04-19 08:47:06Z dgriffiths $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 143921 2011-11-30 20:53:59Z andrea $ +# Maintainer: +# Contributor: dorphell <dorphell@archlinux.org> + pkgname=netkit-bsd-finger pkgver=0.17 -pkgrel=5.1 -pkgdesc="bsd-finger ported to Linux" +pkgrel=6 +pkgdesc="BSD-finger ported to Linux" arch=('i686' 'x86_64' 'mips64el') -url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" +url='ftp://ftp.uk.linux.org/pub/linux/Networking/netkit' license=('BSD') depends=('glibc' 'xinetd') backup=('etc/xinetd.d/finger') -source=(ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/bsd-finger-${pkgver}.tar.gz finger.xinetd LICENSE) -md5sums=('52bf281aac8814bf56cdc92f7661ee75' 'a8682004dc8dee356065162bde892b47'\ +source=("ftp://ftp.archlinux.org/other/${pkgname}/bsd-finger-${pkgver}.tar.gz" + 'finger.xinetd' 'LICENSE') +md5sums=('52bf281aac8814bf56cdc92f7661ee75' + 'a8682004dc8dee356065162bde892b47' '5fc568418a0379fc3a358ed1c2523b44') build() { cd ${srcdir}/bsd-finger-${pkgver} + ./configure --prefix=/usr + sed -i 's@include <sys/time.h>@include <time.h>@' finger/lprint.c + sed -i 's@include <sys/time.h>@include <time.h>@' finger/sprint.c + make +} + +package() { + cd ${srcdir}/bsd-finger-${pkgver} install -d ${pkgdir}/usr/{bin,sbin} ${pkgdir}/usr/share/man/{man1,man8} - ./configure --prefix=/usr || return 1 - sed -i 's@include <sys/time.h>@include <time.h>@' finger/lprint.c || return 1 - sed -i 's@include <sys/time.h>@include <time.h>@' finger/sprint.c || return 1 - make || return 1 - make INSTALLROOT=${pkgdir} MANDIR=/usr/share/man install || return 1 - install -D -m644 ${srcdir}/finger.xinetd ${pkgdir}/etc/xinetd.d/finger || return 1 - install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + make INSTALLROOT=${pkgdir} MANDIR=/usr/share/man install + + install -D -m644 ${srcdir}/finger.xinetd ${pkgdir}/etc/xinetd.d/finger + install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/normalize/PKGBUILD b/extra/normalize/PKGBUILD index f2e8eb00c..9fa1f7063 100644 --- a/extra/normalize/PKGBUILD +++ b/extra/normalize/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 60853 2009-12-07 12:43:05Z giovanni $ +# $Id: PKGBUILD 143917 2011-11-30 20:41:17Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=normalize pkgver=0.7.7 -pkgrel=4 +pkgrel=5 pkgdesc="A tool for adjusting the volume of WAV files to a standard level" arch=('i686' 'x86_64' 'mips64el') +url="http://normalize.nongnu.org" license=('GPL') depends=('audiofile' 'libmad' 'vorbis-tools' 'lame' 'flac' 'mpg123') -source=(http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -url="http://normalize.nongnu.org" +source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('1749b16fc7a08aa5d0cf9f76eeaa8436') build() { @@ -20,6 +20,11 @@ build() { --mandir=/usr/share/man \ --with-audiofile \ --with-mad - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install } diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 776af49d9..b710e7d66 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142201 2011-11-06 05:54:25Z bisson $ +# $Id: PKGBUILD 143934 2011-11-30 21:30:13Z andrea $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> @@ -21,7 +21,7 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' '97b41b8bc34f259f4e525ab2e58707c9724e72e2' '63572457586379aa6bf75b6e899e71d651e643f4' - '6d2d234afb1db2dcb940747a62f70217246a3d13' + 'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e' '6cfcb7bbd34499b30e31dffca2f3e1a036010271') install=install diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf index 5f31fea83..49b2f2bb7 100644 --- a/extra/ntp/ntp.conf +++ b/extra/ntp/ntp.conf @@ -13,6 +13,7 @@ server 2.pool.ntp.org # Only allow read-only access from localhost restrict default nomodify nopeer restrict 127.0.0.1 +restrict ::1 # Location of drift and log files driftfile /var/lib/ntp/ntp.drift diff --git a/extra/obexftp/PKGBUILD b/extra/obexftp/PKGBUILD index 62727963f..3c3426120 100644 --- a/extra/obexftp/PKGBUILD +++ b/extra/obexftp/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 89833 2010-09-04 10:07:43Z remy $ +# $Id: PKGBUILD 143919 2011-11-30 20:53:04Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=obexftp pkgver=0.23 -pkgrel=4 +pkgrel=5 pkgdesc="A tool for transfer files to/from any OBEX enabled device" arch=('i686' 'x86_64' 'mips64el') url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" license=('GPL') depends=('openobex' 'python2') -makedepends=('pkgconfig') +makedepends=('pkg-config') options=('!libtool') -source=(http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}.tar.bz2) +source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}.tar.bz2") md5sums=('f20762061b68bc921e80be4aebc349eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ - --disable-ruby --enable-python || return 1 + --disable-ruby \ + --enable-python make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + + make DESTDIR="${pkgdir}" install # remove nasty files # mv ${pkgdir}/usr/lib/perl5/site_perl/5.10.0 ${pkgdir}/usr/lib/perl5/site_perl/current diff --git a/extra/ocrad/PKGBUILD b/extra/ocrad/PKGBUILD index a5bfd577f..e15c6087f 100644 --- a/extra/ocrad/PKGBUILD +++ b/extra/ocrad/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 106659 2011-01-17 20:26:09Z giovanni $ +# $Id: PKGBUILD 143923 2011-11-30 20:57:38Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=ocrad pkgver=0.21 -pkgrel=1 +pkgrel=2 pkgdesc="An Optical Character Recognition program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/ocrad/ocrad.html" license=('GPL3') depends=('gcc-libs' 'texinfo') install=ocrad.install -source=(http://ftp.gnu.org/gnu/ocrad/ocrad-$pkgver.tar.gz) +source=("http://ftp.gnu.org/gnu/ocrad/ocrad-$pkgver.tar.gz") md5sums=('83f9eae9d808f9d86c181538d3f64aed') build() { @@ -18,10 +18,14 @@ build() { ./configure --prefix=/usr \ CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" || return 1 - make || return 1 + LDFLAGS="${LDFLAGS}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install install-man || return 1 + make DESTDIR="${pkgdir}" install install-man rm $pkgdir/usr/share/info/dir gzip $pkgdir/usr/share/info/* } diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD index 3a50e33ea..9b5699e24 100644 --- a/extra/parted/PKGBUILD +++ b/extra/parted/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 133576 2011-07-29 18:39:57Z giovanni $ +# $Id: PKGBUILD 143925 2011-11-30 21:06:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted pkgver=3.0 -pkgrel=3 +pkgrel=4 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://www.gnu.org/software/parted/parted.html" depends=('device-mapper' 'e2fsprogs') -makedepends=('pkgconfig') +makedepends=('pkg-config') options=('!libtool') -install=${pkgname}.install +install=parted.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" - linux.c.patch) + 'linux.c.patch') md5sums=('c415e5c97f86b5ff65a2d925e5a3feb7' '08c942e212424e238271217f52c59706') diff --git a/extra/perl-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD index 3ef98a39c..dc2ce8ea5 100644 --- a/extra/perl-fcgi/PKGBUILD +++ b/extra/perl-fcgi/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 140128 2011-10-07 15:36:23Z giovanni $ +# $Id: PKGBUILD 143929 2011-11-30 21:23:50Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-fcgi pkgver=0.74 -pkgrel=1 +pkgrel=2 pkgdesc="Fast CGI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/FCGI" license=('GPL' 'PerlArtistic') -depends=('perl>=5.14') +depends=('perl') options=('!emptydirs') source=("http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz") md5sums=('462a77a0072480fea791a4d3095eb486') diff --git a/extra/perl-locale-gettext/PKGBUILD b/extra/perl-locale-gettext/PKGBUILD index 7f320215a..a609c7a9f 100644 --- a/extra/perl-locale-gettext/PKGBUILD +++ b/extra/perl-locale-gettext/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125267 2011-05-25 19:18:48Z foutrelis $ +# $Id: PKGBUILD 143936 2011-11-30 21:34:33Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Paul Mattal <paul@archlinux.org> @@ -6,15 +6,15 @@ pkgname=perl-locale-gettext _realname=gettext pkgver=1.05 -pkgrel=7 +pkgrel=8 pkgdesc="Permits access from Perl to the gettext() family of functions" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" -depends=('gettext' 'perl>=5.10.0') +depends=('gettext' 'perl') options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/${_realname}-${pkgver}.tar.gz - compatibility-with-POSIX-module.patch) +source=("http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/${_realname}-${pkgver}.tar.gz" + 'compatibility-with-POSIX-module.patch') md5sums=('f3d3f474a1458f37174c410dfef61a46' '854302f34d01a2f8ae739187788973dd') @@ -25,6 +25,11 @@ build() { # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test } diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 51eb34b27..679c3a8d9 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140126 2011-10-07 15:32:39Z giovanni $ +# $Id: PKGBUILD 143942 2011-11-30 21:49:37Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay pkgver=1.42 -pkgrel=1 +pkgrel=2 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') @@ -21,13 +21,17 @@ build() { cd ${srcdir}/${_cpanname}-${pkgver} # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL -- INSTALLDIRS=vendor - make + make +} + +package() { + cd ${srcdir}/${_cpanname}-${pkgver} + make install DESTDIR=${pkgdir} # remove perllocal.pod and .packlist find ${pkgdir} -name perllocal.pod -delete find ${pkgdir} -name .packlist -delete - install -D -m644 README ${pkgdir}/usr/share/licenses/${pkgname}/README + install -D -m644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-net-upnp/PKGBUILD b/extra/perl-net-upnp/PKGBUILD index e6187ebf1..40b1c769b 100644 --- a/extra/perl-net-upnp/PKGBUILD +++ b/extra/perl-net-upnp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125279 2011-05-25 19:20:27Z foutrelis $ +# $Id: PKGBUILD 143946 2011-11-30 21:55:00Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Drew Gilbert <gilbert dot drew at gmail dot com> pkgname=perl-net-upnp pkgver=1.4.2 -pkgrel=3 +pkgrel=4 pkgdesc="Perl Module UPnP" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/" @@ -19,7 +19,12 @@ build() { # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make + make +} + +package() { + cd "${srcdir}/Net-UPnP-${pkgver}" + make install DESTDIR="${pkgdir}" find ${pkgdir} -name '.packlist' -delete diff --git a/extra/perl-time-hires/PKGBUILD b/extra/perl-time-hires/PKGBUILD index 3f80db457..9808e3bbd 100644 --- a/extra/perl-time-hires/PKGBUILD +++ b/extra/perl-time-hires/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131686 2011-07-13 14:46:13Z giovanni $ +# $Id: PKGBUILD 143950 2011-11-30 22:03:46Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: mezcal <fila at pruda dot com> pkgname=perl-time-hires pkgver=1.9724 -pkgrel=1 +pkgrel=2 pkgdesc="Perl module: high resolution time, sleep, and alarm" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD index 0c4a0ab44..fe7c7030f 100644 --- a/extra/psiconv/PKGBUILD +++ b/extra/psiconv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137993 2011-09-13 21:30:15Z eric $ +# $Id: PKGBUILD 143959 2011-11-30 22:26:38Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=psiconv pkgver=0.9.8 -pkgrel=8 +pkgrel=9 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" arch=('i686' 'x86_64' 'mips64el') url="http://software.frodo.looijaard.name/psiconv/" @@ -13,7 +13,7 @@ depends=('imagemagick') makedepends=('bc') backup=('etc/psiconv/psiconv.conf') options=('!libtool') -source=(http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz) +source=("http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz") md5sums=('8d7548e3c6b9cd408544736133728acd') build() { diff --git a/extra/scrot/PKGBUILD b/extra/scrot/PKGBUILD index d093c8457..6608526b1 100644 --- a/extra/scrot/PKGBUILD +++ b/extra/scrot/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 71789 2010-03-09 16:23:42Z giovanni $ +# $Id: PKGBUILD 143963 2011-11-30 22:40:01Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=scrot pkgver=0.8 -pkgrel=4 +pkgrel=5 pkgdesc="A simple command-line screenshot utility for X" arch=('i686' 'x86_64' 'mips64el') url="http://scrot.sourcearchive.com/" license=('MIT') depends=('giblib') -source=(ftp://ftp.archlinux.org/other/scrot/${pkgname}-${pkgver}.tar.bz2) +source=("ftp://ftp.archlinux.org/other/scrot/${pkgname}-${pkgver}.tar.bz2") md5sums=('6a02df0e3bb26ec578dfeb8f56a7b30d') build() { cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr \ --mandir=/usr/share/man - make || return 1 - make DESTDIR=$pkgdir docsdir=/usr/share/doc/scrot install || return 1 - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir docsdir=/usr/share/doc/scrot install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index d2258230d..cede125ec 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141049 2011-10-22 14:30:55Z giovanni $ +# $Id: PKGBUILD 143965 2011-11-30 23:00:34Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> @@ -6,17 +6,17 @@ pkgname=smartmontools pkgver=5.42 -pkgrel=1 -pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives." +pkgrel=2 +pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('gcc-libs') backup=('etc/smartd.conf' 'etc/conf.d/smartd') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \ - smartd.conf - smartd.rc) +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'smartd.conf' + 'smartd.rc') md5sums=('4460bf9a79a1252ff5c00ba52cf76b2a' '28c1b80c41dac52d433961dcfb4f70e0' 'fb30e07f87f2c1d99532e018291ad3e8') @@ -34,6 +34,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir}/ install + rm -rf ${pkgdir}/etc/rc.d install -Dm755 ${srcdir}/smartd.rc ${pkgdir}/etc/rc.d/smartd install -Dm644 ${srcdir}/smartd.conf ${pkgdir}/etc/conf.d/smartd diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 689723fa3..82dc3183e 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141128 2011-10-24 13:35:44Z giovanni $ +# $Id: PKGBUILD 143967 2011-11-30 23:07:49Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k pkgver=0.10.90 -pkgrel=1 +pkgrel=2 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64' 'mips64el') url="http://smb4k.berlios.de/" diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index bbc825d51..04308db2b 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,16 +1,20 @@ -# $Id: PKGBUILD 143561 2011-11-26 13:57:53Z andrea $ +# $Id: PKGBUILD 143877 2011-11-30 08:41:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde.org" license=('GPL') -depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control' 'telepathy-kde-contact-list') +depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control' 'telepathy-kde-contact-list' + 'telepathy-kde-auth-handler' 'telepathy-kde-integration-module' 'telepathy-kde-approver' + 'telepathy-kde-filetransfer-handler') makedepends=('cmake' 'automoc4') +optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support' + 'telepathy-haze: all protocols supported by libpurple') groups=('telepathy-kde') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index e9733b535..95b9166fd 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 143565 2011-11-26 13:59:00Z andrea $ +# $Id: PKGBUILD 143879 2011-11-30 08:42:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-contact-list pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde.org" license=('GPL') -depends=('kdebase-runtime' 'telepathy-qt4') +depends=('kdebase-runtime' 'telepathy-qt4' 'telepathy-kde-text-ui' 'telepathy-kde-send-file') makedepends=('cmake' 'automoc4') groups=('telepathy-kde') install=${pkgname}.install diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD index 05ee931e0..ee3ae699c 100644 --- a/extra/vala/PKGBUILD +++ b/extra/vala/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139449 2011-10-01 19:01:54Z ibiru $ +# $Id: PKGBUILD 143889 2011-11-30 17:59:28Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> pkgname=vala -pkgver=0.14.0 +pkgver=0.14.1 pkgrel=1 pkgdesc="Compiler for the GObject type system" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glib2') makedepends=('libxslt') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.14/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3830a30b54738ddfb29ab7819a4ac2370392f52fde090742a8a304fadaec747c') +sha256sums=('bef8c803e6e84d6dd2c6e771b72245ae268f49f554f3d00b2c4a0b7a28f4a439') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/akonadi/PKGBUILD b/testing/akonadi/PKGBUILD new file mode 100644 index 000000000..e2a0e90db --- /dev/null +++ b/testing/akonadi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143851 2011-11-30 06:28:56Z ibiru $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=akonadi +pkgver=1.6.2 +pkgrel=2 +pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" +arch=('i686' 'x86_64') +url='http://pim.kde.org/akonadi' +license=('LGPL') +depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('07e2aa2e6953ac518f9306911747e264') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/akonadi/akonadi.install b/testing/akonadi/akonadi.install new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/testing/akonadi/akonadi.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/avogadro/PKGBUILD b/testing/avogadro/PKGBUILD new file mode 100644 index 000000000..a942acb8d --- /dev/null +++ b/testing/avogadro/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 143853 2011-11-30 06:28:59Z ibiru $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Nick B <Shirakawasuna at gmail _dot_com> + +pkgname=avogadro +pkgver=1.0.3 +pkgrel=4 +pkgdesc="An advanced molecular editor based on Qt" +arch=('i686' 'x86_64') +url="http://avogadro.openmolecules.net/wiki/Main_Page" +license=('GPL2') +depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') +makedepends=('cmake' 'boost') +install=avogadro.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'replace-qt4_automoc-with-qt4_wrap_cpp.patch' + 'fix-boost.patch') +md5sums=('92c2702c1980f70fb6d87a1a58147911' + 'aec516daab066c15326a9681f8f15abc' + '46282e4709429447e44a0a54d51ad2ec') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch + patch -p1 -i "${srcdir}"/fix-boost.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DQT_MKSPECS_RELATIVE=share/qt/mkspecs + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/avogadro/avogadro.install b/testing/avogadro/avogadro.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/testing/avogadro/avogadro.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/avogadro/fix-boost.patch b/testing/avogadro/fix-boost.patch new file mode 100644 index 000000000..8fb53ef12 --- /dev/null +++ b/testing/avogadro/fix-boost.patch @@ -0,0 +1,33 @@ +--- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~ 2011-11-29 18:33:01.777291627 +0000 ++++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-11-29 18:33:23.480814612 +0000 +@@ -149,7 +149,7 @@ + endforeach(P_ITEM ${PYTHON_SRCS}) + endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) + +-QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) ++QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) + + # you have to add link_directories before you add the target + if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) +--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~ 2011-11-29 18:37:15.449506548 +0000 ++++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:37:52.729831744 +0000 +@@ -11,7 +11,7 @@ + # use all cpp files in this directory + FILE(GLOB wrapper_SRCS "*.cpp") + +-QT4_WRAP_CPP(MOC_SRCS moleculelist.h) ++QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) + + ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) + SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) +--- avogadro-1.0.3/libavogadro/CMakeLists.txt~ 2011-11-29 19:41:34.066938217 +0000 ++++ avogadro-1.0.3/libavogadro/CMakeLists.txt 2011-11-29 19:42:53.084320315 +0000 +@@ -18,7 +18,7 @@ + # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp + # We should probably scan the header to verify the Q_OBJECT macro is used + string(REPLACE ".cpp" ".h" hdr_list "${src_list}") +- qt4_wrap_cpp(moc_files ${hdr_list}) ++ qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) + # Now sort out the ui and qrc files, process them as appropriate + set(ui_plugin_files) + set(qrc_plugin_files) diff --git a/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch new file mode 100644 index 000000000..11f58a505 --- /dev/null +++ b/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch @@ -0,0 +1,778 @@ +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt +--- avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt 2011-11-29 18:49:58.520790652 +0100 +@@ -75,6 +75,42 @@ + zmatrix.h + ) + ++SET(libavogadro_MOC_HDRS ++ animation.h ++ atom.h ++ bond.h ++ color.h ++ colorbutton.h ++ colors/elementcolor.h ++ cube.h ++ elementdetail_p.h ++ elementtranslator.h ++ engine.h ++ engines/bsdyengine.h ++ extension.h ++ fragment.h ++ glwidget.h ++ mesh.h ++ molecule.h ++ moleculefile.h ++ moleculefile_p.h ++ periodictablescene_p.h ++ periodictableview.h ++ plotwidget.h ++ plugin.h ++ pluginmanager.h ++ primitive.h ++ protein.h ++ pythonengine_p.h ++ pythonerror.h ++ pythonextension_p.h ++ pythontool_p.h ++ residue.h ++ tool.h ++ toolgroup.h ++ zmatrix.h ++) ++ + set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS}) + # Also add in the qtiocompressor class + #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp) +@@ -113,7 +148,7 @@ + endforeach(P_ITEM ${PYTHON_SRCS}) + endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) + +-qt4_automoc(${libavogadro_SRCS}) ++QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) + + # you have to add link_directories before you add the target + if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) +@@ -149,7 +184,7 @@ + COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}") + endforeach(headerFile ${libavogadro_HDRS}) + +-add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) ++add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) + set_target_properties(avogadro + PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 ) + target_link_libraries(avogadro ${AVO_LINK_LIBRARIES}) +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp +--- avogadro-1.0.3/libavogadro/src/animation.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp 2011-11-29 18:48:47.967839537 +0100 +@@ -224,5 +224,3 @@ + } + + } // end namespace Avogadro +- +-#include "animation.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp +--- avogadro-1.0.3/libavogadro/src/atom.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp 2011-11-29 18:48:39.561218412 +0100 +@@ -293,5 +293,3 @@ + } + + } // End namespace Avogadro +- +-#include "atom.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp +--- avogadro-1.0.3/libavogadro/src/bond.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp 2011-11-29 18:49:00.067773985 +0100 +@@ -166,5 +166,3 @@ + } + + } // End namespace Avogadro +- +-#include "bond.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp +--- avogadro-1.0.3/libavogadro/src/color.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/color.cpp 2011-11-29 18:49:05.207746140 +0100 +@@ -152,5 +152,3 @@ + return "Generic Color"; + } + } +- +-#include "color.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp +--- avogadro-1.0.3/libavogadro/src/colorbutton.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp 2011-11-29 18:49:11.987709410 +0100 +@@ -94,5 +94,3 @@ + } + + } // end namespace +- +-#include "colorbutton.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp +--- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp 2011-11-29 18:50:11.077389292 +0100 +@@ -63,7 +63,5 @@ + + } + +-#include "elementcolor.moc" + //this is a static color plugin... + //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory) +- +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp +--- avogadro-1.0.3/libavogadro/src/cube.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp 2011-11-29 18:50:26.357306516 +0100 +@@ -322,5 +322,3 @@ + } + + } // End namespace Avogadro +- +-#include "cube.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp +--- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp 2011-11-29 18:50:37.680578505 +0100 +@@ -132,5 +132,3 @@ + } + + } // End namespace Avogadro +- +-#include "elementdetail_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp +--- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp 2011-11-29 18:50:48.160521729 +0100 +@@ -401,5 +401,3 @@ + } + + } // End namespace Avogadro +- +-#include "elementtranslator.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp +--- avogadro-1.0.3/libavogadro/src/engine.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp 2011-11-29 18:50:54.397154610 +0100 +@@ -377,5 +377,3 @@ + return m_molecule->bonds(); + } + } +- +-#include "engine.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp +--- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp 2011-11-29 18:51:18.733689435 +0100 +@@ -442,7 +442,5 @@ + } + + } +- +-#include "bsdyengine.moc" + // This is a static engine... + // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory ) +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp +--- avogadro-1.0.3/libavogadro/src/extension.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp 2011-11-29 18:51:56.360152261 +0100 +@@ -80,5 +80,3 @@ + } + + } +- +-#include "extension.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp +--- avogadro-1.0.3/libavogadro/src/fragment.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp 2011-11-29 18:52:01.906788880 +0100 +@@ -82,5 +82,3 @@ + } + + } // End namespace Avogadro +- +-#include "fragment.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp +--- avogadro-1.0.3/libavogadro/src/glwidget.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp 2011-11-29 18:52:14.346721486 +0100 +@@ -1966,5 +1966,3 @@ + d->updateCache = true; + } + } +- +-#include "glwidget.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp +--- avogadro-1.0.3/libavogadro/src/mesh.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp 2011-11-29 18:52:23.033341093 +0100 +@@ -231,5 +231,3 @@ + } + + } // End namespace Avogadro +- +-#include "mesh.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp +--- avogadro-1.0.3/libavogadro/src/molecule.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp 2011-11-29 18:52:33.573283993 +0100 +@@ -1575,5 +1575,3 @@ + } + + } // End namespace Avogadro +- +-#include "molecule.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp +--- avogadro-1.0.3/libavogadro/src/moleculefile.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp 2011-11-29 18:56:26.728687548 +0100 +@@ -22,23 +22,14 @@ + 02110-1301, USA. + **********************************************************************/ + +-#include "moleculefile.h" ++#include "moleculefile_p.h" + + #include <avogadro/molecule.h> + +-#include <QFile> + #include <QFileInfo> +-#include <QStringList> +-#include <QThread> + #include <QDebug> + #include <QPointer> + +-#include <openbabel/mol.h> +-#include <openbabel/obconversion.h> +- +-// Included in obconversion.h +-//#include <iostream> +- + namespace Avogadro { + + using OpenBabel::OBConversion; +@@ -578,164 +569,6 @@ + return false; + } + +- class ReadFileThread : public QThread +- { +- // Q_OBJECT +- +- public: +- ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) +- { +- } +- +- void addConformer(const OpenBabel::OBMol &conformer) +- { +- unsigned int numAtoms = conformer.NumAtoms(); +- std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); +- for (unsigned int i = 0; i < numAtoms; ++i) +- coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); +- m_moleculeFile->m_conformers.push_back(coords); +- } +- +- void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) +- { +- if (!c) { +- // this is the first molecule read +- m_moleculeFile->setConformerFile(true); +- addConformer(current); +- return; +- } +- +- if (!m_moleculeFile->isConformerFile()) +- return; +- +- // as long as we are not sure if this really is a +- // conformer/trajectory file, add the conformers +- addConformer(current); +- +- // performance: check only certain molecule 1-10,20,50 +- switch (c) { +- case 1: +- case 2: +- case 3: +- case 4: +- case 5: +- case 6: +- case 7: +- case 8: +- case 9: +- case 10: +- case 20: +- case 50: +- break; +- default: +- return; +- } +- +- if (first.NumAtoms() != current.NumAtoms()) { +- m_moleculeFile->setConformerFile(false); +- m_moleculeFile->m_conformers.clear(); +- return; +- } +- +- for (unsigned int i = 0; i < first.NumAtoms(); ++i) { +- OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); +- OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); +- if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { +- m_moleculeFile->setConformerFile(false); +- m_moleculeFile->m_conformers.clear(); +- return; +- } +- } +- } +- +- void run() +- { +- // Check that the file can be read from disk +- if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { +- // Cannot read the file +- m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") +- .arg(m_moleculeFile->m_fileName)); +- return; +- } +- +- // Construct the OpenBabel objects, set the file type +- OpenBabel::OBConversion conv; +- OpenBabel::OBFormat *inFormat; +- if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { +- // Input format not supported +- m_moleculeFile->m_error.append( +- QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); +- return; +- } else { +- inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); +- if (!inFormat || !conv.SetInFormat(inFormat)) { +- // Input format not supported +- m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") +- .arg(m_moleculeFile->m_fileName)); +- return; +- } +- } +- +- // set any options +- if (!m_moleculeFile->m_fileOptions.isEmpty()) { +- foreach(const QString &option, +- m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { +- conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); +- } +- } +- +- // Now attempt to read the molecule in +- ifstream ifs; +- ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc +- if (!ifs) // Should not happen, already checked file could be opened +- return; +- +- // read all molecules +- OpenBabel::OBMol firstOBMol, currentOBMol; +- unsigned int c = 0; +- conv.SetInStream(&ifs); +- m_moleculeFile->streamposRef().push_back(ifs.tellg()); +- while (ifs.good() && conv.Read(¤tOBMol)) { +- if (!c) +- firstOBMol = currentOBMol; +- +- if (c > 20 && !m_moleculeFile->isConformerFile()) +- m_moleculeFile->setFirstReady(true); +- +- // detect conformer/trajectory files +- detectConformers(c, firstOBMol, currentOBMol); +- // store information about molecule +- m_moleculeFile->streamposRef().push_back(ifs.tellg()); +- m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); +- // increment count +- ++c; +- } +- m_moleculeFile->streamposRef().pop_back(); +- +- // signle molecule files are not conformer files +- if (c == 1) { +- m_moleculeFile->setConformerFile(false); +- m_moleculeFile->m_conformers.clear(); +- } +- +- // check for empty titles +- for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { +- if (!m_moleculeFile->titlesRef()[i].isEmpty()) +- continue; +- +- QString title; +- if (m_moleculeFile->isConformerFile()) +- title = tr("Conformer %1").arg(i+1); +- else +- title = tr("Molecule %1").arg(i+1); +- +- m_moleculeFile->titlesRef()[i] = title; +- } +- } +- +- MoleculeFile *m_moleculeFile; +- }; // end ReadFileThread class +- + MoleculeFile* MoleculeFile::readFile(const QString &fileName, + const QString &fileType, const QString &fileOptions, bool wait) + { +@@ -794,6 +627,3 @@ + } + + } // end namespace Avogadro +- +-#include "moleculefile.moc" +- +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h +--- avogadro-1.0.3/libavogadro/src/moleculefile_p.h 1970-01-01 01:00:00.000000000 +0100 ++++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h 2011-11-29 18:57:43.108273764 +0100 +@@ -0,0 +1,202 @@ ++/********************************************************************** ++ MoleculeFile - Class representing molecule file. ++ ++ Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch ++ ++ This file is part of the Avogadro molecular editor project. ++ For more information, see <http://avogadro.openmolecules.net/> ++ ++ Avogadro is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ Avogadro is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301, USA. ++ **********************************************************************/ ++ ++#ifndef MOLECULEFILE_P_H ++#define MOLECULEFILE_P_H ++ ++#include "moleculefile.h" ++ ++#include <openbabel/mol.h> ++#include <openbabel/obconversion.h> ++ ++#include <QFile> ++#include <QStringList> ++#include <QThread> ++ ++namespace Avogadro { ++ ++ using OpenBabel::OBConversion; ++ using std::ifstream; ++ ++class ReadFileThread : public QThread ++{ ++ Q_OBJECT ++ ++ public: ++ ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) ++ { ++ } ++ ++ void addConformer(const OpenBabel::OBMol &conformer) ++ { ++ unsigned int numAtoms = conformer.NumAtoms(); ++ std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); ++ for (unsigned int i = 0; i < numAtoms; ++i) ++ coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); ++ m_moleculeFile->m_conformers.push_back(coords); ++ } ++ ++ void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) ++ { ++ if (!c) { ++ // this is the first molecule read ++ m_moleculeFile->setConformerFile(true); ++ addConformer(current); ++ return; ++ } ++ ++ if (!m_moleculeFile->isConformerFile()) ++ return; ++ ++ // as long as we are not sure if this really is a ++ // conformer/trajectory file, add the conformers ++ addConformer(current); ++ ++ // performance: check only certain molecule 1-10,20,50 ++ switch (c) { ++ case 1: ++ case 2: ++ case 3: ++ case 4: ++ case 5: ++ case 6: ++ case 7: ++ case 8: ++ case 9: ++ case 10: ++ case 20: ++ case 50: ++ break; ++ default: ++ return; ++ } ++ ++ if (first.NumAtoms() != current.NumAtoms()) { ++ m_moleculeFile->setConformerFile(false); ++ m_moleculeFile->m_conformers.clear(); ++ return; ++ } ++ ++ for (unsigned int i = 0; i < first.NumAtoms(); ++i) { ++ OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); ++ OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); ++ if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { ++ m_moleculeFile->setConformerFile(false); ++ m_moleculeFile->m_conformers.clear(); ++ return; ++ } ++ } ++ } ++ ++ void run() ++ { ++ // Check that the file can be read from disk ++ if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { ++ // Cannot read the file ++ m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") ++ .arg(m_moleculeFile->m_fileName)); ++ return; ++ } ++ ++ // Construct the OpenBabel objects, set the file type ++ OpenBabel::OBConversion conv; ++ OpenBabel::OBFormat *inFormat; ++ if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { ++ // Input format not supported ++ m_moleculeFile->m_error.append( ++ QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); ++ return; ++ } else { ++ inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); ++ if (!inFormat || !conv.SetInFormat(inFormat)) { ++ // Input format not supported ++ m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") ++ .arg(m_moleculeFile->m_fileName)); ++ return; ++ } ++ } ++ ++ // set any options ++ if (!m_moleculeFile->m_fileOptions.isEmpty()) { ++ foreach(const QString &option, ++ m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { ++ conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); ++ } ++ } ++ ++ // Now attempt to read the molecule in ++ ifstream ifs; ++ ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc ++ if (!ifs) // Should not happen, already checked file could be opened ++ return; ++ ++ // read all molecules ++ OpenBabel::OBMol firstOBMol, currentOBMol; ++ unsigned int c = 0; ++ conv.SetInStream(&ifs); ++ m_moleculeFile->streamposRef().push_back(ifs.tellg()); ++ while (ifs.good() && conv.Read(¤tOBMol)) { ++ if (!c) ++ firstOBMol = currentOBMol; ++ ++ if (c > 20 && !m_moleculeFile->isConformerFile()) ++ m_moleculeFile->setFirstReady(true); ++ ++ // detect conformer/trajectory files ++ detectConformers(c, firstOBMol, currentOBMol); ++ // store information about molecule ++ m_moleculeFile->streamposRef().push_back(ifs.tellg()); ++ m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); ++ // increment count ++ ++c; ++ } ++ m_moleculeFile->streamposRef().pop_back(); ++ ++ // signle molecule files are not conformer files ++ if (c == 1) { ++ m_moleculeFile->setConformerFile(false); ++ m_moleculeFile->m_conformers.clear(); ++ } ++ ++ // check for empty titles ++ for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { ++ if (!m_moleculeFile->titlesRef()[i].isEmpty()) ++ continue; ++ ++ QString title; ++ if (m_moleculeFile->isConformerFile()) ++ title = tr("Conformer %1").arg(i+1); ++ else ++ title = tr("Molecule %1").arg(i+1); ++ ++ m_moleculeFile->titlesRef()[i] = title; ++ } ++ } ++ ++ MoleculeFile *m_moleculeFile; ++}; ++ ++} // end namespace Avogadro ++ ++#endif // MOLECULEFILE_P_H +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp +--- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp 2011-11-29 18:52:50.259860261 +0100 +@@ -213,5 +213,3 @@ + } + + } // End namespace Avogadro +- +-#include "periodictablescene_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp +--- avogadro-1.0.3/libavogadro/src/periodictableview.cpp 2011-11-29 19:30:25.130970122 +0000 ++++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp 2011-11-29 18:52:50.259860261 +0100 +@@ -69,4 +69,3 @@ + + } // End namespace Avogadro + +-#include "periodictableview.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp +--- avogadro-1.0.3/libavogadro/src/plotwidget.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp 2011-11-29 18:53:09.389756626 +0100 +@@ -27,7 +27,6 @@ + **********************************************************************/ + + #include "plotwidget.h" +-#include "plotwidget.moc" + + #include <math.h> + #include <QDebug> +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp +--- avogadro-1.0.3/libavogadro/src/plugin.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp 2011-11-29 18:53:16.016387394 +0100 +@@ -65,5 +65,3 @@ + } + + } // end namespace Avogadro +- +-#include "plugin.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp +--- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp 2011-11-29 18:53:23.569679807 +0100 +@@ -784,5 +784,3 @@ + } + + } +- +-#include "pluginmanager.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp +--- avogadro-1.0.3/libavogadro/src/primitive.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp 2011-11-29 18:53:29.139649631 +0100 +@@ -77,5 +77,3 @@ + } + + } +- +-#include "primitive.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp +--- avogadro-1.0.3/libavogadro/src/protein.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp 2011-11-29 18:53:37.952935219 +0100 +@@ -978,5 +978,3 @@ + } + + } // End namespace Avogadro +- +-#include "protein.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt +--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:58:02.354836165 +0100 +@@ -11,9 +11,9 @@ + # use all cpp files in this directory + FILE(GLOB wrapper_SRCS "*.cpp") + +-qt4_automoc(moleculelist.cpp) ++QT4_WRAP_CPP(MOC_SRCS moleculelist.h) + +-ADD_LIBRARY(python-module MODULE ${wrapper_SRCS}) ++ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) + SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) + SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "") + if (WIN32) +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp +--- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:07.562214311 +0100 ++++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:14.538843182 +0100 +@@ -70,4 +70,3 @@ + + } + +-#include "moleculelist.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp +--- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp 2011-11-29 18:53:45.492894371 +0100 +@@ -289,5 +289,3 @@ + + + } +- +-#include "pythonengine_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp +--- avogadro-1.0.3/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:26.949426045 +0100 ++++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:41.176015640 +0100 +@@ -112,4 +112,3 @@ + + } // namespace + +-#include "pythonerror.moc" + +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp +--- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp 2011-11-29 18:53:54.082847836 +0100 +@@ -340,5 +340,3 @@ + } + + } +- +-#include "pythonextension_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp +--- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp 2011-11-29 18:54:02.269470152 +0100 +@@ -344,5 +344,3 @@ + } + + } +- +-#include "pythontool_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp +--- avogadro-1.0.3/libavogadro/src/residue.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp 2011-11-29 18:54:14.316071557 +0100 +@@ -160,6 +160,3 @@ + } + + } // End namespace Avogadro +- +- #include "residue.moc" +- +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp +--- avogadro-1.0.3/libavogadro/src/tool.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp 2011-11-29 18:55:05.515794184 +0100 +@@ -117,5 +117,3 @@ + } + + } // end namespace Avogadro +- +-#include "tool.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp +--- avogadro-1.0.3/libavogadro/src/toolgroup.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp 2011-11-29 18:55:11.699094018 +0100 +@@ -206,5 +206,3 @@ + } + + } // end namespace Avogadro +- +-#include "toolgroup.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp +--- avogadro-1.0.3/libavogadro/src/zmatrix.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp 2011-11-29 18:55:17.209064168 +0100 +@@ -149,5 +149,3 @@ + + + } // End namespace Avogadro +- +-#include "zmatrix.moc" diff --git a/testing/boost/BOOST_FOREACH.patch b/testing/boost/BOOST_FOREACH.patch new file mode 100644 index 000000000..12cf08800 --- /dev/null +++ b/testing/boost/BOOST_FOREACH.patch @@ -0,0 +1,60 @@ +Index: /trunk/boost/foreach_fwd.hpp
+===================================================================
+--- /trunk/boost/foreach_fwd.hpp (revision 62661)
++++ /trunk/boost/foreach_fwd.hpp (revision 75540)
+@@ -15,4 +15,6 @@
+ #define BOOST_FOREACH_FWD_HPP
+
++#include <utility> // for std::pair
++
+ // This must be at global scope, hence the uglified name
+ enum boost_foreach_argument_dependent_lookup_hack
+@@ -26,4 +28,7 @@
+ namespace foreach
+ {
++ template<typename T>
++ std::pair<T, T> in_range(T begin, T end);
++
+ ///////////////////////////////////////////////////////////////////////////////
+ // boost::foreach::tag
+@@ -47,4 +52,22 @@
+ } // namespace foreach
+
++// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131
++namespace BOOST_FOREACH
++{
++ using foreach::in_range;
++ using foreach::tag;
++
++ template<typename T>
++ struct is_lightweight_proxy
++ : foreach::is_lightweight_proxy<T>
++ {};
++
++ template<typename T>
++ struct is_noncopyable
++ : foreach::is_noncopyable<T>
++ {};
++
++} // namespace BOOST_FOREACH
++
+ } // namespace boost
+
+Index: /trunk/boost/foreach.hpp
+===================================================================
+--- /trunk/boost/foreach.hpp (revision 75077)
++++ /trunk/boost/foreach.hpp (revision 75540)
+@@ -166,5 +166,5 @@
+ // at the global namespace for your type.
+ template<typename T>
+-inline boost::foreach::is_lightweight_proxy<T> *
++inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
+ boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
+
+@@ -191,5 +191,5 @@
+ // at the global namespace for your type.
+ template<typename T>
+-inline boost::foreach::is_noncopyable<T> *
++inline boost::BOOST_FOREACH::is_noncopyable<T> *
+ boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
+
diff --git a/testing/boost/PKGBUILD b/testing/boost/PKGBUILD new file mode 100644 index 000000000..d21937455 --- /dev/null +++ b/testing/boost/PKGBUILD @@ -0,0 +1,121 @@ +# $Id: PKGBUILD 143855 2011-11-30 06:29:02Z ibiru $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Kritoke <kritoke@gamebox.net> +# Contributor: Luca Roccia <little_rock@users.sourceforge.net> + +pkgbase=boost +pkgname=('boost-libs' 'boost') +pkgver=1.48.0 +_boostver=${pkgver//./_} +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.boost.org/" +makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + exceptions.patch + BOOST_FOREACH.patch) +license=('custom') +md5sums=('313a11e97eb56eb7efd18325354631be' + '9b44c28b36303152050c8c82469569c5' + '2db6098a1a39bced4c6162eb46418320') + +_stagedir="${srcdir}/stagedir" + +build() { + # set python path for bjam + cd "${srcdir}/${pkgbase}_${_boostver}/tools" + echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam + echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam + echo "using mpi ;" >> build/v2/user-config.jam + + cd "${srcdir}"/${pkgbase}_${_boostver} + # https://svn.boost.org/trac/boost/ticket/5731 + patch -p0 -i "${srcdir}/exceptions.patch" + # https://svn.boost.org/trac/boost/ticket/6131 + patch -p2 -i "${srcdir}/BOOST_FOREACH.patch" + + + # build bjam + cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" + ./build.sh cc + + _bindir="bin.linuxx86" + [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" + + install -d "${_stagedir}"/usr/bin + install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam + + # build tools + cd "${srcdir}/${pkgbase}_${_boostver}/tools/" + "${_stagedir}"/usr/bin/bjam --toolset=gcc + + # copy the tools + cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin" + for i in *;do + install -m755 "${i}" "${_stagedir}/usr/bin/${i}" + done + + #boostbook needed by quickbook + cd "${srcdir}/${pkgbase}_${_boostver}/dist/" + cp -r share "${_stagedir}" + + # build libs + cd "${srcdir}/${pkgbase}_${_boostver}" + + # default "minimal" install: "release link=shared,static + # runtime-link=shared threading=single,multi" + # --layout=tagged will add the "-mt" suffix for multithreaded libraries + # and installs includes in /usr/include/boost. + # --layout=system no longer adds the -mt suffix for multi-threaded libs. + # install to ${_stagedir} in preparation for split packaging + + "${_stagedir}"/usr/bin/bjam \ + release debug-symbols=off threading=multi \ + runtime-link=shared link=shared,static \ + cflags=-fno-strict-aliasing \ + toolset=gcc \ + --prefix="${_stagedir}" \ + -sTOOLS=gcc \ + --layout=system \ + ${MAKEFLAGS} \ + install +} + +package_boost() { + pkgdesc="Free peer-reviewed portable C++ source libraries - Development" + depends=("boost-libs=${pkgver}") + optdepends=('python: for python bindings' + 'python2: for python2 bindings') + + install -d "${pkgdir}"/usr/{include,lib,share} + # headers/source files + cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ + + # static libs + cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ + + # utilities (bjam, bcp, pyste) + cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ + + #boostbook + cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share + + # license + install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ + "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt +} + +package_boost-libs() { + pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" + depends=('gcc-libs' 'bzip2' 'zlib' 'icu') + optdepends=('openmpi: for mpi support') + + install -d "${pkgdir}/usr/lib" + #shared libs + cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" + + # license + install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ + "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt +} diff --git a/testing/boost/exceptions.patch b/testing/boost/exceptions.patch new file mode 100644 index 000000000..9faa71526 --- /dev/null +++ b/testing/boost/exceptions.patch @@ -0,0 +1,25 @@ +diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp +--- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200 ++++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200 +@@ -20,6 +20,7 @@ + + #include "boost/mpl/if.hpp" + #include "boost/mpl/integral_c.hpp" ++#include "boost/throw_exception.hpp" + + namespace boost { namespace numeric + { +@@ -159,9 +160,9 @@ struct def_overflow_handler + void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow) + { + if ( r == cNegOverflow ) +- throw negative_overflow() ; ++ boost::throw_exception( negative_overflow() ) ; + else if ( r == cPosOverflow ) +- throw positive_overflow() ; ++ boost::throw_exception( positive_overflow() ) ; + } + } ; + + +Diff finished. Fri Jul 22 11:46:49 2011 diff --git a/testing/ekiga/PKGBUILD b/testing/ekiga/PKGBUILD new file mode 100644 index 000000000..1ea85f94d --- /dev/null +++ b/testing/ekiga/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 143857 2011-11-30 06:29:05Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tom K <tomk@runbox.com> + +pkgname=ekiga +pkgver=3.3.2 +pkgrel=2 +pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" +url="http://www.ekiga.org" +license=(GPL) +arch=(i686 x86_64) +depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') +makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost' 'gnome-common') +optdepends=('evolution-data-server: Evolution integration') +options=(!emptydirs) +groups=('gnome-extra') +install=ekiga.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-schemas-install \ + --disable-scrollkeeper --enable-dbus + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/ekiga/ekiga.install b/testing/ekiga/ekiga.install new file mode 100644 index 000000000..b1d76a4a3 --- /dev/null +++ b/testing/ekiga/ekiga.install @@ -0,0 +1,22 @@ +pkgname=ekiga + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD new file mode 100644 index 000000000..a232576d7 --- /dev/null +++ b/testing/hugin/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143859 2011-11-30 06:29:09Z ibiru $ +# Maintainer: Tobias Kieslich <tobias@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=hugin +pkgver=2011.2.0 +pkgrel=2 +pkgdesc="A frontend to the panorama-tools" +arch=('i686' 'x86_64') +url="http://hugin.sourceforge.net/" +license=('GPL') +depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' + 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') +makedepends=('zip' 'cmake' 'boost' 'tclap') +install=hugin.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('79dfdac229b4e58f50c893c1238bdd0921ad9da6') + +build() { + cd "${srcdir}" + mkdir build && cd build + cmake "${srcdir}/${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ + -DENABLE_LAPACK=yes + make +} + +package(){ + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/hugin/hugin.install b/testing/hugin/hugin.install new file mode 100644 index 000000000..362749233 --- /dev/null +++ b/testing/hugin/hugin.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} diff --git a/testing/kdeedu-kig/PKGBUILD b/testing/kdeedu-kig/PKGBUILD new file mode 100644 index 000000000..9bde7108a --- /dev/null +++ b/testing/kdeedu-kig/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143861 2011-11-30 06:29:12Z ibiru $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdeedu-kig +pkgver=4.7.3 +pkgrel=2 +pkgdesc="Interactive Geometry" +url="http://kde.org/applications/education/kig/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +depends=('kdebase-runtime') +makedepends=('cmake' 'automoc4') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2") +sha1sums=('5a948b641f380e1cc6cf0f91d795a97029464bbb') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../kig-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py +} diff --git a/testing/kdeedu-kig/kdeedu-kig.install b/testing/kdeedu-kig/kdeedu-kig.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdeedu-kig/kdeedu-kig.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/keyutils/PKGBUILD b/testing/keyutils/PKGBUILD new file mode 100644 index 000000000..79bde8741 --- /dev/null +++ b/testing/keyutils/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 143944 2011-11-30 21:52:16Z stephane $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=keyutils +pkgver=1.5.5 +pkgrel=1 +pkgdesc="Linux Key Management Utilities" +arch=(i686 x86_64) +url="http://www.kernel.org" +license=('GPL2' 'LGPL2.1') +depends=('glibc' 'sh') +backup=(etc/request-key.conf) +source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('9e8ab5164bc8f84be148761cc89e9d6f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s|/lib64|/lib|g" Makefile + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/liborigin2/PKGBUILD b/testing/liborigin2/PKGBUILD new file mode 100644 index 000000000..e3616a53e --- /dev/null +++ b/testing/liborigin2/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 143863 2011-11-30 06:29:14Z ibiru $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgbase=liborigin2 +pkgname=('liborigin2' 'liborigin2-docs') +pkgver=20100913 +pkgrel=6 +arch=('i686' 'x86_64') +url="http://soft.proindependent.com/liborigin2/" +license=('GPL3') +makedepends=('doxygen' 'qt' 'boost') +replaces=('liborigin') +provides=('liborigin') +source=(http://download.berlios.de/qtiplot/${pkgbase}-13092010.zip + liborigin.pro.archlinux + http://tree.phi-sci.com/tree.hh) +md5sums=('e2b41c4d8a1e2d357dd2b5b331d31375' + '2b19f7a4bd120f6d689edc327468e48e' + '966ef25cb42d192a694a71eedf484c1c') + +build() { + cd "${srcdir}/${pkgbase}" + + install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin.pro + install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases + qmake liborigin.pro QMAKESPEC=linux-g++ + make QTDIR=/usr/ QMAKESPEC=linux-g++ + + # create documentation + cd doc + doxygen +} + +package_liborigin2() { + pkgdesc="A library for reading OriginLab OPJ project files" + depends=('boost-libs') + + cd "${srcdir}/${pkgbase}" + + INSTALL_ROOT="${pkgdir}" make install + + # install missing includes + install -Dm644 tree.hh "${pkgdir}/usr/include/liborigin2/tree.hh" + for i in *.h; do + install -Dm644 ${i} "${pkgdir}/usr/include/liborigin2/${i}" + done +} +package_liborigin2-docs() { + pkgdesc="Documentation for liborigin2: a library for reading OriginLab OPJ project files" + + cd "${srcdir}/${pkgbase}/doc" + install -d "${pkgdir}/usr/share/doc/${pkgbase}" + cp -rf html/* "${pkgdir}/usr/share/doc/${pkgbase}" + chmod 755 "${pkgdir}/usr/share/doc/liborigin2/images" + chmod 644 "${pkgdir}/usr/share/doc/liborigin2/images/origin_import.png" +} diff --git a/testing/liborigin2/liborigin.pro.archlinux b/testing/liborigin2/liborigin.pro.archlinux new file mode 100644 index 000000000..d338a009c --- /dev/null +++ b/testing/liborigin2/liborigin.pro.archlinux @@ -0,0 +1,41 @@ +TARGET = origin2
+TEMPLATE = lib
+CONFIG += warn_on release thread
+#CONFIG += staticlib
+MOC_DIR = ./tmp
+OBJECTS_DIR = ./tmp
+
+DESTDIR = ./
+
+#INCLUDEPATH += boost_1_33_0
+LIBS += -lboost_date_time
+LIBS += -lboost_thread
+
+HEADERS += endianfstream.hh
+HEADERS += logging.hpp
+HEADERS += OriginObj.h
+HEADERS += OriginFile.h
+HEADERS += OriginParser.h
+HEADERS += OriginDefaultParser.h
+HEADERS += Origin600Parser.h
+HEADERS += Origin610Parser.h
+HEADERS += Origin700Parser.h
+HEADERS += Origin750Parser.h
+HEADERS += Origin800Parser.h
+HEADERS += Origin810Parser.h
+
+SOURCES += OriginFile.cpp
+SOURCES += OriginParser.cpp
+SOURCES += OriginDefaultParser.cpp
+SOURCES += Origin600Parser.cpp
+SOURCES += Origin610Parser.cpp
+SOURCES += Origin700Parser.cpp
+SOURCES += Origin750Parser.cpp
+SOURCES += Origin800Parser.cpp
+SOURCES += Origin810Parser.cpp
+
+headers.files = \$\$HEADERS
+headers.path = /usr/include/liborigin2
+target.path = /usr/lib
+INSTALLS = target headers
+
diff --git a/testing/libpst/PKGBUILD b/testing/libpst/PKGBUILD new file mode 100644 index 000000000..6f8696e41 --- /dev/null +++ b/testing/libpst/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 143865 2011-11-30 06:29:17Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=libpst +pkgname=('libpst' 'libpst-docs') +pkgver=0.6.53 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.five-ten-sg.com/libpst/" +license=('GPL') +makedepends=('python2' 'boost') +source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz) +sha1sums=('b8e5972429091fd0e915fd3eb695b68adbe1f7cc') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man \ + --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2 + make +} + +package_libpst() { + pkgdesc="Outlook .pst file converter" + depends=('gcc-libs') + optdepends=('boost-libs: for libpst python interface') + options=('!libtool' '!docs') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_libpst-docs() { + pkgdesc="Documentation for Outlook .pst file converter" + options=('!libtool') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install-htmlDATA + cd "${srcdir}/${pkgbase}-${pkgver}/html" + make DESTDIR="${pkgdir}" install-htmldevelDATA +} diff --git a/testing/libtorrent-rasterbar/PKGBUILD b/testing/libtorrent-rasterbar/PKGBUILD new file mode 100644 index 000000000..c607527a9 --- /dev/null +++ b/testing/libtorrent-rasterbar/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 143867 2011-11-30 06:29:19Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Hugo Doria <hugo@archlinux.org> + +pkgname=libtorrent-rasterbar +pkgver=0.15.9 +pkgrel=1 +pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" +url="http://www.rasterbar.com/products/libtorrent/" +arch=('i686' 'x86_64') +license=('custom') +depends=('boost-libs' 'python2') +makedepends=('boost') +options=('!libtool' '!emptydirs') +source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) +sha1sums=('d86eb9d4452d07715a355d3a67312f162d6eff3a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-python-binding + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/testing/lyx/PKGBUILD b/testing/lyx/PKGBUILD new file mode 100644 index 000000000..e78a14c10 --- /dev/null +++ b/testing/lyx/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 143869 2011-11-30 06:29:21Z ibiru $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=lyx +pkgver=2.0.1 +pkgrel=3 +pkgdesc="An advanced open-source document processor" +arch=('i686' 'x86_64') +url="http://www.lyx.org" +depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'enchant' 'boost-libs' 'libmythes') +makedepends=('boost') +license=('GPL') +source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz + lyx.desktop lyxrc.dist) +backup=('etc/lyx/lyxrc.dist') +install=lyx.install +sha1sums=('225b4d853f38463e986a9b42a39cac432da56d8a' + 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad' + '56416642cc3da2a13b87b84e6b87c1a239f3d09a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} + + sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp + export CXXFLAGS="$CXXFLAGS -fpermissive" + ./configure --prefix=/usr \ + --with-frontend=qt4 --without-included-boost \ + --without-included-mythes + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # install desktop entry + install -Dm644 "${srcdir}/lyx.desktop" \ + "${pkgdir}/usr/share/applications/lyx.desktop" + install -Dm644 "lib/images/lyx.png" \ + "${pkgdir}/usr/share/pixmaps/lyx.png" + + # install default config file + install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist" + ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist" +} diff --git a/testing/lyx/lyx.desktop b/testing/lyx/lyx.desktop new file mode 100644 index 000000000..649b30c98 --- /dev/null +++ b/testing/lyx/lyx.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=LyX Document Processor +GenericName=Document Processor +Comment=High level LaTeX frontend +Exec=lyx %F +TryExec=lyx +Icon=lyx +StartupNotify=false +StartupWMClass=Lyx +Terminal=false +Categories=Office;WordProcessor;Qt; +MimeType=text/x-lyx;application/x-lyx; diff --git a/testing/lyx/lyx.install b/testing/lyx/lyx.install new file mode 100644 index 000000000..c15c17b3a --- /dev/null +++ b/testing/lyx/lyx.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove () { + post_install +} + + + diff --git a/testing/lyx/lyxrc.dist b/testing/lyx/lyxrc.dist new file mode 100644 index 000000000..dd18694f9 --- /dev/null +++ b/testing/lyx/lyxrc.dist @@ -0,0 +1,14 @@ +### This file is part of +### ======================================================== +### LyX, The Document Processor +### +### Copyright 1995 Matthias Ettrich +### Copyright 1995-2011 The LyX Team. +### +### ======================================================== + +# The file lyxrc.dist gives initial global options for all LyX users. +# Almost all settings here can be overridden through the preferences in LyX. + +\thesaurusdir_path "/usr/share/mythes" +\hunspelldir_path "/usr/share/myspell" diff --git a/testing/mkvtoolnix/PKGBUILD b/testing/mkvtoolnix/PKGBUILD new file mode 100644 index 000000000..b7c234849 --- /dev/null +++ b/testing/mkvtoolnix/PKGBUILD @@ -0,0 +1,82 @@ +# $Id: PKGBUILD 143887 2011-11-30 17:14:00Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: xduugu <xduugu@gmx.com> + +pkgbase=mkvtoolnix +pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') +pkgver=5.1.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" +makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' + 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') +source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") +md5sums=('fed878893a7f292969e8bd81c7ab9209') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Disable automagic curl dep used for online update checking + sed -i -e '/curl/d' configure.in + export CURL_CFLAGS="" CURL_LIBS="" + + export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3" + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3" + + autoreconf + + ./configure --prefix=/usr \ + --with-boost-libdir=/usr/lib \ + --disable-gui + rake + + mv src/mkvinfo{,-cli} + + ./configure --prefix=/usr \ + --with-boost-libdir=/usr/lib + rake +} + +package_mkvtoolnix-cli() { + pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" + depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2') + provides=('mkvtoolnix') + conflicts=('mkvtoolnix') + replaces=('mkvtoolnix') + + cd "${srcdir}/${pkgbase}-${pkgver}" + + rake DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/bin/mkvinfo + install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo + + rm -rf "${pkgdir}"/usr/bin/mmg + rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/applications + rm -rf "${pkgdir}"/usr/share/icons + rm -rf "${pkgdir}"/usr/share/mime +} + +package_mkvtoolnix-gtk() { + pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI" + depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils') + install=mkvtoolnix.install + + cd "${srcdir}/${pkgbase}-${pkgver}" + + rake DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/bin/mkv* + install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk + sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop + + rm -rf "${pkgdir}"/usr/share/doc + rm -rf "${pkgdir}"/usr/share/locale + rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv* +} diff --git a/testing/mkvtoolnix/mkvtoolnix.install b/testing/mkvtoolnix/mkvtoolnix.install new file mode 100644 index 000000000..74d9eb2ef --- /dev/null +++ b/testing/mkvtoolnix/mkvtoolnix.install @@ -0,0 +1,14 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + if [ -f usr/bin/update-mime-database ]; then + update-mime-database usr/share/mime &> /dev/null + fi +} + +post_upgrade() { + post_install +} + +pre_remove() { + post_install +} diff --git a/testing/source-highlight/PKGBUILD b/testing/source-highlight/PKGBUILD new file mode 100644 index 000000000..5ae1785a5 --- /dev/null +++ b/testing/source-highlight/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143873 2011-11-30 06:29:25Z ibiru $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=source-highlight +pkgver=3.1.5 +pkgrel=2 +pkgdesc="Convert source code to syntax highlighted document" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/src-highlite/" +license=('GPL') +depends=('gcc-libs' 'bash' 'boost-libs') +makedepends=('ctags' 'boost') +options=('!libtool') +install=$pkgname.install +source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz") +md5sums=('3117ee47c1c6b0668667e20d2aca3757') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-bash-completion=${pkgdir}/etc/bash_completion.d + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}/usr" install +} diff --git a/testing/source-highlight/source-highlight.install b/testing/source-highlight/source-highlight.install new file mode 100644 index 000000000..4fd1b3005 --- /dev/null +++ b/testing/source-highlight/source-highlight.install @@ -0,0 +1,18 @@ +info_dir=usr/share/info +info_files=(source-highlight.info source-highlight-lib.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/testing/wesnoth/PKGBUILD b/testing/wesnoth/PKGBUILD new file mode 100644 index 000000000..d568c820e --- /dev/null +++ b/testing/wesnoth/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 143875 2011-11-30 06:29:27Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Jacobo Arvelo <unix4all@ya.com> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=wesnoth +pkgver=1.8.6 +pkgrel=3 +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=${pkgver}" 'dbus-core') +makedepends=('boost') +install=wesnoth.install +options=(!emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + wesnoth-libpng-1.4.0.patch + wesnoth-1.8.6-boost-foreach.patch + wesnoth.tmpfiles.conf) +md5sums=('f1c3179869b01b61e253e74aeb241034' + 'ca7412ffc4682ef55ddf82d56b0e2f08' + 'dc414ab7e1334941548e9db6db9c2460' + 'b8122f5054e3895c9c054e87460869dc') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/wesnoth-libpng-1.4.0.patch" + patch -Np1 -i "$srcdir/wesnoth-1.8.6-boost-foreach.patch" + ./autogen.sh + ./configure --prefix=/usr --localstatedir=/var --enable-tools \ + --enable-editor --enable-server --with-fifodir=/run/wesnothd +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install-exec + install -dm755 "$pkgdir/usr/lib/tmpfiles.d/" + install -m644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf" + + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wesnoth_addon_manager" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlindent" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlscope" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmllint" +} diff --git a/testing/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/testing/wesnoth/wesnoth-1.8.6-boost-foreach.patch new file mode 100644 index 000000000..5aee3118c --- /dev/null +++ b/testing/wesnoth/wesnoth-1.8.6-boost-foreach.patch @@ -0,0 +1,70 @@ +--- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21 23:05:56.594879049 +0200 ++++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21 23:28:07.540358742 +0200 +@@ -238,6 +238,17 @@ void ttree_view_node::clear() + + struct ttree_view_node_implementation + { ++ template<class W, class It> ++ static W* find_at_aux(It begin, It end, ++ const tpoint& coordinate, const bool must_be_active) { ++ for (It it = begin; it != end; ++it) { ++ if(W* widget = it->find_at(coordinate, must_be_active)) { ++ return widget; ++ } ++ } ++ return NULL; ++ } ++ + template<class W> + static W* find_at( + typename tconst_duplicator<W, ttree_view_node>::type& +@@ -255,13 +266,9 @@ struct ttree_view_node_implementation + } + + typedef typename tconst_duplicator<W, ttree_view_node>::type thack; +- foreach(thack& node, tree_view_node.children_) { +- if(W* widget = node.find_at(coordinate, must_be_active)) { +- return widget; +- } +- } +- +- return NULL; ++ return find_at_aux<W>(tree_view_node.children_.begin(), ++ tree_view_node.children_.end(), ++ coordinate, must_be_active); + } + }; + +@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size + return size; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz + size.x += (get_indention_level() - 1) * tree_view().indention_step_size_; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s + + DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n"; + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; diff --git a/testing/wesnoth/wesnoth-libpng-1.4.0.patch b/testing/wesnoth/wesnoth-libpng-1.4.0.patch new file mode 100644 index 000000000..be8adfcaa --- /dev/null +++ b/testing/wesnoth/wesnoth-libpng-1.4.0.patch @@ -0,0 +1,14 @@ +diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 +@@ -174,8 +174,8 @@ + //TODO: review whether providing NULL error handlers is something + //sensible + png_struct* png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL), +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL), ++ NULL, NULL); + if(!png_ptr) + throw exploder_failure("Unable to initialize the png write structure"); + diff --git a/testing/wesnoth/wesnoth.install b/testing/wesnoth/wesnoth.install new file mode 100644 index 000000000..4f1e419ae --- /dev/null +++ b/testing/wesnoth/wesnoth.install @@ -0,0 +1,9 @@ +# arg 1: the new package version +post_install() { +cat << EOF +Note: +==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma" +==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth +==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output. +EOF +} diff --git a/testing/wesnoth/wesnoth.tmpfiles.conf b/testing/wesnoth/wesnoth.tmpfiles.conf new file mode 100644 index 000000000..3ec0f6013 --- /dev/null +++ b/testing/wesnoth/wesnoth.tmpfiles.conf @@ -0,0 +1 @@ +D /run/wesnothd 0700 root root - |
