From d5d697136e6d703fa618b3fb08915eef50d4d4de Mon Sep 17 00:00:00 2001 From: root Date: Sat, 26 Nov 2011 23:14:49 +0000 Subject: Sat Nov 26 23:14:49 UTC 2011 --- extra/enblend-enfuse/PKGBUILD | 18 ++++++++++-------- extra/enblend-enfuse/enblend-enfuse.install | 6 ++++-- extra/kdeedu-kig/PKGBUILD | 2 +- extra/libburn/PKGBUILD | 6 +++--- extra/libisoburn/PKGBUILD | 8 ++++---- extra/telepathy-gabble/PKGBUILD | 14 +++++++------- extra/tracker/PKGBUILD | 8 ++++---- 7 files changed, 33 insertions(+), 29 deletions(-) (limited to 'extra') diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index 32708fb9c..b46dbd724 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 138480 2011-09-24 16:46:36Z stephane $ +# $Id: PKGBUILD 143541 2011-11-26 04:58:43Z eric $ # Maintainer: tobias # Contributor: Dominik Ryba pkgname=enblend-enfuse pkgver=4.0 -pkgrel=3 -pkgdesc="intelligent blend tool for overlapping picture" +pkgrel=4 +pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64") license=('GPL') url="http://enblend.sourceforge.net" -depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'libgl' 'lcms' 'texinfo' 'libpng') -makedepends=('boost' 'pkgconfig') +depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng') +makedepends=('boost') replaces=('enblend') conflicts=('enblend') provides=('enblend') install=${pkgname}.install -source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz libpng-1.4.patch) -md5sums=('2e7c950061e0085fd75d94576130250f' 'a39df8dd32ccfa020dea2ea388642575') -sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' 'eae6cf48ea082865130302d0b4d1ca0b884a563b') +source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} libpng-1.4.patch) +sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' + 'aac6364b29b0a9d6c61c3db0982f52ce1579e934' + 'eae6cf48ea082865130302d0b4d1ca0b884a563b') build() { cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx patch -Np1 -i ../libpng-1.4.patch ./configure --prefix=/usr make diff --git a/extra/enblend-enfuse/enblend-enfuse.install b/extra/enblend-enfuse/enblend-enfuse.install index 0ba358878..24ea28a4e 100644 --- a/extra/enblend-enfuse/enblend-enfuse.install +++ b/extra/enblend-enfuse/enblend-enfuse.install @@ -1,7 +1,8 @@ -infodir=/usr/share/info -filelist=(enblend.info enfuse-focus-stacking.info enfuse.info) +infodir=usr/share/info +filelist=(enblend.info enfuse.info) post_install() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info $infodir/$file.gz $infodir/dir 2> /dev/null done @@ -12,6 +13,7 @@ post_upgrade() { } pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 for file in ${filelist[@]}; do install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 3caba94f6..b0e9cf7dc 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141819 2011-11-02 18:14:04Z andrea $ +# $Id: PKGBUILD 143501 2011-11-25 08:27:09Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdeedu-kig diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index e8fbd4cba..250747ac0 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140467 2011-10-15 09:28:22Z andyrtr $ +# $Id: PKGBUILD 143527 2011-11-25 17:36:29Z andyrtr $ # Maintainer: Andreas Radke # Contributor: William Rea pkgname=libburn -pkgver=1.1.6 #.pl01 +pkgver=1.1.8 #.pl01 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool' '!emptydirs') -md5sums=('741604c3d4064502f06bae20293c508c') +md5sums=('b91d2b8c65483efe447dbc3e3c9545d0') build() { cd ${srcdir}/${pkgname}-${pkgver} #/.pl??/} diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index a48ca5a20..39e306723 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 140472 2011-10-15 09:35:02Z andyrtr $ +# $Id: PKGBUILD 143529 2011-11-25 17:39:44Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Gour pkgname=libisoburn -pkgver=1.1.6 +pkgver=1.1.8 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" arch=('i686' 'x86_64') license=('GPL2') -depends=('libburn' 'libisofs' 'readline') +depends=('libburn>=1.1.8' 'libisofs>=1.1.6' 'readline') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('132746d3662005fd4dd462fc5d80d588') +md5sums=('78c02d1790d5871524a9f4434934e277') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index 3ba473cc2..19294d97f 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142337 2011-11-08 15:59:23Z ibiru $ +# $Id: PKGBUILD 143507 2011-11-25 10:37:09Z ibiru $ # Maintainer : Ionut Biru # Contributor: Daniel Balieiro # Contributor: Rodrigo L. M. Flores pkgname=telepathy-gabble -pkgver=0.14.0 +pkgver=0.14.1 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64') @@ -13,18 +13,18 @@ license=('LGPL2.1') depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3') makedepends=('libxslt' 'python2') options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz) +source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/$pkgname-$pkgver.tar.gz) install=telepathy-gabble.install -md5sums=('73afa5533833d176b9b82b96351efe63') +md5sums=('f6dfcd3da49eb6a558085fc917cdbdd4') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $srcdir/$pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy --with-tls=openssl make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 19ad1b223..1fcc15fb7 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 142660 2011-11-12 17:18:45Z ibiru $ +# $Id: PKGBUILD 143537 2011-11-26 00:25:40Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Sergej Pupykin # Contributor: Alexander Fehr pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.12.7 +pkgver=0.12.8 _tver=${pkgver%.*} -pkgrel=2 +pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" arch=('i686' 'x86_64') license=('GPL') @@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4') +sha256sums=('92b18cc381a80d87d52e386f51ca1475b94f82cf5adf668424669c5b63474473') build() { cd "$srcdir/$pkgbase-$pkgver" -- cgit v1.2.3-54-g00ecf From 495674534c45d86d3ad9149cdba75ca0bbbe1a0e Mon Sep 17 00:00:00 2001 From: root Date: Sun, 27 Nov 2011 23:14:57 +0000 Subject: Sun Nov 27 23:14:57 UTC 2011 --- community-staging/gnash/PKGBUILD | 83 +++++ community-staging/gnash/gentoo-ffmpeg-0.8.patch | 204 +++++++++++ community-staging/gnash/gnash-gtk.install | 12 + community-staging/gnash/xul8.patch | 44 +++ community-staging/luxrays/PKGBUILD | 45 +++ .../luxrays/luxrays_opencl1.2_use_deprecated.diff | 12 + community-staging/luxrender/PKGBUILD | 55 +++ community-staging/tagpy/PKGBUILD | 36 ++ community/calibre/PKGBUILD | 6 +- community/duplicity/PKGBUILD | 6 +- community/iasl/PKGBUILD | 8 +- community/wvstreams/PKGBUILD | 11 +- community/wvstreams/wvstreams-4.6.1-glibc212.patch | 24 ++ extra/bluefish/PKGBUILD | 12 +- extra/colord/PKGBUILD | 6 +- extra/dosfstools/PKGBUILD | 6 +- extra/ftgl/PKGBUILD | 8 +- extra/imagemagick/PKGBUILD | 8 +- extra/telepathy-kde-accounts-kcm/PKGBUILD | 14 +- extra/telepathy-kde-approver/PKGBUILD | 12 +- extra/telepathy-kde-auth-handler/PKGBUILD | 30 ++ extra/telepathy-kde-contact-applet/PKGBUILD | 30 ++ extra/telepathy-kde-contact-list/PKGBUILD | 12 +- extra/telepathy-kde-filetransfer-handler/PKGBUILD | 10 +- extra/telepathy-kde-integration-module/PKGBUILD | 30 ++ extra/telepathy-kde-presence-dataengine/PKGBUILD | 12 +- extra/telepathy-kde-send-file/PKGBUILD | 12 +- extra/telepathy-kde-text-ui/PKGBUILD | 12 +- extra/thunar/PKGBUILD | 7 +- staging/ekiga/PKGBUILD | 36 ++ staging/ekiga/ekiga.install | 22 ++ staging/libpst/PKGBUILD | 40 +++ staging/mkvtoolnix/PKGBUILD | 68 ++++ staging/mkvtoolnix/mkvtoolnix.install | 14 + staging/source-highlight/PKGBUILD | 32 ++ staging/source-highlight/source-highlight.install | 18 + testing/openssh/PKGBUILD | 67 ++++ testing/openssh/sshd | 45 +++ testing/openssh/sshd.confd | 4 + testing/openssh/sshd.pam | 12 + testing/shadow/LICENSE | 31 ++ testing/shadow/PKGBUILD | 106 ++++++ testing/shadow/adduser | 399 +++++++++++++++++++++ testing/shadow/chgpasswd | 4 + testing/shadow/chpasswd | 6 + testing/shadow/defaults.pam | 6 + testing/shadow/login | 21 ++ testing/shadow/login.defs | 197 ++++++++++ testing/shadow/newusers | 6 + testing/shadow/passwd | 4 + testing/shadow/shadow-add-missing-include.patch | 11 + testing/shadow/shadow-strncpy-usage.patch | 27 ++ testing/shadow/shadow.cron.daily | 6 + testing/shadow/shadow.install | 8 + testing/shadow/shadow_CVE-2011-0721.patch | 57 +++ testing/shadow/useradd.defaults | 9 + testing/shadow/xstrdup.patch | 9 + testing/ypserv/PKGBUILD | 6 +- 58 files changed, 1957 insertions(+), 81 deletions(-) create mode 100644 community-staging/gnash/PKGBUILD create mode 100644 community-staging/gnash/gentoo-ffmpeg-0.8.patch create mode 100644 community-staging/gnash/gnash-gtk.install create mode 100644 community-staging/gnash/xul8.patch create mode 100644 community-staging/luxrays/PKGBUILD create mode 100644 community-staging/luxrays/luxrays_opencl1.2_use_deprecated.diff create mode 100644 community-staging/luxrender/PKGBUILD create mode 100644 community-staging/tagpy/PKGBUILD create mode 100644 community/wvstreams/wvstreams-4.6.1-glibc212.patch create mode 100644 extra/telepathy-kde-auth-handler/PKGBUILD create mode 100644 extra/telepathy-kde-contact-applet/PKGBUILD create mode 100644 extra/telepathy-kde-integration-module/PKGBUILD create mode 100644 staging/ekiga/PKGBUILD create mode 100644 staging/ekiga/ekiga.install create mode 100644 staging/libpst/PKGBUILD create mode 100644 staging/mkvtoolnix/PKGBUILD create mode 100644 staging/mkvtoolnix/mkvtoolnix.install create mode 100644 staging/source-highlight/PKGBUILD create mode 100644 staging/source-highlight/source-highlight.install create mode 100644 testing/openssh/PKGBUILD create mode 100755 testing/openssh/sshd create mode 100644 testing/openssh/sshd.confd create mode 100644 testing/openssh/sshd.pam create mode 100644 testing/shadow/LICENSE create mode 100644 testing/shadow/PKGBUILD create mode 100644 testing/shadow/adduser create mode 100644 testing/shadow/chgpasswd create mode 100644 testing/shadow/chpasswd create mode 100644 testing/shadow/defaults.pam create mode 100644 testing/shadow/login create mode 100644 testing/shadow/login.defs create mode 100644 testing/shadow/newusers create mode 100644 testing/shadow/passwd create mode 100644 testing/shadow/shadow-add-missing-include.patch create mode 100644 testing/shadow/shadow-strncpy-usage.patch create mode 100755 testing/shadow/shadow.cron.daily create mode 100644 testing/shadow/shadow.install create mode 100644 testing/shadow/shadow_CVE-2011-0721.patch create mode 100644 testing/shadow/useradd.defaults create mode 100644 testing/shadow/xstrdup.patch (limited to 'extra') diff --git a/community-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD new file mode 100644 index 000000000..8b5849e88 --- /dev/null +++ b/community-staging/gnash/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 82896 2010-06-18 18:30:20Z ibiru $ +# Maintainer: Jan "heftig" Steffens + +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-staging/gnash/gentoo-ffmpeg-0.8.patch b/community-staging/gnash/gentoo-ffmpeg-0.8.patch new file mode 100644 index 000000000..d74bcc8e0 --- /dev/null +++ b/community-staging/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(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(_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-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/community-staging/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-staging/gnash/xul8.patch b/community-staging/gnash/xul8.patch new file mode 100644 index 000000000..7bd708b2d --- /dev/null +++ b/community-staging/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(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-staging/luxrays/PKGBUILD b/community-staging/luxrays/PKGBUILD new file mode 100644 index 000000000..a36897ecd --- /dev/null +++ b/community-staging/luxrays/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 59474 2011-11-26 11:04:23Z stativ $ +# Maintainer: Lukas Jirkovsky +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-staging/luxrays/luxrays_opencl1.2_use_deprecated.diff b/community-staging/luxrays/luxrays_opencl1.2_use_deprecated.diff new file mode 100644 index 000000000..0876628d7 --- /dev/null +++ b/community-staging/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 + #else diff --git a/community-staging/luxrender/PKGBUILD b/community-staging/luxrender/PKGBUILD new file mode 100644 index 000000000..37d3d8de0 --- /dev/null +++ b/community-staging/luxrender/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 59488 2011-11-26 15:22:02Z stativ $ +# Maintainer: Lukas Jirkovsky +# Initial contributor: flixie <69one@gmx.net> +# Contributor: Imanol Celaya +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-staging/tagpy/PKGBUILD b/community-staging/tagpy/PKGBUILD new file mode 100644 index 000000000..0c59a8237 --- /dev/null +++ b/community-staging/tagpy/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 59479 2011-11-26 14:14:54Z jelle $ +# Maintainer: Andrea Scarpino +# Contributor: Callan Barrett +# Contributor: Scott Horowitz + +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/calibre/PKGBUILD b/community/calibre/PKGBUILD index a4f3f3a61..ac7d304dc 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58842 2011-11-18 20:05:26Z giovanni $ +# $Id: PKGBUILD 59472 2011-11-26 10:23:12Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.27 +pkgver=0.8.28 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('6a56538249fd7ddb63d1f72d1b601272' +md5sums=('08aa2568300e8781824c62de7c23faae' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 13d46f2d5..847c75f38 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58556 2011-11-14 12:40:26Z lfleischer $ +# $Id: PKGBUILD 59484 2011-11-26 14:33:23Z lfleischer $ # Maintainer: Kaiting Chen # Contributor: Aaron Schaefer pkgname=duplicity -pkgver=0.6.16 +pkgver=0.6.17 pkgrel=1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface') source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('55996756a5bc9743add738cfcba2dda2') +md5sums=('36423ab4e3b9aa90c5c44d9fa93fba0f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD index 6f2ef773e..5e8d89a49 100644 --- a/community/iasl/PKGBUILD +++ b/community/iasl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57915 2011-11-04 12:13:21Z lcarlier $ +# $Id: PKGBUILD 59496 2011-11-26 21:04:57Z lcarlier $ # Maintainer : Laurent Carlier # Contributor: Giovanni Scafora # Contributor: Alessio 'mOlOk' Bolognino pkgname=iasl -pkgver=20110922 -pkgrel=2 +pkgver=20111123 +pkgrel=1 pkgdesc="Intel ACPI Source Language compiler" arch=('i686' 'x86_64') url="http://acpica.org" @@ -16,7 +16,7 @@ options=('!makeflags') install=iasl.install source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz LICENSE) -md5sums=('b95af67bb277657ae01844db01f2f9c7' +md5sums=('433470ddbdf8eab5e9c22e8f0e8836ff' '8615526144f69ea4e870d9bc37df9b29') build() { diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD index 5be8bf94f..fb668c1d2 100644 --- a/community/wvstreams/PKGBUILD +++ b/community/wvstreams/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 49019 2011-06-09 20:53:15Z andrea $ +# $Id: PKGBUILD 59490 2011-11-26 18:58:32Z bluewind $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: dorphell pkgname=wvstreams pkgver=4.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="A network programming library written in C++" arch=('i686' 'x86_64') url="http://alumnit.ca/wiki/?page=WvStreams" license=('LGPL') depends=('zlib' 'pam' 'xplc' 'openssl' 'readline') -source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('2760dac31a43d452a19a3147bfde571c') +source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz +wvstreams-4.6.1-glibc212.patch) +md5sums=('2760dac31a43d452a19a3147bfde571c' + '5f6e24864209055239cb4e7c9bbd4a41') options=('!makeflags') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/community/wvstreams/wvstreams-4.6.1-glibc212.patch b/community/wvstreams/wvstreams-4.6.1-glibc212.patch new file mode 100644 index 000000000..eb3e9b631 --- /dev/null +++ b/community/wvstreams/wvstreams-4.6.1-glibc212.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/333301 +https://bugs.archlinux.org/task/27188 + +--- ipstreams/wvunixdgsocket.cc ++++ ipstreams/wvunixdgsocket.cc +@@ -1,5 +1,5 @@ + #include "wvunixdgsocket.h" +-#ifdef MACOS ++#if defined(MACOS) || defined(__GNUC__) + #include + #include + #endif +--- streams/wvatomicfile.cc ++++ streams/wvatomicfile.cc +@@ -11,7 +11,8 @@ + #include "wvfileutils.h" + #include "wvstrutils.h" + +-#ifdef MACOS ++#if defined(MACOS) || defined(__GNUC__) ++#include + #include + #endif + diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD index e0e160d4d..7b2d84942 100644 --- a/extra/bluefish/PKGBUILD +++ b/extra/bluefish/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 110956 2011-02-23 10:09:47Z eric $ +# $Id: PKGBUILD 143599 2011-11-26 23:39:41Z eric $ # Maintainer: Eric Bélanger pkgname=bluefish -pkgver=2.0.3 +pkgver=2.2.0 pkgrel=1 pkgdesc="A powerful HTML editor for experienced web designers and programmers" arch=('i686' 'x86_64') url="http://bluefish.openoffice.nl/" license=('GPL3') -depends=('pcre' 'gtk2' 'enchant' 'desktop-file-utils' 'shared-mime-info') +depends=('gtk3' 'enchant' 'desktop-file-utils') makedepends=('gucharmap' 'intltool') optdepends=('gucharmap: for using the charmap plugin') options=('!libtool') install=bluefish.install -source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2) -md5sums=('4c062fcb1f90f91a35687b877d37d6dd') -sha1sums=('ab6b16d50faca169c25001d5a26ca8b84ddb1019') +source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig}) +sha1sums=('b8f5dad17c7365bc6f4342b6c22bdc328e31d20d' + 'faf37ece57fc155c3510e5d6cec5679f22cd11f4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index fc4ff867e..54327c8f3 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139644 2011-10-04 07:46:34Z heftig $ +# $Id: PKGBUILD 143587 2011-11-26 19:38:40Z ibiru $ # Maintainer: Jan "heftig" Steffens # Contributor: Ionut Biru pkgname=colord -pkgver=0.1.13 +pkgver=0.1.15 pkgrel=1 pkgdesc="Color daemon" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('lcms2' 'sqlite3' 'polkit' 'udev' 'sane') makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') source=($url/releases/$pkgname-$pkgver.tar.xz) options=('!libtool') -sha256sums=('eb3d00653d4a028f4e97f4e61ffa29940c65b42c20d4439e067cb183b725c292') +sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD index 587e15ec4..a2555b3be 100644 --- a/extra/dosfstools/PKGBUILD +++ b/extra/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 115131 2011-03-17 07:32:20Z tpowa $ +# $Id: PKGBUILD 143546 2011-11-26 09:49:37Z tpowa $ # Maintainer: dorphell # Committer: Judd Vinet pkgname=dosfstools -pkgver=3.0.11 +pkgver=3.0.12 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64) @@ -20,4 +20,4 @@ package () { cd $srcdir/$pkgname-$pkgver make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install } -md5sums=('8d2211d5bd813164e20740e7c852aa06') +md5sums=('5c7c2adac9eae4afbe1f16443142b566') diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD index b284d4289..09a890d9e 100644 --- a/extra/ftgl/PKGBUILD +++ b/extra/ftgl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 114670 2011-03-15 12:17:12Z heftig $ +# $Id: PKGBUILD 143589 2011-11-26 21:44:46Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Alexander Baldeck # Contributor: tobias @@ -6,13 +6,13 @@ pkgname=ftgl _pkgver=2.1.3-rc5 pkgver=${_pkgver/-/} -pkgrel=2 +pkgrel=3 pkgdesc="OpenGL library to use arbitrary fonts" arch=(i686 x86_64) url="http://ftgl.wiki.sourceforge.net/" license=(MIT) -depends=(freetype2 glut) -makedepends=(doxygen) +depends=(freetype2 mesa) +makedepends=(doxygen glut) options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2") md5sums=('c7879018cde844059495b3029b0b6503') diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index d1e325a31..9eba812e0 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 142234 2011-11-06 21:12:47Z eric $ +# $Id: PKGBUILD 143601 2011-11-27 03:03:13Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.3.4 +pkgver=6.7.3.8 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') -depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo') +depends=('libltdl' 'lcms2' 'libxt' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo') makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('317dbb760c0ff8a22f031c3864d3c13f03b93a4c' +sha1sums=('0414771506d69efd6f3ba3c20ab3320e46656f39' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index f92cfc332..9e0a69750 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,25 +1,27 @@ -# $Id$ +# $Id: PKGBUILD 143561 2011-11-26 13:57:53Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-accounts-kcm -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64') url="http://www.kde.org" license=('GPL') -depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control') +depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2") -sha1sums=('23c1d3289ecaf4b4361d0ed324a7044cccfae801') +conflicts=('telepathy-kde-accounts-kcm-plugins') +replaces=('telepathy-kde-accounts-kcm-plugins') +source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('2ebc4ac117a3e28e2812a2a9c97f7d0ee97dac67') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}_${pkgver} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index 631f41f97..a6ef75257 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,25 +1,25 @@ -# $Id$ +# $Id: PKGBUILD 143563 2011-11-26 13:58:28Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-approver -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64') url="http://www.kde.org" license=('GPL') -depends=('kdelibs' 'telepathy-qt4') +depends=('kdelibs' 'telepathy-qt4' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2") -sha1sums=('ca4bb9d817354e50af18072736843b961a5dc916') +source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('6488f3119a19c38fc72e0afe3007a49394f36b13') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}_${pkgver} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD new file mode 100644 index 000000000..f74689855 --- /dev/null +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143577 2011-11-26 14:06:41Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=telepathy-kde-auth-handler +pkgver=0.2.0 +pkgrel=1 +pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" +arch=('i686' 'x86_64') +url="http://www.kde.org" +license=('GPL') +depends=('kdelibs' 'telepathy-qt4') +makedepends=('cmake' 'automoc4') +groups=('telepathy-kde') +source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('f482134e041541a5d45ff14b9dc6a1fb2db9520c') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/telepathy-kde-contact-applet/PKGBUILD b/extra/telepathy-kde-contact-applet/PKGBUILD new file mode 100644 index 000000000..4e8e4421c --- /dev/null +++ b/extra/telepathy-kde-contact-applet/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143578 2011-11-26 14:07:09Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=telepathy-kde-contact-applet +pkgver=0.2.0 +pkgrel=1 +pkgdesc="The kde-telepathy contact plasmoid" +arch=('i686' 'x86_64') +url="http://www.kde.org" +license=('GPL') +depends=('kdelibs' 'telepathy-qt4') +makedepends=('cmake' 'automoc4') +groups=('telepathy-kde') +source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('b1e2ad706deccd6ca4d745828a8b54fd87bc2066') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index 31df73c28..ef05c3760 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ +# $Id: PKGBUILD 143565 2011-11-26 13:59:00Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-contact-list -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=1 -pkgdesc="Telepathy contact list application " +pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64') url="http://www.kde.org" license=('GPL') @@ -13,14 +13,14 @@ depends=('kdebase-runtime' 'telepathy-qt4') makedepends=('cmake' 'automoc4') groups=('telepathy-kde') install=${pkgname}.install -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2") -sha1sums=('1875f88842568f800e08d7d1b391d05152834b3b') +source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('7ec01e08d991123db9c2ce17d6350d8dd835793f') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}_${pkgver} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index e76a0f9ec..45beddc20 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 143567 2011-11-26 13:59:37Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-filetransfer-handler -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64') @@ -11,14 +11,14 @@ license=('GPL') depends=('kdebase-runtime' 'telepathy-qt4') makedepends=('cmake' 'automoc4') groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2") -sha1sums=('050eb79ee5a24a102512cf4dbef18b4bf8eb5b50') +source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('25c52485cb5653fa79d0eb9724b494803a8f0ad9') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}_${pkgver} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD new file mode 100644 index 000000000..d844d3350 --- /dev/null +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143579 2011-11-26 14:07:39Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=telepathy-kde-integration-module +pkgver=0.2.0 +pkgrel=1 +pkgdesc="Provide several plugins for the Telepathy KDE suite" +arch=('i686' 'x86_64') +url="http://www.kde.org" +license=('GPL') +depends=('kdelibs' 'telepathy-qt4') +makedepends=('cmake' 'automoc4') +groups=('telepathy-kde') +source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('5ad3e5786707b624a0f785c6891ed6de4a5d79c7') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/telepathy-kde-presence-dataengine/PKGBUILD b/extra/telepathy-kde-presence-dataengine/PKGBUILD index 53364c696..88a0981b1 100644 --- a/extra/telepathy-kde-presence-dataengine/PKGBUILD +++ b/extra/telepathy-kde-presence-dataengine/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138063 2011-09-15 18:35:47Z andrea $ +# $Id: PKGBUILD 143571 2011-11-26 14:00:36Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-presence-dataengine -pkgver=0.1.0 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="Plasma dataengine for managing Telepathy account presence" arch=('i686' 'x86_64') url="http://www.kde.org" @@ -12,14 +12,14 @@ license=('GPL') depends=('kdebase-workspace' 'telepathy-qt4') makedepends=('cmake' 'automoc4') groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2") -sha1sums=('afaf16ce63eef9c9a4cdb06b1e88e62f887094bd') +source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('87f8c65baf35410e65ca9b7cb016210f2b13f72d') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}_${pkgver} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 777c2ace0..949597c5d 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,25 +1,25 @@ -# $Id$ +# $Id: PKGBUILD 143573 2011-11-26 14:01:08Z andrea $ # Maintainer: Andrea Scarpino pkgname=telepathy-kde-send-file -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64') url="http://www.kde.org" license=('GPL') -depends=('telepathy-kde-filetransfer-handler') +depends=('telepathy-kde-filetransfer-handler' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('telepathy-kde') install=${pkgname}.install -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2") -sha1sums=('ef49d3008294a6eacad846fbe1c042d59c5c8e69') +source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('d6cdd99b6feef58f81c2c0c39325954c239deb2d') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}_${pkgver} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index 9996d0e96..2e69f7a5f 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,25 +1,25 @@ -# $Id$ +# $Id: PKGBUILD 143575 2011-11-26 14:01:45Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Laurent Carlier pkgname=telepathy-kde-text-ui -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=1 pkgdesc="Telepathy text chat handler" arch=('i686' 'x86_64') url="http://www.kde.org" license=('GPL') -depends=('kdebase-runtime' 'telepathy-qt4') +depends=('kdebase-runtime' 'telepathy-qt4' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2") -sha1sums=('3a9a174acd5b955618a74761a380e951c6dce48a') +source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('fb7c5dc02bb9d150d0e372c3584f50670d620f4a') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}_${pkgver} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index 247660553..ee13ccfa1 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142015 2011-11-04 03:17:01Z foutrelis $ +# $Id: PKGBUILD 143583 2011-11-26 17:25:12Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Andrew Simmons pkgname=thunar pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="Modern file manager for Xfce" arch=('i686' 'x86_64') url="http://thunar.xfce.org" @@ -14,6 +14,7 @@ depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev' 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng') makedepends=('intltool' 'gtk-doc' 'xfce4-panel') optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems' + 'polkit-gnome: for mounting internal partitions (needs root password)' 'xfce4-panel: for trash applet' 'tumbler: for thumbnail previews' 'thunar-volman: manages removable devices' @@ -21,7 +22,7 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems 'thunar-media-tags-plugin: view/edit id3/ogg tags') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2) +source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-$pkgver.tar.bz2) sha256sums=('e66aa9ad61a9202e15cc7c5fffc7b961da9ab3b4428f874c1ec8e46eb4ffaca6') build() { diff --git a/staging/ekiga/PKGBUILD b/staging/ekiga/PKGBUILD new file mode 100644 index 000000000..fb7fe42d9 --- /dev/null +++ b/staging/ekiga/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 143593 2011-11-26 22:32:57Z ibiru $ +# Maintainer: Jan de Groot +# Contributor: Tom K + +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/staging/ekiga/ekiga.install b/staging/ekiga/ekiga.install new file mode 100644 index 000000000..b1d76a4a3 --- /dev/null +++ b/staging/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/staging/libpst/PKGBUILD b/staging/libpst/PKGBUILD new file mode 100644 index 000000000..462bb5152 --- /dev/null +++ b/staging/libpst/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 143595 2011-11-26 22:36:03Z ibiru $ +# Maintainer: Jan de Groot + +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/staging/mkvtoolnix/PKGBUILD b/staging/mkvtoolnix/PKGBUILD new file mode 100644 index 000000000..94300cb62 --- /dev/null +++ b/staging/mkvtoolnix/PKGBUILD @@ -0,0 +1,68 @@ +# $Id: PKGBUILD 143592 2011-11-26 22:32:50Z giovanni $ +# Maintainer: Giovanni Scafora + +pkgbase=mkvtoolnix +pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') +pkgver=5.0.1 +pkgrel=5 +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=('93fbbe946de6013eca699c0c2a93a4e9') + +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=2" + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + autoreconf + + ./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/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* + 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/staging/mkvtoolnix/mkvtoolnix.install b/staging/mkvtoolnix/mkvtoolnix.install new file mode 100644 index 000000000..74d9eb2ef --- /dev/null +++ b/staging/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/staging/source-highlight/PKGBUILD b/staging/source-highlight/PKGBUILD new file mode 100644 index 000000000..d43c52790 --- /dev/null +++ b/staging/source-highlight/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143597 2011-11-26 22:48:36Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Douglas Soares de Andrade + +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/staging/source-highlight/source-highlight.install b/staging/source-highlight/source-highlight.install new file mode 100644 index 000000000..4fd1b3005 --- /dev/null +++ b/staging/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/openssh/PKGBUILD b/testing/openssh/PKGBUILD new file mode 100644 index 000000000..6b4681089 --- /dev/null +++ b/testing/openssh/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 143549 2011-11-26 12:47:01Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: Aaron Griffin +# Contributor: judd + +pkgname=openssh +pkgver=5.9p1 +pkgrel=5 +pkgdesc='Free version of the SSH connectivity tools' +arch=('i686' 'x86_64') +license=('custom:BSD') +url='http://www.openssh.org/portable.html' +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') +depends=('krb5' 'openssl' 'libedit') +optdepends=('x11-ssh-askpass: input passphrase in X without a terminal') +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" + 'sshd.confd' + 'sshd.pam' + 'sshd') +sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56' + 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' + '3413909fd45a28701c92e6e5b59c6b65346ddb0f' + '21fa88de6cc1c7912e71655f50896ba17991a1c2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/ssh \ + --sysconfdir=/etc/ssh \ + --with-privsep-user=nobody \ + --with-md5-passwords \ + --with-pam \ + --with-mantype=man \ + --with-xauth=/usr/bin/xauth \ + --with-kerberos5=/usr \ + --with-ssl-engine \ + --with-libedit=/usr/lib \ + --disable-strip # stripping is done by makepkg + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + + rm "${pkgdir}"/usr/share/man/man1/slogin.1 + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + + # additional contrib scripts that we like + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh + install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id + install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 + + # PAM is a common, standard feature to have + sed \ + -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ + -e '/^#UsePAM no$/c UsePAM yes' \ + -i "${pkgdir}"/etc/ssh/sshd_config +} diff --git a/testing/openssh/sshd b/testing/openssh/sshd new file mode 100755 index 000000000..1d68fb877 --- /dev/null +++ b/testing/openssh/sshd @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/sshd + +PIDFILE=/var/run/sshd.pid +PID=$(cat $PIDFILE 2>/dev/null) +if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then + PID= + rm $PIDFILE 2>/dev/null +fi + +case "$1" in + start) + stat_busy 'Starting Secure Shell Daemon' + /usr/bin/ssh-keygen -A + [[ -d /var/empty ]] || mkdir -p /var/empty + [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS + if [[ $? -gt 0 ]]; then + stat_fail + else + add_daemon sshd + stat_done + fi + ;; + stop) + stat_busy 'Stopping Secure Shell Daemon' + [[ ! -z $PID ]] && kill $PID &> /dev/null + if [[ $? -gt 0 ]]; then + stat_fail + else + rm_daemon sshd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd new file mode 100644 index 000000000..5ce7c0079 --- /dev/null +++ b/testing/openssh/sshd.confd @@ -0,0 +1,4 @@ +# +# Parameters to be passed to sshd +# +SSHD_ARGS="" diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam new file mode 100644 index 000000000..c7b91cdfb --- /dev/null +++ b/testing/openssh/sshd.pam @@ -0,0 +1,12 @@ +#%PAM-1.0 +#auth required pam_securetty.so #Disable remote root +auth required pam_unix.so +auth required pam_env.so +account required pam_nologin.so +account required pam_unix.so +account required pam_time.so +password required pam_unix.so +session required pam_unix_session.so +session required pam_limits.so +-session optional pam_ck_connector.so nox11 +-session optional pam_systemd.so diff --git a/testing/shadow/LICENSE b/testing/shadow/LICENSE new file mode 100644 index 000000000..c5ab15a56 --- /dev/null +++ b/testing/shadow/LICENSE @@ -0,0 +1,31 @@ +/* + * Copyright (c) 1990 - 1994, Julianne Frances Haugh + * Copyright (c) 1996 - 2000, Marek Michałkiewicz + * Copyright (c) 2001 - 2006, Tomasz Kłoczko + * Copyright (c) 2007 - 2009, Nicolas François + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the copyright holders or contributors may not be used to + * endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD new file mode 100644 index 000000000..3486b77e4 --- /dev/null +++ b/testing/shadow/PKGBUILD @@ -0,0 +1,106 @@ +# $Id: PKGBUILD 143544 2011-11-26 05:50:16Z dreisner $ +# Maintainer: Aaron Griffin + +pkgname=shadow +pkgver=4.1.4.3 +pkgrel=3 +pkgdesc="Password and account management tool suite with support for shadow files and PAM" +arch=('i686' 'x86_64') +url='http://pkg-shadow.alioth.debian.org/' +license=('BSD') +groups=('base') +depends=('bash' 'pam' 'acl') +backup=(etc/login.defs + etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel} + etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} + etc/pam.d/{chfn,chgpasswd,groupmems,chsh} + etc/default/useradd) +options=('!libtool') +install=shadow.install +#http://pkg-shadow.alioth.debian.org/releases/shadow-$pkgver.tar.bz2 +# shadow 4.1.4.3 is just shadow 4.1.4.2 with shadow_CVE-2011-0721.patch applied +source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz + adduser chgpasswd chpasswd defaults.pam login login.defs newusers + passwd shadow.cron.daily useradd.defaults LICENSE + xstrdup.patch shadow_CVE-2011-0721.patch shadow-strncpy-usage.patch + shadow-add-missing-include.patch) +sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e' + '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' + '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' + '0db3819326f45d2c75042aca4315737cca39edc4' + '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' + '895aad07c192b288b457e19dd7b8c55841b4ad22' + 'e5cab2118ecb1e61874cde842d7d04d1003f35cb' + '12427b1ca92a9b85ca8202239f0d9f50198b818f' + '611be25d91c3f8f307c7fe2485d5f781e5dee75f' + '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' + '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' + '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' + '6010fffeed1fc6673ad9875492e1193b1a847b53' + '6bfe6528391eb38d338beacedd620407877b637d' + '9db9e62ad173f31e1039121c0124cf60826ffd7e' + '0697a21f7519de30821da7772677035652df4ad2') + +build() { + cd "$srcdir/$pkgname-4.1.4.2+svn3283" + + #Ugh, force this to build shared libraries, for god's sake + sed -i "s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g" lib/Makefile.am + libtoolize + autoreconf + export LDFLAGS="$LDFLAGS -lcrypt" + + patch -p1 -i "$srcdir/xstrdup.patch" + patch -p1 -i "$srcdir/shadow_CVE-2011-0721.patch" + patch -p1 -i "$srcdir/shadow-strncpy-usage.patch" + patch -p1 -i "$srcdir/shadow-add-missing-include.patch" + + # supress etc/pam.d/*, we provide our own + sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in + + ./configure \ + --prefix=/usr --libdir=/lib \ + --mandir=/usr/share/man --sysconfdir=/etc \ + --enable-shared --disable-static \ + --with-libpam --without-selinux + make +} + +package() { + cd "$srcdir/$pkgname-4.1.4.2+svn3283" + make DESTDIR="$pkgdir" install + + # license + install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE" + + # interactive useradd + install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser" + + # useradd defaults + install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd" + + # cron job + install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow" + + # login.defs + install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" + + # PAM config - custom + install -Dm644 "$srcdir/login" "$pkgdir/etc/pam.d/login" + install -Dm644 "$srcdir/passwd" "$pkgdir/etc/pam.d/passwd" + install -Dm644 "$srcdir/chgpasswd" "$pkgdir/etc/pam.d/chgpasswd" + install -Dm644 "$srcdir/chpasswd" "$pkgdir/etc/pam.d/chpasswd" + install -Dm644 "$srcdir/newusers" "$pkgdir/etc/pam.d/newusers" + # PAM config - from tarball + install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" + + # we use the 'useradd' PAM file for other similar utilities + for file in chage chfn chsh groupadd groupdel groupmod shadow \ + useradd usermod userdel; do + install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" + done + + # Remove su - using su from coreutils instead + rm "$pkgdir/bin/su" + find "$pkgdir/usr/share/man" -name 'su.1' -delete +} diff --git a/testing/shadow/adduser b/testing/shadow/adduser new file mode 100644 index 000000000..a5d7fd4fa --- /dev/null +++ b/testing/shadow/adduser @@ -0,0 +1,399 @@ +#!/bin/bash +# +# Copyright 1995 Hrvoje Dogan, Croatia. +# Copyright 2002, 2003, 2004 Stuart Winter, West Midlands, England, UK. +# Copyright 2004 Slackware Linux, Inc., Concord, CA, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# +########################################################################## +# Program: /usr/sbin/adduser +# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux +# Author : Stuart Winter +# Based on the original Slackware adduser by Hrvoje Dogan +# with modifications by Patrick Volkerding +# Version: 1.09 +########################################################################## +# Usage..: adduser [] +########################################################################## +# History # +########### +# v1.09 - 07/06/04 +# * Added standard Slackware script licence to the head of this file. +# v1.08 - 25/04/04 +# * Disallow user names that begin with a numeric because useradd +# (from shadow v4.03) does not allow them. +# v1.07 - 07/03/03 +# * When supplying a null string for the uid (meaning 'Choose next available'), +# if there were file names in the range 'a-z' in the pwd then the +# egrep command considered these files rather than the null string. +# The egrep expression is now in quotes. +# Reported & fixed by Vadim O. Ustiansky +# v1.06 - 31/03/03 +# * Ask to chown user.group the home directory if it already exists. +# This helps reduce later confusion when adding users whose home dir +# already exists (mounted partition for example) and is owned +# by a user other than the user to which the directory is being +# assigned as home. Default is not to chown. +# Brought to my attention by mRgOBLIN. +# v1.05 - 04/01/03 +# * Advise & prevent users from creating logins with '.' characters +# in the user name. +# * Made pending account creation info look neater +# v1.04 - 09/06/02 +# * Catered for shadow-4.0.3's 'useradd' binary that no longer +# will let you create a user that has any uppercase chars in it +# This was reported on the userlocal.org forums +# by 'xcp' - thanks. +# v1.03 - 20/05/02 +# * Support 'broken' (null lines in) /etc/passwd and +# /etc/group files +# * For recycling UIDs (default still 'off'), we now look in +# /etc/login.defs for the UID_MIN value and use it +# If not found then default to 1000 +# v1.02 - 10/04/02 +# * Fix user-specified UID bug. +# v1.01 - 23/03/02 +# * Match Slackware indenting style, simplify. +# v1.00 - 22/03/02 +# * Created +####################################################################### + +# Path to files +pfile=/etc/passwd +gfile=/etc/group +sfile=/etc/shells + +# Paths to binaries +useradd=/usr/sbin/useradd +chfn=/usr/bin/chfn +passwd=/usr/bin/passwd + +# Defaults +defhome=/home +defshell=/bin/bash +defgroup=users + +# Determine what the minimum UID is (for UID recycling) +# (we ignore it if it's not at the beginning of the line (i.e. commented out with #)) +export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)" +# If we couldn't find it, set it to the default of 1000 +if [ -z "$recycleUIDMIN" ]; then + export recycleUIDMIN=1000 # this is the default from Slackware's /etc/login.defs +fi + + +# This setting enables the 'recycling' of older unused UIDs. +# When you userdel a user, it removes it from passwd and shadow but it will +# never get used again unless you specify it expliticly -- useradd (appears to) just +# look at the last line in passwd and increment the uid. I like the idea of +# recycling uids but you may have very good reasons not to (old forgotten +# confidential files still on the system could then be owned by this new user). +# We'll set this to no because this is what the original adduser shell script +# did and it's what users expect. +recycleuids=no + +# Function to read keyboard input. +# bash1 is broken (even ash will take read -ep!), so we work around +# it (even though bash1 is no longer supported on Slackware). +function get_input() { + local output + if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then + echo -n "${1} " >&2 # fudge for use with bash v1 + read output + else # this should work with any other /bin/sh + read -ep "${1} " output + fi + echo $output +} + +# Function to display the account info +function display () { + local goose + goose="$(echo $2 | cut -d ' ' -f 2-)" # lop off the prefixed argument useradd needs + echo -n "$1 " + # If it's null then display the 'other' information + if [ -z "$goose" -a ! -z "$3" ]; then + echo "$3" + else + echo "$goose" + fi +} + +# Function to check whether groups exist in the /etc/group file +function check_group () { + local got_error group + if [ ! -z "$@" ]; then + for group in $@ ; do + local uid_not_named="" uid_not_num="" + grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes + grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes + if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then + echo "- Group '$group' does not exist" + got_error=yes + fi + done + fi + # Return exit code of 1 if at least one of the groups didn't exist + if [ ! -z "$got_error" ]; then + return 1 + fi +} + +#: Read the login name for the new user :# +# +# Remember that most Mail Transfer Agents are case independant, so having +# 'uSer' and 'user' may cause confusion/things to break. Because of this, +# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase, +# and we must reject them, too. + +# Set the login variable to the command line param +echo +LOGIN="$1" +needinput=yes +while [ ! -z $needinput ]; do + if [ -z "$LOGIN" ]; then + while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done + fi + grep "^${LOGIN}:" $pfile >/dev/null 2>&1 # ensure it's not already used + if [ $? -eq 0 ]; then + echo "- User '$LOGIN' already exists; please choose another" + unset LOGIN + elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then + echo "- User names cannot begin with a number; please choose another" + unset LOGIN + elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase + echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another" + unset LOGIN + elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then + echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another" + unset LOGIN + else + unset needinput + fi +done + +# Display the user name passed from the shell if it hasn't changed +if [ "$1" = "$LOGIN" ]; then + echo "Login name for new user: $LOGIN" +fi + +#: Get the UID for the user & ensure it's not already in use :# +# +# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because +# when you change password for the uid, it finds the first match in /etc/passwd +# which isn't necessarily the correct user +# +echo +needinput=yes +while [ ! -z "$needinput" ]; do + _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")" + grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1 + if [ $? -eq 0 ]; then + echo "- That UID is already in use; please choose another" + elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then + echo "- UIDs are numerics only" + else + unset needinput + fi +done +# If we were given a UID, then syntax up the variable to pass to useradd +if [ ! -z "$_UID" ]; then + U_ID="-u ${_UID}" +else + # Will we be recycling UIDs? + if [ "$recycleuids" = "yes" ]; then + U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)" + fi +fi + +#: Get the initial group for the user & ensure it exists :# +# +# We check /etc/group for both the text version and the group ID number +echo +needinput=yes +while [ ! -z "$needinput" ]; do + GID="$(get_input "Initial group [ ${defgroup} ]:")" + check_group "$GID" + if [ $? -gt 0 ]; then + echo "- Please choose another" + else + unset needinput + fi +done +# Syntax the variable ready for useradd +if [ -z "$GID" ]; then + GID="-g ${defgroup}" +else + GID="-g ${GID}" +fi + +#: Get additional groups for the user :# +# +echo +needinput=yes +while [ ! -z "$needinput" ]; do + AGID="$(get_input "Additional groups (comma separated) []:")" + AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing + if [ ! -z "$AGID" ]; then + check_group "$AGID" # check all groups at once (treated as N # of params) + if [ $? -gt 0 ]; then + echo "- Please re-enter the group(s)" + else + unset needinput # we found all groups specified + AGID="-G $(echo "$AGID" | tr ' ' ,)" + fi + else + unset needinput # we don't *have* to have additional groups + fi +done + +#: Get the new user's home dir :# +# +echo +needinput=yes +while [ ! -z "$needinput" ]; do + HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")" + if [ -z "$HME" ]; then + HME="${defhome}/${LOGIN}" + fi + # Warn the user if the home dir already exists + if [ -d "$HME" ]; then + echo "- Warning: '$HME' already exists !" + getyn="$(get_input " Do you wish to change the home directory path ? (Y/n) ")" + if [ "$(echo $getyn | grep -i "n")" ]; then + unset needinput + # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME + getyn="$(get_input " Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")" + if [ "$(echo $getyn | grep -i "y")" ]; then + CHOWNHOMEDIR=$HME # set this to the home directory + fi + fi + else + unset needinput + fi +done +HME="-d ${HME}" + +#: Get the new user's shell :# +echo +needinput=yes +while [ ! -z "$needinput" ]; do + unset got_error + SHL="$(get_input "Shell [ ${defshell} ]")" + if [ -z "$SHL" ]; then + SHL="${defshell}" + fi + # Warn the user if the shell doesn't exist in /etc/shells or as a file + if [ -z "$(grep "^${SHL}$" $sfile)" ]; then + echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)" + got_error=yes + fi + if [ ! -f "$SHL" ]; then + echo "- Warning: ${SHL} does not exist as a file" + got_error=yes + fi + if [ ! -z "$got_error" ]; then + getyn="$(get_input " Do you wish to change the shell ? (Y/n) ")" + if [ "$(echo $getyn | grep -i "n")" ]; then + unset needinput + fi + else + unset needinput + fi +done +SHL="-s ${SHL}" + +#: Get the expiry date :# +echo +needinput=yes +while [ ! -z "$needinput" ]; do + EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")" + if [ ! -z "$EXP" ]; then + # Check to see whether the expiry date is in the valid format + if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then + echo "- That is not a valid expiration date" + else + unset needinput + EXP="-e ${EXP}" + fi + else + unset needinput + fi +done + +# Display the info about the new impending account +echo +echo "New account will be created as follows:" +echo +echo "---------------------------------------" +display "Login name.......: " "$LOGIN" +display "UID..............: " "$_UID" "[ Next available ]" +display "Initial group....: " "$GID" +display "Additional groups: " "$AGID" "[ None ]" +display "Home directory...: " "$HME" +display "Shell............: " "$SHL" +display "Expiry date......: " "$EXP" "[ Never ]" +echo + +echo "This is it... if you want to bail out, hit Control-C. Otherwise, press" +echo "ENTER to go ahead and make the account." +read junk + +echo +echo "Creating new account..." +echo +echo + +# Add the account to the system +CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN"" +$CMD + +if [ $? -gt 0 ]; then + echo "- Error running useradd command -- account not created!" + echo "(cmd: $CMD)" + exit 1 +fi + +# chown the home dir ? We can only do this once the useradd has +# completed otherwise the user name doesn't exist. +if [ ! -z "${CHOWNHOMEDIR}" ]; then + chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}" +fi + +# Set the finger information +$chfn "$LOGIN" +if [ $? -gt 0 ]; then + echo "- Warning: an error occurred while setting finger information" +fi + +# Set a password +$passwd "$LOGIN" +if [ $? -gt 0 ]; then + echo "* WARNING: An error occured while setting the password for" + echo " this account. Please manually investigate this *" + exit 1 +fi + +echo +echo +echo "Account setup complete." +exit 0 + diff --git a/testing/shadow/chgpasswd b/testing/shadow/chgpasswd new file mode 100644 index 000000000..8f49f5cc8 --- /dev/null +++ b/testing/shadow/chgpasswd @@ -0,0 +1,4 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +account required pam_permit.so +password include system-auth diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd new file mode 100644 index 000000000..0bd61516e --- /dev/null +++ b/testing/shadow/chpasswd @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password required pam_unix.so 512 shadow diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam new file mode 100644 index 000000000..a7bf8a4a5 --- /dev/null +++ b/testing/shadow/defaults.pam @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password required pam_permit.so diff --git a/testing/shadow/login b/testing/shadow/login new file mode 100644 index 000000000..b8555f89c --- /dev/null +++ b/testing/shadow/login @@ -0,0 +1,21 @@ +#%PAM-1.0 +auth required pam_securetty.so +auth requisite pam_nologin.so +auth required pam_unix.so nullok +auth required pam_tally.so onerr=succeed file=/var/log/faillog +# use this to lockout accounts for 10 minutes after 3 failed attempts +#auth required pam_tally.so deny=2 unlock_time=600 onerr=succeed file=/var/log/faillog +account required pam_access.so +account required pam_time.so +account required pam_unix.so +#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 +#password required pam_unix.so sha512 shadow use_authtok +session required pam_unix.so +session required pam_env.so +session required pam_motd.so +session required pam_limits.so +session optional pam_mail.so dir=/var/spool/mail standard +session optional pam_lastlog.so +session optional pam_loginuid.so +-session optional pam_ck_connector.so nox11 +-session optional pam_systemd.so diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs new file mode 100644 index 000000000..2500ee447 --- /dev/null +++ b/testing/shadow/login.defs @@ -0,0 +1,197 @@ +# +# /etc/login.defs - Configuration control definitions for the login package. +# +# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. +# If unspecified, some arbitrary (and possibly incorrect) value will +# be assumed. All other items are optional - if not specified then +# the described action or option will be inhibited. +# +# Comment lines (lines beginning with "#") and blank lines are ignored. +# +# Modified for Linux. --marekm + +# +# Delay in seconds before being allowed another attempt after a login failure +# +FAIL_DELAY 3 + +# +# Enable display of unknown usernames when login failures are recorded. +# +LOG_UNKFAIL_ENAB no + +# +# Enable logging of successful logins +# +LOG_OK_LOGINS no + +# +# Enable "syslog" logging of su activity - in addition to sulog file logging. +# SYSLOG_SG_ENAB does the same for newgrp and sg. +# +SYSLOG_SU_ENAB yes +SYSLOG_SG_ENAB yes + +# +# If defined, either full pathname of a file containing device names or +# a ":" delimited list of device names. Root logins will be allowed only +# upon these devices. +# +CONSOLE /etc/securetty +#CONSOLE console:tty01:tty02:tty03:tty04 + +# +# If defined, all su activity is logged to this file. +# +#SULOG_FILE /var/log/sulog + +# +# If defined, file which maps tty line to TERM environment parameter. +# Each line of the file is in a format something like "vt100 tty01". +# +#TTYTYPE_FILE /etc/ttytype + +# +# If defined, the command name to display when running "su -". For +# example, if this is defined as "su" then a "ps" will display the +# command is "-su". If not defined, then "ps" would display the +# name of the shell actually being run, e.g. something like "-sh". +# +SU_NAME su + +# +# *REQUIRED* +# Directory where mailboxes reside, _or_ name of file, relative to the +# home directory. If you _do_ define both, MAIL_DIR takes precedence. +# QMAIL_DIR is for Qmail +# +#QMAIL_DIR Maildir +MAIL_DIR /var/spool/mail + +# +# If defined, file which inhibits all the usual chatter during the login +# sequence. If a full pathname, then hushed mode will be enabled if the +# user's name or shell are found in the file. If not a full pathname, then +# hushed mode will be enabled if the file exists in the user's home directory. +# +HUSHLOGIN_FILE .hushlogin +#HUSHLOGIN_FILE /etc/hushlogins + +# +# *REQUIRED* The default PATH settings, for superuser and normal users. +# +# (they are minimal, add the rest in the shell startup files) +ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin +ENV_PATH PATH=/bin:/usr/bin + +# +# Terminal permissions +# +# TTYGROUP Login tty will be assigned this group ownership. +# TTYPERM Login tty will be set to this permission. +# +# If you have a "write" program which is "setgid" to a special group +# which owns the terminals, define TTYGROUP to the group number and +# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign +# TTYPERM to either 622 or 600. +# +TTYGROUP tty +TTYPERM 0600 + +# +# Login configuration initializations: +# +# ERASECHAR Terminal ERASE character ('\010' = backspace). +# KILLCHAR Terminal KILL character ('\025' = CTRL/U). +# UMASK Default "umask" value. +# +# The ERASECHAR and KILLCHAR are used only on System V machines. +# The ULIMIT is used only if the system supports it. +# (now it works with setrlimit too; ulimit is in 512-byte units) +# +# Prefix these values with "0" to get octal, "0x" to get hexadecimal. +# +ERASECHAR 0177 +KILLCHAR 025 +UMASK 077 + +# +# Password aging controls: +# +# PASS_MAX_DAYS Maximum number of days a password may be used. +# PASS_MIN_DAYS Minimum number of days allowed between password changes. +# PASS_WARN_AGE Number of days warning given before a password expires. +# +PASS_MAX_DAYS 99999 +PASS_MIN_DAYS 0 +PASS_WARN_AGE 7 + +# +# Min/max values for automatic uid selection in useradd +# +UID_MIN 1000 +UID_MAX 60000 +# System accounts +SYS_UID_MIN 500 +SYS_UID_MAX 999 + +# +# Min/max values for automatic gid selection in groupadd +# +GID_MIN 1000 +GID_MAX 60000 +# System accounts +SYS_GID_MIN 500 +SYS_GID_MAX 999 + +# +# Max number of login retries if password is bad +# +LOGIN_RETRIES 5 + +# +# Max time in seconds for login +# +LOGIN_TIMEOUT 60 + +# +# Which fields may be changed by regular users using chfn - use +# any combination of letters "frwh" (full name, room number, work +# phone, home phone). If not defined, no changes are allowed. +# For backward compatibility, "yes" = "rwh" and "no" = "frwh". +# +CHFN_RESTRICT rwh + +# +# List of groups to add to the user's supplementary group set +# when logging in on the console (as determined by the CONSOLE +# setting). Default is none. +# +# Use with caution - it is possible for users to gain permanent +# access to these groups, even when not logged in on the console. +# How to do it is left as an exercise for the reader... +# +#CONSOLE_GROUPS floppy:audio:cdrom + +# +# Should login be allowed if we can't cd to the home directory? +# Default in no. +# +DEFAULT_HOME yes + +# +# If defined, this command is run when removing a user. +# It should remove any at/cron/print jobs etc. owned by +# the user to be removed (passed as the first argument). +# +#USERDEL_CMD /usr/sbin/userdel_local + +# +# Enable setting of the umask group bits to be the same as owner bits +# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is +# the same as gid, and username is the same as the primary group name. +# +# This also enables userdel to remove user groups if no members exist. +# +USERGROUPS_ENAB yes + diff --git a/testing/shadow/newusers b/testing/shadow/newusers new file mode 100644 index 000000000..5d447985a --- /dev/null +++ b/testing/shadow/newusers @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password required pam_unix.so sha512 shadow diff --git a/testing/shadow/passwd b/testing/shadow/passwd new file mode 100644 index 000000000..ab56da496 --- /dev/null +++ b/testing/shadow/passwd @@ -0,0 +1,4 @@ +#%PAM-1.0 +#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 +#password required pam_unix.so sha512 shadow use_authtok +password required pam_unix.so sha512 shadow nullok diff --git a/testing/shadow/shadow-add-missing-include.patch b/testing/shadow/shadow-add-missing-include.patch new file mode 100644 index 000000000..5c9e946ef --- /dev/null +++ b/testing/shadow/shadow-add-missing-include.patch @@ -0,0 +1,11 @@ +diff -Naur shadow-4.1.4.2+svn3283/libmisc/copydir.c shadow-4.1.4.2+svn3283.new/libmisc/copydir.c +--- shadow-4.1.4.2+svn3283/libmisc/copydir.c 2010-09-05 11:35:26.000000000 -0400 ++++ shadow-4.1.4.2+svn3283.new/libmisc/copydir.c 2011-06-26 01:26:52.000000000 -0400 +@@ -34,6 +34,7 @@ + + #ident "$Id: copydir.c 3283 2010-09-05 15:34:42Z nekral-guest $" + ++#include + #include + #include + #include diff --git a/testing/shadow/shadow-strncpy-usage.patch b/testing/shadow/shadow-strncpy-usage.patch new file mode 100644 index 000000000..46df74ace --- /dev/null +++ b/testing/shadow/shadow-strncpy-usage.patch @@ -0,0 +1,27 @@ +diff -ur shadow-4.1.4.3.orig/src/login.c shadow-4.1.4.3/src/login.c +--- shadow-4.1.4.3.orig/src/login.c 2011-03-05 22:17:10.032524948 -0800 ++++ shadow-4.1.4.3/src/login.c 2011-03-05 22:17:59.154342059 -0800 +@@ -748,8 +748,9 @@ + sizeof (loginprompt), + _("%s login: "), hostn); + } else { ++ loginprompt[sizeof (loginprompt) - 1] = '\0'; + strncpy (loginprompt, _("login: "), +- sizeof (loginprompt)); ++ sizeof (loginprompt) - 1); + } + + retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt); +diff -ur shadow-4.1.4.3.orig/src/usermod.c shadow-4.1.4.3/src/usermod.c +--- shadow-4.1.4.3.orig/src/usermod.c 2011-03-05 22:17:10.029191265 -0800 ++++ shadow-4.1.4.3/src/usermod.c 2011-03-05 22:18:42.665576968 -0800 +@@ -182,7 +182,8 @@ + struct tm *tp; + + if ((negativ != NULL) && (date < 0)) { +- strncpy (buf, negativ, maxsize); ++ buf[maxsize - 1] = '\0'; ++ strncpy (buf, negativ, maxsize - 1); + } else { + time_t t = (time_t) date; + tp = gmtime (&t); diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily new file mode 100755 index 000000000..1931a793e --- /dev/null +++ b/testing/shadow/shadow.cron.daily @@ -0,0 +1,6 @@ +#!/bin/sh + +# Verify integrity of password and group files +/usr/sbin/pwck -r +/usr/sbin/grpck -r + diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install new file mode 100644 index 000000000..c1bd1066b --- /dev/null +++ b/testing/shadow/shadow.install @@ -0,0 +1,8 @@ +post_upgrade() { + grpck -r &>/dev/null + if [ $? -eq 2 ]; then + echo "Fixing gshadow file ..." + while :; do echo "y"; done | grpck &>/dev/null + fi + return 0 +} diff --git a/testing/shadow/shadow_CVE-2011-0721.patch b/testing/shadow/shadow_CVE-2011-0721.patch new file mode 100644 index 000000000..eb9ad80a2 --- /dev/null +++ b/testing/shadow/shadow_CVE-2011-0721.patch @@ -0,0 +1,57 @@ +Goal: Input sanitization for chfn and chsh + +Fixes: CVE-2011-0721 + +Status wrt upstream: Already applied upstream (4.1.4.3) + +--- a/src/chfn.c ++++ b/src/chfn.c +@@ -551,14 +551,14 @@ + static void check_fields (void) + { + int err; +- err = valid_field (fullnm, ":,="); ++ err = valid_field (fullnm, ":,=\n"); + if (err > 0) { + fprintf (stderr, _("%s: name with non-ASCII characters: '%s'\n"), Prog, fullnm); + } else if (err < 0) { + fprintf (stderr, _("%s: invalid name: '%s'\n"), Prog, fullnm); + fail_exit (E_NOPERM); + } +- err = valid_field (roomno, ":,="); ++ err = valid_field (roomno, ":,=\n"); + if (err > 0) { + fprintf (stderr, _("%s: room number with non-ASCII characters: '%s'\n"), Prog, roomno); + } else if (err < 0) { +@@ -566,17 +566,17 @@ + Prog, roomno); + fail_exit (E_NOPERM); + } +- if (valid_field (workph, ":,=") != 0) { ++ if (valid_field (workph, ":,=\n") != 0) { + fprintf (stderr, _("%s: invalid work phone: '%s'\n"), + Prog, workph); + fail_exit (E_NOPERM); + } +- if (valid_field (homeph, ":,=") != 0) { ++ if (valid_field (homeph, ":,=\n") != 0) { + fprintf (stderr, _("%s: invalid home phone: '%s'\n"), + Prog, homeph); + fail_exit (E_NOPERM); + } +- err = valid_field (slop, ":"); ++ err = valid_field (slop, ":\n"); + if (err > 0) { + fprintf (stderr, _("%s: '%s' contains non-ASCII characters\n"), Prog, slop); + } else if (err < 0) { +--- a/src/chsh. ++++ b/src/chsh.c +@@ -528,7 +528,7 @@ + * users are restricted to using the shells in /etc/shells. + * The shell must be executable by the user. + */ +- if (valid_field (loginsh, ":,=") != 0) { ++ if (valid_field (loginsh, ":,=\n") != 0) { + fprintf (stderr, _("%s: Invalid entry: %s\n"), Prog, loginsh); + fail_exit (1); + } diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults new file mode 100644 index 000000000..b800b1777 --- /dev/null +++ b/testing/shadow/useradd.defaults @@ -0,0 +1,9 @@ +# useradd defaults file for ArchLinux +# original changes by TomK +GROUP=100 +HOME=/home +INACTIVE=-1 +EXPIRE= +SHELL=/bin/bash +SKEL=/etc/skel +CREATE_MAIL_SPOOL=no diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch new file mode 100644 index 000000000..bce434264 --- /dev/null +++ b/testing/shadow/xstrdup.patch @@ -0,0 +1,9 @@ +--- shadow-4.1.2.1/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500 ++++ shadow-4.1.2.1/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500 +@@ -61,5 +61,6 @@ + + char *xstrdup (const char *str) + { ++ if(str == NULL) return NULL; + return strcpy (xmalloc (strlen (str) + 1), str); + } diff --git a/testing/ypserv/PKGBUILD b/testing/ypserv/PKGBUILD index 25b52721f..2bfaf2b8b 100644 --- a/testing/ypserv/PKGBUILD +++ b/testing/ypserv/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 143484 2011-11-24 17:03:26Z stephane $ +# $Id: PKGBUILD 143552 2011-11-26 13:20:22Z bisson $ # Maintainer: Gaetan Bisson # Contributor: judd # Contributor: Tom Newsom pkgname=ypserv pkgver=2.26 -pkgrel=2 +pkgrel=3 pkgdesc='Linux NIS Server' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/ypserv/' license=('GPL2') -depends=('gdbm' 'openslp') +depends=('gdbm' 'openslp' 'inetutils') backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" \ 'yppasswd' -- cgit v1.2.3-54-g00ecf From 83c3c42a38bda36bdc56d594318958bc4cfd9b32 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 28 Nov 2011 23:14:56 +0000 Subject: Mon Nov 28 23:14:56 UTC 2011 --- community-staging/cclive/PKGBUILD | 27 ++ community-staging/encfs/PKGBUILD | 33 ++ community-staging/glob2/PKGBUILD | 34 ++ community-staging/glob2/glob2-0.9.4.1-gcc44.patch | 87 ++++ community-staging/glob2/glob2.install | 12 + community-staging/glom/PKGBUILD | 35 ++ community-staging/glom/glom.install | 15 + community-staging/pokerth/PKGBUILD | 44 +++ community-staging/smc/PKGBUILD | 45 +++ community-staging/smc/smc-for-cegui-v0-7.diff | 437 +++++++++++++++++++++ community-staging/smc/smc.desktop | 9 + community-staging/smc/smc.png | Bin 0 -> 2961 bytes community-testing/i3-wm/PKGBUILD | 58 +++ community-testing/i3lock/PKGBUILD | 32 ++ community-testing/percona-server/PKGBUILD | 24 +- community/conntrack-tools/PKGBUILD | 34 ++ community/ebtables/PKGBUILD | 48 +++ community/ebtables/ebtables.conf | 37 ++ community/ebtables/ebtables.rc | 128 ++++++ community/ipset/PKGBUILD | 28 ++ community/libmnl/PKGBUILD | 25 ++ community/newton-dynamics/PKGBUILD | 3 +- community/nload/PKGBUILD | 26 ++ community/perf/PKGBUILD | 29 ++ community/sfk/PKGBUILD | 26 ++ community/skrooge/PKGBUILD | 9 +- community/skrooge/skrooge.changelog | 2 + community/viking/PKGBUILD | 8 +- community/viking/viking.changelog | 3 + community/vlan/PKGBUILD | 27 ++ core/openssh/PKGBUILD | 6 +- core/openssh/sshd.pam | 1 + extra/audacity/PKGBUILD | 18 +- extra/audacity/audacity-1.3.13-ffmpeg.patch | 164 ++++++++ extra/glsof/PKGBUILD | 34 +- extra/inkscape/PKGBUILD | 7 +- extra/kdeplasma-applets-networkmanagement/PKGBUILD | 6 +- extra/mesa/PKGBUILD | 6 +- extra/msmtp/PKGBUILD | 6 +- extra/vim/PKGBUILD | 29 +- extra/vim/urxvt-mouse.diff | 35 ++ kde-unstable/kdeplasma-addons/PKGBUILD | 14 +- kde-unstable/kdeplasma-addons/fix-build.patch | 163 ++++++++ libre/lsb-release-libre/PKGBUILD | 34 ++ libre/lsb-release-libre/lsb-release.install | 12 + multilib/lib32-mesa/PKGBUILD | 6 +- staging/boost/BOOST_FOREACH.patch | 60 +++ staging/boost/PKGBUILD | 17 +- staging/wesnoth/PKGBUILD | 46 +++ staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch | 70 ++++ staging/wesnoth/wesnoth-libpng-1.4.0.patch | 14 + staging/wesnoth/wesnoth.install | 9 + staging/wesnoth/wesnoth.tmpfiles.conf | 1 + testing/libevent/PKGBUILD | 34 ++ testing/perl/PKGBUILD | 14 +- testing/startup-notification/PKGBUILD | 28 ++ testing/vlc/PKGBUILD | 78 ++++ .../vlc/bp-set-channel-map-pulseaudio-1.0.patch | 33 ++ testing/vlc/vlc.install | 18 + testing/xcb-util-image/LICENSE | 267 +++++++++++++ testing/xcb-util-image/PKGBUILD | 37 ++ testing/xcb-util-keysyms/LICENSE | 267 +++++++++++++ testing/xcb-util-keysyms/PKGBUILD | 37 ++ testing/xcb-util-renderutil/LICENSE | 267 +++++++++++++ testing/xcb-util-renderutil/PKGBUILD | 37 ++ testing/xcb-util-wm/LICENSE | 267 +++++++++++++ testing/xcb-util-wm/PKGBUILD | 37 ++ testing/xcb-util/LICENSE | 267 +++++++++++++ testing/xcb-util/PKGBUILD | 38 ++ testing/xf86-video-intel/PKGBUILD | 8 +- 70 files changed, 3724 insertions(+), 93 deletions(-) create mode 100644 community-staging/cclive/PKGBUILD create mode 100644 community-staging/encfs/PKGBUILD create mode 100644 community-staging/glob2/PKGBUILD create mode 100644 community-staging/glob2/glob2-0.9.4.1-gcc44.patch create mode 100644 community-staging/glob2/glob2.install create mode 100644 community-staging/glom/PKGBUILD create mode 100644 community-staging/glom/glom.install create mode 100644 community-staging/pokerth/PKGBUILD create mode 100644 community-staging/smc/PKGBUILD create mode 100644 community-staging/smc/smc-for-cegui-v0-7.diff create mode 100644 community-staging/smc/smc.desktop create mode 100644 community-staging/smc/smc.png create mode 100644 community-testing/i3-wm/PKGBUILD create mode 100644 community-testing/i3lock/PKGBUILD create mode 100644 community/conntrack-tools/PKGBUILD create mode 100644 community/ebtables/PKGBUILD create mode 100644 community/ebtables/ebtables.conf create mode 100644 community/ebtables/ebtables.rc create mode 100644 community/ipset/PKGBUILD create mode 100644 community/libmnl/PKGBUILD create mode 100644 community/nload/PKGBUILD create mode 100644 community/perf/PKGBUILD create mode 100644 community/sfk/PKGBUILD create mode 100644 community/skrooge/skrooge.changelog create mode 100644 community/vlan/PKGBUILD create mode 100644 extra/audacity/audacity-1.3.13-ffmpeg.patch create mode 100644 extra/vim/urxvt-mouse.diff create mode 100644 kde-unstable/kdeplasma-addons/fix-build.patch create mode 100644 libre/lsb-release-libre/PKGBUILD create mode 100644 libre/lsb-release-libre/lsb-release.install create mode 100644 staging/boost/BOOST_FOREACH.patch create mode 100644 staging/wesnoth/PKGBUILD create mode 100644 staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch create mode 100644 staging/wesnoth/wesnoth-libpng-1.4.0.patch create mode 100644 staging/wesnoth/wesnoth.install create mode 100644 staging/wesnoth/wesnoth.tmpfiles.conf create mode 100644 testing/libevent/PKGBUILD create mode 100644 testing/startup-notification/PKGBUILD create mode 100644 testing/vlc/PKGBUILD create mode 100644 testing/vlc/bp-set-channel-map-pulseaudio-1.0.patch create mode 100644 testing/vlc/vlc.install create mode 100644 testing/xcb-util-image/LICENSE create mode 100644 testing/xcb-util-image/PKGBUILD create mode 100644 testing/xcb-util-keysyms/LICENSE create mode 100644 testing/xcb-util-keysyms/PKGBUILD create mode 100644 testing/xcb-util-renderutil/LICENSE create mode 100644 testing/xcb-util-renderutil/PKGBUILD create mode 100644 testing/xcb-util-wm/LICENSE create mode 100644 testing/xcb-util-wm/PKGBUILD create mode 100644 testing/xcb-util/LICENSE create mode 100644 testing/xcb-util/PKGBUILD (limited to 'extra') diff --git a/community-staging/cclive/PKGBUILD b/community-staging/cclive/PKGBUILD new file mode 100644 index 000000000..32e6c7e62 --- /dev/null +++ b/community-staging/cclive/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 59521 2011-11-27 18:31:19Z spupykin $ +# Maintainer: Lukas Fleischer +# 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-staging/encfs/PKGBUILD b/community-staging/encfs/PKGBUILD new file mode 100644 index 000000000..7f60a03d2 --- /dev/null +++ b/community-staging/encfs/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 59523 2011-11-27 18:32:06Z spupykin $ +# Contributor: Andrea Scarpino +# Contributor: Jaroslaw Swierczynski +# Contributor: Sven Kauber, +# Maintainer: Daniel J Griffiths + +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-staging/glob2/PKGBUILD b/community-staging/glob2/PKGBUILD new file mode 100644 index 000000000..0f061104d --- /dev/null +++ b/community-staging/glob2/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 59525 2011-11-27 18:33:05Z spupykin $ +# Contributor: Jaroslaw Swierczynski +# Contributor: Roman Kyrylych + +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-staging/glob2/glob2-0.9.4.1-gcc44.patch b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch new file mode 100644 index 000000000..b425b25ec --- /dev/null +++ b/community-staging/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-staging/glob2/glob2.install b/community-staging/glob2/glob2.install new file mode 100644 index 000000000..7463b6e76 --- /dev/null +++ b/community-staging/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-staging/glom/PKGBUILD b/community-staging/glom/PKGBUILD new file mode 100644 index 000000000..d96aef193 --- /dev/null +++ b/community-staging/glom/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 59510 2011-11-27 15:05:04Z heftig $ +# Maintainer: Roman Kyrylych +# Contributor: William Rea +# Contributor: Jaroslav Lichtblau + +pkgname=glom +pkgver=1.20.0 +pkgrel=2 +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=('047ce7bd6e5a0214f6f49cad15cc0ee1d2e8eeb61462e094328ed32676c15e5b') + +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-staging/glom/glom.install b/community-staging/glom/glom.install new file mode 100644 index 000000000..1ad77f9aa --- /dev/null +++ b/community-staging/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-staging/pokerth/PKGBUILD b/community-staging/pokerth/PKGBUILD new file mode 100644 index 000000000..54dd65ded --- /dev/null +++ b/community-staging/pokerth/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 59530 2011-11-27 19:00:09Z spupykin $ +# Maintainer: Mateusz Herych +# Contributor: Vasco Costa + +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-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD new file mode 100644 index 000000000..ea0a614a2 --- /dev/null +++ b/community-staging/smc/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 59528 2011-11-27 18:43:01Z spupykin $ +# Maintainer: +# Contributor: Juergen Hoetzel +# Contributor: Kritoke + +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-staging/smc/smc-for-cegui-v0-7.diff b/community-staging/smc/smc-for-cegui-v0-7.diff new file mode 100644 index 000000000..a99cbce6c --- /dev/null +++ b/community-staging/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(ev->resize.w), static_cast(ev->resize.h) ) ); ++ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast(ev->resize.w), static_cast(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(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(screen_w), static_cast(screen_h) ) ); ++ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast(screen_w), static_cast(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 + + 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-staging/smc/smc.desktop b/community-staging/smc/smc.desktop new file mode 100644 index 000000000..6cfe5b018 --- /dev/null +++ b/community-staging/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-staging/smc/smc.png b/community-staging/smc/smc.png new file mode 100644 index 000000000..f02af1bfc Binary files /dev/null and b/community-staging/smc/smc.png differ diff --git a/community-testing/i3-wm/PKGBUILD b/community-testing/i3-wm/PKGBUILD new file mode 100644 index 000000000..b42842dc1 --- /dev/null +++ b/community-testing/i3-wm/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 59516 2011-11-27 15:48:56Z ttopper $ +# Maintainer: Thorsten Töpper + +pkgname=i3-wm +_pkgsourcename=i3 +pkgver=4.1 +pkgrel=2 +pkgdesc="An improved dynamic tiling window manager" +arch=('i686' 'x86_64') +url="http://i3wm.org/" +license=('BSD') +replaces=("i3" "i3bar") +groups=("i3") +depends=('libxcursor' 'xcb-util-wm' 'xcb-util-keysyms' 'libev' 'yajl' 'startup-notification' 'pcre') +makedepends=('bison' 'flex') +optdepends=('rxvt-unicode: The terminal emulator used in the default config.' + 'dmenu: As menu.' + 'i3lock: For locking your screen.' + 'i3status: To display systeminformation with a bar.' + 'perl: To migrate your configuration to v4 format.') +options=('docs' '!strip') +source=(http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2) +md5sums=('1a05d605624506c2b4b9f1272fd84a5a') + +build() { + cd "$srcdir/$_pkgsourcename-$pkgver" + + # To avoid problems with bison use only a single process + MAKEFLAGS="-j1" + make +} + +package() { + cd "$srcdir/$_pkgsourcename-$pkgver" + + make DESTDIR="$pkgdir/" install + + install -Dm644 man/i3.1 \ + ${pkgdir}/usr/share/man/man1/i3.1 + install -Dm644 i3bar/doc/i3bar.1 \ + ${pkgdir}/usr/share/man/man1/i3bar.1 + install -Dm644 man/i3-config-wizard.1 \ + ${pkgdir}/usr/share/man/man1/i3-config-wizard.1 + install -Dm644 man/i3-input.1 \ + ${pkgdir}/usr/share/man/man1/i3-input.1 + install -Dm644 man/i3-msg.1 \ + ${pkgdir}/usr/share/man/man1/i3-msg.1 + install -Dm644 man/i3-migrate-config-to-v4.1 \ + ${pkgdir}/usr/share/man/man1/i3-migrate-config-to-v4.1 + install -Dm644 man/i3-nagbar.1 \ + ${pkgdir}/usr/share/man/man1/i3-nagbar.1 + install -Dm644 LICENSE \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/i3lock/PKGBUILD b/community-testing/i3lock/PKGBUILD new file mode 100644 index 000000000..a480fb878 --- /dev/null +++ b/community-testing/i3lock/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Thorsten Töpper + +pkgname=i3lock +pkgver=2.2 +pkgrel=2 +pkgdesc="An improved screenlocker based upon XCB and PAM" +arch=('i686' 'x86_64') +url="http://i3wm.org/i3lock/" +license=('MIT') +groups=("i3") +depends=('xcb-util' 'xcb-util-image' 'xcb-util-keysyms' 'pam') +options=('docs') +source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2") +md5sums=('6179a1611e333c8baf54093b57d50687') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make NOLIBCAIRO=y + gzip i3lock.1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 i3lock.1.gz ${pkgdir}/usr/share/man/man1/i3lock.1.gz + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + make clean +} + +# vim:set ts=2 sw=2 et: + diff --git a/community-testing/percona-server/PKGBUILD b/community-testing/percona-server/PKGBUILD index acf9a20ad..d3bcd65b3 100644 --- a/community-testing/percona-server/PKGBUILD +++ b/community-testing/percona-server/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: Massimiliano Torromeo pkgname=percona-server -pkgver=5.5.16_rel22.0 +pkgver=5.5.17_rel22.1 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64') -depends=('mysql-clients' 'net-tools' 'libaio') +depends=('mysql-clients' 'libaio') conflicts=('mysql') provides=('mysql') optdepends=('perl-dbi' 'perl-dbd-mysql') @@ -35,6 +35,7 @@ build() { CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \ + -DMANUFACTURER=Arch \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -53,19 +54,22 @@ build() { -DINSTALL_MYSQLSHAREDIR=share/mysql \ -DINSTALL_DOCDIR=share/mysql/docs \ -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_READLINE=ON \ + -DWITH_READLINE=OFF \ -DWITH_ZLIB=system \ -DWITH_SSL=system \ -DWITH_LIBWRAP=OFF \ + -DWITH_LIBEDIT=OFF \ + -DWITH_UNIT_TESTS=OFF \ -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ -DWITH_EXTRA_CHARSETS=complex \ -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=1 \ - -DWITH_PARTITION_STORAGE_ENGINE=1 \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + -DWITH_INNOBASE_STORAGE_ENGINE=ON \ + -DWITH_PARTITION_STORAGE_ENGINE=ON \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \ + -DWITH_ARCHIVE_STORAGE_ENGINE=ON \ + -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \ + -DWITH_FEDERATED_STORAGE_ENGINE=OFF \ + -DWITH_EXAMPLE_STORAGE_ENGINE=OFF make } @@ -94,6 +98,6 @@ package() { install -dm700 "${pkgdir}"/var/lib/mysql } -md5sums=('cfc4523a7110f07c193391f3e73d59ae' +md5sums=('77e2ff68ff3ffa60a48a1ee045056f15' '243864805611764a7e5883c1dba7afd8' '1c949c0dbea5206af0db14942d9927b6') diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD new file mode 100644 index 000000000..a70a1663f --- /dev/null +++ b/community/conntrack-tools/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 59559 2011-11-28 03:06:32Z seblu $ +# Maintainer: Sebastien Luttringer +# Contributor: Valere Monseur +# Contributor: Alessandro Sagratini +# Contributor: Kevin Edmonds + +pkgname=conntrack-tools +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Userspace tools to interact with the Netfilter's Connection Tracking System" +arch=('i686' 'x86_64') +url='http://www.netfilter.org/projects/conntrack-tools' +license=('GPL2') +depends=('libnetfilter_conntrack') +source=(http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${pkgver}.tar.bz2) +md5sums=('5add24d4761baf17af630d5627a71752') + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${pkgname}-${pkgver} + + # install binaries + make DESTDIR="${pkgdir}" install + + # install directories + install -d "${pkgdir}/etc/conntrackd" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/PKGBUILD b/community/ebtables/PKGBUILD new file mode 100644 index 000000000..5b1e406dd --- /dev/null +++ b/community/ebtables/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 59563 2011-11-28 03:11:50Z seblu $ +# Maintainer: Sebastien Luttringer +# Contributor: Michal Soltys + +pkgname=ebtables +pkgver='2.0.10_2' +pkgrel=2 +pkgdesc='Ethernet bridge filtering utilities' +arch=('i686' 'x86_64') +backup=('etc/conf.d/ebtables') +url='http://ebtables.sourceforge.net/' +license=('GPL2') +source=( + "http://downloads.sourceforge.net/${pkgname}/${pkgname}-v${pkgver/_/-}.tar.gz" + 'ebtables.rc' + 'ebtables.conf' + ) +md5sums=('c5ae7fb75810fd936a5445239e853fd8' + '368825c83a2b1180d2223e61b9f3bd07' + '86fc3622e6fc0a7a7920c90ff576cc38') + +build() { + cd ${pkgname}-v${pkgver/_/-} + make \ + CFLAGS='-Wunused -Wall -Werror -Wno-error=unused-but-set-variable' \ + LDFLAGS='' +} + +package() { + cd "${pkgname}-v${pkgver/_/-}" + make install \ + DESTDIR="${pkgdir}" \ + LIBDIR=/usr/lib \ + MANDIR=/usr/share/man \ + BINDIR=/usr/sbin \ + INITDIR=/etc/rc.d \ + SYSCONFIGDIR=/etc/ebtables + + # rm package ebtables rc.d scripts + rm "${pkgdir}/etc/rc.d/ebtables" + rm "${pkgdir}/etc/ebtables/ebtables-config" + + # install custom ebtables rc.d scripts + install -D -m 0755 "${srcdir}/ebtables.rc" "${pkgdir}/etc/rc.d/ebtables" + install -D -m 0644 "${srcdir}/ebtables.conf" "${pkgdir}/etc/conf.d/ebtables" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/ebtables.conf b/community/ebtables/ebtables.conf new file mode 100644 index 000000000..0005444e7 --- /dev/null +++ b/community/ebtables/ebtables.conf @@ -0,0 +1,37 @@ +# Save (and possibly restore) in text format. +# Value: yes|no, default: yes +# Save the firewall rules in text format to /etc/conf.d/ebtables +# If EBTABLES_BINARY_FORMAT="no" then restoring the firewall rules +# is done using this text format. +EBTABLES_TEXT_FORMAT="yes" + +# Save (and restore) in binary format. +# Value: yes|no, default: yes +# Save (and restore) the firewall rules in binary format to (and from) +# /etc/ebtables/ebtables.. Enabling this option will make +# firewall initialisation a lot faster. +EBTABLES_BINARY_FORMAT="yes" + +# Unload modules on restart and stop +# Value: yes|no, default: yes +# This option has to be 'yes' to get to a sane state for a firewall +# restart or stop. Only set to 'no' if there are problems unloading netfilter +# modules. +EBTABLES_MODULES_UNLOAD="yes" + +# Save current firewall rules on stop. +# Value: yes|no, default: no +# Saves all firewall rules if firewall gets stopped +# (e.g. on system shutdown). +EBTABLES_SAVE_ON_STOP="no" + +# Save current firewall rules on restart. +# Value: yes|no, default: no +# Saves all firewall rules if firewall gets restarted. +EBTABLES_SAVE_ON_RESTART="no" + +# Save (and restore) rule counters. +# Value: yes|no, default: no +# Save rule counters when saving a kernel table to a file. If the +# rule counters were saved, they will be restored when restoring the table. +EBTABLES_SAVE_COUNTER="no" diff --git a/community/ebtables/ebtables.rc b/community/ebtables/ebtables.rc new file mode 100644 index 000000000..3a889b914 --- /dev/null +++ b/community/ebtables/ebtables.rc @@ -0,0 +1,128 @@ +#!/bin/bash + +# Credits to: +# Sebastien Luttringer +# Bart De Schuymer +# Rok Papez +# Dag Wieers + +. /etc/rc.conf +. /etc/rc.d/functions + +#default configuration: +EBTABLES_TEXT_FORMAT="yes" +EBTABLES_BINARY_FORMAT="yes" +EBTABLES_MODULES_UNLOAD="yes" +EBTABLES_SAVE_ON_STOP="no" +EBTABLES_SAVE_ON_RESTART="no" +EBTABLES_SAVE_COUNTER="no" + +[[ -r "/etc/conf.d/ebtables" ]] && . "/etc/conf.d/ebtables" + +RETVAL=0 + +start() { + stat_busy "Starting ebtables" + ! ck_daemon ebtables && stat_done && RETVAL=0 && return + if [[ "$EBTABLES_BINARY_FORMAT" = yes ]]; then + for table in $(ls /etc/ebtables/ebtables.* 2>/dev/null | sed -e 's/.*ebtables\.//' -e '/save/d' ); do + /usr/sbin/ebtables -t ${table} --atomic-file /etc/ebtables/ebtables.${table} --atomic-commit || RETVAL=1 + done + elif [[ "$EBTABLES_TEXT_FORMAT" = "yes" ]]; then + [[ ! -r /etc/ebtables/ebtables ]] && :>/etc/ebtables/ebtables + /usr/sbin/ebtables-restore /dev/null + done + fi + + if (( RETVAL == 0 )); then + rm_daemon ebtables + stat_done + else + stat_fail + fi +} + +restart() { + stop + sleep 1 + start +} + +save() { + stat_busy "Saving ebtables" + if [[ "$EBTABLES_TEXT_FORMAT" = yes ]]; then + if [[ -r /etc/ebtables/ebtables ]]; then + mv -f /etc/ebtables/ebtables /etc/ebtables/ebtables.save + fi + /usr/sbin/ebtables-save >/etc/ebtables/ebtables || RETVAL=1 + fi + if [[ "$EBTABLES_BINARY_FORMAT" = yes ]]; then + rm -f /etc/ebtables/ebtables.*.save + for oldtable in $(ls /etc/ebtables/ebtables.* 2>/dev/null | grep -vF 'ebtables.save'); do + mv -f $oldtable $oldtable.save + done + for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do + :> /etc/ebtables/ebtables.$table + /usr/sbin/ebtables -t $table --atomic-file /etc/ebtables/ebtables.$table --atomic-save || RETVAL=1 + if [[ "$EBTABLES_SAVE_COUNTER" = no ]]; then + /usr/sbin/ebtables -t $table --atomic-file /etc/ebtables/ebtables.$table -Z || RETVAL=1 + fi + done + fi + + (( RETVAL == 0 )) && stat_done || stat_fail +} + +case "$1" in + start) + start + ;; + stop) + [[ "$EBTABLES_SAVE_ON_STOP" = yes ]] && save + stop + ;; + restart|reload) + [[ "$EBTABLES_SAVE_ON_RESTART" = yes ]] && save + restart + ;; + condrestart) + ! ck_daemon ebtables && restart + RETVAL=$? + ;; + save) + save + ;; + status) + /usr/sbin/ebtables-save + RETVAL=$? + ;; + *) + echo "Usage $0 {start|stop|restart|condrestart|save|status}" + RETVAL=1 +esac + +exit $RETVAL + +# vim:set ts=2 sw=2 ft=sh noet: diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD new file mode 100644 index 000000000..edabb23c9 --- /dev/null +++ b/community/ipset/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 59544 2011-11-28 00:43:00Z seblu $ +# Maintainer: Sebastien Luttringer + +pkgname=ipset +pkgver=6.9.1 +pkgrel=2 +pkgdesc='Administration tool for IP sets' +arch=('i686' 'x86_64') +url='http://ipset.netfilter.org' +license=('GPL2') +depends=('libmnl') +makedepends=('linux-headers') +source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2") +md5sums=('71f4b826e025be5918a52e9843673167') + +build() { + cd $pkgname-$pkgver + ./autogen.sh + ./configure --prefix=/usr --with-kbuild=/lib/modules/$(pacman -Qi linux-headers|sed -rn 's,Version[[:space:]]*:[[:space:]]*(.*),\1,p')-ARCH/build + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/libmnl/PKGBUILD b/community/libmnl/PKGBUILD new file mode 100644 index 000000000..ab2f8549f --- /dev/null +++ b/community/libmnl/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 59542 2011-11-28 00:38:43Z seblu $ +# Maintainer: Sebastien Luttringer + +pkgname=libmnl +pkgver=1.0.1 +pkgrel=2 +pkgdesc='Minimalistic user-space library oriented to Netlink developers.' +arch=('i686' 'x86_64') +url='http://www.netfilter.org/projects/libmnl/' +license=('LGPL2.1') +source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") +md5sums=('e936236bb57a2375afa4e70e75dc3ba9') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/newton-dynamics/PKGBUILD b/community/newton-dynamics/PKGBUILD index 93a578450..defe9db75 100644 --- a/community/newton-dynamics/PKGBUILD +++ b/community/newton-dynamics/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Christophe Robin (bombstrike) pkgname=newton-dynamics pkgver=2.33 -pkgrel=1 +pkgrel=2 pkgdesc="A simple physics API" arch=('i686' 'x86_64') url="http://www.newtondynamics.com" @@ -37,6 +37,7 @@ build() { ## build lib cd "${builddir}" + sed -i 's/ -o libNewton.so/ -lpthread -lstdc++ -o libNewton.so/' makefile make install -D -m644 "${builddir}/libNewton.a" "${pkgdir}/usr/lib/libNewton.a" diff --git a/community/nload/PKGBUILD b/community/nload/PKGBUILD new file mode 100644 index 000000000..2518e64ee --- /dev/null +++ b/community/nload/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Sebastien Luttringer + +pkgname=nload +pkgver=0.7.3 +pkgrel=2 +pkgdesc='Console application which monitors network traffic and bandwidth usage in real time' +url='http://www.roland-riegel.de/nload' +license=('GPL2') +depends=('ncurses' 'gcc-libs') +arch=('i686' 'x86_64') +source=("$url/$pkgname-$pkgver.tar.gz") +md5sums=('9b97c37fe1474f1da42f265fead24081') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/perf/PKGBUILD b/community/perf/PKGBUILD new file mode 100644 index 000000000..0fca9ed9a --- /dev/null +++ b/community/perf/PKGBUILD @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: Sebastien Luttringer + +pkgname=perf +pkgver=3.1.2 +pkgrel=1 +pkgdesc="Linux kernel $pkgver performance tool" +license=('GPL2') +arch=('i686' 'x86_64') +url='http://www.kernel.org' +options=(!strip) +depends=('python2' 'libnewt' 'elfutils') +makedepends=('asciidoc' 'xmlto') +source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$pkgver.tar.xz") +md5sums=('24027361d3ea6ea2cdd7bbdd2effe43f') + +build() { + cd linux-$pkgver/tools/perf + make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver \ + all man +} + +package() { + cd linux-${pkgver}/tools/perf + make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver \ + install install-man +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD new file mode 100644 index 000000000..3a6cb9e24 --- /dev/null +++ b/community/sfk/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 59548 2011-11-28 01:04:30Z seblu $ +# Maintainer: Sebastien Luttringer +# Contributor: Baumi + +pkgname=sfk +pkgver=1.6.4 +pkgrel=2 +pkgdesc='Swiss File Knife - A Command Line Tools Collection' +arch=('i686' 'x86_64') +url='http://stahlforce.com/dev/?tool=sfk' +license=('custom: BSD') +source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip") +md5sums=('263df6a8e18f6ebb6032f3c048df0b6d') + +build() { + cd ${pkgname}${pkgver//./} + g++ $CXXFLAGS $LDFLAGS sfk.cpp sfknet.cpp patch.cpp inst.cpp -o sfk +} + +package() { + cd ${pkgname}${pkgver//./} + install -D -m755 $pkgname "$pkgdir/usr/bin/$pkgname" + install -D -m444 bsd-license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD index 04cdef219..cf52881d5 100644 --- a/community/skrooge/PKGBUILD +++ b/community/skrooge/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56764 2011-10-11 21:59:15Z ebelanger $ -# Maintainer: +# $Id: PKGBUILD 59508 2011-11-27 13:44:23Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau # Contributor: Ray Rashif # Contributor: Andrea Scarpino # Contributor: neuromante pkgname=skrooge -pkgver=1.0.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="A personal finances manager for KDE" arch=('i686' 'x86_64') @@ -14,8 +14,9 @@ license=('GPL') depends=('kdebase-runtime' 'libofx' 'qca-ossl') makedepends=('cmake' 'automoc4' 'docbook-xsl') install=$pkgname.install +changelog=$pkgname.changelog source=("http://skrooge.org/files/$pkgname-$pkgver.tar.bz2") -md5sums=('900da5dd41b940272941ee71e78cf8b4') +sha256sums=('6553a61a74bb4f5d0272fff4844e47d983fa38cd6af0481658f4d1e3150c6d62') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog new file mode 100644 index 000000000..ce1768e34 --- /dev/null +++ b/community/skrooge/skrooge.changelog @@ -0,0 +1,2 @@ +2011-11-27 Jaroslav Lichtblau + * skrooge 1.1.1-1 diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD index b007a93dd..ce38ac15e 100644 --- a/community/viking/PKGBUILD +++ b/community/viking/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54936 2011-08-28 15:44:24Z jlichtblau $ +# $Id: PKGBUILD 59505 2011-11-27 13:11:14Z jlichtblau $ # Maintainer: Jaroslav Lichtblau # Contributor: Nick Østergaard # Contributor: Jonny Gerold pkgname=viking -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="GTK+2 application to manage GPS data" arch=('i686' 'x86_64') @@ -17,13 +17,11 @@ options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('7c4b36398a9ec121ab11b66f042d17368dd46cf328a2a0e00bda38fd357a9743') +sha256sums=('9f96f9bdfc9cae8c65d391f9e972a987ec7f3d9d662a0e4df8bd14282879b10c') build() { cd ${srcdir}/$pkgname-$pkgver - sed '/#include /d' -i src/osm-traces.c - ./configure --prefix=/usr --disable-realtime-gps-tracking --enable-geocaches --enable-expedia make } diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog index bffeb3245..b195927d1 100644 --- a/community/viking/viking.changelog +++ b/community/viking/viking.changelog @@ -1,3 +1,6 @@ +2011-11-27 Jaroslav Lichtblau + * viking 1.2.2-1 + 2011-08-28 Jaroslav Lichtblau * viking 1.2.1-1 diff --git a/community/vlan/PKGBUILD b/community/vlan/PKGBUILD new file mode 100644 index 000000000..8cdaddd47 --- /dev/null +++ b/community/vlan/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 59555 2011-11-28 01:48:10Z seblu $ +# Maintainer: Sebastien Luttringer +# Contributor: Judd Vinet + +pkgname=vlan +pkgver=1.9 +pkgrel=1 +pkgdesc='Virtual LAN configuration utility' +arch=('i686' 'x86_64') +url='http://www.candelatech.com/~greear/vlan.html' +license=('GPL') +source=("http://www.candelatech.com/~greear/vlan/vlan.${pkgver}.tar.gz") +md5sums=('5f0c6060b33956fb16e11a15467dd394') + +build() { + cd vlan + make clean all +} + +package() { + cd vlan + install -D -m755 'vconfig' "$pkgdir/usr/sbin/vconfig" + install -D -m755 'macvlan_config' "$pkgdir/usr/sbin/macvlan_config" + install -D -m644 'vconfig.8' "$pkgdir/usr/share/man/man8/vconfig.8" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index a8899d96c..a09087ac1 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140826 2011-10-19 22:29:31Z bisson $ +# $Id: PKGBUILD 143647 2011-11-28 00:51:52Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Aaron Griffin # Contributor: judd pkgname=openssh pkgver=5.9p1 -pkgrel=4 +pkgrel=5 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64') license=('custom:BSD') @@ -19,7 +19,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} 'sshd') sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1' + '3413909fd45a28701c92e6e5b59c6b65346ddb0f' '21fa88de6cc1c7912e71655f50896ba17991a1c2') build() { diff --git a/core/openssh/sshd.pam b/core/openssh/sshd.pam index ff8829fe9..c7b91cdfb 100644 --- a/core/openssh/sshd.pam +++ b/core/openssh/sshd.pam @@ -9,3 +9,4 @@ password required pam_unix.so session required pam_unix_session.so session required pam_limits.so -session optional pam_ck_connector.so nox11 +-session optional pam_systemd.so diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD index d5c42fd92..95d7de472 100644 --- a/extra/audacity/PKGBUILD +++ b/extra/audacity/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 119629 2011-04-12 20:51:50Z eric $ +# $Id: PKGBUILD 143650 2011-11-28 02:34:27Z eric $ # Maintainer: Eric Bélanger pkgname=audacity pkgver=1.3.13 -pkgrel=1 +pkgrel=2 pkgdesc="A program that lets you manipulate digital audio waveforms" arch=('i686' 'x86_64') url="http://audacity.sourceforge.net/" license=('GPL') -depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'libsamplerate' 'lame' 'hicolor-icon-theme' - 'shared-mime-info' 'desktop-file-utils' 'redland' 'jack' 'soundtouch') -makedepends=('zip') +depends=('libmad' 'libid3tag' 'wxgtk' 'lame' 'hicolor-icon-theme' + 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg') options=('!makeflags') install=audacity.install -source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2) -md5sums=('57be7fadb8c8dd17b8462c7ac1561d03') +source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2 \ + audacity-1.3.13-ffmpeg.patch) +sha1sums=('47a1340699958c8e1804f374209835be865d7027' + '26c2ad8e611705b2762a318e66312169f59cc218') build() { cd "${srcdir}/${pkgname}-src-${pkgver}-beta" + patch -p1 -i "${srcdir}/audacity-1.3.13-ffmpeg.patch" WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \ --with-portaudio --with-libsamplerate \ --without-libresample --with-libmad \ - --with-id3tag --with-libflac \ + --with-ffmpeg --with-id3tag --with-libflac \ --with-vorbis --with-libexpat \ --with-libsndfile --with-soundtouch \ --enable-unicode --without-taglib diff --git a/extra/audacity/audacity-1.3.13-ffmpeg.patch b/extra/audacity/audacity-1.3.13-ffmpeg.patch new file mode 100644 index 000000000..675470913 --- /dev/null +++ b/extra/audacity/audacity-1.3.13-ffmpeg.patch @@ -0,0 +1,164 @@ +--- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpeg.cpp ++++ audacity-src-1.3.13-beta/src/export/ExportFFmpeg.cpp +@@ -352,7 +352,7 @@ + avcodec_get_context_defaults(mEncAudioCodecCtx); + + mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid; +- mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO; ++ mEncAudioCodecCtx->codec_type = AVMEDIA_TYPE_AUDIO; + mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id); + mSampleRate = (int)project->GetRate(); + mEncAudioCodecCtx->global_quality = -99999; //quality mode is off by default; +@@ -403,7 +403,6 @@ + mEncAudioCodecCtx->flags2 = 0; + if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR; + if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only? +- mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true); + mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1); + mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0); + mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0); +@@ -569,7 +569,7 @@ + pkt.stream_index = mEncAudioStream->index; + pkt.data = mEncAudioEncodedBuf; + pkt.size = nEncodedBytes; +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + // Set presentation time of frame (currently in the codec's timebase) in the stream timebase. + if(mEncAudioCodecCtx->coded_frame && mEncAudioCodecCtx->coded_frame->pts != int64_t(AV_NOPTS_VALUE)) +@@ -656,7 +656,7 @@ + + pkt.stream_index = mEncAudioStream->index; + pkt.data = mEncAudioEncodedBuf; +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + // Write the encoded audio frame to the output file. + if ((ret = av_interleaved_write_frame(mEncFormatCtx, &pkt)) != 0) +--- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpegDialogs.cpp ++++ audacity-src-1.3.13-beta/src/export/ExportFFmpegDialogs.cpp +@@ -1288,7 +1288,7 @@ + while ((codec = av_codec_next(codec))) + { + // We're only interested in audio and only in encoders +- if (codec->type == CODEC_TYPE_AUDIO && codec->encode) ++ if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode) + { + mCodecNames.Add(wxString::FromUTF8(codec->name)); + mCodecLongNames.Add(wxString::Format(wxT("%s - %s"),mCodecNames.Last().c_str(),wxString::FromUTF8(codec->long_name).c_str())); +@@ -1528,7 +1528,7 @@ + // Find the codec, that is claimed to be compatible + AVCodec *codec = avcodec_find_encoder(CompatibilityList[i].codec); + // If it exists, is audio and has encoder +- if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode) ++ if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode) + { + // If it was selected - remember it's new index + if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount(); +@@ -1543,7 +1543,7 @@ + AVCodec *codec = NULL; + while ((codec = av_codec_next(codec))) + { +- if (codec->type == CODEC_TYPE_AUDIO && codec->encode) ++ if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode) + { + if (mShownCodecNames.Index(wxString::FromUTF8(codec->name)) < 0) + { +@@ -1563,7 +1563,7 @@ + if (format != NULL) + { + AVCodec *codec = avcodec_find_encoder(format->audio_codec); +- if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode) ++ if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode) + { + if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount(); + mShownCodecNames.Add(wxString::FromUTF8(codec->name)); +--- audacity-src-1.3.13-beta.orig/src/FFmpeg.cpp ++++ audacity-src-1.3.13-beta/src/FFmpeg.cpp +@@ -316,7 +316,7 @@ + pd.buf_size = 0; + pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE); + if (pd.buf == NULL) { +- err = AVERROR_NOMEM; ++ err = AVERROR(ENOMEM); + goto fail; + } + +@@ -381,7 +381,7 @@ + + // Didn't find a suitable format, so bail + if (!fmt) { +- err = AVERROR_NOFMT; ++ err = AVERROR(EILSEQ); + goto fail; + } + +@@ -855,7 +855,6 @@ + FFMPEG_INITDYN(codec, avcodec_find_decoder); + FFMPEG_INITDYN(codec, avcodec_get_context_defaults); + FFMPEG_INITDYN(codec, avcodec_open); +- FFMPEG_INITDYN(codec, avcodec_decode_audio2); + FFMPEG_INITDYN(codec, avcodec_decode_audio3); + FFMPEG_INITDYN(codec, avcodec_encode_audio); + FFMPEG_INITDYN(codec, avcodec_close); +--- audacity-src-1.3.13-beta.orig/src/FFmpeg.h ++++ audacity-src-1.3.13-beta/src/FFmpeg.h +@@ -559,7 +559,11 @@ + FFMPEG_FUNCTION_WITH_RETURN( + void*, + av_fast_realloc, ++#if LIBAVUTIL_VERSION_MAJOR < 51 + (void *ptr, unsigned int *size, unsigned int min_size), ++#else ++ (void *ptr, unsigned int *size, size_t min_size), ++#endif + (ptr, size, min_size) + ); + FFMPEG_FUNCTION_WITH_RETURN( +@@ -747,7 +751,11 @@ + FFMPEG_FUNCTION_WITH_RETURN( + void*, + av_malloc, ++#if LIBAVUTIL_VERSION_MAJOR < 51 + (unsigned int size), ++#else ++ (size_t size), ++#endif + (size) + ); + FFMPEG_FUNCTION_NO_RETURN( +--- audacity-src-1.3.13-beta.orig/src/import/ImportFFmpeg.cpp ++++ audacity-src-1.3.13-beta/src/import/ImportFFmpeg.cpp +@@ -416,7 +416,7 @@ + // Fill the stream contexts + for (unsigned int i = 0; i < mFormatContext->nb_streams; i++) + { +- if (mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) ++ if (mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) + { + //Create a context + streamContext *sc = new streamContext; +--- audacity-src-1.3.13-beta.orig/src/ondemand/ODDecodeFFmpegTask.cpp ++++ audacity-src-1.3.13-beta/src/ondemand/ODDecodeFFmpegTask.cpp +@@ -156,7 +156,7 @@ + //test the audio stream(s) + for (unsigned int i = 0; i < ic->nb_streams; i++) + { +- if (ic->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) ++ if (ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) + { + audioStreamExists = true; + st = ic->streams[i]; +@@ -573,10 +573,10 @@ + } + } + +- // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but ++ // avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but + // also returns the number of bytes it decoded in the same parameter. + sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz; +- nBytesDecoded = avcodec_decode_audio2(sc->m_codecCtx, ++ nBytesDecoded = avcodec_decode_audio3(sc->m_codecCtx, + sc->m_decodedAudioSamples, // out + &sc->m_decodedAudioSamplesValidSiz, // in/out + pDecode, nDecodeSiz); // in diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD index 72ce404fc..390128888 100644 --- a/extra/glsof/PKGBUILD +++ b/extra/glsof/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124019 2011-05-16 00:31:31Z eric $ +# $Id: PKGBUILD 143652 2011-11-28 02:56:39Z eric $ # Maintainer: Eric Bélanger pkgname=glsof -pkgver=1.5 -_fmver=1.5 +pkgver=1.6 +_fmver=1.6 _qver=1.0.0 pkgrel=1 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility" @@ -15,24 +15,24 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver} if [ "$CARCH" = "i686" ]; then source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \ glsof-filemonitor glsof-queries) - md5sums=('6ca86f9f356e9cba02e4f0861eb1c464' - '895bcec79edea97ebde36d7f5eaa3ee9' - '7e43c1120e15e65bd1a12d6f188be4a0' - '980da4b39e1e3f4fbed08018dfd3be7b') + sha1sums=('cb6f56170beffcd15faa68a02db976cdab1436da' + 'd5a17d66dd02cd78bad5ffdda0b936c7848e4890' + '197b58f40880995d6442fd42a58fa1f4594fd19d' + '2797c326904af16a254c3e39b8c529ea14ef37e5') elif [ "$CARCH" = "x86_64" ]; then source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \ glsof-filemonitor glsof-queries) - md5sums=('6ca86f9f356e9cba02e4f0861eb1c464' - 'ed96ee2105428aa8b038f5fe13b8cd1d' - '7e43c1120e15e65bd1a12d6f188be4a0' - '980da4b39e1e3f4fbed08018dfd3be7b') + sha1sums=('cb6f56170beffcd15faa68a02db976cdab1436da' + 'c5dd12e9b2860f1c427ed7cd482e898978051d2c' + '197b58f40880995d6442fd42a58fa1f4594fd19d' + '2797c326904af16a254c3e39b8c529ea14ef37e5') fi package() { - cd "${srcdir}" - install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor" - install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries" - install -D -m644 filemonitor/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar" - install -D -m644 queries_linux??/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar" - install -D -m644 queries_linux??/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf" + cd "${srcdir}" + install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor" + install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries" + install -D -m644 filemonitor/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar" + install -D -m644 queries_linux??/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar" + install -D -m644 queries_linux??/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf" } diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 94615493a..079ca3009 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 142652 2011-11-12 17:18:29Z ibiru $ +# $Id: PKGBUILD 143645 2011-11-28 00:27:02Z bisson $ # Contributor: tobias # Contributor: Tobias Kieslich # Maintainer: Gaetan Bisson pkgname=inkscape pkgver=0.48.2 -pkgrel=4 +pkgrel=5 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64') license=('GPL' 'LGPL') makedepends=('boost' 'pkg-config' 'intltool') -depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2' +depends=('gc' 'gtkmm' 'poppler-glib' 'libxslt' 'gsl' 'popt' 'python2' 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('pstoedit: latex formulas' 'texlive-core: latex formulas' 'python2-numpy: some extensions' 'python-lxml: some extensions and filters' + 'pyxml: some extensions' 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index f6b7670b4..605c34c35 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=0.9.0rc2 -_pkgver=0.8.95 +pkgver=0.9.0rc3 +_pkgver=0.8.98 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install source=("ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/${_pkgver}/src/networkmanagement-${_pkgver}.tar.bz2") -sha1sums=('43df2e26acb1b96f3b5e394568a25d04036a085b') +sha1sums=('f46274c4cca722f37eef7418144c0c04bfe21e24') build() { cd "${srcdir}" diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index bb7e6c83f..e1f0df20b 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142908 2011-11-18 07:55:25Z andyrtr $ +# $Id: PKGBUILD 143633 2011-11-27 22:29:58Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke @@ -15,7 +15,7 @@ if [ "${_git}" = "true" ]; then #pkgver=7.10.99.git20110709 pkgver=7.11 else - pkgver=7.11.1 + pkgver=7.11.2 fi pkgrel=1 arch=('i686' 'x86_64') @@ -34,7 +34,7 @@ if [ "${_git}" = "true" ]; then ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - 'a77307102cee844ff6544ffa8fafeac1') + '0837c52698fe3252369c3fdb5195afcc') build() { cd ${srcdir}/?esa-* diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 3aad52a3b..ef30c63bb 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140559 2011-10-17 07:57:05Z eric $ +# $Id: PKGBUILD 143654 2011-11-28 04:52:17Z eric $ # Maintainer: tobias # Contributor: Ben Mazer pkgname=msmtp -pkgver=1.4.25 +pkgver=1.4.26 pkgrel=1 pkgdesc="A mini smtp client" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('texlive-core') provides=('smtp-forwarder') install=msmtp.install source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2d9603a7b5c1ebd83ea289ac2aa3a634') +sha1sums=('0ce5352447b01dc21970b7a00cf13b8a3e7172c9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index f2d9258bc..fae945242 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142404 2011-11-09 04:16:54Z eric $ +# $Id: PKGBUILD 143639 2011-11-27 23:44:53Z eric $ # Contributor: Jan "heftig" Steffens # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths @@ -10,19 +10,20 @@ _patchlevel=353 __hgrev=379a6398d462 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 - vimrc archlinux.vim gvim.desktop) -md5sums=('3a7fb107699b741a7a1a86ff5ec3b83e' - '6e7adfbd5d26c1d161030ec203a7f243' - 'e57777374891063b9ca48a1fe392ac05' - '10353a61aadc3f276692d0e17db1478e' - 'd90413bd21f400313a785bb4010120cd') + vimrc archlinux.vim gvim.desktop urxvt-mouse.diff) +sha1sums=('1713682c077d26ec3d3e8d0d18bad88a2a447fd5' + '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' + '3494baf53a63581ba69f86a81293640ff681c5c5' + '25dd3c2ce436e73a367c8f73b68f7f6889682437' + '4a579cf66590d711f49c5dfb4a25e5df116ff7ba' + '54d8edec6a450a529ba11bab45c5685b1e7c2e84') # source PKGBUILD && mksource mksource() { @@ -52,6 +53,8 @@ mksource() { build() { cd "${srcdir}" + (cd ${pkgname}-${pkgver}; patch -p1 -i ../urxvt-mouse.diff) + cp -a ${pkgname}-${pkgver} vim-build # define the place for the global (g)vimrc file (set to /etc/vimrc) @@ -69,19 +72,19 @@ build() { cd "${srcdir}"/vim-build ./configure --prefix=/usr --localstatedir=/var/lib/vim \ - --mandir=/usr/share/man --with-compiledby=ArchLinux \ - --with-features=big --enable-gpm --enable-acl --with-x=no \ + --with-features=big --with-compiledby=ArchLinux \ + --enable-gpm --enable-acl --with-x=no \ --disable-gui --enable-multibyte --enable-cscope \ --disable-netbeans --enable-perlinterp --disable-pythoninterp \ - --disable-rubyinterp --disable-luainterp + --disable-python3interp --disable-rubyinterp --disable-luainterp make cd "${srcdir}"/gvim-build ./configure --prefix=/usr --localstatedir=/var/lib/vim \ - --mandir=/usr/share/man --with-compiledby=ArchLinux \ - --with-features=big --enable-gpm --enable-acl --with-x=yes \ + --with-features=big --with-compiledby=ArchLinux \ + --enable-gpm --enable-acl --with-x=yes \ --enable-gui=gtk2 --enable-multibyte --enable-cscope \ --enable-netbeans --enable-perlinterp --enable-pythoninterp \ --enable-python3interp --enable-rubyinterp --enable-luainterp diff --git a/extra/vim/urxvt-mouse.diff b/extra/vim/urxvt-mouse.diff new file mode 100644 index 000000000..9112e7ffd --- /dev/null +++ b/extra/vim/urxvt-mouse.diff @@ -0,0 +1,35 @@ +diff --git a/src/term.c b/src/term.c +--- a/src/term.c ++++ b/src/term.c +@@ -1996,6 +1996,7 @@ + # define HMT_DEC 4 + # define HMT_JSBTERM 8 + # define HMT_PTERM 16 ++# define HMT_URXVT 32 + static int has_mouse_termcode = 0; + # endif + +@@ -2031,6 +2032,11 @@ + has_mouse_termcode |= HMT_PTERM; + else + # endif ++# ifdef FEAT_MOUSE_URXVT ++ if (n == KS_URXVT_MOUSE) ++ has_mouse_termcode |= HMT_URXVT; ++ else ++# endif + has_mouse_termcode |= HMT_NORMAL; + # endif + } +@@ -2068,6 +2074,11 @@ + has_mouse_termcode &= ~HMT_PTERM; + else + # endif ++# ifdef FEAT_MOUSE_URXVT ++ if (n == KS_URXVT_MOUSE) ++ has_mouse_termcode &= ~HMT_URXVT; ++ else ++# endif + has_mouse_termcode &= ~HMT_NORMAL; + # endif + } diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD index 21270b2f6..ff363b32a 100644 --- a/kde-unstable/kdeplasma-addons/PKGBUILD +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143418 2011-11-24 16:16:32Z andrea $ +# $Id: PKGBUILD 143608 2011-11-27 12:08:26Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -75,23 +75,27 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.7.80 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('fd27a14fc2ad676a4d5ddf4cd8658d80fc7aa8e9') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'fix-build.patch') +sha1sums=('fd27a14fc2ad676a4d5ddf4cd8658d80fc7aa8e9' + '408f4ba54c2aba93e68f3454be0ef4327e48a51b') build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-build.patch + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/kde-unstable/kdeplasma-addons/fix-build.patch b/kde-unstable/kdeplasma-addons/fix-build.patch new file mode 100644 index 000000000..79e1d1f8c --- /dev/null +++ b/kde-unstable/kdeplasma-addons/fix-build.patch @@ -0,0 +1,163 @@ +From: Aaron Seigo +Date: Tue, 22 Nov 2011 20:10:45 +0000 +Subject: fix build +X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&a=commitdiff&h=6967ee53518136651b4fd5d691293a3c866d7a47 +--- +fix build +--- + + +--- a/libs/lancelot-datamodels/OpenDocuments.cpp ++++ b/libs/lancelot-datamodels/OpenDocuments.cpp +@@ -66,41 +66,41 @@ OpenDocuments::~OpenDocuments() + delete d; + } + +-void OpenDocuments::Private::connectTask(TaskPtr task) ++void OpenDocuments::Private::connectTask(::TaskManager::Task *task) + { + Q_ASSERT(task); + connect( +- task.constData(), SIGNAL(changed(::TaskManager::TaskChanges)), ++ task, SIGNAL(changed(::TaskManager::TaskChanges)), + this, SLOT(taskChanged()) + ); + } + + void OpenDocuments::load() + { +- foreach (TaskPtr task, TaskManager::TaskManager::self()->tasks()) { ++ foreach (TaskManager::Task *task, TaskManager::TaskManager::self()->tasks()) { + if (d->setDataForTask(task)) { + d->connectTask(task); + } + } + + connect( +- TaskManager::TaskManager::self(), SIGNAL(taskAdded(TaskPtr)), +- d, SLOT(taskAdded(TaskPtr)) ++ TaskManager::TaskManager::self(), SIGNAL(taskAdded(::TaskManager::Task*)), ++ d, SLOT(taskAdded(::TaskManager::Task*)) + ); + + connect( +- TaskManager::TaskManager::self(), SIGNAL(taskRemoved(TaskPtr)), +- d, SLOT(taskRemoved(TaskPtr)) ++ TaskManager::TaskManager::self(), SIGNAL(taskRemoved(::TaskManager::Task*)), ++ d, SLOT(taskRemoved(::TaskManager::Task*)) + ); + } + +-void OpenDocuments::Private::taskAdded(TaskPtr task) ++void OpenDocuments::Private::taskAdded(::TaskManager::Task *task) + { + connectTask(task); + setDataForTask(task); + } + +-void OpenDocuments::Private::taskRemoved(TaskPtr task) ++void OpenDocuments::Private::taskRemoved(::TaskManager::Task *task) + { + Q_ASSERT(task); + int index = indexOf(task->window()); +@@ -115,10 +115,10 @@ void OpenDocuments::Private::taskChanged + TaskManager::Task* task = qobject_cast(sender()); + Q_ASSERT(task); + +- setDataForTask(TaskPtr(task)); ++ setDataForTask(task); + } + +-bool OpenDocuments::Private::setDataForTask(TaskPtr task) ++bool OpenDocuments::Private::setDataForTask(::TaskManager::Task *task) + { + Q_ASSERT(task); + + +--- a/libs/lancelot-datamodels/OpenDocuments.h ++++ b/libs/lancelot-datamodels/OpenDocuments.h +@@ -26,8 +26,6 @@ + #include + #include + +-using TaskManager::TaskPtr; +- + namespace Lancelot { + namespace Models { + + +--- a/libs/lancelot-datamodels/OpenDocuments_p.h ++++ b/libs/lancelot-datamodels/OpenDocuments_p.h +@@ -24,8 +24,6 @@ + #include + #include + +-using TaskManager::TaskPtr; +- + namespace Lancelot { + namespace Models { + +@@ -44,16 +42,16 @@ public: + + public Q_SLOTS: + void taskChanged(); +- void taskAdded(TaskPtr task); +- void taskRemoved(TaskPtr task); ++ void taskAdded(::TaskManager::Task *task); ++ void taskRemoved(::TaskManager::Task *task); + +- void connectTask(TaskPtr task); +- bool setDataForTask(TaskPtr task); ++ void connectTask(::TaskManager::Task *task); ++ bool setDataForTask(::TaskManager::Task *task); + + int indexOf(WId wid); + + public: +- QMap tasks; ++ QMap tasks; + QList supportedTasks; + + private: + +From: Aaron Seigo +Date: Tue, 22 Nov 2011 13:07:59 +0000 +Subject: remove outdated using statements +X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&a=commitdiff&h=b0c70d7fd866efb628036f43978bc791e0485f90 +--- +remove outdated using statements +--- + + +--- a/applets/icontasks/taskitemlayout.h ++++ b/applets/icontasks/taskitemlayout.h +@@ -32,9 +32,6 @@ class TaskGroupItem; + class AbstractTaskItem; + class LauncherSeparator; + +-using TaskManager::StartupPtr; +-using TaskManager::TaskPtr; +- + /** + * A Layout for the expanded group + */ + +--- a/applets/icontasks/tasks.h ++++ b/applets/icontasks/tasks.h +@@ -54,15 +54,6 @@ namespace TaskManager + class GroupManager; + } // namespace TaskManager + +-using TaskManager::StartupPtr; +-using TaskManager::TaskPtr; +-using TaskManager::StartupPtr; +-using TaskManager::GroupPtr; +-using TaskManager::AbstractGroupableItem; +-using TaskManager::TaskItem; +-using TaskManager::TaskGroup; +-using TaskManager::LauncherItem; +- + class TaskGroupItem; + class GroupManager; + + diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release-libre/PKGBUILD new file mode 100644 index 000000000..5eb411a97 --- /dev/null +++ b/libre/lsb-release-libre/PKGBUILD @@ -0,0 +1,34 @@ +# Parabola maintainer: Michał Masłowski +# $Id: PKGBUILD 22635 2010-07-25 20:05:28Z svenstaro $ +# Maintainer: Sven-Hendrik Haase +# Contributor: Malte Rabenseifner +# Contributor: John Gerritse + +_pkgname=lsb-release +pkgname=lsb-release-libre +pkgver=1.4 +pkgrel=10 +pkgdesc="LSB version query program with Parabola name" +arch=('any') +url="http://www.linuxbase.org/" +license=('GPL2') +provides=('lsb-release') +conflicts=('lsb-release') +replaces=('lsb-release') +install=lsb-release.install +source=(http://downloads.sourceforge.net/lsb/$_pkgname-$pkgver.tar.gz) +md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + install -dm755 "$pkgdir/etc" + echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-Libre\"" > "$pkgdir/etc/lsb-release" + + install -Dm 644 lsb_release.1.gz "$pkgdir/usr/share/man/man1/lsb_release.1.gz" + install -Dm 755 lsb_release "$pkgdir/usr/bin/lsb_release" +} diff --git a/libre/lsb-release-libre/lsb-release.install b/libre/lsb-release-libre/lsb-release.install new file mode 100644 index 000000000..6ce4fee54 --- /dev/null +++ b/libre/lsb-release-libre/lsb-release.install @@ -0,0 +1,12 @@ +post_install() { + echo "Parabola GNU/Linux-Libre release" >> /etc/arch-release +} + +post_upgrade() { + sed -e '/Parabola GNU\/Linux-Libre release/d' -i /etc/arch-release + echo "Parabola GNU/Linux-Libre release" >> /etc/arch-release +} + +pre_remove() { + sed -e '/Parabola GNU\/Linux-Libre release/d' -i /etc/arch-release +} diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD index aeab086d2..04d00d5de 100644 --- a/multilib/lib32-mesa/PKGBUILD +++ b/multilib/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58846 2011-11-18 21:09:53Z lcarlier $ +# $Id: PKGBUILD 59540 2011-11-27 22:56:07Z lcarlier $ # Contributor: Jan de Groot # Contributor: Andreas Radke @@ -16,7 +16,7 @@ if [ "${_git}" = "true" ]; then #pkgver=7.10.99.git20110709 pkgver=7.11 else - pkgver=7.11.1 + pkgver=7.11.2 fi pkgrel=1 @@ -33,7 +33,7 @@ if [ "${_git}" = "true" ]; then else source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2") #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2") - md5sums=('a77307102cee844ff6544ffa8fafeac1') + md5sums=('0837c52698fe3252369c3fdb5195afcc') fi build() { diff --git a/staging/boost/BOOST_FOREACH.patch b/staging/boost/BOOST_FOREACH.patch new file mode 100644 index 000000000..12cf08800 --- /dev/null +++ b/staging/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 // 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 ++ std::pair 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 ++ struct is_lightweight_proxy ++ : foreach::is_lightweight_proxy ++ {}; ++ ++ template ++ struct is_noncopyable ++ : foreach::is_noncopyable ++ {}; ++ ++} // 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 +-inline boost::foreach::is_lightweight_proxy * ++inline boost::BOOST_FOREACH::is_lightweight_proxy * + boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; } + +@@ -191,5 +191,5 @@ + // at the global namespace for your type. + template +-inline boost::foreach::is_noncopyable * ++inline boost::BOOST_FOREACH::is_noncopyable * + boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; } + diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD index 42d822a29..8d5114db2 100644 --- a/staging/boost/PKGBUILD +++ b/staging/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143220 2011-11-23 14:06:08Z ibiru $ +# $Id: PKGBUILD 143606 2011-11-27 10:46:32Z ibiru $ # Maintainer: kevin # Contributor: Giovanni Scafora # Contributor: Kritoke @@ -8,15 +8,17 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.48.0 _boostver=${pkgver//./_} -pkgrel=1 +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) + exceptions.patch + BOOST_FOREACH.patch) license=('custom') md5sums=('313a11e97eb56eb7efd18325354631be' - '9b44c28b36303152050c8c82469569c5') + '9b44c28b36303152050c8c82469569c5' + '2db6098a1a39bced4c6162eb46418320') _stagedir="${srcdir}/stagedir" @@ -27,9 +29,12 @@ build() { 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 - # http://web.archiveorange.com/archive/v/Q0J4VE5bwsy3zxRXqUgd cd "${srcdir}"/${pkgbase}_${_boostver} - patch -p0 -i "${srcdir}"/exceptions.patch + # 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" diff --git a/staging/wesnoth/PKGBUILD b/staging/wesnoth/PKGBUILD new file mode 100644 index 000000000..2bc7e7e97 --- /dev/null +++ b/staging/wesnoth/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 143610 2011-11-27 12:53:58Z ibiru $ +# Maintainer: Jan de Groot +# Contributor: Tobias Powalowski +# Contributor: Jacobo Arvelo +# Contributor: Douglas Soares de Andrade + +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/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/staging/wesnoth/wesnoth-1.8.6-boost-foreach.patch new file mode 100644 index 000000000..5aee3118c --- /dev/null +++ b/staging/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 ++ 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 + static W* find_at( + typename tconst_duplicator::type& +@@ -255,13 +266,9 @@ struct ttree_view_node_implementation + } + + typedef typename tconst_duplicator::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(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::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::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::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/staging/wesnoth/wesnoth-libpng-1.4.0.patch b/staging/wesnoth/wesnoth-libpng-1.4.0.patch new file mode 100644 index 000000000..be8adfcaa --- /dev/null +++ b/staging/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_NULL), +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, reinterpret_cast(NULL), ++ NULL, NULL); + if(!png_ptr) + throw exploder_failure("Unable to initialize the png write structure"); + diff --git a/staging/wesnoth/wesnoth.install b/staging/wesnoth/wesnoth.install new file mode 100644 index 000000000..4f1e419ae --- /dev/null +++ b/staging/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/staging/wesnoth/wesnoth.tmpfiles.conf b/staging/wesnoth/wesnoth.tmpfiles.conf new file mode 100644 index 000000000..3ec0f6013 --- /dev/null +++ b/staging/wesnoth/wesnoth.tmpfiles.conf @@ -0,0 +1 @@ +D /run/wesnothd 0700 root root - diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD new file mode 100644 index 000000000..f23b3ac41 --- /dev/null +++ b/testing/libevent/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143631 2011-11-27 20:54:04Z eric $ +# Maintainer: +# Contributor: Judd + +pkgname=libevent +pkgver=2.0.16 +pkgrel=1 +pkgdesc="An event notification library" +arch=('i686' 'x86_64') +url="http://www.monkey.org/~provos/libevent/" +license=('GPL2') +depends=('openssl') +optdepends=('python2: to use event_rpcgen.py') +options=('!libtool') +source=(https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz{,.asc}) +sha1sums=('9eb9fe3c0ec607525ed2dee6827687efcd0696ac' + '679023511db0106cb84a36e4ff78604d00d0a611') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + sed -i 's#python#python2#' event_rpcgen.py + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/perl/PKGBUILD b/testing/perl/PKGBUILD index 496ca3fdd..15aac3276 100644 --- a/testing/perl/PKGBUILD +++ b/testing/perl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143472 2011-11-24 17:03:10Z stephane $ +# $Id: PKGBUILD 143604 2011-11-27 10:03:52Z bluewind $ # Maintainer: Angel Velasquez # Contributor: kevin # Contributor: judd # Contributor: francois pkgname=perl pkgver=5.14.2 -pkgrel=3 +pkgrel=4 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -36,6 +36,10 @@ build() { # for i686 arch_opts="" fi + + # remove rpath FS#27173 + sed -i 's#xxx="-Wl,-rpath,$shrpdir"##' Configure + ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ -Dprivlib=/usr/share/perl5/core_perl \ @@ -53,6 +57,12 @@ build() { patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch make } + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make test +} + package() { # hack to work around makepkg running the subshell in check_sanity() new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .)) diff --git a/testing/startup-notification/PKGBUILD b/testing/startup-notification/PKGBUILD new file mode 100644 index 000000000..6f95eac59 --- /dev/null +++ b/testing/startup-notification/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 143629 2011-11-27 15:45:17Z andyrtr $ +# Maintainer: Jan de Groot +# Contributor: dorphell + +pkgname=startup-notification +pkgver=0.12 +pkgrel=2 +pkgdesc="Monitor and display application startup" +arch=(i686 x86_64) +license=('LGPL') +depends=('libx11' 'xcb-util>=0.3.8') +options=('!libtool') +url="http://www.freedesktop.org" +source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz) +md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e '/AC_PATH_XTRA/d' configure.in + autoreconf --force --install + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD new file mode 100644 index 000000000..f934dc9eb --- /dev/null +++ b/testing/vlc/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 143627 2011-11-27 15:45:14Z andyrtr $ +# Maintainer: Giovanni Scafora +# Contributor: Sarah Hay +# Contributor: Martin Sandsmark + +pkgname=vlc +pkgver=1.1.12 +pkgrel=5 +pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" +arch=('i686' 'x86_64') +url="http://www.videolan.org/vlc/" +license=('GPL') +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' 'xcb-util-keysyms' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') +makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' + 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' + 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' + 'lirc-utils' 'gnutls' 'libcaca') +optdepends=('avahi: for service discovery using bonjour protocol' + 'libnotify: for notification plugin' + 'ncurses: for ncurses interface support' + 'libdvdcss: for decoding encrypted DVDs' + 'lirc-utils: for lirc plugin' + 'libavc1394: for devices using the 1394ta AV/C' + 'libdc1394: for IEEE 1394 plugin' + 'kdelibs: KDE Solid hardware integration' + 'libpulse: PulseAudio support' + 'vdpau-video: vdpau back-end for nvidia' + 'libva-driver-intel: back-end for intel cards') +conflicts=('vlc-plugin') +replaces=('vlc-plugin') +backup=('usr/share/vlc/http/.hosts' + 'usr/share/vlc/http/dialogs/.hosts' + 'usr/share/vlc/lua/http/.hosts' + 'usr/share/vlc/lua/http/dialogs/.hosts') +options=('!libtool') +install=vlc.install +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'bp-set-channel-map-pulseaudio-1.0.patch') +md5sums=('91de1ad308c947e35380f9d747ff5713' + 'bae24e02207364d76a1a118644de484e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c + + patch -Np1 -i ${srcdir}/bp-set-channel-map-pulseaudio-1.0.patch + + ./configure --prefix=/usr \ + --disable-rpath \ + --enable-faad \ + --enable-v4l \ + --enable-snapshot \ + --enable-dbus-control \ + --enable-nls \ + --enable-lirc \ + --enable-pvr \ + --enable-ncurses \ + --with-live555-tree=/usr/lib/live \ + --enable-upnp \ + --enable-realrtsp + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install + + for res in 16 32 48 128; do + install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" + done +} diff --git a/testing/vlc/bp-set-channel-map-pulseaudio-1.0.patch b/testing/vlc/bp-set-channel-map-pulseaudio-1.0.patch new file mode 100644 index 000000000..e63b3f97b --- /dev/null +++ b/testing/vlc/bp-set-channel-map-pulseaudio-1.0.patch @@ -0,0 +1,33 @@ +From 15a821886296a8efe5f8b9015b6e9c5ae5e3ae79 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Tue, 11 Oct 2011 19:19:21 +0300 +Subject: Set channel map when using PulseAudio 1.0 + +(cherry picked from commit ca2cb5f01340252a85ad5bed877e84407f092b21) +--- + modules/audio_output/pulse.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c +index d67dc31..18ee280 100644 +--- a/modules/audio_output/pulse.c ++++ b/modules/audio_output/pulse.c +@@ -640,6 +640,7 @@ static int Open(vlc_object_t *obj) + formatv[formatc]->encoding = encoding; + pa_format_info_set_rate(formatv[formatc], ss.rate); + pa_format_info_set_channels(formatv[formatc], ss.channels); ++ pa_format_info_set_channel_map(formatv[formatc], &map); + formatc++; + } + +@@ -649,6 +650,7 @@ static int Open(vlc_object_t *obj) + pa_format_info_set_sample_format(formatv[formatc], ss.format); + pa_format_info_set_rate(formatv[formatc], ss.rate); + pa_format_info_set_channels(formatv[formatc], ss.channels); ++ pa_format_info_set_channel_map(formatv[formatc], &map); + formatc++; + + /* Create a playback stream */ +-- +1.7.4.1 + diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install new file mode 100644 index 000000000..dc4961cae --- /dev/null +++ b/testing/vlc/vlc.install @@ -0,0 +1,18 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib/vlc/plugins/plugins-*.dat +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} diff --git a/testing/xcb-util-image/LICENSE b/testing/xcb-util-image/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/testing/xcb-util-image/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/testing/xcb-util-image/PKGBUILD b/testing/xcb-util-image/PKGBUILD new file mode 100644 index 000000000..7d894c42d --- /dev/null +++ b/testing/xcb-util-image/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 143617 2011-11-27 15:45:02Z andyrtr $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-image +pkgver=0.3.8 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7' 'xcb-util>=0.3.8') +makedepends=('xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +md5sums=('245a96041f373b05764148e52d2e0211' + '2672c2e72dedb40f773e989dd622f298') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/xcb-util-keysyms/LICENSE b/testing/xcb-util-keysyms/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/testing/xcb-util-keysyms/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/testing/xcb-util-keysyms/PKGBUILD b/testing/xcb-util-keysyms/PKGBUILD new file mode 100644 index 000000000..a054f74e1 --- /dev/null +++ b/testing/xcb-util-keysyms/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 143619 2011-11-27 15:45:04Z andyrtr $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-keysyms +pkgver=0.3.8 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +md5sums=('c75bb20e709093580a67eaf263251b50' + '2672c2e72dedb40f773e989dd622f298') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/xcb-util-renderutil/LICENSE b/testing/xcb-util-renderutil/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/testing/xcb-util-renderutil/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/testing/xcb-util-renderutil/PKGBUILD b/testing/xcb-util-renderutil/PKGBUILD new file mode 100644 index 000000000..8b3dff810 --- /dev/null +++ b/testing/xcb-util-renderutil/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 143621 2011-11-27 15:45:06Z andyrtr $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-renderutil +pkgver=0.3.8 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - Convenience functions for the Render extension" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +md5sums=('b346ff598ee093c141f836fbc0f8f721' + '2672c2e72dedb40f773e989dd622f298') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/xcb-util-wm/LICENSE b/testing/xcb-util-wm/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/testing/xcb-util-wm/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/testing/xcb-util-wm/PKGBUILD b/testing/xcb-util-wm/PKGBUILD new file mode 100644 index 000000000..18724ea02 --- /dev/null +++ b/testing/xcb-util-wm/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 143623 2011-11-27 15:45:07Z andyrtr $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke + +pkgname=xcb-util-wm +pkgver=0.3.8 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding - " +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +md5sums=('dda47289bc846a6a3e07824e9ec3aef8' + '2672c2e72dedb40f773e989dd622f298') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/xcb-util/LICENSE b/testing/xcb-util/LICENSE new file mode 100644 index 000000000..5e3822ccd --- /dev/null +++ b/testing/xcb-util/LICENSE @@ -0,0 +1,267 @@ +/* Copyright (C) 2007 Bart Massey + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* + * Copyright (C) 2008-2009 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright (C) 2008 Arnaud Fontaine + * Copyright (C) 2007-2008 Vincent Torri + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + +/* + * Copyright © 2008 Bart Massey + * Copyright © 2008 Julien Danjou + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Keith Packard + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Bart Massey + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* + * Copyright © 2008 Ian Osgood + * Copyright © 2008 Jamey Sharp + * Copyright © 2008 Josh Triplett + * Copyright © 2008 Ulrich Eckhardt + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or + * their institutions shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from the authors. + */ + +/* Copyright © 2006 Jamey Sharp. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2006 Ian Osgood + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors or their + * institutions shall not be used in advertising or otherwise to promote the + * sale, use or other dealings in this Software without prior written + * authorization from the authors. + */ + +/* Copyright © 2000 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Keith Packard not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Keith Packard makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ diff --git a/testing/xcb-util/PKGBUILD b/testing/xcb-util/PKGBUILD new file mode 100644 index 000000000..6ad3a7c89 --- /dev/null +++ b/testing/xcb-util/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 143615 2011-11-27 15:44:59Z andyrtr $ +# Maintainer: Jan de Groot +# Maintainer: Andreas Radke +# Contributor: Andrea Scarpino + +pkgname=xcb-util +pkgver=0.3.8 +pkgrel=1 +pkgdesc="Utility libraries for XC Binding" +arch=('i686' 'x86_64') +url="http://xcb.freedesktop.org" +license=('custom') +depends=('libxcb>=1.7') +makedepends=('gperf' 'xorg-util-macros') +options=('!libtool') +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') +md5sums=('8ce019c4bbf20dce246b98f177cfccff' + '2672c2e72dedb40f773e989dd622f298') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD index ecbe65fb5..77f219841 100644 --- a/testing/xf86-video-intel/PKGBUILD +++ b/testing/xf86-video-intel/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 142914 2011-11-18 08:37:24Z andyrtr $ +# $Id: PKGBUILD 143625 2011-11-27 15:45:10Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-intel pkgver=2.17.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev) -makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender') +depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev') +makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-drivers' 'xorg') -- cgit v1.2.3-54-g00ecf