From c288a123dd9113afec1a1cc6a2d62fde30307cfa Mon Sep 17 00:00:00 2001 From: root Date: Wed, 2 Jan 2013 00:03:46 -0800 Subject: Wed Jan 2 00:03:46 PST 2013 --- community/ginac/PKGBUILD | 33 ++++----- community/ginac/ginac.install | 20 ++++++ core/patch/PKGBUILD | 17 +++-- ...1-initialize-data-structures-early-enough.patch | 81 ++++++++++++++++++++++ extra/cvsps/PKGBUILD | 13 ++-- extra/feh/PKGBUILD | 6 +- extra/libxcb/PKGBUILD | 5 +- extra/redland/PKGBUILD | 17 ++--- extra/sharutils/PKGBUILD | 8 +-- extra/uim/PKGBUILD | 6 +- extra/xfce4-terminal/PKGBUILD | 41 +++++++++++ extra/xfce4-terminal/xfce4-terminal.install | 13 ++++ pcr/libav-builder/PKGBUILD | 48 +++++++++++++ pcr/python2-renpy/ChangeLog | 32 +++++++++ pcr/python2-renpy/PKGBUILD | 66 ++++++++++++++++++ 15 files changed, 356 insertions(+), 50 deletions(-) create mode 100644 community/ginac/ginac.install create mode 100644 core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch create mode 100644 extra/xfce4-terminal/PKGBUILD create mode 100644 extra/xfce4-terminal/xfce4-terminal.install create mode 100644 pcr/libav-builder/PKGBUILD create mode 100644 pcr/python2-renpy/ChangeLog create mode 100644 pcr/python2-renpy/PKGBUILD diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD index b812f13dc..01c21fd7a 100644 --- a/community/ginac/PKGBUILD +++ b/community/ginac/PKGBUILD @@ -1,36 +1,33 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 174027 2013-01-02 02:57:17Z stephane $ +# Maintainer: Stéphane Gaudreault # Contributor: Thomas Baechler pkgname=ginac pkgver=1.6.2 -pkgrel=1 -pkgdesc='A library designed to allow the creation of integrated systems that embed symbolic manipulations.' +pkgrel=2 +pkgdesc="C++ library for symbolic calculations" arch=('i686' 'x86_64') -url='http://www.ginac.de' -license=('GPL') +url="http://www.ginac.de/" +license=("GPL") depends=('cln') makedepends=('transfig' 'doxygen' 'texlive-bin') -options=('!libtool') -source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2") -md5sums=('4cfdd286ab0c32981ec1c9c779e87eb9') +source=(http://www.ginac.de/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('c93913c4c543874b2ade4f0390030641be7e0c41') +options=(!libtool) +install=${pkgname}.install build() { - cd ginac-${pkgver} - - ./configure \ - --prefix=/usr - + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static make } check() { - cd ginac-${pkgver} - + cd "${srcdir}/${pkgname}-${pkgver}" make check } package() { - cd ginac-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/ginac/ginac.install b/community/ginac/ginac.install new file mode 100644 index 000000000..3de7910d0 --- /dev/null +++ b/community/ginac/ginac.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(ginac.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD index bd0f27666..5d7b9f06a 100644 --- a/core/patch/PKGBUILD +++ b/core/patch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167281 2012-09-29 22:30:14Z allan $ +# $Id: PKGBUILD 174021 2013-01-01 15:15:16Z foutrelis $ # Maintainer: Allan McRae # Contributor: judd pkgname=patch pkgver=2.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64') url="http://www.gnu.org/software/patch/patch.html" @@ -13,12 +13,21 @@ groups=('base-devel') depends=('glibc') makedepends=('ed') optdepends=('ed: for patch -e functionality') -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} + patch-2.7.1-initialize-data-structures-early-enough.patch) md5sums=('e9ae5393426d3ad783a300a338c09b72' - 'b12189e0de3cb2af25268441647ec517') + 'b12189e0de3cb2af25268441647ec517' + 'dc6367a7cd49933d4006c246789e98da') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # Fix segfault on non-numeric strip-count + # (also segfaults on nonexistent directory passed to -d) + # http://savannah.gnu.org/bugs/?37500 + patch -Np1 -i \ + $srcdir/patch-2.7.1-initialize-data-structures-early-enough.patch + ./configure --prefix=/usr make } diff --git a/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch b/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch new file mode 100644 index 000000000..046edc3d4 --- /dev/null +++ b/core/patch/patch-2.7.1-initialize-data-structures-early-enough.patch @@ -0,0 +1,81 @@ +From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Thu, 4 Oct 2012 12:33:09 +0200 +Subject: [PATCH] Initialize data structures early enough + +* src/patch.c (main): Initialize data structures early enough, before error +paths can access them. +* tests/bad-usage: Test bad command line usage. +* tests/Makefile.am (TESTS): Add bad-usage here. +--- + src/patch.c | 8 ++++---- + tests/Makefile.am | 1 + + tests/bad-usage | 18 ++++++++++++++++++ + 3 files changed, 23 insertions(+), 4 deletions(-) + create mode 100644 tests/bad-usage + +diff --git a/src/patch.c b/src/patch.c +index 828943b..0255fbb 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -150,6 +150,10 @@ main (int argc, char **argv) + else if ((version_control = getenv ("VERSION_CONTROL"))) + version_control_context = "$VERSION_CONTROL"; + ++ init_backup_hash_table (); ++ init_files_to_delete (); ++ init_files_to_output (); ++ + /* parse switches */ + Argc = argc; + Argv = argv; +@@ -162,10 +166,6 @@ main (int argc, char **argv) + if (make_backups | backup_if_mismatch) + backup_type = get_version (version_control_context, version_control); + +- init_backup_hash_table (); +- init_files_to_delete (); +- init_files_to_output (); +- + init_output (&outstate); + if (outfile) + outstate.ofp = open_outfile (outfile); +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 02fc6de..5cea52d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -20,6 +20,7 @@ TESTS = \ + asymmetric-hunks \ + backup-prefix-suffix \ + bad-filenames \ ++ bad-usage \ + concat-git-diff \ + copy-rename \ + corrupt-reject-files \ +diff --git a/tests/bad-usage b/tests/bad-usage +new file mode 100644 +index 0000000..022eeda +--- /dev/null ++++ b/tests/bad-usage +@@ -0,0 +1,18 @@ ++# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. ++# ++# Copying and distribution of this file, with or without modification, ++# in any medium, are permitted without royalty provided the copyright ++# notice and this notice are preserved. ++ ++. $srcdir/test-lib.sh ++ ++require_cat ++use_local_patch ++use_tmpdir ++ ++# ============================================================== ++ ++check 'patch -px || echo "status: $?"' < # Contributor: Jeff 'codemac' Mickey pkgname=cvsps -pkgver=3.2 +pkgver=3.4 pkgrel=1 pkgdesc="Generating 'patchset' information from a CVS repository" url="http://www.catb.org/esr/cvsps/" @@ -11,14 +11,11 @@ license=('GPL') arch=('i686' 'x86_64') depends=('zlib') makedepends=('asciidoc') -source=("http://www.catb.org/~esr/cvsps/cvsps-${pkgver}.tar.gz" - cvsps-buffer-overflow.patch) -md5sums=('4a00c4b0d504078268db7c6c68decc38' - '6cfe55ee7f1137f9d2e670502d8cc3c7') +source=("http://www.catb.org/~esr/cvsps/cvsps-${pkgver}.tar.gz") +md5sums=('5bdcc9e49e1837e8016cdd139fe05ce7') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 < ../cvsps-buffer-overflow.patch make prefix=/usr } diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 008db0424..f560cd9a9 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168900 2012-10-16 14:01:32Z bisson $ +# $Id: PKGBUILD 174012 2013-01-01 13:02:26Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andrea Scarpino # Contributor: dorphell # Contributor: Tom Newsom pkgname=feh -pkgver=2.7 +pkgver=2.8 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('25c3cf8af2d30b9cc176b36f2a78344ba9ae18f1') +sha1sums=('eeb251d5971cf07e632661ef0b514fc3b0c7aca6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index c6564337c..1bc3cab9e 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168376 2012-10-09 16:18:34Z andyrtr $ +# $Id: PKGBUILD 174025 2013-01-01 19:16:09Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=libxcb pkgver=1.9 -pkgrel=1 +pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xcb.freedesktop.org/" @@ -23,6 +23,7 @@ build() { PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr \ --enable-xinput \ + --enable-xkb \ --disable-static make } diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD index 2b6db16bd..174f9800e 100644 --- a/extra/redland/PKGBUILD +++ b/extra/redland/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 146481 2012-01-11 15:22:34Z stephane $ -# Maintainer: AndyRTR +# $Id: PKGBUILD 174023 2013-01-01 18:37:13Z andyrtr $ +# Maintainer: Tom Gundersen +# Contributor: AndyRTR # Contributor: Francois Charette pkgbase=redland epoch=1 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') -pkgver=1.0.15 -pkgrel=3 +pkgver=1.0.16 +pkgrel=1 url="http://librdf.org/" license=("GPL") arch=('i686' 'x86_64') -makedepends=('rasqal>=0.9.28' 'raptor>=2.0.6' 'db>=5.3' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +makedepends=('rasqal' 'raptor' 'db' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite') options=('!libtool') source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc} rpath.diff) -sha1sums=('e93d6fafaeebdf9f15a1044be6f4a88270f007af' - '3aeef38a7247ae33db6a0a19511ef4132240164b' - 'f5db05c925b6bcd6402d5abd75c648b137f069c7') +sha256sums=('d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd' + '2955af40eb2fbffa6e1ef28f7f1b7f607a3958478a5080896b878da96605246d' + '9ddf9f7581f5194d73ad908f3b26354c70d3079a7a87c8add8a0d0e4c6974fec') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD index c04443584..476573baa 100644 --- a/extra/sharutils/PKGBUILD +++ b/extra/sharutils/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 123635 2011-05-11 23:31:36Z bisson $ +# $Id: PKGBUILD 174014 2013-01-01 13:05:38Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Kevin Piche # Contributor: Tom Newsom pkgname=sharutils -pkgver=4.11.1 +pkgver=4.13 pkgrel=1 pkgdesc='Makes so-called shell archives out of many files' url='http://www.gnu.org/software/sharutils/' license=('GPL') arch=('i686' 'x86_64') depends=('perl' 'gettext' 'texinfo') -source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('e9c9f869f8ecb3bcb30cc323e02e0a1266aeb109') +source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('8c1531846bc397c2afbbbf2ca33c8d5fd78bbc3d') install=install diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index 55eed0040..6fb42cc48 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167322 2012-10-01 01:53:47Z bisson $ +# $Id: PKGBUILD 174018 2013-01-01 13:24:02Z bisson $ # Maintainer: Gaetan Bisson # Contributor: damir pkgname=uim -pkgver=1.8.3 +pkgver=1.8.4 pkgrel=1 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' @@ -17,7 +17,7 @@ optdepends=('qt: immodule and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('4f63836935051d52b9194572afb904892fe89595') +sha1sums=('4f40912e4d4a85d9967044caef9e1ef349f3d6f2') install=install diff --git a/extra/xfce4-terminal/PKGBUILD b/extra/xfce4-terminal/PKGBUILD new file mode 100644 index 000000000..28ae7e7f7 --- /dev/null +++ b/extra/xfce4-terminal/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 174007 2013-01-01 12:50:48Z foutrelis $ +# Maintainer: Evangelos Foutras +# Contributor: tobias +# Contributor: Aurelien Foret + +pkgname=xfce4-terminal +pkgver=0.6.1 +pkgrel=1 +pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment" +arch=('i686' 'x86_64') +url="http://www.xfce.org/" +license=('GPL2') +groups=('xfce4') +depends=('libxfce4ui' 'vte' 'hicolor-icon-theme') +makedepends=('intltool') +conflicts=('terminal') +replaces=('terminal') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2) +sha256sums=('61346427e55af79e86511572bfabb2e025cb13720879226ea1b98a92f0bcd4c8') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-terminal/xfce4-terminal.install b/extra/xfce4-terminal/xfce4-terminal.install new file mode 100644 index 000000000..e4f8fd06c --- /dev/null +++ b/extra/xfce4-terminal/xfce4-terminal.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD new file mode 100644 index 000000000..372243b2a --- /dev/null +++ b/pcr/libav-builder/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer (Parabola): Márcio Silva + +static=false +pkgbase=libav +if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then + pkgname=libav-static-builder +elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then + pkgname=libav-builder +fi +pkgflag=builder +pkgver=0.8.4 +pkgrel=1 +pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)" +arch=any +url="http://$pkgbase.org/" +license=GPL +depends=${pkgname%-$pkgflag}=$pkgver +conflicts=( + ffmpeg + ffmpeg-static +) +if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then + conflicts+=( + ${pkgname%-static-$pkgflag} + ) +elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then + conflicts+=( + ${pkgname%-$pkgflag}-static + ) +fi + +package() { + install -m755 -d $pkgdir/usr/{include,lib{,/pkgconfig}} + include_list=$(ls /opt/${pkgname%-$pkgflag}/include) + for i in $include_list; do + ln -s /opt/${pkgname%-$pkgflag}/include/$i $pkgdir/usr/include + done + lib_list=$(ls /opt/${pkgname%-$pkgflag}/lib | grep lib) + for l in $lib_list; do + ln -s /opt/${pkgname%-$pkgflag}/lib/$l $pkgdir/usr/lib + done + pkgconfig_list=$(ls /opt/${pkgname%-$pkgflag}/lib/pkgconfig) + for c in $pkgconfig_list; do + ln -s /opt/${pkgname%-$pkgflag}/lib/pkgconfig/$c $pkgdir/usr/lib/pkgconfig + done +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/python2-renpy/ChangeLog b/pcr/python2-renpy/ChangeLog new file mode 100644 index 000000000..0a357d3db --- /dev/null +++ b/pcr/python2-renpy/ChangeLog @@ -0,0 +1,32 @@ +2012-28-07 AlexanderR + + * 6.14.1-1 : + new upstream release. + added renpy.diff. + +2012-22-07 AlexanderR + + * 6.13.12-3 : + fixed build with latest ffmpeg at cost of sound. + +2012-26-04 AlexanderR + + * 6.13.12-2 : + moved python-pygame from makedepends to depends. + +2012-20-04 AlexanderR + + * 6.13.12-1 : + new upstream release. + +2012-07-04 AlexanderR + + * 6.13.11-1 : + new upstream release. + moved python-pygame dependency form renpy to python-renpy. + +2011-22-03 AlexanderR + + * 16.13.9-2 : + added ChangeLog. + fixed corrupted images, caused by gcc optimization. diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD new file mode 100644 index 000000000..4d6611548 --- /dev/null +++ b/pcr/python2-renpy/PKGBUILD @@ -0,0 +1,66 @@ +# Maintainer: AlexanderR +# Contributor: zhn +# Maintainer (Parabola): André Silva +# Maintainer (Parabola): Márcio Silva + +pkgname=python2-renpy +pkgflag=renpy +pkgver=6.14.1 +pkgrel=3 +pkgdesc="Platform-dependant Ren'Py libraries." +arch=( + i686 + x86_64 + mips64el +) +license=MIT +url="http://www.$pkgflag.org/" +depends=( + fribidi + glew + libav + libgl + python2-pygame +) +# python-argparse is part of distribution since 2.7 +makedepends=( + cython2 + libav-builder # to solve libav deps + mesa + 'python2>=2.7' +) +options=!buildflags +provides="python-$pkgflag=$pkgver" +conflicts=( + python-$pkgflag + "$pkgflag<$pkgver" + $pkgflag64 + $pkgflag-bin +) +renplaces=python-$pkgflag +changelog=ChangeLog +source=( + "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2" +) + +md5sums=( + 16814530ba9ce1f2968bb8c8c785651b +) + +build() { + cd $srcdir/$pkgflag-$pkgver-source + + sed -i -e ' + s#!/usr/bin/env python#!/usr/bin/env python2#; + ' module/setup.py + + CFLAGS=-Os setarch $CARCH python2 module/setup.py build +} + +package(){ + cd $srcdir/$pkgflag-$pkgver-source + + # install python2-$pkgflag + CFLAGS=-Os setarch $CARCH python2 module/setup.py install --root=$pkgdir/ --prefix=/usr --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE +} -- cgit v1.2.3-54-g00ecf