diff options
59 files changed, 749 insertions, 185 deletions
diff --git a/community-staging/haskell-cairo/PKGBUILD b/community-staging/haskell-cairo/PKGBUILD new file mode 100644 index 000000000..d07e9f435 --- /dev/null +++ b/community-staging/haskell-cairo/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 76138 2012-09-12 04:01:58Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-cairo +pkgver=0.12.3.1 +pkgrel=2 +pkgdesc="Binding to the cairo library for Gtk2Hs." +url="http://hackage.haskell.org/package/cairo" +license=('LGPL2.1') +arch=('i686' 'x86_64') +depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1') +makedepends=("gtk2hs-buildtools") +options=('strip') +conflicts=('gtk2hs-cairo') +provides=('gtk2hs-cairo') +replaces=('gtk2hs-cairo') +install=gtk2hs-cairo.install +source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) +md5sums=('9d489fbb6cadb3d109543fe25c50195e') + +build() { + cd ${srcdir}/cairo-$pkgver + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/cairo-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community-staging/haskell-cairo/gtk2hs-cairo.install b/community-staging/haskell-cairo/gtk2hs-cairo.install new file mode 100644 index 000000000..4ec5096b6 --- /dev/null +++ b/community-staging/haskell-cairo/gtk2hs-cairo.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/gtk2hs-cairo +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index cbe9e65f0..311d94ec8 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74503 2012-07-29 19:34:09Z lcarlier $ +# $Id: PKGBUILD 76167 2012-09-12 12:38:26Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.99.12 +pkgver=1.99.13 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." @@ -15,7 +15,7 @@ makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) install=chmsee.install -md5sums=('6cce2f994867fbe8a637a129c721546b' +md5sums=('6ea077c593bdadaafb278cce9165fba2' '242a9390bc943cc38237fa71137fb26c') build() { diff --git a/community/chuck/PKGBUILD b/community/chuck/PKGBUILD index 5cb5634ab..fa6383f90 100644 --- a/community/chuck/PKGBUILD +++ b/community/chuck/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75637 2012-08-27 21:34:19Z arodseth $ +# $Id: PKGBUILD 76163 2012-09-12 11:20:01Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Laurent Carlier <lordheavym@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -7,31 +7,22 @@ # Contributor: tardo <tardo@nagi-fanboi.net> pkgname=chuck -pkgver=1.3.0.0 +pkgver=1.3.1.0 pkgrel=1 pkgdesc="Concurrent, on-the-fly audio programming language" arch=('x86_64' 'i686') url="http://chuck.cs.princeton.edu/" license=('GPL') depends=('gcc-libs' 'libsndfile') -makedepends=('bison' 'flex' 'setconf') +# base-devel +#makedepends=('bison' 'flex') source=("http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz") -sha256sums=('80bfc6ab3017c8183fe7640eca94bcb314cf4cdb1c4b70cc3abb67b4d88ff111') - -if [[ $CARCH == x86_64 ]]; then - depends=('gcc-libs-multilib' 'lib32-libsndfile' 'lib32-alsa-lib') - makedepends+=('gcc-multilib') -fi +sha256sums=('43af7e06f06932cd3afde9facb17c83530e0fa45826b1f3ea04496f10f009d0a') build() { cd "$srcdir/$pkgname-$pkgver/src" msg2 "Configuring..." - if [[ $CARCH == x86_64 ]]; then - setconf makefile CC 'gcc -m32' - setconf makefile CXX 'g++ -m32' - setconf makefile LD 'g++ -m32' - fi CFLAGS+=' -fno-strict-aliasing -lpthread' CXXFLAGS+=' -fno-strict-aliasing -fpermissive -lpthread' diff --git a/community/emacs-nox/PKGBUILD b/community/emacs-nox/PKGBUILD index 69fac4ce8..dc61fe518 100644 --- a/community/emacs-nox/PKGBUILD +++ b/community/emacs-nox/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 72353 2012-06-12 21:10:00Z jlichtblau $ +# $Id: PKGBUILD 76185 2012-09-12 20:05:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Chris Brannon <cmbrannon@cox.net> pkgname=emacs-nox -pkgver=24.1 +pkgver=24.2 pkgrel=1 pkgdesc="The Emacs Editor, without X11 support" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL') +license=('GPL3') depends=('dbus-core' 'ncurses' 'perl') provides=('emacs') conflicts=('emacs' 'emacs-cvs') @@ -16,7 +16,7 @@ options=('docs') changelog=$pkgname.changelog install=$pkgname.install source=(ftp://ftp.gnu.org/gnu/emacs/emacs-${pkgver}.tar.gz) -sha256sums=('60d26dd1d9c0b955543ae83a2f4dd7c8b6af59e16a06822cfb175f1bf97c8bab') +sha256sums=('6d9892dff6e1761d4a5eba20712beba4f37d77a196f8021081a2e69fcb5bd357') build() { cd ${srcdir}/emacs-$pkgver diff --git a/community/emacs-nox/emacs-nox.changelog b/community/emacs-nox/emacs-nox.changelog index 5e4d8f206..9fe1ae221 100644 --- a/community/emacs-nox/emacs-nox.changelog +++ b/community/emacs-nox/emacs-nox.changelog @@ -1,3 +1,6 @@ +2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * emacs-nox 24.2-1 + 2012-06-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * emacs-nox 24.1-1 diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD index 8974c2774..9552e8e0d 100644 --- a/community/gmerlin-avdecoder/PKGBUILD +++ b/community/gmerlin-avdecoder/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66296 2012-02-23 13:44:15Z allan $ +# $Id: PKGBUILD 76151 2012-09-12 05:56:57Z ebelanger $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin-avdecoder -pkgver=1.1.0 -pkgrel=5 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Media decoding library" arch=('i686' 'x86_64') url="http://gmerlin.sourceforge.net/avdec_frame.html" @@ -11,7 +11,7 @@ license=('GPL') depends=('gmerlin' 'openjpeg' 'flac' 'smbclient' 'libmad' 'libmpcdec' 'speex' 'libdca' 'libmpeg2' 'a52dec') source=(http://downloads.sourceforge.net/sourceforge/gmerlin/gmerlin-avdecoder-$pkgver.tar.gz) -md5sums=('c1ea663e9da631453eec4ac79138b6c5') +md5sums=('37b19266b098d9d05bb05ebef138ffbd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 433af970c..84b919bc2 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66294 2012-02-23 13:44:07Z allan $ +# $Id: PKGBUILD 76142 2012-09-12 05:13:57Z ebelanger $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin -pkgver=1.0.0 -pkgrel=6 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64') url="http://openmovieeditor.sourceforge.net/HomePage" @@ -17,17 +17,14 @@ optdepends=('alsa-lib: for ALSA support' 'v4l-utils: for video conversion') options=('!libtool' '!makeflags') install=gmerlin.install -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - libpng.patch) -md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6' - 'c262023434246705296d97bc7337a212') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('2f2a0880e738e71486f04c929ba067f4') build() { cd "$srcdir/$pkgname-$pkgver" rm -rf cpuinfo.sh - patch -p1 -i "$srcdir/libpng.patch" ./configure --prefix=/usr --without-doxygen sed -i 's|LIBS = -lgavl|LIBS = -lgavl -ldl -lpthread -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11|' {lib,tests,apps/*}/Makefile sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile diff --git a/community/gnonlin/PKGBUILD b/community/gnonlin/PKGBUILD index 26ec96b05..8a7bde9c5 100644 --- a/community/gnonlin/PKGBUILD +++ b/community/gnonlin/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 76128 2012-09-11 20:32:33Z arodseth $ +# $Id: PKGBUILD 76165 2012-09-12 12:34:14Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=gnonlin -pkgver=0.10.16 -pkgrel=3 +pkgver=0.10.17 +pkgrel=1 pkgdesc='Library for creating non-linear video editors' arch=('x86_64' 'i686') url='http://gnonlin.sourceforge.net/' @@ -15,7 +15,7 @@ makedepends=('python' 'gstreamer0.10-base-plugins>=0.10.36' 'pkgconfig') options=('!libtool') license=('LGPL') source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2") -sha256sums=('0d32028d449c304bc8d467d02c053c64988b2fc5bbeb020c13361f9d7206bbf5') +sha256sums=('e4a2dd8af1c0c97f2f63e918a25c26e871c896e88b7ee85948509f68f29e8935') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/ico2xpm/PKGBUILD b/community/ico2xpm/PKGBUILD index 1f990376d..ac06c0ef4 100644 --- a/community/ico2xpm/PKGBUILD +++ b/community/ico2xpm/PKGBUILD @@ -1,15 +1,17 @@ +# $Id: PKGBUILD 76155 2012-09-12 10:40:28Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ico2xpm -pkgver=1.2 -pkgrel=2 +pkgver=1.3 +pkgrel=1 pkgdesc="A utility which converts Windows icons into X pixmaps" arch=('i686' 'x86_64') url="http://ico2xpm.sourceforge.net/" license=('GPL') -source=(http://downloads.sourceforge.net/ico2xpm/1.2/ico2xpm-1_2-src.tar.gz) -md5sums=('b3dbe027e2420ee33e57d67140f40896') +source=(http://downloads.sourceforge.net/ico2xpm/$pkgver/ico2xpm-${pkgver/./_}-src.tar.gz) +md5sums=('fbae5631281cb6b48ca31f78bbbcba85') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/icoutils/PKGBUILD b/community/icoutils/PKGBUILD index 8f8813cbd..50156744e 100644 --- a/community/icoutils/PKGBUILD +++ b/community/icoutils/PKGBUILD @@ -1,17 +1,19 @@ +# $Id: PKGBUILD 76157 2012-09-12 10:41:13Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: neodreams <yanbrodeur@videotron.ca> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=icoutils -pkgver=0.29.1 -pkgrel=2 +pkgver=0.30.0 +pkgrel=1 pkgdesc='Extracts and converts images in MS Windows(R) icon and cursor files.' arch=('i686' 'x86_64') license=('GPL') url='http://www.nongnu.org/icoutils/' depends=('libpng>=1.0.0' 'perl-libwww>=5.64') source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b58f375e0f8731595e8d0ecdc3a0acb9') +md5sums=('2574eb4ff5c0d3b2a59ad5a7d8848ced') build() { cd ${pkgname}-${pkgver} diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index 5b7a43d0c..43801f6af 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71743 2012-06-02 10:29:04Z bluewind $ +# $Id: PKGBUILD 76159 2012-09-12 10:42:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Edward Tjörnhammar <xhemi@cube2.se> # Contributor: Edward Tjörnhammar <xhemi@cube2.se> pkgname=inn -pkgver=2.5.2 -pkgrel=10 +pkgver=2.5.3 +pkgrel=1 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64') @@ -51,12 +51,14 @@ source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz nnrpd.rc innd.conf nnrpd.conf + innd.service site.make.patch) -md5sums=('a6e577dceb90d07501b96149508b974b' +md5sums=('353fe95232828ddbc80debff86c240bc' 'a243d9498568f1beee20da5684b5fbfc' 'a0b1ff8501ac8a31ce81a2f9c9b4bac9' 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a' 'bb4bbe86ae52fbbf08b0f6f370dea052' + '9da925a486fcf0cd67fdf462cbb9c0b4' '960c800026ed6e03901cf0bafdfd53d8') build() { @@ -129,4 +131,6 @@ package() { install -D -m0644 $srcdir/inn-$pkgver/LICENSE $pkgdir/usr/share/licenses/inn/LICENSE chown root:root $pkgdir/usr/bin/innbind chmod 05555 $pkgdir/usr/bin/innbind + + install -Dm0644 $srcdir/innd.service $pkgdir/usr/lib/systemd/system/innd.service } diff --git a/community/inn/innd.service b/community/inn/innd.service new file mode 100644 index 000000000..724baf90c --- /dev/null +++ b/community/inn/innd.service @@ -0,0 +1,16 @@ +[Unit] +Description=Inetnet News Daemon +After=syslog.target network.target +ConditionPathExists=/etc/inn/inn.conf + +[Service] +User=news +PermissionsStartOnly=true +PIDFile=/run/inn/innd.pid +Type=forking +ExecStart=/usr/bin/rc.news +ExecStop=/bin/su -m news -c '/usr/bin/rc.news stop' +KillMode=control-group + +[Install] +WantedBy=multi-user.target diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD index 483de0ef1..de2f86f20 100644 --- a/community/jansson/PKGBUILD +++ b/community/jansson/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62893 2012-01-28 22:13:43Z kkeen $ +# $Id: PKGBUILD 76140 2012-09-12 04:02:41Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dave Reisner <d@falconindy.com> pkgname=jansson -pkgver=2.3 +pkgver=2.3.1 pkgrel=1 pkgdesc='C library for encoding, decoding and manipulating JSON data' arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url='http://www.digip.org/jansson/' depends=('glibc') license=('MIT') options=('!libtool') -source=("$url/releases/$pkgname-$pkgver.tar.bz2") -md5sums=('9f322b4b43b1b4f38473c52b49dabf99') +source=("http://www.digip.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2") +md5sums=('fb529b7d96162950f2123dca8704c4c6') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/mayavi/PKGBUILD b/community/mayavi/PKGBUILD index 4e9fcafc9..888251cd7 100644 --- a/community/mayavi/PKGBUILD +++ b/community/mayavi/PKGBUILD @@ -1,31 +1,64 @@ -# $Id: PKGBUILD 75627 2012-08-27 16:59:37Z aginiewicz $ +# $Id: PKGBUILD 76178 2012-09-12 16:35:27Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> pkgname=mayavi pkgver=4.2.0 _githubtag=a1e562a -pkgrel=2 +pkgrel=4 pkgdesc="A 3-dimensional visualizer of scientific data" arch=('i686' 'x86_64') url="http://code.enthought.com/projects/mayavi/" license=('BSD') depends=('ipython2' 'vtk' 'python2-envisage' 'wxpython') -makedepends=('python2-distribute' 'python2-sphinx') +makedepends=('python2-distribute' 'python2-sphinx' 'xorg-server-xvfb' 'twisted') replaces=('python2-mayavi') provides=('python2-mayavi') options=(!emptydirs) -source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/tarball/${pkgver}") -md5sums=('b46fb048176002738de64eed8d2b447a') +source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/tarball/${pkgver}" + vtk-5.10.patch) +md5sums=('b46fb048176002738de64eed8d2b447a' + '01b8375392b5d3f587e81ba388a8089f') build() { cd "$srcdir"/enthought-mayavi-${_githubtag} - python2 setup.py build + # Add compatibility for vtk 5.10 (FS#31498) + patch -p1 < ../vtk-5.10.patch + + # Use python2-sphinx provided sphinx-build2 + sed -i -e 's/sphinx-build/sphinx-build2/' docs/Makefile* + + # Fix distutils compatibility + sed -i -e 's/distutils.Version/distutils.version/' mayavi/modules/text.py + sed -i -e 's/distutils.Version/distutils.version/' tvtk/tools/mlab.py - cd docs + # set path so autodoc can find just built modules + echo "sys.path.append('$srcdir/enthought-mayavi-${_githubtag}/build/lib.linux-$CARCH-2.7/')" >> docs/source/mayavi/conf.py + mkdir -p build/lib.linux-$CARCH-2.7/{tvtk/plugins/scene,mayavi/preferences,mayavi/core} + ln -s "$srcdir"/enthought-mayavi-${_githubtag}/tvtk/tvtk_classes.zip \ + build/lib.linux-$CARCH-2.7/tvtk/tvtk_classes.zip + ln -s "$srcdir"/enthought-mayavi-${_githubtag}/mayavi/preferences/preferences.ini \ + build/lib.linux-$CARCH-2.7/mayavi/preferences/preferences.ini + ln -s "$srcdir"/enthought-mayavi-${_githubtag}/tvtk/plugins/scene/preferences.ini \ + build/lib.linux-$CARCH-2.7/tvtk/plugins/scene/preferences.ini + ln -s "$srcdir"/enthought-mayavi-${_githubtag}/mayavi/core/lut \ + build/lib.linux-$CARCH-2.7/mayavi/core/lut + + # now this is ugly, but docs do not build without X. We setup X according to: + # http://docs.enthought.com/mayavi/mayavi/tips.html#rendering-using-the-virtual-framebuffer + export DISPLAY=:69 + Xvfb $DISPLAY & + + # build! + python2 setup.py build - make SPHINXBUILD=sphinx-build2 html + # have to kill the server to proceed, and do other cleanup + kill `cat /tmp/.X${DISPLAY/:/}-lock` + rm build/lib.linux-$CARCH-2.7/tvtk/tvtk_classes.zip + rm build/lib.linux-$CARCH-2.7/mayavi/preferences/preferences.ini + rm build/lib.linux-$CARCH-2.7/tvtk/plugins/scene/preferences.ini + rm build/lib.linux-$CARCH-2.7/mayavi/core/lut } package() { diff --git a/community/mayavi/vtk-5.10.patch b/community/mayavi/vtk-5.10.patch new file mode 100644 index 000000000..34fbbcf34 --- /dev/null +++ b/community/mayavi/vtk-5.10.patch @@ -0,0 +1,83 @@ +From e61d4afa02072b48a332c7250b293704f57c6b2a Mon Sep 17 00:00:00 2001 +From: "mluessi@nmr.mgh.harvard.edu" <mluessi@nmr.mgh.harvard.edu> +Date: Mon, 9 Jul 2012 17:48:20 -0400 +Subject: [PATCH 01/13] FIX: version comp. for VTK 5.10 + +--- + mayavi/modules/text.py | 8 +++++--- + tvtk/tools/mlab.py | 5 +++-- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/mayavi/modules/text.py b/mayavi/modules/text.py +index 1fcc0e0..d1c79c0 100644 +--- a/mayavi/modules/text.py ++++ b/mayavi/modules/text.py +@@ -5,6 +5,8 @@ + # Copyright (c) 2005, Enthought, Inc. + # License: BSD Style. + ++from distutils.Version import StrictVersion ++ + # Enthought library imports. + from traits.api import Instance, Range, Str, Bool, Property, \ + Float +@@ -16,7 +18,7 @@ from apptools.persistence import state_pickler + from mayavi.core.module import Module + from mayavi.core.pipeline_info import PipelineInfo + +-VTK_VER = float(tvtk.Version().vtk_version[:3]) ++VTK_VER = StrictVersion(tvtk.Version().vtk_version) + + + ###################################################################### +@@ -68,7 +70,7 @@ class Text(Module): + ######################################## + # The view of this object. + +- if VTK_VER > 5.1: ++ if VTK_VER > '5.1': + _text_actor_group = Group(Item(name='visibility'), + Item(name='text_scale_mode'), + Item(name='alignment_point'), +@@ -152,7 +154,7 @@ class Text(Module): + set the `actors` attribute up at this point. + """ + actor = self.actor = tvtk.TextActor(input=str(self.text)) +- if VTK_VER > 5.1: ++ if VTK_VER > '5.1': + actor.set(text_scale_mode='prop', width=0.4, height=1.0) + else: + actor.set(scaled_text=True, width=0.4, height=1.0) +diff --git a/tvtk/tools/mlab.py b/tvtk/tools/mlab.py +index 8262da0..dfe9230 100644 +--- a/tvtk/tools/mlab.py ++++ b/tvtk/tools/mlab.py +@@ -92,6 +92,7 @@ functions:: + # Copyright (c) 2005-2007, Enthought, Inc. + # License: BSD Style. + ++from distutils.Version import StrictVersion + + import numpy + +@@ -107,7 +108,7 @@ from tvtk.tools import ivtk + # Set this to False to not use LOD Actors. + USE_LOD_ACTOR = True + +-VTK_VER = float(tvtk.Version().vtk_version[:3]) ++VTK_VER = StrictVersion(tvtk.Version().vtk_version) + + ###################################################################### + # Utility functions. +@@ -639,7 +640,7 @@ class Title(MLabBase): + super(Title, self).__init__(**traits) + + ta = self.text_actor +- if VTK_VER > 5.1: ++ if VTK_VER > '5.1': + ta.set(text_scale_mode='prop', height=0.05, input=self.text) + else: + ta.set(scaled_text=True, height=0.05, input=self.text) +-- +1.7.12 + diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 9ab64b439..066c0c47d 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75455 2012-08-24 19:14:55Z bpiotrowski $ +# $Id: PKGBUILD 76180 2012-09-12 17:56:42Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,18 +8,17 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.8.8 +pkgver=0.8.9 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' license=('MIT') -depends=('python2') +depends=('openssl' 'python2') #'v8') checkdepends=('curl') # curl used for check() -optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('f4dae84e96a94b768404c14633bccd49') +md5sums=('5470b3951a3b2684cfa71027801bd19d') build() { cd node-v${pkgver} @@ -33,7 +32,10 @@ build() { ./configure \ --prefix=/usr \ - --shared-openssl + --shared-openssl \ +# --shared-v8 \ +# --shared-v8-libpath=/usr/lib \ +# --shared-v8-includes=/usr/include make } diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD index d2599af3b..62c4f17c0 100644 --- a/community/pinot/PKGBUILD +++ b/community/pinot/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 74840 2012-08-06 23:09:24Z andrea $ +# $Id: PKGBUILD 76182 2012-09-12 19:21:50Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=pinot -pkgver=1.0 -pkgrel=2 +pkgver=1.01 +pkgrel=1 pkgdesc='Personal search and metasearch tool' arch=('i686' 'x86_64') url='http://code.google.com/p/pinot-search/' @@ -26,7 +26,7 @@ options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha256sums=('d1f5ac17022014c5a29ba1e6d95fc39bcf254338a4e0bfe84bf16558d219e2e2') +sha256sums=('a2a82009db05ca7abb4ffbd8baafa8fb820a7e961fd3cdcb21af46bb05eb57d4') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/community/pinot/pinot.changelog b/community/pinot/pinot.changelog index 770a1ef0a..ab865bc42 100644 --- a/community/pinot/pinot.changelog +++ b/community/pinot/pinot.changelog @@ -1,3 +1,6 @@ +2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * pinot 1.01-1 + 2012-07-31 Eric Belanger <eric@archlinux.org> * pinot 1.0-2 : Rebuild against exiv2 0.23, Add boost-libs depends diff --git a/community/ristretto/PKGBUILD b/community/ristretto/PKGBUILD index 9771da10f..edb1a60bf 100644 --- a/community/ristretto/PKGBUILD +++ b/community/ristretto/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 75057 2012-08-13 06:21:47Z bpiotrowski $ +# $Id: PKGBUILD 76146 2012-09-12 05:39:43Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ristretto pkgver=0.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="A fast and lightweight picture-viewer for Xfce" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/applications/ristretto" license=('GPL') depends=('libxfce4ui' 'libexif' 'desktop-file-utils') makedepends=('intltool') +optdepends=('librsvg: SVG support') groups=('xfce4-goodies') install=ristretto.install -source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2") +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) md5sums=('6b8c9a5d7ed319e4c84a9fefaa18792c') build() { - cd "${srcdir}/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -27,6 +28,6 @@ build() { } package() { - cd "${srcdir}/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 18c3ee0bd..a35c01a4a 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 163513 2012-07-14 13:07:23Z allan $ +# $Id: PKGBUILD 166572 2012-09-12 13:25:27Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod -pkgver=9 -pkgrel=2 +pkgver=10 +pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' license=('GPL2') depends=('glibc' 'zlib') +makedepends=('gtk-doc') options=('!libtool') provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') -install=kmod.install source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" "depmod-search.conf") -md5sums=('c8ae2d2694fbca2b28e238b30543a0cd' +md5sums=('e2a883c4df15a50f78a7a61d5b64089f' 'dd62cbf62bd8f212f51ef8c43bec9a77') build() { @@ -24,8 +24,8 @@ build() { ./configure \ --sysconfdir=/etc \ - --with-zlib \ - --with-rootprefix=/usr + --enable-gtk-doc \ + --with-zlib make } diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index 0eba01797..a567d0e8f 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,15 +1,12 @@ -# $Id: PKGBUILD 164067 2012-07-26 15:21:52Z bisson $ +# $Id: PKGBUILD 166603 2012-09-12 22:39:35Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> pkgname=bind - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.1.P2 -_pkgver=9.9.1-P2 +_pkgver=9.9.1-P3 +pkgver=${_pkgver//-/.} pkgrel=1 - pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' url='http://www.isc.org/software/bind/' license=('custom:ISC') @@ -26,13 +23,13 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7' +sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799' 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' '18f477f510df31e6c6f547ee2d5fc46e973479bf' '46232e9db243c6c05e170a1781d7a7f413be5d03' '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' '7848edbfb9a848843f57c11c02b0289eefd42d00' - '05fb2346a30dee2f99c40914dd23708729839b64' + '7de92fff4b90c4821b3b133a05affd186fb93951' '9ffb5c3f72390a517aeae557e32349d5d278cb63' '76a0d4cd1b913db177a5a375bebc47e5956866ec' '53be0f1437ebe595240d8dbdd819939582b97fb9') diff --git a/extra/bind/named.service b/extra/bind/named.service index 77196f785..c21f13f4b 100644 --- a/extra/bind/named.service +++ b/extra/bind/named.service @@ -1,5 +1,6 @@ [Unit] Description=Internet domain name server +After=network.target [Service] ExecStart=/usr/sbin/named -f -u named diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index 83b4b65f6..31c4f34df 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 156718 2012-04-23 09:03:54Z ibiru $ +# $Id: PKGBUILD 166581 2012-09-12 17:27:00Z jgc $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou -pkgver=0.4.2 +pkgver=0.4.4 pkgrel=1 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." arch=('i686' 'x86_64') url="http://live.gnome.org/Caribou" license=('LGPL') depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('intltool' 'docbook-xsl') install=caribou.install options=(!libtool !emptydirs) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('bcc64498b20c368747c3630d501a66ccf904db15d855f33fd4f963b5b19723ad') +sha256sums=('823c53afec88d43f06ddce63e0d1aac79d783f498502a0617d8be0cffc6a7de2') build() { cd $pkgname-$pkgver diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index 6142187df..42e234dc9 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 163748 2012-07-19 02:30:56Z eric $ +# $Id: PKGBUILD 166605 2012-09-12 22:49:29Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.2.5 +pkgver=4.2.6 pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" license=('GPL') -makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' \ +makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' 'wget' \ 'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant') source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz) -sha1sums=('5fcadf1436f6a1010802449f6ef162cf21fdfccb') +sha1sums=('3abc1d5f8725b7e700b347d1ba19b4f40ba7be14') build() { cd "${srcdir}" @@ -22,6 +22,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_OPENCC=OFF \ + -DFORCE_PRESAGE=ON \ -DENABLE_TEST=ON \ -DENABLE_GTK3_IM_MODULE=ON \ -DENABLE_QT_IM_MODULE=ON @@ -36,7 +37,9 @@ check() { package_fcitx() { pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system" depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \ - 'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' 'enchant' 'icu') + 'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \ + 'libxfixes' 'dbus-core' 'icu') + optdepends=('enchant: for word predication support') install=fcitx.install cd "${srcdir}"/build diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index aa9f6a69b..88da552e1 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 156861 2012-04-23 09:07:46Z ibiru $ +# $Id: PKGBUILD 166593 2012-09-12 17:59:25Z jgc $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-user-share -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64') url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" license=('GPL') -depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') -makedepends=('intltool' 'gnome-doc-utils' 'nautilus') +depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') +makedepends=('intltool' 'nautilus' 'itstool' 'docbook-xsl') options=('!emptydirs' '!libtool') install=gnome-user-share.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd') +sha256sums=('0196c22fd339922922b2f2558942ef5aac1a0896e7327cf5ab4399ad9f1f1347') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,9 +25,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain gnome-user-share ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + make DESTDIR="${pkgdir}" install } diff --git a/extra/gnome-user-share/gnome-user-share.install b/extra/gnome-user-share/gnome-user-share.install index 3cc1b5286..f7e8c46ac 100644 --- a/extra/gnome-user-share/gnome-user-share.install +++ b/extra/gnome-user-share/gnome-user-share.install @@ -1,22 +1,12 @@ -pkgname=gnome-user-share - post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index ee9859444..4a8b500a8 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163911 2012-07-22 09:08:14Z ibiru $ +# $Id: PKGBUILD 166579 2012-09-12 17:20:44Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.11 -pkgrel=2 +pkgver=2.24.12 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,16 +12,13 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz - xid-collision-debug.patch - fix-stuck-grabs.patch) -sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '7739a1ab04aaf6e7f87987bad106062456e71933bc50acd948160cc03634dcd9') + xid-collision-debug.patch) +sha256sums=('c5eba3b9259e4bf7554e9dc9db5d72038aa8b1bdd40fa0364b3705c226d11808' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { cd gtk+-$pkgver patch -Np1 -i ../xid-collision-debug.patch - patch -Np1 -i ../fix-stuck-grabs.patch CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index c5f844f46..d7e3ab964 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165819 2012-08-30 20:53:00Z eric $ +# $Id: PKGBUILD 166610 2012-09-13 02:13:20Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.9.2 +pkgver=6.7.9.4 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('a22342f53903f2fe6debc099136263412f2b6571' +sha1sums=('6fa1a160c85f9119047a94ad1c8d3f49d9a84492' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD index 456888917..abe2a3adf 100644 --- a/extra/kdiff3/PKGBUILD +++ b/extra/kdiff3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136960 2011-09-03 21:15:57Z eric $ +# $Id: PKGBUILD 166597 2012-09-12 20:12:20Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=kdiff3 -pkgver=0.9.96 +pkgver=0.9.97 pkgrel=1 pkgdesc="A KDE file comparator/merge tool" arch=('i686' 'x86_64') @@ -13,8 +13,7 @@ makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml') optdepends=('kdebase-lib: for the plugin') install=kdiff3.install source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz) -md5sums=('46b96befddf3448a3cb673f018c6f6f9') -sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5') +sha1sums=('1f2828c4b287b905bac64992b46a3e9231319547') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD index c3416902e..ed705018c 100644 --- a/extra/libgsf/PKGBUILD +++ b/extra/libgsf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156900 2012-04-23 09:08:39Z ibiru $ +# $Id: PKGBUILD 166587 2012-09-12 17:38:22Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libgsf -pkgver=1.14.23 +pkgver=1.14.24 pkgrel=1 arch=(i686 x86_64) pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats" @@ -13,12 +13,12 @@ options=('!libtool') depends=('libxml2' 'gdk-pixbuf2' 'bzip2') makedepends=('intltool' 'gobject-introspection') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz) -sha256sums=('bfc1c6178f5319d5e6d854c380ce26542f9a103a5ff31c9d25a834e0be52fb17') +sha256sums=('975fc00a1332167e2baf649f8e2637884f798db1c8bb04abece2d5141663abff') build() { cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static --enable-introspection make } diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 284f405ed..f21121da7 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 156916 2012-04-23 09:09:00Z ibiru $ +# $Id: PKGBUILD 166591 2012-09-12 17:51:07Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.36.1 +pkgver=2.36.3 pkgrel=1 pkgdesc="A SVG viewing library" arch=(i686 x86_64) license=('LGPL') depends=('gdk-pixbuf2' 'pango' 'libcroco') makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection') -optdepends=('gtk3: for rsvg-view-3') +optdepends=('gtk3: for rsvg-view-3' + 'gtk2: gtk2 SVG engine module') options=('!libtool' '!emptydirs') url="http://librsvg.sourceforge.net/" install=librsvg.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('786b95e1a091375c5ef2997a21c69ff24d7077afeff18197355f54d9dcbcd8c5') +sha256sums=('3d7d583271030e21acacc60cb6b81ee305713c9da5e98429cbd609312aea3632') build() { cd $pkgname-$pkgver diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index 388c23eb1..161867bee 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159042 2012-05-15 10:57:35Z heftig $ +# $Id: PKGBUILD 166583 2012-09-12 17:32:14Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.4.2 +pkgver=3.4.3 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('1d055d0d7bd1069d97416985d11241eaea48aedb4311a22ff0d3404871707051') +sha256sums=('e468118927d50231df250d1f00106b32139aaad1ee9249a4ef316e5526d17d1d') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD index d56baaa0d..cbc994bae 100644 --- a/extra/metacity/PKGBUILD +++ b/extra/metacity/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 165026 2012-08-09 07:46:44Z jgc $ +# $Id: PKGBUILD 166589 2012-09-12 17:45:09Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=metacity -pkgver=2.34.5 +pkgver=2.34.8 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) license=('GPL') depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool' 'yelp-tools') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=metacity.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8e0712d4e3a4402b6b818348019dd864999585dda624a6ac0d44bf6a37ed2534') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + fix_compositing_startup.patch) +sha256sums=('ab83038a9dc0b53a63b66c3f9323a10abb0b9a9ae2b5c5d3cc6bbabe2b607806' + '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2') build() { cd "$pkgname-$pkgver" + patch -Np1 -i "${srcdir}/fix_compositing_startup.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/metacity \ --localstatedir=/var --disable-static \ diff --git a/extra/metacity/fix_compositing_startup.patch b/extra/metacity/fix_compositing_startup.patch new file mode 100644 index 000000000..56b218ae7 --- /dev/null +++ b/extra/metacity/fix_compositing_startup.patch @@ -0,0 +1,12 @@ +diff -Naur metacity-2.34.5.orig/src/compositor/compositor-xrender.c metacity-2.34.5/src/compositor/compositor-xrender.c +--- metacity-2.34.5.orig/src/compositor/compositor-xrender.c 2011-11-10 15:14:34.000000000 +0100 ++++ metacity-2.34.5/src/compositor/compositor-xrender.c 2012-08-28 14:23:04.093750568 +0200 +@@ -3066,6 +3057,8 @@ + #endif + + xrc->enabled = TRUE; ++ xrc->show_redraw = FALSE; ++ xrc->debug = FALSE; + g_timeout_add (2000, (GSourceFunc) timeout_debug, xrc); + + return compositor; diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD index 4fbf31f6b..99b091e37 100644 --- a/extra/notification-daemon/PKGBUILD +++ b/extra/notification-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154762 2012-03-30 16:38:12Z heftig $ +# $Id: PKGBUILD 166585 2012-09-12 17:37:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> pkgname=notification-daemon -pkgver=0.7.4 +pkgver=0.7.6 pkgrel=1 pkgdesc="Notification daemon for the desktop notifications framework" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ groups=('gnome') makedepends=('pkgconfig' 'intltool') options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9591273ee2099215cfbe1ce7eb7c08e8cbc3743d0a119e331889ffe9004e6f2f') +sha256sums=('64d0ce6fb12c94c3b73b701502c804c408cb5a94580bcae5ac37607639f7a0b3') build() { cd ${pkgname}-${pkgver} diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 5d882e8a6..38fa1ddf5 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166395 2012-09-07 16:07:57Z tpowa $ +# $Id: PKGBUILD 166569 2012-09-12 06:53:18Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' pkgname=('ocaml' 'ocaml-compiler-libs') pkgver=4.00.0 -pkgrel=1 +pkgrel=2 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') license=('LGPL2' 'custom: QPL-1.0') diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 01c2c4369..c36dcd09f 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163599 2012-07-16 15:36:12Z tpowa $ +# $Id: PKGBUILD 166599 2012-09-12 20:22:19Z tpowa $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,7 +6,7 @@ pkgname=slim pkgver=1.3.4 -pkgrel=2 +pkgrel=3 pkgdesc='Desktop-independent graphical login manager for X11' arch=('i686' 'x86_64') url='http://slim.berlios.de/' @@ -20,7 +20,8 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'logrotate' 'slim.service' 'session-name.patch' - 'libpng-1.4+-support.patch') + 'libpng-1.4+-support.patch' + 'fix-glibc-segfault-1.3.4.patch') install=install @@ -28,6 +29,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../session-name.patch # FS#26693: fix default session name patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build + patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864 cd ${srcdir} mkdir build cd build @@ -59,4 +61,5 @@ md5sums=('51543533e492b41007811f7d880720fa' '43da096480bf72c3ccec8ad8400f34f0' 'a5d6bde9e63899df7d2081e1585bbe54' 'ebcb6829028615686de7b64ceeaaf8ed' - '6d19bd7a91592ed2bb902b22b9594565') + '6d19bd7a91592ed2bb902b22b9594565' + '9efc4e0d82d354f0c578be7723870769') diff --git a/extra/slim/fix-glibc-segfault-1.3.4.patch b/extra/slim/fix-glibc-segfault-1.3.4.patch new file mode 100644 index 000000000..b035f8a78 --- /dev/null +++ b/extra/slim/fix-glibc-segfault-1.3.4.patch @@ -0,0 +1,13 @@ +Index: app.cpp +=================================================================== +--- app.cpp (revision 223) ++++ app.cpp (working copy) +@@ -593,7 +593,7 @@ + + n++; + +- child_env = static_cast<char**>(malloc(sizeof(char*)*n)); ++ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1))); + memcpy(child_env, old_env, sizeof(char*)*n); + child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); + child_env[n] = NULL; diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index e9e78bdc0..918428a6e 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 159166 2012-05-16 20:55:54Z andrea $ +# $Id: PKGBUILD 166607 2012-09-13 00:51:08Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ucommon -pkgver=5.2.2 -pkgrel=2 +pkgver=5.5.0 +pkgrel=1 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" arch=('i686' 'x86_64') url="http://www.gnutelephony.org/index.php/GNU_uCommon_C++" license=('GPL3' 'LGPL3') depends=('openssl') options=('!libtool') -source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('4739fcd9db006432f1b8e2ea226e414a' - 'adb2349cffe80678e39a96c6ab5c5a5b') +#source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) +source=("http://www.gnutelephony.org/dist/tarballs/$pkgname-$pkgver.tar.gz"{,.sig}) +md5sums=('99d302b5217bb92b6fb9d91ead6fd028' + '0fcfd66e9746c3105cb5d222ad2cc91d') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -20,6 +21,11 @@ build() { make } +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install diff --git a/extra/xfce4-weather-plugin/PKGBUILD b/extra/xfce4-weather-plugin/PKGBUILD index 1ad2262c4..07f3d4ad2 100644 --- a/extra/xfce4-weather-plugin/PKGBUILD +++ b/extra/xfce4-weather-plugin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164814 2012-08-06 17:00:02Z foutrelis $ +# $Id: PKGBUILD 166575 2012-09-12 13:41:32Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Suzy Williams <suzanne.williams3@verizon.net> pkgname=xfce4-weather-plugin -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=1 pkgdesc="A weather plugin for the Xfce4 panel" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.8/$pkgname-$pkgver.tar.bz2) -sha256sums=('a03a001065afdd8a167a44b96885d70013290b88d82e7deec45a2d294411077d') +sha256sums=('9506a3b1c04992202790b1deac8bbef8ed4933a0becd5c8e61194118e7eb67fe') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/gnome-unstable/rest/PKGBUILD b/gnome-unstable/rest/PKGBUILD new file mode 100644 index 000000000..16f5b5e63 --- /dev/null +++ b/gnome-unstable/rest/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 166595 2012-09-12 18:10:17Z jgc $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=rest +pkgver=0.7.90 +pkgrel=1 +pkgdesc="A helper library for RESTful services." +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'libxml2' 'libsoup-gnome') +makedepends=('gobject-introspection') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/multilib/zsnes/PKGBUILD b/multilib/zsnes/PKGBUILD index 0cf2c0e60..5e9e758bb 100644 --- a/multilib/zsnes/PKGBUILD +++ b/multilib/zsnes/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73928 2012-07-17 06:23:12Z svenstaro $ +# $Id: PKGBUILD 76172 2012-09-12 13:46:03Z lcarlier $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Frank Tetzel <frank.tetzel@mailbox.tu-dresden.de> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,7 +6,7 @@ pkgname=zsnes pkgver=1.51 -pkgrel=15 +pkgrel=16 pkgdesc="Super Nintendo emulator" url="http://www.zsnes.com/" arch=('i686' 'x86_64') @@ -15,9 +15,11 @@ options=(!buildflags) if [[ $CARCH == "x86_64" ]]; then depends=('lib32-gcc-libs' 'lib32-sdl' 'lib32-libpng>=1.5.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa') + optdepends=('lib32-alsa-lib: sound support') makedepends=('nasm' 'gcc-multilib' 'gendesk') else depends=('gcc-libs' 'sdl' 'libpng>=1.5.0' 'libgl' 'ncurses' 'mesa') + optdepends=('alsa-lib: sound support') makedepends=('nasm' 'gcc' 'gendesk') fi diff --git a/pcr/csync-owncloud/PKGBUILD b/pcr/csync-owncloud/PKGBUILD new file mode 100644 index 000000000..daba8c568 --- /dev/null +++ b/pcr/csync-owncloud/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> +# https://github.com/zizzfizzix/pkgbuilds + +############################################################## +#### The section below can be adjusted to suit your needs #### +############################################################## + +# What type of build do you want? +# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported. +# Default is RelWithDebInfo to help with debugging. + +_buildtype="RelWithDebInfo" + +############################################################## + +_name=csync +pkgname=csync-owncloud +pkgver=0.50.8 +pkgrel=1 +pkgdesc="A file synchronizer especially designed for you, the normal user." +arch=("i686" "x86_64") +url="http://www.csync.org" +license=('GPL2') +depends=('log4c' 'sqlite3' 'iniparser' 'neon' 'smbclient' 'libssh') +makedepends=('cmake') +#optdepends=('samba: smb support' 'libssh: sftp support') +provides=('csync') +conflicts=('csync') +options=(!strip) +source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2") +md5sums=('322f6fa22ca0e8cd05f23dc0d075e7ca') + +# Clean options array to strip pkg if release buildtype is chosen +if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then + options=() +fi + +build() { + if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi + mkdir ${srcdir}/${_name}-${pkgver}-build + cd ${srcdir}/${_name}-${pkgver}-build + + cmake -DCMAKE_BUILD_TYPE=${_buildtype} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLOG_TO_CALLBACK=on \ + ../${_name}-${pkgver} + make +} +package() { + cd ${srcdir}/${_name}-${pkgver}-build + make DESTDIR=${pkgdir} install +} diff --git a/pcr/log4c/PKGBUILD b/pcr/log4c/PKGBUILD new file mode 100644 index 000000000..bfcb6bb53 --- /dev/null +++ b/pcr/log4c/PKGBUILD @@ -0,0 +1,22 @@ +# Contributor: rockerzz <rockerzz@gmail.com> +# +pkgname=log4c +pkgver=1.2.1 +pkgrel=1 +pkgdesc="Logging FrameWork for C, as Log4j or Log4Cpp" +url="http://log4c.sourceforge.net/" +arch=('i686' 'x86_64') +license="LGPL" +depends=('gcc-libs') +makedepends=( 'bash' 'make' 'gcc' ) +source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('ca5412b7515d8901714ab7892323adb6') +options=('!libtool') + +build() { + cd $startdir/src/log4c-$pkgver + ./configure --prefix=/usr + make || return 1 + make DESTDIR=$startdir/pkg install +} + diff --git a/pcr/nexuiz-data/PKGBUILD b/pcr/nexuiz-data/PKGBUILD new file mode 100644 index 000000000..edd338097 --- /dev/null +++ b/pcr/nexuiz-data/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Xyne +# Contributor: Rick Chen (stuffcorpse) +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: Camille Moncelier <pix@devlife.org> + +pkgname=nexuiz-data +_pkgsourcename=nexuiz +pkgver=2.5.2 +_zipver=252 +pkgrel=1 +arch=('any') +pkgdesc="Nexuiz game data" +conflicts=('nexuiz<2.5.1-3') +url="http://www.nexuiz.com/" +license=("GPL") +source=(http://downloads.sourceforge.net/${_pkgsourcename}/${_pkgsourcename}-${_zipver}.zip) +md5sums=('d750bc328e58df8492f8d88bdcf818cb') + +build() { + _nexdir="$pkgdir/opt/nexuiz" + + _install_dir $srcdir/Nexuiz/Docs $_nexdir/docs + _install_dir $srcdir/Nexuiz/data $_nexdir/data + _install_dir $srcdir/Nexuiz/havoc $_nexdir/havoc + _install_dir $srcdir/Nexuiz/server $_nexdir/server + + find $_nexdir/server -name "*_windows.bat" -exec rm {} \; + find $_nexdir/server -name "*_mac.sh" -exec rm {} \; +} + +function _install_dir { + _src_dir=$1 + _dest_dir=$2 + _n=${#_src_dir} + for _file in $(find $_src_dir -type f) + do + _dest_file=${_dest_dir}${_file:$_n} + install -Dm644 $_file $_dest_file + done +} diff --git a/pcr/nexuiz/PKGBUILD b/pcr/nexuiz/PKGBUILD new file mode 100644 index 000000000..3b59cd617 --- /dev/null +++ b/pcr/nexuiz/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Xyne +# Contributor: Rick Chen (stuffcorpse) +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: Camille Moncelier <pix@devlife.org> + +pkgname=nexuiz +pkgver=2.5.2 +_zipver=252 +pkgrel=2 +arch=('i686' 'x86_64') +pkgdesc="a free software first person shooter" +url="http://www.nexuiz.com/" +license=("GPL") +depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'nexuiz-data' 'libpng>=1.4.0') +makedepends=('mesa') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_zipver}.zip \ + nexuiz-dedicated nexuiz-glx nexuiz-sdl nexuiz-glx.desktop \ + nexuiz-sdl.desktop nexuiz.png libpng14.patch) +md5sums=('d750bc328e58df8492f8d88bdcf818cb' + '19bfaa6e891d3309783e8366db485474' + '4d0ee9282a6fe153f82f7797decfd585' + '3e5ea741e8d55df8e7691c797c81ffa7' + '310f0577c39391f2d2f17cea446ce269' + '4561d3c5be4801399af515faf82ebcba' + '442fb62670bbe0a1b5370461052051a3' + '60964348924ff777a92dbb171a86a1ed') + +build() { + _nexdir="$pkgdir/opt/nexuiz" + _enginesource_date="20091001" + mkdir -p "$_nexdir" || return 1 + + cd $srcdir/Nexuiz + bsdtar -x -f sources/enginesource${_enginesource_date}.zip || return 1 + cd darkplaces + patch -Np1 -i ${srcdir}/libpng14.patch || return 1 + # patch -p1 < "$srcdir/nexuiz-libjpeg-fix.patch" || return 1 + + # here's a working kludge to build all three binaries at once but don't use it ;) + # make CPUOPTIMIZATIONS="${CFLAGS}" nexuiz || make CPUOPTIMIZATIONS="${CFLAGS}" nexuiz || return 1 + + # build the binaries separately instead to avoid truncated files + make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 cl-nexuiz || return 1 + make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sdl-nexuiz || return 1 + make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sv-nexuiz || return 1 + + # install the compiled binaries + install -Dm755 nexuiz-glx nexuiz-sdl nexuiz-dedicated -t $_nexdir || return 1 + + install -dm755 $pkgdir/usr/{bin,share/applications} || return 1 + install -Dm755 $srcdir/nexuiz-{glx,sdl,dedicated} -t $pkgdir/usr/bin || return 1 + install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications || return 1 + install -Dm644 $srcdir/nexuiz.png $pkgdir/usr/share/pixmaps/nexuiz.png || return 1 +} diff --git a/pcr/nexuiz/libpng14.patch b/pcr/nexuiz/libpng14.patch new file mode 100644 index 000000000..d6ce5ea76 --- /dev/null +++ b/pcr/nexuiz/libpng14.patch @@ -0,0 +1,39 @@ +diff -Nur darkplaces.old/image_png.c darkplaces/image_png.c +--- darkplaces.old/image_png.c 2009-09-15 06:08:02.000000000 +0300 ++++ darkplaces/image_png.c 2010-01-28 01:23:24.000000000 +0200 +@@ -36,7 +36,7 @@ + static void* (*qpng_create_info_struct) (void*); + static void (*qpng_read_info) (void*, void*); + static void (*qpng_set_expand) (void*); +-static void (*qpng_set_gray_1_2_4_to_8) (void*); ++static void (*qpng_set_expand_gray_1_2_4_to_8) (void*); + static void (*qpng_set_palette_to_rgb) (void*); + static void (*qpng_set_tRNS_to_alpha) (void*); + static void (*qpng_set_gray_to_rgb) (void*); +@@ -61,7 +61,7 @@ + {"png_create_info_struct", (void **) &qpng_create_info_struct}, + {"png_read_info", (void **) &qpng_read_info}, + {"png_set_expand", (void **) &qpng_set_expand}, +- {"png_set_gray_1_2_4_to_8", (void **) &qpng_set_gray_1_2_4_to_8}, ++ {"png_set_expand_gray_1_2_4_to_8", (void **) &qpng_set_expand_gray_1_2_4_to_8}, + {"png_set_palette_to_rgb", (void **) &qpng_set_palette_to_rgb}, + {"png_set_tRNS_to_alpha", (void **) &qpng_set_tRNS_to_alpha}, + {"png_set_gray_to_rgb", (void **) &qpng_set_gray_to_rgb}, +@@ -110,7 +110,7 @@ + #elif defined(MACOSX) + "libpng12.0.dylib", + #else +- "libpng12.so.0", ++ "libpng14.so.0", + "libpng.so", // FreeBSD + #endif + NULL +@@ -311,7 +311,7 @@ + { + qpng_set_gray_to_rgb(png); + if (my_png.BitDepth < 8) +- qpng_set_gray_1_2_4_to_8(png); ++ qpng_set_expand_gray_1_2_4_to_8(png); + } + + if (qpng_get_valid(png, pnginfo, PNG_INFO_tRNS)) diff --git a/pcr/nexuiz/nexuiz-dedicated b/pcr/nexuiz/nexuiz-dedicated new file mode 100644 index 000000000..bf517cce7 --- /dev/null +++ b/pcr/nexuiz/nexuiz-dedicated @@ -0,0 +1,3 @@ +#!/bin/sh +cd /opt/nexuiz +./nexuiz-dedicated $@ diff --git a/pcr/nexuiz/nexuiz-glx b/pcr/nexuiz/nexuiz-glx new file mode 100644 index 000000000..5fad4db07 --- /dev/null +++ b/pcr/nexuiz/nexuiz-glx @@ -0,0 +1,3 @@ +#!/bin/sh +cd /opt/nexuiz +./nexuiz-glx $@ diff --git a/pcr/nexuiz/nexuiz-glx.desktop b/pcr/nexuiz/nexuiz-glx.desktop new file mode 100644 index 000000000..8808c16db --- /dev/null +++ b/pcr/nexuiz/nexuiz-glx.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Version=2.5 +Encoding=UTF-8 +Name=Nexuiz (GLX) +Comment=a free open-source first person shooter +Icon=/usr/share/pixmaps/nexuiz.png +Exec=/usr/bin/nexuiz-glx +Terminal=false +StartupNotify=false +Categories=Game; diff --git a/pcr/nexuiz/nexuiz-sdl b/pcr/nexuiz/nexuiz-sdl new file mode 100644 index 000000000..36b6d5cc3 --- /dev/null +++ b/pcr/nexuiz/nexuiz-sdl @@ -0,0 +1,3 @@ +#!/bin/sh +cd /opt/nexuiz +./nexuiz-sdl $@ diff --git a/pcr/nexuiz/nexuiz-sdl.desktop b/pcr/nexuiz/nexuiz-sdl.desktop new file mode 100644 index 000000000..019970e61 --- /dev/null +++ b/pcr/nexuiz/nexuiz-sdl.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Version=2.5 +Encoding=UTF-8 +Name=Nexuiz (SDL) +Comment=a free open-source first person shooter +Icon=/usr/share/pixmaps/nexuiz.png +Exec=/usr/bin/nexuiz-sdl +Terminal=false +StartupNotify=false +Categories=Game; diff --git a/pcr/nexuiz/nexuiz.png b/pcr/nexuiz/nexuiz.png Binary files differnew file mode 100644 index 000000000..a0ec8b3d4 --- /dev/null +++ b/pcr/nexuiz/nexuiz.png diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD new file mode 100644 index 000000000..7e8dfa59a --- /dev/null +++ b/pcr/owncloud-client/PKGBUILD @@ -0,0 +1,54 @@ +# Maintainer: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com> +# https://github.com/zizzfizzix/pkgbuilds + +############################################################## +#### The section below can be adjusted to suit your needs #### +############################################################## + +# What type of build do you want? +# See http://techbase.kde.org/Development/CMake/Addons_for_KDE#Buildtypes to check what is supported. +# Default is RelWithDebInfo to help with debugging. + +_buildtype="RelWithDebInfo" + +############################################################## + +_name=mirall +pkgname=owncloud-client +pkgver=1.0.5 +pkgrel=2 +pkgdesc="ownCloud client based on mirall" +arch=('i686' 'x86_64') +url="http://owncloud.org/" +license=('GPL2') +depends=('qt' 'csync-owncloud') +makedepends=('cmake') +provides=('mirall' 'owncloud-client') +conflicts=('mirall-git') +options=(!strip) +install=owncloud-client.install +backup=('etc/exclude.lst') +source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2" + "${pkgname}.desktop") +md5sums=('b7a96411f092bb16f88e3868a558032f' + 'e223d162626c2ff54efebaa90a182d81') + +# Clean options array to strip pkg if release buildtype is chosen +if [[ ${_buildtype} == "Release" ]] || [[ ${_buildtype} == "release" ]]; then + options=() +fi + +build() { + if [[ -e ${srcdir}/${_name}-${pkgver}-build ]]; then rm -rf ${srcdir}/${_name}-${pkgver}-build; fi + mkdir ${srcdir}/${_name}-${pkgver}-build + cd ${srcdir}/${_name}-${pkgver}-build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_BUILD_TYPE=${_buildtype} ../${_name}-${pkgver} + make +} + +package() { + cd ${srcdir}/${_name}-${pkgver}-build + make DESTDIR=${pkgdir} install + install -Dm644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop +} diff --git a/pcr/owncloud-client/owncloud-client.desktop b/pcr/owncloud-client/owncloud-client.desktop new file mode 100644 index 000000000..005e52219 --- /dev/null +++ b/pcr/owncloud-client/owncloud-client.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=ownCloud 2012 client +GenericName=File Sync +TryExec=owncloud +Exec=owncloud %u +Comment=ownCloud - Your Cloud, Your Data, Your Way! +Icon=mirall +Terminal=false +Categories=Qt;Utility; diff --git a/pcr/owncloud-client/owncloud-client.install b/pcr/owncloud-client/owncloud-client.install new file mode 100644 index 000000000..1c0de2e4f --- /dev/null +++ b/pcr/owncloud-client/owncloud-client.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index d07972e54..334d32325 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -6,12 +6,12 @@ pkgname=zoneminder pkgver=1.25.0 -pkgrel=13 +pkgrel=14 pkgdesc="Capture, analyse, record and monitor video security cameras" arch=('i686' 'x86_64' 'mips64el') url="http://www.zoneminder.com" license=('GPL') -depends=('cambozola' 'apache' 'php' 'php-gd' 'php-mcrypt' 'mysql' 'pcre' 'openssl' 'ffmpeg' 'perl-libwww' 'perl-date-manip' 'perl-unicode-map' 'perl-dbi' 'perl-dbd-mysql' 'perl-io-stringy' 'perl-mime-lite' 'perl-timedate' 'perl-x10' 'perl-time-modules' 'perl-net-smtp-ssl' 'perl-sys-mmap' 'perl-net-sftp-foreign' 'perl-mime-tools' 'perl-io-tty' 'sudo' 'libv4l' 'libjpeg' 'gnutls' 'php-apache') +depends=('cambozola' 'apache' 'php' 'php-gd' 'php-mcrypt' 'mysql' 'pcre' 'openssl' 'ffmpeg' 'perl-libwww' 'perl-date-manip' 'perl-unicode-map' 'perl-dbi' 'perl-dbd-mysql' 'perl-io-stringy' 'perl-mime-lite' 'perl-timedate' 'perl-x10' 'perl-time-modules' 'perl-net-smtp-ssl' 'perl-sys-mmap' 'perl-net-sftp-foreign' 'perl-mime-tools' 'perl-io-tty' 'libv4l' 'libjpeg' 'gnutls' 'php-apache') makedepends=() install=zoneminder.install source=("http://www.zoneminder.com/downloads/ZoneMinder-${pkgver}.tar.gz" diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD index a0206c0c1..ca628457a 100644 --- a/testing/dnsutils/PKGBUILD +++ b/testing/dnsutils/PKGBUILD @@ -1,15 +1,12 @@ -# $Id: PKGBUILD 164042 2012-07-25 00:29:36Z bisson $ +# $Id: PKGBUILD 166602 2012-09-12 22:38:22Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: mario <mario_vazq@hotmail.com> pkgname=dnsutils - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.1.P2 -_pkgver=9.9.1-P2 +_pkgver=9.9.1-P3 +pkgver=${_pkgver//-/.} pkgrel=1 - pkgdesc='DNS utilities: dig host nslookup' url='http://www.isc.org/software/bind/' license=('custom:ISC') @@ -18,7 +15,7 @@ options=('!makeflags') depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'remove-bind.patch') -sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7' +sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799' 'b465ef6160b004838f04de9978fe1be8422af777') replaces=('bind-tools' 'host') |
