diff options
| author | root <root@rshg047.dnsready.net> | 2011-07-08 23:09:34 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-07-08 23:09:34 +0000 |
| commit | d006db78a1ce530e9df8a65f87bf39e8d6cc88e5 (patch) | |
| tree | 082c5c2c39abee82c3957872552fa15c8325744d | |
| parent | ff64a82ccedcb1690d2f0140d63432aa49676591 (diff) | |
Fri Jul 8 23:09:34 UTC 2011
88 files changed, 1412 insertions, 453 deletions
diff --git a/community/balsa/PKGBUILD b/community/balsa/PKGBUILD index 5ca276e96..c0d0468f3 100644 --- a/community/balsa/PKGBUILD +++ b/community/balsa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48556 2011-06-02 02:30:07Z bfanella $ +# $Id: PKGBUILD 51383 2011-07-08 03:41:33Z bfanella $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=balsa -pkgver=2.4.9 -pkgrel=4 +pkgver=2.4.10 +pkgrel=1 pkgdesc="An e-mail client for GNOME" arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gt makedepends=('perlxml' 'gnome-doc-utils' 'intltool' 'namcap') install=balsa.install source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('bd7ac44f0cf3117a5fdb46d17dac2b51') +md5sums=('fa2b7cb9d248912ac2e3dcc08cd6aa5b') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/fldiff/PKGBUILD b/community/fldiff/PKGBUILD index 2946ef440..ab25a3240 100644 --- a/community/fldiff/PKGBUILD +++ b/community/fldiff/PKGBUILD @@ -1,23 +1,31 @@ -# $Id: PKGBUILD 8588 2010-01-21 01:26:51Z dgriffiths $ +# $Id: PKGBUILD 51104 2011-07-05 09:00:11Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: kevin <kevin@archlinux.org> # Contributor: iztok pizorn <pizorn@gmail.com> pkgname=fldiff pkgver=1.1 -pkgrel=5 +pkgrel=6 pkgdesc="graphical diff program" arch=(i686 x86_64) url="http://www.easysw.com/~mike/fldiff/" -source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz) license=('GPL') install=fldiff.install depends=('diffutils' 'fltk' 'xdg-utils') -md5sums=('12897c92106fb5d665210a2e82f5cf25') +source=(http://www.easysw.com/~mike/fldiff/$pkgname-$pkgver-source.tar.gz + build-fix.patch) +md5sums=('12897c92106fb5d665210a2e82f5cf25' + 'ea7258e07544b81561c6d76a41c184e7') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr - make || return 1 - make BUILDROOT=$startdir/pkg install install-desktop || return 1 - mv `find $startdir/pkg/ -name Development -type d` $startdir/pkg/usr/share/applications + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make BUILDROOT=$pkgdir install install-desktop + mv `find $pkgdir/ -name Development -type d` $startdir/pkg/usr/share/applications } diff --git a/community/fldiff/build-fix.patch b/community/fldiff/build-fix.patch new file mode 100644 index 000000000..bb3e0245e --- /dev/null +++ b/community/fldiff/build-fix.patch @@ -0,0 +1,31 @@ +Only in fldiff-1.1.my: config.log +Only in fldiff-1.1.my: config.status +Only in fldiff-1.1.my: DiffChooser.o +Only in fldiff-1.1.my: DiffOpenWindow.o +Only in fldiff-1.1.my: DiffView.o +diff -wbBur fldiff-1.1/DiffWindow.cxx fldiff-1.1.my/DiffWindow.cxx +--- fldiff-1.1/DiffWindow.cxx 2006-11-13 21:54:02.000000000 +0300 ++++ fldiff-1.1.my/DiffWindow.cxx 2011-07-05 12:58:38.000000000 +0400 +@@ -1126,11 +1126,11 @@ + DiffWindow::save_prefs() + { + // Save the window prefs for the next run... +- prefs_.set("color", color()); +- prefs_.set("selection_color", selection_color()); ++ prefs_.set("color", (int)color()); ++ prefs_.set("selection_color", (int)selection_color()); + prefs_.set("showlinenum", showlinenum()); + prefs_.set("tabwidth", tabwidth()); +- prefs_.set("textcolor", textcolor()); ++ prefs_.set("textcolor", (int)textcolor()); + prefs_.set("textsize", textsize()); + prefs_.set("ignoreblanks", ignoreblanks()); + } +Only in fldiff-1.1.my: DiffWindow.o +Only in fldiff-1.1.my: FavoritesMenu.o +Only in fldiff-1.1.my: FavoritesWindow.o +Only in fldiff-1.1.my: fldiff +Only in fldiff-1.1.my: fldiff.list +Only in fldiff-1.1.my: fldiff.o +Only in fldiff-1.1.my: Makefile +Only in fldiff-1.1.my: PtProcess.o diff --git a/community/fldiff/fldiff.install b/community/fldiff/fldiff.install index b4ee8556f..b95cc069d 100644 --- a/community/fldiff/fldiff.install +++ b/community/fldiff/fldiff.install @@ -9,4 +9,3 @@ post_upgrade() { post_remove() { which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true } - diff --git a/community/htmldoc/PKGBUILD b/community/htmldoc/PKGBUILD index 47f82367b..92622ac08 100644 --- a/community/htmldoc/PKGBUILD +++ b/community/htmldoc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 15782 2010-04-15 20:40:51Z spupykin $ +# $Id: PKGBUILD 51081 2011-07-05 07:09:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tobias <tobias@archlinux.org> # Contributor: Simon Rutishauser <simon.rutishauser@gmx.ch> pkgname=htmldoc pkgver=1.8.27 -pkgrel=5 +pkgrel=6 pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices" arch=(i686 x86_64) url="http://www.htmldoc.org" @@ -18,7 +18,11 @@ build() { cd ${startdir}/src/${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=${pkgdir}/usr/share/man sed -i 's|^bindir.*$|bindir = ${prefix}/bin|' Makedefs - make || return 1 + make +} + +package() { + cd ${startdir}/src/${pkgname}-${pkgver} make prefix=${startdir}/pkg/usr install # fix freedesktop stuff install -Dm 644 desktop/htmldoc-128.png \ diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD index e65a06b83..56a00339c 100644 --- a/community/libcss/PKGBUILD +++ b/community/libcss/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libcss -pkgver=0.0.2 +pkgver=0.1.0 pkgrel=1 pkgdesc="A CSS parser and selection engine." arch=('i686' 'x86_64') @@ -10,15 +10,16 @@ url="http://www.netsurf-browser.org/projects/libcss/" license=('MIT') depends=('libparserutils' 'libwapcaplet') source=(http://www.netsurf-browser.org/projects/releases/libcss-${pkgver}-src.tar.gz) -md5sums=('3bbdd853a2f52db7ab0e2ea3597e62fa') +md5sums=('47b9bba60fffe16ecebeba578c89fd40') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver}-src + export CFLAGS="-Wno-error=unused-but-set-variable" make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver}-src make PREFIX=/usr DESTDIR=${pkgdir} install install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index b9deb62b4..f3de9ef59 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48795 2011-06-05 19:15:38Z bfanella $ +# $Id: PKGBUILD 51368 2011-07-08 01:02:45Z bfanella $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=libraw _pkgbasename=LibRaw -pkgver=0.13.5 +pkgver=0.13.6 pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('CDDL' 'LGPL' 'custom') depends=('lcms') options=('!makeflags') source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('bf6894f6a60b411da012f58a0954e910') +md5sums=('452bff308af4bfcb9bf1c2fdb0bd0eab') build() { cd ${srcdir}/${_pkgbasename}-${pkgver} diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD index 2eff2bc70..f5d57aa2f 100644 --- a/community/libwapcaplet/PKGBUILD +++ b/community/libwapcaplet/PKGBUILD @@ -1,24 +1,25 @@ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=libwapcaplet -pkgver=0.0.2 +pkgver=0.1.0 pkgrel=1 pkgdesc="A string internment library with rapid string comparison." arch=('i686' 'x86_64') url="http://www.netsurf-browser.org/projects/libwapcaplet/" license=('MIT') source=(http://www.netsurf-browser.org/projects/releases/${pkgname}-${pkgver}-src.tar.gz) -md5sums=('c73b5ff5fce55819cc698e8cb486d5eb') +md5sums=('c21975b81bcdafa60ad6b97b95925efe') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver}-src - make || return 1 + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver}-src - make PREFIX=/usr DESTDIR=${pkgdir} install || return 1 + make PREFIX=/usr DESTDIR=${pkgdir} install install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/community/mtasc/PKGBUILD b/community/mtasc/PKGBUILD index 621a27b45..30e3284f8 100644 --- a/community/mtasc/PKGBUILD +++ b/community/mtasc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50978 2011-07-04 10:46:29Z spupykin $ +# $Id: PKGBUILD 51324 2011-07-07 13:42:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Niel Drummond <niel.drummond@grumpytoad.org> @@ -11,7 +11,7 @@ url="http://mtasc.org/" license=('GPL2') depends=('zlib') makedepends=('ocaml' 'cvs') -source=("http://arch.p5n.pp.ru/~sergej/dl/mtasc-$pkgver.tar.gz") +source=("http://arch.p5n.pp.ru/~sergej/dl/mtasc-$pkgver-1.tar.gz") md5sums=('e3b1f31ae906ebbd92678fdac0fdd411') build() { diff --git a/community/openmovieeditor/PKGBUILD b/community/openmovieeditor/PKGBUILD index 00bca41d7..f5edd51ad 100644 --- a/community/openmovieeditor/PKGBUILD +++ b/community/openmovieeditor/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 9280 2010-01-24 22:58:30Z foutrelis $ +# $Id: PKGBUILD 51110 2011-07-05 10:08:30Z spupykin $ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> # Maintainer: Robert Emil Berge # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=openmovieeditor pkgver=0.0.20090105 -pkgrel=6 +pkgrel=7 pkgdesc="A simple video editor" arch=('i686' 'x86_64') url="http://openmovieeditor.sourceforge.net/HomePage" license=('GPL') -depends=('libquicktime' 'libsamplerate' 'fltk' 'jack-audio-connection-kit' 'portaudio' 'gmerlin-avdecoder') +depends=('libquicktime' 'libsamplerate' 'fltk' 'jack' 'portaudio' 'gmerlin-avdecoder') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('ce4f76c0b3e90aabf9c2d5c8dd31e9b1') @@ -17,6 +17,11 @@ build() { cd $srcdir/$pkgname-$pkgver unset LDFLAGS + export CFLAGS="$CFLAGS -fpermissive" + export CXXFLAGS="$CXXFLAGS -fpermissive" + export CPPFLAGS="$CPPFLAGS -fpermissive" + sed -i 's|= sizes();|= (short*)sizes();|g' src/Fl_Split.cpp + # Fix missing includes sed -e 's|<sstream>|<sstream>\n#include <stdint.h>|' -i src/VideoViewGL.H sed -e 's|<string>|<string>\n#include <stdint.h>|' -i src/WaveForm.H @@ -25,6 +30,6 @@ build() { sed -e 's|<iostream>|<iostream>\n#include <stdio.h>|' -i src/fl_font_browser.h ./configure --prefix=/usr - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index a313aeb8c..57309a0d8 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 50065 2011-06-23 20:33:39Z jlichtblau $ +# $Id: PKGBUILD 51336 2011-07-07 21:24:31Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('f28b37340a773e466434988e64929b6282e445dc43612fb6c1d991d2d5ff995f' +sha256sums=('24304fb148651e1e989ff9c15e56e3c6fb5d8b1e16aa70342d73bee86be67da8' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index f2cfbb448..83a7eee92 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2011-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.1-1 + 2011-06-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.2.0-1 diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD index 0ed1b484c..98f8bc5cc 100644 --- a/community/ushare/PKGBUILD +++ b/community/ushare/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 49979 2011-06-22 19:57:08Z spupykin $ +# $Id: PKGBUILD 51319 2011-07-07 10:51:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=ushare pkgver=1.1a -pkgrel=13 +pkgrel=14 pkgdesc="A free UPnP A/V Media Server for Linux" url="http://ushare.geexbox.org" license=('GPL2') @@ -19,35 +19,32 @@ source=("http://ushare.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "upnp-build-fix.patch" "ushare-config.patch") md5sums=('5bbcdbf1ff85a9710fa3d4e82ccaa251' - '5b8d5ab953dba09f05abd38abef063de' + 'e3cf0a44b0280da4966177c21e49361c' '32c29f9f673e8b3a3d9e7bf5e60febbc' '5243475c0cebc5db49296b2f3691085b') build() { cd ${srcdir}/${pkgname}-${pkgver} - sed -i -e \ "s%^INSTALL=\"/usr/bin/install -c\"$%INSTALL=\"$(which install) -c\"%" \ configure patch -p1 <$srcdir/upnp-build-fix.patch patch -p1 <$srcdir/ushare-config.patch - ./configure --prefix=/usr --sysconfdir=/etc/ushare \ --enable-dlna --with-libdlna-dir=/usr/include/libavformat - make } package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/etc/${pkgname}/init.d install -m 0755 -D ${srcdir}/ushare ${pkgdir}/etc/rc.d/ushare install -d -m 0755 ${pkgdir}/etc/conf.d/ cat >${pkgdir}/etc/conf.d/ushare <<EOF #PARAMS="-c /tmp -i eth0" PARAMS= +USHARE_USER=ushare EOF install -D -m0644 src/ushare.1 $pkgdir/usr/share/man/man1/ushare.1 } diff --git a/community/ushare/ushare b/community/ushare/ushare index 0770d16b9..b545b85d4 100755 --- a/community/ushare/ushare +++ b/community/ushare/ushare @@ -7,6 +7,8 @@ DESC="uShare UPnP A/V Media Server" [ -r "/etc/ushare/ushare.conf" ] && . /etc/ushare/ushare.conf [ -r "/etc/conf.d/ushare" ] && . /etc/conf.d/ushare +[ -z $USHARE_USER ] && USHARE_USER=ushare + # abort if no executable exists #[ -x $DAEMON ] || stat_fail @@ -23,7 +25,7 @@ PID=`pidof -o %PPID /usr/bin/ushare` case "$1" in start) stat_busy "Starting $DESC" - [ -z "$PID" ] && sudo -u ushare /usr/bin/ushare -D -x $PARAMS + [ -z "$PID" ] && sudo -u $USHARE_USER /usr/bin/ushare -D -x $PARAMS if [ $? -gt 0 ]; then stat_fail else diff --git a/community/ushare/ushare.install b/community/ushare/ushare.install index c51ea621d..ee677c849 100644 --- a/community/ushare/ushare.install +++ b/community/ushare/ushare.install @@ -3,7 +3,7 @@ post_install() { groupadd ushare fi if [ -z "`grep '^ushare:' /etc/passwd`" ]; then - useradd -d /var/empty -g ushare -s /bin/false ushare + useradd -d /var/empty -g ushare -s /sbin/nologin ushare fi } diff --git a/community/xdiskusage/PKGBUILD b/community/xdiskusage/PKGBUILD index f73231f15..0ff97363c 100644 --- a/community/xdiskusage/PKGBUILD +++ b/community/xdiskusage/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 2038 2009-09-07 16:25:48Z spupykin $ +# $Id: PKGBUILD 51101 2011-07-05 08:55:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Jason Chu <jason@archlinux.org> pkgname=xdiskusage pkgver=1.48 -pkgrel=5 +pkgrel=6 pkgdesc="xdiskusage is a user-friendly program to show you what is using up all your disk space" arch=('i686' 'x86_64') depends=('fltk') +makedepends=('libxi') license=('GPL') url="http://xdiskusage.sourceforge.net" options=(!emptydirs) @@ -33,10 +34,14 @@ build() { --- > int n = (long long)v; EOF - + ./configure --prefix=/usr install -d "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1" - LDFLAGS=-lXi make || return 1 - make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install || return 1 + LDFLAGS=-lXi make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install chmod 0644 $pkgdir/usr/share/man/man1/* } diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index 12829b5d1..724bb5c4d 100644 --- a/core/dnsutils/PKGBUILD +++ b/core/dnsutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125626 2011-05-27 10:41:33Z bisson $ +# $Id: PKGBUILD 130510 2011-07-07 02:37:46Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: mario <mario_vazq@hotmail.com> @@ -6,8 +6,8 @@ pkgname=dnsutils # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P2 -_pkgver=9.8.0-P2 +pkgver=9.8.0.P4 +_pkgver=9.8.0-P4 pkgrel=1 pkgdesc='Various DNS utilities - dig host nslookup nsupdate' @@ -19,7 +19,7 @@ replaces=('bind-tools' 'host') options=('!makeflags') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'tools-only.patch') -sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b' +sha1sums=('969864200c1516a8bea54266de60f316d79182b4' 'ac88c89e25c26d73095a3dd85e1ca1070d184ded') build() { diff --git a/elementary/gtk-engine-equinox/PKGBUILD b/elementary/gtk-engine-equinox/PKGBUILD new file mode 100644 index 000000000..18f18df99 --- /dev/null +++ b/elementary/gtk-engine-equinox/PKGBUILD @@ -0,0 +1,30 @@ +# created 16:18:42 - 21/03/10 +# Maintainer: Frikilinux <frikilinux at frikilinux.com.ar> + +pkgname=gtk-engine-equinox +pkgver=1.50 +pkgrel=1 +pkgdesc="A heavily modified version of the beautiful Aurora engine" +url="http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881" +license=('GPL2') +arch=('i686' 'x86_64') +depends=('gtk2') +makedepends=('pkgconfig') +conflicts=() +options=('!libtool') +source=("http://gnome-look.org/CONTENT/content-files/121881-equinox-${pkgver}.tar.gz") +sha256sums=('0cf8b8cc841e0da7d4a08ab5a70d3bb330fd76bdcb03165a47aaddcd47e02227') + +build() { + cd "${srcdir}"/equinox-$pkgver + + # Toolbar Fix + sed -i "s|\(EQUINOX_IS_TOOLBAR.*parent\)|widget \&\& \1|" src/equinox_style.c + + ./configure --prefix=/usr --enable-animation + make +} +package() { + cd "${srcdir}"/equinox-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/elementary/trisquel-themes/PKGBUILD b/elementary/trisquel-themes/PKGBUILD new file mode 100644 index 000000000..4f21fd10f --- /dev/null +++ b/elementary/trisquel-themes/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: fauno <fauno@kiwwwi.com.ar> + +pkgname=trisquel-themes +pkgver=4.5 +_miniver=4.4.9 +pkgrel=1 +pkgdesc="Themes from Trisquel, including GTK2, Metacity, XFWM and Openbox themes" +arch=('any') +url=http://trisquel.info +license=('GPL') +depends=() +optdepends=('gtk-engine-equinox: for Trisquel GTK2 theme') +source=(http://archive.trisquel.info/trisquel/pool/main/t/trisquel-gtk-theme/trisquel-gtk-theme_${pkgver}.tar.gz +http://archive.trisquel.info/trisquel/pool/main/t/trisquel-mini-data/trisquel-mini-data_${_miniver}.tar.gz) + +build() { + /bin/true +} + +package() { + install -d ${pkgdir}/usr/share/themes + + for trisquelsrc in trisquel-gtk-theme-4.5/data trisquel-mini-data-4.0; do + cp -R ${srcdir}/${trisquelsrc}/usr/share/themes/* \ + ${pkgdir}/usr/share/themes/ + done +} +md5sums=('cfb8f457a40090e242448951240e81d7' + '4ba11a4902c718b2b4ccc2216ae5f12a') diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index 8df2eb03d..9d34dc6dc 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125623 2011-05-27 08:34:32Z bisson $ +# $Id: PKGBUILD 130507 2011-07-07 02:35:18Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -6,8 +6,8 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P2 -_pkgver=9.8.0-P2 +pkgver=9.8.0.P4 +_pkgver=9.8.0-P4 pkgrel=1 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols' @@ -30,8 +30,8 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b' - 'ee52947062c1582858187716b776afa3613608fb' +sha1sums=('969864200c1516a8bea54266de60f316d79182b4' + 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' '17444f9d759a4bde7688bdaa304dac57a138e4c1' '46232e9db243c6c05e170a1781d7a7f413be5d03' diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 3ca7e379f..2e32cef93 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127566 2011-06-16 15:50:23Z andrea $ +# $Id: PKGBUILD 130704 2011-07-07 21:27:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez -pkgver=4.94 +pkgver=4.95 pkgrel=1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" @@ -27,7 +27,7 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" 'bluetooth.conf.d' 'rc.bluetooth') -md5sums=('1b599892f4c71c0ab6cf0ed4d3cb226a' +md5sums=('f34338440a4b3697cb9b3a2584f3251d' '8f60a5eb9d84b9c64c478d63e1c24b10' 'ca4c39eb4bb201bd2eacad01492cd735') diff --git a/extra/cinepaint/LICENSE b/extra/cinepaint/LICENSE new file mode 100644 index 000000000..746207229 --- /dev/null +++ b/extra/cinepaint/LICENSE @@ -0,0 +1,25 @@ +Copyright (c) 2005, Kai-Uwe Behrmann +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * 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.ntributors may 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 +OWNER 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/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index c60484af5..93b61ee16 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,39 +1,48 @@ -# $Id: PKGBUILD 89858 2010-09-04 14:16:02Z remy $ +# $Id: PKGBUILD 130311 2011-07-04 22:01:41Z eric $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint _srcver=0.22-1 pkgver=${_srcver/-/.} -pkgrel=7 -pkgdesc="sophisticated graphics manipulation programm supporting >8bit pictures" -arch=(i686 x86_64) -license=('LGPL' 'GPL' 'MIT-OSI') -url=(http://cinepaint.org.sourceforge.net/) -depends=('gtk2>=2.18.6' 'openexr>=1.6.1' 'lcms>=1.18' 'libxmu>=1.0.4' 'libxpm>=3.5.7' 'fltk>=1.1.9' 'desktop-file-utils' 'ftgl>=2.1.3rc5' 'libjpeg>=8') -makedepends=('python2' 'gutenprint>=5.2.3') -optdepends=('python2' 'gutenprint') +pkgrel=8 +pkgdesc="Sophisticated graphics manipulation programm supporting >8bit pictures" +arch=('i686' 'x86_64') +license=('LGPL' 'GPL' 'MIT') +url="http://www.cinepaint.org" +depends=('gtk2>=2.18.6' 'openexr>=1.6.1' 'lcms>=1.18' 'libxpm>=3.5.7' 'fltk' + 'desktop-file-utils' 'ftgl>=2.1.3rc5') +makedepends=('python2' 'gutenprint') +optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins') options=('!libtool') install=cinepaint.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_srcver}.tar.gz + LICENSE cinepaint-0.22.1-gcc43.patch cinepaint-0.22.1-multiple_parameters_named.patch cinepaint-0.22.1-ambiguousawake.patch cinepaint-0.22-gcc44.patch) -md5sums=('f360587240db6b6d2f0bfd94c420c492' 'f05e17a16d0018e5301aff0e1fa597b0'\ - '0876510a5ce3d581ebdde7e18199c09f' '4586aa153a0d3cac36120afc1f95a880'\ +md5sums=('f360587240db6b6d2f0bfd94c420c492' + '169085743f667c250ea2e4022efecf5f' + 'f05e17a16d0018e5301aff0e1fa597b0' + '0876510a5ce3d581ebdde7e18199c09f' + '4586aa153a0d3cac36120afc1f95a880' '368e820c27f525e3569d43388f1c119a') build() { cd "${srcdir}/${pkgname}-${_srcver}" # FIXES - patch -Np1 -i "${srcdir}/cinepaint-0.22.1-gcc43.patch" || return 1 - patch -Np1 -i "${srcdir}/cinepaint-0.22-gcc44.patch" || return 1 - patch -Np1 -i "${srcdir}/cinepaint-0.22.1-multiple_parameters_named.patch" || return 1 - patch -Np0 -i "${srcdir}/cinepaint-0.22.1-ambiguousawake.patch" || return 1 + patch -Np1 -i "${srcdir}/cinepaint-0.22.1-gcc43.patch" + patch -Np1 -i "${srcdir}/cinepaint-0.22-gcc44.patch" + patch -Np1 -i "${srcdir}/cinepaint-0.22.1-multiple_parameters_named.patch" + patch -Np0 -i "${srcdir}/cinepaint-0.22.1-ambiguousawake.patch" find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + - find plug-ins/print -type f -exec \ - sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \; + find plug-ins/print -type f -exec sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \; + sed -i 's|Fl/Fl_File_Chooser.H|FL/Fl_File_Chooser.H|' lib/fl_i18n/fl_i18n.cxx + sed -i 's|Fl/Fl_Widget.H|FL/Fl_Widget.H|' plug-ins/icc_examin/icc_examin/icc_helfer.h + sed -i 's|Fl/Fl.H|FL/Fl.H|' plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp + sed -i 's|Fl/Fl_File_Chooser.H|FL/Fl_File_Chooser.H|' plug-ins/icc_examin/icc_examin/fl_i18n/fl_i18n.cxx + # Fix insecure rpath sed '/-rpath/d' -i plug-ins/icc_examin/icc_examin/configure @@ -45,11 +54,11 @@ build() { sed -i 's/^\(X_LIBS.*\)$/\1 -lpthread/' plug-ins/openexr/Makefile make } + package() { cd "${srcdir}/${pkgname}-${_srcver}" - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/applications" - install -m755 -d "${pkgdir}/usr/share/pixmaps" - install -m644 cinepaint.desktop "${pkgdir}/usr/share/applications/" || return 1 - install -m644 cinepaint.png "${pkgdir}/usr/share/pixmaps/" || return 1 + make DESTDIR="${pkgdir}" install + sed -i -e "s|-I$srcdir/cinepaint-0.22-1||" -e "s|-I$srcdir/cinepaint-0.22-1/lib||" -e "/libcinepaint.la/d" \ + -e "s|$srcdir/cinepaint-0.22-1/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD index f5335f613..2ce310cdd 100644 --- a/extra/fltk/PKGBUILD +++ b/extra/fltk/PKGBUILD @@ -1,26 +1,46 @@ -# $Id: PKGBUILD 71291 2010-03-06 01:40:12Z pierre $ +# $Id: PKGBUILD 130308 2011-07-04 21:56:54Z eric $ -pkgname=fltk -pkgver=1.1.10 +pkgbase=fltk +pkgname=('fltk' 'fltk-docs') +pkgver=1.3.0 pkgrel=1 -pkgdesc="Graphical user interface toolkit for X" arch=('i686' 'x86_64') -license=('LGPL') +license=('custom:LGPL') url="http://www.fltk.org/" -depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext') -makedepends=('mesa') -source=("http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2") -md5sums=('a1765594bc427ff892e36089fe1fa672') +depends=('sh' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils') +makedepends=('mesa' 'doxygen') +source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz) +md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3') build() { - cd $srcdir/$pkgname-$pkgver - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - export LDFLAGS="${LDFLAGS//,--as-needed}" + cd "$srcdir/$pkgbase-$pkgver" ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared - make || return 1 + make + cd documentation + make html } -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install +package_fltk() { + pkgdesc="Graphical user interface toolkit for X" + options=('!docs') + install=fltk.install + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install install-desktop + chmod 644 "$pkgdir"/usr/lib/*.a + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_fltk-docs() { + pkgdesc="Graphical user interface toolkit for X (documentation)" + depends=('') + + cd "$srcdir/$pkgbase-$pkgver/documentation" + install -d "$pkgdir"/usr/share/doc/fltk/ + for _file in html/* ; do + install -m644 $_file "$pkgdir"/usr/share/doc/fltk/ + done + cd ../test + make DESTDIR="$pkgdir" install + install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/fltk/fltk.install b/extra/fltk/fltk.install new file mode 100644 index 000000000..f89ec8213 --- /dev/null +++ b/extra/fltk/fltk.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD index 8c58575cd..7efaa8a18 100644 --- a/extra/foomatic/PKGBUILD +++ b/extra/foomatic/PKGBUILD @@ -1,27 +1,24 @@ -# $Id: PKGBUILD 103148 2010-12-15 21:11:48Z andyrtr $ +# $Id: PKGBUILD 130674 2011-07-07 16:52:03Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="foomatic" pkgname=('foomatic-db' 'foomatic-filters' 'foomatic-db-engine' 'foomatic-db-nonfree') arch=('i686' 'x86_64') # needs to be changed in the subpackages when makepkg will support it -_snapdate=20101215 -_relver=4.0.6 +_snapdate=20110707 +_relver=4.0.7 pkgver=${_relver}_${_snapdate} pkgrel=1 -makedepends=('cups>=1.4.2' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash') +epoch=1 +makedepends=('cups>=1.4.7' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash') source=(http://www.linuxprinting.org/download/foomatic/$pkgbase-{filters,db-engine}-${_relver}.tar.gz http://www.linuxprinting.org/download/foomatic/$pkgbase-db-4.0-${_snapdate}.tar.gz http://www.linuxprinting.org/download/foomatic/$pkgbase-db-nonfree-${_snapdate}.tar.gz) url="http://www.linuxprinting.org/foomatic.html" -options=('force' '!emptydirs') -md5sums=('fd99dac3a36807a47ffa4f9eb15c1b07' - '0893a4a9705ffd7305bc50cbb951daf9' - 'f801fab0b210cc61f217bede1963cd0e' - 'f51e447404b32949057307a1bc4d1b5e') -md5sums=('9bca3d3d83192a3741a34bd9b1859b1e' - 'b34f17b56304b48e3e90c1c6c8f2c287' - 'f99807cb4d5da437ddf02c843f92eaca' - '21040845f5fcb2bbdfa814bae934fd8d') +options=('!emptydirs') +md5sums=('20abd25c1c98b2dae68709062a132a7d' + 'fcfa8eb9ce5494b81b58ae983fc2aeb5' + '88d467d9099188b170185564bd33d7b7' + 'e12969b36dc0b59be6a973ee522d707e') build() { /bin/true @@ -39,8 +36,8 @@ package_foomatic-db() { cd ${srcdir}/${pkgname}-${_snapdate} ./configure --prefix=/usr - make DESTDIR=${pkgdir} install || return 1 - install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1 + make DESTDIR=${pkgdir} install + install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } package_foomatic-filters() { @@ -56,8 +53,8 @@ package_foomatic-filters() { # cd ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/foomatic-filters-${_relver} ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make + make DESTDIR=${pkgdir} install } package_foomatic-db-engine() { @@ -70,12 +67,12 @@ package_foomatic-db-engine() { # cd ${srcdir}/${pkgname}-${pkgver} cd ${srcdir}/foomatic-db-engine-${_relver} ./configure --prefix=/usr - make || return 1 + make eval `perl -V:archname` make DESTDIR=${pkgdir} \ INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \ INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \ - INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install || return 1 + INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install /usr/bin/find ${pkgdir} -name '.packlist' -delete # fix permissions chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl} @@ -91,7 +88,7 @@ package_foomatic-db-nonfree() { # cd ${srcdir}/${pkgname}-${_snapdate} cd ${srcdir}/foomatic-db-nonfree-${_snapdate} ./configure --prefix=/usr - make DESTDIR=${pkgdir} install || return 1 -# install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1 - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/foomatic-db-nonfree/COPYING || return 1 + make DESTDIR=${pkgdir} install +# install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/foomatic-db-nonfree/COPYING } diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD index b93cb243f..39a14d91d 100644 --- a/extra/kdeaccessibility/PKGBUILD +++ b/extra/kdeaccessibility/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121097 2011-04-29 00:27:46Z andrea $ +# $Id: PKGBUILD 130258 2011-07-04 19:27:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdeaccessibility-colorschemes' 'kdeaccessibility-kmag' 'kdeaccessibility-kmousetool' 'kdeaccessibility-kmouth') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://accessibility.kde.org' @@ -19,7 +19,7 @@ groups=('kde' 'kdeaccessibility') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'speech-dispatcher') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('8d4053defbf839fd428820d6d1659b6e46ab468a') +sha1sums=('6e40aab7c95671070cad0b5f59507ff887414ce0') build() { cd ${srcdir} diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index aa1f6a3e0..329404ead 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122186 2011-05-02 17:58:19Z andrea $ +# $Id: PKGBUILD 130259 2011-07-04 19:27:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -17,7 +17,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common' 'python2-pyqt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'syslog-path.patch') -sha1sums=('141e8e794ebd5341940d2d22986b7376a2abefbf' +sha1sums=('010912294a12461a8a0bfdce69c5373b37342cb6' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 6594d7a38..c6aefa0d0 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121099 2011-04-29 00:27:52Z andrea $ +# $Id: PKGBUILD 130260 2011-07-04 19:27:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('084834ac3c654ea24257d9ed407c2384bf5aa110') +sha1sums=('9bcf223f7ee2ca0e12f9c8ab8235dcd35f589a8d') build() { cd $srcdir diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index 4a4f75b6a..ca063d8c1 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121092 2011-04-29 00:27:28Z andrea $ +# $Id: PKGBUILD 130252 2011-07-04 19:27:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('htdig: to build the search index in khelpcenter' 'gdb: drkonq crash handler') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('75cf1993b42cbada44b8c3ca2d5b99e6ac48594c') +sha1sums=('e91d35af2a916259305cc7efc2f3a3fbc8b22def') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 0bc1f7a37..85be8853d 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124831 2011-05-24 17:22:55Z andrea $ +# $Id: PKGBUILD 130255 2011-07-04 19:27:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace -pkgver=4.6.3 -pkgrel=2 +pkgver=4.6.5 +pkgrel=1 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -27,17 +27,15 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch' - 'fix-app-launch-in-plasmoid.patch') -sha1sums=('50103b7752defbab08965b665fa95361bb5b3ff6' + 'fixpath.patch' 'terminate-server.patch') +sha1sums=('190a524d57c4e52e69dcc1fc2e5a1c0681239a1c' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'ca55cd0a25fd8cfb95fa3b1cdd373d496fd7312d') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -45,9 +43,6 @@ build() { patch -p0 -i ${srcdir}/fixpath.patch patch -p0 -i ${srcdir}/terminate-server.patch - # Already fixed upstream - patch -p1 -i ${srcdir}/fix-app-launch-in-plasmoid.patch - cd ${srcdir} mkdir build cd build diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 85efdbf20..354b64302 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121096 2011-04-29 00:27:43Z andrea $ +# $Id: PKGBUILD 130256 2011-07-04 19:27:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdebase-dolphin' 'kdebase-kwrite' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -21,7 +21,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('69cfba74099cdce27f7f72725288f025979b41f3') +sha1sums=('1a902d22956daaf380ceefe68f8db75b8b760ae6') build() { cd ${srcdir} diff --git a/extra/kdebindings/PKGBUILD b/extra/kdebindings/PKGBUILD index c9c3469f5..af6812ec9 100644 --- a/extra/kdebindings/PKGBUILD +++ b/extra/kdebindings/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('kdebindings-csharp' 'kdebindings-python' 'kdebindings-ruby' 'kdebindings-smoke') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL') makedepends=('pkgconfig' 'cmake' 'automoc4' 'python2-pyqt' 'kdepim-runtime' 'mono' 'kdegraphics-okular' 'qwt' 'boost' 'qscintilla' 'ruby') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('4ecc6ac378c241472aa75680abfafd8d57672653') +sha1sums=('e63a0b0eec92320df2c2c539b916c5ee9425a689') build() { export MONO_SHARED_DIR="${srcdir}/build/.mono" @@ -31,7 +31,8 @@ build() { -DBUILD_falcon=OFF \ -DBUILD_java=OFF \ -DBUILD_php=OFF \ - -DWITH_PolkitQt=OFF + -DWITH_PolkitQt=OFF \ + -DWITH_Soprano=OFF make } diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD index a5a24fb20..449a41c1c 100644 --- a/extra/kdeedu/PKGBUILD +++ b/extra/kdeedu/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 124802 2011-05-24 13:56:35Z andrea $ +# $Id: PKGBUILD 130257 2011-07-04 19:27:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=kdeedu pkgname=('kdeedu-blinken' 'kdeedu-cantor' - 'kdeedu-data' 'kdeedu-kalgebra' 'kdeedu-kalzium' 'kdeedu-kanagram' @@ -25,8 +24,8 @@ pkgname=('kdeedu-blinken' 'kdeedu-parley' 'kdeedu-rocs' 'kdeedu-step') -pkgver=4.6.3 -pkgrel=2 +pkgver=4.6.5 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -35,13 +34,16 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd' 'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre' 'python2' 'avogadro') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'gpsd-2.96.patch') -sha1sums=('4b27e6e1670760982dae13dc8c51c814c6853396' - 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e') + 'gpsd-2.96.patch' + 'remove-libkdeedu-libscience.patch') +sha1sums=('64247eb68b2710a66baaf824d798e46b34ca4d4f' + 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e' + 'cd4e18f2b30d42f6e2bcc518ad72fd49839fd8dc') build() { cd ${srcdir}/${pkgbase}-${pkgver} patch -Np1 -i ${srcdir}/gpsd-2.96.patch + patch -p1 -i ${srcdir}/remove-libkdeedu-libscience.patch cd ${srcdir} mkdir build @@ -59,7 +61,7 @@ package_kdeedu-blinken() { install='kdeedu.install' cd $srcdir/build/blinken make DESTDIR=$pkgdir install - cd $srcdir/build/doc/blinken + cd $srcdir/build/blinken/doc make DESTDIR=$pkgdir install } @@ -72,14 +74,7 @@ package_kdeedu-cantor() { install='kdeedu.install' cd $srcdir/build/cantor make DESTDIR=$pkgdir install - cd $srcdir/build/doc/cantor - make DESTDIR=$pkgdir install -} - -package_kdeedu-data() { - pkgdesc='Data for KDE Educational Software' - groups=() - cd $srcdir/build/data + cd $srcdir/build/cantor/doc make DESTDIR=$pkgdir install } @@ -89,7 +84,7 @@ package_kdeedu-kalgebra() { install='kdeedu.install' cd $srcdir/build/kalgebra make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kalgebra + cd $srcdir/build/kalgebra/doc make DESTDIR=$pkgdir install } @@ -99,17 +94,17 @@ package_kdeedu-kalzium() { install='kdeedu.install' cd $srcdir/build/kalzium make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kalzium + cd $srcdir/build/kalzium/doc make DESTDIR=$pkgdir install } package_kdeedu-kanagram() { pkgdesc='KDE Letter Order Game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + depends=('kdebase-runtime' 'kdeedu-libkdeedu') install='kdeedu.install' cd $srcdir/build/kanagram make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kanagram + cd $srcdir/build/kanagram/doc make DESTDIR=$pkgdir install } @@ -119,7 +114,7 @@ package_kdeedu-kbruch() { install='kdeedu.install' cd $srcdir/build/kbruch make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbruch + cd $srcdir/build/kbruch/doc make DESTDIR=$pkgdir install } @@ -129,17 +124,17 @@ package_kdeedu-kgeography() { install='kdeedu.install' cd $srcdir/build/kgeography make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kgeography + cd $srcdir/build/kgeography/doc make DESTDIR=$pkgdir install } package_kdeedu-khangman() { pkgdesc='KDE Hangman Game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + depends=('kdebase-runtime' 'kdeedu-libkdeedu') install='kdeedu.install' cd $srcdir/build/khangman make DESTDIR=$pkgdir install - cd $srcdir/build/doc/khangman + cd $srcdir/build/khangman/doc make DESTDIR=$pkgdir install } @@ -149,7 +144,7 @@ package_kdeedu-kig() { install='kdeedu.install' cd $srcdir/build/kig make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kig + cd $srcdir/build/kig/doc make DESTDIR=$pkgdir install # Use the python2 executable @@ -162,7 +157,7 @@ package_kdeedu-kiten() { install='kdeedu.install' cd $srcdir/build/kiten make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kiten + cd $srcdir/build/kiten/doc make DESTDIR=$pkgdir install } @@ -172,7 +167,7 @@ package_kdeedu-klettres() { install='kdeedu.install' cd $srcdir/build/klettres make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klettres + cd $srcdir/build/klettres/doc make DESTDIR=$pkgdir install } @@ -182,7 +177,7 @@ package_kdeedu-kmplot() { install='kdeedu.install' cd $srcdir/build/kmplot make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmplot + cd $srcdir/build/kmplot/doc make DESTDIR=$pkgdir install } @@ -192,7 +187,7 @@ package_kdeedu-kstars() { install='kdeedu.install' cd $srcdir/build/kstars make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kstars + cd $srcdir/build/kstars/doc make DESTDIR=$pkgdir install } @@ -202,7 +197,7 @@ package_kdeedu-ktouch() { install='kdeedu.install' cd $srcdir/build/ktouch make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktouch + cd $srcdir/build/ktouch/doc make DESTDIR=$pkgdir install } @@ -212,17 +207,17 @@ package_kdeedu-kturtle() { install='kdeedu.install' cd $srcdir/build/kturtle make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kturtle + cd $srcdir/build/kturtle/doc make DESTDIR=$pkgdir install } package_kdeedu-kwordquiz() { pkgdesc='A flashcard and vocabulary learning program' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + depends=('kdebase-runtime' 'kdeedu-libkdeedu') install='kdeedu.install' cd $srcdir/build/kwordquiz make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kwordquiz + cd $srcdir/build/kwordquiz/doc make DESTDIR=$pkgdir install } @@ -231,10 +226,10 @@ package_kdeedu-libkdeedu() { groups=() depends=('kdelibs') install='kdeedu.install' + replaces=('kdeedu-data') + conflicts=('kdeedu-data') cd $srcdir/build/libkdeedu make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \ - $pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake } package_kdeedu-marble() { @@ -243,19 +238,17 @@ package_kdeedu-marble() { install='kdeedu.install' cd $srcdir/build/marble make DESTDIR=$pkgdir install - cd $srcdir/build/doc/marble + cd $srcdir/build/marble/doc make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \ - $pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake } package_kdeedu-parley() { pkgdesc='Vocabulary Trainer' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python') + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdebindings-python') install='kdeedu.install' cd $srcdir/build/parley make DESTDIR=$pkgdir install - cd $srcdir/build/doc/parley + cd $srcdir/build/parley/doc make DESTDIR=$pkgdir install } @@ -265,7 +258,7 @@ package_kdeedu-rocs() { install='kdeedu.install' cd $srcdir/build/rocs make DESTDIR=$pkgdir install - cd $srcdir/build/doc/rocs + cd $srcdir/build/rocs/doc make DESTDIR=$pkgdir install } @@ -275,6 +268,6 @@ package_kdeedu-step() { install='kdeedu.install' cd $srcdir/build/step make DESTDIR=$pkgdir install - cd $srcdir/build/doc/step + cd $srcdir/build/step/doc make DESTDIR=$pkgdir install } diff --git a/extra/kdeedu/remove-libkdeedu-libscience.patch b/extra/kdeedu/remove-libkdeedu-libscience.patch new file mode 100644 index 000000000..a8643d49f --- /dev/null +++ b/extra/kdeedu/remove-libkdeedu-libscience.patch @@ -0,0 +1,10 @@ +--- kdeedu-4.6.4/libkdeedu/CMakeLists.txt~ 2011-06-10 16:59:34.922935038 +0000 ++++ kdeedu-4.6.4/libkdeedu/CMakeLists.txt 2011-06-10 16:59:56.279802081 +0000 +@@ -8,7 +8,6 @@ + + add_subdirectory(keduvocdocument) + add_subdirectory(kdeeduui) +-add_subdirectory(libscience) + add_subdirectory(data) + #add_subdirectory(widgets) + add_subdirectory(qtmmlwidget) diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index 4f120b7c0..21bc2765c 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 123676 2011-05-12 11:12:57Z andrea $ +# $Id: PKGBUILD 130261 2011-07-04 19:27:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -43,16 +43,16 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.6.3 -pkgrel=2 +pkgver=4.6.5 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdegames') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'ggz-client-libs' - 'twisted' 'kdebindings-python') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted' + 'kdebindings-python' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('472cb9541f389a8869a496f715d48587db568dda') +sha1sums=('28c4908439f493fa30436875a77de01a21e88f4c') build() { cd $srcdir @@ -61,8 +61,7 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_OpenAL=OFF + -DCMAKE_INSTALL_PREFIX=/usr make } @@ -90,7 +89,7 @@ package_kdegames-bovo() { package_kdegames-granatier() { pkgdesc='Granatier' - depends=('kdebase-runtime' 'kdegames-libkdegames') + depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') url="http://kde.org/applications/games/granatier/" install='kdegames.install' cd $srcdir/build/granatier @@ -215,7 +214,7 @@ package_kdegames-kfourinline() { package_kdegames-kgoldrunner() { pkgdesc='A game of action and puzzle-solving' - depends=('kdebase-runtime' 'kdegames-libkdegames') + depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal') url="http://kde.org/applications/games/kgoldrunner/" install='kdegames.install' cd $srcdir/build/kgoldrunner diff --git a/extra/kdegraphics/PKGBUILD b/extra/kdegraphics/PKGBUILD index eacf66276..37ac0ab2e 100644 --- a/extra/kdegraphics/PKGBUILD +++ b/extra/kdegraphics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121093 2011-04-29 00:27:32Z andrea $ +# $Id: PKGBUILD 130500 2011-07-06 23:50:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,8 +12,8 @@ pkgname=('kdegraphics-gwenview' 'kdegraphics-ksnapshot' 'kdegraphics-libs' 'kdegraphics-okular') -pkgver=4.6.3 -pkgrel=1 +pkgver=4.6.5 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -22,7 +22,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'sane' 'lcms' 'libxxf86vm' 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre' 'ebook-tools' 'kdebase-runtime') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('c16dc9c55e7459418fa9887aa532ea0a269e7179') +sha1sums=('1e64698993d0754dfae1296d8d16ba9370f9a08c') build() { cd ${srcdir} diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 006f488d8..ab89b60f9 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124805 2011-05-24 14:15:20Z andrea $ +# $Id: PKGBUILD 130249 2011-07-04 19:26:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs -pkgver=4.6.3 -pkgrel=3 +pkgver=4.6.5 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,12 +20,11 @@ replaces=('arts' 'kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kde-applications-menu.patch' 'archlinux-menu.patch' - 'abs-syntax-highlight.patch' 'fix-double-POST-action.patch') -sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4' + 'abs-syntax-highlight.patch') +sha1sums=('9bb948769a3a5d4d5b6c65e84a8cf570bd7bc120' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - 'd994f262356af5b9e4e9619646e471bd98c91efb' - 'c8ef05943e71a28c4604217d31fc6ca83e48476c') + 'd994f262356af5b9e4e9619646e471bd98c91efb') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -37,9 +36,6 @@ build() { # add syntax highlightning for PKGBUILD and .install files patch -p1 -i $srcdir/abs-syntax-highlight.patch - # Already fixed upstream - patch -p1 -i $srcdir/fix-double-POST-action.patch - cd ${srcdir} mkdir build cd build diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index 816d66bbb..85973e455 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121101 2011-04-29 00:27:58Z andrea $ +# $Id: PKGBUILD 130262 2011-07-04 19:27:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kmix' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp' 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'mplayerthumbs.config') -sha1sums=('d5bde19156b65e9b56e0e6de800efc0efe117632' +sha1sums=('081bead5ee758d169f3119c138424929b001d04f' 'ba016fa2563c14ffcba852c62506b66bfc6ee683') build() { diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 6d672de87..78a73889b 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121102 2011-04-29 00:28:01Z andrea $ +# $Id: PKGBUILD 130263 2011-07-04 19:27:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -19,12 +19,12 @@ groups=('kde' 'kdenetwork') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' - 'telepathy-qt4' 'libktorrent') + 'telepathy-qt4' 'libktorrent' 'mediastreamer') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('6f140dca442be815eda4fb79d51efd9e4588a1f1') +sha1sums=('cc398063da61f9f9ef0db4455dc0c989a4e68a25') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ @@ -33,7 +33,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ -DWITH_Xmms=OFF \ - -DWITH_LibMeanwhile=OFF + -DWITH_LibMeanwhile=OFF \ + -DWITH_msiLBC=OFF make } @@ -70,7 +71,7 @@ package_kdenetwork-kget() { package_kdenetwork-kopete() { pkgdesc='Instant Messenger' depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' - 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu') + 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu' 'mediastreamer') url="http://kde.org/applications/internet/kopete/" install='kdenetwork.install' cd $srcdir/build/kopete diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 208459210..c53892f01 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 120273 2011-04-22 00:22:43Z andrea $ +# $Id: PKGBUILD 130494 2011-07-06 23:34:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.4.11.1 +pkgver=4.6.1 pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64') -url='http://www.kde.org' +url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') depends=('kdepimlibs' 'kdebase-runtime') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install=${pkgname}.install -source=("http://download.kde.org/stable/kdepim-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('e3105eb99ab0de47c617f8491774b2e3ee4cdd4a') +source=("http://download.kde.org/stable/kdepim-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'disable-l10n.patch') +sha1sums=('e416ffd0142c720a779b4eb2e4a841ca751efdce' + 'd4f8c39911cf288973a30d4b71087906ebb26359') build() { - cd $srcdir + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/disable-l10n.patch + + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -27,6 +32,6 @@ build() { } package() { - cd $srcdir/build - make DESTDIR=$pkgdir install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/extra/kdepim-runtime/disable-l10n.patch b/extra/kdepim-runtime/disable-l10n.patch new file mode 100644 index 000000000..b49cd54a8 --- /dev/null +++ b/extra/kdepim-runtime/disable-l10n.patch @@ -0,0 +1,10 @@ +--- kdepim-runtime-4.6.0/CMakeLists.txt~ 2011-06-10 16:49:12.130427269 +0000 ++++ kdepim-runtime-4.6.0/CMakeLists.txt 2011-06-10 16:56:52.871414776 +0000 +@@ -194,7 +194,3 @@ + update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR}) + + macro_display_feature_log() +- +-find_package(Msgfmt REQUIRED) +-find_package(Gettext REQUIRED) +-add_subdirectory(po) diff --git a/extra/kdepim-runtime/kdepim-runtime.install b/extra/kdepim-runtime/kdepim-runtime.install index ce5c32e1b..c77e68041 100644 --- a/extra/kdepim-runtime/kdepim-runtime.install +++ b/extra/kdepim-runtime/kdepim-runtime.install @@ -1,6 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { @@ -9,4 +10,4 @@ post_upgrade() { post_remove() { post_install -}
\ No newline at end of file +} diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 4b3e307b0..210df38c0 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 120278 2011-04-22 00:23:46Z andrea $ +# $Id: PKGBUILD 130497 2011-07-06 23:35:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,219 +20,239 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.4.11.1 +pkgver=4.6.1 pkgrel=1 arch=('i686' 'x86_64') -url='http://www.kde.org' +url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'disable-l10n.patch') +sha1sums=('aa4dc75d33b3aa105e3f3b2f41e9d87b57cbf20a' + 'f52c8d3918e3cd6d8e0180af243333ee2d87d382') build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/disable-l10n.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DKDEPIM_BUILD_MOBILE=OFF + make } package_kdepim-akonadiconsole() { pkgdesc='Akonadi Management and Debugging Console' - depends=('kdepim-libkdepim' 'kdebase-runtime') + depends=('kdepim-libkdepim') + url='http://pim.kde.org' install='kdepim.install' - cd $srcdir/build/akonadiconsole - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/akonadiconsole + make DESTDIR="${pkgdir}" install } package_kdepim-akregator() { pkgdesc='A Feed Reader for KDE' - depends=('kdepim-libkdepim' 'kdebase-runtime') + depends=('kdepim-libkdepim') url="http://kde.org/applications/internet/akregator/" install='kdepim.install' - cd $srcdir/build/akregator - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/akregator - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/akregator - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/akregator + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/akregator + make DESTDIR="${pkgdir}" install } package_kdepim-blogilo() { pkgdesc='A KDE Blogging Client' - depends=('kdebase-runtime' 'kdepimlibs' 'kdepim-runtime') + depends=('kdepim-runtime') url="http://kde.org/applications/internet/blogilo/" replaces=('blogilo') conflicts=('blogilo') install='kdepim.install' - cd $srcdir/build/blogilo - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/blogilo - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/blogilo + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/blogilo + make DESTDIR="${pkgdir}" install } package_kdepim-console() { pkgdesc='Command line tool for accessing calendar files' - depends=('kdebase-runtime' 'kdepimlibs' 'kdepim-runtime') - cd $srcdir/build/console - make DESTDIR=$pkgdir install + depends=('kdepim-runtime') + url='http://pim.kde.org' + install='kdepim.install' + cd "${srcdir}"/build/console + make DESTDIR="${pkgdir}" install } package_kdepim-kaddressbook() { pkgdesc='Contact Manager' - depends=('kdepim-libkdepim' 'kdebase-runtime') + depends=('kdepim-libkdepim') url="http://kde.org/applications/office/kaddressbook/" install='kdepim.install' - cd $srcdir/build/kaddressbook - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/kaddressbook - make DESTDIR=$pkgdir install - cd $srcdir/build/plugins/kaddressbook - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kaddressbook + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/plugins/kaddressbook + make DESTDIR="${pkgdir}" install } package_kdepim-kalarm() { pkgdesc='Personal Alarm Scheduler' - depends=('kdepim-libkdepim' 'kdebase-runtime') + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kalarm/" install='kdepim.install' - cd $srcdir/build/kalarm - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kalarm - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/kalarm + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kalarm + make DESTDIR="${pkgdir}" install } package_kdepim-kjots() { pkgdesc='Note Taker' - depends=('kdebase-runtime' 'kdepimlibs' 'kdepim-runtime') + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kjots/" install='kdepim.install' - cd $srcdir/build/kjots - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kjots - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/kjots - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kjots + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/kjots + make DESTDIR="${pkgdir}" install } package_kdepim-kleopatra() { pkgdesc='Certificate Manager and Unified Crypto GUI' - depends=('kdepim-libkdepim' 'kdebase-runtime') - cd $srcdir/build/kleopatra - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kleopatra - make DESTDIR=$pkgdir install + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/kleopatra/" + install='kdepim-kleopatra.install' + cd "${srcdir}"/build/kleopatra + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kleopatra + make DESTDIR="${pkgdir}" install } package_kdepim-kmail() { pkgdesc='Mail Client' - depends=('kdepim-libkdepim' 'kdebase-runtime') + depends=('kdepim-libkdepim') url="http://kde.org/applications/internet/kmail/" - install='kdepim.install' + install='kdepim-kmail.install' conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins') replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' 'kdepim-mimelib' 'kdepim-plugins') - optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication') - for i in kmail doc/kmail mimelib libksieve plugins/kmail ksendemail \ - kmailcvt ontologies kontact/plugins/kmail; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install + optdepends=('cyrus-sasl-plugins: CRAM-MD5 authentication') + for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \ + nepomuk_email_feeder ontologies templateparser kontact/plugins/kmail; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install done } package_kdepim-knode() { pkgdesc='News Reader' - depends=('kdebase-runtime' 'kdepim-libkdepim') + depends=('kdepim-libkdepim') url="http://kde.org/applications/internet/knode/" install='kdepim.install' - cd $srcdir/build/knode - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/knode - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/knode - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knode + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knode + make DESTDIR="${pkgdir}" install } package_kdepim-knotes() { pkgdesc='Popup Notes' - depends=('kdepim-libkdepim' 'kdebase-runtime') + depends=('kdepim-libkdepim') + url="http://kde.org/applications/utilities/knotes/" install='kdepim.install' - cd $srcdir/build/knotes - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/knotes - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/knotes - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/knotes + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/knotes + make DESTDIR="${pkgdir}" install } package_kdepim-kontact() { pkgdesc='Personal Information Manager' - depends=('kdebase-runtime' 'kdepim-korganizer') + depends=('kdepim-libkdepim') url="http://kde.org/applications/office/kontact/" install='kdepim.install' conflcits=('kdepim-kontactinterfaces') replaces=('kdepim-kontactinterfaces') - for i in kontact/src kontact/pics doc/kontact\ - kontact/plugins/summary; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install + for i in kontact/src doc/kontact \ + kontact/plugins/summary kontact/plugins/specialdates; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install done } package_kdepim-korganizer() { pkgdesc='Calendar and Scheduling Program' - depends=('kdepim-libkdepim' 'kdebase-runtime') + depends=('kdepim-libkdepim') url="http://kde.org/applications/office/korganizer" - install='kdepim.install' - cd $srcdir/build/korganizer - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/korganizer - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/korganizer - make DESTDIR=$pkgdir install + install='kdepim-korganizer.install' + cd "${srcdir}"/build/korganizer + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/korganizer + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/korganizer + make DESTDIR="${pkgdir}" install } package_kdepim-kresources() { pkgdesc='KDE PIM resources' - depends=('kdebase-runtime' 'kdepim-libkdepim') - cd $srcdir/build/kresources - make DESTDIR=$pkgdir install + depends=('kdepim-libkdepim') + url='http://pim.kde.org' + cd "${srcdir}"/build/kresources + make DESTDIR="${pkgdir}" install } package_kdepim-ktimetracker() { pkgdesc='Personal Time Tracker' - depends=('kdebase-runtime' 'kdepim-kresources') + depends=('kdepim-kresources') + url="http://kde.org/applications/utilities/ktimetracker/" install='kdepim.install' - cd $srcdir/build/ktimetracker - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktimetracker - make DESTDIR=$pkgdir install - cd $srcdir/build/kontact/plugins/ktimetracker - make DESTDIR=$pkgdir install + cd "${srcdir}"/build/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/ktimetracker + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/kontact/plugins/ktimetracker + make DESTDIR="${pkgdir}" install } package_kdepim-libkdepim() { pkgdesc='Library for KDE PIM' groups=() - depends=('kdepimlibs' 'kde-agent' 'kdepim-runtime') + depends=('kde-agent' 'kdepim-runtime') + url='http://pim.kde.org' conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' 'kdepim-strigi-analyzer' 'kdepim-akonadi') - for i in libkdepim icons libkleo libkpgp strigi-analyzer \ - messagecore messagelist messageviewer akonadi plugins/ktexteditor; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install + for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \ + kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ + messagecomposer messagecore messagelist messageviewer icons \ + strigi-analyzer plugins/messageviewer plugins/ktexteditor; do + cd "${srcdir}"/build/${i} + make DESTDIR="${pkgdir}" install done } package_kdepim-wizards() { pkgdesc='KDE Groupware Wizard' - depends=('kdebase-runtime' 'kdepim-libkdepim' 'kdepim-kresources') - cd $srcdir/build/wizards - make DESTDIR=$pkgdir install + depends=('kdepim-kresources') + url='http://pim.kde.org' + cd "${srcdir}"/build/wizards + make DESTDIR="${pkgdir}" install } diff --git a/extra/kdepim/disable-l10n.patch b/extra/kdepim/disable-l10n.patch new file mode 100644 index 000000000..0c24ab408 --- /dev/null +++ b/extra/kdepim/disable-l10n.patch @@ -0,0 +1,10 @@ +--- kdepim-4.6.1/CMakeLists.txt~ 2011-07-06 19:17:16.801814825 +0000 ++++ kdepim-4.6.1/CMakeLists.txt 2011-07-06 19:17:34.141961840 +0000 +@@ -425,7 +425,3 @@ + endif(NOT QGPGME_FOUND) + # All done, let's display what we found... + macro_display_feature_log() +-find_package(Msgfmt REQUIRED) +-find_package(Gettext REQUIRED) +-add_subdirectory(po) +-add_subdirectory(doc-translations) diff --git a/extra/kdepim/kdepim-kleopatra.install b/extra/kdepim/kdepim-kleopatra.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/extra/kdepim/kdepim-kleopatra.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kdepim/kdepim-kmail.install b/extra/kdepim/kdepim-kmail.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/extra/kdepim/kdepim-kmail.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kdepim/kdepim-korganizer.install b/extra/kdepim/kdepim-korganizer.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/extra/kdepim/kdepim-korganizer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 43c20cc0c..67d38d3b2 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121090 2011-04-29 00:27:22Z andrea $ +# $Id: PKGBUILD 130250 2011-07-04 19:26:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' ) makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('370b4e98ab9e1f8ba18d36630d5c8bbff8da4883') +sha1sums=('6bf82a0934d5a16223f193e848bf3696a40e4820') build() { cd ${srcdir} diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index e6703b7f4..749887ce4 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122728 2011-05-06 08:49:57Z andrea $ +# $Id: PKGBUILD 130264 2011-07-04 19:28:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -72,7 +72,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-pattern' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -81,7 +81,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('7a43dcfebc0316e681b04d0958d89272620a11b7') +sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8') build() { cd ${srcdir} diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index afb12e671..7c51f7b13 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126168 2011-06-02 00:51:07Z andrea $ +# $Id: PKGBUILD 130265 2011-07-04 19:28:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -23,8 +23,8 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.6.3 -pkgrel=2 +pkgver=4.6.5 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -33,7 +33,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'subversion 'antlr2' 'kdebase-konqueror') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'fix-python2-path.patch') -sha1sums=('6faecbd828fda6cf0aced642287d982d3541d746' +sha1sums=('8cffa0472fbe1096ebfea9bde49aaff76a145b34' 'd05ca0231869c484fd3861955d960a60aff7dcfb') build() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index de6101cb5..fb1e8a81e 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121104 2011-04-29 00:28:07Z andrea $ +# $Id: PKGBUILD 130266 2011-07-04 19:28:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('07eaf12ccabc9209bd5de6a3f0e4ff6c70fca8b0') +sha1sums=('0ce43a76f5b7005d60430692ae87421661281f1f') build() { cd $srcdir diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD index a953627e1..6a6cae983 100644 --- a/extra/kdeutils/PKGBUILD +++ b/extra/kdeutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121105 2011-04-29 00:28:11Z andrea $ +# $Id: PKGBUILD 130267 2011-07-04 19:28:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -16,7 +16,7 @@ pkgname=('kdeutils-ark' 'kdeutils-printer-applet' 'kdeutils-superkaramba' 'kdeutils-sweeper') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -26,7 +26,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' 'qjson') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('1aa735c03689ef49b949278ee31d0d8e8536b7d6') +sha1sums=('1c2ae023d9a6bcf72d3cebd0d7df2e6a175ffdcb') build() { cd ${srcdir} diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 686a9dc62..495378d50 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 121106 2011-04-29 00:28:14Z andrea $ +# $Id: PKGBUILD 130268 2011-07-04 19:28:19Z andrea $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=kdewebdev @@ -6,7 +6,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.6.3 +pkgver=4.6.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -15,7 +15,7 @@ groups=('kde' 'kdewebdev') makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('39e72fbaf76ee1c685321c8c3a767c38e63bc2a9') +sha1sums=('b7ec635c438f865337f5ef1e7bbaca23643ed871') build() { cd $srcdir diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 74b940110..9dc386211 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130106 2011-07-02 19:39:19Z andyrtr $ +# $Id: PKGBUILD 130669 2011-07-07 16:34:03Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -77,7 +77,6 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions http://download.go-oo.org/src/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 - http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt @@ -177,7 +176,6 @@ md5sums=('10b3212002688e7ce49a276c68352b50' '7a0dcb3fe1e8c7229ab4fb868b7325e6' '185d60944ea767075d27247c3162b3bc' 'b4cae0700aa1c2aef7eb7f345365e6f1' - '451ccf439a36a568653b024534669971' '90401bca927835b6fbae4a707ed187c8' 'f02578f5218f217a9f20e9c30e119c6a' '7e7efc5d4a03126bb9ae3ae9aa2c4e87' diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 7d7ab740e..26c64dbc0 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 115723 2011-03-20 15:52:24Z andyrtr $ +# $Id: PKGBUILD 130682 2011-07-07 17:24:45Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'xorg-util-macros') options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('97e60a60dd789287e47df807e487f4952dd4ff95') +sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD index c888828b9..e148eb6cd 100644 --- a/extra/libxrandr/PKGBUILD +++ b/extra/libxrandr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97787 2010-11-01 22:11:26Z jgc $ +# $Id: PKGBUILD 130687 2011-07-07 17:27:06Z andyrtr $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libxrandr -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('libxext' 'libxrender' 'randrproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) -sha1sums=('8e89622b0656cb2eb22c1f3c646c797dc648ead5') +sha1sums=('0c844a4c5237f96794f0c18a5af16dc5ab7a36ec') build() { cd "${srcdir}/libXrandr-${pkgver}" diff --git a/extra/monica/PKGBUILD b/extra/monica/PKGBUILD index 82b0a4850..b3783fd57 100644 --- a/extra/monica/PKGBUILD +++ b/extra/monica/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 2959 2008-06-17 01:02:56Z eric $ +# $Id: PKGBUILD 130314 2011-07-04 22:06:55Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=monica pkgver=3.7 -pkgrel=1 +pkgrel=2 pkgdesc="A monitor calibration tool" -arch=(i686 x86_64) -license=('custom') +arch=('i686' 'x86_64') url="http://www.pcbypaul.com/software/monica.html" -depends=('fltk') -makedepends=('librsvg' 'python') -source=(http://www.pcbypaul.com/software/dl/${pkgname}-${pkgver}.tar.bz2 \ - ${pkgname}.desktop ${pkgname}.svg) -md5sums=('490aabc35b830e4a3dc32a2f893ba805' 'a337bfda1fca7228420db0ce92256816'\ +license=('BSD') +depends=('fltk' 'xorg-xgamma') +makedepends=('librsvg') +#http://www.pcbypaul.com/software/dl/${pkgname}-${pkgver}.tar.bz2 +source=(ftp://ftp.archlinux.org/other/monica/${pkgname}-${pkgver}.tar.bz2 \ + monica.desktop monica.svg) +md5sums=('490aabc35b830e4a3dc32a2f893ba805' + 'a337bfda1fca7228420db0ce92256816' '4569f5df7d7b3eaf20108adf48e8dfe4') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - make || return 1 - install -Dm755 ${pkgname} ${startdir}/pkg/usr/bin/${pkgname} - install -Dm644 ../${pkgname}.desktop \ - ${startdir}/pkg/usr/share/applications/${pkgname}.desktop - install -Dm644 ../${pkgname}.svg \ - ${startdir}/pkg/usr/share/pixmaps/${pkgname}.svg - rsvg -w 64 -h 57 -f png ${startdir}/pkg/usr/share/pixmaps/${pkgname}.svg \ - ${startdir}/pkg/usr/share/pixmaps/${pkgname}.png - install -Dm644 licence ${startdir}/pkg/usr/share/licenses/monica/license.txt + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -Dm755 monica "${pkgdir}/usr/bin/monica" + install -Dm644 "${srcdir}/monica.desktop" "${pkgdir}/usr/share/applications/monica.desktop" + install -Dm644 "${srcdir}/monica.svg" "${pkgdir}/usr/share/pixmaps/monica.svg" + rsvg-convert -w 64 -h 57 -f png -o "${pkgdir}/usr/share/pixmaps/monica.png" "${srcdir}/monica.svg" + install -Dm644 licence "${pkgdir}/usr/share/licenses/monica/license.txt" } diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD index 10c2a4a46..cae937292 100644 --- a/extra/obexd/PKGBUILD +++ b/extra/obexd/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 106996 2011-01-20 12:27:07Z andrea $ +# $Id: PKGBUILD 130696 2011-07-07 21:06:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgbase=obexd pkgname=('obexd-client' 'obexd-server') -pkgver=0.40 +pkgver=0.41 pkgrel=1 url="http://www.bluez.org/" arch=('i686' 'x86_64') license=('GPL2') makedepends=('openobex' 'libical') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('f303592b7664b246965c1d6e9361c919') +md5sums=('d8ec74f18014e0f7164bcc37dee6723b') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 7ae08c572..e48ce2510 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127765 2011-06-18 08:12:47Z bisson $ +# $Id: PKGBUILD 130701 2011-07-07 21:12:32Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=postfix -pkgver=2.8.3 -pkgrel=4 +pkgver=2.8.4 +pkgrel=1 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' url='http://www.postfix.org/' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ 'aliases.patch' \ 'rc.d') -sha1sums=('2604066f158f5327449960afd6334b996dc01799' +sha1sums=('48d077ad2614098f39411cb965a74d8ce2f3e5be' '5fc3de6c7df1e5851a0a379e825148868808318b' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') @@ -27,7 +27,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - + make makefiles DEBUG='' CCARGS=' \ -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ -DHAS_LDAP \ diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD index b353c6437..63c0c31b3 100644 --- a/extra/rasqal/PKGBUILD +++ b/extra/rasqal/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 120960 2011-04-27 19:27:24Z andrea $ +# $Id: PKGBUILD 130165 2011-07-02 23:00:40Z andrea $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lawrence Lee <valheru@facticius.net> pkgname=rasqal epoch=1 -pkgver=0.9.21 +pkgver=0.9.26 pkgrel=1 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" url="http://librdf.org/rasqal" license=('GPL' 'LGPL') arch=('i686' 'x86_64') -depends=('raptor1' 'mpfr') +depends=('raptor>=2.0.3' 'mpfr') options=('!libtool') -replaces=('rasqal-compat') -conflicts=('rasqal-compat') source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) -md5sums=('55b67ec92a059ef8979d46486b00a032') +md5sums=('1e9fe5423498f10f636319633855e691') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index 35ca87ac8..698851fbd 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 127976 2011-06-20 14:47:11Z andrea $ +# $Id: PKGBUILD 130173 2011-07-02 23:43:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano -pkgver=2.6.0 -pkgrel=6 +pkgver=2.6.50git20110703 +pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso') makedepends=('cmake' 'openjdk6' 'doxygen') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('03ae49e87c6ec99e57d0433c2650846f') +#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=soprano.git&a=snapshot&h=3a7a527fd07c0d58146eb9e6770ecbcfb6717bc6&fmt=tbz2") +md5sums=('21ef1f075062ea13d3e55d89d8f92fd2') build() { cd "${srcdir}" @@ -20,7 +21,7 @@ build() { cd build . /etc/profile.d/openjdk6.sh # we need the rpath - cmake ../${pkgname}-${pkgver} \ + cmake ../${pkgname} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index 82f425511..52979a01c 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 126576 2011-06-06 10:40:59Z jgc $ +# $Id: PKGBUILD 130717 2011-07-07 22:08:11Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-input-synaptics -pkgver=1.4.0.901 +pkgver=1.4.1 pkgrel=1 pkgdesc="Synaptics driver for notebook touchpads" arch=(i686 x86_64) @@ -22,13 +22,16 @@ options=(!libtool) backup=('etc/X11/xorg.conf.d/10-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 10-synaptics.conf) -sha1sums=('2203f64a9d656088387c81c5914422c63827848f' +sha1sums=('e41201476f4bc8658291808d2d6ef2e0535179ae' '68e1f4ef5e1038231d210eb422fa4d18c5922f0f') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/" diff --git a/extra/xorg-mkfontscale/PKGBUILD b/extra/xorg-mkfontscale/PKGBUILD index b7eee43a6..883dc49b7 100644 --- a/extra/xorg-mkfontscale/PKGBUILD +++ b/extra/xorg-mkfontscale/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 113678 2011-03-10 14:41:30Z jgc $ +# $Id: PKGBUILD 130725 2011-07-07 22:14:26Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-mkfontscale -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="Create an index of scalable font files for X" arch=(i686 x86_64) @@ -12,12 +12,16 @@ depends=('freetype2' 'libfontenc') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/mkfontscale-${pkgver}.tar.bz2) -sha1sums=('accfb12751bf3b7ae7b28c1b0b863d5be871398f') +sha1sums=(''5a8ac438d6d6694dcf1314b74c4d9f029da4f486) build() { cd "${srcdir}/mkfontscale-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/mkfontscale-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-smproxy/PKGBUILD b/extra/xorg-smproxy/PKGBUILD index 50964a380..d8c25e0a4 100644 --- a/extra/xorg-smproxy/PKGBUILD +++ b/extra/xorg-smproxy/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113698 2011-03-10 14:47:17Z jgc $ +# $Id: PKGBUILD 130730 2011-07-07 22:18:10Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-smproxy -pkgver=1.0.4 -pkgrel=2 +pkgver=1.0.5 +pkgrel=1 pkgdesc="Allows X applications that do not support X11R6 session management to participate in an X11R6 session" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -12,12 +12,16 @@ depends=('libsm' 'libxt' 'libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/smproxy-${pkgver}.tar.bz2) -sha1sums=('ea9639b6d0669f157ac62b807cdba64f509b25ed') +sha1sums=('59e19def9a351896cb3101cb580ae424e9e48a3e') build() { cd "${srcdir}/smproxy-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/smproxy-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xkbcomp/PKGBUILD b/extra/xorg-xkbcomp/PKGBUILD index 50c2b77f6..dc2ec9c89 100644 --- a/extra/xorg-xkbcomp/PKGBUILD +++ b/extra/xorg-xkbcomp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113771 2011-03-10 15:39:50Z jgc $ +# $Id: PKGBUILD 130738 2011-07-07 22:22:56Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xkbcomp -pkgver=1.2.1 -pkgrel=2 +pkgver=1.2.3 +pkgrel=1 pkgdesc="X Keyboard description compiler" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -12,12 +12,16 @@ depends=('libxkbfile') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(${url}/releases/individual/app/xkbcomp-${pkgver}.tar.bz2) -sha1sums=('02d7e7b67a6ef3035f92f9e541252bf85e3f0385') +sha1sums=('c20d1b5b8e25634cc9a79c5e4c3397a5ffbee1e0') build() { cd "${srcdir}/xkbcomp-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xkbcomp-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xman/PKGBUILD b/extra/xorg-xman/PKGBUILD index b35686959..77bb96546 100644 --- a/extra/xorg-xman/PKGBUILD +++ b/extra/xorg-xman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: $ +# $Id: PKGBUILD 113771 2011-03-10 15:39:50Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xman -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="Unix manual page viewer" arch=(i686 x86_64) @@ -11,12 +11,16 @@ license=('custom') depends=('libxaw' 'libxt') makedepends=('xorg-util-macros' 'xproto' 'libxmu') source=(http://xorg.freedesktop.org/archive/individual/app/xman-${pkgver}.tar.bz2) -sha1sums=('c8e1170e837da4bc280ee907030b3f9245608ef2') +sha1sums=('ba10cf0b2d0c2b40ded93e892c69e7bd4586ad1e') build() { cd "${srcdir}/xman-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xman-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xprop/PKGBUILD b/extra/xorg-xprop/PKGBUILD index 9fd9e0cb5..32e121164 100644 --- a/extra/xorg-xprop/PKGBUILD +++ b/extra/xorg-xprop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113811 2011-03-10 15:49:11Z jgc $ +# $Id: PKGBUILD 130748 2011-07-07 22:27:50Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xprop -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="Property displayer for X" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -12,12 +12,16 @@ depends=('libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xprop-${pkgver}.tar.bz2) -sha1sums=('278f83c5077eed1d96c180bdc0a6f22ba5279a66') +sha1sums=('d531be0f5f2b7758216ea4d7890f88c42c5fa3fd') build() { cd "${srcdir}/xprop-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xprop-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xrandr/PKGBUILD b/extra/xorg-xrandr/PKGBUILD index 483f2748c..a208b1ee3 100644 --- a/extra/xorg-xrandr/PKGBUILD +++ b/extra/xorg-xrandr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113816 2011-03-10 15:50:41Z jgc $ +# $Id: PKGBUILD 130753 2011-07-07 22:30:11Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xrandr -pkgver=1.3.4 -pkgrel=2 +pkgver=1.3.5 +pkgrel=1 pkgdesc="Primitive command line interface to RandR extension" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -12,12 +12,16 @@ depends=('libxrandr' 'libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xrandr-${pkgver}.tar.bz2) -sha1sums=('637949501b8a45d32d9cab809e8822ee45b69414') +sha1sums=('ef45925d5b0e72c73d21798d65a41d476fdb0d3f') build() { cd "${srcdir}/xrandr-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xrandr-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xwininfo/PKGBUILD b/extra/xorg-xwininfo/PKGBUILD index 785353a88..1e16302d1 100644 --- a/extra/xorg-xwininfo/PKGBUILD +++ b/extra/xorg-xwininfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113851 2011-03-10 16:03:22Z jgc $ +# $Id: PKGBUILD 130758 2011-07-07 22:32:22Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xwininfo -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="Command-line utility to print information about windows on an X server" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -12,12 +12,16 @@ depends=('libxcb') makedepends=('xorg-util-macros' 'libx11') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xwininfo-${pkgver}.tar.bz2) -sha1sums=('945e5d51632876e304e001003c8068f34ffe299e') +sha1sums=('c90b3c289f95474aa8eb6cf1bf4caf3b9dbf82d3') build() { cd "${srcdir}/xwininfo-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/xwininfo-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 36fcc4aae..bb64074b9 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -5,17 +5,17 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=33690 -pkgrel=2 +pkgver=33805 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex' -'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig') +'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa') license=('GPL') url="http://www.mplayerhq.hu/" -options=(!buildflags !emptydirs !distcc) +options=(!buildflags !emptydirs) source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop) -md5sums=('7efa332d381a1461f8518730f8c52e4d' +md5sums=('512a0309ba5979a41ae93b740f4592f4' 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { @@ -46,7 +46,7 @@ package_mplayer-libre() { backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' 'speex' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' - 'libjpeg' 'faad2' 'libxvmc' 'schroedinger') + 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'ladspa') provides=("mplayer=$pkgver") replaces=('mplayer') conflicts=('mplayer') @@ -66,7 +66,7 @@ package_mplayer-libre() { package_mencoder-libre() { pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)" depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' 'speex' - 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger') + 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123') provides=("mencoder=$pkgver") replaces=('mencoder') conflicts=('mencoder') diff --git a/multilib/lib32-libpciaccess/PKGBUILD b/multilib/lib32-libpciaccess/PKGBUILD new file mode 100644 index 000000000..70f982a10 --- /dev/null +++ b/multilib/lib32-libpciaccess/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 51345 2011-07-07 21:46:31Z lcarlier $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +_pkgbasename=libpciaccess +pkgname=lib32-${_pkgbasename} +pkgver=0.12.1 +pkgrel=2 +pkgdesc="X11 PCI access library (32-bit" +arch=(i686 x86_64) +license=('custom') +url="http://xorg.freedesktop.org/" +depends=('lib32-glibc' ${_pkgbasename}) +makedepends=('gcc-multilib' 'pkgconfig' 'xorg-util-macros') +options=('!libtool') +source=(${url}/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2) +sha1sums=('4933bda545df37395e57ff6b4bd61e17a5431770') + +build() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libdir=/usr/lib32 + make + + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/include + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/testing/hwloc/PKGBUILD b/testing/hwloc/PKGBUILD new file mode 100644 index 000000000..e0d40b332 --- /dev/null +++ b/testing/hwloc/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 130527 2011-07-07 11:15:35Z stephane $ +# Maintainer : Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Sylvain HENRY <hsyl20@yahoo.fr> +# Contributor: Hervé YVIQUEL <elldekaa@gmail.com> + +pkgname=hwloc +pkgver=1.2 +pkgrel=1 +pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" +arch=('i686' 'x86_64') +url="http://www.open-mpi.org/projects/hwloc/" +license=('BSD') +depends=('sh') +makedepends=('pkg-config') +optdepends=('cairo: Graphical output' 'libxml2: XML export') +options=('!libtool' '!docs') +source=(http://www.open-mpi.org/software/hwloc/v1.2/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('43886dfdddda5bfbaa841976275e7bf643453d7b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/libdrm/COPYING b/testing/libdrm/COPYING new file mode 100644 index 000000000..6e74c337c --- /dev/null +++ b/testing/libdrm/COPYING @@ -0,0 +1,48 @@ + Copyright 2005 Adam Jackson. + + 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 on the rights to use, copy, modify, merge, + publish, distribute, sub license, 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 (including the + next paragraph) 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 + NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON 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. + +------------------------------------------------------------------------ + + Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. + Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. + All Rights Reserved. + + 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 (including the + next paragraph) 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 PRECISION INSIGHT AND/OR ITS + SUPPLIERS 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. diff --git a/testing/libdrm/PKGBUILD b/testing/libdrm/PKGBUILD new file mode 100644 index 000000000..fcc236ed2 --- /dev/null +++ b/testing/libdrm/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 130679 2011-07-07 17:20:06Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libdrm +pkgver=2.4.26 +pkgrel=1 +pkgdesc="Userspace interface to kernel DRM services" +arch=(i686 x86_64) +license=('custom') +depends=('glibc' 'libpciaccess') +options=('!libtool') +url="http://dri.freedesktop.org/" +source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + no-pthread-stubs.patch + COPYING) +md5sums=('062569426773f69b11a47a7712bba770' + 'c722c8406507b7e3a8da7a3030d1d9cf' + 'ba65e71c481b94ef0fb6c23c7f21ffa1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" + +# libtoolize --force + autoreconf --force --install + ./configure --prefix=/usr \ + --enable-udev \ + --enable-intel \ + --enable-radeon \ + --enable-vmwgfx-experimental-api \ + --enable-nouveau-experimental-api + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/libdrm/no-pthread-stubs.patch b/testing/libdrm/no-pthread-stubs.patch new file mode 100644 index 000000000..348c2a795 --- /dev/null +++ b/testing/libdrm/no-pthread-stubs.patch @@ -0,0 +1,66 @@ +diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac +--- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 ++++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 +@@ -47,10 +47,6 @@ + LT_INIT([disable-static]) + + +-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) +-AC_SUBST(PTHREADSTUBS_CFLAGS) +-AC_SUBST(PTHREADSTUBS_LIBS) +- + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) + AC_SUBST(PCIACCESS_CFLAGS) + AC_SUBST(PCIACCESS_LIBS) +--- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 ++++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 +@@ -26,14 +26,13 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/intel \ +- $(PTHREADSTUBS_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_intel_la_LTLIBRARIES = libdrm_intel.la + libdrm_intel_ladir = $(libdir) + libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ ++libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@ + + libdrm_intel_la_SOURCES = \ + intel_bufmgr.c \ +--- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 ++++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 +@@ -26,13 +26,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/radeon \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la + libdrm_radeon_ladir = $(libdir) + libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_radeon_la_LIBADD = ../libdrm.la + + libdrm_radeon_la_SOURCES = \ + radeon_bo_gem.c \ +--- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000 ++++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000 +@@ -2,13 +2,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/nouveau \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la + libdrm_nouveau_ladir = $(libdir) + libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_nouveau_la_LIBADD = ../libdrm.la + + libdrm_nouveau_la_SOURCES = \ + nouveau_device.c \ diff --git a/testing/logrotate/PKGBUILD b/testing/logrotate/PKGBUILD new file mode 100644 index 000000000..95a0681bd --- /dev/null +++ b/testing/logrotate/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 130804 2011-07-08 03:53:21Z eric $ +# Maintainer: Aaron Griffin <aaron@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=logrotate +pkgver=3.8.0 +pkgrel=1 +pkgdesc="Rotates system logs automatically" +arch=('i686' 'x86_64') +url="https://fedorahosted.org/logrotate/" +license=('GPL') +groups=('base') +depends=('popt' 'cron' 'gzip') +backup=('etc/logrotate.conf') +source=(https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz + logrotate.conf + logrotate.cron.daily) +md5sums=('590f77c13077a4c384dbec7ca9c5f242' + '462a5f364717461537eb2ae6394ad23e' + '8e23d5d4cc29b1e055b24df87e355cdc') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + sed -i 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\ + config.h + sed -i "s|CFLAGS = -Wall|CFLAGS = -Wall $CFLAGS|" Makefile + sed -i 's|$(BASEDIR)/man|$(BASEDIR)/share/man|' Makefile + + make +} + +check() { + cd "$srcdir/${pkgname}-${pkgver}" + make test +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + make PREFIX="$pkgdir" install + + install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf" + install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate" +} diff --git a/testing/logrotate/logrotate.conf b/testing/logrotate/logrotate.conf new file mode 100644 index 000000000..88b4935cd --- /dev/null +++ b/testing/logrotate/logrotate.conf @@ -0,0 +1,31 @@ +# see "man logrotate" for details +# rotate log files weekly +weekly + +# keep 4 weeks worth of backlogs +rotate 4 + +# restrict maximum size of log files +#size 20M + +# create new (empty) log files after rotating old ones +create + +# uncomment this if you want your log files compressed +#compress + +# Logs are moved into directory for rotation +# olddir /var/log/archive + +# Ignore pacman saved files +tabooext + .pacorig .pacnew .pacsave + +# Arch packages drop log rotation information into this directory +include /etc/logrotate.d + +/var/log/wtmp { + monthly + create 0664 root root + rotate 1 +} + diff --git a/testing/logrotate/logrotate.cron.daily b/testing/logrotate/logrotate.cron.daily new file mode 100755 index 000000000..e8ab921ea --- /dev/null +++ b/testing/logrotate/logrotate.cron.daily @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/sbin/logrotate /etc/logrotate.conf diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index 345e8c2b8..a51c13fbe 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130489 2011-07-06 16:35:35Z andyrtr $ +# $Id: PKGBUILD 130807 2011-07-08 03:57:21Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -13,10 +13,10 @@ if [ "${_git}" = "true" ]; then else pkgver=7.10.3 fi -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' - 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake' 'llvm') + 'gcc-libs>=4.5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm') url="http://mesa3d.sourceforge.net" license=('custom') source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch) @@ -177,7 +177,7 @@ fi } package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.25' 'glproto>=1.4.12') + depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto>=2.6' 'libdrm>=2.4.25' 'glproto>=1.4.12') optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3-D graphics libraries and include files" diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD new file mode 100644 index 000000000..893bb15dc --- /dev/null +++ b/testing/opencv/PKGBUILD @@ -0,0 +1,110 @@ +# $Id: PKGBUILD 130774 2011-07-07 23:14:56Z foutrelis $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgbase=opencv +pkgname=('opencv' 'opencv-docs' 'opencv-samples') +_realname=OpenCV +pkgver=2.3.0 +pkgrel=1 +pkgdesc="Open Source Computer Vision Library" +arch=('i686' 'x86_64') +license=('BSD') +url="http://opencv.willowgarage.com/" +depends=('jasper' 'gstreamer0.10-base' 'openexr' + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') +makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') +optdepends=('python2-numpy: Python 2.x interface' + 'eigen2') +options=('!libtool') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2" + 'pypkgpath_nondebian.patch') +md5sums=('dea5e9df241ac37f4439da16559e420d' + 'eb884bad665047276e80556e44043a43') + +_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' + '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_SKIP_RPATH=ON' + '-D BUILD_TESTS=OFF' + '-D ENABLE_SSE=ON' + '-D ENABLE_SSE2=ON' + '-D ENABLE_SSE3=OFF' + '-D ENABLE_SSSE3=OFF' + '-D ENABLE_SSE41=OFF' + '-D ENABLE_SSE42=OFF' + '-D BUILD_EXAMPLES=ON' + '-D INSTALL_C_EXAMPLES=ON' + '-D INSTALL_PYTHON_EXAMPLES=ON' + '-D WITH_XINE=ON' + '-D WITH_QT=OFF' + '-D WITH_QT_OPENGL=OFF' + '-D WITH_UNICAP=OFF' + '-D WITH_PVAPI=OFF' + '-D WITH_OPENNI=OFF' + '-D WITH_TBB=OFF' + '-D WITH_IPP=OFF' + '-D WITH_CUDA=OFF' + '-D USE_FAST_MATH=ON') + +build() { + cd "$srcdir/$_realname-$pkgver" + + # fix upstream's assumption of "debian-based" + patch -Np1 -i "$srcdir/pypkgpath_nondebian.patch" + + # x64, i.e "Athlon64" and upwards, can use SSE3 + [ $CARCH = x86_64 ] && \ + _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} + + cmake ${_cmakeopts[@]} . + + make +} + +package_opencv() { + install=$pkgname.install + + cd "$srcdir/$_realname-$pkgver" + + make DESTDIR="$pkgdir" install + + # install license file + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # separate docs package; also be -R friendly + [ -d "$pkgdir/usr/share/opencv/doc" ] && \ + mv "$pkgdir/usr/share/opencv/doc" "$srcdir/opencv-doc" + + # separate samples package + [ -d "$pkgdir/usr/share/opencv/samples" ] && \ + mv "$pkgdir/usr/share/opencv/samples" "$srcdir/opencv-samples" +} + +package_opencv-docs() { + pkgdesc+=" (documentation)" + #arch=('any') + depends=() + optdepends=() + options=('docs') + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/doc" + cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" +} + +package_opencv-samples() { + pkgdesc+=" (samples)" + #arch=('any') + depends=() + optdepends=() + options=() + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/opencv" + cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/opencv/opencv.install b/testing/opencv/opencv.install new file mode 100644 index 000000000..7709a9cc3 --- /dev/null +++ b/testing/opencv/opencv.install @@ -0,0 +1,12 @@ +post_install() { + echo "==> Documentation and samples are in separate packages:" + echo + echo "* opencv-docs" + echo "* opencv-samples" +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/opencv/pypkgpath_nondebian.patch b/testing/opencv/pypkgpath_nondebian.patch new file mode 100644 index 000000000..7c2d44b09 --- /dev/null +++ b/testing/opencv/pypkgpath_nondebian.patch @@ -0,0 +1,16 @@ +diff -aur OpenCV-2.3.0.orig/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt +--- OpenCV-2.3.0.orig/CMakeLists.txt 2011-07-07 17:31:35.656946629 +0800 ++++ OpenCV-2.3.0/CMakeLists.txt 2011-07-07 17:40:34.110696242 +0800 +@@ -620,11 +620,7 @@ + string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}") + if(UNIX) + set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) +- if(APPLE) +- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") +- else() #debian based assumed, install to the dist-packages. +- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.") +- endif() ++ set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") + endif() + if(WIN32) + get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE) diff --git a/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD new file mode 100644 index 000000000..c8b2eaf46 --- /dev/null +++ b/testing/openmpi/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 130580 2011-07-07 13:38:27Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +pkgname=openmpi +pkgver=1.5.3 +pkgrel=4 +pkgdesc="High performance message passing library (MPI)" +arch=('i686' 'x86_64') +url="http://www.open-mpi.org" +license=('custom') +depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc') +makedepends=('net-tools') +options=(!libtool) +source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('669565c708deab82ad4069d82675b2020eb0e0c6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc/${pkgname} \ + --mandir=/usr/share/man \ + --enable-mpi-f90 \ + --libdir=/usr/lib/${pkgname} \ + --with-threads=posix \ + --enable-mpi-threads \ + --enable-smp-locks \ + --with-valgrind \ + --enable-memchecker \ + --enable-debug \ + --enable-pretty-print-stacktrace \ + --without-slurm \ + --with-hwloc=external \ + --with-libltdl=/usr \ + FC=/usr/bin/gfortran \ + LDFLAGS='-Wl,-z,noexecstack' + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # Openmpi's otfinfo conflicts with the one from texlive + mv "${pkgdir}"/usr/bin/otfinfo "${pkgdir}"/usr/bin/otfinfompi + + # Openmpi's otfdump conflicts with the one from libotf + mv "${pkgdir}"/usr/bin/otfdump "${pkgdir}"/usr/bin/otfdumpompi + + # Symlink points to non-existing ortec++.1 + rm "${pkgdir}"/usr/share/man/man1/orteCC.1 + + install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d + echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/pixman/PKGBUILD b/testing/pixman/PKGBUILD new file mode 100644 index 000000000..f02a11779 --- /dev/null +++ b/testing/pixman/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 130771 2011-07-07 22:43:35Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=pixman +pkgver=0.22.2 +pkgrel=1 +pkgdesc="Pixman library" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org" +license=('custom') +depends=('glibc') +options=('!libtool') +source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('ad2b828ce4280472f5933d8bb5f0f4d583aed7f3') + +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 -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/poppler/PKGBUILD b/testing/poppler/PKGBUILD new file mode 100644 index 000000000..758a6b582 --- /dev/null +++ b/testing/poppler/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 130693 2011-07-07 17:38:24Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=poppler +pkgname=('poppler' 'poppler-glib' 'poppler-qt') +pkgver=0.16.7 +pkgrel=1 +arch=(i686 x86_64) +license=('GPL') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') +options=('!libtool') +url="http://poppler.freedesktop.org/" +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz) +md5sums=('3afa28e3c8c4f06b0fbca3c91e06394e') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i -e '/AC_PATH_XTRA/d' configure.ac + autoreconf + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-cairo-output \ + --enable-xpdf-headers \ + --enable-libjpeg --enable-zlib \ + --enable-poppler-qt4 \ + --enable-poppler-glib + make +} + +package_poppler() { + pkgdesc="PDF rendering library based on xpdf 3.0" + depends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') + conflicts=("poppler-qt3<${pkgver}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -e 's/^glib_subdir =.*/glib_subdir =/' \ + -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc +} + +package_poppler-glib() { + pkgdesc="Poppler glib bindings" + depends=("poppler=${pkgver}" 'gtk2') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/glib" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* +} + +package_poppler-qt() { + pkgdesc="Poppler Qt bindings" + depends=("poppler=${pkgver}" 'qt') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/qt4" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* +} diff --git a/testing/xf86-video-mach64/PKGBUILD b/testing/xf86-video-mach64/PKGBUILD new file mode 100644 index 000000000..75c9792c5 --- /dev/null +++ b/testing/xf86-video-mach64/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 130722 2011-07-07 22:12:01Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-mach64 +pkgver=6.9.0 +pkgrel=1 +pkgdesc="X.org mach64 video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('glibc' 'mach64-dri') +makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') +conflicts=('xorg-server<1.10.0') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + mach64-fix-pixmap.patch) +sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1' + '9658d16b964c1c0a3f8aa68f6706bd643cef321e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" +# patch -Np1 -i ${srcdir}/mach64-fix-pixmap.patch + ./configure --prefix=/usr --enable-dri + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/xf86-video-mach64/mach64-fix-pixmap.patch b/testing/xf86-video-mach64/mach64-fix-pixmap.patch new file mode 100644 index 000000000..6f1a64748 --- /dev/null +++ b/testing/xf86-video-mach64/mach64-fix-pixmap.patch @@ -0,0 +1,47 @@ +diff --git a/src/aticonsole.c b/src/aticonsole.c +index 1be147e..6e742d9 100644 +--- a/src/aticonsole.c ++++ b/src/aticonsole.c +@@ -28,6 +28,7 @@ + #include "config.h" + #endif + ++#include "xorgVersion.h" + #include "ati.h" + #include "aticonsole.h" + #include "atii2c.h" +@@ -689,7 +690,9 @@ ATIEnterVT + ScreenPtr pScreen = pScreenInfo->pScreen; + ATIPtr pATI = ATIPTR(pScreenInfo); + PixmapPtr pScreenPixmap; ++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) + DevUnion PixmapPrivate; ++#endif + Bool Entered; + + if (!ATIEnterGraphics(NULL, pScreenInfo, pATI)) +@@ -714,19 +717,24 @@ ATIEnterVT + } + + pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen); ++ ++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) + PixmapPrivate = pScreenPixmap->devPrivate; + if (!PixmapPrivate.ptr) + pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate; ++#endif + + /* Tell framebuffer about remapped aperture */ + Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap, + -1, -1, -1, -1, -1, pATI->pMemory); + ++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) + if (!PixmapPrivate.ptr) + { + pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate; + pScreenPixmap->devPrivate.ptr = NULL; + } ++#endif + + #ifdef XF86DRI_DEVEL + |