diff options
340 files changed, 6241 insertions, 1327 deletions
diff --git a/community/aspell-uk/PKGBUILD b/community/aspell-uk/PKGBUILD index 421678246..ba4520171 100644 --- a/community/aspell-uk/PKGBUILD +++ b/community/aspell-uk/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 43281 2011-03-24 13:28:23Z andrea $ -# Maintainer : Roman Kyrylych <roman@archlinux.org> +# $Id: PKGBUILD 60254 2011-12-08 19:13:21Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=aspell-uk -pkgver=1.6.0 +pkgver=1.6.5 _ftpver=1.4.0 -pkgrel=3 +pkgrel=1 pkgdesc="Ukrainian dictionary for aspell" arch=('i686' 'x86_64' 'mips64el') url="http://ispell-uk.sourceforge.net/" license=('GPL' 'LGPL' 'MPL') depends=('aspell') source=(ftp://ftp.gnu.org/gnu/aspell/dict/uk/aspell6-uk-${_ftpver}-0.tar.bz2 - http://downloads.sourceforge.net/ispell-uk/spell-uk-$pkgver.tgz) -md5sums=('662f15381d11581758866fd7af43b4d7' - '4177ed3e196e6511513cf358c4a42e1a') + http://downloads.sourceforge.net/project/ispell-uk/spell-uk/$pkgver/spell-uk-$pkgver.tgz) +sha256sums=('35f9a7e840c1272706bc6dd172bc9625cbd843d021094da8598a6abba525f18c' + '90eff3b9e40d04b53717240b725e303f02cec4ee8bef9bded69b7481e41fa422') build() { # needed when using a source package from ispell-uk project diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD index deab45541..0d53076e5 100644 --- a/community/augeas/PKGBUILD +++ b/community/augeas/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 59250 2011-11-22 01:03:57Z ebelanger $ +# $Id: PKGBUILD 60191 2011-12-07 04:43:36Z ebelanger $ # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=augeas -pkgver=0.9.0 +pkgver=0.10.0 pkgrel=1 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree" arch=('i686' 'x86_64' 'mips64el') url="http://augeas.net" license=('LGPL') -depends=('readline' 'gcc-libs') +depends=('libxml2') options=('!libtool') -source=(http://augeas.net/download/$pkgname-$pkgver.tar.gz) -md5sums=('5ef0ce53ce4c75f59ab2523506731084') +source=(http://augeas.net/download/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('fe1834e90a066c3208ac0214622c7352' + 'efb3f1a90ff31320dcc4c499eba5a555') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/bibletime/PKGBUILD b/community/bibletime/PKGBUILD new file mode 100644 index 000000000..f5b061581 --- /dev/null +++ b/community/bibletime/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 60250 2011-12-08 17:32:00Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de> +pkgname=bibletime +pkgver=2.9.0 +pkgrel=1 +pkgdesc="Bible software that uses the Sword Engine for KDE4" +arch=('x86_64' 'i686') +url="http://www.bibletime.info/" +license=('GPL2') +depends=('qt' 'sword' 'openssl' 'clucene') +makedepends=('cmake' 'boost-libs') +install=$pkgname.install +source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") +md5sums=('0190b64de5892fc5f45e9a3d46bb29d6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/bibletime/bibletime.install b/community/bibletime/bibletime.install new file mode 100644 index 000000000..ad97d7bab --- /dev/null +++ b/community/bibletime/bibletime.install @@ -0,0 +1,13 @@ +post_upgrade() { + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 65e10d605..9a71587e4 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59984 2011-12-02 22:33:05Z giovanni $ +# $Id: PKGBUILD 60299 2011-12-09 17:18:34Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.29 +pkgver=0.8.30 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') @@ -18,10 +18,10 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' makedepends=('python2-pycountry') optdepends=('ipython: to use calibre-debug') install=calibre.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('e51c2b889e0bdfc217000ebba93af8a7' +md5sums=('0af59b942b6184ce7b9c4247555b68dd' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index d102689c1..bf4035763 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 55262 2011-09-07 19:47:51Z svenstaro $ +# $Id: PKGBUILD 60147 2011-12-06 05:24:01Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib -pkgver=2.3.3 +pkgver=2.3.4 pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' makedepends=('doxygen' 'graphviz') options=('!libtool') source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) -md5sums=('052779f52c2e86317eca6a1e7d882fdf') +md5sums=('cc89f632aa194399e909bbbd13beca1b') build() { cd ${srcdir}/ClanLib-${pkgver} diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD index b64aab760..ddfb63ec2 100755 --- a/community/confuse/PKGBUILD +++ b/community/confuse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17258 2010-05-22 14:32:23Z ibiru $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org> diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index 9cb8758be..c324f06d4 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59585 2011-11-28 16:53:50Z giovanni $ +# $Id: PKGBUILD 60165 2011-12-06 10:42:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen -pkgver=0.4.6 -pkgrel=4 +pkgver=0.4.7 +pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') url="http://converseen.sourceforge.net/" @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('07c876b52e1982b8b2493c3aea3c3071') +md5sums=('d21cb571b268ddf4bcdc395d01c0dc49') build() { cd "${srcdir}" diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD index b04dd2eac..d12c5680b 100644 --- a/community/denemo/PKGBUILD +++ b/community/denemo/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 45779 2011-04-28 21:38:58Z spupykin $ +# $Id: PKGBUILD 60150 2011-12-06 08:50:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> # Contributor: Gnud <ach.gnud@gmail.com> pkgname=denemo -pkgver=0.9.0 +pkgver=0.9.2 pkgrel=1 pkgdesc="A music score editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.denemo.org" license=('GPL') depends=('aubio' 'portaudio' 'lilypond' 'gtk2' 'libxml2' 'guile' 'fftw' 'gtksourceview2' - 'librsvg' 'fluidsynth') + 'librsvg' 'fluidsynth' 'libsmf') options=('!libtool') backup=('etc/denemo/denemo.conf') source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7679622302e5fec9776501a5e2777888') +md5sums=('6dbe944f45cf8818b199e831ac7a5e4f') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index fddb3cc7c..b1fa118b2 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 57890 2011-11-04 08:33:14Z lcarlier $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 60209 2011-12-07 16:29:05Z svenstaro $ +# Maintainer: Laurent Carlier <lordheavym@gmail.org> +# Contributor: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=8 +pkgrel=9 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64' 'mips64el') url="http://openil.sourceforge.net/" -depends=('allegro4' 'sdl' 'libpng' 'libmng' 'freeglut' - 'jasper' 'lcms' 'openexr') -makedepends=('bash') -options=('!libtool' '!docs') +depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr') +install=devil.install +options=('!libtool' '!docs' '!emptydirs') license=('GPL') source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch) md5sums=('7918f215524589435e5ec2e8736d5e1d' @@ -22,7 +22,7 @@ build() { patch -Np1 -i ${srcdir}/libpng14.patch - ./configure --prefix=/usr --enable-ILU --enable-ILUT --enable-opengl --enable-sdl + ./configure --prefix=/usr --enable-ILU make } diff --git a/community/devil/devil.install b/community/devil/devil.install new file mode 100644 index 000000000..8336ac3d1 --- /dev/null +++ b/community/devil/devil.install @@ -0,0 +1,11 @@ +infodir=usr/share/info + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null +} diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD index af53031ec..20b975395 100644 --- a/community/dillo/PKGBUILD +++ b/community/dillo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55932 2011-09-26 09:36:25Z spupykin $ +# $Id: PKGBUILD 60152 2011-12-06 08:54:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=dillo -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="A small, fast graphical web browser built on FLTK" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' 'libxi' 'libxinerama') backup=(etc/dillo/{dillorc,dpidrc}) source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('f201e771a4bc70e801521000763b82fb') +md5sums=('81b82112cefcc7d54fe2972a21f42930') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 0a2b48572..08a9f5a31 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 59792 2011-11-30 10:03:59Z lfleischer $ +# $Id: PKGBUILD 60285 2011-12-08 22:52:59Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity pkgver=0.6.17 -pkgrel=2 +pkgrel=3 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('36423ab4e3b9aa90c5c44d9fa93fba0f') +source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" + 'botobackend.patch') +md5sums=('36423ab4e3b9aa90c5c44d9fa93fba0f' + '49bbdc327230fe5985d18eaae37eec0c') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,9 +24,13 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done + # add hotfix issued by upstream (FS#27390) + patch -p0 -i ../botobackend.patch + python2 setup.py install --root="$pkgdir" --optimize=1 - chmod 644 $pkgdir/usr/share/man/man1/$pkgname.1 - chmod 644 $pkgdir/usr/share/man/man1/rdiffdir.1 - chmod 644 $pkgdir/usr/share/doc/$pkgname-$pkgver/* + # fix broken documentation permissions until upstream does (FS#27301) + chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1" + chmod 644 "$pkgdir/usr/share/man/man1/rdiffdir.1" + chmod 644 "$pkgdir/usr/share/doc/$pkgname-$pkgver"/* } diff --git a/community/duplicity/botobackend.patch b/community/duplicity/botobackend.patch new file mode 100644 index 000000000..302e1e2b1 --- /dev/null +++ b/community/duplicity/botobackend.patch @@ -0,0 +1,13 @@ +=== modified file duplicity/backends/botobackend.py +--- duplicity/backends/botobackend.py 2011-11-25 17:47:57 +0000 ++++ duplicity/backends/botobackend.py 2011-12-01 16:15:25 +0000 +@@ -26,6 +26,6 @@ + if sys.version_info[:2] < (2,6): + print "Sorry, S3 multiprocessing requires version 2.6 or later of python" + sys.exit(1) +- import _boto_multi.py ++ import _boto_multi + else: +- import _boto_single.py ++ import _boto_single + diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index db8906b12..4e8053ec8 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58075 2011-11-06 10:13:58Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index 06c75533c..f893b61ff 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58073 2011-11-06 10:12:55Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index ec20ba97a..12e599935 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58089 2011-11-06 13:31:05Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 912678418..a3b51cc3b 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58090 2011-11-06 13:31:38Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index 983c417af..27346f8b4 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58091 2011-11-06 13:32:00Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index e7609cf72..6d6dd57ea 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58071 2011-11-06 10:11:44Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 75957b532..65b508ece 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58057 2011-11-06 10:03:11Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index 4a27c760d..ecade52fa 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58067 2011-11-06 10:07:33Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD index 8e855b55d..f86109ac9 100755 --- a/community/emesene/PKGBUILD +++ b/community/emesene/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59461 2011-11-25 15:15:41Z jelle $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Claudio Riva <firetux83@gmail.com> diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD index f2023c285..cc25d3fcd 100755 --- a/community/emprint-svn/PKGBUILD +++ b/community/emprint-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 53118 2011-07-30 17:05:35Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index a6fcc5a41..95e1ae93f 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58061 2011-11-06 10:05:15Z rvanharen $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index 67b8e026f..788d6800c 100755 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42747 2011-03-20 15:07:32Z ttopper $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Contributor: Giorgio Lando <lando at imap dot cc> # Contributor: Sergej Pupykin # Contributor: Thomas Bächler diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index db3a22678..ec1bda143 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56333 2011-10-05 18:51:32Z ibiru $ +# $Id: PKGBUILD 60311 2011-12-10 09:50:50Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=gnome-commander -pkgver=1.2.8.14 +pkgver=1.2.8.15 pkgrel=1 pkgdesc="A graphical two-pane filemanager for Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -15,10 +15,10 @@ makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool') options=(!libtool) install=gnome-commander.install source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz) -sha256sums=('3519ff0a6e0b287e9cc700df41c61f4bf29110ad16545a4e2f9445ed9a17df08') +sha256sums=('d2feecf215db3e0faeb873c559087c2ad9af0a5aac26e2b1b32b28be939da37f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" # python2 fix for file in doc/*/gnome-commander.xml; do @@ -32,11 +32,11 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - mkdir -p "${pkgdir}"/usr/share/gconf/schemas - gconf-merge-schema "${pkgdir}"/usr/share/gconf/schemas/${pkgname}.schemas \ - --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -rf "${pkgdir}"/etc/gconf/schemas/ + mkdir -p "$pkgdir"/usr/share/gconf/schemas + gconf-merge-schema "$pkgdir"/usr/share/gconf/schemas/$pkgname.schemas \ + --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas + rm -rf "$pkgdir"/etc/gconf/schemas/ } diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD index 27b4a9fb2..d63234c5b 100644 --- a/community/gogglesmm/PKGBUILD +++ b/community/gogglesmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56576 2011-10-08 22:42:27Z spupykin $ +# $Id: PKGBUILD 60238 2011-12-08 10:43:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=gogglesmm -pkgver=0.12.4 -pkgrel=2 +pkgver=0.12.5 +pkgrel=1 pkgdesc="Music Manager and Player" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/gogglesmm/" @@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'glproto' 'dri2proto') replaces=('musicmanager') conflicts=('musicmanager') source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) -md5sums=('ddbc41ecc6cfcf8958dbe2bca47e79e6') +md5sums=('07e92bcf2daf39d6b380590816edd013') build() { cd $srcdir/gogglesmm-$pkgver diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 1c0843521..ccb506e98 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 60020 2011-12-03 09:02:29Z stativ $ +# $Id: PKGBUILD 60185 2011-12-06 20:06:27Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=10.5.3 -_pkgver=107.764 +pkgver=11 +_pkgver=111.69 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -10,14 +10,16 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('56d1fec8f420cb964f086f5685694b86') +md5sums=('d838994ecc6556b52a83d37138530dbb') build() { cd "$srcdir" - install -d -m755 "$pkgdir/"usr/{bin,lib} + install -d -m755 "$pkgdir/usr/share/intellijidea-ce/bin" + install -d -m755 "$pkgdir/usr/lib" + [ $CARCH == "x86_64" ] && SUFFIX=64 - install -m755 "idea-IC-$_pkgver"/bin/fsnotifier${SUFFIX} "$pkgdir"/usr/bin + install -m755 "idea-IC-$_pkgver"/bin/fsnotifier${SUFFIX} "$pkgdir"/usr/share/intellijidea-ce/bin/ install -m644 "idea-IC-$_pkgver"/bin/libbreakgen${SUFFIX}.so "$pkgdir"/usr/lib } diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD new file mode 100644 index 000000000..79361ec90 --- /dev/null +++ b/community/keepalived/PKGBUILD @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net +# Contributor: Andrea Zucchelli <zukka77@gmail.com> + +pkgname=keepalived +pkgver=1.2.2 +pkgrel=1 +pkgdesc='implements an independent VRRPv2 stack and a userspace daemon for LVS cluster nodes healthchecks and LVS directors failover' +arch=('i686' 'x86_64') +url='http://www.keepalived.org/' +license=('GPL2') +backup=('etc/keepalived/keepalived.conf' 'etc/conf.d/keepalived') +depends=('openssl' 'popt' 'libnl') +source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" + 'keepalived.rc' + 'keepalived.conf' + 'ip_vs_moved.patch') +md5sums=('f68327ca142616a8463d2d105db122cd' + 'baeb62a682c2b59d732cea84bf52cc87' + '9c8142da8730ad27a345587dea83ced7' + '87ee19c85adaedd3eb11bea8a5865d47') + +build() { + cd $pkgname-$pkgver + patch -p1 -i ../ip_vs_moved.patch + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + # add initscripts + install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" + install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" + + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # clean pacakge init scripts + rm -r "$pkgdir/etc/rc.d/init.d" "$pkgdir/etc/sysconfig" + # move examples to /usr/share + install -d -m 755 "$pkgdir/usr/share/$pkgname" + mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/keepalived/ip_vs_moved.patch b/community/keepalived/ip_vs_moved.patch new file mode 100644 index 000000000..e27873810 --- /dev/null +++ b/community/keepalived/ip_vs_moved.patch @@ -0,0 +1,23 @@ +--- keepalived-1.2.2/configure 2011-01-06 01:51:33.000000000 +0100 ++++ keepalived-1.2.2.orig/configure 2011-11-24 19:36:32.051486626 +0100 +@@ -3973,7 +3973,7 @@ + + IPVS_SUPPORT="_WITHOUT_LVS_" + if test "$enable_lvs" != "no"; then +- ac_fn_c_check_header_mongrel "$LINENO" "net/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "linux/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default" + if test "x$ac_cv_header_net_ip_vs_h" = x""yes; then : + IPVS_SUPPORT="_WITH_LVS_" + else +diff -ru keepalived-1.2.2/configure.in keepalived-1.2.2.orig/configure.in +--- keepalived-1.2.2/configure.in 2011-01-06 01:51:30.000000000 +0100 ++++ keepalived-1.2.2.orig/configure.in 2011-11-24 19:36:11.797860077 +0100 +@@ -124,7 +124,7 @@ + dnl ----[ Checks for LVS and VRRP support ]---- + IPVS_SUPPORT="_WITHOUT_LVS_" + if test "$enable_lvs" != "no"; then +- AC_CHECK_HEADER([net/ip_vs.h], ++ AC_CHECK_HEADER([linux/ip_vs.h], + [IPVS_SUPPORT="_WITH_LVS_"], + [ + IPVS_SUPPORT="_WITHOUT_LVS_" diff --git a/community/keepalived/keepalived.conf b/community/keepalived/keepalived.conf new file mode 100644 index 000000000..225f02bf9 --- /dev/null +++ b/community/keepalived/keepalived.conf @@ -0,0 +1,16 @@ +# vim:set ts=2 sw=2 ft=sh et: +# Options for keepalived. See `keepalived --help' output and keepalived(8) and +# keepalived.conf(5) man pages for a list of all options. Here are the most +# common ones : +# +# --vrrp -P Only run with VRRP subsystem. +# --check -C Only run with Health-checker subsystem. +# --dont-release-vrrp -V Dont remove VRRP VIPs & VROUTEs on daemon stop. +# --dont-release-ipvs -I Dont remove IPVS topology on daemon stop. +# --dump-conf -d Dump the configuration data. +# --log-detail -D Detailed log messages. +# --log-facility -S 0-7 Set local syslog facility (default=LOG_DAEMON) +# + +DAEMON_OPTS='-D' + diff --git a/community/keepalived/keepalived.rc b/community/keepalived/keepalived.rc new file mode 100644 index 000000000..88bb90724 --- /dev/null +++ b/community/keepalived/keepalived.rc @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/${0##*/} + +NAME=keepalived +DAEMON=/usr/sbin/keepalived +PID=$(pidof -o %PPID $DAEMON) + +case "$1" in + start) + stat_busy "Starting $NAME daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0 + stat_fail + ;; + stop) + stat_busy "Stopping $NAME daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0 + stat_fail + ;; + restart) + $0 stop + $0 start + exit 0 + ;; + reload) + stat_busy "Reloading $NAME daemon" + [[ $PID ]] && kill -HUP $PID &> /dev/null && stat_done && exit 0 + stat_fail + ;; + *) + echo "usage: ${0##*/} {start|stop|restart|reload}" >&2 + ;; +esac + +exit 1 + +# vim:set ts=2 sw=2 ft=sh noet: diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index 5f9ac10f4..3bb9cbc28 100755 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58848 2011-11-18 21:30:35Z lcarlier $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> diff --git a/community/libmilter/PKGBUILD b/community/libmilter/PKGBUILD index 3154cc8b9..3d842fb77 100644 --- a/community/libmilter/PKGBUILD +++ b/community/libmilter/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 56914 2011-10-16 12:39:57Z spupykin $ +# $Id: PKGBUILD 60205 2011-12-07 15:22:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mutantmonkey <mutantmonkey@gmail.com> pkgname=libmilter -pkgver=8.14.4 -pkgrel=3 +pkgver=8.14.5 +pkgrel=1 pkgdesc="libmilter" arch=(i686 x86_64) url="http://www.postfix.org/MILTER_README.html" license=('custom:Sendmail open source license') source="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${pkgver}.tar.gz" -md5sums=('1b23d5000c8e7bfe82ec1a27f2f5fdc5') +md5sums=('02ccfc331cc81ed00ec8bb5ecfc69018') build(){ cd "${srcdir}/sendmail-${pkgver}" diff --git a/community/libsmf/PKGBUILD b/community/libsmf/PKGBUILD new file mode 100644 index 000000000..62f77a96a --- /dev/null +++ b/community/libsmf/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 60154 2011-12-06 08:54:54Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: SpepS <dreamspepser at yahoo dot it> + +pkgname=libsmf +pkgver=1.3 +pkgrel=3 +pkgdesc='A BSD-licensed C library for handling SMF ("*.mid") files.' +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/libsmf/" +license=('BSD') +depends=('glib2' 'readline') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/libsmf/libsmf/$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('eb698f1bc0bad9d5bce4c10386347486') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --enable-static=no + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index b31cd57d6..a7737f43b 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60010 2011-12-03 08:06:57Z spupykin $ +# $Id: PKGBUILD 60240 2011-12-08 11:32:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.9.7 -pkgrel=2 +pkgver=0.9.8 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -37,7 +37,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" openbsd-netcat-default.patch unixperms.patch yajl-2.x.patch) -md5sums=('4308b3f4d23f5b0c5196260a9a22a38b' +md5sums=('5bb74092e469d773c3d63128a8c57501' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '737ec24aa56871fbabfa892789457db4' diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 5e43fd6ea..4a4da3547 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mplayer2 pkgver=2.0.20111101 -pkgrel=1 +pkgrel=1.1 pkgdesc="A movie player" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ if [ "${CARCH}" = "mips64el" ] ; then # the supported mips64el machines. depends=('ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libass' 'fontconfig' 'freetype2' 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' - 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex') + 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex' 'libxv') makedepends=('live-media' 'p7zip-libre' 'gettext') else depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' @@ -57,6 +57,9 @@ build() { --disable-musepack \ --disable-esd \ --disable-mga \ + --disable-vdpau \ + --disable-gl \ + --enable-xv \ --language=all \ --enable-translation \ --confdir=/etc/mplayer diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD index 8c67cf230..47dca2027 100644 --- a/community/nautilus-actions/PKGBUILD +++ b/community/nautilus-actions/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56331 2011-10-05 18:42:40Z ibiru $ +# $Id: PKGBUILD 60313 2011-12-10 09:56:53Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tor Krill <tor@krill.nu> pkgname=nautilus-actions -pkgver=3.1.4 +pkgver=3.1.5 pkgrel=1 pkgdesc="Configures programs to be launched when files are selected in Nautilus" arch=('i686' 'x86_64' 'mips64el') @@ -15,20 +15,20 @@ makedepends=('intltool' 'gnome-doc-utils') install=nautilus-actions.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.1/$pkgname-$pkgver.tar.xz) -sha256sums=('071013f1037a2c22875e4c9a5efa6f28a1626965b4d5c8aa4576f319427cd0e3') +sha256sums=('dc6b7522d04e1ed1505d6cb2e3be7888ffbac3f094ba6204da81a19c92cb230a') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/nautilus-actions make } package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install - mkdir -p ${pkgdir}/usr/share/gconf/schemas - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain nautilus-actions \ - ${pkgdir}/etc/gconf/schemas/*.schemas - rm -rf ${pkgdir}/etc/gconf/schemas/ + cd $srcdir/$pkgname-$pkgver + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install + mkdir -p $pkgdir/usr/share/gconf/schemas + gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas --domain nautilus-actions \ + $pkgdir/etc/gconf/schemas/*.schemas + rm -rf $pkgdir/etc/gconf/schemas/ } diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index 557d160aa..09df8c6d1 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 43285 2011-03-24 13:35:27Z bisson $ +# $Id: PKGBUILD 60316 2011-12-10 11:25:09Z bisson $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=nsd -pkgver=3.2.8 +pkgver=3.2.9 pkgrel=1 pkgdesc='Authoritative only, high performance and simple DNS server' -arch=('i686' 'x86_64' 'mips64el') url='http://www.nlnetlabs.nl/nsd/' license=('BSD') depends=('openssl') makedepends=('flex') -source=("http://www.nlnetlabs.nl/downloads/nsd/nsd-$pkgver.tar.gz") -sha1sums=('e8db690a09f53152f0dca6e4fbfabcc89003fced') +arch=('i686' 'x86_64' 'mips64el') +source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('66e17e5801e94da1a21f0f2a4dd7a4ab4ffe0dd9') -install=nsd.install +install=install build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/ --exec-prefix=/usr --datarootdir=/usr/share make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -d "$pkgdir"/{etc/rc.d,usr/share/{doc,licenses}/"$pkgname"} + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}"/{etc/rc.d,usr/share/{doc,licenses}/"${pkgname}"} rm doc/differences.pdf - install -m644 doc/* "$pkgdir"/usr/share/doc/"$pkgname" - ln -s ../../doc/"$pkgname"/LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE - ln -s ../../usr/sbin/nsdc "$pkgdir"/etc/rc.d/nsd + install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}" + ln -s ../../doc/"${pkgname}"/LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE + ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd } diff --git a/community/nsd/install b/community/nsd/install new file mode 100644 index 000000000..d90c83521 --- /dev/null +++ b/community/nsd/install @@ -0,0 +1,19 @@ +post_install() { + getent group nsd &>/dev/null || groupadd -r nsd >/dev/null + getent passwd nsd &>/dev/null || useradd -r -g nsd -d /dev/null -s /bin/false -c nsd nsd >/dev/null + chown nsd:nsd /var/db/nsd + chmod 700 /var/db/nsd + install -o nsd -d /var/run/nsd +} + +post_upgrade() { + [[ `vercmp $2 3.2.9` -lt 0 ]] && cat <<\EOF +==> The database format was updated; please run `nsdc rebuild`. +EOF +} + +post_remove() { + getent passwd nsd &>/dev/null && userdel nsd >/dev/null + getent group nsd &>/dev/null && groupdel nsd >/dev/null + true +} diff --git a/community/openbsd-netcat/PKGBUILD b/community/openbsd-netcat/PKGBUILD index 4e84b6240..a1cf3b666 100644 --- a/community/openbsd-netcat/PKGBUILD +++ b/community/openbsd-netcat/PKGBUILD @@ -4,7 +4,8 @@ pkgname="openbsd-netcat" pkgver=1.89 -pkgrel=4 +_pkgrel=4 +pkgrel=4.1 pkgdesc="TCP/IP swiss army knife. OpenBSD variant." arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/sid/netcat-openbsd" @@ -12,13 +13,13 @@ license=('BSD') depends=('glib2') makedepends=('gcc' 'make' 'pkg-config') source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}.orig.tar.gz" - "http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${pkgrel}.diff.gz") + "http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${_pkgrel}.diff.gz") md5sums=('7238ce15aae43069e96ba7faf03f153e' '00c65aa22243b76998174c733cbb64cc') build() { cd $srcdir/netcat-openbsd-${pkgver}.orig - patch -p1 < ../netcat-openbsd_${pkgver}-${pkgrel}.diff + patch -p1 < ../netcat-openbsd_${pkgver}-${_pkgrel}.diff for i in `cat debian/patches/series` do echo "** patch $i" 1>&2 diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index 44bdf517d..568cd38c4 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58664 2011-11-17 11:39:42Z ttopper $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> diff --git a/community/python-mpi4py/PKGBUILD b/community/python-mpi4py/PKGBUILD index 31223ef91..e48458f39 100644 --- a/community/python-mpi4py/PKGBUILD +++ b/community/python-mpi4py/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 42202 2011-03-15 13:58:47Z andrea $ +# $Id: PKGBUILD 60172 2011-12-06 14:17:13Z stephane $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sebastien Binet <binet@cern.ch> pkgbase=python-mpi4py pkgname=('python-mpi4py' 'python2-mpi4py') pkgver=1.2.2 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') url="http://mpi4py.scipy.org" license=('BSD') diff --git a/community/python-psycopg1/PKGBUILD b/community/python-psycopg1/PKGBUILD index 7a0acfefa..54244d526 100755 --- a/community/python-psycopg1/PKGBUILD +++ b/community/python-psycopg1/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 27290 2010-09-19 04:29:33Z ebelanger $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Contributor: William Rea <sillywilly@gmail.com> pkgname=python-psycopg1 diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 299e07aa5..25bdc0312 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 59902 2011-12-02 11:04:21Z andrea $ -# Maintainer: +# $Id: PKGBUILD 60320 2011-12-10 12:45:52Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> - pkgname=python-pymongo pkgver=1.9b1 -pkgrel=2 +pkgrel=3 pkgdesc="Python driver for MongoDB" +arch=('x86_64' 'i686' 'mips64el') license=("APACHE") -url="http://pypi.python.org/pypi/pymongo/" -arch=('i686' 'x86_64' 'mips64el') +url="http://pypi.python.org/pypi/pymongo3/" depends=('python') makedepends=('python-distribute') -source=(http://pypi.python.org/packages/source/p/pymongo3/pymongo3-$pkgver.tar.gz) -md5sums=('6c65dcad8674f37ffc8bc3d6e1fd4155') +source=("http://pypi.python.org/packages/source/p/pymongo3/pymongo3-$pkgver.tar.gz") +sha256sums=('dcabaaca2f0067e648c2b081a70564b832de981495ff953597c1e451a7fcac20') package() { - cd $srcdir/pymongo3-$pkgver - LANG=en_US.UTF8 python setup.py install --root=$pkgdir --optimize=1 + cd "$srcdir/pymongo3-$pkgver" + + LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1 } + +# vim:set ts=2 sw=2 et: diff --git a/community/python-pyro/PKGBUILD b/community/python-pyro/PKGBUILD index c978da9a2..72d738f24 100755 --- a/community/python-pyro/PKGBUILD +++ b/community/python-pyro/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56634 2011-10-09 10:13:09Z angvp $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.br> pkgbase=python-pyro diff --git a/community/python2-cheetah/PKGBUILD b/community/python2-cheetah/PKGBUILD index fd6ebf4ed..d27faddb3 100755 --- a/community/python2-cheetah/PKGBUILD +++ b/community/python2-cheetah/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56977 2011-10-17 13:24:23Z jelle $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Contributor: James Rayner <james@archlinux.org> # Contributor: Todd Maynard <arch@toddmaynard.com> diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 35e45b332..d20f1568f 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58530 2011-11-13 16:03:22Z andrea $ +# $Id: PKGBUILD 60267 2011-12-08 19:52:00Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.2.4 +pkgver=1.3.1 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') @@ -16,18 +16,14 @@ optdepends=('garmindev: to connect garmin devices') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-mimetypes.xml - 'fix-glu-header.patch') -sha256sums=('3f87667ceffde60a7c533df7e25f375793a093970d89bfa1cd842b3595c58f2c' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' - '8e8c6440e1674a87d5a221c978f2be832457fb43980894725044837581625618') + $pkgname-mimetypes.xml) +sha256sums=('77a387856e2d41f9ea69f750cbac9bb49fa249d65bdef5e319bfa6f7c9f84121' + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { - cd "${srcdir}/$pkgname-$pkgver" + cd ${srcdir}/$pkgname-$pkgver - patch -R -p2 -i "${srcdir}"/fix-glu-header.patch - - cd "${srcdir}" + cd ${srcdir} mkdir build cd build @@ -38,10 +34,10 @@ build() { } package(){ - cd "${srcdir}/build" + cd ${srcdir}/build - make DESTDIR="${pkgdir}" install + make DESTDIR=${pkgdir} install - install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ - "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" + install -D -m644 ${srcdir}/$pkgname-mimetypes.xml \ + ${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml } diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index 531d2ebe5..59d0e9a59 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2011-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.3.1-1 + 2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.2.4-1 diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD index 6d7869391..d1ec3d9b7 100644 --- a/community/qps/PKGBUILD +++ b/community/qps/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 54014 2011-08-11 18:04:13Z spupykin $ +# $Id: PKGBUILD 60157 2011-12-06 09:22:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Rosenstrauch <darose@darose.net> pkgname=qps -pkgver=1.10.15 -_dlpkgver=5946 -pkgrel=2 +pkgver=1.10.16 +_dlpkgver=5963 +pkgrel=1 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'." url="http://qps.kldp.net/projects/qps" depends=('qt') arch=('i686' 'x86_64' 'mips64el') license="GPL" -source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2 - version-patch.diff) -md5sums=('25a6c6f8ac9172a6874e3514edf1eda1' - 'e323a796a3dbf44a99af386e867f7848') +source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2) +md5sums=('dc3396749ad9254fd60ca84b5c0b16b9') build() { cd $srcdir/$pkgname-$pkgver - patch -p0 <$srcdir/version-patch.diff qmake make } diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD index 7a6e2487c..ad3c84abb 100755 --- a/community/qstardict/PKGBUILD +++ b/community/qstardict/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54585 2011-08-20 18:29:13Z jlichtblau $ +# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD index 84e1983f7..647a79693 100644 --- a/community/qtfm/PKGBUILD +++ b/community/qtfm/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 57268 2011-10-25 05:38:14Z ebelanger $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 60270 2011-12-08 20:02:24Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Wittfella <wittfella@wittfella.com> pkgname=qtfm -pkgver=5.1 +pkgver=5.2 pkgrel=1 pkgdesc="A lightweight file manager" arch=('i686' 'x86_64' 'mips64el') -url="http://www.qtfm.org" +url="http://www.qtfm.org/" license=('GPL') depends=('qt') -install=qtfm.install +install=$pkgname.install source=(http://www.qtfm.org/$pkgname-$pkgver.tar.gz) -md5sums=('e7e079d2586b46ce80998c52b777cb88') +sha256sums=('289b93956958729ccf02657acf7745d4ba621bfb18e8180988196a0a1310e99b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd ${srcdir}/$pkgname-$pkgver + qmake make } package() { - cd "$srcdir/$pkgname-$pkgver" - make INSTALL_ROOT="$pkgdir" install + cd ${srcdir}/$pkgname-$pkgver + + make INSTALL_ROOT=${pkgdir} install } diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD new file mode 100644 index 000000000..254303c85 --- /dev/null +++ b/community/r8168-lts/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> + +pkgname=r8168-lts +_pkgname=r8168 +pkgver=8.027.00 +pkgrel=2 +pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts" +url="http://www.realtek.com.tw" +license=("GPL") +arch=('i686' 'x86_64') +depends=('glibc' "kernel26-lts>=2.6.32" "kernel26-lts<2.6.33") +makedepends=("kernel26-lts-headers>=2.6.32" "kernel26-lts-headers<2.6.33") +source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) +install=$pkgname.install + +_extramodules=extramodules-2.6.32-lts +_kernver="$(cat /lib/modules/$_extramodules/version || true)" + +build() { + cd "$srcdir/$_pkgname-$pkgver" + make -C /lib/modules/$_kernver/build SUBDIRS="$srcdir/$_pkgname-$pkgver/src" EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" modules +} + +package() { + cd "$srcdir/$_pkgname-$pkgver/src" + install -D -m644 $_pkgname.ko "$pkgdir/lib/modules/$_extramodules/$_pkgname.ko" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; +} + +md5sums=('98155ce1ad5c248eeb7a93c9954d8344') +sha256sums=('5bc3b44bd69a05e45ab13be727256a95adf18a658f726141283046b397dc22e2') diff --git a/community/r8168-lts/r8168-lts.install b/community/r8168-lts/r8168-lts.install new file mode 100644 index 000000000..fd4f92f63 --- /dev/null +++ b/community/r8168-lts/r8168-lts.install @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-2.6.32-lts' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies + echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:' + echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`' +} +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 2256dffb3..1f8d2451b 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 59968 2011-12-02 21:01:02Z ibiru $ +# $Id: PKGBUILD 60207 2011-12-07 16:26:35Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> @@ -6,12 +6,12 @@ pkgname=spring pkgver=0.84.0 _pkgver=84.0 -pkgrel=1 +pkgrel=2 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" license=('GPL') -depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') +depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl') makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2') optdepends=('python2: python-based bots' 'java-runtime: java-based bots') diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index 6e0c46a78..6f228be5b 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58274 2011-11-09 16:42:13Z lfleischer $ +# $Id: PKGBUILD 60289 2011-12-08 23:55:42Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel -pkgver=4.46 +pkgver=4.50 pkgrel=1 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'Makefile.patch' 'stunnel.rc.d') -md5sums=('978030ff42f087ec26eb8a095ab69994' - 'dcd8d51b8591d4d1df50373646a363b8' +md5sums=('d68b4565294496a8bdf23c728a679f53' + 'ea9e85daef0cc96ce21649901b3514f7' 'f15398497e10e080c2406d2fc541660c' 'cb647c71ff4cb1e035b6e515d5f13ebf') diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD index 3a3659dc6..950c35862 100644 --- a/community/sword/PKGBUILD +++ b/community/sword/PKGBUILD @@ -1,53 +1,57 @@ -# $Id: PKGBUILD 59377 2011-11-23 21:18:49Z andrea $ -# Maintainer: +# $Id: PKGBUILD 60193 2011-12-07 12:16:33Z arodseth $ +# Maintainer: Alexander Rødseth # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: TripleE <eric1548@yahoo.com> - pkgname=sword pkgver=1.6.2 -pkgrel=5 +pkgrel=6 pkgdesc="Libraries for Bible programs" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.crosswire.org/sword/index.jsp" +arch=('x86_64' 'i686' 'mips64el') +url="http://www.crosswire.org/sword/" license=('GPL') depends=('curl' 'clucene' 'swig') makedepends=('cmake') backup=('etc/sword.conf') -source=("http://www.crosswire.org/ftpmirror/pub/${pkgname}/source/v1.6/${pkgname}-${pkgver}.tar.gz" curl.patch) +source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz" + curl.patch) md5sums=('a7dc4456e20e915fec46d774b690e305' 'e84a226ce3697af33b9fdd9a22884a2a') build() { - cd "${srcdir}"/$pkgname-$pkgver - patch -p1 -i $srcdir/curl.patch + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i ../curl.patch + + mkdir ../build + cd ../build - cd $srcdir - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ + cmake "../$pkgname-$pkgver" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release + make } package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install + cd "$srcdir/build" + + make DESTDIR="$pkgdir" install - # Ugly workarounds to fix a weird cmakelists.txt - install -d "${pkgdir}"/usr/lib/sword - mv "${pkgdir}"/usr/lib/1.6.2_icu_4.8* "${pkgdir}"/usr/lib/sword/ + install -d "$pkgdir/usr/lib/sword" + mv "$pkgdir"/usr/lib/1.6.2_icu_4.8* "$pkgdir/usr/lib/sword/" - cd "${srcdir}"/${pkgname}-${pkgver}/locales.d/ + cd "$srcdir/$pkgname-$pkgver/locales.d/" for file in *.conf; do - install -Dm644 $file "${pkgdir}"/usr/share/sword/locales.d/$file + install -Dm644 "$file" "$pkgdir/usr/share/sword/locales.d/$file" done cd ../include - install -d "${pkgdir}"/usr/include/sword - install -Dm644 canon_{catholic{,2},synodalp}.h "${pkgdir}"/usr/include/sword + install -d "$pkgdir/usr/include/sword" + install -Dm644 canon_{catholic{,2},synodalp}.h "$pkgdir/usr/include/sword" cd ../samples - install -Dm644 mods.d/globals.conf "${pkgdir}"/usr/share/sword/mods.d/globals.conf - install -Dm644 recommended/sword.conf "${pkgdir}"/etc/sword.conf + install -Dm644 mods.d/globals.conf "$pkgdir/usr/share/sword/mods.d/globals.conf" + install -Dm644 recommended/sword.conf "$pkgdir/etc/sword.conf" } + +# vim:set ts=2 sw=2 et: diff --git a/community/unrtf/PKGBUILD b/community/unrtf/PKGBUILD index 4a1ba1423..bce1f2817 100644 --- a/community/unrtf/PKGBUILD +++ b/community/unrtf/PKGBUILD @@ -1,26 +1,32 @@ -# $Id: PKGBUILD 8335 2010-01-18 20:36:57Z jlichtblau $ +# $Id: PKGBUILD 60272 2011-12-08 20:04:08Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: froggie <sullivanva@gmail.com> pkgname=unrtf -pkgver=0.21.1 +pkgver=0.21.2 pkgrel=1 pkgdesc="Command-line program which converts RTF documents to other formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/unrtf/unrtf.html" license=('GPL3') depends=('glibc') +changelog=$pkgname.changelog source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('ce069646837d0a2c15b439a5529afde8') +sha256sums=('acb1b093dd2c7485fc43b128ccaf665d6188f568752cec96d54b693374caddb0') build() { cd ${srcdir}/$pkgname-$pkgver # bugfix FS#14043 - sed -e 's|/usr/local|/usr|' -i src/{main.h,path.h} || return 1 + sed -e 's|/usr/local|/usr|' -i src/{main.h,path.h} ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install } diff --git a/community/unrtf/unrtf.changelog b/community/unrtf/unrtf.changelog new file mode 100644 index 000000000..04b898b16 --- /dev/null +++ b/community/unrtf/unrtf.changelog @@ -0,0 +1,11 @@ +2011-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * unrtf 0.21.2 + +2010-01-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.21.1 + +2009-05-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * FS#14043 fixed + +2009-03-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 0.21.0 diff --git a/community/xiphos/PKGBUILD b/community/xiphos/PKGBUILD index aca720a45..cb3864be4 100755 --- a/community/xiphos/PKGBUILD +++ b/community/xiphos/PKGBUILD @@ -1,31 +1,36 @@ -# $Id: PKGBUILD 49759 2011-06-20 22:11:59Z andrea $ -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# $Id: PKGBUILD 60197 2011-12-07 12:42:03Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Andrea Scarpino +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: TripleE <eric1548@yahoo.com> - pkgname=xiphos pkgver=3.1.4 -pkgrel=8 -pkgdesc="A Bible study tool for gtk" -arch=('i686' 'x86_64' 'mips64el') -url="http://xiphos.org" +pkgrel=9 +pkgdesc="Bible study tool for GTK+" +arch=('x86_64' 'i686' 'mips64el') +url="http://xiphos.org/" license=('GPL') -depends=('libgsf' 'libglade' 'gtkhtml' 'sword' 'hicolor-icon-theme') +depends=('libgsf' 'libglade' 'gtkhtml' 'sword') makedepends=('gnome-doc-utils' 'intltool' 'python2') conflicts=('gnomesword') provides=('gnomesword') replaces=('gnomesword') -install=$pkgname.install +install=xiphos.install source=("http://downloads.sourceforge.net/gnomesword/$pkgname-$pkgver.tar.gz") md5sums=('4d6f7805c4c8185f5c4ac3bd95fc705a') build() { - cd $srcdir/$pkgname-$pkgver - sed -i '1s/python/python2/' waf + cd "$srcdir/$pkgname-$pkgver" + + sed -i '0,/on/s//on2/' waf ./waf configure --prefix=/usr --enable-gtkhtml ./waf build --prefix=/usr } package() { - cd $srcdir/$pkgname-$pkgver - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./waf install --destdir=$pkgdir + cd "$srcdir/$pkgname-$pkgver" + + GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./waf install --destdir="$pkgdir" } + +# vim:set ts=2 sw=2 et: diff --git a/community/xiphos/xiphos.install b/community/xiphos/xiphos.install index ada2ca2f2..048e77780 100644 --- a/community/xiphos/xiphos.install +++ b/community/xiphos/xiphos.install @@ -1,5 +1,3 @@ -pkgname=xiphos - post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } @@ -11,3 +9,5 @@ post_upgrade() { post_remove() { post_install } + +# vim:set ts=2 sw=2 et: diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index f81ad0e10..bc1928a92 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 135920 2011-08-20 07:14:19Z allan $ +# $Id: PKGBUILD 144850 2011-12-08 12:17:07Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils -pkgver=2.21.1 -pkgrel=2.2 -_date=20110627 +pkgver=2.22 +pkgrel=2 +_date=20111201 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" license=('GPL') -groups=('base') +groups=('base-devel') depends=('glibc>=2.14' 'zlib') checkdepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('2face559e80d649ba148e42bb2d1fb0f') +md5sums=('77c15027ac112c65fd5f73ca91b0651c') mksource() { mkdir ${pkgname}-${_date} cd ${pkgname}-${_date} - export _TAG=binutils-2_21-branch + export _TAG=binutils-2_22-branch export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' cvs -z9 co -r $_TAG binutils || return 1 mv src binutils diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD index e392f774a..d3fd6f97d 100644 --- a/core/fakeroot/PKGBUILD +++ b/core/fakeroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139748 2011-10-04 21:10:33Z allan $ +# $Id: PKGBUILD 144854 2011-12-08 12:17:14Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=fakeroot -pkgver=1.18.1 -pkgrel=1.1 +pkgver=1.18.2 +pkgrel=1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ install=fakeroot.install depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') options=('!libtool') source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('8eedda3dcb71b6ab6f62297b82ae5ac6') +md5sums=('79f32331358ad58499704ea5e19fd0ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index f9633577b..bd6f44227 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141368 2011-10-30 06:46:42Z allan $ +# $Id: PKGBUILD 144846 2011-12-08 12:16:58Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -10,31 +10,33 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi pkgver=4.6.2 -pkgrel=1.1 -#_snapshot=4.6-20110819 +pkgrel=3 +_snapshot=4.6-20111125 _libstdcppmanver=20110814 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" if [[ "${CARCH}" != "mips64el" ]]; then - makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada') + makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada') else - makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl') + makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl') fi checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc_mips64el_lib.patch - gcc-hash-style-both.patch) -md5sums=('028115c4fbfb6cfd75d6369f4a90d87e' + gcc-hash-style-both.patch + gcc-pr49720.patch) +md5sums=('922b0ee688669c188d237bbd21d42d07' 'ce920d2550ff7e042b9f091d27764d8f' '4030ee1c08dd1e843c0225b772360e76' '67e337993d821d72fccacbed52d48c34' - '4df25b623799b148a0703eaeec8fdf3f') + '4df25b623799b148a0703eaeec8fdf3f' + 'f9d7e5b792c59175f3da3f8421447512') if [ -n "${_snapshot}" ]; then _basedir="${srcdir}/gcc-${_snapshot}" @@ -58,6 +60,9 @@ build() { fi patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch + # fix compiler segfault in binutils testsuite + patch -Np1 -i ${srcdir}/gcc-pr49720.patch + echo ${pkgver} > gcc/BASE-VER cd ${srcdir} @@ -84,7 +89,7 @@ build() { --enable-plugin --with-plugin-ld=ld.gold \ --disable-multilib --disable-libssp --disable-libstdcxx-pch \ --enable-checking=release - make profiledbootstrap + make } check() { @@ -132,7 +137,7 @@ package_gcc-libs() package_gcc() { pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21.1' 'libmpc' 'cloog' 'ppl') + depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl') groups=('base-devel') install=gcc.install diff --git a/core/gcc/gcc-pr49720.patch b/core/gcc/gcc-pr49720.patch new file mode 100644 index 000000000..8f50c4120 --- /dev/null +++ b/core/gcc/gcc-pr49720.patch @@ -0,0 +1,26 @@ +--- trunk/gcc/simplify-rtx.c 2011/10/28 05:55:10 180603 ++++ trunk/gcc/simplify-rtx.c 2011/10/28 06:35:31 180604 +@@ -4352,10 +4352,20 @@ + { + rtx x = XEXP (op0, 0); + rtx c = XEXP (op0, 1); ++ enum rtx_code invcode = op0code == PLUS ? MINUS : PLUS; ++ rtx tem = simplify_gen_binary (invcode, cmp_mode, op1, c); + +- c = simplify_gen_binary (op0code == PLUS ? MINUS : PLUS, +- cmp_mode, op1, c); +- return simplify_gen_relational (code, mode, cmp_mode, x, c); ++ /* Detect an infinite recursive condition, where we oscillate at this ++ simplification case between: ++ A + B == C <---> C - B == A, ++ where A, B, and C are all constants with non-simplifiable expressions, ++ usually SYMBOL_REFs. */ ++ if (GET_CODE (tem) == invcode ++ && CONSTANT_P (x) ++ && rtx_equal_p (c, XEXP (tem, 1))) ++ return NULL_RTX; ++ ++ return simplify_gen_relational (code, mode, cmp_mode, x, tem); + } + + /* (ne:SI (zero_extract:SI FOO (const_int 1) BAR) (const_int 0))) is diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 6af3811e8..d3462cb2e 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141374 2011-10-30 06:48:27Z allan $ +# $Id: PKGBUILD 144848 2011-12-08 12:17:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.14.1 -pkgrel=1 +pkgrel=2 _glibcdate=20111025 _glibcportsver=2.14 _glibcportsdate=20110908 @@ -15,7 +15,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.0' 'tzdata') +depends=('linux-api-headers>=3.1' 'tzdata') makedepends=('gcc>=4.6') backup=(etc/gai.conf etc/locale.gen diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index 691cc0add..5a9db6545 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142277 2011-11-07 20:10:07Z stephane $ +# $Id: PKGBUILD 144590 2011-12-07 12:54:45Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils -pkgver=1.5.2 -pkgrel=2 +pkgver=1.5.5 +pkgrel=1 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64 'mips64el') url="http://www.kernel.org" @@ -10,7 +10,7 @@ license=('GPL2' 'LGPL2.1') depends=('glibc' 'sh') backup=(etc/request-key.conf) source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('19811ee31f683058a9aae3e6a3a23a7f') +md5sums=('9e8ab5164bc8f84be148761cc89e9d6f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index ddc548bbc..9eb17fc59 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142223 2011-11-06 13:03:25Z stephane $ +# $Id: PKGBUILD 144896 2011-12-09 11:55:57Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.9.2 -pkgrel=1.1 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -18,12 +18,14 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-sig krb5-kadmind krb5-kdc krb5-kpropd - krb5-1.9.1-config-script.patch) + krb5-1.9.1-config-script.patch + krb5-1.9.1-2011-007.patch) sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' '7f402078fa65bb9ff1beb6cbbbb017450df78560' - '7342410760cf44bfa01bb99bb4c49e12496cb46f') + '7342410760cf44bfa01bb99bb4c49e12496cb46f' + 'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7') options=('!emptydirs') build() { @@ -37,10 +39,15 @@ build() { # by libkrb5, unless do_deps is set to 1, which indicates that the caller # wants the whole list. # - # Patch from upstream : + # Patch from upstream : # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch + # Apply upstream patch to fix a null pointer dereference when processing TGS requests + # CVE-2011-1530 + # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt + patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch + # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 diff --git a/core/krb5/krb5-1.9.1-2011-007.patch b/core/krb5/krb5-1.9.1-2011-007.patch new file mode 100644 index 000000000..336a4ad31 --- /dev/null +++ b/core/krb5/krb5-1.9.1-2011-007.patch @@ -0,0 +1,40 @@ +diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in +index f46cad3..102fbaa 100644 +--- a/src/kdc/Makefile.in ++++ b/src/kdc/Makefile.in +@@ -67,6 +67,7 @@ check-unix:: rtest + + check-pytests:: + $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS) ++ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS) + + install:: + $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc +diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c +index c169c54..840a2ef 100644 +--- a/src/kdc/do_tgs_req.c ++++ b/src/kdc/do_tgs_req.c +@@ -243,7 +243,8 @@ tgt_again: + if (!tgs_1 || !data_eq(*server_1, *tgs_1)) { + errcode = find_alternate_tgs(request, &server); + firstpass = 0; +- goto tgt_again; ++ if (errcode == 0) ++ goto tgt_again; + } + } + status = "UNKNOWN_SERVER"; +diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py +new file mode 100644 +index 0000000..1760bcd +--- /dev/null ++++ b/src/kdc/t_emptytgt.py +@@ -0,0 +1,8 @@ ++#!/usr/bin/python ++from k5test import * ++ ++realm = K5Realm(start_kadmind=False, create_host=False) ++output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1) ++if 'not found in Kerberos database' not in output: ++ fail('TGT lookup for empty realm failed in unexpected way') ++success('Empty tgt lookup.') diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD index 2acfc5dc5..9ed3709f6 100644 --- a/core/linux-api-headers/PKGBUILD +++ b/core/linux-api-headers/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135918 2011-08-20 07:14:16Z allan $ +# $Id: PKGBUILD 144852 2011-12-08 12:17:11Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-api-headers -pkgver=3.0.1 -_basever=3.0 +pkgver=3.1.4 +_basever=3.1 pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ conflicts=('kernel-headers') replaces=('kernel-headers') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}-libre/linux-${_basever}-libre.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basever}-libre-${pkgver}-libre.xz") -md5sums=('44e7bc20c235a193f9b6123a8d5e9509' - 'af8d721036d89ed5500675c3289e3b48') +md5sums=('d73df15ab1d36fe3c102755d8f42117f' + 'ad965eeb168f19c536722ede6e22983b') build() { cd ${srcdir}/linux-${_basever} diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index e17c3f9cf..22980acea 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mkinitcpio-busybox pkgver=1.19.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64' 'mips64el') url="http://www.busybox.net/" diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD index d52b61042..1e3b467f9 100644 --- a/core/module-init-tools/PKGBUILD +++ b/core/module-init-tools/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 142296 2011-11-08 00:38:05Z dreisner $ +# $Id: PKGBUILD 144465 2011-12-06 10:57:39Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=module-init-tools pkgver=3.16 -pkgrel=2 +pkgrel=3 pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules" arch=('i686' 'x86_64' 'mips64el') url="https://modules.wiki.kernel.org" license=('GPL') depends=('glibc') makedepends=('docbook2x') -backup=('etc/modprobe.d/modprobe.conf') +backup=('etc/modprobe.d/modprobe.conf' + 'etc/depmod.d/depmod.conf') source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2" modprobe.conf + depmod.conf docfix.patch) md5sums=('bc44832c6e41707b8447e2847d2019f5' '325657db471b3190f685e5a89c9b90e3' + '4b8cbcbc54b9029c99fd730e257d4436' '4320d19902ded43bed55c804b065cdc7') build() { @@ -35,9 +38,12 @@ package() { make DESTDIR=$pkgdir install - # extra modprobe.d conf dir - install -dm755 "$pkgdir/lib/modprobe.d" + # extra modprobe.d and depmod.d conf dirs + install -dm755 "$pkgdir/lib/modprobe.d" "$pkgdir/etc/depmod.d" - # Install our custom (read: empty) modprobe.conf + # Install custom depmod config to allow searching extramodules/ + install -Dm644 "$srcdir/depmod.conf" "$pkgdir/etc/depmod.d/depmod.conf" + + # Install our custom (empty) modprobe.conf install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf" } diff --git a/core/module-init-tools/depmod.conf b/core/module-init-tools/depmod.conf new file mode 100644 index 000000000..3feb67b05 --- /dev/null +++ b/core/module-init-tools/depmod.conf @@ -0,0 +1,5 @@ +# +# /etc/depmod.d/depmod.conf +# + +search updates extramodules built-in diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index eced63917..4ec7c926d 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -7,7 +7,7 @@ pkgname=nfs-utils pkgver=1.2.5 -pkgrel=1 +pkgrel=1.1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64' 'mips64el') url='http://nfs.sourceforge.net' diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD index 45e945496..e46251076 100644 --- a/core/shadow/PKGBUILD +++ b/core/shadow/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 129320 2011-06-26 16:36:48Z eric $ +# $Id: PKGBUILD 144463 2011-12-06 10:57:36Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=shadow pkgver=4.1.4.3 -pkgrel=2 +pkgrel=5 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=('i686' 'x86_64' 'mips64el') url='http://pkg-shadow.alioth.debian.org/' @@ -27,12 +28,12 @@ source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e' '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' - 'd66096ed9477bd7242e8d2cc28eaa23170269788' + '12427b1ca92a9b85ca8202239f0d9f50198b818f' '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' - '0b2d98a0ee3bfde8551ade48d4d35cc20ec702a1' + '895aad07c192b288b457e19dd7b8c55841b4ad22' 'e5cab2118ecb1e61874cde842d7d04d1003f35cb' - 'd66096ed9477bd7242e8d2cc28eaa23170269788' - '6f183bc7709b0a8d20ad17481a4ad025cf6e5056' + '12427b1ca92a9b85ca8202239f0d9f50198b818f' + '611be25d91c3f8f307c7fe2485d5f781e5dee75f' '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' diff --git a/core/shadow/chpasswd b/core/shadow/chpasswd index bc14857dc..5d447985a 100644 --- a/core/shadow/chpasswd +++ b/core/shadow/chpasswd @@ -3,4 +3,4 @@ auth sufficient pam_rootok.so auth required pam_unix.so account required pam_unix.so session required pam_unix.so -password required pam_unix.so md5 shadow +password required pam_unix.so sha512 shadow diff --git a/core/shadow/login b/core/shadow/login index 51ff96a4a..b8555f89c 100644 --- a/core/shadow/login +++ b/core/shadow/login @@ -9,7 +9,7 @@ account required pam_access.so account required pam_time.so account required pam_unix.so #password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so md5 shadow use_authtok +#password required pam_unix.so sha512 shadow use_authtok session required pam_unix.so session required pam_env.so session required pam_motd.so @@ -18,3 +18,4 @@ session optional pam_mail.so dir=/var/spool/mail standard session optional pam_lastlog.so session optional pam_loginuid.so -session optional pam_ck_connector.so nox11 +-session optional pam_systemd.so diff --git a/core/shadow/newusers b/core/shadow/newusers index bc14857dc..5d447985a 100644 --- a/core/shadow/newusers +++ b/core/shadow/newusers @@ -3,4 +3,4 @@ auth sufficient pam_rootok.so auth required pam_unix.so account required pam_unix.so session required pam_unix.so -password required pam_unix.so md5 shadow +password required pam_unix.so sha512 shadow diff --git a/core/shadow/passwd b/core/shadow/passwd index 1ffd1bdd8..ab56da496 100644 --- a/core/shadow/passwd +++ b/core/shadow/passwd @@ -1,4 +1,4 @@ #%PAM-1.0 #password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so md5 shadow use_authtok -password required pam_unix.so md5 shadow nullok +#password required pam_unix.so sha512 shadow use_authtok +password required pam_unix.so sha512 shadow nullok diff --git a/core/shadow/shadow.install b/core/shadow/shadow.install index c1bd1066b..e990bfe39 100644 --- a/core/shadow/shadow.install +++ b/core/shadow/shadow.install @@ -1,8 +1,9 @@ post_upgrade() { - grpck -r &>/dev/null + grpck -r >/dev/null 2>&1 if [ $? -eq 2 ]; then - echo "Fixing gshadow file ..." - while :; do echo "y"; done | grpck &>/dev/null + printf '%s\n' \ + "==> Warning: /etc/group or /etc/gshadow are inconsistant." \ + " Run 'grpck' to correct this." fi return 0 } diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD index 9d3d375ad..582bae1e3 100644 --- a/core/wpa_actiond/PKGBUILD +++ b/core/wpa_actiond/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_actiond pkgver=1.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events" arch=('i686' 'x86_64' 'mips64el') url="http://projects.archlinux.org/wpa_actiond.git/" diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 09c6fa9ae..aa6b6658b 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143076 2011-11-22 12:47:07Z giovanni $ +# $Id: PKGBUILD 144467 2011-12-06 11:17:39Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10683 +pkgver=10688 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('c9adbecbbec7831fc42b177c8b548e05') +md5sums=('0bb387c6aafa146e75130e1537a64066') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 6d8566651..32740d692 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142549 2011-11-11 23:52:56Z bisson $ +# $Id: PKGBUILD 144890 2011-12-09 03:35:28Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.1 -pkgrel=2 +pkgver=3.1.1 +pkgrel=1 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' url='http://audacious-media-player.org/' license=('GPL3') @@ -13,8 +13,8 @@ arch=('i686' 'x86_64' 'mips64el') depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') optdepends=('p7zip-libre: zipped skins support') -source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") -sha1sums=('53d89b3e2faf5ca13dca55875dc04efc753328f2') +source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('fa5629d68ac1b12d563e8c0b4be083dea7c7924c') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/babl/PKGBUILD b/extra/babl/PKGBUILD index 98005f9d9..45f2d5cef 100644 --- a/extra/babl/PKGBUILD +++ b/extra/babl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108536 2011-02-01 06:59:18Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 144898 2011-12-09 11:56:58Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=babl -pkgver=0.1.4 +pkgver=0.1.6 pkgrel=1 pkgdesc="Dynamic, any to any, pixel format conversion library" arch=('i686' 'x86_64' 'mips64el') @@ -11,14 +11,19 @@ license=('LGPL3') depends=('glibc') options=('!libtool' '!makeflags') source=(ftp://ftp.gimp.org/pub/babl/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1deaf8188b200b10d98a343a7e712b2b') -sha1sums=('9f7186e5d968a4c9d81a63b20836b163f56df616') +sha1sums=('3178ec9f988efe895d00e2d432ad9b6ec10211e9') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index ce74ff1bb..2153ff5ad 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144362 2011-12-05 08:15:00Z bisson $ +# $Id: PKGBUILD 144487 2011-12-06 22:43:42Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -8,13 +8,16 @@ pkgname=bitlbee pkgver=3.0.4 -pkgrel=1 +pkgrel=3 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' -arch=('i686' 'x86_64' 'mips64el') url='http://www.bitlbee.org/' license=('GPL') -depends=('openssl' 'glib2' 'libotr') -optdepends=('xinetd: to run bitlbee through xinetd') +arch=('i686' 'x86_64' 'mips64el') +depends=('openssl' 'glib2') +makedepends=('asciidoc' 'libotr') +optdepends=('skype4py: to use skyped' + 'libotr: for OTR encryption support' + 'xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' 'rc.d') @@ -28,15 +31,15 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --etcdir=/etc/bitlbee \ --pidfile=/var/run/bitlbee/bitlbee.pid \ --ipcsocket=/var/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/lib/systemd/system \ --ssl=openssl \ --strip=0 \ - --otr=1 \ - --ssl=gnutls + --otr=plugin make } diff --git a/extra/bitlbee/install b/extra/bitlbee/install index 7b43c7885..b0dd5511d 100644 --- a/extra/bitlbee/install +++ b/extra/bitlbee/install @@ -10,4 +10,5 @@ post_upgrade() { post_remove() { getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null + true } diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index e298d0cb4..20396ee35 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136387 2011-08-28 17:30:31Z andyrtr $ +# $Id: PKGBUILD 144878 2011-12-08 21:06:16Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.7.10 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -19,12 +19,17 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) -md5sums=('fcf58dcff52f0908ff3bc368d820408b') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + gnutls_buildfix.patch) +md5sums=('fcf58dcff52f0908ff3bc368d820408b' + '372bf7a9da58ae49d9da50f79db69fb6') build() { cd ${srcdir}/${pkgname}-${pkgver} + # fix build with latest gnutls + patch -Np1 -i ${srcdir}/gnutls_buildfix.patch + sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py ./configure --prefix=/usr --disable-static \ diff --git a/extra/claws-mail/gnutls_buildfix.patch b/extra/claws-mail/gnutls_buildfix.patch new file mode 100644 index 000000000..31de8eb8b --- /dev/null +++ b/extra/claws-mail/gnutls_buildfix.patch @@ -0,0 +1,12 @@ +--- claws-mail-3.7.10/src/common/ssl.c 2011-12-07 14:55:08.682553870 +0100 ++++ claws-mail-3.7.10/src/common/ssl.c 2011-12-07 14:55:43.808349602 +0100 +@@ -270,7 +270,9 @@ gboolean ssl_init_socket_with_method(Soc + if (session == NULL || r != 0) + return FALSE; + ++#if GNUTLS_VERSION_NUMBER < 0x020c00 + gnutls_transport_set_lowat (session, 1); ++#endif + gnutls_set_default_priority(session); + gnutls_protocol_set_priority (session, proto_prio); + gnutls_cipher_set_priority (session, cipher_prio); diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index bdd3b1e7a..57e789067 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 144384 2011-12-05 13:01:04Z ibiru $ +# $Id: PKGBUILD 144475 2011-12-06 14:25:28Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord pkgver=0.1.15 -pkgrel=2 +pkgrel=3 pkgdesc="Color daemon" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/software/colord" license=('GPL2') -depends=('lcms2' 'libgusb' 'polkit' 'sane' 'sqlite3' 'udev') +depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -optdepends=('shared-color-profiles: color profiles') -source=($url/releases/$pkgname-$pkgver.tar.xz) +source=($url/releases/$pkgname-$pkgver.tar.xz + scan_only_color_profile_dir.patch) options=('!libtool') -sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8') +sha1sums=('e83a68add3fac9c677829925794ee353743dc9c8' + 'b4b8ea1008ecfdc1084ec69d647127587a2a87f7') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/scan_only_color_profile_dir.patch" ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ --localstatedir=/var --disable-static diff --git a/extra/colord/scan_only_color_profile_dir.patch b/extra/colord/scan_only_color_profile_dir.patch new file mode 100644 index 000000000..0591fc420 --- /dev/null +++ b/extra/colord/scan_only_color_profile_dir.patch @@ -0,0 +1,35 @@ +From 78b6dc7dbf865df6b0d30526293591fe5773029a Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Tue, 6 Dec 2011 09:49:49 +0000 +Subject: [PATCH] If /usr/share/color appears at runtime, don't rescan the + parent dir + +Resolves https://bugs.freedesktop.org/show_bug.cgi?id=43542 +--- + src/cd-profile-store.c | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/cd-profile-store.c b/src/cd-profile-store.c +index ecad474..c662351 100644 +--- a/src/cd-profile-store.c ++++ b/src/cd-profile-store.c +@@ -260,8 +260,14 @@ cd_profile_store_file_monitor_changed_cb (GFileMonitor *monitor, + /* just rescan the correct directory */ + parent = g_file_get_parent (file); + parent_path = g_file_get_path (parent); +- g_debug ("CdProfileStore: %s was added, rescanning %s", path, parent_path); +- cd_profile_store_search_path (profile_store, parent_path); ++ if (g_strcmp0 (parent_path, DATADIR) == 0) { ++ g_debug ("CdProfileStore: %s was added, rescanning", path); ++ cd_profile_store_search_path (profile_store, path); ++ } else { ++ g_debug ("CdProfileStore: %s was added, rescanning parent %s", ++ path, parent_path); ++ cd_profile_store_search_path (profile_store, parent_path); ++ } + out: + if (parent != NULL) + g_object_unref (parent); +-- +1.7.6 + diff --git a/extra/convertlit/PKGBUILD b/extra/convertlit/PKGBUILD new file mode 100644 index 000000000..4c7477666 --- /dev/null +++ b/extra/convertlit/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 144473 2011-12-06 12:35:16Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: gDD (usrgdd | gmail) +# Contributor: cantabile + +pkgname=convertlit +pkgver=1.8 +pkgrel=6 +pkgdesc="An extractor/converter for .LIT eBooks" +arch=('i686' 'x86_64') +url="http://www.convertlit.com/" +license=('GPL') +depends=('glibc') +makedepends=('libtommath') +source=("http://www.convertlit.com/clit18src.zip") +md5sums=('d691d4729485fe5d73e3f0937d8fb42e') + +build() { + cd ${srcdir}/lib + make + + cd ../clit18 + sed -i 's|../libtommath-0.30/|/usr/lib/|' Makefile + make +} + +package() { + cd ${srcdir}/clit18 + + install -Dm755 clit "$pkgdir/usr/bin/clit" +} diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 2b4a1156e..4d7971276 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.23 -pkgrel=8 +pkgrel=8.1 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index 538f77327..39c34fed7 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -3,7 +3,7 @@ pkgname=dconf pkgver=0.10.0 -pkgrel=1 +pkgrel=1.1 pkgdesc="A low-level configuration system." arch=(i686 x86_64 'mips64el') url="http://live.gnome.org/dconf" diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 38c885149..00d2269e5 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 136084 2011-08-22 14:13:59Z dan $ +# $Id: PKGBUILD 144489 2011-12-06 22:57:33Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.7.5.1 +pkgver=1.7.6 pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra') source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('f5355c442c5bc2481dbef7fdea8f0556') -sha1sums=('15671defd1eefe255aa564b6f3097e30ab07ff55') +md5sums=('79f67eea3d43a5c9964194786d786f37') +sha1sums=('6c63ece66875c9312b76bfe11d688e1b1ae2e3bb') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 26eba0f2a..7125acf0d 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -21,14 +21,14 @@ fi source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz ffmpeg-loongson.patch) md5sums=('8ec30d05efe0f6cc6f702933e6781e8e' - '081d03278559a351322157a441fabcf5') + '99d412cb539f328dbc37d5ead3407fc7') build() { cd "$srcdir/$pkgname" -# [ "$CARCH" = "mips64el" ] && patch -Np1 -i $srcdir/ffmpeg-loongson.patch - if [ "$CARCH" = "mips64el" ] ; then +# Make video decoding faster and turn all pixels green. +# patch -Np1 -i $srcdir/ffmpeg-loongson.patch extraconf="--disable-runtime-cpudetect --disable-vdpau --disable-vaapi" else extraconf="" diff --git a/extra/ffmpeg/ffmpeg-loongson.patch b/extra/ffmpeg/ffmpeg-loongson.patch index 501eafd15..d576812da 100644 --- a/extra/ffmpeg/ffmpeg-loongson.patch +++ b/extra/ffmpeg/ffmpeg-loongson.patch @@ -1,8 +1,7 @@ -diff --git a/configure b/configure -index 25e8cef..1d6c652 100755 ---- a/configure -+++ b/configure -@@ -230,6 +230,7 @@ Advanced options (experts only): +diff -Nru ffmpeg.orig/configure ffmpeg/configure +--- ffmpeg.orig/configure 2011-12-09 21:40:32.268783206 +0100 ++++ ffmpeg/configure 2011-12-09 21:40:50.408820175 +0100 +@@ -249,6 +249,7 @@ --disable-armvfp disable ARM VFP optimizations --disable-iwmmxt disable iwmmxt optimizations --disable-mmi disable MMI optimizations @@ -10,15 +9,15 @@ index 25e8cef..1d6c652 100755 --disable-neon disable neon optimizations --disable-vis disable VIS optimizations --disable-yasm disable use of yasm assembler -@@ -995,6 +996,7 @@ ARCH_EXT_LIST=' - armvfp +@@ -1110,6 +1111,7 @@ + avx iwmmxt mmi + loongson2mmi mmx mmx2 neon -@@ -2862,6 +2864,7 @@ if enabled arm; then +@@ -3367,6 +3369,7 @@ fi if enabled mips; then echo "MMI enabled ${mmi-no}" @@ -26,11 +25,10 @@ index 25e8cef..1d6c652 100755 fi if enabled ppc; then echo "AltiVec enabled ${altivec-no}" -diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h -index add4b10..8244e51 100644 ---- a/libavcodec/avcodec.h -+++ b/libavcodec/avcodec.h -@@ -1586,6 +1586,8 @@ typedef struct AVCodecContext { +diff -Nru ffmpeg.orig/libavcodec/avcodec.h ffmpeg/libavcodec/avcodec.h +--- ffmpeg.orig/libavcodec/avcodec.h 2011-12-09 21:40:31.980782616 +0100 ++++ ffmpeg/libavcodec/avcodec.h 2011-12-09 21:40:50.504820368 +0100 +@@ -1824,6 +1824,8 @@ #define FF_IDCT_SIMPLENEON 22 #define FF_IDCT_SIMPLEALPHA 23 #define FF_IDCT_BINK 24 @@ -39,11 +37,10 @@ index add4b10..8244e51 100644 /** * slice count -diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c -index bbfdb6a..dfc3452 100644 ---- a/libavcodec/dsputil.c -+++ b/libavcodec/dsputil.c -@@ -4525,6 +4525,7 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx) +diff -Nru ffmpeg.orig/libavcodec/dsputil.c ffmpeg/libavcodec/dsputil.c +--- ffmpeg.orig/libavcodec/dsputil.c 2011-12-09 21:40:31.912782478 +0100 ++++ ffmpeg/libavcodec/dsputil.c 2011-12-09 21:40:50.568820499 +0100 +@@ -3193,6 +3193,7 @@ if (HAVE_MMI) dsputil_init_mmi (c, avctx); if (ARCH_SH4) dsputil_init_sh4 (c, avctx); if (ARCH_BFIN) dsputil_init_bfin (c, avctx); @@ -51,23 +48,20 @@ index bbfdb6a..dfc3452 100644 for(i=0; i<64; i++){ if(!c->put_2tap_qpel_pixels_tab[0][i]) -diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h -index d1816e6..1a72ae9 100644 ---- a/libavcodec/dsputil.h -+++ b/libavcodec/dsputil.h -@@ -636,6 +636,7 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx); +diff -Nru ffmpeg.orig/libavcodec/dsputil.h ffmpeg/libavcodec/dsputil.h +--- ffmpeg.orig/libavcodec/dsputil.h 2011-12-09 21:40:31.720782087 +0100 ++++ ffmpeg/libavcodec/dsputil.h 2011-12-09 21:40:50.628820621 +0100 +@@ -650,6 +650,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx); void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); void dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); +void dsputil_init_loongson2(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_dwt(DSPContext *c); - void ff_cavsdsp_init(DSPContext* c, AVCodecContext *avctx); -diff --git a/libavcodec/loongson2/dsputil_loongson2.c b/libavcodec/loongson2/dsputil_loongson2.c -new file mode 100644 -index 0000000..01bd3ac ---- /dev/null -+++ b/libavcodec/loongson2/dsputil_loongson2.c + void ff_intrax8dsp_init(DSPContext* c, AVCodecContext *avctx); +diff -Nru ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.c ffmpeg/libavcodec/loongson2/dsputil_loongson2.c +--- ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/dsputil_loongson2.c 2011-12-09 21:40:50.668820701 +0100 @@ -0,0 +1,221 @@ +/* + * Copyright(C) 2006-2010 comcat <jiankemeng@gmail.com> @@ -290,11 +284,9 @@ index 0000000..01bd3ac +#endif + +} -diff --git a/libavcodec/loongson2/dsputil_loongson2.d b/libavcodec/loongson2/dsputil_loongson2.d -new file mode 100644 -index 0000000..808f0a3 ---- /dev/null -+++ b/libavcodec/loongson2/dsputil_loongson2.d +diff -Nru ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.d ffmpeg/libavcodec/loongson2/dsputil_loongson2.d +--- ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.d 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/dsputil_loongson2.d 2011-12-09 21:40:50.680820726 +0100 @@ -0,0 +1,18 @@ +libavcodec/loongson2/dsputil_loongson2.o: \ + libavcodec/loongson2/dsputil_loongson2.c \ @@ -314,24 +306,16 @@ index 0000000..808f0a3 + libavcodec/loongson2/../eval.h libavcodec/loongson2/../parser.h \ + libavcodec/loongson2/../avcodec.h libavcodec/loongson2/../mpeg12data.h \ + libavutil/rational.h libavcodec/loongson2/../rl.h -diff --git a/libavcodec/loongson2/dsputil_loongson2.h b/libavcodec/loongson2/dsputil_loongson2.h -new file mode 100644 -index 0000000..87c7bd9 ---- /dev/null -+++ b/libavcodec/loongson2/dsputil_loongson2.h +diff -Nru ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.h ffmpeg/libavcodec/loongson2/dsputil_loongson2.h +--- ffmpeg.orig/libavcodec/loongson2/dsputil_loongson2.h 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/dsputil_loongson2.h 2011-12-09 21:40:50.692820753 +0100 @@ -0,0 +1,3 @@ +#include "libavcodec/dsputil.h" + +void dsputil_init_pix_loongson2(DSPContext* c, AVCodecContext *avctx); -diff --git a/libavcodec/loongson2/dsputil_loongson2.o b/libavcodec/loongson2/dsputil_loongson2.o -new file mode 100644 -index 0000000..fca0b55 -Binary files /dev/null and b/libavcodec/loongson2/dsputil_loongson2.o differ -diff --git a/libavcodec/loongson2/idct_loongson2.c b/libavcodec/loongson2/idct_loongson2.c -new file mode 100644 -index 0000000..539cab5 ---- /dev/null -+++ b/libavcodec/loongson2/idct_loongson2.c +diff -Nru ffmpeg.orig/libavcodec/loongson2/idct_loongson2.c ffmpeg/libavcodec/loongson2/idct_loongson2.c +--- ffmpeg.orig/libavcodec/loongson2/idct_loongson2.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/idct_loongson2.c 2011-12-09 21:40:50.744820857 +0100 @@ -0,0 +1,336 @@ +/* + * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org> @@ -669,11 +653,9 @@ index 0000000..539cab5 + +declare_idct (ff_loongson2_idct, loongson2_table, + loongson2_row_head, loongson2_row, loongson2_row_tail, loongson2_row_mid) -diff --git a/libavcodec/loongson2/idct_loongson2_xvid.c b/libavcodec/loongson2/idct_loongson2_xvid.c -new file mode 100644 -index 0000000..4a1ee1e ---- /dev/null -+++ b/libavcodec/loongson2/idct_loongson2_xvid.c +diff -Nru ffmpeg.orig/libavcodec/loongson2/idct_loongson2_xvid.c ffmpeg/libavcodec/loongson2/idct_loongson2_xvid.c +--- ffmpeg.orig/libavcodec/loongson2/idct_loongson2_xvid.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/idct_loongson2_xvid.c 2011-12-09 22:38:11.227175456 +0100 @@ -0,0 +1,301 @@ +/* + * XVID MPEG-4 VIDEO CODEC @@ -713,13 +695,13 @@ index 0000000..4a1ee1e +// Various memory constants (trigonometric values or rounding values) +//----------------------------------------------------------------------------- + -+static const int16_t tg_1_16[4*4] attribute_used __attribute__ ((aligned(8))) = { ++DECLARE_ALIGNED(8, static const int16_t, tg_1_16)[4*4] = { + 13036,13036,13036,13036, // tg * (2<<16) + 0.5 + 27146,27146,27146,27146, // tg * (2<<16) + 0.5 + -21746,-21746,-21746,-21746, // tg * (2<<16) + 0.5 + 23170,23170,23170,23170}; // cos * (2<<15) + 0.5 + -+static const int32_t rounder_0[2*8] attribute_used __attribute__ ((aligned(8))) = { ++DECLARE_ALIGNED(8, static const int32_t, rounder_0)[2*8] = { + 65536,65536, + 3597,3597, + 2260,2260, @@ -731,7 +713,7 @@ index 0000000..4a1ee1e + + +// Table for rows 0,4 - constants are multiplied by cos_4_16 -+static const int16_t tab_i_04_mmx[32*4] attribute_used __attribute__ ((aligned(8))) = { ++DECLARE_ALIGNED(8, static const int16_t, tab_i_04_mmx)[32*4] = { + 16384,16384,16384,-16384, // movq-> w06 w04 w02 w00 + 21407,8867,8867,-21407, // w07 w05 w03 w01 + 16384,-16384,16384,16384, // w14 w12 w10 w08 @@ -771,7 +753,7 @@ index 0000000..4a1ee1e + + +// %3 for rows 0,4 - constants are multiplied by cos_4_16 -+static const int16_t tab_i_04_xmm[32*4] attribute_used __attribute__ ((aligned(8))) = { ++DECLARE_ALIGNED(8, static const int16_t, tab_i_04_xmm)[32*4] = { + 16384,21407,16384,8867, // movq-> w05 w04 w01 w00 + 16384,8867,-16384,-21407, // w07 w06 w03 w02 + 16384,-8867,16384,-21407, // w13 w12 w09 w08 @@ -865,7 +847,7 @@ index 0000000..4a1ee1e + "packsswh $f14, $f14, $f8 \n\t"/* 4 ; y6 y7 y4 y5*/\ + "sdc1 $f6, " #A2 " \n\t"/* 3 ; save y3 y2 y1 y0*/\ + "pshufh $f14, $f14, $f20 \n\t"/* y7 y6 y5 y4*/\ -+ "sdc1 $f14, 8 +" #A2 " \n\t"/* 7 ; save y7 y6 y5 y4*/\ ++ "sdc1 $f14, 8 +" #A2 " \n\t"/* 7 ; save y7 y6 y5 y4*/ + + +#define DCT_8_INV_COL(A1,A2)\ @@ -976,12 +958,9 @@ index 0000000..4a1ee1e + : "r"(block), "r"(rounder_0), "r"(tab_i_04_xmm), "r"(tg_1_16) + :"$f0","$f2","$f4","$f6","$f8","$f10","$f12","$f14","$f18","$f16","$20","$22","$24","$26"); +} -+ -diff --git a/libavcodec/loongson2/motion_est_loongson2.c b/libavcodec/loongson2/motion_est_loongson2.c -new file mode 100644 -index 0000000..bb67290 ---- /dev/null -+++ b/libavcodec/loongson2/motion_est_loongson2.c +diff -Nru ffmpeg.orig/libavcodec/loongson2/motion_est_loongson2.c ffmpeg/libavcodec/loongson2/motion_est_loongson2.c +--- ffmpeg.orig/libavcodec/loongson2/motion_est_loongson2.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/motion_est_loongson2.c 2011-12-09 23:25:15.247445391 +0100 @@ -0,0 +1,365 @@ +/* + * Loongson2E MMI optimized motion estimation @@ -994,13 +973,13 @@ index 0000000..bb67290 +#include "dsputil_loongson2.h" +#include "../avcodec.h" + -+static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={ ++DECLARE_ASM_CONST(8, uint64_t, round_tab)[3]={ + 0x0000000000000000ULL, + 0x0001000100010001ULL, + 0x0002000200020002ULL, +}; + -+static attribute_used __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL; ++DECLARE_ASM_CONST(8, uint64_t, bone)= 0x0101010101010101LL; + +static inline void sad8_1_loongson2(uint8_t *blk1, uint8_t *blk2, int stride, int h) +{ @@ -1348,11 +1327,9 @@ index 0000000..bb67290 + c->sad[0]= sad16_loongson2; + c->sad[1]= sad8_loongson2; +} -diff --git a/libavcodec/loongson2/mpegvideo_loongson2.c b/libavcodec/loongson2/mpegvideo_loongson2.c -new file mode 100644 -index 0000000..18d070a ---- /dev/null -+++ b/libavcodec/loongson2/mpegvideo_loongson2.c +diff -Nru ffmpeg.orig/libavcodec/loongson2/mpegvideo_loongson2.c ffmpeg/libavcodec/loongson2/mpegvideo_loongson2.c +--- ffmpeg.orig/libavcodec/loongson2/mpegvideo_loongson2.c 1970-01-01 01:00:00.000000000 +0100 ++++ ffmpeg/libavcodec/loongson2/mpegvideo_loongson2.c 2011-12-09 21:40:50.828821027 +0100 @@ -0,0 +1,385 @@ +/* + * The simplest mpeg encoder (well, it was the simplest!) @@ -1739,10 +1716,9 @@ index 0000000..18d070a +// draw_edges = draw_edges_loongson2; + +} -diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile -index 3f4da68..73e4d56 100644 ---- a/libavcodec/mips/Makefile -+++ b/libavcodec/mips/Makefile +diff -Nru ffmpeg.orig/libavcodec/mips/Makefile ffmpeg/libavcodec/mips/Makefile +--- ffmpeg.orig/libavcodec/mips/Makefile 2011-12-09 21:40:31.700782047 +0100 ++++ ffmpeg/libavcodec/mips/Makefile 2011-12-09 21:40:50.836821045 +0100 @@ -1,3 +1,9 @@ OBJS-$(HAVE_MMI) += ps2/dsputil_mmi.o \ ps2/idct_mmi.o \ @@ -1753,11 +1729,10 @@ index 3f4da68..73e4d56 100644 + loongson2/idct_loongson2_xvid.o \ + loongson2/mpegvideo_loongson2.o \ + loongson2/motion_est_loongson2.o -diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c -index b47ff9a..af92552 100644 ---- a/libavcodec/mpegvideo.c -+++ b/libavcodec/mpegvideo.c -@@ -176,6 +176,9 @@ av_cold int ff_dct_common_init(MpegEncContext *s) +diff -Nru ffmpeg.orig/libavcodec/mpegvideo.c ffmpeg/libavcodec/mpegvideo.c +--- ffmpeg.orig/libavcodec/mpegvideo.c 2011-12-09 21:40:31.644781931 +0100 ++++ ffmpeg/libavcodec/mpegvideo.c 2011-12-09 21:40:50.868821109 +0100 +@@ -182,6 +182,9 @@ #elif ARCH_BFIN MPV_common_init_bfin(s); #endif @@ -1767,11 +1742,10 @@ index b47ff9a..af92552 100644 /* load & permutate scantables note: only wmv uses different ones -diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h -index 5302be9..8d09906 100644 ---- a/libavcodec/mpegvideo.h -+++ b/libavcodec/mpegvideo.h -@@ -689,6 +689,7 @@ int MPV_encode_picture(AVCodecContext *avctx, unsigned char *buf, int buf_size, +diff -Nru ffmpeg.orig/libavcodec/mpegvideo.h ffmpeg/libavcodec/mpegvideo.h +--- ffmpeg.orig/libavcodec/mpegvideo.h 2011-12-09 21:40:31.728782103 +0100 ++++ ffmpeg/libavcodec/mpegvideo.h 2011-12-09 21:40:50.892821159 +0100 +@@ -704,6 +704,7 @@ void MPV_common_init_mmx(MpegEncContext *s); void MPV_common_init_axp(MpegEncContext *s); void MPV_common_init_mlib(MpegEncContext *s); @@ -1779,16 +1753,15 @@ index 5302be9..8d09906 100644 void MPV_common_init_mmi(MpegEncContext *s); void MPV_common_init_arm(MpegEncContext *s); void MPV_common_init_altivec(MpegEncContext *s); -diff --git a/libavcodec/options.c b/libavcodec/options.c -index 7ca1062..c05b3f4 100644 ---- a/libavcodec/options.c.orig 2011-06-22 12:52:11.584428161 -0300 -+++ b/libavcodec/options.c 2011-06-22 12:52:25.003143367 -0300 -@@ -219,6 +219,8 @@ static const AVOption options[]={ - {"simple", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"}, - {"simplemmx", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, - {"libmpeg2mmx", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_LIBMPEG2MMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, -+{"libmpeg2loongson2", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_LIBMPEG2LOONGSON2, INT_MIN, INT_MAX, V|E|D, "idct"}, -+{"xvidloongson2", NULL, 0, FF_OPT_TYPE_CONST, FF_IDCT_XVIDLOONGSON2, INT_MIN, INT_MAX, V|E|D, "idct"}, - {"ps2", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_PS2 }, INT_MIN, INT_MAX, V|E|D, "idct"}, - {"mlib", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_MLIB }, INT_MIN, INT_MAX, V|E|D, "idct"}, - {"arm", NULL, 0, FF_OPT_TYPE_CONST, {.dbl = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, +diff -Nru ffmpeg.orig/libavcodec/options.c ffmpeg/libavcodec/options.c +--- ffmpeg.orig/libavcodec/options.c 2011-12-09 21:40:31.820782292 +0100 ++++ ffmpeg/libavcodec/options.c 2011-12-09 21:45:31.645390878 +0100 +@@ -251,6 +251,8 @@ + {"simple", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLE }, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"libmpeg2mmx", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_LIBMPEG2MMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, ++{"libmpeg2loongson2", NULL, 0, AV_OPT_TYPE_CONST, FF_IDCT_LIBMPEG2LOONGSON2, INT_MIN, INT_MAX, V|E|D, "idct"}, ++{"xvidloongson2", NULL, 0, AV_OPT_TYPE_CONST, FF_IDCT_XVIDLOONGSON2, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"ps2", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_PS2 }, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"mlib", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_MLIB }, INT_MIN, INT_MAX, V|E|D, "idct"}, + {"arm", NULL, 0, AV_OPT_TYPE_CONST, {.dbl = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 121bfc29e..98c08a84e 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143496 2011-11-25 03:20:54Z bisson $ +# $Id: PKGBUILD 144921 2011-12-10 11:25:45Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.1.0 +pkgver=2.5.2 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('9ab09afece8d94faacdcadb150f87c0337108857' +sha1sums=('2d4eddf52fd7a7d6c936afb3c42b12dfc86aed01' '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc') install=install diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 1b80a60be..14c922a82 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142878 2011-11-17 18:34:36Z ibiru $ +# $Id: PKGBUILD 144900 2011-12-09 12:16:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.2.3 +pkgver=3.2.5 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9db009de74874846edadc0f4a7dc0127a4272cff4348a13544c611cc3696b751') +sha256sums=('0cec1916b4ba878531d32163767a8d39b72eea8d6893103238c82d3a27127c81') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 808942a8a..93a8cbd50 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142624 2011-11-12 17:15:18Z ibiru $ +# $Id: PKGBUILD 144902 2011-12-09 12:21:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gegl -pkgver=0.1.6 -pkgrel=2 +pkgver=0.1.8 +pkgrel=1 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.gegl.org/" @@ -15,19 +15,21 @@ optdepends=('openexr: for using the openexr plugin' \ 'librsvg: for using the svg plugin' \ 'jasper: for using the jasper plugin') options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \ - 0.1.6-ffmpeg.patch) -sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d' - 'd62d4987f1c0fc256f5968271fc65cce0cc4c195') +source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('3d4d902580f5c5122b01b5188b6b5da03089ecac') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch" ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make } +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make check +#} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/gettext-mono/PKGBUILD b/extra/gettext-mono/PKGBUILD index bb9490811..5741a1640 100644 --- a/extra/gettext-mono/PKGBUILD +++ b/extra/gettext-mono/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 69576 2010-02-21 06:28:43Z allan $ +# $Id: PKGBUILD 144881 2011-12-08 21:14:16Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gettext-mono -pkgver=0.17 -pkgrel=4 +pkgver=0.18.1.1 +pkgrel=1 pkgdesc="mono assemblies for GNU internationalization library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gettext" -license=('GPL3') -depends=('mono>=1.9') +license=('GPL') +depends=('mono>=2.10.6') source=(ftp://ftp.gnu.org/pub/gnu/gettext/gettext-$pkgver.tar.gz) -md5sums=('58a2bc6d39c0ba57823034d55d65d606') +md5sums=('3dd55b952826d2b32f51308f2f91aa89') build() { # get rid of that .wapi errors; thanks to brice diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD index 739f42ca3..5e1fee3fd 100644 --- a/extra/gobject-introspection/PKGBUILD +++ b/extra/gobject-introspection/PKGBUILD @@ -3,7 +3,7 @@ pkgname=gobject-introspection pkgver=1.30.0 -pkgrel=1 +pkgrel=1.1 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" arch=('x86_64' 'i686' 'mips64el') diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 6c9daaaa4..95d13fa3f 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141116 2011-10-24 10:42:39Z heftig $ +# $Id: PKGBUILD 144927 2011-12-10 21:25:05Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.1.17 -pkgrel=3 +pkgver=0.1.18 +pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') @@ -23,14 +23,11 @@ optdepends=('gupnp-av: uPnP plugin' 'libtracker-sparql: Tracker plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a') +sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # support tracker 0.12, already fixed in git master. - sed -i 's/sparql-0.11/sparql-0.12/g' configure - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ --enable-shoutcast make diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD index 9d2d331f3..b1b19646b 100644 --- a/extra/grilo/PKGBUILD +++ b/extra/grilo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139336 2011-10-01 18:58:47Z ibiru $ +# $Id: PKGBUILD 144926 2011-12-10 21:23:58Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=grilo -pkgver=0.1.17 -pkgrel=2 +pkgver=0.1.18 +pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" arch=(mips64el) @@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f88406b1737bdf0dc38c3acda418983084afe62ddc09fefd14a95f42ec727eaf') +sha256sums=('dc5bc1ea74ed3d47c4ec2d94886234346671509bdc63ce181f98824e7178ae83') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index 26f7397c1..bb30981e5 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Martin Striz <ms@poruba.net> pkgname=irqbalance -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ backup=(etc/conf.d/irqbalance) source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz irqbalance.conf.d irqbalance.rc.d) -md5sums=('58e1c9c164b12d797b500634a73938b4' +md5sums=('6f246481d6295bcb9a79751c03207c96' '336c1ee99818f9ecda1687e34c69fd6b' 'fb82fc5d267d39110baf720d81282a7c') diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD index 48a2d6911..9ae345965 100644 --- a/extra/kdeaccessibility/PKGBUILD +++ b/extra/kdeaccessibility/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141787 2011-11-02 18:13:09Z andrea $ +# $Id: PKGBUILD 144651 2011-12-08 09:19:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -8,7 +8,7 @@ pkgname=('kdeaccessibility-jovie' 'kdeaccessibility-kmag' 'kdeaccessibility-kmousetool' 'kdeaccessibility-kmouth') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://accessibility.kde.org' @@ -16,7 +16,7 @@ license=('GPL' 'FDL') groups=('kde' 'kdeaccessibility') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('9695d2b8b6f55266e3f76ebf05543f23857b9520') +sha1sums=('03f4ac8234dcc49eb93eff3630f76e226e290fff') build() { cd ${srcdir} diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 29d56822b..55990c6e2 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141789 2011-11-02 18:13:14Z andrea $ +# $Id: PKGBUILD 144653 2011-12-08 09:19:17Z 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.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -17,7 +17,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'syslog-path.patch') -sha1sums=('b2d6d210bc40e8731a9ae8409673f3d71b57de0a' +sha1sums=('1a294315645adbbff348a380196d4300a408b70d' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index e9f8a56af..a313ced91 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141791 2011-11-02 18:13:17Z andrea $ +# $Id: PKGBUILD 144655 2011-12-08 09:19:19Z 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.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('4d3611cbcd6052a7ba7137baa196c654d9d38d4d') +sha1sums=('f397f49a73273baadabcaf45cf18c4d6a3efbe44') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 6cc4d02a4..69cb5a342 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141793 2011-11-02 18:13:21Z andrea $ +# $Id: PKGBUILD 144657 2011-12-08 09:19:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2") -sha1sums=('ecf5d1cc087d78ba049fe65e06ee992a2fadcc19') +sha1sums=('33e1bc6f1043c9bf6186190b66b21483301eac7e') build() { cd "${srcdir}" diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index 444df1228..fa02ce80e 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141749 2011-11-02 18:12:12Z andrea $ +# $Id: PKGBUILD 144615 2011-12-08 09:18:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('htdig: to build the search index in khelpcenter' install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2" 'libqzeitgeist08.patch') -sha1sums=('293dec26e0d7278396d2ad0240d14aeea6060970' +sha1sums=('bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6' '164c9e4305029cb68a2101cfeeb76c7066c2fd39') build() { diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 57f02f9bd..a186ea25d 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141771 2011-11-02 18:12:45Z andrea $ +# $Id: PKGBUILD 144857 2011-12-08 16:10:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.7.3 -pkgrel=3 +pkgver=4.7.4 +pkgrel=2 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -32,10 +32,9 @@ backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kscreensaver') 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' + 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e' - '8c2bdefb23a03b753b78d16944d03fa3939d2d99' +sha1sums=('b7810ba13f6f2a1c4783b153ad9349a1dd27b495' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' @@ -46,7 +45,6 @@ sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e' build() { cd "${srcdir}"/${_pkgname}-${pkgver} - patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch patch -p1 -i "${srcdir}"/kdm-xinitrd.patch patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index a14566963..356046249 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141773 2011-11-02 18:12:47Z andrea $ +# $Id: PKGBUILD 144637 2011-12-08 09:18:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2") -sha1sums=('952dc26d0d908b41973a8d7b4d27765bf5128d58') +sha1sums=('ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 99ab380c8..bb1c748e5 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141795 2011-11-02 18:13:24Z andrea $ +# $Id: PKGBUILD 144659 2011-12-08 09:19:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2") -sha1sums=('d87622d46bce9a5f8b875393ac2292f5a57d5f78') +sha1sums=('8f260e09bffcf74bad18a5168016d0dad5db3656') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 3262e30d0..7057c3b8c 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141797 2011-11-02 18:13:27Z andrea $ +# $Id: PKGBUILD 144855 2011-12-08 14:50:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE bindings for ruby" url="http://kde.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.bz2") -sha1sums=('bf41817298a8b18ba3542e45256c1c6ddb08c900') +sha1sums=('e220dc672461aa1369e58de325f980139fcd52f6') build() { cd "${srcdir}" diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 7686e051c..1e5e85828 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141799 2011-11-02 18:13:30Z andrea $ +# $Id: PKGBUILD 144663 2011-12-08 09:19:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2") -sha1sums=('3e31b85d1a27a273450652d9f5a33f2c3c035329') +sha1sums=('416e9f25ff2050d9c5518254a7cc7d4cad22b648') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 74f5a4dca..91f35ddc1 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141801 2011-11-02 18:13:33Z andrea $ +# $Id: PKGBUILD 144665 2011-12-08 09:19:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2") -sha1sums=('e0cc0d644084f1c71b6afc30d5467c49ba9a9fab') +sha1sums=('7116668ecd5baf55734a8349a2f0b04d0e701898') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 016bd8d5b..685bb939b 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141763 2011-11-02 18:12:32Z andrea $ +# $Id: PKGBUILD 144627 2011-12-08 09:18:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") -sha1sums=('6e69719edccb23e3ced7ba30b72e88d214d6f54e') +sha1sums=('b4b3d8ce2b08af62202f5ae79fe57bde60dd9a85') build() { cd "${srcdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 5c8a7ebb8..7d809f25d 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141765 2011-11-02 18:12:34Z andrea $ +# $Id: PKGBUILD 144629 2011-12-08 09:18:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE bindings for Python" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") -sha1sums=('16063793d39fdc9f5b9916cab49236103ce79da2') +sha1sums=('cac4b94098dba73d58fb4f7d73d7c65c306517d1') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 147af2513..c96e6c1c9 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141769 2011-11-02 18:12:40Z andrea $ +# $Id: PKGBUILD 144633 2011-12-08 09:18:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Qt bindings for ruby" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2") -sha1sums=('2e3b36ece9039ccd39be76145575015503c6283c') +sha1sums=('e49e38a59238cf6f5ec9c2d9afc06f3330369fc7') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 2c6a7439f..940613359 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141767 2011-11-02 18:12:38Z andrea $ +# $Id: PKGBUILD 144631 2011-12-08 09:18:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2") -sha1sums=('676042633b8c426adf1f47ad143f5db20ae257ef') +sha1sums=('8f2412a8bbb343bdb1e14c0fc6ef3681afe9d601') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index 22a7bd81c..943e70baf 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141753 2011-11-02 18:12:18Z andrea $ +# $Id: PKGBUILD 144619 2011-12-08 09:18:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="http://kde.org/" @@ -11,10 +11,15 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') -source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2") -sha1sums=('ede4095fdb190b3bef13b246111e7d79903ad77e') +source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2" + 'fix-crash.patch') +sha1sums=('068d37e2404311b9caa23d78ee7fa262188a8622' + 'b209b2b7017622fea3406c5a9636e2334566af01') build() { + cd "${srcdir}"/smokegen-${pkgver} + patch -p1 -i "${srcdir}"/fix-crash.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/kdebindings-smokegen/fix-crash.patch b/extra/kdebindings-smokegen/fix-crash.patch new file mode 100644 index 000000000..5864da3f3 --- /dev/null +++ b/extra/kdebindings-smokegen/fix-crash.patch @@ -0,0 +1,13 @@ +diff -up smokegen-4.7.0/parser/type_compiler.cpp.orig smokegen-4.7.0/parser/type_compiler.cpp +diff -up smokegen-4.7.0/type_compiler.cpp.orig smokegen-4.7.0/type_compiler.cpp +--- smokegen-4.7.0/type_compiler.cpp.orig 2011-08-02 14:34:08.000000000 +0200 ++++ smokegen-4.7.0/type_compiler.cpp 2011-08-02 14:34:34.000000000 +0200 +@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara + + void TypeCompiler::visitPtrOperator(PtrOperatorAST* node) + { ++ if ( ! m_session->token_stream ) return; ++ if ( ! token_text(m_session->token_stream->kind(node->op)) ) return; + if (token_text(m_session->token_stream->kind(node->op))[0] == '*') { + QPair<bool, bool> cv = m_visitor->parseCv(node->cv); + pointerDepth.append(cv.first); diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 7c532e38b..a84b14362 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141761 2011-11-02 18:12:30Z andrea $ +# $Id: PKGBUILD 144625 2011-12-08 09:18:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="http://kde.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2") -sha1sums=('a25114d92c540f16af9022366ca2b5da447a1531') +sha1sums=('c3e2bd07158c4bc6a19123d5ae8e81529b52e07b') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index d7207015d..cce7f1e7e 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142565 2011-11-12 08:14:45Z andrea $ +# $Id: PKGBUILD 144621 2011-12-08 09:18:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.7.3 -pkgrel=2 +pkgver=4.7.4 +pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") -sha1sums=('cf1c4b7116695f0842972b2985eca65f6b63702e') +sha1sums=('2b1033732d166946db3096ddbf6eb9a6ddb61877') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index 91e7a18be..dccccf6f1 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141803 2011-11-02 18:13:36Z andrea $ +# $Id: PKGBUILD 144667 2011-12-08 09:19:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2") -sha1sums=('24f09f604e1687062b3296a30b873d1781379543') +sha1sums=('edeb024db23da00cf896bc41c6e3efa371d9867d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index f97ac94c2..cbda53904 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141805 2011-11-02 18:13:40Z andrea $ +# $Id: PKGBUILD 144669 2011-12-08 09:19:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2") -sha1sums=('ce6240d44cbf47b3dbfd1dbc03196c916e4394e9') +sha1sums=('da39832093c1ea6eb28c6b5b4f67cb24473d8fb5') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index f0d4411b4..5993a1545 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141807 2011-11-02 18:13:43Z andrea $ +# $Id: PKGBUILD 144671 2011-12-08 09:19:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2") -sha1sums=('88cc89a6c942b7cef548532702c5e68bf75f0748') +sha1sums=('8ef005a50316d7d86b7bc1ed306380d69ce946a0') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index ddf686d8c..f1bc07000 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141809 2011-11-02 18:13:47Z andrea $ +# $Id: PKGBUILD 144673 2011-12-08 09:19:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2") -sha1sums=('e22b54be4a2e8ce8a22af73fa6155ee012fa6fdf') +sha1sums=('6cb65b2c524f529976e4c63a75a7637a181d08d9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index bf4942ea7..33f76b461 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141811 2011-11-02 18:13:50Z andrea $ +# $Id: PKGBUILD 144675 2011-12-08 09:19:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2") -sha1sums=('44a60b76bbc8ae61b8673c37c2b8721f12dc22bb') +sha1sums=('15fda47cd6685a7e19fb4744ec930b9a4dcfbe05') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index 365128388..9b885ec49 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141813 2011-11-02 18:13:53Z andrea $ +# $Id: PKGBUILD 144677 2011-12-08 09:19:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2") -sha1sums=('c90205954d9c153aaa5966b424aa437b07e657f7') +sha1sums=('36165292cb9935343d1aa2572935a130b6619f00') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index 5a839bb6b..53ce7a39e 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141815 2011-11-02 18:13:57Z andrea $ +# $Id: PKGBUILD 144679 2011-12-08 09:20:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2") -sha1sums=('5f9835994ec6ad9454f7ee19bf003c8457e11d9e') +sha1sums=('4a90c59928a4947c5cd970ed72e5e9cea370d8e6') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index 17b1eea92..3a2781967 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141817 2011-11-02 18:14:01Z andrea $ +# $Id: PKGBUILD 144681 2011-12-08 09:20:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2") -sha1sums=('aef288a20209a4c1bf5d6f48be689c433049ea83') +sha1sums=('c5999ba4218cb0331b906fbcaafa7f497762221d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index e2a5ad425..d18a7a4dc 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144051 2011-12-02 20:54:24Z ibiru $ +# $Id: PKGBUILD 144683 2011-12-08 09:20:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.7.3 -pkgrel=2 +pkgver=4.7.4 +pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2") -sha1sums=('5a948b641f380e1cc6cf0f91d795a97029464bbb') +sha1sums=('4c76ef89e6210f2f25e719176db4d8a2b31b6222') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index 4891170f0..da0399a4a 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141821 2011-11-02 18:14:07Z andrea $ +# $Id: PKGBUILD 144685 2011-12-08 09:20:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2") -sha1sums=('5df19802a731b5f7033b43aa9b35e0b20164cd3e') +sha1sums=('8ec806306a7b08cb8ca5e567a48417cd2268e501') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index edb96cc11..abb06b626 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141823 2011-11-02 18:14:09Z andrea $ +# $Id: PKGBUILD 144687 2011-12-08 09:20:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2") -sha1sums=('da01b1c71d74f634ace0b6c2fc6e0186a08f9974') +sha1sums=('d2450f7aa24fc0118dd20d2e11d61fca68ba5461') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 543470bfc..48ad4fb51 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141825 2011-11-02 18:14:13Z andrea $ +# $Id: PKGBUILD 144689 2011-12-08 09:20:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2") -sha1sums=('e98ba022e987b9601ea1b27e97607ff7885ff788') +sha1sums=('b0b2b748e4ea0f670ffe5c9be01a6997a061a75c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 775af4f8b..1f784900c 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141827 2011-11-02 18:14:15Z andrea $ +# $Id: PKGBUILD 144691 2011-12-08 09:20:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2") -sha1sums=('41d333f726d9752a7ddb48f98817d91744adb7b0') +sha1sums=('d4e489093b440e4246c817821187193e4e53be66') build() { cd "${srcdir}" diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index b66c3555b..4674a5ee7 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141829 2011-11-02 18:14:18Z andrea $ +# $Id: PKGBUILD 144693 2011-12-08 09:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2") -sha1sums=('46b865ece6e14d4476297d4a3b400d5fab6564ea') +sha1sums=('92d7e446216bdfdf68e13c9f0ba39d44e02b29c9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index a5bb66c24..2c98139ca 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141831 2011-11-02 18:14:22Z andrea $ +# $Id: PKGBUILD 144695 2011-12-08 09:20:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2") -sha1sums=('07d5ad5c1b8308c2c8c2ff48e2c0c18adfd051ca') +sha1sums=('b3baa81277417f352d4a0bdca61df75515f30c0d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index 0290a54c2..61c85dea2 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141833 2011-11-02 18:14:26Z andrea $ +# $Id: PKGBUILD 144697 2011-12-08 09:20:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2") -sha1sums=('616c16a94066ec2930bc0795f8053be221c871e5') +sha1sums=('c726b0856234ce78fab0ecd61072cdb035e66513') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index a1ac2edb7..29fca5ac8 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141777 2011-11-02 18:12:53Z andrea $ +# $Id: PKGBUILD 144641 2011-12-08 09:18:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2") -sha1sums=('980a8dae9c7a0f8483fde5dc839fae834763933a') +sha1sums=('e560c355a8d91bbb61b9f2e6c7cb11bd79eba1ab') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 4e4e85026..3c1d22bd0 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141835 2011-11-02 18:14:29Z andrea $ +# $Id: PKGBUILD 144699 2011-12-08 09:20:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2") -sha1sums=('a5d06f373976554d58c8aae279e411a6be028826') +sha1sums=('e61d0192dce0e1427ee41ff96f1bcb73c77cbcef') build() { cd "${srcdir}" diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 4006d6eac..e2197da44 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141837 2011-11-02 18:14:31Z andrea $ +# $Id: PKGBUILD 144701 2011-12-08 09:20:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2") -sha1sums=('5c7d4115f029e09a006912bf816d4ce396a9b49a') +sha1sums=('f808118fcd5df59a9a808747be940a88b30cf6f3') options=('!makeflags') build() { diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 8af05974a..a75526795 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141839 2011-11-02 18:14:34Z andrea $ +# $Id: PKGBUILD 144703 2011-12-08 09:20:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2") -sha1sums=('411695882916a8a1d0db86426a0d8f935fab21ad') +sha1sums=('30dba80e6f34124fd5a8ebf6688e261ab109d0d4') build() { cd "${srcdir}" diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index 4721fae86..5715c57da 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141841 2011-11-02 18:14:43Z andrea $ +# $Id: PKGBUILD 144705 2011-12-08 09:20:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -43,7 +43,7 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('abd90be42fa67cd6d6be1defe90dcd0408e94445') +sha1sums=('a1f97524f868ab9dae0439abcbf4b41f68715598') build() { cd $srcdir diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index 97b500140..7e0d99786 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141843 2011-11-02 18:14:47Z andrea $ +# $Id: PKGBUILD 144707 2011-12-08 09:20:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") -sha1sums=('7096721285d15311699acc76abd62755d6e93860') +sha1sums=('598714d18cf7adab8afd4f906070f0915e1cdc95') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 183d6dd0c..3c1402ec8 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141845 2011-11-02 18:14:51Z andrea $ +# $Id: PKGBUILD 144709 2011-12-08 09:20:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2") -sha1sums=('820f9b6449732f6cab48f5c2d9e7dbcf53eb6437') +sha1sums=('098c71d7588d5163656cb07a476efbfc6755900a') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index c734d406b..7e18901a7 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141847 2011-11-02 18:14:55Z andrea $ +# $Id: PKGBUILD 144711 2011-12-08 09:20:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2") -sha1sums=('bdd35e5defbcfc151f4960541c351246cb4dfa9e') +sha1sums=('bbfda234e8aec109c63226499fc72355b1c051ca') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index c3eb024e3..93a78cbed 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141849 2011-11-02 18:14:58Z andrea $ +# $Id: PKGBUILD 144713 2011-12-08 09:20:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2") -sha1sums=('d97511574120614ffb85308888c23eb2d3ba1b01') +sha1sums=('cd528839b6a9be997ed8d4a2fc87a8b5b8e8de91') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 6fb85c217..4859849c8 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141851 2011-11-02 18:15:01Z andrea $ +# $Id: PKGBUILD 144715 2011-12-08 09:21:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2") -sha1sums=('d276d230e76f7fbe91229dd015a6465cb1a6956e') +sha1sums=('31e23ab6735291ec86ebd83e2eee7afa191a4a59') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 32a58e460..647c3fc4e 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141853 2011-11-02 18:15:04Z andrea $ +# $Id: PKGBUILD 144717 2011-12-08 09:21:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2") -sha1sums=('2cc0b9d31248604ab570404a0c67ef325e8ed00e') +sha1sums=('a854213e5342e382d3b9c4a29d1aada654378d0f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 73f41b412..0985773b5 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141855 2011-11-02 18:15:07Z andrea $ +# $Id: PKGBUILD 144719 2011-12-08 09:21:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2") -sha1sums=('547c298e2f3f7b8f651e3402bf18507321d4a7ce') +sha1sums=('15f7ca6fbabb757898cc0f18685f5e204e6b3f56') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 842085d19..3355032f0 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141857 2011-11-02 18:15:12Z andrea $ +# $Id: PKGBUILD 144721 2011-12-08 09:21:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2") -sha1sums=('e0dd6e093cd487fa6604077371122d84b3e8efb7') +sha1sums=('bc40ae740e3a684e47ba1b5af01aeb427bb4336e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index de770154a..c46dc73a1 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141859 2011-11-02 18:15:14Z andrea $ +# $Id: PKGBUILD 144723 2011-12-08 09:21:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2") -sha1sums=('a55908cbc951c98dd27171909c1ccc5d978eec65') +sha1sums=('db278a2ebe4680a94c4963a53c1501cf1f1d9d2a') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 67280fc9f..e6605019b 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141757 2011-11-02 18:12:23Z andrea $ +# $Id: PKGBUILD 144623 2011-12-08 09:18:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2") -sha1sums=('a14700386f386cc50f7dd6785eeb93dae10a0362') +sha1sums=('5f02bbfeff81b55e0fd5d9e973cb927909faccb1') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/staging-i686/PKGBUILD b/extra/kdegraphics-okular/staging-i686/PKGBUILD new file mode 100644 index 000000000..8b08d240f --- /dev/null +++ b/extra/kdegraphics-okular/staging-i686/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 144119 2011-12-04 09:06:00Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdegraphics-okular +pkgver=4.7.4 +pkgrel=1 +pkgdesc='Document Viewer' +arch=('i686' 'x86_64') +url="http://kde.org/applications/graphics/okular/" +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' + 'ebook-tools' 'libspectre') +makedepends=('pkgconfig' 'cmake' 'automoc4') +optdepends=('kdegraphics-mobipocket: mobipocket support') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2") +sha1sums=('5f02bbfeff81b55e0fd5d9e973cb927909faccb1') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../okular-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install b/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/extra/kdegraphics-okular/staging-i686/kdegraphics-okular.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/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index aef829149..56f05e2e0 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141861 2011-11-02 18:15:18Z andrea $ +# $Id: PKGBUILD 144725 2011-12-08 09:21:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('827b18fd902a464162db7a3cd98a22fa211bafc9') +sha1sums=('39b3b0312663a3ef7a68c972b39bf12fb4cabe8b') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index a0ef75125..e641d8e40 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141863 2011-11-02 18:15:21Z andrea $ +# $Id: PKGBUILD 144727 2011-12-08 09:21:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A KPart for viewving SVGs" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2") -sha1sums=('fa7f8cac53f6041f18a2bee09c2aa3885e27f7c7') +sha1sums=('38dcb3c468ca359e7b0a0027523b8156de6a06a1') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index a18545c7b..1b842c7a8 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141865 2011-11-02 18:15:24Z andrea $ +# $Id: PKGBUILD 144729 2011-12-08 09:21:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('219fd55d94d695cee8c7b650dbe8088cc9807e5c') +sha1sums=('0e1636da30c78ad2c186bcd30c0566406b920126') build() { cd "${srcdir}" diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 9de106e09..3a90fada3 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143000 2011-11-20 11:13:59Z andrea $ +# $Id: PKGBUILD 144610 2011-12-08 09:18:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kde-applications-menu.patch') -sha1sums=('4f1bbd1b4d558f3541057747db9bf7e9dcececb3' +sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8' '86ee8c8660f19de8141ac99cd6943964d97a1ed7') build() { diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index cde1482de..978cbd0cc 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142628 2011-11-12 17:15:23Z ibiru $ +# $Id: PKGBUILD 144731 2011-12-08 09:21:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,8 +10,8 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kmix' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') -pkgver=4.7.3 -pkgrel=3 +pkgver=4.7.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -20,7 +20,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'mplayerthumbs.config') -sha1sums=('4db44494e6a2ef886e3513b6a2eb4e526741a6ff' +sha1sums=('e0001afac38e35e3ab7b919d79f74cd57e3c18dd' 'ba016fa2563c14ffcba852c62506b66bfc6ee683') build() { diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 0a99ea940..ef294cd36 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141869 2011-11-02 18:15:31Z andrea $ +# $Id: PKGBUILD 144733 2011-12-08 09:21:25Z 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.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -21,7 +21,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7') +sha1sums=('15d5bdcda0e05de6247b22b96c6ca4a98da8a278') build() { cd "${srcdir}" diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 27ff41080..f1bb3f541 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141751 2011-11-02 18:12:14Z andrea $ +# $Id: PKGBUILD 144617 2011-12-08 09:18:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdepimlibs' 'kdebase-runtime') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('fa0e336e17f7abea1e36d28d941a4ef79b4e4635') +sha1sums=('fb02f53673316aaafb65b7c4dd570f3be3b4e935') build() { cd "${srcdir}" diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index be4e55bb2..16140a51b 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141871 2011-11-02 18:15:37Z andrea $ +# $Id: PKGBUILD 144735 2011-12-08 09:21:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -29,7 +29,7 @@ groups=('kde' 'kdepim') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('b540de51ba5b9995ce3b7c05cfb09112423d8569') +sha1sums=('233f6c413eeedd4af7cf15106a2af7b8f29977bf') build() { cd "${srcdir}" diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index fc01cff36..32cbf1484 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141746 2011-11-02 18:12:07Z andrea $ +# $Id: PKGBUILD 144612 2011-12-08 09:18:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('b95822a3e38587744174308b629336cd3d0444f4') +sha1sums=('a539e29557c0a30779e752b9349b3a0c000ffbba') build() { cd ${srcdir} diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index bad1591cf..1392bfbbc 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141873 2011-11-02 18:15:43Z andrea $ +# $Id: PKGBUILD 144737 2011-12-08 09:21:34Z 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.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -81,7 +81,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('decdea2d081396c90daabc9af754a233b43a0783') +sha1sums=('2bbf77d77e809733e6a74ff5688e6ff5487bc8bf') build() { cd "${srcdir}" diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index ab43ade39..aea73b6b5 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 141759 2011-11-02 18:12:27Z andrea $ +# $Id: PKGBUILD 144748 2011-12-08 09:52:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-kwrite' 'kdesdk-kate') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2" 'pkgbuild-syntax-highlight.patch') -sha1sums=('d67e871a49d426246f2e555ace0ad5a303c41045' +sha1sums=('b808f01213e0e44607e8f2577f9d1b4f88e14388' 'ab0c5d2a796b0f283154799add161c99f48ffcd5') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 773086d6f..0a9da92ae 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141875 2011-11-02 18:15:48Z andrea $ +# $Id: PKGBUILD 144767 2011-12-08 10:28:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -24,7 +24,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -34,7 +34,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'fix-python2-path.patch') -sha1sums=('c0afae643345c92bce387ceafbcea59d3fbd812e' +sha1sums=('3a0f61204653dc3f9f975732b6f67659c60ecaf3' 'd05ca0231869c484fd3861955d960a60aff7dcfb') build() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 6b6c0441b..fa5020736 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141877 2011-11-02 18:15:51Z andrea $ +# $Id: PKGBUILD 144739 2011-12-08 09:21:39Z 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.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('93d6f0a92c805de51fc68469f940f38858f81fbe') +sha1sums=('f929e598180f420d7fc6e4642ed56af9eee5a22b') build() { cd $srcdir diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD index f875791fc..c7f21e1b5 100644 --- a/extra/kdeutils/PKGBUILD +++ b/extra/kdeutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141879 2011-11-02 18:15:55Z andrea $ +# $Id: PKGBUILD 144741 2011-12-08 09:21:43Z 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.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('23fc9823647152d5d8cc250a55402c8930db4059') +sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e') build() { cd "${srcdir}"/${pkgbase}-${pkgver} diff --git a/extra/kdevelop-pg-qt/PKGBUILD b/extra/kdevelop-pg-qt/PKGBUILD index 94e797734..bfb042d6a 100644 --- a/extra/kdevelop-pg-qt/PKGBUILD +++ b/extra/kdevelop-pg-qt/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 118371 2011-04-06 12:38:22Z andrea $ +# $Id: PKGBUILD 144905 2011-12-09 16:07:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-pg-qt pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc="KDevelop Parser Generator, a LL(1) parser generator used by KDevelop language plugins" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdevelop.org/" license=('GPL') -depends=('kdelibs') +depends=('kdevelop') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") sha1sums=('b5bcb46a490bfb6a2d04c48cb28e0c77cdde183f') diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index ac5d5745e..d081099ab 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141881 2011-11-02 18:15:58Z andrea $ +# $Id: PKGBUILD 144743 2011-12-08 09:21:45Z andrea $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=kdewebdev @@ -6,7 +6,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') 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=('11108698887d376d00f02cbdfa1496aa3cb268c1') +sha1sums=('1e37e877d4f5ec8f6dcd05e828b4a8f0fd743d2c') build() { cd $srcdir diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 15c62994a..ec440bca1 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141675 2011-11-02 06:41:48Z andyrtr $ +# $Id: PKGBUILD 144919 2011-12-10 10:45:30Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.27 +pkgver=2.4.28 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -13,16 +13,26 @@ options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch - COPYING) -md5sums=('0fba4f42735cd3d24dd7a8cde0023fbd' + COPYING + git_fixes.diff + #missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538 + rbo.h list.h) +md5sums=('6488f64119c6439fa4038e9cd7b30b67' 'c722c8406507b7e3a8da7a3030d1d9cf' - 'ba65e71c481b94ef0fb6c23c7f21ffa1') + 'ba65e71c481b94ef0fb6c23c7f21ffa1' + '671b87f9670e709e54a19cd292c6330d' + '073846ea43fb4d6130062c1897d92e40' + 'ce867d3331862c2b87d1a37461b42dbe') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" + + # add a missing file in the release tarball + patch -Np1 -i ${srcdir}/git_fixes.diff + cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/ -# libtoolize --force + #libtoolize --force autoreconf --force --install ./configure --prefix=/usr \ --enable-udev \ diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff new file mode 100644 index 000000000..5ebcb606a --- /dev/null +++ b/extra/libdrm/git_fixes.diff @@ -0,0 +1,19 @@ +From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 05 Dec 2011 21:24:48 +0000 +Subject: test/radeon: add missing files for dist + +--- +diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am +index 021ca72..1775669 100644 +--- a/tests/radeon/Makefile.am ++++ b/tests/radeon/Makefile.am +@@ -9,4 +9,6 @@ noinst_PROGRAMS = \ + + radeon_ttm_SOURCES = \ + rbo.c \ ++ rbo.h \ ++ list.h \ + radeon_ttm.c +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libdrm/list.h b/extra/libdrm/list.h new file mode 100644 index 000000000..305c903e1 --- /dev/null +++ b/extra/libdrm/list.h @@ -0,0 +1,137 @@ +/* + * + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA. + * 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, 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 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 + * THE COPYRIGHT HOLDERS, AUTHORS 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. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + */ + +/** + * \file + * List macros heavily inspired by the Linux kernel + * list handling. No list looping yet. + * + * Is not threadsafe, so common operations need to + * be protected using an external mutex. + */ +#ifndef _U_DOUBLE_LIST_H_ +#define _U_DOUBLE_LIST_H_ + +#include <stddef.h> + +struct list_head +{ + struct list_head *prev; + struct list_head *next; +}; + +static void list_inithead(struct list_head *item) +{ + item->prev = item; + item->next = item; +} + +static void list_add(struct list_head *item, struct list_head *list) +{ + item->prev = list; + item->next = list->next; + list->next->prev = item; + list->next = item; +} + +static void list_addtail(struct list_head *item, struct list_head *list) +{ + item->next = list; + item->prev = list->prev; + list->prev->next = item; + list->prev = item; +} + +static void list_replace(struct list_head *from, struct list_head *to) +{ + to->prev = from->prev; + to->next = from->next; + from->next->prev = to; + from->prev->next = to; +} + +static void list_del(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; +} + +static void list_delinit(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; + item->next = item; + item->prev = item; +} + +#define LIST_INITHEAD(__item) list_inithead(__item) +#define LIST_ADD(__item, __list) list_add(__item, __list) +#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list) +#define LIST_REPLACE(__from, __to) list_replace(__from, __to) +#define LIST_DEL(__item) list_del(__item) +#define LIST_DELINIT(__item) list_delinit(__item) + +#define LIST_ENTRY(__type, __item, __field) \ + ((__type *)(((char *)(__item)) - offsetof(__type, __field))) + +#define LIST_IS_EMPTY(__list) \ + ((__list)->next == (__list)) + +#ifndef container_of +#define container_of(ptr, sample, member) \ + (void *)((char *)(ptr) \ + - ((char *)&(sample)->member - (char *)(sample))) +#endif + +#define LIST_FOR_EACH_ENTRY(pos, head, member) \ + for (pos = container_of((head)->next, pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member) \ + for (pos = container_of((head)->next, pos, member), \ + storage = container_of(pos->member.next, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.next, storage, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member) \ + for (pos = container_of((head)->prev, pos, member), \ + storage = container_of(pos->member.prev, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.prev, storage, member)) + +#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.prev, pos, member)) + +#endif /*_U_DOUBLE_LIST_H_*/ diff --git a/extra/libdrm/rbo.h b/extra/libdrm/rbo.h new file mode 100644 index 000000000..c25c73a4c --- /dev/null +++ b/extra/libdrm/rbo.h @@ -0,0 +1,50 @@ +/* + * Copyright © 2011 Red Hat + * + * 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 + * THE AUTHORS OR COPYRIGHT HOLDERS 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. + * + * Authors: + * Jerome Glisse <j.glisse@gmail.com> + */ +#ifndef RBO_H +#define RBO_H + +#include "list.h" + +struct rbo { + struct list_head list; + int fd; + unsigned refcount; + unsigned mapcount; + unsigned handle; + unsigned size; + unsigned alignment; + void *data; +}; + +struct rbo *rbo(int fd, unsigned handle, unsigned size, + unsigned alignment, void *ptr); +int rbo_map(struct rbo *bo); +void rbo_unmap(struct rbo *bo); +struct rbo *rbo_incref(struct rbo *bo); +struct rbo *rbo_decref(struct rbo *bo); +int rbo_wait(struct rbo *bo); + +#endif diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index e3d6354c0..3305f740f 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141779 2011-11-02 18:12:56Z andrea $ +# $Id: PKGBUILD 144643 2011-12-08 09:18:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('084f6aff760957d2005dd571dad178ca685abb68') +sha1sums=('f97516a2da26da3c15075a007bec7c8f9860379b') build() { cd "${srcdir}" diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 95b05321a..e2cfe2cfc 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141775 2011-11-02 18:12:50Z andrea $ +# $Id: PKGBUILD 144639 2011-12-08 09:18:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d2a1e88c6135fa23cea7670dfbb7c8634dc9c870') +sha1sums=('2f508c6efa9ef9561d25578000c7d5bb5ed1c5ee') build() { cd "${srcdir}" diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index 6e8787d8d..b85c2918f 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141781 2011-11-02 18:12:59Z andrea $ +# $Id: PKGBUILD 144645 2011-12-08 09:19:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('daaf507f75855660ae9f1af00158c2746c574902') +sha1sums=('19031140c87d9d7003fef564b6927c6f69d7e3d3') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 1ccf20cea..40cf07e56 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141783 2011-11-02 18:13:03Z andrea $ +# $Id: PKGBUILD 144647 2011-12-08 09:19:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('9c6d4406a1292cfe81fa27508ffe4d96633417bf') +sha1sums=('3225ac0c55f5e4fef71a8baee8d3c49efff6adbf') build() { cd "${srcdir}" diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 09bef8527..98d783a80 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141785 2011-11-02 18:13:06Z andrea $ +# $Id: PKGBUILD 144649 2011-12-08 09:19:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.7.3 +pkgver=4.7.4 pkgrel=1 pkgdesc="An image scanning library" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d1efdd1f5f7f99ba173ddcc88b2ddee343ecf96b') +sha1sums=('3c7a8d5b7fd80175684a0373fae26197e8158565') build() { cd "${srcdir}" diff --git a/extra/libmythes/PKGBUILD b/extra/libmythes/PKGBUILD index b64e27dd8..8a86b2f38 100644 --- a/extra/libmythes/PKGBUILD +++ b/extra/libmythes/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 104337 2011-01-01 13:29:40Z andyrtr $ +# $Id: PKGBUILD 144883 2011-12-08 21:25:55Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libmythes pkgver=1.2.1 -pkgrel=1 +pkgrel=2 +epoch=1 pkgdesc="a simple thesaurus" arch=('i686' 'x86_64' 'mips64el') url="http://hunspell.sourceforge.net/ " diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD index 54953a283..372d98220 100644 --- a/extra/libxslt/PKGBUILD +++ b/extra/libxslt/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libxslt pkgver=1.1.26 -pkgrel=2 +pkgrel=2.1 pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64' 'mips64el') url="http://xmlsoft.org/XSLT/" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 707b85d1e..8b5dbf8b6 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143899 2011-11-30 19:57:03Z giovanni $ +# $Id: PKGBUILD 144603 2011-12-07 21:23:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 90356df24..2c2310b2d 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141372 2011-10-30 06:47:25Z allan $ +# $Id: PKGBUILD 144867 2011-12-08 20:35:39Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -10,39 +10,34 @@ # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=2.9 -_gcc_ver=4.6.2 -pkgrel=7 +pkgver=3.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") -source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz - http://llvm.org/releases/$pkgver/clang-$pkgver.tgz - ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz +makedepends=('libffi' 'python2' 'ocaml') +source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tar.gz + http://llvm.org/releases/$pkgver/clang-$pkgver.tar.gz clang-plugin-loader-registry.patch cindexer-clang-path.patch - clang-toolchains-gcc-versions.patch clang-pure64.patch enable-lto.patch - bug-9869-operator-h-c++0x.patch) -sha256sums=('661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779' - '70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df' - '12cf0bfb128cd8bd2a308c3c03cf0e607aa47bd87d9a58b422b96bd387e476c1' + fix-gold-lto-linking.patch) +sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477' + 'b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d' 'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c' '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92' - '7c05788c02697f0cd05f7c74fe65b460530c0748851313eb950c5d4d17a8115a' - '5bba4964d0d832c9e97308beb45244ff6ed4e16ed3f9f771babe571f1b82fa33' - '1a308679edf3078b8f0c33c94d4e6d0c0db6d3baad91babce08bf5370aa052ef' - '1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7') + '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524' + 'cf8922a932e1859f3783bef2af8ac1e90ce96f8eec79928392327b71b3d7cb89' + '24d275cdf170f53844bc7174b065fb51b6ddbb9642ced34702cde1f0f74d9192') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver.src" # At the present, clang must reside inside the LLVM source code tree to build # See http://llvm.org/bugs/show_bug.cgi?id=4840 rm -rf tools/clang - cp -r "$srcdir/clang-$pkgver" tools/clang + cp -r "$srcdir/clang-$pkgver.src" tools/clang # Fix symbolic links from OCaml bindings to LLVM libraries sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml @@ -63,11 +58,8 @@ build() { # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" - # Add GCC 4.6.1 to GccVersions (FS#23631) - patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" - if [[ $CARCH == x86_64 ]]; then - # Adjust lib paths + # Adjust linker path patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" fi @@ -75,9 +67,8 @@ build() { # Use gold instead of default linker, and always use the plugin patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" - # Fix upstream bug #9869: - # Operator.h incompatibility with GCC 4.6 in C++0x mode - patch -Np2 -i "$srcdir/bug-9869-operator-h-c++0x.patch" + # Fix libLTO.so location in gold plugin + patch -Np1 -i "$srcdir/fix-gold-lto-linking.patch" # Apply strip option to configure _optimized_switch="enable" @@ -86,20 +77,8 @@ build() { # Include location of libffi headers in CPPFLAGS export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - # TODO: Uncomment when clang works with GCC 4.6+ - #_cxx_headers="/usr/include/c++/$_gcc_ver" - #if [[ ! -d $_cxx_headers ]]; then - # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" - # return 1 - #fi - _cxx_headers="/usr/include/c++/clang-$pkgver" - - _32bit_headers="" - if [[ $CARCH == x86_64 ]]; then - # Important for multilib - _32bit_headers="32" - fi - + # Force the use of GCC instead of clang + CC=gcc CXX=g++ \ ./configure \ --prefix=/usr \ --libdir=/usr/lib/llvm \ @@ -111,9 +90,6 @@ build() { --disable-debug-runtime \ --disable-assertions \ --with-binutils-include=/usr/include \ - --with-cxx-include-root=$_cxx_headers \ - --with-cxx-include-arch=$CHOST \ - --with-cxx-include-32bit-dir=$_32bit_headers \ --$_optimized_switch-optimized make REQUIRES_RTTI=1 @@ -123,11 +99,13 @@ package_llvm() { pkgdesc="Low Level Virtual Machine" depends=('perl' 'libffi') - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver.src" # We move the clang directory out of the tree so it won't get installed and # then we bring it back in for the clang package mv tools/clang "$srcdir" + # Copy missing file into the expected location + cp bindings/ocaml/llvm/META.llvm bindings/ocaml/llvm/Release/ # -j1 is due to race conditions during the installation of the OCaml bindings make -j1 DESTDIR="$pkgdir" install mv "$srcdir/clang" tools @@ -148,9 +126,6 @@ package_llvm() { # Get rid of example Hello transformation rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* - # Symlink the gold plugin where clang expects it - ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so" - # Add ld.so.conf.d entry install -d "$pkgdir/etc/ld.so.conf.d" echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" @@ -162,7 +137,7 @@ package_llvm-ocaml() { pkgdesc="OCaml bindings for LLVM" depends=("llvm=$pkgver-$pkgrel" 'ocaml') - cd "$srcdir/llvm-$pkgver" + cd "$srcdir/llvm-$pkgver.src" install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" @@ -177,15 +152,13 @@ package_llvm-ocaml() { package_clang() { pkgdesc="C language family frontend for LLVM" url="http://clang.llvm.org/" - # It looks like clang still needs GCC to assemble and link object files - # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html - depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver") + depends=("llvm=$pkgver-$pkgrel" 'gcc') # Fix installation path for clang docs sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ - "$srcdir/llvm-$pkgver/Makefile.config" + "$srcdir/llvm-$pkgver.src/Makefile.config" - cd "$srcdir/llvm-$pkgver/tools/clang" + cd "$srcdir/llvm-$pkgver.src/tools/clang" make DESTDIR="$pkgdir" install # Fix permissions of static libs @@ -193,12 +166,7 @@ package_clang() { # Revert the path change in case we want to do a repackage later sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ - "$srcdir/llvm-$pkgver/Makefile.config" - - # Install old libstdc++ headers. Contains combined headers from - # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64 - install -d "$pkgdir/usr/include/c++" - cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver" + "$srcdir/llvm-$pkgver.src/Makefile.config" install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" } @@ -208,7 +176,7 @@ package_clang-analyzer() { url="http://clang-analyzer.llvm.org/" depends=("clang=$pkgver-$pkgrel" 'python2') - cd "$srcdir/llvm-$pkgver/tools/clang" + cd "$srcdir/llvm-$pkgver.src/tools/clang" install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} for _tool in scan-{build,view}; do diff --git a/extra/llvm/clang-pure64.patch b/extra/llvm/clang-pure64.patch index da6178519..9bbbfaa8b 100644 --- a/extra/llvm/clang-pure64.patch +++ b/extra/llvm/clang-pure64.patch @@ -3,36 +3,11 @@ Index: lib/Driver/Tools.cpp --- lib/Driver/Tools.cpp (revision 123373) +++ lib/Driver/Tools.cpp (working copy) @@ -3306,7 +3306,7 @@ - else if (ToolChain.getArch() == llvm::Triple::arm) - CmdArgs.push_back("/lib/ld-linux.so.3"); + else if (ToolChain.getArch() == llvm::Triple::ppc64) + CmdArgs.push_back("/lib64/ld64.so.1"); else - CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); + CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); } CmdArgs.push_back("-o"); -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1317,18 +1317,10 @@ - if (Arch == llvm::Triple::x86) - Suffix64 = "/64"; - -- std::string Lib32 = "lib"; -- -- bool Exists; -- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists) -- Lib32 = "lib32"; -- -+ std::string Lib32 = "lib32"; - std::string Lib64 = "lib"; -- bool Symlink; -- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists && -- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink)) -- Lib64 = "lib64"; - -+ bool Exists; - std::string GccTriple = ""; - if (Arch == llvm::Triple::arm) { - if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) && diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch index 40d93104a..3c8691b17 100644 --- a/extra/llvm/enable-lto.patch +++ b/extra/llvm/enable-lto.patch @@ -2,17 +2,12 @@ Index: lib/Driver/ToolChains.cpp =================================================================== --- lib/Driver/ToolChains.cpp (revision 123373) +++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,11 +1398,11 @@ - Lib = Lib64; - } +@@ -1398,7 +1398,7 @@ + PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + + GCCInstallation.getTriple() + "/bin").str()); -- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); -+ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold"); - if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) - Linker = LinkerPath.str(); - else -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld.gold"); LinuxDistro Distro = DetectLinuxDistro(Arch); @@ -27,7 +22,8 @@ Index: lib/Driver/Tools.cpp - if (Args.hasArg(options::OPT_use_gold_plugin)) { + // if (Args.hasArg(options::OPT_use_gold_plugin)) { CmdArgs.push_back("-plugin"); - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; +- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; ++ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; CmdArgs.push_back(Args.MakeArgString(Plugin)); - } + // } diff --git a/extra/llvm/fix-gold-lto-linking.patch b/extra/llvm/fix-gold-lto-linking.patch new file mode 100644 index 000000000..84d166471 --- /dev/null +++ b/extra/llvm/fix-gold-lto-linking.patch @@ -0,0 +1,11 @@ +diff -upr llvm-3.0.src.orig/tools/gold/Makefile llvm-3.0.src/tools/gold/Makefile +--- llvm-3.0.src.orig/tools/gold/Makefile 2011-05-31 23:00:45.000000000 +0300 ++++ llvm-3.0.src/tools/gold/Makefile 2011-12-04 22:06:59.000000000 +0200 +@@ -26,6 +26,6 @@ LINK_COMPONENTS := support + # Because off_t is used in the public API, the largefile parts are required for + # ABI compatibility. + CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +-CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) ++CXXFLAGS+=-L $(SharedLibDir) -lLTO + + include $(LEVEL)/Makefile.common diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index e0ce6b0e1..8d63f8280 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143491 2011-11-24 21:29:37Z juergen $ +# $Id: PKGBUILD 144879 2011-12-08 21:06:55Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.25.1 -pkgrel=2 +pkgrel=3 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.0.53' 'texinfo' 'sh') + depends=('sbcl=1.0.54' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index fc31188ae..6b4b6f09f 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=2.8.2 +pkgver=2.8.4.2 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64' 'mips64el') url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=2.8.2' 'gdb') +depends=('monodevelop>=2.8.4.2' 'gdb') makedepends=('mono') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('0c1661c05d8a3fbe56cf1122d9730b26') +md5sums=('4c081b6d85ffe36389a3b06da37dcbe4') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" @@ -20,6 +20,10 @@ build() { ./configure --prefix=/usr make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 7de84d024..a00ba49aa 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=2.8.2 +pkgver=2.8.4.2 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.1 options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('4a445e251d5e8a12a8aa4ae22f3a6841') +md5sums=('276fb75e2ffa4cf41fd609caa74dc276') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD index 52a4e8806..5eeb3031d 100644 --- a/extra/most/PKGBUILD +++ b/extra/most/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 125648 2011-05-27 17:52:54Z stephane $ -# Maintainer: juergen <juergen@archlinux.org> +# $Id: PKGBUILD 144477 2011-12-06 14:33:19Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=most pkgver=5.0.0a -pkgrel=3 +pkgrel=4 pkgdesc="A terminal pager similar to 'more' and 'less'" arch=('i686' 'x86_64' 'mips64el') depends=('slang') license=('GPL') -url="ftp://space.mit.edu/pub/davis/most/" -source=(ftp://space.mit.edu/pub/davis/${pkgname}/${pkgname}-${pkgver}.tar.gz most-debian.patch) +url="http://www.jedsoft.org/most/index.html" +source=(ftp://space.mit.edu/pub/davis/${pkgname}/${pkgname}-${pkgver}.tar.gz + most-debian.patch + most-leak-fd.patch) sha1sums=('99eedb7169754b9a47c7755ac48949d76531e3b2' - '937796040c69bae3bf735fa3cd734775c582e7d0') - + '937796040c69bae3bf735fa3cd734775c582e7d0' + 'c5713e1278febdd0ed434e6e3044feb220b5d525') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i ../most-debian.patch + patch -Np1 -i ../most-leak-fd.patch ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/extra/most/most-leak-fd.patch b/extra/most/most-leak-fd.patch new file mode 100644 index 000000000..c8cd2af09 --- /dev/null +++ b/extra/most/most-leak-fd.patch @@ -0,0 +1,14 @@ +--- most-5.0.0a.orig/src/most.c 2007-06-03 00:03:59.000000000 -0400 ++++ most-5.0.0a/src/most.c 2010-12-31 04:42:08.000000000 -0500 +@@ -321,9 +321,11 @@ + { + fprintf (stderr, "fwrite returned %d, errno = %d\n", + m, errno); ++ (void) fclose (fp); + exit (1); + } + } ++ (void) fclose (fp); + } + + void most_initialize_most (void) diff --git a/extra/mpd/ChangeLog b/extra/mpd/ChangeLog index 40ba5e4e7..b22d95f8d 100644 --- a/extra/mpd/ChangeLog +++ b/extra/mpd/ChangeLog @@ -1,3 +1,6 @@ +2011-12-05 Angel Velasquez <angvp@archlinux.org> + * Version bump to 0.16.6 + 2011-09-03 Angel Velasquez <angvp@archlinux.org> * Version bump to 0.16.4 * Removed the patch mpd-0.16.3_ffmpeg_sigsegv.patch since is included upstream diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 4578958de..afe78dfe7 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 142638 2011-11-12 17:15:35Z ibiru $ +# $Id: PKGBUILD 144459 2011-12-06 06:52:26Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.16.5 -pkgrel=2 +pkgver=0.16.6 +pkgrel=1 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -19,7 +19,7 @@ install=${pkgname}.install changelog=ChangeLog source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2" 'mpd') -md5sums=('f7564cff12035f6a1112cce770655df7' +md5sums=('5489dd327fba12c67f01558d2cfa6d57' 'e5669c2bff4031928531e52475addeb1') build() { diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 4be16689a..5caa18d63 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143260 2011-11-24 07:38:10Z andrea $ +# $Id: PKGBUILD 144910 2011-12-09 17:20:57Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.18 +pkgver=5.5.19 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,7 +15,7 @@ options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('38b65815249f3bcacf3b0ee85171c486' +md5sums=('a78cf450974e9202bd43674860349b5a' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') diff --git a/extra/nicotine/PKGBUILD b/extra/nicotine/PKGBUILD index 2c6f54a83..96cf743d5 100644 --- a/extra/nicotine/PKGBUILD +++ b/extra/nicotine/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 108389 2011-01-30 22:14:15Z angvp $ +# $Id: PKGBUILD 144457 2011-12-06 06:35:08Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Andrew Wright <andreww@photism.org> pkgname=nicotine pkgver=1.2.16 -pkgrel=2 +pkgrel=3 pkgdesc="Soulseek music-sharing client, written in python" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('pygtk>=2.14.1' 'mutagen' 'python-geoip>=1.2.4') +depends=('pygtk>=2.14.1' 'mutagen') conflicts=(nicotine-plus) replaces=(nicotine-plus) url="http://sourceforge.net/projects/nicotine-plus/" @@ -18,6 +18,9 @@ optdepends=('python-sexy: To enable spell checking' 'python-geoip: to enable Geographical blocker') md5sums=('ac7433c21ef619a37e079a7ae68da94a') + + + build() { cd ${srcdir}/${pkgname}+-${pkgver} sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476 @@ -25,6 +28,10 @@ build() { cd trayicon python2 autogen.py make +} + +package() { + cd ${srcdir}/${pkgname}+-${pkgver}/trayicon make DESTDIR=${pkgdir} install ln -s nicotine.py ${pkgdir}/usr/bin/nicotine } diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index b710e7d66..9464444f6 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ntp pkgver=4.2.6.p4 _realver=4.2.6p4 -pkgrel=2 +pkgrel=2.1 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') diff --git a/extra/orbit2/PKGBUILD b/extra/orbit2/PKGBUILD index 5159c7d32..08e9ce2db 100644 --- a/extra/orbit2/PKGBUILD +++ b/extra/orbit2/PKGBUILD @@ -3,7 +3,7 @@ pkgname=orbit2 pkgver=2.14.19 -pkgrel=1 +pkgrel=1.1 pkgdesc="Thin/fast CORBA ORB" arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 41eef8858..47f3f81a7 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141476 2011-10-30 16:50:53Z foutrelis $ +# $Id: PKGBUILD 144934 2011-12-10 23:19:27Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.0 -pkgrel=3 +pkgver=2.10.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') @@ -18,7 +18,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 nm09-more.patch) -sha256sums=('f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd' +sha256sums=('2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8' '7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e') build() { @@ -32,6 +32,9 @@ build() { sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} + # Pidgin doesn't explicitly link to libm + LDFLAGS+=' -Wl,--copy-dt-needed-entries' + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/pm-utils/PKGBUILD b/extra/pm-utils/PKGBUILD index 82b7e2b79..2ef5e2208 100644 --- a/extra/pm-utils/PKGBUILD +++ b/extra/pm-utils/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pm-utils pkgver=1.4.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="Utilities and scripts for suspend and hibernate power management" arch=('i686' 'x86_64' 'mips64el') url="http://pm-utils.freedesktop.org" diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD index 0fe7ea09b..60db8e35f 100644 --- a/extra/polkit/PKGBUILD +++ b/extra/polkit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136695 2011-08-31 14:31:56Z jgc $ +# $Id: PKGBUILD 144479 2011-12-06 17:28:58Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=polkit -pkgver=0.102 +pkgver=0.103 pkgrel=1 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ replaces=('policykit') options=('!libtool') source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz polkit.pam) -md5sums=('a3726bdb9728c103e58f62131e26693a' +md5sums=('aaacf2ef18774ea8a825a426a7cfe763' '6564f95878297b954f0572bc1610dd15') build() { diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 0f60dacfb..98a4e1def 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -5,7 +5,7 @@ pkgname=postfix pkgver=2.8.7 -pkgrel=1 +pkgrel=1.1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD index 7a46571da..4eeff18a7 100644 --- a/extra/purple-plugin-pack/PKGBUILD +++ b/extra/purple-plugin-pack/PKGBUILD @@ -1,25 +1,34 @@ -# $Id: PKGBUILD 77562 2010-04-15 22:34:21Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> +# $Id: PKGBUILD 144607 2011-12-08 01:03:26Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Dale Blount <dale@archlinux.org> pkgname=purple-plugin-pack -pkgver=2.6.3 +pkgver=2.7.0 pkgrel=1 -pkgdesc="Plugin pack for Pidgin" +pkgdesc="Compilation of plugins for the libpurple family of IM clients" arch=('i686' 'x86_64' 'mips64el') -url="http://plugins.guifications.org/trac/wiki/PluginPack" +url="https://www.guifications.org/projects/purple-plugin-pack" license=('GPL') -depends=('pidgin') -makedepends=('intltool' 'python') +depends=('libpurple') +makedepends=('intltool' 'gettext' 'python2' 'pidgin') options=('!libtool') -source=(http://plugins.guifications.org/trac/downloads/48) -md5sums=('2dccee28f087c7e81cef07ee845399bb') +source=(https://www.guifications.org/attachments/download/201/purple-plugin-pack-2.7.0.tar.bz2) +sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c') build() { - cd "$srcdir/purple-plugin_pack-$pkgver" + cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr } + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/putty/PKGBUILD b/extra/putty/PKGBUILD index addb040dc..c8fe95255 100644 --- a/extra/putty/PKGBUILD +++ b/extra/putty/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 131725 2011-07-14 01:51:53Z eric $ +# $Id: PKGBUILD 144938 2011-12-11 04:46:16Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=putty -pkgver=0.61 +pkgver=0.62 pkgrel=1 pkgdesc="A terminal integrated SSH/Telnet client" arch=('i686' 'x86_64' 'mips64el') url="http://www.chiark.greenend.org.uk/~sgtatham/putty/" license=('MIT') depends=('gtk2') -source=(http://the.earth.li/~sgtatham/putty/${pkgver}/${pkgname}-${pkgver}.tar.gz) -md5sums=('db0e37f6b82ea62f0ace87927d29b2a4') -sha1sums=('cbb82fd392142e3455e859ca8bc7b1e61b246204') +source=(http://the.earth.li/~sgtatham/putty/${pkgver}/${pkgname}-${pkgver}.tar.gz + putty-${pkgver}.tar.gz.sig::http://the.earth.li/~sgtatham/putty/latest/putty-${pkgver}.tar.gz.DSA) +sha1sums=('5898438614117ee7e3704fc3f30a3c4bf2041380' + '128cded001647e3b47494dbfb1eeb70cbed49a7c') build() { cd "${srcdir}/${pkgname}-${pkgver}/unix" diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD index 806c926ad..06e1abf86 100644 --- a/extra/qhull/PKGBUILD +++ b/extra/qhull/PKGBUILD @@ -6,7 +6,7 @@ pkgname=qhull pkgver=2010.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="A general dimension code for computing convex hulls and related structures" arch=('i686' 'x86_64' 'mips64el') url="http://www.qhull.org/" diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index ef51d1d45..29b5fc0a8 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143489 2011-11-24 20:44:47Z juergen $ +# $Id: PKGBUILD 144860 2011-12-08 19:58:02Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.0.53 +pkgver=1.0.54 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -18,11 +18,9 @@ makedepends=('sbcl' 'texinfo') makedepends=('clisp' 'texinfo') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" - "arch-fixes.lisp" - "mips-arch.h.diff") -md5sums=('28bdb8d65b240bcc45370f19b781f9b8' - '7ac0c1936547f4278198b8bf7725204d' - 'a456535d65d6c5b85b1b646f11455fce') + "arch-fixes.lisp") +md5sums=('b7e956a71d603bb714f71c2f7ef350f6' + '7ac0c1936547f4278198b8bf7725204d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index d5df7b1c8..1b06de270 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142894 2011-11-17 18:35:07Z ibiru $ +# $Id: PKGBUILD 144929 2011-12-10 21:36:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') license=('GPL') @@ -19,7 +19,7 @@ install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) sha256sums=('25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9' - '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') + '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/seahorse/seahorse-ssh-askpass.sh b/extra/seahorse/seahorse-ssh-askpass.sh index 44281ac2b..04f79d8f2 100644 --- a/extra/seahorse/seahorse-ssh-askpass.sh +++ b/extra/seahorse/seahorse-ssh-askpass.sh @@ -1,3 +1,3 @@ -if [ -z "$SSH_ASKPASS" ]; then +if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass fi diff --git a/extra/unixodbc/PKGBUILD b/extra/unixodbc/PKGBUILD index b98f97abd..364881d66 100644 --- a/extra/unixodbc/PKGBUILD +++ b/extra/unixodbc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=unixodbc pkgver=2.3.0 -pkgrel=2 +pkgrel=2.1 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index b2e124f72..e4134fdeb 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138500 2011-09-25 14:55:34Z andyrtr $ +# $Id: PKGBUILD 144876 2011-12-08 20:54:22Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.8.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') @@ -25,6 +25,7 @@ build() { cd "${srcdir}"/${pkgbase}-${pkgver} patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DWITH_VIGRANUMPY=1 \ -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \ -DDOCINSTALL=share/doc @@ -49,6 +50,9 @@ package_vigra() { # remove doc rm -rf "${pkgdir}"/usr/share/doc + + #fix shebang for python2 + sed -i 's|python$|python2|' "$pkgdir"/usr/bin/vigra-config } package_vigra-doc() { diff --git a/extra/xalan-java/PKGBUILD b/extra/xalan-java/PKGBUILD new file mode 100644 index 000000000..f7fa0ad7c --- /dev/null +++ b/extra/xalan-java/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Hussam Al-Tayeb <ht990332@gmail.com> + +pkgname=xalan-java +pkgver=2.7.1 +pkgrel=3 +pkgdesc="XSLT processor for transforming XML documents into HTML, text, or other XML document types" +arch=('any') +license=('APACHE') +url="http://xml.apache.org/xalan-j" +depends=('xerces2-java') +source=(http://mirror.softaculous.com/apache//xml/xalan-j/xalan-j_${pkgver//./_}-bin-2jars.tar.gz) +md5sums=('3ccda39bcd08b780436dfd2f22fb23d5') + +build() { + /bin/true +} + +package() { + cd ${srcdir}/xalan-j_${pkgver//./_} + install -m755 -d ${pkgdir}/usr/share/java + install -m644 xalan.jar ${pkgdir}/usr/share/java/ || return 1 + install -m644 xsltc.jar ${pkgdir}/usr/share/java/ || return 1 +} diff --git a/extra/xerces2-java/PKGBUILD b/extra/xerces2-java/PKGBUILD new file mode 100644 index 000000000..cccb28bed --- /dev/null +++ b/extra/xerces2-java/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 144863 2011-12-08 20:32:13Z andyrtr $ + +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xerces2-java +pkgver=2.11.0 +pkgrel=1 +pkgdesc="High performance fully compliant Java XML parser" +arch=('any') +url="http://xml.apache.org/xerces2-j" +license=('APACHE') +provides=("java-xerces2=${pkgver}") +conflicts=('java-xerces2') +replaces=('java-xerces2') +source=(http://mirror.checkdomain.de/apache//xerces/j/Xerces-J-bin.${pkgver}.tar.gz) +md5sums=('29d731e0ae57eb3f2e09af6594bc2515') + +build() { + /bin/true +} + +package() { + cd ${srcdir}/xerces-${pkgver//./_} + install -m755 -d ${pkgdir}/usr/share/java + rm -f xercesSamples.jar + install -m644 *.jar ${pkgdir}/usr/share/java/ +} diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 5be04a4a5..c2c9c34a2 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') pkgver=1.11.2 -pkgrel=2 +pkgrel=2.1 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -20,7 +20,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch xvfb-run xvfb-run.1 - 10-quirks.conf) + 10-quirks.conf + loongson.patch) md5sums=('8796fff441e5435ee36a72579008af24' '6c7e87d63ac4b535e19a80c89d0cf091' 'f8194638ca4872c2b0a67862a70bcebf' @@ -30,7 +31,8 @@ md5sums=('8796fff441e5435ee36a72579008af24' '47f9b979fe38043b42ff86eeee6fd0d0' '52fd3effd80d7bc6c1660d4ecf23d31c' '376c70308715cd2643f7bff936d9934b' - 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') + 'd4f7dfc6be4ef4e2c6dd7632a9d88abe' + 'd39c2e1a70bb4e400bb688cc74cd15f8') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -55,6 +57,9 @@ build() { # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298 patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch" + # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html + patch -Np1 -i "${srcdir}/loongson.patch" + autoreconf -fi if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ diff --git a/extra/xorg-server/loongson.patch b/extra/xorg-server/loongson.patch new file mode 100644 index 000000000..b6c9692fc --- /dev/null +++ b/extra/xorg-server/loongson.patch @@ -0,0 +1,49 @@ +diff -ru xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h xorg-server-1.11.2/hw/xfree86/dri/sarea.h +--- xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h 2011-12-07 16:47:06.971237310 +0100 ++++ xorg-server-1.11.2/hw/xfree86/dri/sarea.h 2011-12-07 16:48:40.132392770 +0100 +@@ -42,6 +42,8 @@ + /* SAREA area needs to be at least a page */ + #if defined(__alpha__) + #define SAREA_MAX 0x2000 ++#elif defined(__mips__) ++#define SAREA_MAX 0x4000 + #elif defined(__ia64__) + #define SAREA_MAX 0x10000 /* 64kB */ + #else +diff -ru xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c +--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2011-12-07 16:47:06.967237429 +0100 ++++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2011-12-07 16:52:33.200881187 +0100 +@@ -493,9 +493,10 @@ + Bool + xf86EnableIO(void) + { +-#if defined(__powerpc__) ++#if defined(__powerpc__) || defined(__mips__) + int fd; + unsigned int ioBase_phys; ++ extern unsigned int IOPortBase; + #endif + + if (ExtendedEnabled) +@@ -520,6 +521,21 @@ + #endif + } + close(fd); ++#elif defined(__mips__) ++ fd = open("/dev/mem", O_RDWR); ++ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000, ++ PROT_READ | PROT_WRITE, MAP_SHARED, fd, ++ 0x1fd00000); ++ if (IOPortBase == MAP_FAILED) { ++ xf86Msg(X_WARNING, ++ "xf86EnableIOPorts: Failed to map iobase (%s)\n", ++ strerror(errno)); ++ return FALSE; ++ } ++ close(fd); ++ xf86Msg(X_WARNING, ++ "xf86EnableIOPorts: map iobase (%x)\n", ++ IOPortBase); + #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__) + if (ioperm(0, 1024, 1) || iopl(3)) { + if (errno == ENODEV) diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 95eed637b..d11a75e9f 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 143828 2011-11-29 13:33:59Z stephane $ +# $Id: PKGBUILD 144599 2011-12-07 15:40:43Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh -pkgver=4.3.12 -pkgrel=3 +pkgver=4.3.14 +pkgrel=2 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64' 'mips64el') url='http://www.zsh.org/' license=('custom') depends=('pcre' 'libcap' 'gdbm') install=zsh.install -source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'modules.patch') -md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811' - 'b367c1398b60242f7044a93a837227f9') +source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" + 'zprofile') +backup=('etc/zsh/zprofile') +md5sums=('1c819a3ff7302b42eba988e333e76109' + '24a9335edf77252a7b5f52e079f7aef7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # upstream patch to fix handling of compressed kernel modules - patch -p1 -i ${srcdir}/modules.patch # FS#16360 sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ Doc/zsh.texi \ @@ -29,7 +29,7 @@ build() { --enable-zshenv=/etc/zsh/zshenv \ --enable-zlogin=/etc/zsh/zlogin \ --enable-zlogout=/etc/zsh/zlogout \ - --enable-zprofile=/etc/profile \ + --enable-zprofile=/etc/zsh/zprofile \ --enable-zshrc=/etc/zsh/zshrc \ --enable-maildir-support \ --with-term-lib='ncursesw' \ @@ -54,5 +54,6 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install + install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/zsh/zprofile b/extra/zsh/zprofile new file mode 100644 index 000000000..6bfcdf7cb --- /dev/null +++ b/extra/zsh/zprofile @@ -0,0 +1 @@ +emulate sh -c 'source /etc/profile' diff --git a/kde-unstable/kactivities/PKGBUILD b/kde-unstable/kactivities/PKGBUILD index e60a143e9..cbb4efee4 100644 --- a/kde-unstable/kactivities/PKGBUILD +++ b/kde-unstable/kactivities/PKGBUILD @@ -1,24 +1,19 @@ -# $Id: PKGBUILD 143306 2011-11-24 16:13:52Z andrea $ +# $Id: PKGBUILD 144769 2011-12-08 10:29:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.7.80 -pkgrel=2 +pkgver=4.7.90 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc='API for using and interacting with Activities' url='http://kde.org/' license=('GPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'fix-activities.patch') -sha1sums=('c619c5d6e3e2ef79d0cebf52bf18d1b467dc24f9' - '6eb890958726856cf4ddb172acd46ba08f7a5088') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('23ae79b85dd8c754950fcbabbd4cae5c9f139e74') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/fix-activities.patch - cd "${srcdir}" mkdir build cd build diff --git a/kde-unstable/kdeaccessibility-jovie/PKGBUILD b/kde-unstable/kdeaccessibility-jovie/PKGBUILD index c57d0deef..7e3f1b849 100644 --- a/kde-unstable/kdeaccessibility-jovie/PKGBUILD +++ b/kde-unstable/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143326 2011-11-24 16:14:16Z andrea $ +# $Id: PKGBUILD 144780 2011-12-08 10:36:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/jovie-${pkgver}.tar.bz2") -sha1sums=('d5ae86d01279fdf7b8102f9d516749b0ddfb531b') +sha1sums=('7c4ce5adcf6c7762c22706c99d467775254aeaa8') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD b/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD index 0e90b4e79..6d5157bd4 100644 --- a/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD +++ b/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143328 2011-11-24 16:14:18Z andrea $ +# $Id: PKGBUILD 144781 2011-12-08 10:36:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/kaccessible-${pkgver}.tar.bz2") -sha1sums=('6d3235dde870414af9548c6fe1b1d25dd101d436') +sha1sums=('320c7ec5a9cc7d67b768db6efcfff1f18854d045') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeaccessibility-kmag/PKGBUILD b/kde-unstable/kdeaccessibility-kmag/PKGBUILD index 084ce52af..c608359a5 100644 --- a/kde-unstable/kdeaccessibility-kmag/PKGBUILD +++ b/kde-unstable/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143330 2011-11-24 16:14:20Z andrea $ +# $Id: PKGBUILD 144782 2011-12-08 10:37:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kmag-${pkgver}.tar.bz2") -sha1sums=('549bd0c71e95f7526bb6766ba4d262ac372b6e1c') +sha1sums=('e0e1f5f7307576f7ba651f0ab3090b169b330648') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD b/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD index f052a35a8..790170dea 100644 --- a/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD +++ b/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143332 2011-11-24 16:14:23Z andrea $ +# $Id: PKGBUILD 144783 2011-12-08 10:37:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kmousetool-${pkgver}.tar.bz2") -sha1sums=('a5a3190ba645d1930ca561560f2f37f91dc550c9') +sha1sums=('bca35f26870d3922aa0631212780509f925639a3') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeaccessibility-kmouth/PKGBUILD b/kde-unstable/kdeaccessibility-kmouth/PKGBUILD index 72c7247b4..c912eccf6 100644 --- a/kde-unstable/kdeaccessibility-kmouth/PKGBUILD +++ b/kde-unstable/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143334 2011-11-24 16:14:25Z andrea $ +# $Id: PKGBUILD 144784 2011-12-08 10:38:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kmouth-${pkgver}.tar.bz2") -sha1sums=('175b2a58241a42689d73396d02f2836d57978e5e') +sha1sums=('b013e3bbeea1ee0ef14b65301db10371ee42dec5') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeadmin/PKGBUILD b/kde-unstable/kdeadmin/PKGBUILD index da2c8b6de..a46225a0a 100644 --- a/kde-unstable/kdeadmin/PKGBUILD +++ b/kde-unstable/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143336 2011-11-24 16:14:27Z andrea $ +# $Id: PKGBUILD 144785 2011-12-08 10:38:49Z 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.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -16,7 +16,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'syslog-path.patch') -sha1sums=('3e06dff48271e78eec67bcda644476bcf0efa554' +sha1sums=('188265229fcc401706e760db9b5247f66e6f4931' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/kde-unstable/kdeartwork/PKGBUILD b/kde-unstable/kdeartwork/PKGBUILD index 4113014a1..1af1a6205 100644 --- a/kde-unstable/kdeartwork/PKGBUILD +++ b/kde-unstable/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143338 2011-11-24 16:14:29Z andrea $ +# $Id: PKGBUILD 144786 2011-12-08 10:39:26Z 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.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('1b046764a5ca6481d6ce5648b0e180eec7cd08c0') +sha1sums=('fe7fc5262c677a963fb42784b817b3a2c2659271') build() { cd $srcdir diff --git a/kde-unstable/kdebase-konsole/PKGBUILD b/kde-unstable/kdebase-konsole/PKGBUILD index 9b0e14d2b..020e0639a 100644 --- a/kde-unstable/kdebase-konsole/PKGBUILD +++ b/kde-unstable/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143340 2011-11-24 16:14:32Z andrea $ +# $Id: PKGBUILD 144787 2011-12-08 10:42:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/konsole-${pkgver}.tar.bz2") -sha1sums=('47305f7eeabeefd71e518314b04d18b7a9724c39') +sha1sums=('c4e99b07fcca2ddef6e155ca03d26a495a9e362b') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD index d329f4d40..b8c6543b8 100644 --- a/kde-unstable/kdebase-runtime/PKGBUILD +++ b/kde-unstable/kdebase-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143284 2011-11-24 16:13:21Z andrea $ +# $Id: PKGBUILD 144756 2011-12-08 10:22:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('htdig: to build the search index in khelpcenter' 'gdb: drkonq crash handler') install="${pkgname}.install" source=("http://download.kde.org/unstable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2") -sha1sums=('a9c0be087a2cd96d84c1fec1b4f726e9cbcc3327') +sha1sums=('834f3a0c4743e9d537139a856eb066a2c6251c15') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebase/PKGBUILD b/kde-unstable/kdebase/PKGBUILD index 70263f6aa..5007b40a8 100644 --- a/kde-unstable/kdebase/PKGBUILD +++ b/kde-unstable/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143310 2011-11-24 16:13:59Z andrea $ +# $Id: PKGBUILD 144771 2011-12-08 10:31:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/unstable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2") -sha1sums=('51782a7e569479ea0eff5e2ed93bc9813111a4cc') +sha1sums=('4e1bf22e8b42b84ef4c779dcdd736f376a2c459b') build() { cd ${srcdir} diff --git a/kde-unstable/kdebindings-kimono/PKGBUILD b/kde-unstable/kdebindings-kimono/PKGBUILD index e09b59b09..d8ad9eb77 100644 --- a/kde-unstable/kdebindings-kimono/PKGBUILD +++ b/kde-unstable/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143342 2011-11-24 16:14:33Z andrea $ +# $Id: PKGBUILD 144788 2011-12-08 10:42:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/unstable/${pkgver}/src/kimono-${pkgver}.tar.bz2") -sha1sums=('a60e0e77618cc29592537e3c1254f1141cfb1bee') +sha1sums=('db61f32a15e37a84ef44746e3e04b33667df71c9') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebindings-korundum/PKGBUILD b/kde-unstable/kdebindings-korundum/PKGBUILD new file mode 100644 index 000000000..f83c1ef3a --- /dev/null +++ b/kde-unstable/kdebindings-korundum/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 144789 2011-12-08 10:43:26Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kdebindings-korundum +pkgver=4.7.80 +pkgrel=1 +pkgdesc="KDE bindings for ruby" +url="http://kde.org/" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kdebindings') +depends=('kdebindings-qtruby' 'kdebindings-smokekde') +makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' + 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') +conflicts=('kdebindings-ruby') +source=("http://download.kde.org/unstable/${pkgver}/src/korundum-${pkgver}.tar.bz2") +sha1sums=('8336a5504f90111772ff4004eff971e779f92327') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../korundum-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/kdebindings-kross/PKGBUILD b/kde-unstable/kdebindings-kross/PKGBUILD index 3348d88f6..329a3628b 100644 --- a/kde-unstable/kdebindings-kross/PKGBUILD +++ b/kde-unstable/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143344 2011-11-24 16:14:36Z andrea $ +# $Id: PKGBUILD 144790 2011-12-08 10:43:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 url="http://kde.org/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/unstable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2") -sha1sums=('52adafe42de134c6bc53855dbc464df2a1190efd') +sha1sums=('bf52cd779c91b289b59b627db10112e2fa015547') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebindings-perlkde/PKGBUILD b/kde-unstable/kdebindings-perlkde/PKGBUILD index ff15152b2..8833c0573 100644 --- a/kde-unstable/kdebindings-perlkde/PKGBUILD +++ b/kde-unstable/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143346 2011-11-24 16:14:39Z andrea $ +# $Id: PKGBUILD 144791 2011-12-08 10:44:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/unstable/${pkgver}/src/perlkde-${pkgver}.tar.bz2") -sha1sums=('2e5c317f26ccbc1e251fb53b30eae364a5153543') +sha1sums=('4bb4cb048ec96fb52a9bb49d2a32938a28f37355') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD index bed48ab40..d186f60bd 100644 --- a/kde-unstable/kdebindings-perlqt/PKGBUILD +++ b/kde-unstable/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143298 2011-11-24 16:13:43Z andrea $ +# $Id: PKGBUILD 144764 2011-12-08 10:27:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/unstable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") -sha1sums=('1f147d9554999b539b7c81da0fb4522f05f7c7d4') +sha1sums=('0526a7b5b32934e85ff8432a597e3e88c9362ecc') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD index 021c5ee02..d5d38aebe 100644 --- a/kde-unstable/kdebindings-python/PKGBUILD +++ b/kde-unstable/kdebindings-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143300 2011-11-24 16:13:45Z andrea $ +# $Id: PKGBUILD 144765 2011-12-08 10:27:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="KDE bindings for Python" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") -sha1sums=('b67905a73566ad99b3bf1238b87f333c3ebb1fc5') +sha1sums=('ada3862a46add5f0901d03a84c0c04759a944401') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebindings-qtruby/PKGBUILD b/kde-unstable/kdebindings-qtruby/PKGBUILD index b3976602d..cfa6a28c8 100644 --- a/kde-unstable/kdebindings-qtruby/PKGBUILD +++ b/kde-unstable/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143304 2011-11-24 16:13:50Z andrea $ +# $Id: PKGBUILD 144768 2011-12-08 10:28:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Qt bindings for ruby" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/unstable/${pkgver}/src/qtruby-${pkgver}.tar.bz2") -sha1sums=('ca1e73b375449d36ee52ae3012e70f2fa149f751') +sha1sums=('8679b33dff47a6d73616ef75ab5119452e54c246') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebindings-qyoto/PKGBUILD b/kde-unstable/kdebindings-qyoto/PKGBUILD index cfb9d378d..75ebea31f 100644 --- a/kde-unstable/kdebindings-qyoto/PKGBUILD +++ b/kde-unstable/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143302 2011-11-24 16:13:48Z andrea $ +# $Id: PKGBUILD 144766 2011-12-08 10:28:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/unstable/${pkgver}/src/qyoto-${pkgver}.tar.bz2") -sha1sums=('e1e4ab189e16ad33e3d19a457aee8540437c4af9') +sha1sums=('b81fc239f3465daadbda3fa5da8478fd3f26e740') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD index ac12f5f64..ba2b2146f 100644 --- a/kde-unstable/kdebindings-smokegen/PKGBUILD +++ b/kde-unstable/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143288 2011-11-24 16:13:26Z andrea $ +# $Id: PKGBUILD 144759 2011-12-08 10:24:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="http://kde.org/" @@ -11,10 +11,15 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') -source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.bz2") -sha1sums=('da6dd73b0650c0f6e749435c3ae822c236224b00') +source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.bz2" + 'fix-crash.patch') +sha1sums=('c852cf97a7b2d7516a4995d19ad3be6035aa0c17' + 'b209b2b7017622fea3406c5a9636e2334566af01') build() { + cd "${srcdir}"/smokegen-${pkgver} + patch -p1 -i "${srcdir}"/fix-crash.patch + cd "${srcdir}" mkdir build cd build diff --git a/kde-unstable/kdebindings-smokegen/fix-crash.patch b/kde-unstable/kdebindings-smokegen/fix-crash.patch new file mode 100644 index 000000000..5864da3f3 --- /dev/null +++ b/kde-unstable/kdebindings-smokegen/fix-crash.patch @@ -0,0 +1,13 @@ +diff -up smokegen-4.7.0/parser/type_compiler.cpp.orig smokegen-4.7.0/parser/type_compiler.cpp +diff -up smokegen-4.7.0/type_compiler.cpp.orig smokegen-4.7.0/type_compiler.cpp +--- smokegen-4.7.0/type_compiler.cpp.orig 2011-08-02 14:34:08.000000000 +0200 ++++ smokegen-4.7.0/type_compiler.cpp 2011-08-02 14:34:34.000000000 +0200 +@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara + + void TypeCompiler::visitPtrOperator(PtrOperatorAST* node) + { ++ if ( ! m_session->token_stream ) return; ++ if ( ! token_text(m_session->token_stream->kind(node->op)) ) return; + if (token_text(m_session->token_stream->kind(node->op))[0] == '*') { + QPair<bool, bool> cv = m_visitor->parseCv(node->cv); + pointerDepth.append(cv.first); diff --git a/kde-unstable/kdebindings-smokekde/PKGBUILD b/kde-unstable/kdebindings-smokekde/PKGBUILD index 63ca984c4..ad02576b9 100644 --- a/kde-unstable/kdebindings-smokekde/PKGBUILD +++ b/kde-unstable/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143296 2011-11-24 16:13:40Z andrea $ +# $Id: PKGBUILD 144763 2011-12-08 10:26:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="http://kde.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-smoke') source=("http://download.kde.org/unstable/${pkgver}/src/smokekde-${pkgver}.tar.bz2") -sha1sums=('579e87eaf1067593d27396fe092434f7fc7b4c09') +sha1sums=('22aa60f5ee75d124c64dbff66903a57467f4675e') build() { cd "${srcdir}" diff --git a/kde-unstable/kdebindings-smokeqt/PKGBUILD b/kde-unstable/kdebindings-smokeqt/PKGBUILD index 2490b2493..efd5c4166 100644 --- a/kde-unstable/kdebindings-smokeqt/PKGBUILD +++ b/kde-unstable/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143290 2011-11-24 16:13:28Z andrea $ +# $Id: PKGBUILD 144760 2011-12-08 10:24:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") -sha1sums=('cad6c93aef4374012de9958d9ac38e3993a799b2') +sha1sums=('394f5e5d00abfaffffecf46da0a3c274fa5d192b') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-analitza/PKGBUILD b/kde-unstable/kdeedu-analitza/PKGBUILD index 7ddcbb258..a3296b3a9 100644 --- a/kde-unstable/kdeedu-analitza/PKGBUILD +++ b/kde-unstable/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143324 2011-11-24 16:14:14Z andrea $ +# $Id: PKGBUILD 144779 2011-12-08 10:35:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdelibs') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/analitza-${pkgver}.tar.bz2") -sha1sums=('db2b8fd3f14f03c128255d078670c1273a3b6657') +sha1sums=('f9193fa475d595df0b289dc1f390796dc8a8abcc') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-blinken/PKGBUILD b/kde-unstable/kdeedu-blinken/PKGBUILD index f39a11290..83a338aed 100644 --- a/kde-unstable/kdeedu-blinken/PKGBUILD +++ b/kde-unstable/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143348 2011-11-24 16:14:42Z andrea $ +# $Id: PKGBUILD 144792 2011-12-08 10:44:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/blinken-${pkgver}.tar.bz2") -sha1sums=('9215dc4d2b40b8f9173f95f06cf77c5099a733cb') +sha1sums=('6650df9ded1d935f9e767cdac25f33dcd1cec632') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-cantor/PKGBUILD b/kde-unstable/kdeedu-cantor/PKGBUILD index 2d6dbeb81..a1f8eef3e 100644 --- a/kde-unstable/kdeedu-cantor/PKGBUILD +++ b/kde-unstable/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143350 2011-11-24 16:14:44Z andrea $ +# $Id: PKGBUILD 144793 2011-12-08 10:45:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/cantor-${pkgver}.tar.bz2") -sha1sums=('7ea3094de5323b51f8f8aa1c559b1cbb8c5fbea4') +sha1sums=('a23450b3b0772730adc7c1c00aed4c4bee23a9b6') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kalgebra/PKGBUILD b/kde-unstable/kdeedu-kalgebra/PKGBUILD index fb5280713..7c90967e1 100644 --- a/kde-unstable/kdeedu-kalgebra/PKGBUILD +++ b/kde-unstable/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143352 2011-11-24 16:14:47Z andrea $ +# $Id: PKGBUILD 144794 2011-12-08 10:45:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2") -sha1sums=('705bba4e1faf35b4d09d6ac487171cef9f54f642') +sha1sums=('5455555357ef314da3480baabe8c557e9a4b8c60') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kalzium/PKGBUILD b/kde-unstable/kdeedu-kalzium/PKGBUILD index 7604114fd..4608c0945 100644 --- a/kde-unstable/kdeedu-kalzium/PKGBUILD +++ b/kde-unstable/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143354 2011-11-24 16:14:49Z andrea $ +# $Id: PKGBUILD 144795 2011-12-08 10:46:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml' 'facile') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kalzium-${pkgver}.tar.bz2") -sha1sums=('d6dbca03628ed96a256c3c603fae220a97d6fec3') +sha1sums=('97e9ddf6b7b122cc1c294468de199414e067e261') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kanagram/PKGBUILD b/kde-unstable/kdeedu-kanagram/PKGBUILD index 7924b79b3..c7699f6cb 100644 --- a/kde-unstable/kdeedu-kanagram/PKGBUILD +++ b/kde-unstable/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143356 2011-11-24 16:14:52Z andrea $ +# $Id: PKGBUILD 144796 2011-12-08 10:46:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kanagram-${pkgver}.tar.bz2") -sha1sums=('eb7d0cf7eeae5ab5520cb67cf52b73f08ec6bd57') +sha1sums=('89de86ddda5d94a56dca341ae67ad5a2337cceec') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kbruch/PKGBUILD b/kde-unstable/kdeedu-kbruch/PKGBUILD index 7ab43f309..e5c7c70ae 100644 --- a/kde-unstable/kdeedu-kbruch/PKGBUILD +++ b/kde-unstable/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143358 2011-11-24 16:14:54Z andrea $ +# $Id: PKGBUILD 144797 2011-12-08 10:47:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kbruch-${pkgver}.tar.bz2") -sha1sums=('46d735c58ed5bf7a871d92633f1d42b418da7815') +sha1sums=('ab327db23a577ed18eedc06b9e0f1e6ab64961a6') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kgeography/PKGBUILD b/kde-unstable/kdeedu-kgeography/PKGBUILD index 6aca74f87..b1f050fa3 100644 --- a/kde-unstable/kdeedu-kgeography/PKGBUILD +++ b/kde-unstable/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143360 2011-11-24 16:14:56Z andrea $ +# $Id: PKGBUILD 144798 2011-12-08 10:47:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kgeography-${pkgver}.tar.bz2") -sha1sums=('5b71a2f5a66b996cd6741422045d217e4dc275a1') +sha1sums=('0018ebb2b62ba6f577a3e424500c35797353c222') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-khangman/PKGBUILD b/kde-unstable/kdeedu-khangman/PKGBUILD index 5f450e478..21d10c7eb 100644 --- a/kde-unstable/kdeedu-khangman/PKGBUILD +++ b/kde-unstable/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143362 2011-11-24 16:15:00Z andrea $ +# $Id: PKGBUILD 144799 2011-12-08 10:48:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/khangman-${pkgver}.tar.bz2") -sha1sums=('3e4e14a145e35ec4a433f6db1bbbf4bc3804953c') +sha1sums=('712d4acec177e790b16a99aace00405143da0aa9') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kig/PKGBUILD b/kde-unstable/kdeedu-kig/PKGBUILD index f83a2bf20..5435e00a6 100644 --- a/kde-unstable/kdeedu-kig/PKGBUILD +++ b/kde-unstable/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143364 2011-11-24 16:15:03Z andrea $ +# $Id: PKGBUILD 144800 2011-12-08 10:49:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kig-${pkgver}.tar.bz2") -sha1sums=('9ac87b12dde1108782e5d4c332e550759ffd769d') +sha1sums=('04f0ad06edf4b3c759d2d9b51dadf25846b3a330') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kiten/PKGBUILD b/kde-unstable/kdeedu-kiten/PKGBUILD index 98bb48051..016506080 100644 --- a/kde-unstable/kdeedu-kiten/PKGBUILD +++ b/kde-unstable/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143366 2011-11-24 16:15:06Z andrea $ +# $Id: PKGBUILD 144801 2011-12-08 10:49:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kiten-${pkgver}.tar.bz2") -sha1sums=('60fb150e05185990da7fadf2002390938e9fef9e') +sha1sums=('737de5bdb23b84739dad4d791195b697e9f161e3') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-klettres/PKGBUILD b/kde-unstable/kdeedu-klettres/PKGBUILD index 0a13bd752..82c8e5b39 100644 --- a/kde-unstable/kdeedu-klettres/PKGBUILD +++ b/kde-unstable/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143368 2011-11-24 16:15:10Z andrea $ +# $Id: PKGBUILD 144802 2011-12-08 10:50:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/klettres-${pkgver}.tar.bz2") -sha1sums=('ef205da0317630d455d34c6f53f541b2a06038ea') +sha1sums=('1b3a30f69399a6770a8dce86db54f62d2ff9ac7d') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kmplot/PKGBUILD b/kde-unstable/kdeedu-kmplot/PKGBUILD index 75fc53cba..3fa8055d2 100644 --- a/kde-unstable/kdeedu-kmplot/PKGBUILD +++ b/kde-unstable/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143370 2011-11-24 16:15:14Z andrea $ +# $Id: PKGBUILD 144803 2011-12-08 10:50:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kmplot-${pkgver}.tar.bz2") -sha1sums=('7009619d0d11bd6be7acac095f386ff219ccd506') +sha1sums=('895c2adb0b53bd2800b1eb47d187b8b16ba574f4') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kstars/PKGBUILD b/kde-unstable/kdeedu-kstars/PKGBUILD index 38d5b4939..79b65825b 100644 --- a/kde-unstable/kdeedu-kstars/PKGBUILD +++ b/kde-unstable/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143372 2011-11-24 16:15:18Z andrea $ +# $Id: PKGBUILD 144804 2011-12-08 10:51:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kstars-${pkgver}.tar.bz2") -sha1sums=('ac705e13f83db3017e5ad6a615c264be69259f21') +sha1sums=('7e818cddfb9d52c44a8702edc56321b14924c9a2') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-ktouch/PKGBUILD b/kde-unstable/kdeedu-ktouch/PKGBUILD index 62f000d1e..a12ceb3f3 100644 --- a/kde-unstable/kdeedu-ktouch/PKGBUILD +++ b/kde-unstable/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143374 2011-11-24 16:15:21Z andrea $ +# $Id: PKGBUILD 144805 2011-12-08 10:52:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/ktouch-${pkgver}.tar.bz2") -sha1sums=('ebba0f8d22ca06db2488d1059b41432fce6b7a67') +sha1sums=('faa97d88e132788e21a93e044c1977030f246180') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kturtle/PKGBUILD b/kde-unstable/kdeedu-kturtle/PKGBUILD index 06635be37..3e79f0a48 100644 --- a/kde-unstable/kdeedu-kturtle/PKGBUILD +++ b/kde-unstable/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143376 2011-11-24 16:15:26Z andrea $ +# $Id: PKGBUILD 144806 2011-12-08 10:52:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kturtle-${pkgver}.tar.bz2") -sha1sums=('85e087446b2e6633658ad71e8d64c446a1029b6b') +sha1sums=('be1250b25efde8d74ca9c64f6f2af1fe7f3ae655') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-kwordquiz/PKGBUILD b/kde-unstable/kdeedu-kwordquiz/PKGBUILD index 3e2415ee6..1df9a8d7a 100644 --- a/kde-unstable/kdeedu-kwordquiz/PKGBUILD +++ b/kde-unstable/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143378 2011-11-24 16:15:29Z andrea $ +# $Id: PKGBUILD 144807 2011-12-08 10:53:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2") -sha1sums=('6bca16d9ad9d0df0517bec8b944f8e61c89f16c6') +sha1sums=('6bf02eb04565e9b2b12cd1f1a71b747b5f9a5d09') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-marble/PKGBUILD b/kde-unstable/kdeedu-marble/PKGBUILD index cd5efacfd..5f26bf757 100644 --- a/kde-unstable/kdeedu-marble/PKGBUILD +++ b/kde-unstable/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143314 2011-11-24 16:14:04Z andrea $ +# $Id: PKGBUILD 144774 2011-12-08 10:32:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2") -sha1sums=('e525f3bca3bef13a3506f5b295847e62fd69e4b2') +sha1sums=('5b184a51a5e6448657ebc9926ee41c7f894e5898') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-parley/PKGBUILD b/kde-unstable/kdeedu-parley/PKGBUILD index 51199cf74..27ba8fdae 100644 --- a/kde-unstable/kdeedu-parley/PKGBUILD +++ b/kde-unstable/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143380 2011-11-24 16:15:34Z andrea $ +# $Id: PKGBUILD 144808 2011-12-08 10:53:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/parley-${pkgver}.tar.bz2") -sha1sums=('be0824a60c1c33e19b1399d5995d7f9692a98a3f') +sha1sums=('feb71126d177327df5be96a3f1fdd0e844edd94f') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeedu-rocs/PKGBUILD b/kde-unstable/kdeedu-rocs/PKGBUILD index 33e77fd6a..d088c9b55 100644 --- a/kde-unstable/kdeedu-rocs/PKGBUILD +++ b/kde-unstable/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143382 2011-11-24 16:15:38Z andrea $ +# $Id: PKGBUILD 144809 2011-12-08 10:54:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/unstable/${pkgver}/src/rocs-${pkgver}.tar.bz2") -sha1sums=('dca8675203a9c9d9d384d0b236507cb3380cf75e') +sha1sums=('308ee10484e60d21476507b400b8bacdec64ba9f') options=('!makeflags') build() { diff --git a/kde-unstable/kdeedu-step/PKGBUILD b/kde-unstable/kdeedu-step/PKGBUILD index df3186e81..de8bd83a3 100644 --- a/kde-unstable/kdeedu-step/PKGBUILD +++ b/kde-unstable/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143384 2011-11-24 16:15:43Z andrea $ +# $Id: PKGBUILD 144810 2011-12-08 10:54:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/step-${pkgver}.tar.bz2") -sha1sums=('fd2f8f931d74c050feec57f6cf6a9e484dc59fd9') +sha1sums=('280fb584332f6bb043f40a367b8ba9b0e1a4f783') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegames/PKGBUILD b/kde-unstable/kdegames/PKGBUILD index 5ef47f9ca..aeb8950bb 100644 --- a/kde-unstable/kdegames/PKGBUILD +++ b/kde-unstable/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143386 2011-11-24 16:15:52Z andrea $ +# $Id: PKGBUILD 144811 2011-12-08 10:56:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -43,7 +43,7 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python' 'openal') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('11583e33d6a8ad6eb1a5f98d11338940083bfea4') +sha1sums=('bfc61fba50d8674a0f8ba5437d23ff3e7254886b') build() { cd $srcdir @@ -102,6 +102,7 @@ package_kdegames-granatier() { package_kdegames-kajongg() { pkgdesc='The ancient Chinese board game for 4 players' depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted') + url="http://www.kde.org/applications/games/kajongg/" install='kdegames.install' cd $srcdir/build/kajongg make DESTDIR=$pkgdir install diff --git a/kde-unstable/kdegraphics-gwenview/PKGBUILD b/kde-unstable/kdegraphics-gwenview/PKGBUILD index 377064424..33b6d1a62 100644 --- a/kde-unstable/kdegraphics-gwenview/PKGBUILD +++ b/kde-unstable/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143388 2011-11-24 16:15:56Z andrea $ +# $Id: PKGBUILD 144812 2011-12-08 10:58:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/unstable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") -sha1sums=('7d8a9a99f28b36e8acbd42815929e91c4b9f94eb') +sha1sums=('4ce42d89a91d1dda669e9ac6630613413a8644d8') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-kamera/PKGBUILD b/kde-unstable/kdegraphics-kamera/PKGBUILD index ab9286568..bc333aafc 100644 --- a/kde-unstable/kdegraphics-kamera/PKGBUILD +++ b/kde-unstable/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143390 2011-11-24 16:15:58Z andrea $ +# $Id: PKGBUILD 144813 2011-12-08 10:58:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/kamera-${pkgver}.tar.bz2") -sha1sums=('10a794c4e8e3d26df808d6ea76c9231574f5635a') +sha1sums=('d431167c4a4c9b5df9105095b41ce9f340851e64') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD index d907e2a73..b9faa7484 100644 --- a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD +++ b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143392 2011-11-24 16:16:00Z andrea $ +# $Id: PKGBUILD 144814 2011-12-08 10:59:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2") -sha1sums=('611ed0489f2b913d8bba4938bb250e5c93f7bc10') +sha1sums=('f16bdd87bb6233cbfd2ab647cab7335d3d34d062') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-kgamma/PKGBUILD b/kde-unstable/kdegraphics-kgamma/PKGBUILD index 4bc017e9d..7a569633b 100644 --- a/kde-unstable/kdegraphics-kgamma/PKGBUILD +++ b/kde-unstable/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143394 2011-11-24 16:16:03Z andrea $ +# $Id: PKGBUILD 144815 2011-12-08 10:59:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/kgamma-${pkgver}.tar.bz2") -sha1sums=('76ed0d777f6cde5c6c2facf39cebba4d3e60b8aa') +sha1sums=('1424d9e79e709550f2093d74abc9b2530b0326b8') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD index 4be57e33d..d513500d3 100644 --- a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD +++ b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143396 2011-11-24 16:16:05Z andrea $ +# $Id: PKGBUILD 144816 2011-12-08 11:00:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2") -sha1sums=('7d2e2eee77fe9307eef18cb5accd476fbb55fa57') +sha1sums=('20d46610bfc8943cfe5b83e2e9b0902a6389b973') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-kruler/PKGBUILD b/kde-unstable/kdegraphics-kruler/PKGBUILD index cc36025a5..eb890bc3f 100644 --- a/kde-unstable/kdegraphics-kruler/PKGBUILD +++ b/kde-unstable/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143398 2011-11-24 16:16:06Z andrea $ +# $Id: PKGBUILD 144817 2011-12-08 11:00:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kruler-${pkgver}.tar.bz2") -sha1sums=('efbd6ceef6645ab14eb0a6b4e142a1c6cbfaa47e') +sha1sums=('89ec4ca602371264b0587649b92631bb74093a4a') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD index d084c5851..81637de54 100644 --- a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD +++ b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143400 2011-11-24 16:16:09Z andrea $ +# $Id: PKGBUILD 144818 2011-12-08 11:01:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/unstable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2") -sha1sums=('57af20b3a7f6973e3a4e881522443ccf40f39e2e') +sha1sums=('f493dcad48561622baf4e67958faf932f221a032') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD index 1efef8d49..585129c84 100644 --- a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD +++ b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143402 2011-11-24 16:16:11Z andrea $ +# $Id: PKGBUILD 144819 2011-12-08 11:01:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2") -sha1sums=('5016877111e974fb745e33a36900fa2be4665279') +sha1sums=('d8a7b36516c905c1f69e0d1b50b87c78094f9caf') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-mobipocket/PKGBUILD b/kde-unstable/kdegraphics-mobipocket/PKGBUILD index 77dd2876a..fa8d5066a 100644 --- a/kde-unstable/kdegraphics-mobipocket/PKGBUILD +++ b/kde-unstable/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143404 2011-11-24 16:16:13Z andrea $ +# $Id: PKGBUILD 144820 2011-12-08 11:02:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2") -sha1sums=('1da0a6d283b0ee361afeb27b0e03901581b86e8a') +sha1sums=('82e978474ab0f9a3edbdd74f0ddb9834cd5b1736') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-okular/PKGBUILD b/kde-unstable/kdegraphics-okular/PKGBUILD index 554ca1f62..54928f2b2 100644 --- a/kde-unstable/kdegraphics-okular/PKGBUILD +++ b/kde-unstable/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143292 2011-11-24 16:13:32Z andrea $ +# $Id: PKGBUILD 144761 2011-12-08 10:25:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/okular-${pkgver}.tar.bz2") -sha1sums=('971562ce741fc6d4afb6c80dc405984b77ef7bfa') +sha1sums=('ca6208448ccc2e0ce1f0545ab7d76f6e59f767b0') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD index cab45048e..978ed2868 100644 --- a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD +++ b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143406 2011-11-24 16:16:15Z andrea $ +# $Id: PKGBUILD 144821 2011-12-08 11:02:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('3a7dbc47de312d08d804bbfa394bc9c2a454cd5c') +sha1sums=('6ce63fd58bf35b86e854bd39332ec493de2c3a0d') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-svgpart/PKGBUILD b/kde-unstable/kdegraphics-svgpart/PKGBUILD index 930d12fa0..5f6dbf5c4 100644 --- a/kde-unstable/kdegraphics-svgpart/PKGBUILD +++ b/kde-unstable/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143408 2011-11-24 16:16:17Z andrea $ +# $Id: PKGBUILD 144822 2011-12-08 11:03:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="A KPart for viewving SVGs" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/unstable/${pkgver}/src/svgpart-${pkgver}.tar.bz2") -sha1sums=('41f05ccdb5a903fc2b91a685477271b3b4c8d72e') +sha1sums=('4280bca62347bc9116a8e499065dcd6c7a4adea3') build() { cd "${srcdir}" diff --git a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD index d6a0d8de2..e5322b996 100644 --- a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD +++ b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143410 2011-11-24 16:16:19Z andrea $ +# $Id: PKGBUILD 144823 2011-12-08 11:03:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('b690cdf4175ea0ecefc5ae21c054d460e3ce508e') +sha1sums=('61247ab0fb8b94c9431c5bce4f68c514ad0ec722') build() { cd "${srcdir}" diff --git a/kde-unstable/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD index 86a31d841..b663c6cf2 100644 --- a/kde-unstable/kdelibs/PKGBUILD +++ b/kde-unstable/kdelibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143279 2011-11-24 16:13:15Z andrea $ +# $Id: PKGBUILD 144751 2011-12-08 10:17:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ replaces=('kdelibs-experimental') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kde-applications-menu.patch' 'archlinux-menu.patch') -sha1sums=('0dac96f3d7445bde8e2e7066986ca5656d441b02' +sha1sums=('888a37f78cd44d16101c244f86576a39adc89bb6' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' '63a850ab4196b9d06934f2b4a13acd9f7739bc67') diff --git a/kde-unstable/kdemultimedia/PKGBUILD b/kde-unstable/kdemultimedia/PKGBUILD index 29264c7ee..dde82bf7f 100644 --- a/kde-unstable/kdemultimedia/PKGBUILD +++ b/kde-unstable/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143412 2011-11-24 16:16:21Z andrea $ +# $Id: PKGBUILD 144824 2011-12-08 11:04:15Z 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.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ makedepends=('cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'mplayerthumbs.config') -sha1sums=('44b9adf781fcbebe1214fc87b006bf13ddd8b702' +sha1sums=('438e74972985616afbd019d0814863a208abe64b' 'ba016fa2563c14ffcba852c62506b66bfc6ee683') build() { diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD index 4b0cc1dc1..27cbb4168 100644 --- a/kde-unstable/kdenetwork/PKGBUILD +++ b/kde-unstable/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143414 2011-11-24 16:16:24Z andrea $ +# $Id: PKGBUILD 144825 2011-12-08 11:05:04Z 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.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('3ea7ab56d36260db9deaef2585feee80311ccfdc') +sha1sums=('7b2389d3c11b928a57677171901598a0007181f0') build() { cd "${srcdir}" diff --git a/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD index 51dc56b29..6ca841a19 100644 --- a/kde-unstable/kdepim-runtime/PKGBUILD +++ b/kde-unstable/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143286 2011-11-24 16:13:23Z andrea $ +# $Id: PKGBUILD 144757 2011-12-08 10:22:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdepimlibs' 'kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('54de62929a8293d7a514e505ce63a46c7514a9e6') +sha1sums=('8833bb270f9dcd3f89abe84c0276a338df553fca') build() { cd "${srcdir}" diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD index d29e3c7f6..247c1f439 100644 --- a/kde-unstable/kdepim/PKGBUILD +++ b/kde-unstable/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143416 2011-11-24 16:16:27Z andrea $ +# $Id: PKGBUILD 144826 2011-12-08 11:06:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' @@ -29,7 +29,7 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('e1b6f42a864a9be2263a9ac2cd21367af39fd532') +sha1sums=('c29ef1490c5dad892072014e2facfafb72dc5fbb') build() { cd "${srcdir}" diff --git a/kde-unstable/kdepimlibs/PKGBUILD b/kde-unstable/kdepimlibs/PKGBUILD index d706eecbb..77a1d2ae0 100644 --- a/kde-unstable/kdepimlibs/PKGBUILD +++ b/kde-unstable/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143281 2011-11-24 16:13:17Z andrea $ +# $Id: PKGBUILD 144753 2011-12-08 10:18:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') install='kdepimlibs.install' source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('8c32406b85cf9677b7bebeb61cf50621dd034787') +sha1sums=('6f4b0bbc3e8f88d16d4e3830fe0d50c7f3a65f83') build() { cd ${srcdir} diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD index ff363b32a..8f052bc2e 100644 --- a/kde-unstable/kdeplasma-addons/PKGBUILD +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143608 2011-11-27 12:08:26Z andrea $ +# $Id: PKGBUILD 144827 2011-12-08 11:06:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -74,23 +74,18 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-potd' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.7.80 -pkgrel=2 +pkgver=4.7.90 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'fix-build.patch') -sha1sums=('fd27a14fc2ad676a4d5ddf4cd8658d80fc7aa8e9' - '408f4ba54c2aba93e68f3454be0ef4327e48a51b') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('b32064ec97f089adf7d769b714ee095c78f499cb') build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/fix-build.patch - cd "${srcdir}" mkdir build cd build diff --git a/kde-unstable/kdesdk-kate/PKGBUILD b/kde-unstable/kdesdk-kate/PKGBUILD index 84619e271..80490b36c 100644 --- a/kde-unstable/kdesdk-kate/PKGBUILD +++ b/kde-unstable/kdesdk-kate/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 143294 2011-11-24 16:13:37Z andrea $ +# $Id: PKGBUILD 144762 2011-12-08 10:25:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-kwrite' 'kdesdk-kate') -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.bz2" 'pkgbuild-syntax-highlight.patch') -sha1sums=('6c243a3fc1f114b8c1d9a6d644ec61e3ebf332e8' +sha1sums=('0d6b11fffc02de0ee22e2f866446d5b92b987423' '0a928253bd2077f0264d96a6c8823c69c47b6a8d') build() { @@ -32,6 +32,7 @@ package_kdebase-kwrite() { pkgdesc="Text Editor" depends=('kdebase-runtime') groups=('kde' 'kdebase') + url="http://www.kde.org/applications/utilities/kwrite/" install='kdebase-kwrite.install' cd "${srcdir}"/build/kwrite @@ -48,6 +49,7 @@ package_kdesdk-kate() { pkgdesc="Advanced Text Editor" depends=('kdebase-kwrite') groups=('kde' 'kdesdk') + url="http://www.kde.org/applications/utilities/kate/" install='kdesdk-kate.install' cd "${srcdir}"/build/kate diff --git a/kde-unstable/kdesdk/PKGBUILD b/kde-unstable/kdesdk/PKGBUILD index 87d3ca27d..fb7567423 100644 --- a/kde-unstable/kdesdk/PKGBUILD +++ b/kde-unstable/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143420 2011-11-24 16:16:37Z andrea $ +# $Id: PKGBUILD 144772 2011-12-08 10:31:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -22,7 +22,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -32,7 +32,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'fix-python2-path.patch') -sha1sums=('725ca18c5bbf16061911bde15d98cb0e86db4471' +sha1sums=('0a1592c1886bdd3828d2b41f7e78c0662f725014' '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') build() { @@ -198,7 +198,7 @@ package_kdesdk-okteta() { depends=('kdebase-runtime') replaces=('kdeutils-okteta') conflicts=('kdeutils-okteta') - url="http://kde.org/applications/utilities/okteta" + url="http://kde.org/applications/utilities/okteta/" install='kdesdk-okteta.install' cd $srcdir/build/okteta make DESTDIR=$pkgdir install diff --git a/kde-unstable/kdetoys/PKGBUILD b/kde-unstable/kdetoys/PKGBUILD index 7c515243d..e93491d23 100644 --- a/kde-unstable/kdetoys/PKGBUILD +++ b/kde-unstable/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143422 2011-11-24 16:16:40Z andrea $ +# $Id: PKGBUILD 144828 2011-12-08 11:07:36Z 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.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('5462cdc809f22fcc2837844fb7b5fad0b5f716c5') +sha1sums=('fd49f8bd04572c47eebb8a180c3db833b2e17da8') build() { cd $srcdir diff --git a/kde-unstable/kdeutils-filelight/PKGBUILD b/kde-unstable/kdeutils-filelight/PKGBUILD index 85976db3b..073cfcf92 100644 --- a/kde-unstable/kdeutils-filelight/PKGBUILD +++ b/kde-unstable/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143426 2011-11-24 16:16:44Z andrea $ +# $Id: PKGBUILD 144830 2011-12-08 11:08:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/filelight-${pkgver}.tar.bz2") -sha1sums=('e77283760f0a787e7090dbd121e133036e5e57de') +sha1sums=('fe30a6749254eaec6aff7f62aa569ac7bd807be4') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-kcalc/PKGBUILD b/kde-unstable/kdeutils-kcalc/PKGBUILD index c5ec6c1e4..6d31d0098 100644 --- a/kde-unstable/kdeutils-kcalc/PKGBUILD +++ b/kde-unstable/kdeutils-kcalc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143428 2011-11-24 16:16:47Z andrea $ +# $Id: PKGBUILD 144831 2011-12-08 11:09:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='Scientific Calculator' -url='http://kde.org/applications/utilities/kcalc' +url='http://kde.org/applications/utilities/kcalc/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kcalc-${pkgver}.tar.bz2") -sha1sums=('0fce57dbbd39028bb3b5749959368c35d8aa0442') +sha1sums=('d7c267f92ea5a15e5a3f9377b17dcad117627ed1') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-kcharselect/PKGBUILD b/kde-unstable/kdeutils-kcharselect/PKGBUILD index 478a59212..66b541aa6 100644 --- a/kde-unstable/kdeutils-kcharselect/PKGBUILD +++ b/kde-unstable/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143430 2011-11-24 16:16:50Z andrea $ +# $Id: PKGBUILD 144832 2011-12-08 11:09:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/unstable/${pkgver}/src/kcharselect-${pkgver}.tar.bz2") -sha1sums=('d5938cdba2aa32970fa7211827c1ee0e614f4acf') +sha1sums=('b95231c0718c3351c1b8846f083b884502e3c0fe') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-kdf/PKGBUILD b/kde-unstable/kdeutils-kdf/PKGBUILD index 7d27cec82..708ef66dd 100644 --- a/kde-unstable/kdeutils-kdf/PKGBUILD +++ b/kde-unstable/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143432 2011-11-24 16:16:52Z andrea $ +# $Id: PKGBUILD 144833 2011-12-08 11:10:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kdf-${pkgver}.tar.bz2") -sha1sums=('22f42048664ab76cb7a5357c4ce18e3ac9321120') +sha1sums=('e93e7e566773e32075a812976d2553a0f63cba5a') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-kfloppy/PKGBUILD b/kde-unstable/kdeutils-kfloppy/PKGBUILD index 213d1a741..5d882035e 100644 --- a/kde-unstable/kdeutils-kfloppy/PKGBUILD +++ b/kde-unstable/kdeutils-kfloppy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143434 2011-11-24 16:16:54Z andrea $ +# $Id: PKGBUILD 144834 2011-12-08 11:10:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='Floppy Formatter' -url='http://kde.org/applications/utilities/kfloppy' +url='http://kde.org/applications/utilities/kfloppy/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kfloppy-${pkgver}.tar.bz2") -sha1sums=('c7669a2c35fff0a403ecf8df23e0da03238dc6ae') +sha1sums=('d88adef423e3938a7fe6f07991ad9c9b266896ef') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-kgpg/PKGBUILD b/kde-unstable/kdeutils-kgpg/PKGBUILD index 9c6f639a7..fb7190e3b 100644 --- a/kde-unstable/kdeutils-kgpg/PKGBUILD +++ b/kde-unstable/kdeutils-kgpg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143436 2011-11-24 16:16:56Z andrea $ +# $Id: PKGBUILD 144835 2011-12-08 11:11:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='A GnuPG frontend' -url='http://kde.org/applications/utilities/kgpg' +url='http://kde.org/applications/utilities/kgpg/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') depends=('kdepim-runtime' 'kde-agent') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kgpg-${pkgver}.tar.bz2") -sha1sums=('ee2143a2c5ecc04608e7b037a364b2f360d06574') +sha1sums=('77f2bf2eeed2945046a9b563a8d8dc040c5559ab') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-kremotecontrol/PKGBUILD b/kde-unstable/kdeutils-kremotecontrol/PKGBUILD index 51c1c9397..a3621be0c 100644 --- a/kde-unstable/kdeutils-kremotecontrol/PKGBUILD +++ b/kde-unstable/kdeutils-kremotecontrol/PKGBUILD @@ -2,10 +2,10 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' -url='http://kde.org/applications/utilities/kremotecontrol' +url='http://kde.org/applications/utilities/kremotecontrol/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') depends=('kdebase-workspace') @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kremotecontrol-${pkgver}.tar.bz2") -sha1sums=('fae17c72a67fbcd3333815838ff1d934a3fc7c53') +sha1sums=('deecb178365fb8baf90fe807ddd0b3a63bee0e67') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-ktimer/PKGBUILD b/kde-unstable/kdeutils-ktimer/PKGBUILD index 37886965e..95a4b4515 100644 --- a/kde-unstable/kdeutils-ktimer/PKGBUILD +++ b/kde-unstable/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143440 2011-11-24 16:17:00Z andrea $ +# $Id: PKGBUILD 144837 2011-12-08 11:11:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/ktimer-${pkgver}.tar.bz2") -sha1sums=('763c0116dc99f3c428fa1f48721b9dd37a9b53e1') +sha1sums=('b3af39fcb5a0bdc93fea85b4fd2e2af5b7953634') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-kwallet/PKGBUILD b/kde-unstable/kdeutils-kwallet/PKGBUILD index b48789a39..2557fe1c2 100644 --- a/kde-unstable/kdeutils-kwallet/PKGBUILD +++ b/kde-unstable/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143442 2011-11-24 16:17:02Z andrea $ +# $Id: PKGBUILD 144838 2011-12-08 11:12:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/kwallet-${pkgver}.tar.bz2") -sha1sums=('ba1fc1e070c8d84af6d8a3e58452854f4b504214') +sha1sums=('a2c667f38852c9293866a3cdd71073c3c46079d5') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-printer-applet/PKGBUILD b/kde-unstable/kdeutils-printer-applet/PKGBUILD index 43f4f2a39..48d1a009c 100644 --- a/kde-unstable/kdeutils-printer-applet/PKGBUILD +++ b/kde-unstable/kdeutils-printer-applet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143444 2011-11-24 16:17:04Z andrea $ +# $Id: PKGBUILD 144839 2011-12-08 11:12:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-printer-applet -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='System tray icon for managing print jobs' url='http://kde.org/applications/system/printerapplet/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/unstable/${pkgver}/src/printer-applet-${pkgver}.tar.bz2") -sha1sums=('d1fc4913baf8ca7a938347f7ce4efcb5b1e2ab85') +sha1sums=('b30e5089389c0147e7256080323f7f6777ef422e') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-superkaramba/PKGBUILD b/kde-unstable/kdeutils-superkaramba/PKGBUILD index e7b4a7039..0fc73c92c 100644 --- a/kde-unstable/kdeutils-superkaramba/PKGBUILD +++ b/kde-unstable/kdeutils-superkaramba/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143446 2011-11-24 16:17:06Z andrea $ +# $Id: PKGBUILD 144840 2011-12-08 11:13:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' -url='http://kde.org/applications/utilities/superkaramba' +url='http://kde.org/applications/utilities/superkaramba/' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'qimageblitz') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/superkaramba-${pkgver}.tar.bz2") -sha1sums=('16c505363cf3dac342eb411d8a5ffea80216563d') +sha1sums=('6135759152daa625e1b3de694a75d3b229452e30') build() { cd "${srcdir}" diff --git a/kde-unstable/kdeutils-sweeper/PKGBUILD b/kde-unstable/kdeutils-sweeper/PKGBUILD index 9225f5813..55308a9e9 100644 --- a/kde-unstable/kdeutils-sweeper/PKGBUILD +++ b/kde-unstable/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143448 2011-11-24 16:17:08Z andrea $ +# $Id: PKGBUILD 144841 2011-12-08 11:13:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/unstable/${pkgver}/src/sweeper-${pkgver}.tar.bz2") -sha1sums=('18c915a8057fd63edcb47c7e7c2a4503e5141856') +sha1sums=('1de3c266d237b4914993a99a5267fe904f66f21b') build() { cd "${srcdir}" diff --git a/kde-unstable/kdewebdev/PKGBUILD b/kde-unstable/kdewebdev/PKGBUILD index a3638ccd0..d0386bf93 100644 --- a/kde-unstable/kdewebdev/PKGBUILD +++ b/kde-unstable/kdewebdev/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 143450 2011-11-24 16:17:10Z andrea $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> +# $Id: PKGBUILD 144842 2011-12-08 11:14:34Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=kdewebdev pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -14,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('505444a089b88b210a34dc31d09ae2926892aee0') +sha1sums=('22a8a85eed8e4d070e2bc4b1bff73610703936ec') build() { cd $srcdir @@ -41,6 +42,7 @@ package_kdewebdev-kfilereplace() { package_kdewebdev-kimagemapeditor() { pkgdesc='HTML Image Map Editor' depends=('kdebase-runtime') + url="http://www.kde.org/applications/development/kimagemapeditor/" install='kdewebdev-kimagemapeditor.install' cd $srcdir/build/kimagemapeditor make DESTDIR=$pkgdir install @@ -51,6 +53,7 @@ package_kdewebdev-kimagemapeditor() { package_kdewebdev-klinkstatus() { pkgdesc='Link Checker' depends=('kdepim-runtime' 'tidyhtml') + url="http://www.kde.org/applications/development/klinkstatus/" install='kdewebdev.install' cd $srcdir/build/klinkstatus make DESTDIR=$pkgdir install @@ -61,6 +64,7 @@ package_kdewebdev-klinkstatus() { package_kdewebdev-kommander() { pkgdesc='Executor for Kommander dialogs' depends=('kdebase-runtime') + url="http://www.kde.org/applications/development/kommander/" cd $srcdir/build/kommander make DESTDIR=$pkgdir install } diff --git a/kde-unstable/libkdcraw/PKGBUILD b/kde-unstable/libkdcraw/PKGBUILD index 5abf08e05..7ea7b684b 100644 --- a/kde-unstable/libkdcraw/PKGBUILD +++ b/kde-unstable/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143316 2011-11-24 16:14:06Z andrea $ +# $Id: PKGBUILD 144775 2011-12-08 10:33:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('67f6b65a98a4ab24e946fdf2c4b3523c803c935a') +sha1sums=('79cd12cf888936ca2b64c5309261f57e540bab4d') build() { cd "${srcdir}" diff --git a/kde-unstable/libkdeedu/PKGBUILD b/kde-unstable/libkdeedu/PKGBUILD index 15624153e..85fde3cd5 100644 --- a/kde-unstable/libkdeedu/PKGBUILD +++ b/kde-unstable/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143312 2011-11-24 16:14:02Z andrea $ +# $Id: PKGBUILD 144773 2011-12-08 10:32:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('31113d9c884d37d36a6af10d5a3b9ab66dcb7396') +sha1sums=('0fe65883164162d464046da0249a905298597df8') build() { cd "${srcdir}" diff --git a/kde-unstable/libkexiv2/PKGBUILD b/kde-unstable/libkexiv2/PKGBUILD index aaf47b893..96bb47fbd 100644 --- a/kde-unstable/libkexiv2/PKGBUILD +++ b/kde-unstable/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143318 2011-11-24 16:14:08Z andrea $ +# $Id: PKGBUILD 144776 2011-12-08 10:34:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('50916f1f47653f1a3fb84f07cd8eeed4296bf9b1') +sha1sums=('4d27c1d5e97d719e5cf2c5cada8d030ed3c8a4ea') build() { cd "${srcdir}" diff --git a/kde-unstable/libkipi/PKGBUILD b/kde-unstable/libkipi/PKGBUILD index 0e45757c6..ec2b2d1db 100644 --- a/kde-unstable/libkipi/PKGBUILD +++ b/kde-unstable/libkipi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143320 2011-11-24 16:14:10Z andrea $ +# $Id: PKGBUILD 144777 2011-12-08 10:34:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('cd223fb1dbdbfbdea39b3abf79291fe81f534906') +sha1sums=('d8051403f165f76ccdffcfb831c247729b70b507') build() { cd "${srcdir}" diff --git a/kde-unstable/libksane/PKGBUILD b/kde-unstable/libksane/PKGBUILD index 58f01f20a..042e8c4cc 100644 --- a/kde-unstable/libksane/PKGBUILD +++ b/kde-unstable/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143322 2011-11-24 16:14:12Z andrea $ +# $Id: PKGBUILD 144778 2011-12-08 10:35:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.7.80 +pkgver=4.7.90 pkgrel=1 pkgdesc="An image scanning library" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('331914883d031e9e56560d6c6fbef08de304767e') +sha1sums=('ca3166bb334babf232d90d9c82dfe4a1e646d842') build() { cd "${srcdir}" diff --git a/multilib/dev86/PKGBUILD b/multilib/dev86/PKGBUILD deleted file mode 100644 index 634592a08..000000000 --- a/multilib/dev86/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 59310 2011-11-23 10:19:34Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Alessio 'mOLOk' Bolognino <themolok@gmail.com> -# Contributor: Suat SARIALP <muhendis.suat@gmail.com> - -pkgname=dev86 -pkgver=0.16.18 -pkgrel=2 -pkgdesc="Simple C compiler to generate 8086 code" -arch=('i686' 'x86_64') -url="http://www.debath.co.uk/dev86/" -license=(GPL) -[ "${CARCH}" == "x86_64" ] && depends=('lib32-glibc') -makedepends=('bin86') -options=('!libtool' '!strip' '!makeflags') -source=(http://www.debath.co.uk/dev86/Dev86src-$pkgver.tar.gz - dev86-pic.patch - dev86-0.16.17-fortify.patch) -md5sums=('f2e06b547397383b2b2650b9c4fd9bab' - '1b750c5561a4bde5f83f65e5827feb73' - '07238f9203c6528ea1e34198e771ea12') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np0 -i $srcdir/dev86-pic.patch - patch -Np1 -i $srcdir/dev86-0.16.17-fortify.patch - if [ "${CARCH}" = "x86_64" ]; then - # x86_64 fix - sed -i.orig -e 's,alt-libs elksemu,alt-libs,' \ - -e 's,install-lib install-emu,install-lib,' \ - $srcdir/$pkgname-$pkgver/makefile.in - sed -i -e "s/-O2 -g/-O2 -g -m32/" makefile.in - sed -i 's|^LDFLAGS.*=$|LDFLAGS=-m32|' makefile.in - fi - - unset CFLAGS - unset LDFLAGS - unset CPPFLAGS - unset CXXFLAGS - - make PREFIX=/usr DIST="$pkgdir" - make install-all DIST="$pkgdir" - mkdir -p $pkgdir/usr/share - mv $pkgdir/usr/man $pkgdir/usr/share - # remove all the stuff supplied by bin86 - rm $pkgdir/usr/bin/{as,ld,nm,objdump,size}86 - rm $pkgdir/usr/share/man/man1/{as,ld}86.1 -} diff --git a/multilib/dev86/dev86-0.16.17-fortify.patch b/multilib/dev86/dev86-0.16.17-fortify.patch deleted file mode 100644 index 715d0c4ca..000000000 --- a/multilib/dev86/dev86-0.16.17-fortify.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- dev86-0.16.17/bcc/bcc.c -+++ dev86-0.16.17/bcc/bcc.c -@@ -19,6 +19,7 @@ - #ifdef __STDC__ - #include <stdlib.h> - #ifndef MSDOS -+#include <limits.h> - #include <unistd.h> - #endif - #else -@@ -596,12 +597,17 @@ - } - } - --void --command_reset() --{ - #ifndef MAXPATHLEN -+#ifdef PATH_MAX -+#define MAXPATHLEN PATH_MAX -+#else - #define MAXPATHLEN 1024 - #endif -+#endif -+ -+void -+command_reset() -+{ - char buf[MAXPATHLEN]; - char ** prefix; - char * saved_cmd; -@@ -1308,11 +1314,7 @@ - - for(d=s=ptr; d && *s; s=d) - { --#ifdef MAXPATHLEN - char buf[MAXPATHLEN]; --#else -- char buf[1024]; --#endif - - free(temp); - d=strchr(s, ':'); diff --git a/multilib/dev86/dev86-pic.patch b/multilib/dev86/dev86-pic.patch deleted file mode 100644 index 439c2648b..000000000 --- a/multilib/dev86/dev86-pic.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- elksemu/elks.c.orig 2005-11-04 01:35:37.000000000 +0100 -+++ elksemu/elks.c 2005-11-04 01:45:28.000000000 +0100 -@@ -129,8 +129,17 @@ - static inline int vm86_mine(struct vm86_struct* v86) - { - int __res; -+#ifndef __PIC__ - __asm__ __volatile__("int $0x80\n" - :"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86)); -+#else -+ __asm__ __volatile__( -+ "movl %%ebx,%%ecx\n\t" -+ "movl %2,%%ebx\n\t" -+ "int $0x80\n\t" -+ "movl %%ecx,%%ebx\n\t" -+ :"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx"); -+#endif - return __res; - } - #endif diff --git a/multilib/jack2-multilib/40-hpet-permissions.rules b/multilib/jack2-multilib/40-hpet-permissions.rules new file mode 100644 index 000000000..7af3780f9 --- /dev/null +++ b/multilib/jack2-multilib/40-hpet-permissions.rules @@ -0,0 +1,2 @@ +KERNEL=="rtc0", GROUP="audio" +KERNEL=="hpet", GROUP="audio" diff --git a/multilib/jack2-multilib/99-audio.conf b/multilib/jack2-multilib/99-audio.conf new file mode 100644 index 000000000..eb76ef920 --- /dev/null +++ b/multilib/jack2-multilib/99-audio.conf @@ -0,0 +1,2 @@ +@audio - rtprio 99 +@audio - memlock unlimited diff --git a/multilib/jack2-multilib/PKGBUILD b/multilib/jack2-multilib/PKGBUILD new file mode 100644 index 000000000..7c61a3571 --- /dev/null +++ b/multilib/jack2-multilib/PKGBUILD @@ -0,0 +1,142 @@ +# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: SpepS <dreamspepser at yahoo dot it> + +# This one is in response to a need for an equivalent to lib32-jack for +# jack2. A lib32-jack2 would require much patching and invading the pure +# jack2 package, and what's more, the buildsystem provides a flag just to +# build a hybrid jack2 in full. As such, we have opted to provide multilib +# users with a replacement package instead of the usual lib32 add-on. +# +# See http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html + +pkgbase=jack2-multilib +pkgname=('jack2-multilib' 'jack2-dbus-multilib') +#pkgname= # single build (overrides split) +_tarname=jack +pkgver=1.9.7 +pkgrel=1 +arch=('x86_64') +url="http://jackaudio.org/" +backup=(etc/security/limits.d/99-audio.conf) +license=('GPL') +makedepends=('python2' 'libffado' 'libsamplerate' 'celt' + 'doxygen' 'gcc-multilib' 'lib32-dbus-core') +source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tar.bz2" + '99-audio.conf' + '40-hpet-permissions.rules') +md5sums=('9759670feecbd43eeccf1c0f743ec199' + 'ae65b7c9ebe0fff6c918ba9d97ae342d' + '471aad533ff56c5d3cbbf65ce32cadef') + +_pyfix() { + sed -i 's:bin/env python:bin/env python2:' \ + "$pkgdir/usr/bin/jack_control" +} + +_wafconf() { + python2 waf configure --prefix=/usr \ + --alsa \ + --firewire \ + --mixed \ + --doxygen $@ +} + +_isbuild() { + printf "%s\n" ${pkgname[@]} | grep -qx $1 +} + +_mklinks() { + ln -s /usr/lib32/libjack.so.0.1.0 "$pkgdir/usr/lib32/libjack.so.0" + ln -s /usr/lib32/libjack.so.0 "$pkgdir/usr/lib32/libjack.so" +} + +build() { + cd "$srcdir" + + # fix doxygen building + sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript + + # we may do 2 different builds + cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver + + # mixed dbus/classic build + if _isbuild jack2-multilib; then + cd $_tarname-$pkgver + msg2 "Running Mixed D-Bus/Classic build" + _wafconf --classic --dbus + python2 waf build $MAKEFLAGS + cd .. + fi + + # dbus-ONLY build + if _isbuild jack2-dbus-multilib; then + cd $_tarname-dbus-$pkgver + msg2 "Running D-Bus-only build" + _wafconf --dbus + python2 waf build $MAKEFLAGS + cd .. + fi +} + +package_jack2-multilib() { + ! _isbuild jack2-multilib && return 0 + + pkgdesc="The next-generation JACK with SMP support & mixed mode" + depends=('libsamplerate' 'gcc-libs-multilib') + optdepends=('libffado: FireWire support' + 'celt: NetJACK2 driver' + 'lib32-dbus-core: jackdbus' + 'python2: jack_control') + conflicts=('jack' 'jack2' 'lib32-jack') + provides=('jack' 'jack2' 'lib32-jack' 'jackmp' + 'jackdmp' 'jackdbus' 'lib32-jack2') + + cd "$srcdir/$_tarname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + # fix for major python transition + _pyfix + + # configure realtime access/scheduling + # see https://bugs.archlinux.org/task/26343 + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + + # should be done by upstream + # see http://trac.jackaudio.org/ticket/200 + _mklinks +} + +package_jack2-dbus-multilib() { + ! _isbuild jack2-dbus-multilib && return 0 + + pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)" + depends=('libsamplerate' 'lib32-dbus-core') + optdepends=('libffado: FireWire support' + 'celt: NetJACK2 driver' + 'python2: jack_control') + conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib') + provides=('jack' 'jack2' 'lib32-jack' 'jack2-multilib' + 'jackmp' 'jackdmp' 'jackdbus' 'lib32-jack2') + + cd "$srcdir/$_tarname-dbus-$pkgver" + + python2 waf install --destdir="$pkgdir" + + _pyfix + + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + + _mklinks +} + +# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-gettext/PKGBUILD b/multilib/lib32-gettext/PKGBUILD deleted file mode 100644 index 94f9b4aa5..000000000 --- a/multilib/lib32-gettext/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Joakim Hernberg <jhernberg at alchemy dot lu> -_pkgbasename=gettext -pkgname=lib32-$_pkgbasename -pkgver=0.18.1.1 -pkgrel=2 -pkgdesc="GNU internationalization library (32-bit)" -arch=('x86_64') -url="http://www.gnu.org/software/gettext/" -license=('GPL') -depends=('lib32-acl' $_pkgbasename) -makedepends=(gcc-multilib) -optdepends=('cvs: for autopoint tool') -options=(!libtool !docs) -source=(ftp://ftp.gnu.org/pub/gnu/gettext/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('3dd55b952826d2b32f51308f2f91aa89') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c - ./configure --prefix=/usr --enable-csharp --libdir=/usr/lib32 - make -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# make check -#} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/{bin,include,share} -} diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD deleted file mode 100644 index 7e9d8b5fe..000000000 --- a/multilib/nspluginwrapper/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 60061 2011-12-04 15:24:45Z bluewind $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -pkgname=nspluginwrapper -pkgver=1.4.4 -pkgrel=2 -pkgdesc="Cross-platform NPAPI compatible plugin viewer" -arch=('i686' 'x86_64') -url="http://nspluginwrapper.davidben.net/" -license=('GPL') -depends=( - 'curl' - 'libxt' 'lib32-libxt' - 'gcc-libs' 'lib32-gcc-libs' - 'gtk2' 'lib32-gtk2' -) -makedepends=('gcc-multilib') -install="install" -source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz) -md5sums=('36f3e290fc4ce56f65ee695078961188') - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -fi - -build() { - cd "$srcdir/$pkgname-$pkgver" - - configure_args="" - if [[ $CARCH == x86_64 ]]; then - configure_args="$configure_args --with-lib32=lib32 --with-lib64=lib" - fi - - ./configure $configure_args - make -j1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make -j1 DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/kadu/PKGBUILD b/staging/kadu/PKGBUILD new file mode 100644 index 000000000..9f3f341ab --- /dev/null +++ b/staging/kadu/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 57137 2011-10-22 11:15:09Z bpiotrowski $ +# Maintainer: Mateusz Herych +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> + +pkgname=kadu +pkgver=0.10.1 +pkgrel=2 +pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" +arch=('i686' 'x86_64') +url="http://www.kadu.net/" +license=('GPL') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit') +makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') +source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) +md5sums=('6211a9a9e02d645268cbf055892601a0') + +build() { + cd $srcdir/kadu-$pkgver + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/kadu-$pkgver + make DESTDIR=$pkgdir install + rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} + rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} +} diff --git a/testing/kdevplatform/PKGBUILD b/testing/kdevplatform/PKGBUILD new file mode 100644 index 000000000..75e543a98 --- /dev/null +++ b/testing/kdevplatform/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 144746 2011-12-08 09:39:48Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=kdevplatform +pkgver=1.2.3 +_pkgver=4.2.3 +pkgrel=2 +pkgdesc="A C/C++ development platform for KDE" +arch=('i686' 'x86_64') +url="http://www.kdevelop.org/" +license=('GPL') +depends=('kdelibs''subversion' 'qjson') +optdepends=("kdesdk-kompare: difference checking") +makedepends=('cmake' 'automoc4' 'boost') +install=${pkgname}.install +source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'subversion17.patch') +sha1sums=('c8badd157c2477b1b299403d01d40f68a1ba14cd' + '08e2ab2005a7a447f1733e8449a9bc926035fb9e') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/subversion17.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/kdevplatform/kdevplatform.install b/testing/kdevplatform/kdevplatform.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/kdevplatform/kdevplatform.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdevplatform/subversion17.patch b/testing/kdevplatform/subversion17.patch new file mode 100644 index 000000000..782ac38ea --- /dev/null +++ b/testing/kdevplatform/subversion17.patch @@ -0,0 +1,127 @@ +commit 74dec52749e3c3af2ac6492f50e2676128f35b27 +Author: Milian Wolff <mail@milianw.de> +Date: Fri Nov 18 16:26:06 2011 +0100 + + fix svn api usage: use svn_dirent_canonicalize instead of svn_path_internal_style + + this was suggested by Stephan Sperling + + CCBUG: 284061 + +diff --git a/plugins/subversion/kdevsvncpp/path.cpp b/plugins/subversion/kdevsvncpp/path.cpp +index eaa84c1..4dced08 100644 +--- a/plugins/subversion/kdevsvncpp/path.cpp ++++ b/plugins/subversion/kdevsvncpp/path.cpp +@@ -24,6 +24,7 @@ + + // subversion api + #include "svn_path.h" ++#include "svn_dirent_uri.h" + + // apr api + #include "apr_file_io.h" +@@ -63,8 +64,7 @@ namespace svn + m_path = ""; + else + { +- const char * int_path = +- svn_path_internal_style(path, pool.pool()); ++ const char * int_path = svn_dirent_canonicalize(path, pool); + + m_path = int_path; + +commit cc7f0798d314cdac14b90e427abe22e99c6bd591 +Author: Milian Wolff <mail@milianw.de> +Date: Fri Nov 18 16:23:36 2011 +0100 + + properly initialize client context for compatibility with subversion API + + this should hopefully fix the crash with svn 1.7 in kdevelop, please test + + BUG: 284061 + +diff --git a/plugins/subversion/kdevsvncpp/context.cpp b/plugins/subversion/kdevsvncpp/context.cpp +index d277591..ddbb657 100644 +--- a/plugins/subversion/kdevsvncpp/context.cpp ++++ b/plugins/subversion/kdevsvncpp/context.cpp +@@ -65,7 +65,7 @@ public: + bool logIsSet; + int promptCounter; + Pool pool; +- svn_client_ctx_t ctx; ++ svn_client_ctx_t * ctx; + std::string username; + std::string password; + std::string logMessage; +@@ -205,26 +205,26 @@ public: + svn_auth_open(&ab, providers, pool); + + // initialize ctx structure +- memset(&ctx, 0, sizeof(ctx)); ++ svn_client_create_context(&ctx, pool); + + // get the config based on the configDir passed in +- svn_config_get_config(&ctx.config, c_configDir, pool); ++ svn_config_get_config(&ctx->config, c_configDir, pool); + + // tell the auth functions where the config is + svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR, + c_configDir); + +- ctx.auth_baton = ab; +- ctx.log_msg_func = onLogMsg; +- ctx.log_msg_baton = this; +- ctx.notify_func = onNotify; +- ctx.notify_baton = this; +- ctx.cancel_func = onCancel; +- ctx.cancel_baton = this; ++ ctx->auth_baton = ab; ++ ctx->log_msg_func = onLogMsg; ++ ctx->log_msg_baton = this; ++ ctx->notify_func = onNotify; ++ ctx->notify_baton = this; ++ ctx->cancel_func = onCancel; ++ ctx->cancel_baton = this; + + #if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 2) +- ctx.notify_func2 = onNotify2; +- ctx.notify_baton2 = this; ++ ctx->notify_func2 = onNotify2; ++ ctx->notify_baton2 = this; + #endif + } + +@@ -234,7 +234,7 @@ public: + if (!value) + param = (void *)"1"; + +- svn_auth_set_parameter(ctx.auth_baton, ++ svn_auth_set_parameter(ctx->auth_baton, + SVN_AUTH_PARAM_NO_AUTH_CACHE, + param); + } +@@ -245,7 +245,7 @@ public: + username = usr; + password = pwd; + +- svn_auth_baton_t * ab = ctx.auth_baton; ++ svn_auth_baton_t * ab = ctx->auth_baton; + svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME, + username.c_str()); + svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD, +@@ -654,13 +654,13 @@ public: + + Context::operator svn_client_ctx_t * () + { +- return &(m->ctx); ++ return m->ctx; + } + + svn_client_ctx_t * + Context::ctx() + { +- return &(m->ctx); ++ return m->ctx; + } + + void diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD new file mode 100644 index 000000000..9cbe8c3d7 --- /dev/null +++ b/testing/krb5/PKGBUILD @@ -0,0 +1,90 @@ +# $Id: PKGBUILD 144605 2011-12-07 21:28:52Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=krb5 +pkgver=1.9.2 +pkgrel=2 +pkgdesc="The Kerberos network authentication system" +arch=('i686' 'x86_64') +url="http://web.mit.edu/kerberos/" +license=('custom') +depends=('e2fsprogs' 'libldap' 'keyutils') +makedepends=('perl') +provides=('heimdal') +replaces=('heimdal') +conflicts=('heimdal') +backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar + krb5-kadmind + krb5-kdc + krb5-kpropd + krb5-1.9.1-config-script.patch + krb5-1.9.1-2011-007.patch) +sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' + '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' + '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' + '7f402078fa65bb9ff1beb6cbbbb017450df78560' + '7342410760cf44bfa01bb99bb4c49e12496cb46f' + 'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7') +options=('!emptydirs') + +build() { + tar zxvf ${pkgname}-${pkgver}.tar.gz + cd "${srcdir}/${pkgname}-${pkgver}/src" + + # - Make krb5-config suppress CFLAGS output when called with --libs + # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391 + # + # - Omit extra libraries because their interfaces are not exposed to applications + # by libkrb5, unless do_deps is set to 1, which indicates that the caller + # wants the whole list. + # + # Patch from upstream : + # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 + patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch + + # Apply upstream patch to fix a null pointer dereference when processing TGS requests + # CVE-2011-1530 + # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt + patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch + + # FS#25384 + sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" + export CPPFLAGS+=" -I/usr/include/et" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --localstatedir=/var/lib \ + --enable-shared \ + --with-system-et \ + --with-system-ss \ + --disable-rpath \ + --without-tcl \ + --enable-dns-for-realm \ + --with-ldap + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/src" + make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install + + # Sample KDC config file + install -dm 755 "${pkgdir}"/var/lib/krb5kdc + install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf + + # Default configuration file + install -dm 755 "${pkgdir}"/etc + install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf + + install -dm 755 "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kpropd "${pkgdir}"/etc/rc.d + + install -dm 755 "${pkgdir}"/usr/share/aclocal + install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal + + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/krb5/krb5-1.9.1-2011-007.patch b/testing/krb5/krb5-1.9.1-2011-007.patch new file mode 100644 index 000000000..336a4ad31 --- /dev/null +++ b/testing/krb5/krb5-1.9.1-2011-007.patch @@ -0,0 +1,40 @@ +diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in +index f46cad3..102fbaa 100644 +--- a/src/kdc/Makefile.in ++++ b/src/kdc/Makefile.in +@@ -67,6 +67,7 @@ check-unix:: rtest + + check-pytests:: + $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS) ++ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS) + + install:: + $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc +diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c +index c169c54..840a2ef 100644 +--- a/src/kdc/do_tgs_req.c ++++ b/src/kdc/do_tgs_req.c +@@ -243,7 +243,8 @@ tgt_again: + if (!tgs_1 || !data_eq(*server_1, *tgs_1)) { + errcode = find_alternate_tgs(request, &server); + firstpass = 0; +- goto tgt_again; ++ if (errcode == 0) ++ goto tgt_again; + } + } + status = "UNKNOWN_SERVER"; +diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py +new file mode 100644 +index 0000000..1760bcd +--- /dev/null ++++ b/src/kdc/t_emptytgt.py +@@ -0,0 +1,8 @@ ++#!/usr/bin/python ++from k5test import * ++ ++realm = K5Realm(start_kadmind=False, create_host=False) ++output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1) ++if 'not found in Kerberos database' not in output: ++ fail('TGT lookup for empty realm failed in unexpected way') ++success('Empty tgt lookup.') diff --git a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch new file mode 100644 index 000000000..e5a38498f --- /dev/null +++ b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch @@ -0,0 +1,58 @@ +diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c +--- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c 2011-02-09 16:55:36.000000000 -0500 ++++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c 2011-09-26 18:42:01.465190278 -0400 +@@ -470,13 +470,10 @@ + + /***** STATE_REFERRALS *****/ + +-/* +- * Possibly retry a request in the fallback realm after a referral request +- * failure in the local realm. Expects ctx->reply_code to be set to the error +- * from a referral request. +- */ ++/* Possibly try a non-referral request after a referral request failure. ++ * Expects ctx->reply_code to be set to the error from a referral request. */ + static krb5_error_code +-try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx) ++try_fallback(krb5_context context, krb5_tkt_creds_context ctx) + { + krb5_error_code code; + char **hrealms; +@@ -485,9 +482,10 @@ + if (ctx->referral_count > 1) + return ctx->reply_code; + +- /* Only fall back if the original request used the referral realm. */ ++ /* If the request used a specified realm, make a non-referral request to ++ * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */ + if (!krb5_is_referral_realm(&ctx->req_server->realm)) +- return ctx->reply_code; ++ return begin_non_referral(context, ctx); + + if (ctx->server->length < 2) { + /* We need a type/host format principal to find a fallback realm. */ +@@ -500,10 +498,10 @@ + if (code != 0) + return code; + +- /* Give up if the fallback realm isn't any different. */ ++ /* If the fallback realm isn't any different, use the existing TGT. */ + if (data_eq_string(ctx->server->realm, hrealms[0])) { + krb5_free_host_realm(context, hrealms); +- return ctx->reply_code; ++ return begin_non_referral(context, ctx); + } + + /* Rewrite server->realm to be the fallback realm. */ +@@ -540,9 +538,9 @@ + krb5_error_code code; + const krb5_data *referral_realm; + +- /* Possibly retry with the fallback realm on error. */ ++ /* Possibly try a non-referral fallback request on error. */ + if (ctx->reply_code != 0) +- return try_fallback_realm(context, ctx); ++ return try_fallback(context, ctx); + + if (krb5_principal_compare(context, ctx->reply_creds->server, + ctx->server)) { diff --git a/testing/krb5/krb5-1.9.1-config-script.patch b/testing/krb5/krb5-1.9.1-config-script.patch new file mode 100644 index 000000000..a72a75edf --- /dev/null +++ b/testing/krb5/krb5-1.9.1-config-script.patch @@ -0,0 +1,27 @@ +diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in +--- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500 ++++ krb5-1.9.1/src/krb5-config.in 2011-09-26 18:27:09.018487087 -0400 +@@ -186,7 +186,7 @@ + -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ + -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ +- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` ++ -e 's#\$(CFLAGS)##'` + + if test $library = 'kdb'; then + lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB" +@@ -214,9 +214,13 @@ + fi + + if test $library = 'krb5'; then +- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB" ++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err" + fi + ++ # If we ever support a flag to generate output suitable for static ++ # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB" ++ # here. ++ + echo $lib_flags + fi + diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind new file mode 100644 index 000000000..04df0dcff --- /dev/null +++ b/testing/krb5/krb5-kadmind @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kadmind` +case "$1" in + start) + stat_busy "Starting Kerberos Admin Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kadmind + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kadmind + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Admin Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kadmind + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc new file mode 100644 index 000000000..05a03411e --- /dev/null +++ b/testing/krb5/krb5-kdc @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/krb5kdc` +case "$1" in + start) + stat_busy "Starting Kerberos Authentication" + if [ -z "$PID" ]; then + /usr/sbin/krb5kdc + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kdc + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Authentication" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kdc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kpropd b/testing/krb5/krb5-kpropd new file mode 100644 index 000000000..a0077d68e --- /dev/null +++ b/testing/krb5/krb5-kpropd @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kpropd` +case "$1" in + start) + stat_busy "Starting Kerberos Database Propagation Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kpropd -S + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon kpropd + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Database Propagation Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kpropd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 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..91583d99a --- /dev/null +++ b/testing/libdrm/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 144601 2011-12-07 17:32:22Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libdrm +pkgver=2.4.28 +pkgrel=1 +pkgdesc="Userspace interface to kernel DRM services" +arch=(i686 x86_64) +license=('custom') +depends=('glibc' 'libpciaccess') +makedepends=('cairo') +options=('!libtool') +url="http://dri.freedesktop.org/" +source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + no-pthread-stubs.patch + COPYING + git_fixes.diff + #missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538 + rbo.h list.h) +md5sums=('6488f64119c6439fa4038e9cd7b30b67' + 'c722c8406507b7e3a8da7a3030d1d9cf' + 'ba65e71c481b94ef0fb6c23c7f21ffa1' + '671b87f9670e709e54a19cd292c6330d' + '073846ea43fb4d6130062c1897d92e40' + 'ce867d3331862c2b87d1a37461b42dbe') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" + + # add a missing file in the release tarball + patch -Np1 -i ${srcdir}/git_fixes.diff + cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/ + + #libtoolize --force + autoreconf --force --install + ./configure --prefix=/usr \ + --enable-udev \ + --enable-intel \ + --enable-radeon \ + --enable-vmwgfx-experimental-api \ + --enable-nouveau-experimental-api + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -k check +} + +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/git_fixes.diff b/testing/libdrm/git_fixes.diff new file mode 100644 index 000000000..5ebcb606a --- /dev/null +++ b/testing/libdrm/git_fixes.diff @@ -0,0 +1,19 @@ +From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 05 Dec 2011 21:24:48 +0000 +Subject: test/radeon: add missing files for dist + +--- +diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am +index 021ca72..1775669 100644 +--- a/tests/radeon/Makefile.am ++++ b/tests/radeon/Makefile.am +@@ -9,4 +9,6 @@ noinst_PROGRAMS = \ + + radeon_ttm_SOURCES = \ + rbo.c \ ++ rbo.h \ ++ list.h \ + radeon_ttm.c +-- +cgit v0.9.0.2-2-gbebe diff --git a/testing/libdrm/list.h b/testing/libdrm/list.h new file mode 100644 index 000000000..305c903e1 --- /dev/null +++ b/testing/libdrm/list.h @@ -0,0 +1,137 @@ +/* + * + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA. + * 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, 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 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 + * THE COPYRIGHT HOLDERS, AUTHORS 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. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + */ + +/** + * \file + * List macros heavily inspired by the Linux kernel + * list handling. No list looping yet. + * + * Is not threadsafe, so common operations need to + * be protected using an external mutex. + */ +#ifndef _U_DOUBLE_LIST_H_ +#define _U_DOUBLE_LIST_H_ + +#include <stddef.h> + +struct list_head +{ + struct list_head *prev; + struct list_head *next; +}; + +static void list_inithead(struct list_head *item) +{ + item->prev = item; + item->next = item; +} + +static void list_add(struct list_head *item, struct list_head *list) +{ + item->prev = list; + item->next = list->next; + list->next->prev = item; + list->next = item; +} + +static void list_addtail(struct list_head *item, struct list_head *list) +{ + item->next = list; + item->prev = list->prev; + list->prev->next = item; + list->prev = item; +} + +static void list_replace(struct list_head *from, struct list_head *to) +{ + to->prev = from->prev; + to->next = from->next; + from->next->prev = to; + from->prev->next = to; +} + +static void list_del(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; +} + +static void list_delinit(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; + item->next = item; + item->prev = item; +} + +#define LIST_INITHEAD(__item) list_inithead(__item) +#define LIST_ADD(__item, __list) list_add(__item, __list) +#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list) +#define LIST_REPLACE(__from, __to) list_replace(__from, __to) +#define LIST_DEL(__item) list_del(__item) +#define LIST_DELINIT(__item) list_delinit(__item) + +#define LIST_ENTRY(__type, __item, __field) \ + ((__type *)(((char *)(__item)) - offsetof(__type, __field))) + +#define LIST_IS_EMPTY(__list) \ + ((__list)->next == (__list)) + +#ifndef container_of +#define container_of(ptr, sample, member) \ + (void *)((char *)(ptr) \ + - ((char *)&(sample)->member - (char *)(sample))) +#endif + +#define LIST_FOR_EACH_ENTRY(pos, head, member) \ + for (pos = container_of((head)->next, pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member) \ + for (pos = container_of((head)->next, pos, member), \ + storage = container_of(pos->member.next, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.next, storage, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member) \ + for (pos = container_of((head)->prev, pos, member), \ + storage = container_of(pos->member.prev, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.prev, storage, member)) + +#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.prev, pos, member)) + +#endif /*_U_DOUBLE_LIST_H_*/ 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/libdrm/rbo.h b/testing/libdrm/rbo.h new file mode 100644 index 000000000..c25c73a4c --- /dev/null +++ b/testing/libdrm/rbo.h @@ -0,0 +1,50 @@ +/* + * Copyright © 2011 Red Hat + * + * 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 + * THE AUTHORS OR COPYRIGHT HOLDERS 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. + * + * Authors: + * Jerome Glisse <j.glisse@gmail.com> + */ +#ifndef RBO_H +#define RBO_H + +#include "list.h" + +struct rbo { + struct list_head list; + int fd; + unsigned refcount; + unsigned mapcount; + unsigned handle; + unsigned size; + unsigned alignment; + void *data; +}; + +struct rbo *rbo(int fd, unsigned handle, unsigned size, + unsigned alignment, void *ptr); +int rbo_map(struct rbo *bo); +void rbo_unmap(struct rbo *bo); +struct rbo *rbo_incref(struct rbo *bo); +struct rbo *rbo_decref(struct rbo *bo); +int rbo_wait(struct rbo *bo); + +#endif diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD new file mode 100644 index 000000000..9d587905d --- /dev/null +++ b/testing/subversion/PKGBUILD @@ -0,0 +1,79 @@ +# $Id: PKGBUILD 144461 2011-12-06 07:12:44Z eric $ +# Maintainer: Paul Mattal <paul@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=subversion +pkgver=1.7.2 +pkgrel=1 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +license=('APACHE') +depends=('neon' 'apr-util' 'sqlite3' 'file') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ + 'python2: for some hook scripts' 'ruby: for some hook scripts') +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +url="http://subversion.apache.org/" +provides=('svn') +options=('!makeflags' '!libtool') +source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} + svnserve svn svnserve.conf svnmerge.py + subversion.rpath.fix.patch) +sha1sums=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb' + '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae' + '64ba3e6ebafc08ac62f59d788f7a825fdce69573' + '73b36c046c09cec2093354911c89e3ba8056af6c' + 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' + 'd240228e5755495c26e89d7ef47a75fb097dd040' + '3d1e28408a9abb42af2e531adc0d01ce21acfad6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export PYTHON=/usr/bin/python2 + + patch -p0 -i ../subversion.rpath.fix.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py + + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ + --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \ + --enable-javahl --with-gnome-keyring --with-kwallet + + make external-all + make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all + make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb +#} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH + make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ + swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ + install install-swig-py install-swig-pl install-javahl # install-swig-rb + + install -d "${pkgdir}"/usr/share/subversion + cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ + rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in + + rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist + rm -rf "${pkgdir}"/usr/lib/perl5/core_perl + + install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve + install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn + install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve + install -m 755 "${srcdir}"/svnmerge.py "${pkgdir}"/usr/bin/svnmerge + + # bash completion + install -Dm 644 tools/client-side/bash_completion \ + "${pkgdir}"/etc/bash_completion.d/subversion +} diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch new file mode 100644 index 000000000..ba6ee9e4e --- /dev/null +++ b/testing/subversion/subversion.rpath.fix.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 ++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 +@@ -678,6 +678,7 @@ + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile diff --git a/testing/subversion/svn b/testing/subversion/svn new file mode 100644 index 000000000..8988aaf63 --- /dev/null +++ b/testing/subversion/svn @@ -0,0 +1,11 @@ +service svn +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/bin/svnserve + server_args = -i + log_on_failure += USERID + disable = yes +} diff --git a/testing/subversion/svnmerge.py b/testing/subversion/svnmerge.py new file mode 100644 index 000000000..d8931648f --- /dev/null +++ b/testing/subversion/svnmerge.py @@ -0,0 +1,2370 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- +# Copyright (c) 2005, Giovanni Bajo +# Copyright (c) 2004-2005, Awarix, Inc. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +# +# Author: Archie Cobbs <archie at awarix dot com> +# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com> +# +# Acknowledgments: +# John Belmonte <john at neggie dot net> - metadata and usability +# improvements +# Blair Zajac <blair at orcaware dot com> - random improvements +# Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive +# merging support +# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple +# location identifier formats +# +# $HeadURL$ +# $LastChangedDate$ +# $LastChangedBy$ +# $LastChangedRevision$ +# +# Requisites: +# svnmerge.py has been tested with all SVN major versions since 1.1 (both +# client and server). It is unknown if it works with previous versions. +# +# Differences from svnmerge.sh: +# - More portable: tested as working in FreeBSD and OS/2. +# - Add double-verbose mode, which shows every svn command executed (-v -v). +# - "svnmerge avail" now only shows commits in source, not also commits in +# other parts of the repository. +# - Add "svnmerge block" to flag some revisions as blocked, so that +# they will not show up anymore in the available list. Added also +# the complementary "svnmerge unblock". +# - "svnmerge avail" has grown two new options: +# -B to display a list of the blocked revisions +# -A to display both the blocked and the available revisions. +# - Improved generated commit message to make it machine parsable even when +# merging commits which are themselves merges. +# - Add --force option to skip working copy check +# - Add --record-only option to "svnmerge merge" to avoid performing +# an actual merge, yet record that a merge happened. +# - Can use a variety of location-identifier formats +# +# TODO: +# - Add "svnmerge avail -R": show logs in reverse order +# +# Information for Hackers: +# +# Identifiers for branches: +# A branch is identified in three ways within this source: +# - as a working copy (variable name usually includes 'dir') +# - as a fully qualified URL +# - as a path identifier (an opaque string indicating a particular path +# in a particular repository; variable name includes 'pathid') +# A "target" is generally user-specified, and may be a working copy or +# a URL. + +import sys, os, getopt, re, types, tempfile, time, locale +from bisect import bisect +from xml.dom import pulldom + +NAME = "svnmerge" +if not hasattr(sys, "version_info") or sys.version_info < (2, 0): + error("requires Python 2.0 or newer") + +# Set up the separator used to separate individual log messages from +# each revision merged into the target location. Also, create a +# regular expression that will find this same separator in already +# committed log messages, so that the separator used for this run of +# svnmerge.py will have one more LOG_SEPARATOR appended to the longest +# separator found in all the commits. +LOG_SEPARATOR = 8 * '.' +LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR), + re.MULTILINE) + +# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX. +LOG_LINE_PREFIX = 2 * ' ' + +# Set python to the default locale as per environment settings, same as svn +# TODO we should really parse config and if log-encoding is specified, set +# the locale to match that encoding +locale.setlocale(locale.LC_ALL, '') + +# We want the svn output (such as svn info) to be non-localized +# Using LC_MESSAGES should not affect localized output of svn log, for example +if os.environ.has_key("LC_ALL"): + del os.environ["LC_ALL"] +os.environ["LC_MESSAGES"] = "C" + +############################################################################### +# Support for older Python versions +############################################################################### + +# True/False constants are Python 2.2+ +try: + True, False +except NameError: + True, False = 1, 0 + +def lstrip(s, ch): + """Replacement for str.lstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + i = 0 + try: + while s[i] == ch: + i = i+1 + return s[i:] + except IndexError: + return "" + +def rstrip(s, ch): + """Replacement for str.rstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + try: + if s[-1] != ch: + return s + i = -2 + while s[i] == ch: + i = i-1 + return s[:i+1] + except IndexError: + return "" + +def strip(s, ch): + """Replacement for str.strip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + return lstrip(rstrip(s, ch), ch) + +def rsplit(s, sep, maxsplits=0): + """Like str.rsplit, which is Python 2.4+ only.""" + L = s.split(sep) + if not 0 < maxsplits <= len(L): + return L + return [sep.join(L[0:-maxsplits])] + L[-maxsplits:] + +############################################################################### + +def kwextract(s): + """Extract info from a svn keyword string.""" + try: + return strip(s, "$").strip().split(": ")[1] + except IndexError: + return "<unknown>" + +__revision__ = kwextract('$Rev$') +__date__ = kwextract('$Date$') + +# Additional options, not (yet?) mapped to command line flags +default_opts = { + "svn": "svn", + "prop": NAME + "-integrated", + "block-prop": NAME + "-blocked", + "commit-verbose": True, + "verbose": 0, +} +logs = {} + +def console_width(): + """Get the width of the console screen (if any).""" + try: + return int(os.environ["COLUMNS"]) + except (KeyError, ValueError): + pass + + try: + # Call the Windows API (requires ctypes library) + from ctypes import windll, create_string_buffer + h = windll.kernel32.GetStdHandle(-11) + csbi = create_string_buffer(22) + res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi) + if res: + import struct + (bufx, bufy, + curx, cury, wattr, + left, top, right, bottom, + maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw) + return right - left + 1 + except ImportError: + pass + + # Parse the output of stty -a + if os.isatty(1): + out = os.popen("stty -a").read() + m = re.search(r"columns (\d+);", out) + if m: + return int(m.group(1)) + + # sensible default + return 80 + +def error(s): + """Subroutine to output an error and bail.""" + print >> sys.stderr, "%s: %s" % (NAME, s) + sys.exit(1) + +def report(s): + """Subroutine to output progress message, unless in quiet mode.""" + if opts["verbose"]: + print "%s: %s" % (NAME, s) + +def prefix_lines(prefix, lines): + """Given a string representing one or more lines of text, insert the + specified prefix at the beginning of each line, and return the result. + The input must be terminated by a newline.""" + assert lines[-1] == "\n" + return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n" + +def recode_stdout_to_file(s): + if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \ + or sys.stdout.encoding is None: + return s + u = s.decode(sys.stdout.encoding) + return u.encode(locale.getdefaultlocale()[1]) + +class LaunchError(Exception): + """Signal a failure in execution of an external command. Parameters are the + exit code of the process, the original command line, and the output of the + command.""" + +try: + """Launch a sub-process. Return its output (both stdout and stderr), + optionally split by lines (if split_lines is True). Raise a LaunchError + exception if the exit code of the process is non-zero (failure). + + This function has two implementations, one based on subprocess (preferred), + and one based on popen (for compatibility). + """ + import subprocess + import shlex + + def launch(cmd, split_lines=True): + # Requiring python 2.4 or higher, on some platforms we get + # much faster performance from the subprocess module (where python + # doesn't try to close an exhorbitant number of file descriptors) + stdout = "" + stderr = "" + try: + if os.name == 'nt': + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + else: + # Use shlex to break up the parameters intelligently, + # respecting quotes. shlex can't handle unicode. + args = shlex.split(cmd.encode('ascii')) + p = subprocess.Popen(args, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + stdoutAndErr = p.communicate() + stdout = stdoutAndErr[0] + stderr = stdoutAndErr[1] + except OSError, inst: + # Using 1 as failure code; should get actual number somehow? For + # examples see svnmerge_test.py's TestCase_launch.test_failure and + # TestCase_launch.test_failurecode. + raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst)) + + if p.returncode == 0: + if split_lines: + # Setting keepends=True for compatibility with previous logic + # (where file.readlines() preserves newlines) + return stdout.splitlines(True) + else: + return stdout + else: + raise LaunchError(p.returncode, cmd, stdout + stderr) +except ImportError: + # support versions of python before 2.4 (slower on some systems) + def launch(cmd, split_lines=True): + if os.name not in ['nt', 'os2']: + import popen2 + p = popen2.Popen4(cmd) + p.tochild.close() + if split_lines: + out = p.fromchild.readlines() + else: + out = p.fromchild.read() + ret = p.wait() + if ret == 0: + ret = None + else: + ret >>= 8 + else: + i,k = os.popen4(cmd) + i.close() + if split_lines: + out = k.readlines() + else: + out = k.read() + ret = k.close() + + if ret is None: + return out + raise LaunchError(ret, cmd, out) + +def launchsvn(s, show=False, pretend=False, **kwargs): + """Launch SVN and grab its output.""" + username = password = configdir = "" + if opts.get("username", None): + username = "--username=" + opts["username"] + if opts.get("password", None): + password = "--password=" + opts["password"] + if opts.get("config-dir", None): + configdir = "--config-dir=" + opts["config-dir"] + cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive", + username, password, configdir, s])) + if show or opts["verbose"] >= 2: + print cmd + if pretend: + return None + return launch(cmd, **kwargs) + +def svn_command(s): + """Do (or pretend to do) an SVN command.""" + out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"], + pretend=opts["dry-run"], + split_lines=False) + if not opts["dry-run"]: + print out + +def check_dir_clean(dir): + """Check the current status of dir for local mods.""" + if opts["force"]: + report('skipping status check because of --force') + return + report('checking status of "%s"' % dir) + + # Checking with -q does not show unversioned files or external + # directories. Though it displays a debug message for external + # directories, after a blank line. So, practically, the first line + # matters: if it's non-empty there is a modification. + out = launchsvn("status -q %s" % dir) + if out and out[0].strip(): + error('"%s" has local modifications; it must be clean' % dir) + +class PathIdentifier: + """Abstraction for a path identifier, so that we can start talking + about it before we know the form that it takes in the properties (its + external_form). Objects are referenced in the class variable 'locobjs', + keyed by all known forms.""" + + # a map of UUID (or None) to repository root URL. + repo_hints = {} + + # a map from any known string form to the corresponding PathIdentifier + locobjs = {} + + def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None): + self.repo_relative_path = repo_relative_path + self.uuid = uuid + self.url = url + self.external_form = external_form + + def __repr__(self): + return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>' + + def __str__(self): + """Return a printable string representation""" + if self.external_form: + return self.external_form + if self.url: + return self.format('url') + if self.uuid: + return self.format('uuid') + return self.format('path') + + def from_pathid(pathid_str): + """convert pathid_str to a PathIdentifier""" + if not PathIdentifier.locobjs.has_key(pathid_str): + if is_url(pathid_str): + # we can determine every form; PathIdentifier.hint knows how to do that + PathIdentifier.hint(pathid_str) + elif pathid_str[:7] == 'uuid://': + mo = re.match('uuid://([^/]*)(.*)', pathid_str) + if not mo: + error("Invalid path identifier '%s'" % pathid_str) + uuid, repo_relative_path = mo.groups() + pathid = PathIdentifier(repo_relative_path, uuid=uuid) + # we can cache this by uuid:// pathid and by repo-relative path + PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid + elif pathid_str and pathid_str[0] == '/': + # strip any trailing slashes + pathid_str = pathid_str.rstrip('/') + pathid = PathIdentifier(repo_relative_path=pathid_str) + # we can only cache this by repo-relative path + PathIdentifier.locobjs[pathid_str] = pathid + else: + error("Invalid path identifier '%s'" % pathid_str) + return PathIdentifier.locobjs[pathid_str] + from_pathid = staticmethod(from_pathid) + + def from_target(target): + """Convert a target (either a working copy path or an URL) into a + path identifier.""" + # prime the cache first if we don't know about this target yet + if not PathIdentifier.locobjs.has_key(target): + PathIdentifier.hint(target) + + try: + return PathIdentifier.locobjs[target] + except KeyError: + error("Could not recognize path identifier '%s'" % target) + from_target = staticmethod(from_target) + + def hint(target): + """Cache some information about target, as it may be referenced by + repo-relative path in subversion properties; the cache can help to + expand such a relative path to a full path identifier.""" + if PathIdentifier.locobjs.has_key(target): return + if not is_url(target) and not is_wc(target): return + + url = target_to_url(target) + + root = get_repo_root(url) + assert root[-1] != "/" + assert url[:len(root)] == root, "url=%r, root=%r" % (url, root) + repo_relative_path = url[len(root):] + + try: + uuid = get_svninfo(target)['Repository UUID'] + uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path) + except KeyError: + uuid = None + uuid_pathid = None + + locobj = PathIdentifier.locobjs.get(url) or \ + (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid)) + if not locobj: + locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url) + + PathIdentifier.repo_hints[uuid] = root # (uuid may be None) + + PathIdentifier.locobjs[target] = locobj + PathIdentifier.locobjs[url] = locobj + if uuid_pathid: + PathIdentifier.locobjs[uuid_pathid] = locobj + if not PathIdentifier.locobjs.has_key(repo_relative_path): + PathIdentifier.locobjs[repo_relative_path] = locobj + hint = staticmethod(hint) + + def format(self, fmt): + if fmt == 'path': + return self.repo_relative_path + elif fmt == 'uuid': + return "uuid://%s%s" % (self.uuid, self.repo_relative_path) + elif fmt == 'url': + return self.url + else: + error("Unkonwn path type '%s'" % fmt) + + def match_substring(self, str): + """Test whether str is a substring of any representation of this + PathIdentifier.""" + if self.repo_relative_path.find(str) >= 0: + return True + + if self.uuid: + if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0: + return True + + if self.url: + if (self.url + self.repo_relative_path).find(str) >= 0: + return True + + return False + + def get_url(self): + """Convert a pathid into a URL. If this is not possible, error out.""" + if self.url: + return self.url + # if we have a uuid and happen to know the URL for it, use that + elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid): + self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + return self.url + # if we've only seen one rep, use that (a guess, but an educated one) + elif not self.uuid and len(PathIdentifier.repo_hints) == 1: + uuid, root = PathIdentifier.repo_hints.items()[0] + if uuid: + self.uuid = uuid + PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self + self.url = root + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + report("Guessing that '%s' refers to '%s'" % (self, self.url)) + return self.url + else: + error("Cannot determine URL for '%s'; " % self + + "Explicit source argument (-S/--source) required.\n") + +class RevisionLog: + """ + A log of the revisions which affected a given URL between two + revisions. + """ + + def __init__(self, url, begin, end, find_propchanges=False): + """ + Create a new RevisionLog object, which stores, in self.revs, a list + of the revisions which affected the specified URL between begin and + end. If find_propchanges is True, self.propchange_revs will contain a + list of the revisions which changed properties directly on the + specified URL. URL must be the URL for a directory in the repository. + """ + self.url = url + + # Setup the log options (--quiet, so we don't show log messages) + log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url) + if find_propchanges: + # The --verbose flag lets us grab merge tracking information + # by looking at propchanges + log_opts = "--verbose " + log_opts + + # Read the log to look for revision numbers and merge-tracking info + self.revs = [] + self.propchange_revs = [] + repos_pathid = PathIdentifier.from_target(url) + for chg in SvnLogParser(launchsvn("log %s" % log_opts, + split_lines=False)): + self.revs.append(chg.revision()) + for p in chg.paths(): + if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path: + self.propchange_revs.append(chg.revision()) + + # Save the range of the log + self.begin = int(begin) + if end == "HEAD": + # If end is not provided, we do not know which is the latest + # revision in the repository. So we set 'end' to the latest + # known revision. + self.end = self.revs[-1] + else: + self.end = int(end) + + self._merges = None + self._blocks = None + + def merge_metadata(self): + """ + Return a VersionedProperty object, with a cached view of the merge + metadata in the range of this log. + """ + + # Load merge metadata if necessary + if not self._merges: + self._merges = VersionedProperty(self.url, opts["prop"]) + self._merges.load(self) + + return self._merges + + def block_metadata(self): + if not self._blocks: + self._blocks = VersionedProperty(self.url, opts["block-prop"]) + self._blocks.load(self) + + return self._blocks + + +class VersionedProperty: + """ + A read-only, cached view of a versioned property. + + self.revs contains a list of the revisions in which the property changes. + self.values stores the new values at each corresponding revision. If the + value of the property is unknown, it is set to None. + + Initially, we set self.revs to [0] and self.values to [None]. This + indicates that, as of revision zero, we know nothing about the value of + the property. + + Later, if you run self.load(log), we cache the value of this property over + the entire range of the log by noting each revision in which the property + was changed. At the end of the range of the log, we invalidate our cache + by adding the value "None" to our cache for any revisions which fall out + of the range of our log. + + Once self.revs and self.values are filled, we can find the value of the + property at any arbitrary revision using a binary search on self.revs. + Once we find the last revision during which the property was changed, + we can lookup the associated value in self.values. (If the associated + value is None, the associated value was not cached and we have to do + a full propget.) + + An example: We know that the 'svnmerge' property was added in r10, and + changed in r21. We gathered log info up until r40. + + revs = [0, 10, 21, 40] + values = [None, "val1", "val2", None] + + What these values say: + - From r0 to r9, we know nothing about the property. + - In r10, the property was set to "val1". This property stayed the same + until r21, when it was changed to "val2". + - We don't know what happened after r40. + """ + + def __init__(self, url, name): + """View the history of a versioned property at URL with name""" + self.url = url + self.name = name + + # We know nothing about the value of the property. Setup revs + # and values to indicate as such. + self.revs = [0] + self.values = [None] + + # We don't have any revisions cached + self._initial_value = None + self._changed_revs = [] + self._changed_values = [] + + def load(self, log): + """ + Load the history of property changes from the specified + RevisionLog object. + """ + + # Get the property value before the range of the log + if log.begin > 1: + self.revs.append(log.begin-1) + try: + self._initial_value = self.raw_get(log.begin-1) + except LaunchError: + # The specified URL might not exist before the + # range of the log. If so, we can safely assume + # that the property was empty at that time. + self._initial_value = { } + self.values.append(self._initial_value) + else: + self._initial_value = { } + self.values[0] = self._initial_value + + # Cache the property values in the log range + old_value = self._initial_value + for rev in log.propchange_revs: + new_value = self.raw_get(rev) + if new_value != old_value: + self._changed_revs.append(rev) + self._changed_values.append(new_value) + self.revs.append(rev) + self.values.append(new_value) + old_value = new_value + + # Indicate that we know nothing about the value of the property + # after the range of the log. + if log.revs: + self.revs.append(log.end+1) + self.values.append(None) + + def raw_get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + return get_revlist_prop(self.url, self.name, rev) + + def get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + + if rev is not None: + + # Find the index using a binary search + i = bisect(self.revs, rev) - 1 + + # Return the value of the property, if it was cached + if self.values[i] is not None: + return self.values[i] + + # Get the current value of the property + return self.raw_get(rev) + + def changed_revs(self, key=None): + """ + Get a list of the revisions in which the specified dictionary + key was changed in this property. If key is not specified, + return a list of revisions in which any key was changed. + """ + if key is None: + return self._changed_revs + else: + changed_revs = [] + old_val = self._initial_value + for rev, val in zip(self._changed_revs, self._changed_values): + if val.get(key) != old_val.get(key): + changed_revs.append(rev) + old_val = val + return changed_revs + + def initialized_revs(self): + """ + Get a list of the revisions in which keys were added or + removed in this property. + """ + initialized_revs = [] + old_len = len(self._initial_value) + for rev, val in zip(self._changed_revs, self._changed_values): + if len(val) != old_len: + initialized_revs.append(rev) + old_len = len(val) + return initialized_revs + +class RevisionSet: + """ + A set of revisions, held in dictionary form for easy manipulation. If we + were to rewrite this script for Python 2.3+, we would subclass this from + set (or UserSet). As this class does not include branch + information, it's assumed that one instance will be used per + branch. + """ + def __init__(self, parm): + """Constructs a RevisionSet from a string in property form, or from + a dictionary whose keys are the revisions. Raises ValueError if the + input string is invalid.""" + + self._revs = {} + + revision_range_split_re = re.compile('[-:]') + + if isinstance(parm, types.DictType): + self._revs = parm.copy() + elif isinstance(parm, types.ListType): + for R in parm: + self._revs[int(R)] = 1 + else: + parm = parm.strip() + if parm: + for R in parm.split(","): + rev_or_revs = re.split(revision_range_split_re, R) + if len(rev_or_revs) == 1: + self._revs[int(rev_or_revs[0])] = 1 + elif len(rev_or_revs) == 2: + for rev in range(int(rev_or_revs[0]), + int(rev_or_revs[1])+1): + self._revs[rev] = 1 + else: + raise ValueError, 'Ill formatted revision range: ' + R + + def sorted(self): + revnums = self._revs.keys() + revnums.sort() + return revnums + + def normalized(self): + """Returns a normalized version of the revision set, which is an + ordered list of couples (start,end), with the minimum number of + intervals.""" + revnums = self.sorted() + revnums.reverse() + ret = [] + while revnums: + s = e = revnums.pop() + while revnums and revnums[-1] in (e, e+1): + e = revnums.pop() + ret.append((s, e)) + return ret + + def __str__(self): + """Convert the revision set to a string, using its normalized form.""" + L = [] + for s,e in self.normalized(): + if s == e: + L.append(str(s)) + else: + L.append(str(s) + "-" + str(e)) + return ",".join(L) + + def __contains__(self, rev): + return self._revs.has_key(rev) + + def __sub__(self, rs): + """Compute subtraction as in sets.""" + revs = {} + for r in self._revs.keys(): + if r not in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __and__(self, rs): + """Compute intersections as in sets.""" + revs = {} + for r in self._revs.keys(): + if r in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __nonzero__(self): + return len(self._revs) != 0 + + def __len__(self): + """Return the number of revisions in the set.""" + return len(self._revs) + + def __iter__(self): + return iter(self.sorted()) + + def __or__(self, rs): + """Compute set union.""" + revs = self._revs.copy() + revs.update(rs._revs) + return RevisionSet(revs) + +def merge_props_to_revision_set(merge_props, pathid): + """A converter which returns a RevisionSet instance containing the + revisions from PATH as known to BRANCH_PROPS. BRANCH_PROPS is a + dictionary of pathid -> revision set branch integration information + (as returned by get_merge_props()).""" + if not merge_props.has_key(pathid): + error('no integration info available for path "%s"' % pathid) + return RevisionSet(merge_props[pathid]) + +def dict_from_revlist_prop(propvalue): + """Given a property value as a string containing per-source revision + lists, return a dictionary whose key is a source path identifier + and whose value is the revisions for that source.""" + prop = {} + + # Multiple sources are separated by any whitespace. + for L in propvalue.split(): + # We use rsplit to play safe and allow colons in pathids. + pathid_str, revs = rsplit(L.strip(), ":", 1) + + pathid = PathIdentifier.from_pathid(pathid_str) + + # cache the "external" form we saw + pathid.external_form = pathid_str + + prop[pathid] = revs + return prop + +def get_revlist_prop(url_or_dir, propname, rev=None): + """Given a repository URL or working copy path and a property + name, extract the values of the property which store per-source + revision lists and return a dictionary whose key is a source path + identifier, and whose value is the revisions for that source.""" + + # Note that propget does not return an error if the property does + # not exist, it simply does not output anything. So we do not need + # to check for LaunchError here. + args = '--strict "%s" "%s"' % (propname, url_or_dir) + if rev: + args = '-r %s %s' % (rev, args) + out = launchsvn('propget %s' % args, split_lines=False) + + return dict_from_revlist_prop(out) + +def get_merge_props(dir): + """Extract the merged revisions.""" + return get_revlist_prop(dir, opts["prop"]) + +def get_block_props(dir): + """Extract the blocked revisions.""" + return get_revlist_prop(dir, opts["block-prop"]) + +def get_blocked_revs(dir, source_pathid): + p = get_block_props(dir) + if p.has_key(source_pathid): + return RevisionSet(p[source_pathid]) + return RevisionSet("") + +def format_merge_props(props, sep=" "): + """Formats the hash PROPS as a string suitable for use as a + Subversion property value.""" + assert sep in ["\t", "\n", " "] # must be a whitespace + props = props.items() + props.sort() + L = [] + for h, r in props: + L.append("%s:%s" % (h, r)) + return sep.join(L) + +def _run_propset(dir, prop, value): + """Set the property 'prop' of directory 'dir' to value 'value'. We go + through a temporary file to not run into command line length limits.""" + try: + fd, fname = tempfile.mkstemp() + f = os.fdopen(fd, "wb") + except AttributeError: + # Fallback for Python <= 2.3 which does not have mkstemp (mktemp + # suffers from race conditions. Not that we care...) + fname = tempfile.mktemp() + f = open(fname, "wb") + + try: + f.write(value) + f.close() + report("property data written to temp file: %s" % value) + svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir)) + finally: + os.remove(fname) + +def set_props(dir, name, props): + props = format_merge_props(props) + if props: + _run_propset(dir, name, props) + else: + # Check if NAME exists on DIR before trying to delete it. + # As of 1.6 propdel no longer supports deleting a + # non-existent property. + out = launchsvn('propget "%s" "%s"' % (name, dir)) + if out: + svn_command('propdel "%s" "%s"' % (name, dir)) + +def set_merge_props(dir, props): + set_props(dir, opts["prop"], props) + +def set_block_props(dir, props): + set_props(dir, opts["block-prop"], props) + +def set_blocked_revs(dir, source_pathid, revs): + props = get_block_props(dir) + if revs: + props[source_pathid] = str(revs) + elif props.has_key(source_pathid): + del props[source_pathid] + set_block_props(dir, props) + +def is_url(url): + """Check if url looks like a valid url.""" + return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid' + +def check_url(url): + """Similar to is_url, but actually invoke get_svninfo to find out""" + return get_svninfo(url) != {} + +def is_pathid(pathid): + return isinstance(pathid, PathIdentifier) + +def is_wc(dir): + """Check if a directory is a working copy.""" + return os.path.isdir(os.path.join(dir, ".svn")) or \ + os.path.isdir(os.path.join(dir, "_svn")) + +_cache_svninfo = {} +def get_svninfo(target): + """Extract the subversion information for a target (through 'svn info'). + This function uses an internal cache to let clients query information + many times.""" + if _cache_svninfo.has_key(target): + return _cache_svninfo[target] + info = {} + for L in launchsvn('info "%s"' % target): + L = L.strip() + if not L: + continue + key, value = L.split(": ", 1) + info[key] = value.strip() + _cache_svninfo[target] = info + return info + +def target_to_url(target): + """Convert working copy path or repos URL to a repos URL.""" + if is_wc(target): + info = get_svninfo(target) + return info["URL"] + return target + +_cache_reporoot = {} +def get_repo_root(target): + """Compute the root repos URL given a working-copy path, or a URL.""" + # Try using "svn info WCDIR". This works only on SVN clients >= 1.3 + if not is_url(target): + try: + info = get_svninfo(target) + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except KeyError: + pass + url = target_to_url(target) + assert url[-1] != '/' + else: + url = target + + # Go through the cache of the repository roots. This avoids extra + # server round-trips if we are asking the root of different URLs + # in the same repository (the cache in get_svninfo() cannot detect + # that of course and would issue a remote command). + assert is_url(url) + for r in _cache_reporoot: + if url.startswith(r): + return r + + # Try using "svn info URL". This works only on SVN clients >= 1.2 + try: + info = get_svninfo(url) + # info may be {}, in which case we'll see KeyError here + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except (KeyError, LaunchError): + pass + + # Constrained to older svn clients, we are stuck with this ugly + # trial-and-error implementation. It could be made faster with a + # binary search. + while url: + temp = os.path.dirname(url) + try: + launchsvn('proplist "%s"' % temp) + except LaunchError: + _cache_reporoot[url] = None + return rstrip(url, "/") + url = temp + + error("svn repos root of %s not found" % target) + +class SvnLogParser: + """ + Parse the "svn log", going through the XML output and using pulldom (which + would even allow streaming the command output). + """ + def __init__(self, xml): + self._events = pulldom.parseString(xml) + def __getitem__(self, idx): + for event, node in self._events: + if event == pulldom.START_ELEMENT and node.tagName == "logentry": + self._events.expandNode(node) + return self.SvnLogRevision(node) + raise IndexError, "Could not find 'logentry' tag in xml" + + class SvnLogRevision: + def __init__(self, xmlnode): + self.n = xmlnode + def revision(self): + return int(self.n.getAttribute("revision")) + def author(self): + return self.n.getElementsByTagName("author")[0].firstChild.data + def paths(self): + return [self.SvnLogPath(n) + for n in self.n.getElementsByTagName("path")] + + class SvnLogPath: + def __init__(self, xmlnode): + self.n = xmlnode + def action(self): + return self.n.getAttribute("action") + def pathid(self): + return self.n.firstChild.data + def copyfrom_rev(self): + try: return self.n.getAttribute("copyfrom-rev") + except KeyError: return None + def copyfrom_pathid(self): + try: return self.n.getAttribute("copyfrom-path") + except KeyError: return None + +def get_copyfrom(target): + """Get copyfrom info for a given target (it represents the + repository-relative path from where it was branched). NOTE: + repos root has no copyfrom info. In this case None is returned. + + Returns the: + - source file or directory from which the copy was made + - revision from which that source was copied + - revision in which the copy was committed + """ + repos_path = PathIdentifier.from_target(target).repo_relative_path + for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"' + % target, split_lines=False)): + for p in chg.paths(): + if p.action() == 'A' and p.pathid() == repos_path: + # These values will be None if the corresponding elements are + # not found in the log. + return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision() + return None,None,None + +def get_latest_rev(url): + """Get the latest revision of the repository of which URL is part.""" + try: + info = get_svninfo(url) + if not info.has_key("Revision"): + error("Not a valid URL: %s" % url) + return info["Revision"] + except LaunchError: + # Alternative method for latest revision checking (for svn < 1.2) + report('checking latest revision of "%s"' % url) + L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0] + rev = re.search("revision (\d+)", L).group(1) + report('latest revision of "%s" is %s' % (url, rev)) + return rev + +def get_created_rev(url): + """Lookup the revision at which the path identified by the + provided URL was first created.""" + oldest_rev = -1 + report('determining oldest revision for URL "%s"' % url) + ### TODO: Refactor this to use a modified RevisionLog class. + lines = None + cmd = "log -r1:HEAD --stop-on-copy -q " + url + try: + lines = launchsvn(cmd + " --limit=1") + except LaunchError: + # Assume that --limit isn't supported by the installed 'svn'. + lines = launchsvn(cmd) + if lines and len(lines) > 1: + i = lines[1].find(" ") + if i != -1: + oldest_rev = int(lines[1][1:i]) + if oldest_rev == -1: + error('unable to determine oldest revision for URL "%s"' % url) + return oldest_rev + +def get_commit_log(url, revnum): + """Return the log message for a specific integer revision + number.""" + out = launchsvn("log --incremental -r%d %s" % (revnum, url)) + return recode_stdout_to_file("".join(out[1:])) + +def construct_merged_log_message(url, revnums): + """Return a commit log message containing all the commit messages + in the specified revisions at the given URL. The separator used + in this log message is determined by searching for the longest + svnmerge separator existing in the commit log messages and + extending it by one more separator. This results in a new commit + log message that is clearer in describing merges that contain + other merges. Trailing newlines are removed from the embedded + log messages.""" + messages = [''] + longest_sep = '' + for r in revnums.sorted(): + message = get_commit_log(url, r) + if message: + message = re.sub(r'(\r\n|\r|\n)', "\n", message) + message = rstrip(message, "\n") + "\n" + messages.append(prefix_lines(LOG_LINE_PREFIX, message)) + for match in LOG_SEPARATOR_RE.findall(message): + sep = match[1] + if len(sep) > len(longest_sep): + longest_sep = sep + + longest_sep += LOG_SEPARATOR + "\n" + messages.append('') + return longest_sep.join(messages) + +def get_default_source(branch_target, branch_props): + """Return the default source for branch_target (given its branch_props). + Error out if there is ambiguity.""" + if not branch_props: + error("no integration info available") + + props = branch_props.copy() + pathid = PathIdentifier.from_target(branch_target) + + # To make bidirectional merges easier, find the target's + # repository local path so it can be removed from the list of + # possible integration sources. + if props.has_key(pathid): + del props[pathid] + + if len(props) > 1: + err_msg = "multiple sources found. " + err_msg += "Explicit source argument (-S/--source) required.\n" + err_msg += "The merge sources available are:" + for prop in props: + err_msg += "\n " + str(prop) + error(err_msg) + + return props.keys()[0] + +def should_find_reflected(branch_dir): + should_find_reflected = opts["bidirectional"] + + # If the source has integration info for the target, set find_reflected + # even if --bidirectional wasn't specified + if not should_find_reflected: + source_props = get_merge_props(opts["source-url"]) + should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir)) + + return should_find_reflected + +def analyze_revs(target_pathid, url, begin=1, end=None, + find_reflected=False): + """For the source of the merges in the source URL being merged into + target_pathid, analyze the revisions in the interval begin-end (which + defaults to 1-HEAD), to find out which revisions are changes in + the url, which are changes elsewhere (so-called 'phantom' + revisions), optionally which are reflected changes (to avoid + conflicts that can occur when doing bidirectional merging between + branches), and which revisions initialize merge tracking against other + branches. Return a tuple of four RevisionSet's: + (real_revs, phantom_revs, reflected_revs, initialized_revs). + + NOTE: To maximize speed, if "end" is not provided, the function is + not able to find phantom revisions following the last real + revision in the URL. + """ + + begin = str(begin) + if end is None: + end = "HEAD" + else: + end = str(end) + if long(begin) > long(end): + return RevisionSet(""), RevisionSet(""), \ + RevisionSet(""), RevisionSet("") + + logs[url] = RevisionLog(url, begin, end, find_reflected) + revs = RevisionSet(logs[url].revs) + + if end == "HEAD": + # If end is not provided, we do not know which is the latest revision + # in the repository. So return the phantom revision set only up to + # the latest known revision. + end = str(list(revs)[-1]) + + phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs + + if find_reflected: + reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid) + reflected_revs += logs[url].block_metadata().changed_revs(target_pathid) + else: + reflected_revs = [] + + initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs()) + reflected_revs = RevisionSet(reflected_revs) + + return revs, phantom_revs, reflected_revs, initialized_revs + +def analyze_source_revs(branch_target, source_url, **kwargs): + """For the given branch and source, extract the real and phantom + source revisions.""" + branch_url = target_to_url(branch_target) + branch_pathid = PathIdentifier.from_target(branch_target) + + # Extract the latest repository revision from the URL of the branch + # directory (which is already cached at this point). + end_rev = get_latest_rev(source_url) + + # Calculate the base of analysis. If there is a "1-XX" interval in the + # merged_revs, we do not need to check those. + base = 1 + r = opts["merged-revs"].normalized() + if r and r[0][0] == 1: + base = r[0][1] + 1 + + # See if the user filtered the revision set. If so, we are not + # interested in something outside that range. + if opts["revision"]: + revs = RevisionSet(opts["revision"]).sorted() + if base < revs[0]: + base = revs[0] + if end_rev > revs[-1]: + end_rev = revs[-1] + + return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs) + +def minimal_merge_intervals(revs, phantom_revs): + """Produce the smallest number of intervals suitable for merging. revs + is the RevisionSet which we want to merge, and phantom_revs are phantom + revisions which can be used to concatenate intervals, thus minimizing the + number of operations.""" + revnums = revs.normalized() + ret = [] + + cur = revnums.pop() + while revnums: + next = revnums.pop() + assert next[1] < cur[0] # otherwise it is not ordered + assert cur[0] - next[1] > 1 # otherwise it is not normalized + for i in range(next[1]+1, cur[0]): + if i not in phantom_revs: + ret.append(cur) + cur = next + break + else: + cur = (next[0], cur[1]) + + ret.append(cur) + ret.reverse() + return ret + +def display_revisions(revs, display_style, revisions_msg, source_url): + """Show REVS as dictated by DISPLAY_STYLE, either numerically, in + log format, or as diffs. When displaying revisions numerically, + prefix output with REVISIONS_MSG when in verbose mode. Otherwise, + request logs or diffs using SOURCE_URL.""" + if display_style == "revisions": + if revs: + report(revisions_msg) + print revs + elif display_style == "logs": + for start,end in revs.normalized(): + svn_command('log --incremental -v -r %d:%d %s' % \ + (start, end, source_url)) + elif display_style in ("diffs", "summarize"): + if display_style == 'summarize': + summarize = '--summarize ' + else: + summarize = '' + + for start, end in revs.normalized(): + print + if start == end: + print "%s: changes in revision %d follow" % (NAME, start) + else: + print "%s: changes in revisions %d-%d follow" % (NAME, + start, end) + print + + # Note: the starting revision number to 'svn diff' is + # NOT inclusive so we have to subtract one from ${START}. + svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize, + source_url)) + else: + assert False, "unhandled display style: %s" % display_style + +def action_init(target_dir, target_props): + """Initialize for merges.""" + # Check that directory is ready for being modified + check_dir_clean(target_dir) + + target_pathid = PathIdentifier.from_target(target_dir) + source_pathid = opts['source-pathid'] + if source_pathid == target_pathid: + error("cannot init integration source path '%s'\nIts path identifier does not " + "differ from the path identifier of the current directory, '%s'." + % (source_pathid, target_pathid)) + + source_url = opts['source-url'] + + # If the user hasn't specified the revisions to use, see if the + # "source" is a copy from the current tree and if so, we can use + # the version data obtained from it. + revision_range = opts["revision"] + if not revision_range: + # If source was originally copied from target, and we are merging + # changes from source to target (the copy target is the merge source, + # and the copy source is the merge target), then we want to mark as + # integrated up to the rev in which the copy was committed which + # created the merge source: + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(source_url) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + if target_pathid == cf_pathid: + report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' % + (source_url, target_dir, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + str(copy_committed_in_rev) + + if not revision_range: + # If the reverse is true: copy source is the merge source, and + # the copy target is the merge target, then we want to mark as + # integrated up to the specific rev of the merge target from + # which the merge source was copied. (Longer discussion at: + # http://subversion.tigris.org/issues/show_bug.cgi?id=2810 ) + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(target_dir) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + source_pathid = PathIdentifier.from_target(source_url) + if source_pathid == cf_pathid: + report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' % + (target_dir, source_url, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + cf_rev + + # When neither the merge source nor target is a copy of the other, and + # the user did not specify a revision range, then choose a default which is + # the current revision; saying, in effect, "everything has been merged, so + # mark as integrated up to the latest rev on source url). + if not revision_range: + revision_range = "1-" + get_latest_rev(source_url) + + revs = RevisionSet(revision_range) + + report('marking "%s" as already containing revisions "%s" of "%s"' % + (target_dir, revs, source_url)) + + revs = str(revs) + # If the local svnmerge-integrated property already has an entry + # for the source-pathid, simply error out. + if not opts["force"] and target_props.has_key(source_pathid): + error('Repository-relative path %s has already been initialized at %s\n' + 'Use --force to re-initialize' % (source_pathid, target_dir)) + # set the pathid's external_form based on the user's options + source_pathid.external_form = source_pathid.format(opts['location-type']) + + revs = str(revs) + target_props[source_pathid] = revs + + # Set property + set_merge_props(target_dir, target_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \ + % (NAME, revs) + print >>f, '%s' % source_url + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_avail(branch_dir, branch_props): + """Show commits available for merges.""" + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + report('skipping phantom revisions: %s' % phantom_revs) + if reflected_revs: + report('skipping reflected revisions: %s' % reflected_revs) + report('skipping initialized revisions: %s' % initialized_revs) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \ + reflected_revs - initialized_revs + + # Compose the set of revisions to show + revs = RevisionSet("") + report_msg = "revisions available to be merged are:" + if "avail" in opts["avail-showwhat"]: + revs |= avail_revs + if "blocked" in opts["avail-showwhat"]: + revs |= blocked_revs + report_msg = "revisions blocked are:" + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["avail-display"], + report_msg, + opts["source-url"]) + +def action_integrated(branch_dir, branch_props): + """Show change sets already merged. This set of revisions is + calculated from taking svnmerge-integrated property from the + branch, and subtracting any revision older than the branch + creation revision.""" + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + revs = merge_props_to_revision_set(branch_props, opts["source-pathid"]) + + # Lookup the oldest revision on the branch path. + oldest_src_rev = get_created_rev(opts["source-url"]) + + # Subtract any revisions which pre-date the branch. + report("subtracting revisions which pre-date the source URL (%d)" % + oldest_src_rev) + revs = revs - RevisionSet(range(1, oldest_src_rev)) + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["integrated-display"], + "revisions already integrated are:", opts["source-url"]) + +def action_merge(branch_dir, branch_props): + """Record merge meta data, and do the actual merge (if not + requested otherwise via --record-only).""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + + if opts["revision"]: + revs = RevisionSet(opts["revision"]) + else: + revs = source_revs + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + merged_revs = opts["merged-revs"] + + # Show what we're doing + if opts["verbose"]: # just to avoid useless calculations + if merged_revs & revs: + report('"%s" already contains revisions %s' % (branch_dir, + merged_revs & revs)) + if phantom_revs: + report('memorizing phantom revision(s): %s' % phantom_revs) + if reflected_revs: + report('memorizing reflected revision(s): %s' % reflected_revs) + if blocked_revs & revs: + report('skipping blocked revisions(s): %s' % (blocked_revs & revs)) + if initialized_revs: + report('skipping initialized revision(s): %s' % initialized_revs) + + # Compute final merge set. + revs = revs - merged_revs - blocked_revs - reflected_revs - \ + phantom_revs - initialized_revs + if not revs: + report('no revisions to merge, exiting') + return + + # When manually marking revisions as merged, we only update the + # integration meta data, and don't perform an actual merge. + record_only = opts["record-only"] + + if record_only: + report('recording merge of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('merging in revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the merge(s). Note: the starting revision number to 'svn merge' + # is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + old_block_props = get_block_props(branch_dir) + merge_metadata = logs[opts["source-url"]].merge_metadata() + block_metadata = logs[opts["source-url"]].block_metadata() + for start,end in minimal_merge_intervals(revs, phantom_revs): + if not record_only: + # Preset merge/blocked properties to the source value at + # the start rev to avoid spurious property conflicts + set_merge_props(branch_dir, merge_metadata.get(start - 1)) + set_block_props(branch_dir, block_metadata.get(start - 1)) + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (start - 1, end, opts["source-url"], branch_dir)) + # TODO: to support graph merging, add logic to merge the property + # meta-data manually + + # Update the set of merged revisions. + merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + # Reset the blocked revs + set_block_props(branch_dir, old_block_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded merge of revisions %s via %s from ' % \ + (revs, NAME) + else: + print >>f, 'Merged revisions %s via %s from ' % \ + (revs, NAME) + print >>f, '%s' % opts["source-url"] + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], revs), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_block(branch_dir, branch_props): + """Block revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"]) + revs_to_block = source_revs - opts["merged-revs"] + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_block = RevisionSet(opts["revision"]) & revs_to_block + + if not revs_to_block: + error('no available revisions to block') + + # Change blocked information + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + blocked_revs = blocked_revs | revs_to_block + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_block), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_unblock(branch_dir, branch_props): + """Unblock revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + revs_to_unblock = blocked_revs + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"]) + + if not revs_to_unblock: + error('no available revisions to unblock') + + # Change blocked information + blocked_revs = blocked_revs - revs_to_unblock + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_unblock), + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_rollback(branch_dir, branch_props): + """Rollback previously integrated revisions.""" + + # Make sure the revision arguments are present + if not opts["revision"]: + error("The '-r' option is mandatory for rollback") + + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + # Get the list of all revisions already merged into this source-pathid. + merged_revs = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # At which revision was the src created? + oldest_src_rev = get_created_rev(opts["source-url"]) + src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev) + + # Limit to revisions specified by -r (if any) + revs = merged_revs & RevisionSet(opts["revision"]) + + # make sure there's some revision to rollback + if not revs: + report("Nothing to rollback in revision range r%s" % opts["revision"]) + return + + # If even one specified revision lies outside the lifetime of the + # merge source, error out. + if revs & src_pre_exist_range: + err_str = "Specified revision range falls out of the rollback range.\n" + err_str += "%s was created at r%d" % (opts["source-pathid"], + oldest_src_rev) + error(err_str) + + record_only = opts["record-only"] + + if record_only: + report('recording rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the reverse merge(s). Note: the starting revision number + # to 'svn merge' is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + rollback_intervals = minimal_merge_intervals(revs, []) + # rollback in the reverse order of merge + rollback_intervals.reverse() + for start, end in rollback_intervals: + if not record_only: + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (end, start - 1, opts["source-url"], branch_dir)) + + # Write out commit message if desired + # calculate the phantom revs first + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded rollback of revisions %s via %s from ' % \ + (revs , NAME) + else: + print >>f, 'Rolled back revisions %s via %s from ' % \ + (revs , NAME) + print >>f, '%s' % opts["source-url"] + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + + # Update the set of merged revisions. + merged_revs = merged_revs - revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + +def action_uninit(branch_dir, branch_props): + """Uninit SOURCE URL.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # If the source-pathid does not have an entry in the svnmerge-integrated + # property, simply error out. + if not branch_props.has_key(opts["source-pathid"]): + error('Repository-relative path "%s" does not contain merge ' + 'tracking information for "%s"' \ + % (opts["source-pathid"], branch_dir)) + + del branch_props[opts["source-pathid"]] + + # Set merge property with the selected source deleted + set_merge_props(branch_dir, branch_props) + + # Set blocked revisions for the selected source to None + set_blocked_revs(branch_dir, opts["source-pathid"], None) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Removed merge tracking for "%s" for ' % NAME + print >>f, '%s' % opts["source-url"] + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +############################################################################### +# Command line parsing -- options and commands management +############################################################################### + +class OptBase: + def __init__(self, *args, **kwargs): + self.help = kwargs["help"] + del kwargs["help"] + self.lflags = [] + self.sflags = [] + for a in args: + if a.startswith("--"): self.lflags.append(a) + elif a.startswith("-"): self.sflags.append(a) + else: + raise TypeError, "invalid flag name: %s" % a + if kwargs.has_key("dest"): + self.dest = kwargs["dest"] + del kwargs["dest"] + else: + if not self.lflags: + raise TypeError, "cannot deduce dest name without long options" + self.dest = self.lflags[0][2:] + if kwargs: + raise TypeError, "invalid keyword arguments: %r" % kwargs.keys() + def repr_flags(self): + f = self.sflags + self.lflags + r = f[0] + for fl in f[1:]: + r += " [%s]" % fl + return r + +class Option(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs.setdefault("default", 0) + del kwargs["default"] + self.value = kwargs.setdefault("value", None) + del kwargs["value"] + OptBase.__init__(self, *args, **kwargs) + def apply(self, state, value): + assert value == "" + if self.value is not None: + state[self.dest] = self.value + else: + state[self.dest] += 1 + +class OptionArg(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs["default"] + del kwargs["default"] + self.metavar = kwargs.setdefault("metavar", None) + del kwargs["metavar"] + OptBase.__init__(self, *args, **kwargs) + + if self.metavar is None: + if self.dest is not None: + self.metavar = self.dest.upper() + else: + self.metavar = "arg" + if self.default: + self.help += " (default: %s)" % self.default + def apply(self, state, value): + assert value is not None + state[self.dest] = value + def repr_flags(self): + r = OptBase.repr_flags(self) + return r + " " + self.metavar + +class CommandOpts: + class Cmd: + def __init__(self, *args): + self.name, self.func, self.usage, self.help, self.opts = args + def short_help(self): + return self.help.split(".")[0] + def __str__(self): + return self.name + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) + + def __init__(self, global_opts, common_opts, command_table, version=None): + self.progname = NAME + self.version = version.replace("%prog", self.progname) + self.cwidth = console_width() - 2 + self.ctable = command_table.copy() + self.gopts = global_opts[:] + self.copts = common_opts[:] + self._add_builtins() + for k in self.ctable.keys(): + cmd = self.Cmd(k, *self.ctable[k]) + opts = [] + for o in cmd.opts: + if isinstance(o, types.StringType) or \ + isinstance(o, types.UnicodeType): + o = self._find_common(o) + opts.append(o) + cmd.opts = opts + self.ctable[k] = cmd + + def _add_builtins(self): + self.gopts.append( + Option("-h", "--help", help="show help for this command and exit")) + if self.version is not None: + self.gopts.append( + Option("-V", "--version", help="show version info and exit")) + self.ctable["help"] = (self._cmd_help, + "help [COMMAND]", + "Display help for a specific command. If COMMAND is omitted, " + "display brief command description.", + []) + + def _cmd_help(self, cmd=None, *args): + if args: + self.error("wrong number of arguments", "help") + if cmd is not None: + cmd = self._command(cmd) + self.print_command_help(cmd) + else: + self.print_command_list() + + def _paragraph(self, text, width=78): + chunks = re.split("\s+", text.strip()) + chunks.reverse() + lines = [] + while chunks: + L = chunks.pop() + while chunks and len(L) + len(chunks[-1]) + 1 <= width: + L += " " + chunks.pop() + lines.append(L) + return lines + + def _paragraphs(self, text, *args, **kwargs): + pars = text.split("\n\n") + lines = self._paragraph(pars[0], *args, **kwargs) + for p in pars[1:]: + lines.append("") + lines.extend(self._paragraph(p, *args, **kwargs)) + return lines + + def _print_wrapped(self, text, indent=0): + text = self._paragraphs(text, self.cwidth - indent) + print text.pop(0) + for t in text: + print " " * indent + t + + def _find_common(self, fl): + for o in self.copts: + if fl in o.lflags+o.sflags: + return o + assert False, fl + + def _compute_flags(self, opts, check_conflicts=True): + back = {} + sfl = "" + lfl = [] + for o in opts: + sapp = lapp = "" + if isinstance(o, OptionArg): + sapp, lapp = ":", "=" + for s in o.sflags: + if check_conflicts and back.has_key(s): + raise RuntimeError, "option conflict: %s" % s + back[s] = o + sfl += s[1:] + sapp + for l in o.lflags: + if check_conflicts and back.has_key(l): + raise RuntimeError, "option conflict: %s" % l + back[l] = o + lfl.append(l[2:] + lapp) + return sfl, lfl, back + + def _extract_command(self, args): + """ + Try to extract the command name from the argument list. This is + non-trivial because we want to allow command-specific options even + before the command itself. + """ + opts = self.gopts[:] + for cmd in self.ctable.values(): + opts.extend(cmd.opts) + sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False) + + lopts,largs = getopt.getopt(args, sfl, lfl) + if not largs: + return None + return self._command(largs[0]) + + def _fancy_getopt(self, args, opts, state=None): + if state is None: + state= {} + for o in opts: + if not state.has_key(o.dest): + state[o.dest] = o.default + + sfl, lfl, back = self._compute_flags(opts) + try: + lopts,args = getopt.gnu_getopt(args, sfl, lfl) + except AttributeError: + # Before Python 2.3, there was no gnu_getopt support. + # So we can't parse intermixed positional arguments + # and options. + lopts,args = getopt.getopt(args, sfl, lfl) + + for o,v in lopts: + back[o].apply(state, v) + return state, args + + def _command(self, cmd): + if not self.ctable.has_key(cmd): + self.error("unknown command: '%s'" % cmd) + return self.ctable[cmd] + + def parse(self, args): + if not args: + self.print_small_help() + sys.exit(0) + + cmd = None + try: + cmd = self._extract_command(args) + opts = self.gopts[:] + if cmd: + opts.extend(cmd.opts) + args.remove(cmd.name) + state, args = self._fancy_getopt(args, opts) + except getopt.GetoptError, e: + self.error(e, cmd) + + # Handle builtins + if self.version is not None and state["version"]: + self.print_version() + sys.exit(0) + if state["help"]: # special case for --help + if cmd: + self.print_command_help(cmd) + sys.exit(0) + cmd = self.ctable["help"] + else: + if cmd is None: + self.error("command argument required") + if str(cmd) == "help": + cmd(*args) + sys.exit(0) + return cmd, args, state + + def error(self, s, cmd=None): + print >>sys.stderr, "%s: %s" % (self.progname, s) + if cmd is not None: + self.print_command_help(cmd) + else: + self.print_small_help() + sys.exit(1) + def print_small_help(self): + print "Type '%s help' for usage" % self.progname + def print_usage_line(self): + print "usage: %s <subcommand> [options...] [args...]\n" % self.progname + def print_command_list(self): + print "Available commands (use '%s help COMMAND' for more details):\n" \ + % self.progname + cmds = self.ctable.keys() + cmds.sort() + indent = max(map(len, cmds)) + for c in cmds: + h = self.ctable[c].short_help() + print " %-*s " % (indent, c), + self._print_wrapped(h, indent+6) + def print_command_help(self, cmd): + cmd = self.ctable[str(cmd)] + print 'usage: %s %s\n' % (self.progname, cmd.usage) + self._print_wrapped(cmd.help) + def print_opts(opts, self=self): + if not opts: return + flags = [o.repr_flags() for o in opts] + indent = max(map(len, flags)) + for f,o in zip(flags, opts): + print " %-*s :" % (indent, f), + self._print_wrapped(o.help, indent+5) + print '\nCommand options:' + print_opts(cmd.opts) + print '\nGlobal options:' + print_opts(self.gopts) + + def print_version(self): + print self.version + +############################################################################### +# Options and Commands description +############################################################################### + +global_opts = [ + Option("-F", "--force", + help="force operation even if the working copy is not clean, or " + "there are pending updates"), + Option("-n", "--dry-run", + help="don't actually change anything, just pretend; " + "implies --show-changes"), + Option("-s", "--show-changes", + help="show subversion commands that make changes"), + Option("-v", "--verbose", + help="verbose mode: output more information about progress"), + OptionArg("-u", "--username", + default=None, + help="invoke subversion commands with the supplied username"), + OptionArg("-p", "--password", + default=None, + help="invoke subversion commands with the supplied password"), + OptionArg("-c", "--config-dir", metavar="DIR", + default=None, + help="cause subversion commands to consult runtime config directory DIR"), +] + +common_opts = [ + Option("-b", "--bidirectional", + value=True, + default=False, + help="remove reflected and initialized revisions from merge candidates. " + "Not required but may be specified to speed things up slightly"), + OptionArg("-f", "--commit-file", metavar="FILE", + default="svnmerge-commit-message.txt", + help="set the name of the file where the suggested log message " + "is written to"), + Option("-M", "--record-only", + value=True, + default=False, + help="do not perform an actual merge of the changes, yet record " + "that a merge happened"), + OptionArg("-r", "--revision", + metavar="REVLIST", + default="", + help="specify a revision list, consisting of revision numbers " + 'and ranges separated by commas, e.g., "534,537-539,540"'), + OptionArg("-S", "--source", "--head", + default=None, + help="specify a merge source for this branch. It can be either " + "a working directory path, a full URL, or an unambiguous " + "substring of one of the locations for which merge tracking was " + "already initialized. Needed only to disambiguate in case of " + "multiple merge sources"), +] + +command_table = { + "init": (action_init, + "init [OPTION...] [SOURCE]", + """Initialize merge tracking from SOURCE on the current working + directory. + + If SOURCE is specified, all the revisions in SOURCE are marked as already + merged; if this is not correct, you can use --revision to specify the + exact list of already-merged revisions. + + If SOURCE is omitted, then it is computed from the "svn cp" history of the + current working directory (searching back for the branch point); in this + case, %s assumes that no revision has been integrated yet since + the branch point (unless you teach it with --revision).""" % NAME, + [ + "-f", "-r", # import common opts + OptionArg("-L", "--location-type", + dest="location-type", + default="path", + help="Use this type of location identifier in the new " + + "Subversion properties; 'uuid', 'url', or 'path' " + + "(default)"), + ]), + + "avail": (action_avail, + "avail [OPTION...] [PATH]", + """Show unmerged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to those + also specified in the option. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions.""", + [ + Option("-A", "--all", + dest="avail-showwhat", + value=["blocked", "avail"], + default=["avail"], + help="show both available and blocked revisions (aka ignore " + "blocked revisions)"), + "-b", + Option("-B", "--blocked", + dest="avail-showwhat", + value=["blocked"], + help="show the blocked revision list (see '%s block')" % NAME), + Option("-d", "--diff", + dest="avail-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("--summarize", + dest="avail-display", + value="summarize", + help="show summarized diff instead of revision list"), + Option("-l", "--log", + dest="avail-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "integrated": (action_integrated, + "integrated [OPTION...] [PATH]", + """Show merged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to + those also specified in the option.""", + [ + Option("-d", "--diff", + dest="integrated-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("-l", "--log", + dest="integrated-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "rollback": (action_rollback, + "rollback [OPTION...] [PATH]", + """Rollback previously merged in revisions from PATH. The + --revision option is mandatory, and specifies which revisions + will be rolled back. Only the previously integrated merges + will be rolled back. + + When manually rolling back changes, --record-only can be used to + instruct %s that a manual rollback of a certain revision + already happened, so that it can record it and offer that + revision for merge henceforth.""" % (NAME), + [ + "-f", "-r", "-S", "-M", # import common opts + ]), + + "merge": (action_merge, + "merge [OPTION...] [PATH]", + """Merge in revisions into PATH from its source. If --revision is omitted, + all the available revisions will be merged. In any case, already merged-in + revisions will NOT be merged again. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions. + + When manually merging changes across branches, --record-only can + be used to instruct %s that a manual merge of a certain revision + already happened, so that it can record it and not offer that + revision for merge anymore. Conversely, when there are revisions + which should not be merged, use '%s block'.""" % (NAME, NAME), + [ + "-b", "-f", "-r", "-S", "-M", # import common opts + ]), + + "block": (action_block, + "block [OPTION...] [PATH]", + """Block revisions within PATH so that they disappear from the available + list. This is useful to hide revisions which will not be integrated. + If --revision is omitted, it defaults to all the available revisions. + + Do not use this option to hide revisions that were manually merged + into the branch. Instead, use '%s merge --record-only', which + records that a merge happened (as opposed to a merge which should + not happen).""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "unblock": (action_unblock, + "unblock [OPTION...] [PATH]", + """Revert the effect of '%s block'. If --revision is omitted, all the + blocked revisions are unblocked""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "uninit": (action_uninit, + "uninit [OPTION...] [PATH]", + """Remove merge tracking information from PATH. It cleans any kind of merge + tracking information (including the list of blocked revisions). If there + are multiple sources, use --source to indicate which source you want to + forget about.""", + [ + "-f", "-S", # import common opts + ]), +} + + +def main(args): + global opts + + # Initialize default options + opts = default_opts.copy() + logs.clear() + + optsparser = CommandOpts(global_opts, common_opts, command_table, + version="%%prog r%s\n modified: %s\n\n" + "Copyright (C) 2004,2005 Awarix Inc.\n" + "Copyright (C) 2005, Giovanni Bajo" + % (__revision__, __date__)) + + cmd, args, state = optsparser.parse(args) + opts.update(state) + + source = opts.get("source", None) + branch_dir = "." + + if str(cmd) == "init": + if len(args) == 1: + source = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + elif str(cmd) in command_table.keys(): + if len(args) == 1: + branch_dir = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + else: + assert False, "command not handled: %s" % cmd + + # Validate branch_dir + if not is_wc(branch_dir): + if str(cmd) == "avail": + info = None + # it should be noted here that svn info does not error exit + # if an invalid target is specified to it (as is + # intuitive). so the try, except code is not absolutely + # necessary. but, I retain it to indicate the intuitive + # handling. + try: + info = get_svninfo(branch_dir) + except LaunchError: + pass + # test that we definitely targeted a subversion directory, + # mirroring the purpose of the earlier is_wc() call + if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory": + error('"%s" is neither a valid URL, nor a working directory' % branch_dir) + else: + error('"%s" is not a subversion working directory' % branch_dir) + + # give out some hints as to potential pathids + PathIdentifier.hint(branch_dir) + if source: PathIdentifier.hint(source) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + + # Calculate source_url and source_path + report("calculate source path for the branch") + if not source: + if str(cmd) == "init": + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir) + if not cf_source: + error('no copyfrom info available. ' + 'Explicit source argument (-S/--source) required.') + opts["source-url"] = get_repo_root(branch_dir) + cf_source + opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"]) + + if not opts["revision"]: + opts["revision"] = "1-" + cf_rev + else: + opts["source-pathid"] = get_default_source(branch_dir, branch_props) + opts["source-url"] = opts["source-pathid"].get_url() + + assert is_pathid(opts["source-pathid"]) + assert is_url(opts["source-url"]) + else: + # The source was given as a command line argument and is stored in + # SOURCE. Ensure that the specified source does not end in a /, + # otherwise it's easy to have the same source path listed more + # than once in the integrated version properties, with and without + # trailing /'s. + source = rstrip(source, "/") + if not is_wc(source) and not is_url(source): + # Check if it is a substring of a pathid recorded + # within the branch properties. + found = [] + for pathid in branch_props.keys(): + if pathid.match_substring(source): + found.append(pathid) + if len(found) == 1: + # (assumes pathid is a repository-relative-path) + source_pathid = found[0] + source = source_pathid.get_url() + else: + error('"%s" is neither a valid URL, nor an unambiguous ' + 'substring of a repository path, nor a working directory' + % source) + else: + source_pathid = PathIdentifier.from_target(source) + + source_pathid = PathIdentifier.from_target(source) + if str(cmd) == "init" and \ + source_pathid == PathIdentifier.from_target("."): + error("cannot init integration source path '%s'\n" + "Its repository-relative path must differ from the " + "repository-relative path of the current directory." + % source_pathid) + opts["source-pathid"] = source_pathid + opts["source-url"] = target_to_url(source) + + # Sanity check source_url + assert is_url(opts["source-url"]) + # SVN does not support non-normalized URL (and we should not + # have created them) + assert opts["source-url"].find("/..") < 0 + + report('source is "%s"' % opts["source-url"]) + + # Get previously merged revisions (except when command is init) + if str(cmd) != "init": + opts["merged-revs"] = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # Perform the action + cmd(branch_dir, branch_props) + + +if __name__ == "__main__": + try: + main(sys.argv[1:]) + except LaunchError, (ret, cmd, out): + err_msg = "command execution failed (exit code: %d)\n" % ret + err_msg += cmd + "\n" + err_msg += "".join(out) + error(err_msg) + except KeyboardInterrupt: + # Avoid traceback on CTRL+C + print "aborted by user" + sys.exit(1) diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve new file mode 100755 index 000000000..670fee742 --- /dev/null +++ b/testing/subversion/svnserve @@ -0,0 +1,42 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/svnserve + +PID=`pidof -o %PPID /usr/bin/svnserve` +case "$1" in + start) + stat_busy "Starting svnserve" + if [ -z "$PID" ]; then + if [ -n "$SVNSERVE_USER" ]; then + su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & + else + /usr/bin/svnserve -d $SVNSERVE_ARGS & + fi + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon svnserve + stat_done + fi + ;; + stop) + stat_busy "Stopping svnserve" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon svnserve + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf new file mode 100644 index 000000000..37fb7ea10 --- /dev/null +++ b/testing/subversion/svnserve.conf @@ -0,0 +1,7 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" + +#SVNSERVE_USER="svn" diff --git a/testing/syslinux/PKGBUILD b/testing/syslinux/PKGBUILD new file mode 100644 index 000000000..277bf3bf6 --- /dev/null +++ b/testing/syslinux/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 144912 2011-12-10 00:40:44Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=syslinux +pkgver=4.05 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE" +url="http://syslinux.zytor.com/" +license=('GPL2') +depends=('perl' 'glibc') +optdepends=('perl-passwd-md5: For md5pass' + 'perl-digest-sha1: For sha1pass' + 'mtools: For mkdiskimage and syslinux' + ) +makedepends=('nasm') +backup=('boot/syslinux/syslinux.cfg') +install=syslinux.install +source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2 + syslinux-dont-build-dos-windows-targets.patch + syslinux.cfg + syslinux-install_update) +md5sums=('82299242418385da1274c9479a778cb2' + '1528c376e43f0eaccaa80d8ad1bc13b4' + '4dc27d8ab3802f8e50f3dda28168ce6d' + 'b5b4953c0a5a01cd16441402f6321765') + +build() { + # Do not try to build syslinux with our default LDFLAGS, it will fail + unset LDFLAGS + cd "$srcdir"/$pkgname-${pkgver} + # Do not try to build the Windows or DOS installers + patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch + # Fix FHS manpage path + sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk + make +} + +package() { + cd "$srcdir"/$pkgname-${pkgver} + make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install + + # Install the default configuration + install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg + # Install the installation and update script + # This script is maintained at git://gist.github.com/772138.git + install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update +} diff --git a/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch b/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch new file mode 100644 index 000000000..2b86ab828 --- /dev/null +++ b/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch @@ -0,0 +1,12 @@ +diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile +--- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200 ++++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200 +@@ -54,7 +54,7 @@ + # files that depend only on the B phase, but may have to be regenerated + # for "make installer". + BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ +- diag libinstaller dos win32 win64 dosutil ++ libinstaller + ITARGET = + IOBJECTS = $(ITARGET) \ + utils/gethostip utils/isohybrid utils/mkdiskimage \ diff --git a/testing/syslinux/syslinux-install_update b/testing/syslinux/syslinux-install_update new file mode 100644 index 000000000..f7cd123e1 --- /dev/null +++ b/testing/syslinux/syslinux-install_update @@ -0,0 +1,459 @@ +#!/bin/bash +# +# Sylinux Installer / Updater Scripts +# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +#----------------- +# Exit Codes: +# 1 - get_boot_device or other function failed +# 2 - install/update failed +# 3 - set_active failed +# 4 - install_mbr failed +# +shopt -s nullglob + +libpath="/usr/lib/syslinux" +bootpath="/boot/syslinux" +extlinux="/sbin/extlinux" + +autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE +com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com) +pciids_file=/usr/share/hwdata/pci.ids + +## Helper functions ## +# Taken from libui-sh +# $1 needle +# $2 set (array) haystack +check_is_in() { + local needle="$1" element + shift + for element; do + [[ $element = $needle ]] && return 0 + done + return 1 +} + +# return true when blockdevice is an md raid, otherwise return a unset value +# get all devices that are part of raid device $1 +device_is_raid() { + [[ $1 && -f /proc/mdstat ]] || return 1 + local devmajor=$(stat -c %t "$1") + (( devmajor == 9 )) +} + +mdraid_all_slaves() { + local slave slaves + for slave in /sys/class/block/${1##*/}/slaves/*; do + source "$slave/uevent" + slaves="$slaves/dev/$DEVNAME " + unset DEVNAME + done + echo $slaves +} + +# Check /sys/block to see if device is partitioned +# If we have a partitioned block device (sda1) /sys/block/sda1/dev will not exist +# However, if we have an unpartitioned block device (sda) /sys/block/sda/dev will exist +dev_is_part() { + # $1 - blockdevice + local dev=$1 + + # If block device uevent file should be found + # If a partition is passed in path shouldn't exist + if [[ $dev = *cciss* ]]; then + [[ -f /sys/block/cciss\!${dev##*/}/dev ]] && return 1 + elif [[ $dev = *ida* ]]; then + [[ -f /sys/block/ida\!${dev##*/}/dev ]] && return 1 + else + [[ -f /sys/block/${dev##*/}/dev ]] && return 1 + fi + + return 0 +} + +# If EFI PART is present in the first 8 bytes then it must be a GPT disk +device_is_gpt() { + local partsig=$(dd if="$1" skip=64 bs=8 count=1 2>/dev/null) + [[ $partsig = "EFI PART" ]] +} + +clear_gpt_attr2() { + # $1 - Block Device, no partitions + local disk=$1 + + # Special Exception for cciss controllers + if [[ $disk = *cciss* ]]; then + for part in /dev/cciss/${disk##*/}*p*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + # Smart 2 Controllers + elif [[ $disk = *ida* ]]; then + for part in /dev/ida/${disk##*/}*p*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + else + for part in /sys/block/${disk##*/}/${disk##*/}*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + fi + return 0 +} + +usage() { +cat << EOF +usage: $0 options + +This script will install or upgrade Syslinux + +OPTIONS: + -h Show this message + -i Install Syslinux + -u Update Syslinux + -a Set Boot flag on boot partiton + -m Install Syslinux MBR + -s Updates Syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists + + Arguments Required: + -c Chroot install (ex: -c /mnt) + +Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr) + syslinux-install_update.sh -u (update) +EOF +} + +# Trys to find the partition that /boot resides on +# This will either be on /boot or / (root) +getBoot() { + if [[ ! -d "$bootpath" ]]; then + echo "Could not find $bootpath" + echo "Is boot mounted? Is Syslinux installed?" + exit 1 + fi + + syslinux_fs=(ext2 ext3 ext4 btrfs vfat) + + # Use DATA from findmnt see rc.sysint for more info + if [[ -f /proc/self/mountinfo ]]; then + read rootdev rootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/") + read bootdev bootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/boot") + else + echo "Could not find /proc/self/mountinfo" + echo "Are you running a kernel greater than 2.6.24?" + exit 1 + fi + + if [[ $bootfs ]]; then + if ! check_is_in "$bootfs" "${syslinux_fs[@]}"; then + echo "/boot file system is not supported by Syslinux" + exit 1 + fi + boot="boot" + bootpart="$bootdev" + elif [[ $rootfs ]]; then + if ! check_is_in "$rootfs" "${syslinux_fs[@]}"; then + echo "/ (root) file system is not supported by Syslinux" + exit 1 + fi + boot="root" + bootpart="$rootdev" + else + echo "Could not find filesystem on / (root) or /boot." + exit 1 + fi +} + +# We store the partition table type either gpt or mbr in var ptb +# In rare cases a user could have one raid disk using mbr and another using gpt +# In such cases we accept that the output may be incomplete + +# Calls get_ptb() for $bootpart or for all device in RAID +declare -A bootdevs +get_boot_devices() { + if device_is_raid "$bootpart"; then + slaves=$(mdraid_all_slaves "$bootpart") + + for slave in ${slaves[@]}; do + local disk="${slave%%[[:digit:]]*}" + device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" + bootdevs[$slave]="$ptb" + done + else + local disk="${bootpart%%[[:digit:]]*}" + device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" + bootdevs[$bootpart]="$ptb" + fi +} + +# Function Assumes the boot partition should be marked as active +# All other partitions should not have the boot flag set +set_active() { + # If any bootdev is a block device without partitions bail + # we want to set the boot flag on partitioned disk + for dev in "${!bootdevs[@]}"; do + dev_is_part $dev || { echo "$dev - is a block device. Aborting set_active!"; return 1; } + done + + # Clear BIOS Bootable Legacy Attribute for GPT drives + # In rare cases where a RAID device has slaves on the same block device + # Attribute 2 will be cleared for each partition multiple times + for dev in "${!bootdevs[@]}"; do + local ptb="${bootdevs[$dev]}" + if [[ "$ptb" = GPT ]]; then + local disk="${dev%%[[:digit:]]*}" #ex: /dev/sda + clear_gpt_attr2 "$disk" + fi + done + + # Set the boot flag on bootdevs (generated from get_boot_devices) + for part in "${!bootdevs[@]}"; do + local ptb="${bootdevs[$part]}" + local partnum="${part##*[[:alpha:]]}" + case "$part" in + *[[:digit:]]p[[:digit:]]*) + local disk="${part%%p$partnum}" # get everything before p1 + ;; + *) + local disk="${part%%[[:digit:]]*}" + ;; + esac + + if [[ "$ptb" = MBR ]]; then + if sfdisk "$disk" -A "$partnum" &>/dev/null; then + echo "Boot Flag Set - $part" + else + echo "FAILED to Set the boot flag on $part" + exit 3 + fi + elif [[ "$ptb" = GPT ]]; then + if sgdisk "$disk" --attributes="$partnum":set:2 &>/dev/null; then + echo "Attribute Legacy Bios Bootable Set - $part" + else + echo "FAILED to set attribute Legacy BIOS Bootable on $part" + exit 3 + fi + fi + done + return 0 +} + +install_mbr() { + # If any bootdev is a block device without partitions bail + # we want to install the mbr to a partitioned disk + for dev in "${!bootdevs[@]}"; do + dev_is_part "$dev" || { echo "$dev - is a block device. Aborting MBR install"; return 1; } + done + + for part in "${!bootdevs[@]}"; do + local partnum="${part##*[[:alpha:]]}" + case "$part" in + *[[:digit:]]p[[:digit:]]*) + local disk="${part%%p$partnum}" # get everything before p1 + ;; + *) + local disk="${part%%[[:digit:]]*}" + ;; + esac + local ptb="${bootdevs[$part]}" + + # We want to install to the root of the block device + # If the device is a partition - ABORT! + dev_is_part "$disk" && \ + { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} + + if [[ "$ptb" = MBR ]]; then + mbrfile="$libpath/mbr.bin" + elif [[ "$ptb" = GPT ]]; then + mbrfile="$libpath/gptmbr.bin" + fi + + if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then + echo "Installed MBR ($mbrfile) to $disk" + else + echo "Error Installing MBR ($mbrfile) to $disk" + exit 4 + fi + done + return 0 +} + +_install() { + # Copy files to /boot + for file in "${com32_files[@]}"; do + # Symlink files even if links exist + if [[ "$boot" = root ]]; then + ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$libpath/$file" "$bootpath/$file" + fi + done + + # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS + if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then + if [[ "$boot" = root ]]; then + ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + fi + fi + + if device_is_raid "$bootpart"; then + echo "Detected RAID on /boot - installing Syslinux with --raid" + "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + else + "$extlinux" --install "$bootpath" > /dev/null 2>&1 + fi + + if (( $? )); then + echo "Syslinux install failed" + exit 2 + else + echo "Syslinux install successful" + fi + + touch "$CHROOT/$autoupdate_file" +} + +update() { + # Update any com and c32 files in /boot + if [[ "$boot" = boot ]]; then + for file in "$bootpath"/*.{c32,com}; do + file=$(basename "$file") + cp "$libpath/$file" "$bootpath/$file" &> /dev/null + done + if [[ -f "$bootpath/pci.ids" ]]; then + cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + fi + fi + + if device_is_raid $bootpart; then + echo "Detected RAID on /boot - installing Syslinux with --raid" + "$extlinux" --update "$bootpath" -r &> /dev/null + else + "$extlinux" --update "$bootpath" &> /dev/null + fi + + if (($?)); then + echo "Syslinux update failed" + exit 2 + else + echo "Syslinux update successful" + fi +} + +# Make sure only root can run our script +if (( $(id -u) != 0 )); then + echo "This script must be run as root" 1>&2 + exit 1 +fi + +if (( $# == 0 )); then + usage + exit 1 +fi + +while getopts "c:uihmas" opt; do + case $opt in + c) + CHROOT=$(readlink -e "$OPTARG") + if [[ -z $CHROOT ]]; then + echo "error: chroot path ``$OPTARG does not exist"; + exit 1 + fi + ;; + h) + usage + exit 0 + ;; + i) + INSTALL="True" + ;; + u) + UPDATE="True" + ;; + m) + MBR="True" + ;; + a) + SET_ACTIVE="True" + ;; + s) + # If AUTOUPDATE_FILE does not exist exit the script + if [[ -f $autoupdate_file ]]; then + UPDATE="True" + else + exit 0 + fi + ;; + *) + usage + exit 1 + ;; + esac +done + +# Display Usage Information if both Install and Update are passed +if [[ $INSTALL && $UPDATE ]]; then + usage + exit 1 +fi + +# If a chroot dir is path set variables to reflect chroot +if [[ "$CHROOT" ]]; then + libpath="$CHROOT$libpath" + bootpath="$CHROOT$bootpath" + extlinux="$CHROOT$extlinux" +fi + +# Exit if no /boot path exists +if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bootpath is empty!" + echo "Is /boot mounted?" + exit 1 +fi + +# Get the boot device if any of these options are passed +if [[ $INSTALL || $UPDATE || $SET_ACTIVE || $MBR ]]; then + getBoot +fi + +# Install or Update +if [[ $INSTALL ]]; then + _install || exit +elif [[ $UPDATE ]]; then + update || exit +fi + + +# SET_ACTIVE and MBR +if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then + get_boot_devices + + if [[ $SET_ACTIVE ]]; then + set_active || exit + fi + + if [[ $MBR ]]; then + install_mbr || exit + fi +fi + +exit 0 + +# vim: set et sw=4: diff --git a/testing/syslinux/syslinux.cfg b/testing/syslinux/syslinux.cfg new file mode 100644 index 000000000..02127d21d --- /dev/null +++ b/testing/syslinux/syslinux.cfg @@ -0,0 +1,79 @@ +# Config file for Syslinux - +# /boot/syslinux/syslinux.cfg +# +# Comboot modules: +# * menu.c32 - provides a text menu +# * vesamenu.c32 - provides a graphical menu +# * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders +# * hdt.c32 - hardware detection tool +# * reboot.c32 - reboots the system +# * poweroff.com - shutdown the system +# +# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux. +# If /usr and /boot are on the same file system, symlink the files instead +# of copying them. +# +# If you do not use a menu, a 'boot:' prompt will be shown and the system +# will boot automatically after 5 seconds. +# +# Please review the wiki: https://wiki.archlinux.org/index.php/Syslinux +# The wiki provides further configuration examples + +DEFAULT arch +PROMPT 0 # Change to 1 if you do not want to use a menu +TIMEOUT 50 +# You can create syslinux keymaps with the keytab-lilo tool +#KBDMAP de.ktl + +# Menu Configuration +# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux +UI menu.c32 +#UI vesamenu.c32 + +# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu +MENU TITLE Arch Linux +#MENU BACKGROUND splash.png +MENU COLOR border 30;44 #40ffffff #a0000000 std +MENU COLOR title 1;36;44 #9033ccff #a0000000 std +MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all +MENU COLOR unsel 37;44 #50ffffff #a0000000 std +MENU COLOR help 37;40 #c0ffffff #a0000000 std +MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std +MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std +MENU COLOR msg07 37;40 #90ffffff #a0000000 std +MENU COLOR tabmsg 31;40 #30ffffff #00000000 std + +# boot sections follow +# +# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line. +# +#-* + +LABEL arch + MENU LABEL Arch Linux + LINUX ../vmlinuz-linux + APPEND root=/dev/sda3 ro + INITRD ../initramfs-linux.img + +LABEL archfallback + MENU LABEL Arch Linux Fallback + LINUX ../vmlinuz-linux + APPEND root=/dev/sda3 ro + INITRD ../initramfs-linux-fallback.img + +#LABEL windows +# MENU LABEL Windows +# COM32 chain.c32 +# APPEND hd0 1 + +LABEL hdt + MENU LABEL HDT (Hardware Detection Tool) + COM32 hdt.c32 + +LABEL reboot + MENU LABEL Reboot + COM32 reboot.c32 + +LABEL off + MENU LABEL Power Off + COMBOOT poweroff.com diff --git a/testing/syslinux/syslinux.install b/testing/syslinux/syslinux.install new file mode 100644 index 000000000..0dc0ece36 --- /dev/null +++ b/testing/syslinux/syslinux.install @@ -0,0 +1,13 @@ +post_install() { + echo "==> If you want to use syslinux as your bootloader" + echo "==> edit /boot/syslinux/syslinux.cfg and run" + echo "==> # /usr/sbin/syslinux-install_update -i -a -m" + echo "==> to install it." +} + +post_upgrade() { + # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists + /usr/sbin/syslinux-install_update -s +} + +# vim:set ts=2 sw=2 et: |