diff options
Diffstat (limited to 'community')
515 files changed, 9398 insertions, 2129 deletions
diff --git a/community/abe/PKGBUILD b/community/abe/PKGBUILD new file mode 100644 index 000000000..9f646794f --- /dev/null +++ b/community/abe/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: jsteel <mail at jsteel dot org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=abe +pkgver=1.1 +pkgrel=9 +pkgdesc="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game" +arch=('i686' 'x86_64') +url="http://abe.sourceforge.net" +license=('GPL') +depends=('sdl_mixer') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname.patch + $pkgname.desktop) +md5sums=('5537920e1746708e1a631d84d3500f5c' + '74802a45e21b59d3e3d34f35ade252a4' + '6ff678e781290bff780da154a32b9767') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + patch -Np1 -i "$srcdir"/$pkgname.patch + + ./configure --prefix=/usr + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir"/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop + install -dm755 "$pkgdir"/usr/share/$pkgname/images + + cp -r images/ maps/ sounds/ "$pkgdir"/usr/share/$pkgname/ + + cd "$pkgdir"/usr/share/$pkgname/images + tar -xf "$srcdir"/$pkgname-$pkgver/images/images.tar abe.bmp + chown root:root abe.bmp +} diff --git a/community/abe/abe.desktop b/community/abe/abe.desktop new file mode 100644 index 000000000..8c452e7af --- /dev/null +++ b/community/abe/abe.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Abe +GenericName=Platform Game +Comment=Retro Platform Game +Icon=/usr/share/abe/images/abe.bmp +Exec=abe +Categories=Game; diff --git a/community/abe/abe.patch b/community/abe/abe.patch new file mode 100644 index 000000000..33b0b1af0 --- /dev/null +++ b/community/abe/abe.patch @@ -0,0 +1,24 @@ +diff -ur abe-1.1.orig/src/Directories.h abe-1.1/src/Directories.h +--- abe-1.1.orig/src/Directories.h 2012-08-25 16:43:45.194974618 +0100 ++++ abe-1.1/src/Directories.h 2012-08-25 16:48:07.489030577 +0100 +@@ -27,7 +27,7 @@ + + // BASE_DIR has not " arround it. + #ifndef BASE_DIR +-#define BASE_DIR . ++#define BASE_DIR /usr/share/abe + #endif + + #define IMAGES_DIR "images" +diff -ur abe-1.1.orig/src/Menu.c abe-1.1/src/Menu.c +--- abe-1.1.orig/src/Menu.c 2012-08-25 16:43:45.198307908 +0100 ++++ abe-1.1/src/Menu.c 2012-08-25 16:45:00.319469631 +0100 +@@ -116,7 +116,7 @@ + if(n == SOUND_ENABLED || n == MUSIC_ENABLED) + return sound_loaded; + else +- return 0; ++ return 1; + } + + void diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index bf89aec57..5bf2b9974 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71877 2012-06-02 17:57:44Z seblu $ +# $Id: PKGBUILD 77739 2012-10-14 03:02:21Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=2.0.16 +pkgver=2.0.17 pkgrel=3 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64' 'mips64el') @@ -22,13 +22,13 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz" 'acpid.service' 'anything' 'handler.sh') -md5sums=('d59fc02c9c34f0d5c137495302e2c074' +md5sums=('d858729b7d984c5e3a0c7558e9de1584' '077475c75fbdd9de75f9a397130ccd91' '929c6d2e91295c22ed9ec6212d7eabef' 'ee6cb99e50e580c50331a73045412ae9' '7f545754db5be7296d2dd97c049062ee' '2d37b98d6e74bab815604b8b48c6cfd4' - '74ee3c33714ff5cb44f30c9a0dceeef0') + '47f44ff5f02685dce8bcdab8568f0c38') build() { cd $pkgname-$pkgver diff --git a/community/acpid/handler.sh b/community/acpid/handler.sh index b5a548f43..bab144d03 100644 --- a/community/acpid/handler.sh +++ b/community/acpid/handler.sh @@ -1,18 +1,11 @@ -#!/bin/sh +#!/bin/bash # Default acpi script that takes an entry for all actions -minspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq` -maxspeed=`cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq` -setspeed="/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed" - -set $* - case "$1" in button/power) case "$2" in PBTN|PWRF) - logger "PowerButton pressed: $2" - poweroff + logger 'PowerButton pressed' ;; *) logger "ACPI action undefined: $2" @@ -22,7 +15,7 @@ case "$1" in button/sleep) case "$2" in SLPB|SBTN) - echo -n mem >/sys/power/state + logger 'SleepButton pressed' ;; *) logger "ACPI action undefined: $2" @@ -34,12 +27,10 @@ case "$1" in AC|ACAD|ADP0) case "$4" in 00000000) - echo -n $minspeed >$setspeed - #/etc/laptop-mode/laptop-mode start + logger 'AC unpluged' ;; 00000001) - echo -n $maxspeed >$setspeed - #/etc/laptop-mode/laptop-mode stop + logger 'AC pluged' ;; esac ;; diff --git a/community/agave/PKGBUILD b/community/agave/PKGBUILD index ba0c0622f..1c89f5c9b 100644 --- a/community/agave/PKGBUILD +++ b/community/agave/PKGBUILD @@ -17,18 +17,20 @@ install=$pkgname.install source=("http://download.gna.org/colorscheme/releases/$pkgname-$pkgver.tar.bz2" agave-0.4.7-mdv-fix-str-fmt.patch schemebox.patch - drop-libgnome.patch) + drop-libgnome.patch + agave-0.4.7-mips.patch) md5sums=('93097881f28dcae1eca2800a763f77c3' 'd96ddfe751d8fd4d13a443b94fafb0b6' 'c41adfd52ecbf837f4338e67693640fc' - '7419d23329f847dcde12baa467b52135') + '7419d23329f847dcde12baa467b52135' + 'a08f637b9aa3ba08275aba94f72b1684') build() { cd "$srcdir/$pkgname-$pkgver" patch -Np1 -i "$srcdir/agave-0.4.7-mdv-fix-str-fmt.patch" # Fedora patch patch -Np1 -i "$srcdir/schemebox.patch" # gcs-schemebox patch patch -Np1 -i "$srcdir/drop-libgnome.patch" - + patch -Np1 -i "$srcdir/agave-0.4.7-mips.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-scrollkeeper --disable-gnome --disable-schemas-install \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas diff --git a/community/agave/agave-0.4.7-mips.patch b/community/agave/agave-0.4.7-mips.patch new file mode 100644 index 000000000..5b24c2cbc --- /dev/null +++ b/community/agave/agave-0.4.7-mips.patch @@ -0,0 +1,11 @@ +--- agave.orig/src/core/compat-round.cc 2006-09-30 16:55:58.000000000 -0500 ++++ agave/src/core/compat-round.cc 2012-10-16 11:49:05.823741281 -0500 +@@ -133,7 +133,7 @@ + } bits; + }; + #define compat_mask_nbit_l(u) ((u).bits.manh &= 0x7fffffff) +-#elif __ia64__ ++#elif __mips__ + union compat_IEEEl2bits { + long double e; + struct { diff --git a/community/aide/PKGBUILD b/community/aide/PKGBUILD index d7961b649..7c7e425d7 100644 --- a/community/aide/PKGBUILD +++ b/community/aide/PKGBUILD @@ -20,15 +20,19 @@ md5sums=('d0b72535ff68b93a648e4d08b0ed7f07' build() { cd $srcdir/$pkgname-$pkgver + if [ "$CARCH" != "mips64el" ]; then + confflags="--with-posix-acl" + else + confflags="" + fi ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --with-mhash \ - --with-posix-acl \ --with-prelink \ --with-xattr \ --with-zlib \ - --with-e2fsattrs + --with-e2fsattrs ${confflags} make } diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD index b7cc2cb52..380db3bd6 100644 --- a/community/alex/PKGBUILD +++ b/community/alex/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 72380 2012-06-13 13:45:40Z tdziedzic $ +# $Id: PKGBUILD 77336 2012-10-09 04:16:39Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Philip Nilsson <pnilsson@nullref.se> pkgname=alex pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='a lexical analyser generator for Haskell' arch=('i686' 'x86_64') -url='http://www.haskell.org/alex/' +url='http://hackage.haskell.org/package/alex' license=('custom:BSD3') depends=('gmp') -makedepends=('ghc=7.4.2-1' 'haskell-quickcheck=2.4.2-2') +makedepends=('ghc=7.6.1-1' 'haskell-quickcheck=2.5-2') source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d') diff --git a/community/arm-elf-binutils/PKGBUILD b/community/arm-elf-binutils/PKGBUILD index ac242c134..06b81f00e 100644 --- a/community/arm-elf-binutils/PKGBUILD +++ b/community/arm-elf-binutils/PKGBUILD @@ -6,7 +6,7 @@ pkgver=2.22 pkgrel=1 _xprefix=/usr pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) license=(GPL) options=(!libtool) url="http://sources.redhat.com/binutils" diff --git a/community/assimp/PKGBUILD b/community/assimp/PKGBUILD index 215c165f5..041cefb49 100644 --- a/community/assimp/PKGBUILD +++ b/community/assimp/PKGBUILD @@ -2,22 +2,22 @@ # Contributor: jepaan <jepaan at hotmail dot com> pkgname=assimp -pkgver=3.0 +pkgver=3.0.1270 pkgrel=1 pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('BSD') -depends=('libxmu') -makedepends=('cmake' 'boost' 'freeglut') +depends=('libxmu' 'zlib' 'freeglut') +makedepends=('cmake' 'boost') url=('http://assimp.sourceforge.net/index.html') -source=("http://downloads.sourceforge.net/assimp/assimp-${pkgver}-src.tar.gz") -md5sums=('2cb57a3f9c9930dc3320a93670ec6fdf') +source=("http://downloads.sourceforge.net/assimp/assimp--$pkgver-source-only.zip") +md5sums=('52aa4cf4e34e6b2a9c5f6c0b3c319af1') build() { cd ${srcdir} mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${pkgname}--${pkgver}-source-only \ -DCMAKE_INSTALL_PREFIX=/usr make } @@ -26,5 +26,5 @@ package() { cd ${srcdir}/build make DESTDIR=$pkgdir install - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 ${srcdir}/${pkgname}--${pkgver}-source-only/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/community/astromenace/PKGBUILD b/community/astromenace/PKGBUILD index 7192480fd..3af5f1420 100644 --- a/community/astromenace/PKGBUILD +++ b/community/astromenace/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64740 2012-02-18 03:43:03Z svenstaro $ +# $Id: PKGBUILD 77621 2012-10-13 11:41:17Z allan $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Ivan Bobrov <ibobrik at gmail dot com> @@ -6,12 +6,12 @@ pkgname=astromenace pkgver=1.2.0 -pkgrel=5 +pkgrel=6 pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities. English version" arch=('i686' 'x86_64' 'mips64el') url="http://www.viewizard.com/astromenace/index_linux.php" license=('GPL3') -depends=('sdl' 'freealut' 'libjpeg' 'libvorbis') +depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu') makedepends=('cmake' 'mesa') source=(http://downloads.sourceforge.net/openastromenace/openamenace-src-$pkgver.tar.bz2 http://downloads.sourceforge.net/openastromenace/oamenace-data-$pkgver.tar.bz2 diff --git a/community/atanks/PKGBUILD b/community/atanks/PKGBUILD index 346343521..31c6118c8 100644 --- a/community/atanks/PKGBUILD +++ b/community/atanks/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67099 2012-03-04 08:25:15Z spupykin $ +# $Id: PKGBUILD 76226 2012-09-14 12:01:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jacek Poplawski <jacekpoplawski@gmail.com> # Contributor: Charlie Cox <ccoxiv@yahoo.com> pkgname=atanks -pkgver=5.3 +pkgver=5.5 pkgrel=1 pkgdesc="Atomic Tanks" url="http://atanks.sourceforge.net" @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') makedepends=('sed') depends=('allegro4>=4.4.0.1' 'gcc-libs') source=("http://downloads.sourceforge.net/project/atanks/atanks/atanks-${pkgver}/atanks-${pkgver}.tar.gz") -md5sums=('33e344eb18b1421df120a59696958d5c') +md5sums=('1ba5a8bae3e7e49a0fdb7d21a480e70d') build() { cd atanks-${pkgver} diff --git a/community/avr-binutils/PKGBUILD b/community/avr-binutils/PKGBUILD index 18ef8f9e6..c5a99cd29 100644 --- a/community/avr-binutils/PKGBUILD +++ b/community/avr-binutils/PKGBUILD @@ -10,7 +10,7 @@ pkgrel=3 _pkgname=binutils _date=20120323 pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" license=('GPL') depends=('glibc>=2.15' 'zlib') diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD index 2b28e0904..36ed19ef1 100644 --- a/community/avr-gcc/PKGBUILD +++ b/community/avr-gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75204 2012-08-16 01:56:23Z allan $ +# $Id: PKGBUILD 77419 2012-10-09 18:03:26Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -8,8 +8,8 @@ pkgname=avr-gcc _pkgname=gcc -pkgver=4.7.1 -pkgrel=2 +pkgver=4.7.2 +pkgrel=1 pkgdesc="The GNU AVR Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'custom') @@ -69,4 +69,4 @@ package() { rm -rf ${pkgdir}/usr/share/info } -md5sums=('933e6f15f51c031060af64a9e14149ff') +md5sums=('cc308a0891e778cfda7a151ab8a6e762') diff --git a/community/avr-gdb/PKGBUILD b/community/avr-gdb/PKGBUILD index ba22c2407..2dbb56ee0 100644 --- a/community/avr-gdb/PKGBUILD +++ b/community/avr-gdb/PKGBUILD @@ -8,7 +8,7 @@ pkgname=avr-gdb _pkgname=gdb pkgver=7.4 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Debugger for AVR" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gdb/" diff --git a/community/balsa/PKGBUILD b/community/balsa/PKGBUILD index 9bc637420..6b8f4cb2f 100644 --- a/community/balsa/PKGBUILD +++ b/community/balsa/PKGBUILD @@ -1,29 +1,25 @@ -# $Id: PKGBUILD 62139 2012-01-16 19:52:55Z dreisner $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 76471 2012-09-18 19:07:49Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=balsa -pkgver=2.4.11 +pkgver=2.4.12 pkgrel=1 pkgdesc="An e-mail client for GNOME" arch=('i686' 'x86_64' 'mips64el') -license=('GPL') url='http://pawsa.fedorapeople.org/balsa/' +license=('GPL') depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gtkspell' 'gnome-icon-theme' 'desktop-file-utils') makedepends=('perlxml' 'gnome-doc-utils' 'intltool') -install=balsa.install -source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - gmime26.patch) -md5sums=('915c622b6385aa4f83d5eee8f31ee8e8' - '108d33f533558a371189441edce7d7e6') +install=$pkgname.install +source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('3f72fc69bb7fecb59e64c4cb88dc5083ed58dc76c9345b22d6c15af2c6b1e3c4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gmime26.patch" - autoreconf -fi - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -43,5 +39,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + make GTK_UPDATE_ICON_CACHE=/bin/true DESTDIR="${pkgdir}" install } diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index cae17afdf..78ef8f840 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 73983 2012-07-18 01:06:02Z ibiru $ +# $Id: PKGBUILD 76448 2012-09-18 16:21:17Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.6.3 -_commit=bbe1084 -pkgrel=2 +pkgver=0.7.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'miniupnpc') conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git') replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git') license=('MIT') -source=("$pkgbase-$pkgver.tar.gz::https://github.com/bitcoin/$pkgbase/tarball/v$pkgver") -sha256sums=('3f1a0df5d713c9e4f54f00a8f3f75c6828041afd826e16976b00229de0aecb70') +source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz) +sha256sums=('4b7a44fec28cbd9194a1303dd65bba8f13aa2facd4e06e4a3d1df6d66bc1deb5') build() { - cd "$srcdir/bitcoin-$pkgbase-$_commit" + cd "$srcdir/$pkgbase-$pkgver-linux/src" # and make qt gui qmake @@ -33,7 +32,7 @@ package_bitcoin-qt() { depends=(boost-libs qt miniupnpc) install=bitcoin-qt.install - cd "$srcdir/bitcoin-$pkgbase-$_commit" + cd "$srcdir/$pkgbase-$pkgver-linux/src" install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt install -Dm644 contrib/debian/bitcoin-qt.desktop \ "$pkgdir"/usr/share/applications/bitcoin.desktop @@ -47,7 +46,7 @@ package_bitcoin-daemon() { pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon" depends=(boost-libs miniupnpc openssl) - cd "$srcdir/bitcoin-$pkgbase-$_commit" + cd "$srcdir/$pkgbase-$pkgver-linux/src" install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind install -Dm644 contrib/debian/examples/bitcoin.conf \ "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf" diff --git a/community/blobby2/PKGBUILD b/community/blobby2/PKGBUILD index 76359b9f1..e3b435dff 100644 --- a/community/blobby2/PKGBUILD +++ b/community/blobby2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64502 2012-02-15 09:59:03Z svenstaro $ +# $Id: PKGBUILD 77257 2012-10-08 12:01:38Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=blobby2 -pkgver=1.0rc1 +pkgver=1.0rc2 arch=('x86_64' 'i686' 'mips64el') pkgrel=1 pkgdesc="A beach ball game with blobs of goo" @@ -12,8 +12,9 @@ license=('GPL') depends=('sdl' 'physfs' 'libgl') makedepends=('cmake' 'boost' 'mesa' 'zip') source=(http://downloads.sourceforge.net/blobby/$pkgname-linux-$pkgver.tar.gz - $pkgname.desktop $pkgname.png) -md5sums=('f56472cee041ef3d3c7def604e71b248' + $pkgname.desktop + $pkgname.png) +md5sums=('6a508bb292e8eebe41653da173a37a02' 'ab05bed794ee78db693fd3036393275a' 'c1bc427b41a0a3facd771ac83c7fb412') diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD index e8d55f049..0f0dc6315 100644 --- a/community/blueman/PKGBUILD +++ b/community/blueman/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 73941 2012-07-17 09:53:35Z spupykin $ +# $Id: PKGBUILD 78176 2012-10-17 10:22:59Z allan $ # Maintainer : Ionut Biru <ibiru@archlinux.org # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=blueman pkgver=1.23 -pkgrel=4 +pkgrel=5 pkgdesc="GTK+ bluetooth manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://blueman-project.org" -depends=('python-notify' 'bluez' 'dbus-python' 'gtk2' 'pygobject' 'startup-notification' +depends=('python2-notify' 'bluez' 'python2-dbus' 'gtk2' 'python2-gobject2' 'startup-notification' 'obex-data-server' 'polkit-gnome' 'xdg-utils' 'hicolor-icon-theme' 'libpulse' 'notification-daemon') makedepends=('pyrex' 'intltool') diff --git a/community/bomberclone/PKGBUILD b/community/bomberclone/PKGBUILD index 8f7aae214..a127c664c 100644 --- a/community/bomberclone/PKGBUILD +++ b/community/bomberclone/PKGBUILD @@ -23,7 +23,7 @@ build() { # add build fix extracted from upstream CVS (fixes FS#26942) patch -p0 -i ../bomberclone-0.11.9-build-fix.patch - + sed -i 's/-Werror//' configure ./configure --prefix=/usr make AM_CFLAGS=-lm } diff --git a/community/btanks/PKGBUILD b/community/btanks/PKGBUILD index 9a8f86538..08c12793a 100644 --- a/community/btanks/PKGBUILD +++ b/community/btanks/PKGBUILD @@ -16,18 +16,21 @@ source=(http://downloads.sourceforge.net/btanks/btanks-$pkgver.tar.bz2 btanks_desktop btanks_script bted_script - gcc-4.6.patch) + gcc-4.6.patch + btanks-0.9.8083-gcc47.patch) install=btanks.install md5sums=('49cb95c0eec47d3436c4fdf65e7c9d12' 'a2ddeb1e79dff8d3fd702984c8d3aab5' '07657cfa71b1de1d008cc5e3ade9749b' '91a61c0f581ea27281bdaecb7a3cd58b' - '173f0ffe46bb1bab2c8aa240fe5331f3') + '173f0ffe46bb1bab2c8aa240fe5331f3' + '5588fc87105b45fe4d09ae93098388fb') build() { cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/gcc-4.6.patch - python2 engine/sl08/sl08.py >engine/sl08/sl08.h + patch -Np1 -i "${srcdir}/btanks-0.9.8083-gcc47.patch" + #python2 engine/sl08/sl08.py >engine/sl08/sl08.h scons mkdir -p $pkgdir/usr/share/btanks diff --git a/community/btanks/btanks-0.9.8083-gcc47.patch b/community/btanks/btanks-0.9.8083-gcc47.patch new file mode 100644 index 000000000..6fd93df35 --- /dev/null +++ b/community/btanks/btanks-0.9.8083-gcc47.patch @@ -0,0 +1,111 @@ +--- btanks.orig/mrt/base_file.h 2009-04-04 15:28:59.000000000 -0500 ++++ btanks/mrt/base_file.h 2012-10-11 00:24:20.257335332 -0500 +@@ -20,6 +20,7 @@ + */ + + #include <string> ++#include <unistd.h> + #include "export_mrt.h" + + namespace mrt { +--- btanks.orig/math/range_list.h 2008-10-24 09:15:55.000000000 -0500 ++++ btanks/math/range_list.h 2012-10-11 00:26:24.732432981 -0500 +@@ -53,14 +53,14 @@ + return; + } + +- typename parent_type::iterator i = lower_bound(value); ++ typename parent_type::iterator i = this->lower_bound(value); + if (i != parent_type::end()) { + if (i->first == value) + return; + + if (value + 1 == i->first) { + T e = i->second; +- erase(i); ++ this->erase(i); + i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning + i = pack_left(i); + } +--- btanks.orig/engine/sl08/sl08.h 2008-08-13 04:10:45.000000000 -0500 ++++ btanks/engine/sl08/sl08.h 2012-10-11 01:49:09.226329460 -0500 +@@ -22,6 +22,7 @@ + /* DO NOT MODIFY THIS FILE: IT'S AUTOGENERATED */ + + #include <list> ++#include <cstddef> + + #ifndef NULL + #define NULL ((void*) 0) +@@ -271,7 +272,7 @@ + inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} + + inline void assign(object_type *o, func_t f) { object = o; func = f; } +- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } ++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } + + inline return_type operator() (arg1_type a1) const { + return (object->*func) (a1) ; +@@ -292,7 +293,7 @@ + inline slot1 () : object(NULL), func(NULL) {} + inline slot1 (object_type *object, func_t func) : object(object), func(func) {} + inline void assign(object_type *o, func_t f) { object = o; func = f; } +- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } ++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } + + inline void operator() (arg1_type a1) const { + (object->*func) (a1); +@@ -446,7 +447,7 @@ + inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} + + inline void assign(object_type *o, func_t f) { object = o; func = f; } +- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } ++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } + + inline return_type operator() (arg1_type a1, arg2_type a2) const { + return (object->*func) (a1, a2) ; +@@ -467,7 +468,7 @@ + inline slot2 () : object(NULL), func(NULL) {} + inline slot2 (object_type *object, func_t func) : object(object), func(func) {} + inline void assign(object_type *o, func_t f) { object = o; func = f; } +- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } ++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } + + inline void operator() (arg1_type a1, arg2_type a2) const { + (object->*func) (a1, a2); +@@ -642,7 +643,7 @@ + inline slot3 () : object(NULL), func(NULL) {} + inline slot3 (object_type *object, func_t func) : object(object), func(func) {} + inline void assign(object_type *o, func_t f) { object = o; func = f; } +- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } ++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } + + inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3) const { + (object->*func) (a1, a2, a3); +@@ -796,7 +797,7 @@ + inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} + + inline void assign(object_type *o, func_t f) { object = o; func = f; } +- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } ++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } + + inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { + return (object->*func) (a1, a2, a3, a4) ; +@@ -817,7 +818,7 @@ + inline slot4 () : object(NULL), func(NULL) {} + inline slot4 (object_type *object, func_t func) : object(object), func(func) {} + inline void assign(object_type *o, func_t f) { object = o; func = f; } +- inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } ++ inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); } + + inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { + (object->*func) (a1, a2, a3, a4); +@@ -971,7 +972,7 @@ + inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} + + inline void assign(object_type *o, func_t f) { object = o; func = f; } +- inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } ++ inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); } + + inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const { + return (object->*func) (a1, a2, a3, a4, a5) ; diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD index 5e24f32ea..f6ec83a31 100644 --- a/community/bullet/PKGBUILD +++ b/community/bullet/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 68719 2012-04-01 00:16:22Z svenstaro $ +# $Id: PKGBUILD 77520 2012-10-11 13:39:07Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgbase=bullet pkgname=('bullet' 'bullet-docs') -pkgver=2.80 +_rev=2613 +pkgver=2.81 pkgrel=1 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('i686' 'x86_64' 'mips64el') @@ -12,13 +13,13 @@ url="http://www.bulletphysics.com/Bullet/" license=('custom:zlib') depends=('freeglut') makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu') -source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2531.tgz +source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev${_rev}.tgz ${pkgbase}.pc) -md5sums=('d1eec0332110264a21d0fc0f2fb127c3' +md5sums=('cec9c9a79c2804dbf6385dd7d061346c' 'd1da06deba3b08b884d2212f6838905c') build() { - cd ${pkgbase}-${pkgver}-rev2531 + cd ${pkgbase}-${pkgver}-rev${_rev} # get a clean build dir [[ -d build ]] && rm -rf build @@ -46,15 +47,11 @@ build() { package_bullet() { optdepends=('bullet-docs: documentation') - cd ${pkgbase}-${pkgver}-rev2531/build + cd ${pkgbase}-${pkgver}-rev${_rev}/build # install it make DESTDIR=${pkgdir} install - # fix #29012 - install -Dm644 ../Extras/HACD/hacdVector.inl ${pkgdir}/usr/include/bullet/HACD/hacdVector.inl - install -Dm644 ../Extras/HACD/hacdCircularList.inl ${pkgdir}/usr/include/bullet/HACD/hacdCircularList.inl - # manually handle pkgconfig file mkdir -p "${pkgdir}"/usr/lib/pkgconfig sed "s|VERSION|${pkgver}|g" ${srcdir}/bullet.pc > ${pkgdir}/usr/lib/pkgconfig/bullet.pc @@ -67,7 +64,7 @@ package_bullet-docs() { pkgdesc="Documentation for bullet" depends=() - cd ${pkgbase}-${pkgver}-rev2531 + cd ${pkgbase}-${pkgver}-rev${_rev} # install docs install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 14db62c38..395881026 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75753 2012-08-30 21:02:36Z spupykin $ +# $Id: PKGBUILD 78397 2012-10-17 18:44:11Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.11 -pkgrel=2 +pkgver=2.0.12 +pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64' 'mips64el') url="http://cxx-gtk-utils.sourceforge.net/" @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('30e0299d677fb857bb0291e467408279') +md5sums=('0b85fb1726a8b6fb60292372e6bae7b8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/calf/PKGBUILD b/community/calf/PKGBUILD index 04e7eb64b..63a320e47 100644 --- a/community/calf/PKGBUILD +++ b/community/calf/PKGBUILD @@ -1,35 +1,36 @@ -# Maintainer: Ray Rashif <schiv@archlinux.org> +# $Id: PKGBUILD 77743 2012-10-14 09:43:37Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Ray Rashif <schiv@archlinux.org> pkgname=calf -pkgver=0.0.18.6 +pkgver=0.0.19 +_rc=8 pkgrel=1 -pkgdesc="LV2/DSSI/LADSPA plug-ins suite and standalone JACK host" +pkgdesc='LV2/DSSI/LADSPA plug-ins suite and standalone JACK host' arch=('i686' 'x86_64' 'mips64el') -url="http://calf.sf.net/" +url='http://calf.sf.net/' license=('LGPL') -depends=('libglade' 'lash') +depends=('libglade' 'fftw' 'lash' 'dssi' 'fluidsynth' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('lv2core' 'ladspa' 'dssi') -source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'include_fix.patch') -md5sums=('780854561dad1cb873041d7a0b98cbcd' - '5aab4d057fb3646c43e6dfcad4c7128f') +source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver-rc$_rc.tar.gz") +install=calf.install +options=('!libtool') +sha256sums=('57cb536a24a7b9df890dc665fd75c2f4d307859e55f3b25015c73cdc726a56b5') build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i "$srcdir/include_fix.patch" - - ./configure --prefix=/usr \ - --enable-experimental + cd $srcdir/$pkgname-$pkgver-rc$_rc + if [ "$CARCH" != "mips64el" ]; then + confflags="--enable-sse" + else + confflags="" + fi + ./configure --prefix=/usr --enable-experimental ${confflags} make } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - rm "$pkgdir/usr/share/icons/hicolor/icon-theme.cache" + cd $srcdir/$pkgname-$pkgver-rc$_rc + make DESTDIR=$pkgdir install } # vim:set ts=2 sw=2 et: diff --git a/community/calf/calf.install b/community/calf/calf.install new file mode 100644 index 000000000..b83f56c72 --- /dev/null +++ b/community/calf/calf.install @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database /usr/share/applications +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/catalyst-dkms/3.5-do_mmap.patch b/community/catalyst-dkms/3.5-do_mmap.patch new file mode 100644 index 000000000..04248eb7b --- /dev/null +++ b/community/catalyst-dkms/3.5-do_mmap.patch @@ -0,0 +1,50 @@ +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 +@@ -2106,6 +2106,12 @@ + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) ++# define NO_DO_MMAP ++# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) ++# define do_munmap(a,b,c) vm_munmap(b, c) ++#endif ++ + unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( + KCL_IO_FILE_Handle file, + unsigned long addr, +@@ -2117,10 +2123,13 @@ + + flags = MAP_SHARED; + prot = PROT_READ|PROT_WRITE; +- ++#ifdef NO_DO_MMAP ++ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); ++#else + down_write(¤t->mm->mmap_sem); + vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); + up_write(¤t->mm->mmap_sem); ++#endif + if (IS_ERR(vaddr)) + return 0; + else +@@ -2131,7 +2140,9 @@ + { + int retcode = 0; + ++#ifndef NO_DO_MMAP + down_write(¤t->mm->mmap_sem); ++#endif + #ifdef FGL_LINUX_RHEL_MUNMAP_API + retcode = do_munmap(current->mm, + addr, +@@ -2142,7 +2153,9 @@ + addr, + len); + #endif ++#ifndef NO_DO_MMAP + up_write(¤t->mm->mmap_sem); ++#endif + return retcode; + } + diff --git a/community/catalyst-dkms/PKGBUILD b/community/catalyst-dkms/PKGBUILD new file mode 100644 index 000000000..d48e8f2cd --- /dev/null +++ b/community/catalyst-dkms/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 77694 2012-10-13 14:52:56Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero +# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert + +pkgname=catalyst-dkms +pkgver=12.9 +pkgrel=1 +pkgdesc="AMD proprietary gpu kernel driver" +arch=('i686' 'x86_64') +url="http://www.amd.com" +license=('custom') +depends=('dkms') +optdepends=('linux-headers: build the module against Arch kernel' + 'linux-lts-headers: build the module against LTS Arch kernel') +replaces=('catalyst-lts-dkms') # useless +source=(#http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip + https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz + dkms.conf) +md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b' + '972049dc247a74a7162f2227078abcb0') +install=catalyst.install + +package() { + depends=(${depends[@]} "catalyst-utils=${pkgver}") + + cd ${srcdir} + + if [ "${CARCH}" = "x86_64" ]; then + _archdir=x86_64 + else + _archdir=x86 + fi + + #sh ./amd-driver-installer*.run --extract fglrx-install + + #cd fglrx-install + #patch -Np1 -i ../3.5-do_mmap.patch + + install -dm755 "${pkgdir}/usr/lib/modprobe.d" + install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}" + cp -r lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" + cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" + cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" + sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf" + + echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" + + # license + install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} diff --git a/community/catalyst-dkms/catalyst.install b/community/catalyst-dkms/catalyst.install new file mode 100644 index 000000000..655468646 --- /dev/null +++ b/community/catalyst-dkms/catalyst.install @@ -0,0 +1,18 @@ +post_install() { + dkms install -m fglrx -v $1 +} + +pre_upgrade() { + local curver=$2 + # $2 is unset due to a bug. Query current version using pacman as fallback + [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}') + pre_remove $curver +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + dkms remove -m fglrx -v $1 --all +} diff --git a/community/catalyst-dkms/dkms.conf b/community/catalyst-dkms/dkms.conf new file mode 100644 index 000000000..8d312da4f --- /dev/null +++ b/community/catalyst-dkms/dkms.conf @@ -0,0 +1,7 @@ +PACKAGE_NAME="fglrx" +PACKAGE_VERSION="@VERSION@" +CLEAN="rm -f *.*o" +BUILT_MODULE_NAME[0]="fglrx" +MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck" +DEST_MODULE_LOCATION[0]="/extramodules" +AUTOINSTALL="yes" diff --git a/community/catalyst-lts-dkms/PKGBUILD b/community/catalyst-lts-dkms/PKGBUILD new file mode 100644 index 000000000..2c0683df7 --- /dev/null +++ b/community/catalyst-lts-dkms/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 76980 2012-10-02 21:28:25Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero +# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert + +pkgname=catalyst-lts-dkms +pkgver=12.8 +pkgrel=0.1 +pkgdesc="AMD proprietary gpu kernel driver" +arch=('i686' 'x86_64') +url="http://www.amd.com" +license=('custom') +depends=('linux-lts' 'linux-lts-headers' 'dkms') +source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip + dkms.conf) +md5sums=('41c5478322b13be6909eeb46412a3aa0' + '98d42443e84e91674ba79f0e6c38c572') +install=catalyst.install + +package() { + depends=(${depends[@]} "catalyst-utils=${pkgver}") + + cd ${srcdir} + + if [ "${CARCH}" = "x86_64" ]; then + _archdir=x86_64 + else + _archdir=x86 + fi + + sh ./amd-driver-installer*.run --extract fglrx-install + + cd fglrx-install + + install -dm755 "${pkgdir}/usr/lib/modprobe.d" + install -dm755 "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}" + cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/" + cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/" + cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/" + sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/dkms.conf" + + echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst-lts.conf" + + # license + install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} diff --git a/community/catalyst-lts-dkms/catalyst.install b/community/catalyst-lts-dkms/catalyst.install new file mode 100644 index 000000000..021f3fc54 --- /dev/null +++ b/community/catalyst-lts-dkms/catalyst.install @@ -0,0 +1,24 @@ +post_install() +{ + dkms add -m fglrx-lts -v $1 + dkms build -m fglrx-lts -v $1 + dkms install -m fglrx-lts -v $1 +} + +pre_upgrade() +{ + dkms remove -m fglrx-lts -v $1 --all +} + +post_upgrade() +{ + dkms add -m fglrx-lts -v $1 + dkms build -m fglrx-lts -v $1 + dkms install -m fglrx-lts -v $1 +} + +pre_remove() +{ + dkms remove -m fglrx-lts -v $1 --all +} + diff --git a/community/catalyst-lts-dkms/dkms.conf b/community/catalyst-lts-dkms/dkms.conf new file mode 100644 index 000000000..64f81f832 --- /dev/null +++ b/community/catalyst-lts-dkms/dkms.conf @@ -0,0 +1,7 @@ +PACKAGE_NAME="fglrx-lts" +PACKAGE_VERSION="@VERSION@" +CLEAN="rm -f *.*o" +BUILT_MODULE_NAME[0]="fglrx" +MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck" +DEST_MODULE_LOCATION[0]="/extramodules" +AUTOINSTALL="yes" diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index f63dcfa45..0ce5530ea 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72861 2012-06-24 07:28:13Z giovanni $ +# $Id: PKGBUILD 78395 2012-10-17 18:38:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.7 +pkgver=1.4.8 pkgrel=1 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('LGPL' 'GPL') depends=('pcsclite' 'libusbx') makedepends=('pkg-config') backup=(etc/reader.conf.d/libccidtwin) -source=("https://alioth.debian.org/frs/download.php/3730/${pkgname}-${pkgver}.tar.bz2") -md5sums=('907037484e000504dad1ccfe6c36e1f1') +source=("https://alioth.debian.org/frs/download.php/3768/${pkgname}-${pkgver}.tar.bz2") +md5sums=('b6c37110f50b059a8ba94f118cfd679a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index 54b1c6e36..099850d6a 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 73985 2012-07-18 01:06:14Z ibiru $ +# $Id: PKGBUILD 76190 2012-09-13 07:56:23Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive -pkgver=0.7.9 -pkgrel=2 +pkgver=0.7.10 +pkgrel=1 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64' 'mips64el') url='http://cclive.sourceforge.net/' license=('GPL3') depends=('boost-libs' 'pcre' 'curl' 'libquvi') makedepends=('boost') -source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz") -md5sums=('2c7a3bbc2d6fdcfebb60cb3ae57944b5') +source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz") +md5sums=('dee09cd1b5638078037b8a2945ebac52') build() { cd $pkgname-$pkgver diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD index 140834e21..a46301651 100644 --- a/community/cdrtools/PKGBUILD +++ b/community/cdrtools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75213 2012-08-16 09:19:22Z stativ $ +# $Id: PKGBUILD 76416 2012-09-17 14:33:56Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=cdrtools pkgver=3.01a08 -pkgrel=1 +pkgrel=2 pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://cdrecord.berlios.de/private/cdrecord.html" license=('CDDL') depends=('acl') @@ -36,6 +36,13 @@ package() { # autoload 'sg' module needed by cdrecord install -d -m755 "$pkgdir"/usr/lib/modules-load.d/ echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf + + # create symlinks for cdrkit compatibility + cd "$pkgdir"/usr/bin + ln -s cdrecord wodim + ln -s readcd readom + ln -s mkisofs genisoimage + ln -s cdda2wav icedax } # vim:set ts=2 sw=2 et: diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 1e7a0e365..8fd4dd440 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 74612 2012-07-31 19:55:33Z ebelanger $ +# $Id: PKGBUILD 77052 2012-10-04 03:54:27Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> pkgname=cegui -pkgver=0.7.6 -pkgrel=5 +pkgver=0.7.7 +pkgrel=1 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64' 'mips64el') url="http://crayzedsgui.sourceforge.net" @@ -18,16 +18,12 @@ optdepends=("python2: python bindings" "ogre: ogre module" "irrlicht: irrlicht module") options=(!libtool) -source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz - cegui-0.7.6-python-detection.patch) -md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3' - '4600775f78b7349621a8a314ade8c902') +source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) +md5sums=('8b83577f86eaa1581765dd155c7c8f24') build() { cd $srcdir/CEGUI-${pkgver} - patch -Np0 < $srcdir/cegui-0.7.6-python-detection.patch - ./bootstrap ./configure --prefix=/usr \ diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index 81332fbba..703fa5616 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74503 2012-07-29 19:34:09Z lcarlier $ +# $Id: PKGBUILD 78574 2012-10-21 09:16:19Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.99.12 -pkgrel=1 +pkgver=1.99.13 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" @@ -15,14 +15,14 @@ makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) install=chmsee.install -md5sums=('6cce2f994867fbe8a637a129c721546b' +md5sums=('6ea077c593bdadaafb278cce9165fba2' '242a9390bc943cc38237fa71137fb26c') build() { cd ${srcdir}/jungleji-chmsee-*/src cp Makefile.arch Makefile - #sed -i -e 's/12.*/13.*/g' ../application.ini + sed -i -e 's/15.*/16.*/g' ../application.ini make } diff --git a/community/chntpw/PKGBUILD b/community/chntpw/PKGBUILD index cd0a81d1d..6991ac9d9 100644 --- a/community/chntpw/PKGBUILD +++ b/community/chntpw/PKGBUILD @@ -16,7 +16,7 @@ md5sums=('a3fb358d1adec589cd6bc8dedf68896c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - [ "$CARCH" = "x86_64" ] && sed -i "s|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall -m32|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall|" Makefile + [ "$CARCH" != "i686" ] && sed -i "s|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall -m32|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall|" Makefile make } diff --git a/community/chromium-bsu/PKGBUILD b/community/chromium-bsu/PKGBUILD index a01abed95..2974d0fd9 100644 --- a/community/chromium-bsu/PKGBUILD +++ b/community/chromium-bsu/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 64919 2012-02-18 20:42:52Z jelle $ +# $Id: PKGBUILD 77622 2012-10-13 11:41:22Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=chromium-bsu pkgver=0.9.15 -pkgrel=2 +pkgrel=3 pkgdesc="A fast paced top scrolling shooter" arch=('i686' 'x86_64' 'mips64el') url="http://chromium-bsu.sourceforge.net/" license=('custom:artistic') -depends=('freeglut' 'sdl' 'openal' 'freealut' 'glpng' 'ftgl' 'fontconfig' 'sdl_image') +depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'glpng' 'ftgl' 'fontconfig' 'sdl_image') install=chromium-bsu.install source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('d57137a1ac2292363b35192724c7e3be') diff --git a/community/chuck/PKGBUILD b/community/chuck/PKGBUILD index 5cb5634ab..1927295f1 100644 --- a/community/chuck/PKGBUILD +++ b/community/chuck/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75637 2012-08-27 21:34:19Z arodseth $ +# $Id: PKGBUILD 78497 2012-10-20 00:31:27Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Laurent Carlier <lordheavym@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -7,45 +7,34 @@ # Contributor: tardo <tardo@nagi-fanboi.net> pkgname=chuck -pkgver=1.3.0.0 +pkgver=1.3.1.3 pkgrel=1 -pkgdesc="Concurrent, on-the-fly audio programming language" -arch=('x86_64' 'i686') -url="http://chuck.cs.princeton.edu/" +pkgdesc='Concurrent, on-the-fly audio programming language' +arch=('x86_64' 'i686' 'mips64el') +url='http://chuck.cs.princeton.edu/' license=('GPL') depends=('gcc-libs' 'libsndfile') -makedepends=('bison' 'flex' 'setconf') source=("http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz") -sha256sums=('80bfc6ab3017c8183fe7640eca94bcb314cf4cdb1c4b70cc3abb67b4d88ff111') - -if [[ $CARCH == x86_64 ]]; then - depends=('gcc-libs-multilib' 'lib32-libsndfile' 'lib32-alsa-lib') - makedepends+=('gcc-multilib') -fi +sha256sums=('8ef8a65fe4d265b6f509b9339355a5658b47d9b43219fa09c182ca846cc0a740') build() { - cd "$srcdir/$pkgname-$pkgver/src" + cd $srcdir/$pkgname-$pkgver/src - msg2 "Configuring..." - if [[ $CARCH == x86_64 ]]; then - setconf makefile CC 'gcc -m32' - setconf makefile CXX 'g++ -m32' - setconf makefile LD 'g++ -m32' - fi + msg2 'Configuring...' CFLAGS+=' -fno-strict-aliasing -lpthread' CXXFLAGS+=' -fno-strict-aliasing -fpermissive -lpthread' - msg2 "Compiling..." + msg2 'Compiling...' # Alternatives to linux-alsa are: linux-jack linux-oss osx win32 make linux-alsa } package() { - cd "$srcdir/$pkgname-$pkgver/src" + cd $srcdir/$pkgname-$pkgver/src install -Dm755 chuck $pkgdir/usr/bin/chuck - mkdir -p "$pkgdir/usr/share/doc/$pkgname" - cp -r ../examples "$pkgdir/usr/share/doc/$pkgname/" + mkdir -p $pkgdir/usr/share/doc/$pkgname + cp -r ../examples $pkgdir/usr/share/doc/$pkgname/ } # vim:set ts=2 sw=2 et: diff --git a/community/clinica/PKGBUILD b/community/clinica/PKGBUILD index 85bd9b258..4a069a29d 100644 --- a/community/clinica/PKGBUILD +++ b/community/clinica/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 62971 2012-01-29 17:19:57Z giovanni $ +# $Id: PKGBUILD 78165 2012-10-16 15:57:54Z bgyorgy $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gianmarco Brocchi <gianmarcobrocchi@gmail.com> pkgname=clinica pkgver=0.2.1 -pkgrel=4 +pkgrel=5 pkgdesc="Simple medical records manager" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/clinica-project" license=('GPL3') -depends=('libgee' 'python' 'libpeas' 'dconf') -makedepends=('vala' 'intltool' 'pkg-config') +depends=('libgee' 'libpeas' 'dconf') +makedepends=('vala' 'intltool' 'python') optdepends=('python2-gobject: for Agenzia del Farmaco plugin') install=clinica.install -source=("http://launchpad.net/clinica-project/stable/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('327ce50d20b0e56d3de57270eed2ad23') +source=("http://launchpad.net/clinica-project/stable/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2" + vala-0.16.patch) +md5sums=('327ce50d20b0e56d3de57270eed2ad23' + 'cd619b85a1758aad846c06b11961c6a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/vala-0.16.patch" + sed -i 's@^#!.*python$@#!/usr/bin/python2@' plugins/AgenziaDelFarmaco.py + sed -i -e "s:Application;GTK;:Office;GTK;:g" clinica.desktop ./waf configure --prefix=/usr LC_ALL=C LANG=C ./waf build @@ -28,6 +33,4 @@ package() { ./waf --destdir="${pkgdir}" install rm -rf ${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled - sed -i -e "s:Application;GTK;:Office;:g" clinica.desktop - install -Dm644 clinica.desktop "${pkgdir}/usr/share/applications" } diff --git a/community/clinica/vala-0.16.patch b/community/clinica/vala-0.16.patch new file mode 100644 index 000000000..fda32c1b2 --- /dev/null +++ b/community/clinica/vala-0.16.patch @@ -0,0 +1,242 @@ +diff -Naur clinica-0.2.1.orig/libclinica/DoctorContextMenu.vala clinica-0.2.1/libclinica/DoctorContextMenu.vala +--- clinica-0.2.1.orig/libclinica/DoctorContextMenu.vala 2011-11-30 13:42:30.000000000 +0100 ++++ clinica-0.2.1/libclinica/DoctorContextMenu.vala 2012-10-16 16:57:35.000000000 +0200 +@@ -22,7 +22,7 @@ + + namespace Clinica { + +- public class DoctorContextMenu : Menu { ++ public class DoctorContextMenu : Gtk.Menu { + + /** + * @brief The doctor associated to this popup menu +@@ -38,13 +38,13 @@ + /** + * @brief MenuItem associated to doctor deletion + */ +- private MenuItem delete_menuitem; ++ private Gtk.MenuItem delete_menuitem; + + /** + * @brief MenuItem that triggers doctor edit + * dialog. + */ +- private MenuItem edit_menuitem; ++ private Gtk.MenuItem edit_menuitem; + + private ResourceManager resource_manager; + +@@ -55,8 +55,8 @@ + + /* Create menu items, connect them to their callback + * and add it to the menu */ +- delete_menuitem = new MenuItem.with_label (_("Delete")); +- edit_menuitem = new MenuItem.with_label (_("Edit")); ++ delete_menuitem = new Gtk.MenuItem.with_label (_("Delete")); ++ edit_menuitem = new Gtk.MenuItem.with_label (_("Edit")); + + delete_menuitem.activate.connect (on_delete_menuitem_activated); + edit_menuitem.activate.connect (on_edit_menuitem_activated); +@@ -67,11 +67,11 @@ + show_all (); + } + +- private void on_delete_menuitem_activated (MenuItem item) { ++ private void on_delete_menuitem_activated (Gtk.MenuItem item) { + view.remove_selected_doctor (); + } + +- private void on_edit_menuitem_activated (MenuItem item) { ++ private void on_edit_menuitem_activated (Gtk.MenuItem item) { + var doctor_editor = new DoctorEditor.with_doctor (resource_manager, doctor); + doctor_editor.dialog.set_transient_for (resource_manager.user_interface.window); + doctor_editor.run (); +diff -Naur clinica-0.2.1.orig/libclinica/EventDetail.vala clinica-0.2.1/libclinica/EventDetail.vala +--- clinica-0.2.1.orig/libclinica/EventDetail.vala 2011-11-30 13:42:30.000000000 +0100 ++++ clinica-0.2.1/libclinica/EventDetail.vala 2012-10-16 16:55:51.000000000 +0200 +@@ -104,9 +104,9 @@ + */ + private bool on_button_press_event (Widget widget, EventButton event) { + if (event.button == 3 && event.type == EventType.BUTTON_PRESS) { +- var popup_menu = new Menu (); +- var edit_menu_item = new MenuItem.with_label (_("Edit")); +- var remove_menu_item = new MenuItem.with_label (_("Remove")); ++ var popup_menu = new Gtk.Menu (); ++ var edit_menu_item = new Gtk.MenuItem.with_label (_("Edit")); ++ var remove_menu_item = new Gtk.MenuItem.with_label (_("Remove")); + + /* Connect callbacks for the item */ + edit_menu_item.activate.connect (on_edit_menu_item_activate); +@@ -125,7 +125,7 @@ + return false; + } + +- private void on_edit_menu_item_activate (MenuItem? item = null) { ++ private void on_edit_menu_item_activate (Gtk.MenuItem? item = null) { + var event_editor = new EventEditor (resource_manager, associated_event); + event_editor.set_transient_for (resource_manager.user_interface.calendar_window); + if (event_editor.run () == EventEditor.Response.SAVE) { +@@ -137,7 +137,7 @@ + event_editor.destroy (); + } + +- private void on_remove_menu_item_activate (MenuItem? item = null) { ++ private void on_remove_menu_item_activate (Gtk.MenuItem? item = null) { + var question = new MessageDialog (null, + DialogFlags.MODAL | DialogFlags.DESTROY_WITH_PARENT, + MessageType.QUESTION, ButtonsType.YES_NO, "%s", +diff -Naur clinica-0.2.1.orig/libclinica/PatientContextMenu.vala clinica-0.2.1/libclinica/PatientContextMenu.vala +--- clinica-0.2.1.orig/libclinica/PatientContextMenu.vala 2011-12-09 18:14:42.000000000 +0100 ++++ clinica-0.2.1/libclinica/PatientContextMenu.vala 2012-10-16 16:54:59.000000000 +0200 +@@ -26,7 +26,7 @@ + * @brief Menu to be displayed when a user right click on a patient + * in the TreeView + */ +- public class PatientContextMenu : Menu { ++ public class PatientContextMenu : Gtk.Menu { + + /* Patient where that user has right clicked on */ + Patient patient; +@@ -35,9 +35,9 @@ + PatientListView view; + + /* MENU ITEMS */ +- MenuItem edit_menuitem; +- MenuItem delete_menuitem; +- MenuItem view_visits_menuitem; ++ Gtk.MenuItem edit_menuitem; ++ Gtk.MenuItem delete_menuitem; ++ Gtk.MenuItem view_visits_menuitem; + + private ResourceManager resource_manager; + +@@ -48,13 +48,13 @@ + this.view = view; + + /* Instantiate menu items */ +- edit_menuitem = new MenuItem.with_label(_("Edit")); ++ edit_menuitem = new Gtk.MenuItem.with_label(_("Edit")); + edit_menuitem.activate.connect (on_edit_menuitem_activated); + +- delete_menuitem = new MenuItem.with_label(_("Delete")); ++ delete_menuitem = new Gtk.MenuItem.with_label(_("Delete")); + delete_menuitem.activate.connect(on_delete_menuitem_activated); + +- view_visits_menuitem = new MenuItem.with_label(_("Edit visits")); ++ view_visits_menuitem = new Gtk.MenuItem.with_label(_("Edit visits")); + view_visits_menuitem.activate.connect(on_view_visits_menuitem_activated); + + /* Append menuitems */ +@@ -65,18 +65,18 @@ + show_all (); + } + +- private void on_edit_menuitem_activated (MenuItem item) { ++ private void on_edit_menuitem_activated (Gtk.MenuItem item) { + var patient_editor = new PatientEditor.with_patient (resource_manager, patient); + patient_editor.dialog.set_transient_for (resource_manager.user_interface.window); + patient_editor.run(); + patient_editor.destroy (); + } + +- private void on_delete_menuitem_activated (MenuItem item) { ++ private void on_delete_menuitem_activated (Gtk.MenuItem item) { + view.remove_selected_patient (); + } + +- private void on_view_visits_menuitem_activated (MenuItem item) { ++ private void on_view_visits_menuitem_activated (Gtk.MenuItem item) { + resource_manager.user_interface.show_visit_window (patient); + } + } +diff -Naur clinica-0.2.1.orig/libclinica/UserInterface.vala clinica-0.2.1/libclinica/UserInterface.vala +--- clinica-0.2.1.orig/libclinica/UserInterface.vala 2011-12-09 19:15:27.000000000 +0100 ++++ clinica-0.2.1/libclinica/UserInterface.vala 2012-10-16 16:56:48.000000000 +0200 +@@ -216,7 +216,7 @@ + /* Menu item */ + + [CCode (instance_pos = -1)] +- public void on_new_patient_menu_item_activate (MenuItem item) { ++ public void on_new_patient_menu_item_activate (Gtk.MenuItem item) { + var new_patient_dialog = new PatientEditor (resource_manager); + new_patient_dialog.dialog.set_transient_for (window); + new_patient_dialog.run (); +@@ -224,7 +224,7 @@ + } + + [CCode (instance_pos = -1)] +- public void on_new_doctor_menu_item_activate (MenuItem item) { ++ public void on_new_doctor_menu_item_activate (Gtk.MenuItem item) { + var new_doc_dialog = new DoctorEditor (resource_manager); + new_doc_dialog.dialog.set_transient_for (window); + new_doc_dialog.run (); +@@ -232,22 +232,22 @@ + } + + [CCode (instance_pos = -1)] +- public void on_patient_menu_item_activate (MenuItem item) { ++ public void on_patient_menu_item_activate (Gtk.MenuItem item) { + show_patient_list_page (); + } + + [CCode (instance_pos = -1)] +- public void on_doctor_menu_item_activate (MenuItem item) { ++ public void on_doctor_menu_item_activate (Gtk.MenuItem item) { + show_doctor_list_page (); + } + + [CCode (instance_pos = -1)] +- public void on_home_menu_item_activate (MenuItem item) { ++ public void on_home_menu_item_activate (Gtk.MenuItem item) { + show_start_page(); + } + + [CCode (instance_pos = -1)] +- public void on_search_medicines_menu_item_activate (MenuItem item) { ++ public void on_search_medicines_menu_item_activate (Gtk.MenuItem item) { + set_page (medicine_search_page); + } + +@@ -260,7 +260,7 @@ + } + + [CCode (instance_pos = -1)] +- public void on_settings_menu_item_activate (MenuItem item) { ++ public void on_settings_menu_item_activate (Gtk.MenuItem item) { + if (settings_manager == null){ + settings_manager = new SettingsManager (resource_manager); + /* Dereference the window on release to make it be freed and +@@ -275,7 +275,7 @@ + } + + [CCode (instance_pos = -1)] +- public void on_help_menu_item_activate (MenuItem item) { ++ public void on_help_menu_item_activate (Gtk.MenuItem item) { + try { + Gtk.show_uri (this.window.get_screen (), "ghelp:clinica", Gdk.CURRENT_TIME); + } catch (GLib.Error e) { +diff -Naur clinica-0.2.1.orig/libclinica/VisitDetail.vala clinica-0.2.1/libclinica/VisitDetail.vala +--- clinica-0.2.1.orig/libclinica/VisitDetail.vala 2011-12-09 18:29:19.000000000 +0100 ++++ clinica-0.2.1/libclinica/VisitDetail.vala 2012-10-16 16:53:08.000000000 +0200 +@@ -87,10 +87,10 @@ + */ + private bool on_button_press_event (Widget widget, EventButton event) { + if (event.button == 3 && event.type == EventType.BUTTON_PRESS) { +- var popup_menu = new Menu (); ++ var popup_menu = new Gtk.Menu (); + popup_menu.attach_to_widget (this, null); + +- var open_visit_menu_item = new MenuItem.with_label (_("Show details")); ++ var open_visit_menu_item = new Gtk.MenuItem.with_label (_("Show details")); + open_visit_menu_item.activate.connect (on_open_visit_menu_item_activate); + popup_menu.append (open_visit_menu_item); + +@@ -102,7 +102,7 @@ + return false; + } + +- private void on_open_visit_menu_item_activate (MenuItem? item = null) { ++ private void on_open_visit_menu_item_activate (Gtk.MenuItem? item = null) { + var visit_window = resource_manager.user_interface.show_visit_window (associated_visit.patient); + visit_window.select_visit (associated_visit); + } diff --git a/community/clipit/PKGBUILD b/community/clipit/PKGBUILD index 5a57a6f2f..c81f2d53f 100644 --- a/community/clipit/PKGBUILD +++ b/community/clipit/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 72903 2012-06-24 18:15:32Z bpiotrowski $ +# $Id: PKGBUILD 76710 2012-09-27 13:37:18Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mihai Militaru <mihai dot militaru at xmpp dot ro> pkgname=clipit pkgver=1.4.2 -pkgrel=3 +pkgrel=4 pkgdesc="Lightweight GTK+ clipboard manager (fork of Parcellite)" arch=('i686' 'x86_64' 'mips64el') url="http://gtkclipit.sourceforge.net/" license=('GPL3') -depends=('gtk2' 'gtk-update-icon-cache' 'hicolor-icon-theme') +depends=('gtk2' 'gtk-update-icon-cache' 'hicolor-icon-theme' 'librsvg') makedepends=('intltool') optdepends=('xdotool: for automatic paste') install=$pkgname.install diff --git a/community/cmatrix/PKGBUILD b/community/cmatrix/PKGBUILD new file mode 100644 index 000000000..2506b8326 --- /dev/null +++ b/community/cmatrix/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 76875 2012-10-01 14:55:29Z bisson $ +# Maintainer: + +pkgname=cmatrix +pkgver=1.2a +pkgrel=6 +pkgdesc="Let you see the matrix code in your console" +arch=('i686' 'x86_64') +url="http://www.asty.org/cmatrix/" +license=('GPL') +depends=('ncurses' 'fontconfig') +install=cmatrix.install +source=(http://www.asty.org/cmatrix/dist/$pkgname-$pkgver.tar.gz) +md5sums=('ebfb5733104a258173a9ccf2669968a1') +sha1sums=('ca078c10322a47e327f07a44c9a42b52eab5ad93') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 mtx.pcf "$pkgdir/usr/share/fonts/misc/mtx.pcf" + install -Dm644 matrix.fnt "$pkgdir/usr/share/kbd/consolefonts/matrix.fnt" + install -Dm644 matrix.psf.gz "$pkgdir/usr/share/kbd/consolefonts/matrix.psf.gz" +} diff --git a/community/cmatrix/cmatrix.install b/community/cmatrix/cmatrix.install new file mode 100644 index 000000000..c46fe4469 --- /dev/null +++ b/community/cmatrix/cmatrix.install @@ -0,0 +1,3 @@ +post_install() { + fc-cache +} diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD index dcaac0eee..177282ddd 100644 --- a/community/compiz/PKGBUILD +++ b/community/compiz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17032 2010-05-17 11:13:51Z rvanharen $ +# $Id: PKGBUILD 77624 2012-10-13 11:41:40Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Hussam Al-Tayeb ht990332@gmail.com # Contributor: Khashayar Naderehvandi <khashayar [at] naderehvandi [dot] net> @@ -9,25 +9,34 @@ pkgname=('compiz-core' 'compiz-decorator-kde' 'compiz-decorator-gtk') pkgver=0.8.8 -pkgrel=3 +pkgrel=4 pkgdesc="Composite manager for Aiglx and Xgl" url="http://www.compiz.org/" license=('GPL' 'LGPL' 'MIT') arch=('i686' 'x86_64' 'mips64el') groups=('compiz' 'compiz-kde' 'compiz-gtk' 'compiz-fusion') makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace' - 'startup-notification' 'librsvg' 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse' 'metacity') + 'startup-notification' 'librsvg' 'libgl' 'dbus' 'glu' 'libxslt' 'fuse' 'metacity') options=(!libtool !emptydirs) conflicts=('compiz' 'compiz-core-git' 'compiz-git') replaces=('compiz') -source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz compiz-build.patch) +source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz + compiz-kde-4.8.patch + compiz-kde-4.9.patch + compiz-gcc-4.7.patch) sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e' - '148656352f8a20b3781ee185025c5c8d4b7d720f') + '148656352f8a20b3781ee185025c5c8d4b7d720f' + '2b6fa7398ccb96172a99f4d12990bbc0491e355c' + '2138342ae9f253bae003e96e91fdd0bc9918291a') build() { cd "$srcdir/compiz-$pkgver" - patch -p1 -i ../compiz-build.patch + + patch -p0 -i ../compiz-gcc-4.7.patch + patch -p1 -i ../compiz-kde-4.8.patch + patch -p1 -i ../compiz-kde-4.9.patch + ./configure --prefix=/usr \ --enable-gnome \ --enable-gtk \ @@ -47,7 +56,7 @@ package_compiz-core() pkgdesc="Composite manager for Aiglx and Xgl" depends=('startup-notification' 'librsvg' \ - 'libgl' 'dbus' 'mesa' 'libxslt' 'fuse') + 'libgl' 'dbus' 'glu' 'libxslt' 'fuse') cd "$srcdir/compiz-$pkgver" make DESTDIR="$pkgdir" install diff --git a/community/compiz/compiz-gcc-4.7.patch b/community/compiz/compiz-gcc-4.7.patch new file mode 100644 index 000000000..28315baec --- /dev/null +++ b/community/compiz/compiz-gcc-4.7.patch @@ -0,0 +1,38 @@ +--- kde/window-decorator-kde4/window.cpp 2010-05-21 11:18:14.000000000 +0000 ++++ kde/window-decorator-kde4/window.cpp 2012-09-12 18:05:00.000000000 +0000 +@@ -59,6 +59,9 @@ + + #include "paintredirector.h" + ++// header for gcc-4.7 compatibility ++#include "unistd.h" ++ + KWD::Window::Window (WId parentId, + WId clientId, + WId frame, +--- configure.ac.orig 2012-09-12 23:39:54.093812000 +0400 ++++ configure.ac 2012-09-12 23:40:37.253686000 +0400 +@@ -72,11 +72,6 @@ + *) CFLAGS="$CFLAGS -Wnested-externs" ;; + esac + +- case " $CFLAGS " in +- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; +- *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;; +- esac +- + if test "x$enable_ansi" = "xyes"; then + case " $CFLAGS " in + *[[\ \ ]]-ansi[[\ \ ]]*) ;; +@@ -95,11 +90,6 @@ + *[[\ \ ]]-Wall[[\ \ ]]*) ;; + *) CXXFLAGS="$CXXFLAGS -Wall" ;; + esac +- +- case " $CXXFLAGS " in +- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;; +- *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;; +- esac + fi + + AC_C_BIGENDIAN diff --git a/community/compiz/compiz-kde-4.8.patch b/community/compiz/compiz-kde-4.8.patch new file mode 100644 index 000000000..f22a3fa21 --- /dev/null +++ b/community/compiz/compiz-kde-4.8.patch @@ -0,0 +1,18 @@ +diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp +--- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp 2012-01-29 22:05:54.000000000 -0500 ++++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp 2012-01-29 22:10:38.000000000 -0500 +@@ -986,10 +986,10 @@ + { + Atom atom = Atoms::compizWindowBlurDecor; + QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; +- Region topRegion = NULL; +- Region bottomRegion = NULL; +- Region leftRegion = NULL; +- Region rightRegion = NULL; ++ ::Region topRegion = NULL; ++ ::Region bottomRegion = NULL; ++ ::Region leftRegion = NULL; ++ ::Region rightRegion = NULL; + int size = 0; + int w, h; + diff --git a/community/compiz/compiz-kde-4.9.patch b/community/compiz/compiz-kde-4.9.patch new file mode 100644 index 000000000..7b56da95c --- /dev/null +++ b/community/compiz/compiz-kde-4.9.patch @@ -0,0 +1,196 @@ +From 3c6f698c12f455661807c4115feaa73007fc33d1 Mon Sep 17 00:00:00 2001 +From: Dennis Kasprzyk <onestone@compiz.org> +Date: Mon, 06 Aug 2012 18:23:17 +0000 +Subject: KDE 4.9 support. + +Little modification for compatibility with KDE 4.8 patch was added by Sergey Popov + +--- +diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp +index a65f99f..78d1a47 100644 +--- a/kde/window-decorator-kde4/window.cpp ++++ b/kde/window-decorator-kde4/window.cpp +@@ -768,6 +768,22 @@ KWD::Window::transparentRect () const + return QRect (); + } + ++KDecorationDefines::WindowOperation ++KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) ++{ ++ Options::MouseCommand com = buttonToCommand (button); ++ ++ if (com == Options::MouseOperationsMenu) ++ return KDecorationDefines::OperationsOp; ++ ++ return KDecorationDefines::NoOp; ++} ++ ++ ++#endif ++ ++#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) ++ + bool + KWD::Window::isClientGroupActive () + { +@@ -837,19 +853,82 @@ KWD::Window::displayClientMenu (int index, const QPoint& pos) + showWindowMenu (pos); + } + +-KDecorationDefines::WindowOperation +-KWD::Window::buttonToWindowOperation(Qt::MouseButtons button) ++#endif ++ ++#if KDE_IS_VERSION(4,8,80) ++QString ++KWD::Window::caption(int idx) const + { +- Options::MouseCommand com = buttonToCommand (button); ++ return mName; ++} + +- if (com == Options::MouseOperationsMenu) +- return KDecorationDefines::OperationsOp; ++void ++KWD::Window::closeTab(long id) ++{ ++ closeWindow (); ++} + +- return KDecorationDefines::NoOp; ++void ++KWD::Window::closeTabGroup() ++{ ++ closeWindow (); ++} ++ ++long ++KWD::Window::currentTabId() const ++{ ++ return (long) mClientId; ++} ++ ++QIcon ++KWD::Window::icon(int idx) const ++{ ++ QIcon icon (mIcon); ++ icon.addPixmap (mMiniIcon); ++ return icon; ++} ++ ++void ++KWD::Window::setCurrentTab(long id) ++{ ++} ++ ++void ++KWD::Window::showWindowMenu(const QPoint& pos, long id) ++{ ++ showWindowMenu (pos); ++} ++ ++void ++KWD::Window::tab_A_before_B(long A, long B) ++{ ++} ++ ++void ++KWD::Window::tab_A_behind_B(long A, long B) ++{ ++} ++ ++int ++KWD::Window::tabCount() const ++{ ++ return 1; ++} ++ ++long ++KWD::Window::tabId(int idx) const ++{ ++ return (long) mClientId; ++} ++ ++void ++KWD::Window::untab(long id, const QRect& newGeom) ++{ + } + + #endif + ++ + void + KWD::Window::createDecoration (void) + { +@@ -987,14 +1066,14 @@ KWD::Window::updateBlurProperty (int topOffset, + int leftOffset, + int rightOffset) + { +- Atom atom = Atoms::compizWindowBlurDecor; +- QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; +- ::Region topRegion = NULL; +- ::Region bottomRegion = NULL; +- ::Region leftRegion = NULL; +- ::Region rightRegion = NULL; +- int size = 0; +- int w, h; ++ Atom atom = Atoms::compizWindowBlurDecor; ++ QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; ++ _XRegion *topRegion = NULL; ++ _XRegion *bottomRegion = NULL; ++ _XRegion *leftRegion = NULL; ++ _XRegion *rightRegion = NULL; ++ int size = 0; ++ int w, h; + + w = mGeometry.width () + mBorder.left + mBorder.right; + h = mGeometry.height () + mBorder.top + mBorder.bottom; +diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h +index c2b274b..1ddfbd1 100644 +--- a/kde/window-decorator-kde4/window.h ++++ b/kde/window-decorator-kde4/window.h +@@ -114,7 +114,10 @@ class Window: public QObject, public KDecorationBridgeUnstable { + virtual bool compositingActive () const; + #if KDE_IS_VERSION(4,3,90) + virtual QRect transparentRect () const; +- ++ virtual WindowOperation ++ buttonToWindowOperation(Qt::MouseButtons button); ++#endif ++#if KDE_IS_VERSION(4,3,90) && !KDE_IS_VERSION(4, 8, 80) + virtual bool isClientGroupActive (); + virtual QList<ClientGroupItem> clientGroupItems () const; + virtual long itemId (int index); +@@ -126,10 +129,27 @@ class Window: public QObject, public KDecorationBridgeUnstable { + virtual void closeClientGroupItem (int index); + virtual void closeAllInClientGroup (); + virtual void displayClientMenu (int index, const QPoint& pos); +- +- virtual WindowOperation +- buttonToWindowOperation(Qt::MouseButtons button); ++ ++#endif ++#if KDE_IS_VERSION(4,8,80) ++ using KDecorationBridge::caption; ++ virtual QString caption(int idx) const; ++ virtual void closeTab(long id); ++ virtual void closeTabGroup(); ++ virtual long currentTabId() const; ++ using KDecorationBridge::icon; ++ virtual QIcon icon(int idx) const; ++ virtual void setCurrentTab(long id); ++ using KDecorationBridge::showWindowMenu; ++ virtual void showWindowMenu(const QPoint& pos, long id); ++ virtual void tab_A_before_B(long A, long B); ++ virtual void tab_A_behind_B(long A, long B); ++ virtual int tabCount() const; ++ virtual long tabId(int idx) const; ++ virtual void untab(long id, const QRect& newGeom); + #endif ++ ++ + virtual bool eventFilter (QObject* o, QEvent* e); + + void handleActiveChange (void); +-- +cgit v0.8.3.1-30-gff3a diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index a67a10498..fc32adb31 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,13 +1,13 @@ -#$ID$ +#$Id: PKGBUILD 77533 2012-10-11 21:23:35Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.6 -pkgrel=3 +pkgver=1.8 +pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL2') depends=('dbus-core' 'iptables' 'glib2' 'gnutls') conflicts=('openresolv') @@ -20,9 +20,8 @@ source=('connmand-daemon' 'allow_group_network.diff') md5sums=('88ece7cbf1d0d289545ce4f8553fdab8' - '317fc8603c15fba07478d71c1891e7cb' + '689468f92a1dcb2c0e30d7d00410ad87' 'a8d22ee089fb0ed725130d16ad393047') - build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD index d92115239..9ceac0edd 100644 --- a/community/conntrack-tools/PKGBUILD +++ b/community/conntrack-tools/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 74777 2012-08-04 01:09:31Z seblu $ +# $Id: PKGBUILD 77959 2012-10-16 01:20:20Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Valere Monseur <valere_monseur@hotmail.com> # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=conntrack-tools -pkgver=1.2.2 +pkgver=1.4.0 pkgrel=1 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system' arch=('i686' 'x86_64' 'mips64el') url='http://www.netfilter.org/projects/conntrack-tools' license=('GPL2') -depends=('libnetfilter_conntrack' 'libnetfilter_cttimeout') +depends=('libnetfilter_conntrack' + 'libnetfilter_cttimeout' + 'libnetfilter_cthelper' + 'libnetfilter_queue') backup=('etc/conntrackd.conf' 'etc/conf.d/conntrackd') -install=$pkgname.install +options=('!libtool') source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2" 'conntrackd.rc' 'conntrackd.conf' 'conntrackd.service' '01-config-file-path.patch') -md5sums=('a8afc813e16265655f83991fc0df35b6' +install=$pkgname.install +md5sums=('ee737c774e01349f75e935228a2d851b' '478fe76da0202fcb5249bf65968d1c26' 'd3e73e81b54e3e8166d357d434680684' 'bd135eaefb47923bb8e8d26f084d3e9d' diff --git a/community/consonance/PKGBUILD b/community/consonance/PKGBUILD new file mode 100644 index 000000000..9206e3a1e --- /dev/null +++ b/community/consonance/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 76320 2012-09-15 20:11:01Z jsteel $ +# Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contributor: Auguste Pop <auguste [at] gmail [dot] com> +# Contributor: boenki <boenki at gmx dot de> +# Contributor: sujith_m82 <m.sujith@gmail.com> + +pkgname=consonance +pkgver=0.5.1 +pkgrel=9 +pkgdesc="A lightweight GTK+ music manager that aims to be fast, bloat-free and light on memory consumption" +arch=('i686' 'x86_64' 'mips64el') +url="http://sites.google.com/site/consonancemanager" +license=('GPL') +depends=('curl' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'libao' 'libcdio' + 'libmad' 'libmodplug' 'libnotify' 'libsndfile' 'sqlite3' 'taglib') +install=$pkgname.install +source=($url/releases-1/$pkgname-$pkgver.tar.gz + libnotify.patch) +md5sums=('2a195dd2314f7b65cc57cc871a4c5a47' + 'caa1e8b41723950fd926bfefccbbd8ac') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + patch -Np1 -i "$srcdir"/libnotify.patch + + ./configure --prefix=/usr + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} diff --git a/community/consonance/consonance.install b/community/consonance/consonance.install new file mode 100644 index 000000000..f1474aee3 --- /dev/null +++ b/community/consonance/consonance.install @@ -0,0 +1,14 @@ +post_install() +{ + usr/bin/update-desktop-database -q +} + +post_upgrade() +{ + post_install +} + +post_remove() +{ + post_install +} diff --git a/community/consonance/libnotify.patch b/community/consonance/libnotify.patch new file mode 100644 index 000000000..f59acbfd9 --- /dev/null +++ b/community/consonance/libnotify.patch @@ -0,0 +1,18 @@ +diff --git a/src/statusicon.c b/src/statusicon.c +index f72e808..04efa58 100644 +--- a/src/statusicon.c ++++ b/src/statusicon.c +@@ -47,11 +47,10 @@ void show_osd(struct con_win *cwin) + + /* Create notification instance */ + +- osd = notify_notification_new_with_status_icon( ++ osd = notify_notification_new( + cwin->cstate->curr_mobj->tags->title, + (const gchar *)body, +- NULL, +- GTK_STATUS_ICON(cwin->status_icon)); ++ gtk_status_icon_get_icon_name(GTK_STATUS_ICON(cwin->status_icon))); + notify_notification_set_timeout(osd, OSD_TIMEOUT); + + /* Add album art if set */ diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 1c08888cc..2f7e40085 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75754 2012-08-30 21:02:43Z spupykin $ +# $Id: PKGBUILD 78310 2012-10-17 14:02:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.0 -pkgrel=4 +pkgrel=5 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" @@ -17,9 +17,13 @@ backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc} - "rc-script.patch") + "couchdb.service" + "couchdb.tmpfiles" + "rc-script.patch") md5sums=('a5cbbcaac288831b3d8a08b725657f10' '890a85b22219ea113a4901a289c442f8' + '8914a7ffc6745f94106d96206709acb4' + '1e254ebe32eeb061be64193bafa35dbf' '8a3b1a1ff98a6411827ad991db7a355b') build() { @@ -42,4 +46,7 @@ package() { sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb rm -rf $pkgdir/etc/default/ $pkgdir/var/run + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/couchdb/couchdb.service b/community/couchdb/couchdb.service new file mode 100644 index 000000000..50284f4c3 --- /dev/null +++ b/community/couchdb/couchdb.service @@ -0,0 +1,12 @@ +[Unit] +Description=CouchDB Server + +[Service] +User=couchdb +Type=forking +PermissionsStartOnly=true +ExecStart=/usr/bin/couchdb -b -o /dev/null -e /dev/null +ExecStop=/usr/bin/couchdb -d + +[Install] +WantedBy=multi-user.target diff --git a/community/couchdb/couchdb.tmpfiles b/community/couchdb/couchdb.tmpfiles new file mode 100644 index 000000000..de4378746 --- /dev/null +++ b/community/couchdb/couchdb.tmpfiles @@ -0,0 +1 @@ +d /run/couchdb 0755 couchdb daemon - diff --git a/community/cpulimit/PKGBUILD b/community/cpulimit/PKGBUILD index 510eab2f6..2dc83fac1 100644 --- a/community/cpulimit/PKGBUILD +++ b/community/cpulimit/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 65094 2012-02-20 03:37:27Z spupykin $ +# $Id: PKGBUILD 76442 2012-09-18 16:13:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=cpulimit -pkgver=1.1 -pkgrel=3 +pkgver=20120918 +pkgrel=1 pkgdesc="Limit cpu usage in %. Actualy sends SIGSTOP/SIGCONT" arch=('i686' 'x86_64' 'mips64el') url="http://cpulimit.sourceforge.net/" license=("GPL") -depends=(glibc) -source=("http://downloads.sourceforge.net/sourceforge/cpulimit/cpulimit-$pkgver.tar.gz") -md5sums=('f4ff6d4bfaef1258e8f5cd2041e2e2a3') +depends=() +source=("$pkgname-$pkgver.tar.gz::https://github.com/opsengine/cpulimit/tarball/master") +md5sums=('a80b8ec21b668d1c15a29ab1f795d1ba') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/opsengine-cpulimit-* make - install -D -m0755 cpulimit $pkgdir/usr/bin/cpulimit + install -Dm0755 src/cpulimit $pkgdir/usr/bin/cpulimit + install -Dm0644 README $pkgdir/usr/share/doc/$pkgname/README } diff --git a/community/cwiid/PKGBUILD b/community/cwiid/PKGBUILD index a98abf2e5..c7fb65484 100644 --- a/community/cwiid/PKGBUILD +++ b/community/cwiid/PKGBUILD @@ -10,7 +10,7 @@ pkgname=cwiid pkgver=0.6.00 pkgrel=12 pkgdesc="Linux Nintendo Wiimote interface" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://abstrakraft.org/cwiid" depends=('bluez' 'gtk2') license=('GPL') diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index f58beb2ad..fb1e47a47 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76034 2012-09-09 18:02:06Z spupykin $ +# $Id: PKGBUILD 78181 2012-10-17 10:23:17Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> pkgname=('cython' 'cython2') pkgbase=cython pkgver=0.17 -pkgrel=1 +pkgrel=2 pkgdesc="C-Extensions for Python " arch=(i686 x86_64 'mips64el') url="http://www.cython.org" @@ -23,6 +23,8 @@ package_cython() { cd $srcdir/Cython-$pkgver python setup.py install --root=$pkgdir + + sed -i 's|#!.*python|#!/usr/bin/python3|' $pkgdir/usr/bin/* } package_cython2() { diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index b3328db88..7907f5fd7 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55000 2011-08-30 09:22:57Z spupykin $ +# $Id: PKGBUILD 78352 2012-10-17 15:16:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante pkgver=1.3.2 -pkgrel=1.1 +pkgrel=2 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64 'mips64el') @@ -14,9 +14,11 @@ backup=('etc/socks.conf' 'etc/sockd.conf') options=('!libtool') source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz - sockd.rc) + sockd.rc + sockd.service) md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd' - '5110dfd78a2b38fff27a886ee88b58a6') + '5110dfd78a2b38fff27a886ee88b58a6' + '41f1ca885e2383d9db0c29bb7904de65') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -36,4 +38,5 @@ package() { # rc-script install -D -m755 ${srcdir}/sockd.rc ${pkgdir}/etc/rc.d/sockd echo 'SOCKD_OPTS="-D"' >${pkgdir}/etc/conf.d/sockd.conf + install -Dm0644 $srcdir/sockd.service $pkgdir/usr/lib/systemd/system/sockd.service } diff --git a/community/dante/sockd.service b/community/dante/sockd.service new file mode 100644 index 000000000..6a18a8b0a --- /dev/null +++ b/community/dante/sockd.service @@ -0,0 +1,11 @@ +[Unit] +Description=SOCKS v4 and v5 compatible proxy server and client + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/sockd.conf +PIDFile=/var/run/sockd.pid +ExecStart=sockd $SOCKD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD index 17576f9f3..a1fc00314 100644 --- a/community/darkstat/PKGBUILD +++ b/community/darkstat/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 69208 2012-04-10 03:44:54Z spupykin $ +# $Id: PKGBUILD 78362 2012-10-17 15:24:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=darkstat pkgver=3.0.715 -pkgrel=2 -pkgdesc="Network statistics gatherer (packet sniffer)." +pkgrel=3 +pkgdesc="Network statistics gatherer (packet sniffer)" url="http://dmr.ath.cx/net/darkstat/" license=("GPL") arch=(i686 x86_64 'mips64el') depends=('libpcap' 'zlib' 'gcc-libs') source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2 darkstat + darkstat.service darkstat.conf) install=darkstat.install md5sums=('5b7abc7538dcd8e30667dac150e81d77' '1021f95fabe16cfab4c95f6264d535e5' + 'd22a09fa1f66b2b1afb8521ceea693d6' 'aa9a9effd1e8f08860afcd6439fc94c5') build() { @@ -30,4 +32,5 @@ package() { # darkstat script install -D -m755 "$srcdir"/darkstat "$pkgdir"/etc/rc.d/darkstat install -D -m644 "$srcdir"/darkstat.conf "$pkgdir"/etc/conf.d/darkstat.conf + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/darkstat/darkstat.service b/community/darkstat/darkstat.service new file mode 100644 index 000000000..5e303411f --- /dev/null +++ b/community/darkstat/darkstat.service @@ -0,0 +1,15 @@ +[Unit] +Description=Network statistics gatherer (packet sniffer) + +[Service] +User=couchdb +Type=forking +EnvironmentFile=/etc/conf.d/darkstat.conf +PIDFile=/var/darkstat/darkstat.pid +ExecStart=/usr/sbin/darkstat --user "darkstat" --chroot "/var/darkstat" \ + --import "darkstat.dat" --export "darkstat.dat" \ + --pidfile /var/darkstat/darkstat.pid \ + -i "$DARKSTAT_IFACE" $DARKSTAT_ARGS + +[Install] +WantedBy=multi-user.target diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 449b3321a..4c1487dfd 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74834 2012-08-06 23:08:51Z andrea $ +# $Id: PKGBUILD 77602 2012-10-13 07:54:00Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,7 +6,7 @@ pkgname=darktable pkgver=1.0.5 _pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ @@ -22,8 +22,9 @@ source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/ md5sums=('9ad88a1a6b9761fce28c8073d8f47941') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt + sed -i 's/-Werror//' src/CMakeLists.txt mkdir -p build cd build cmake \ @@ -38,8 +39,8 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver/build - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="$pkgdir" install mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" # mkdir -p "${pkgdir}/usr/share/gconf/schemas/" # mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 711b3ab11..4b6809042 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72451 2012-06-14 19:06:58Z spupykin $ +# $Id: PKGBUILD 77106 2012-10-05 10:14:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') depends=('gmime24' 'libzdb' 'mhash' 'libevent') @@ -23,10 +23,18 @@ conflicts=('dbmail') provides=('dbmail') source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail.conf.d - dbmail.rc.d) + dbmail.rc.d + dbmail-imapd.service + dbmail-lmtpd.service + dbmail-pop3d.service + dbmail-timsieved.service) md5sums=('eb32235abffdf967253ee9d004e0e4a9' 'e7f72bc360decdb2475266391ad12329' - '30774513fb016b9da08e9cf6f2a0b8e7') + '30774513fb016b9da08e9cf6f2a0b8e7' + '845b8bfe40864c366f7ab69768d1faa2' + '81a59222a43ae89f59299fe798b8e072' + '2e9a9a56ae56218142a115bff3f9a272' + 'd1fb94edb272d2a717af1944ecfd7fce') build() { cd $srcdir/dbmail-${pkgver/_/-}/ @@ -47,4 +55,9 @@ package() { mkdir $pkgdir/usr/share/dbmail cp -r sql/* $pkgdir/usr/share/dbmail/ cp dbmail.schema $pkgdir/usr/share/dbmail/ + + install -Dm0644 $srcdir/dbmail-imapd.service $pkgdir/usr/lib/systemd/system/dbmail-imapd.service + install -Dm0644 $srcdir/dbmail-lmtpd.service $pkgdir/usr/lib/systemd/system/dbmail-lmtpd.service + install -Dm0644 $srcdir/dbmail-pop3d.service $pkgdir/usr/lib/systemd/system/dbmail-pop3d.service + install -Dm0644 $srcdir/dbmail-timsieved.service $pkgdir/usr/lib/systemd/system/dbmail-timsieved.service } diff --git a/community/dbmail/dbmail-imapd.service b/community/dbmail/dbmail-imapd.service new file mode 100644 index 000000000..110bbbdc4 --- /dev/null +++ b/community/dbmail/dbmail-imapd.service @@ -0,0 +1,10 @@ +[Unit] +Description=DBMail Imap Server +After=syslog.target network.target mysqld.service postgresql.service + +[Service] +Type=forking +ExecStart=/usr/sbin/dbmail-imapd + +[Install] +WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-lmtpd.service b/community/dbmail/dbmail-lmtpd.service new file mode 100644 index 000000000..e531b2e3e --- /dev/null +++ b/community/dbmail/dbmail-lmtpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=DBMail LMTP Server +After=syslog.target network.target mysqld.service postgresql.service + +[Service] +Type=forking +ExecStart=/usr/sbin/dbmail-lmtpd + +[Install] +WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-pop3d.service b/community/dbmail/dbmail-pop3d.service new file mode 100644 index 000000000..eacef4459 --- /dev/null +++ b/community/dbmail/dbmail-pop3d.service @@ -0,0 +1,10 @@ +[Unit] +Description=DBMail pop3 Server +After=syslog.target network.target mysqld.service postgresql.service + +[Service] +Type=forking +ExecStart=/usr/sbin/dbmail-pop3d + +[Install] +WantedBy=multi-user.target diff --git a/community/dbmail/dbmail-timsieved.service b/community/dbmail/dbmail-timsieved.service new file mode 100644 index 000000000..847b69580 --- /dev/null +++ b/community/dbmail/dbmail-timsieved.service @@ -0,0 +1,10 @@ +[Unit] +Description=DBMail Sieve Server +After=syslog.target network.target mysqld.service postgresql.service + +[Service] +Type=forking +ExecStart=/usr/sbin/dbmail-timsieved + +[Install] +WantedBy=multi-user.target diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD index 41a245c8f..e97b7973b 100644 --- a/community/dee/PKGBUILD +++ b/community/dee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75926 2012-09-05 16:57:29Z bgyorgy $ +# $Id: PKGBUILD 78182 2012-10-17 10:23:20Z allan $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=dee pkgver=1.0.14 -pkgrel=1 +pkgrel=2 pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/dee" @@ -29,6 +29,6 @@ package() { make DESTDIR="$pkgdir/" install # Install GI overrides for python 3 as well - install -dm755 "$pkgdir/usr/lib/python3.2/site-packages/gi/overrides" - ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.2/site-packages/gi/overrides/Dee.py" + install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides" + ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Dee.py" } diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD index 52599dcff..ba17e9c0b 100644 --- a/community/deja-dup/PKGBUILD +++ b/community/deja-dup/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 69507 2012-04-17 14:32:37Z bgyorgy $ +# $Id: PKGBUILD 77901 2012-10-15 17:33:17Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=deja-dup -pkgver=22.1 +pkgver=24.0 pkgrel=1 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/deja-dup" license=('GPL') -depends=('duplicity' 'gtk3' 'libgnome-keyring' 'libnotify' 'dconf' 'hicolor-icon-theme' 'xdg-utils') +depends=('duplicity' 'libgnome-keyring' 'libpeas' 'libnotify' 'python2-gobject2' 'dconf' 'xdg-utils') makedepends=('vala' 'intltool' 'itstool' 'nautilus') optdepends=('nautilus: backup extension') options=('!libtool') install=$pkgname.install source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz) -md5sums=('cbf7af6f0392ab9ef355a3aeb74c8a79') +md5sums=('335131d1f3c85615339fa8b212db50ae') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD index b588ed08d..832be424c 100644 --- a/community/denemo/PKGBUILD +++ b/community/denemo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72932 2012-06-25 10:29:45Z spupykin $ +# $Id: PKGBUILD 76519 2012-09-21 13:30:51Z 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.4 +pkgver=0.9.6 pkgrel=1 pkgdesc="A music score editor" arch=('i686' 'x86_64' 'mips64el') @@ -16,12 +16,12 @@ depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw' options=('!libtool') backup=('etc/denemo/denemo.conf') source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('25f141beedbb067aa361975935588862') +md5sums=('48dd1b0801dba574517bcaf0b86d714a') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc - sed -i 's|#include <glib/gmessages.h>|#include <glib.h>|' src/pitchrecog.c +# sed -i 's|#include <glib/gmessages.h>|#include <glib.h>|' src/pitchrecog.c make make DESTDIR=$pkgdir install } diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD index 187177a00..7905f5e16 100644 --- a/community/desmume/PKGBUILD +++ b/community/desmume/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69392 2012-04-15 16:03:24Z schuay $ +# $Id: PKGBUILD 77627 2012-10-13 11:41:54Z allan $ # Maintainer: Jonathan Conder <jonno dot conder at gmail dot com> # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Arkham <arkham at archlinux dot us> @@ -12,13 +12,13 @@ pkgname=desmume pkgver=0.9.8 -pkgrel=1 +pkgrel=3 pkgdesc="Nintendo DS emulator" arch=('i686' 'x86_64') url="http://desmume.org/" license=('GPL') depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap' - 'soundtouch' 'alsa-lib' 'zziplib') + 'soundtouch' 'alsa-lib' 'zziplib' 'glu') makedepends=('intltool') install=desmume.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir/" install } -sha256sums=('f405b44e2d7ab3578d6be91a6546bbaa0afc60b2a8d193e4415fea5c5332d585') +md5sums=('fb7c984c924087888b9eaaad8cb1875e') diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index 5fc650a59..c64b4dd14 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70147 2012-04-30 19:17:33Z lcarlier $ +# $Id: PKGBUILD 77600 2012-10-13 07:27:55Z allan $ # Maintainer: Laurent Carlier <lordheavym@gmail.org> # Contributor: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=11 +pkgrel=13 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64' 'mips64el') url="http://openil.sourceforge.net/" diff --git a/community/dhex/PKGBUILD b/community/dhex/PKGBUILD new file mode 100644 index 000000000..d9c0213a3 --- /dev/null +++ b/community/dhex/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 76254 2012-09-15 09:07:29Z aginiewicz $ +# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> + +pkgname=dhex +pkgver=0.68 +pkgrel=1 +pkgdesc="An ncurses-based hexeditor with a diff mode" +arch=('i686' 'x86_64') +url="http://www.dettus.net/dhex/" +license=('GPL') +depends=('ncurses') +source=("http://www.dettus.net/dhex/${pkgname}_${pkgver}.tar.gz") +md5sums=('5109b3d50053553e41d75c8e5c0a0175') + +build() { + cd "${srcdir}/${pkgname}_${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}_${pkgver}" + install -d "${pkgdir}"/usr/{bin,share} + install -d "${pkgdir}"/usr/man/man{1,5} + make DESTDIR="${pkgdir}/usr" install + mv "${pkgdir}/usr/man" "${pkgdir}/usr/share/man" +} + diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD index 0f0e1d72f..0e271b4ae 100644 --- a/community/dictd/PKGBUILD +++ b/community/dictd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 65118 2012-02-20 04:52:24Z spupykin $ +# $Id: PKGBUILD 77122 2012-10-05 10:53:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> pkgname=dictd pkgver=1.12.0 -pkgrel=4 +pkgrel=5 pkgdesc="Online dictionary client and server" url="http://sourceforge.net/projects/dict/" license=('GPL') @@ -24,6 +24,7 @@ source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz" dict.conf dictd.conf dictd.confd + dictd.service site.info dictd.xinetd colorit.conf) @@ -32,6 +33,7 @@ md5sums=('71aaf3a697ea2e9409643f11ea85b53a' 'fb72f7d8c55f84b1b37bbc8d33a8e55a' '64cd6ffdb40fb3367224f91ac44926ac' '838887fee38ae4cebd652d399b1f2266' + '574e316d1f08885882d7b3075e1ea522' 'b8cabf913876e544d919c7f20ff8db9e' 'b7dbc9529df13ff895dae2b4abd080d6' '978c9c079a0fc8d7d42a4cd4000190e7') @@ -52,4 +54,5 @@ package() { install -D -m 0644 $srcdir/site.info $pkgdir/etc/dict/site.info install -D -m 0644 $srcdir/dictd.confd $pkgdir/etc/conf.d/dictd install -D -m 0644 $srcdir/colorit.conf $pkgdir/etc/dict/colorit.conf + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/dictd/dictd.service b/community/dictd/dictd.service new file mode 100644 index 000000000..fa219f72a --- /dev/null +++ b/community/dictd/dictd.service @@ -0,0 +1,11 @@ +[Unit] +Description=Dictd Dictionary Server Daemon +After=network.target + +[Service] +Type=forking +EnvironmentFile=-/etc/conf.d/dictd +ExecStart=/usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS + +[Install] +WantedBy=multi-user.target diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index ba94e2f3c..030116559 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70948 2012-05-20 12:51:03Z spupykin $ +# $Id: PKGBUILD 77118 2012-10-05 10:37:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam pkgver=3.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64' 'mips64el') url="http://dspam.nuclearelephant.com/" @@ -22,10 +22,14 @@ options=('zipman' 'docs' '!libtool') install=$pkgname.install source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz dspam.logrotated - dspam) + dspam + dspam.service + dspam.tmpfiles) md5sums=('0e0e405d3284485b2a43f47eaf6b09bb' '2163ca41de383f09f4d754e2d35cb158' - 'bb2300eff5b2a6eb987750c71a2c2169') + 'bb2300eff5b2a6eb987750c71a2c2169' + '1581a94598cec370b66f37b118970676' + '933643f2204ccbd7e451a439f83db1ea') build() { OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam --enable-daemon --enable-virtual-users \ @@ -37,6 +41,7 @@ build() { [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc/dspam --localstatedir=/var ${OPTS} make } + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install @@ -66,4 +71,7 @@ package() { find -type l -exec ln -sf libdspam.3 {} \; chmod 0755 $pkgdir/usr/bin/* + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/dspam/dspam.service b/community/dspam/dspam.service new file mode 100644 index 000000000..1a5b1e710 --- /dev/null +++ b/community/dspam/dspam.service @@ -0,0 +1,11 @@ +[Unit] +Description=A highly accurate statistical spam filter that uses minimal resources + +[Service] +Type=forking +User=dspam +ExecStart=/usr/bin/dspam --daemon 2>/dev/null +PrivateTmp=true + +[Install] +WantedBy=multi-user.target
\ No newline at end of file diff --git a/community/dspam/dspam.tmpfiles b/community/dspam/dspam.tmpfiles new file mode 100644 index 000000000..9f5910969 --- /dev/null +++ b/community/dspam/dspam.tmpfiles @@ -0,0 +1 @@ +d /var/run/dspam 0770 dspam mail - diff --git a/community/dunst/PKGBUILD b/community/dunst/PKGBUILD new file mode 100644 index 000000000..33337133b --- /dev/null +++ b/community/dunst/PKGBUILD @@ -0,0 +1,32 @@ +$Id: PKGBUILD 76730 2012-09-28 03:35:52Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: feuri + +pkgname=dunst +pkgver=0.4.0 +pkgrel=1 +pkgdesc="a dmenu-ish notification system " +arch=('i686' 'x86_64') +url="http://knopwob.github.com/dunst" +license=(MIT) +depends=(dbus-core libxinerama libxft libxss libxdg-basedir) +makedepends=('git' 'perl') +optdepends=('libnotify: dunst is able to listen to notifications from libnotify') +provides=(notification-daemon) +source=("${pkgname}-${pkgver}.tar.bz2::http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2") +md5sums=('615b673011222f6ab6f5df28def329a9') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + + make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 +} + +package() { + cd "${srcdir}/$pkgname-$pkgver" + + make DESTDIR="${pkgdir}" PREFIX=/usr install + + install -Dm644 "${srcdir}/$pkgname-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} +# vim:set ts=2 sw=2 et: diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index e48dfc041..b9c55eaf2 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 71055 2012-05-22 21:28:05Z lfleischer $ +# $Id: PKGBUILD 78184 2012-10-17 10:23:31Z allan $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity pkgver=0.6.19 -pkgrel=1 +pkgrel=2 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' 'python-paramiko') +depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko') source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) md5sums=('c88122d0b651f84f3bfa42e55591c36b' 'df672ed47b8eb4fd8ffa99711623b6b5') @@ -22,7 +22,11 @@ build() { sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + python2 setup.py install --root="$pkgdir" --optimize=1 # fix broken documentation permissions until upstream does (FS#27301) diff --git a/community/dvdbackup/PKGBUILD b/community/dvdbackup/PKGBUILD new file mode 100644 index 000000000..271c3344d --- /dev/null +++ b/community/dvdbackup/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 76304 2012-09-15 15:57:37Z jsteel $ +# Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contributor: yugrotavele <yugrotavele at archlinux dot us> +# Contributor: Varun Acharya <varun@archlinux.org> +# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de> + +pkgname=dvdbackup +pkgver=0.4.2 +pkgrel=1 +pkgdesc="A tool to rip video DVDs from the command line" +arch=('i686' 'x86_64') +url="http://dvdbackup.sourceforge.net/" +license=('GPL') +depends=('libdvdread') +optdepends=('libdvdcss: to decrypt encrypted dvds') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('28f273b2f27a3afea3a3c965ddbede86') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./configure --prefix=/usr + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} diff --git a/community/dvdrtools/PKGBUILD b/community/dvdrtools/PKGBUILD new file mode 100644 index 000000000..3ce4f7354 --- /dev/null +++ b/community/dvdrtools/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 76869 2012-10-01 14:50:59Z bisson $ +# Maintainer: Alexander Baldeck <alexander@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=dvdrtools +pkgver=0.3.1 +pkgrel=3 +pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives" +arch=('i686' 'x86_64' 'mips64el') +url="http://savannah.nongnu.org/projects/dvdrtools/" +license=('GPL') +depends=('file' 'bash') +makedepends=('transcode') +optdepends=('transcode: video/DVD ripper and encoder for the terminal/console') +conflicts=('cdrkit') +source=(ftp://ftp.archlinux.org/other/dvdrtools/$pkgname-$pkgver.tar.gz) +md5sums=('5707b7e877b853e258cd738938833006') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/dwb/PKGBUILD b/community/dwb/PKGBUILD new file mode 100644 index 000000000..0579c9d73 --- /dev/null +++ b/community/dwb/PKGBUILD @@ -0,0 +1,24 @@ +$Id: PKGBUILD 76661 2012-09-25 22:31:13Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: portix <portix at gmx.net> + +pkgname=dwb +pkgver=2012.08.22 +pkgrel=3 +pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot" +url="http://portix.bitbucket.org/dwb/" +arch=('i686' 'x86_64' 'mips64el') +install=dwb.install +license=('GPL') +depends=('libwebkit' 'desktop-file-utils') +source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz) +md5sums=('5cdf3a2b3f8845071529b44e2d93d653') + +build() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}" + make +} +package() { + cd "${srcdir}"/"${pkgname}"-"${pkgver}" + make DESTDIR=${pkgdir} install +} diff --git a/community/dwb/dwb.install b/community/dwb/dwb.install new file mode 100644 index 000000000..5a5553eba --- /dev/null +++ b/community/dwb/dwb.install @@ -0,0 +1,11 @@ +post_install(){ + update-desktop-database -q +} + +post_upgrade(){ + post_install +} + +post_remove(){ + post_install +} diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index 504a84e76..4e99638b5 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 69754 2012-04-23 09:14:53Z ibiru $ +# $Id: PKGBUILD 76393 2012-09-17 08:46:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=dwdiff -pkgver=2.0 -pkgrel=2 +pkgver=2.0.4 +pkgrel=1 pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64' 'mips64el') url="http://os.ghalkes.nl/dwdiff.html" depends=('diffutils' 'icu') license=('GPL') source=("http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz") -md5sums=('98dd16b58a1f136a2cd49f7dd88c5313') +md5sums=('1bb69cbfb76583f69c6912f925fc4cec') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index 207f18023..a2eee522c 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=75192 +pkgver=76479 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64' 'mips64el') @@ -36,14 +36,13 @@ build() { cp -r $_svnmod $_svnmod-build cd $_svnmod-build - for i in alarm calendar comp-scale cpu diskio deskshow \ - empris engage everything-aspell everything-mpris \ - everything-pidgin everything-places everything-shotgun \ - everything-tracker everything-wallpaper everything-websearch \ - execwatch flame iiirk itask mail mem \ - moon mpdule net photo places quickaccess \ - rain slideshow snow taskbar winlist-ng \ - winselector; do + for i in alarm comp-scale cpu diskio deskshow eektool \ + eenvader.fractal empris engage everything-aspell \ + everything-mpris everything-pidgin everything-places \ + everything-shotgun everything-tracker everything-wallpaper \ + everything-websearch execwatch flame iiirk itask mail mem \ + moon mpdule net photo places rain slideshow snow taskbar \ + winlist-ng winselector; do cd $i ./autogen.sh --prefix=/usr @@ -55,14 +54,13 @@ done package() { cd $srcdir/$_svnmod-build - for i in alarm calendar comp-scale cpu diskio deskshow \ - empris engage everything-aspell everything-mpris \ - everything-pidgin everything-places everything-shotgun \ - everything-tracker everything-wallpaper everything-websearch \ - execwatch flame iiirk itask mail mem \ - moon mpdule net photo places quickaccess \ - rain slideshow snow taskbar winlist-ng \ - winselector; do + for i in alarm comp-scale cpu diskio deskshow eektool \ + eenvader.fractal empris engage everything-aspell \ + everything-mpris everything-pidgin everything-places \ + everything-shotgun everything-tracker everything-wallpaper \ + everything-websearch execwatch flame iiirk itask mail mem \ + moon mpdule net photo places rain slideshow snow taskbar \ + winlist-ng winselector; do cd $i make DESTDIR=$pkgdir install diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index bb40f9079..c47690b63 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75145 2012-08-14 09:52:54Z rvanharen $ +# $Id: PKGBUILD 76290 2012-09-15 10:13:42Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=75235 +pkgver=76686 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index 2c8a27455..b167d97ee 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75143 2012-08-14 09:52:21Z rvanharen $ +# $Id: PKGBUILD 76288 2012-09-15 10:12:52Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e_dbus-svn -pkgver=75202 +pkgver=76526 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/easystroke/PKGBUILD b/community/easystroke/PKGBUILD index e214db55b..ba13a2ce8 100644 --- a/community/easystroke/PKGBUILD +++ b/community/easystroke/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Kevin Sullivan <ksullivan@archlinux.us> pkgname=easystroke -pkgver=0.5.5.1 -pkgrel=2 +pkgver=0.5.6 +pkgrel=1 pkgdesc='Use mouse gestures to initiate commands and hotkeys.' arch=('i686' 'x86_64' 'mips64el') url='http://easystroke.sourceforge.net/' @@ -12,7 +12,7 @@ depends=('gtkmm' 'boost' 'libxtst' 'dbus-glib' 'xorg-server') makedepends=('inputproto' 'intltool' 'gettext' 'xorg-server-devel' 'help2man') install=easystroke.install source=("http://downloads.sourceforge.net/easystroke/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba989d1745415be94afd567e33d124bb') +md5sums=('a9f06576a47deaf6f612bb993685af0f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index 46ba8de11..8e51ab271 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75125 2012-08-14 09:47:15Z rvanharen $ +# $Id: PKGBUILD 76272 2012-09-15 10:07:18Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=75234 +pkgver=76638 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 5988cdb7f..d10ffb663 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 75134 2012-08-14 09:50:05Z rvanharen $ +# $Id: PKGBUILD 76280 2012-09-15 10:10:05Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=75185 +pkgver=76688 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') groups=('e17-libs-svn' 'e17-svn') url="http://www.enlightenment.org" license=('BSD') -depends=('ecore-svn' 'embryo-svn' 'python2' 'lua' 'shared-mime-info') +depends=('ecore-svn' 'embryo-svn' 'lua' 'shared-mime-info') +optdepends=('python2: inkscape2edc') makedepends=('svn') conflicts=('edje') provides=('edje') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index 5812b00d0..7fc8d8805 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75120 2012-08-14 09:45:53Z rvanharen $ +# $Id: PKGBUILD 76266 2012-09-15 10:04:51Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet-svn -pkgver=75190 +pkgver=75994 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index 0f9cd40c6..2c3a63610 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75130 2012-08-14 09:48:59Z rvanharen $ +# $Id: PKGBUILD 76276 2012-09-15 10:08:48Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: bluebugs pkgname=eeze-svn -pkgver=75095 +pkgver=75994 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD index c9363d1a5..33b7348c1 100644 --- a/community/efax-gtk/PKGBUILD +++ b/community/efax-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63538 2012-02-05 11:54:36Z ibiru $ +# $Id: PKGBUILD 76212 2012-09-14 07:41:39Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=efax-gtk pkgver=3.2.9 -pkgrel=2 +pkgrel=3 pkgdesc="A GUI front end for the 'efax' fax program" arch=('i686' 'x86_64') url="http://efax-gtk.sourceforge.net/" diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index 1b4c31b14..991f023c1 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75141 2012-08-14 09:51:39Z rvanharen $ +# $Id: PKGBUILD 76286 2012-09-15 10:12:12Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=efreet-svn -pkgver=75107 +pkgver=75994 pkgrel=1 pkgdesc="freedesktop.org specifications for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 79c8bce7d..028c67d6b 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75118 2012-08-14 09:45:09Z rvanharen $ +# $Id: PKGBUILD 76264 2012-09-15 10:04:07Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=75110 +pkgver=76685 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eio-svn/PKGBUILD b/community/eio-svn/PKGBUILD index 0a0b06cf8..d1d2ceb3f 100644 --- a/community/eio-svn/PKGBUILD +++ b/community/eio-svn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75128 2012-08-14 09:48:06Z rvanharen $ +# $Id: PKGBUILD 76274 2012-09-15 10:08:08Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=eio-svn -pkgver=75111 +pkgver=76634 pkgrel=1 pkgdesc="Async IO library" arch=('i686' 'x86_64') diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index 551c508e1..abb8aff3f 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73545 2012-07-09 12:52:21Z spupykin $ +# $Id: PKGBUILD 77108 2012-10-05 10:15:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.11 -pkgrel=3 +pkgrel=4 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686' 'mips64el') url="http://www.ejabberd.im/" @@ -14,11 +14,13 @@ depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2') backup=(etc/ejabberd/ejabberd.cfg etc/logrotate.d/ejabberd) install=$pkgname.install source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz" - "$pkgname.logrotate" - "$pkgname") + "$pkgname.logrotate" + "$pkgname" + "ejabberd.service") md5sums=('a70b040c4e7602f47718c8afe8780d50' 'f97c8a96160f30e0aecc9526c12e6606' - '2338a6230ce5f9f60be6dddcfa39bc7e') + '2338a6230ce5f9f60be6dddcfa39bc7e' + 'bc4552b833e1927fce52acdbc6d76fb2') build() { cd "$srcdir/$pkgname-$pkgver/src" @@ -35,6 +37,7 @@ package() { install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" chmod ug+r "$pkgdir/etc/$pkgname/"* rm -rf "$pkgdir/var/lock" + install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service } # vim:set ts=2 sw=2 et: diff --git a/community/ejabberd/ejabberd.service b/community/ejabberd/ejabberd.service new file mode 100644 index 000000000..47e5f2e27 --- /dev/null +++ b/community/ejabberd/ejabberd.service @@ -0,0 +1,20 @@ +[Unit] +Description=A distributed, fault-tolerant Jabber/XMPP server +After=network.target + +[Service] +Type=oneshot +User=ejabberd +Group=jabber +LimitNOFILE=16000 +RestartSec=5 +ExecStart=/usr/sbin/ejabberdctl \ + --config /etc/ejabberd/ejabberd.cfg \ + --ctl-config /etc/ejabberd/ejabberdctl.cfg \ + --logs "/var/log/ejabberd" \ + --spool "/var/lib/ejabberd" start +ExecStop=/usr/sbin/ejabberdctl stop +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index 55bf6ec6a..c83652edc 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75150 2012-08-14 09:56:14Z rvanharen $ +# $Id: PKGBUILD 76293 2012-09-15 10:19:50Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=75227 +pkgver=76673 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/emacs-nox/PKGBUILD b/community/emacs-nox/PKGBUILD index 85a888af8..6b01bbd4e 100644 --- a/community/emacs-nox/PKGBUILD +++ b/community/emacs-nox/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 72353 2012-06-12 21:10:00Z jlichtblau $ +# $Id: PKGBUILD 76185 2012-09-12 20:05:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Chris Brannon <cmbrannon@cox.net> pkgname=emacs-nox -pkgver=24.1 +pkgver=24.2 pkgrel=1 pkgdesc="The Emacs Editor, without X11 support" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL') +license=('GPL3') depends=('dbus-core' 'ncurses' 'perl') provides=('emacs') conflicts=('emacs' 'emacs-cvs') @@ -16,7 +16,7 @@ options=('docs') changelog=$pkgname.changelog install=$pkgname.install source=(ftp://ftp.gnu.org/gnu/emacs/emacs-${pkgver}.tar.gz) -sha256sums=('60d26dd1d9c0b955543ae83a2f4dd7c8b6af59e16a06822cfb175f1bf97c8bab') +sha256sums=('6d9892dff6e1761d4a5eba20712beba4f37d77a196f8021081a2e69fcb5bd357') build() { cd ${srcdir}/emacs-$pkgver diff --git a/community/emacs-nox/emacs-nox.changelog b/community/emacs-nox/emacs-nox.changelog index 5e4d8f206..9fe1ae221 100644 --- a/community/emacs-nox/emacs-nox.changelog +++ b/community/emacs-nox/emacs-nox.changelog @@ -1,3 +1,6 @@ +2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * emacs-nox 24.2-1 + 2012-06-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * emacs-nox 24.1-1 diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index 064ee25d1..0b35422c0 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75132 2012-08-14 09:49:39Z rvanharen $ +# $Id: PKGBUILD 76278 2012-09-15 10:09:27Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo-svn -pkgver=75095 +pkgver=76491 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/emotion-svn/PKGBUILD b/community/emotion-svn/PKGBUILD index c9d82c17f..ead3edc5a 100644 --- a/community/emotion-svn/PKGBUILD +++ b/community/emotion-svn/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=emotion-svn -pkgver=75111 +pkgver=76438 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64') diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD index 4ede6336a..1376ee9fd 100755 --- a/community/emprint-svn/PKGBUILD +++ b/community/emprint-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75148 2012-08-14 09:55:49Z rvanharen $ +# $Id: PKGBUILD 76291 2012-09-15 10:19:12Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD index b3603c9f1..ee6e2d97f 100644 --- a/community/enet/PKGBUILD +++ b/community/enet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71720 2012-06-01 18:47:54Z ebelanger $ +# $Id: PKGBUILD 77516 2012-10-11 13:14:20Z svenstaro $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Bj?indeijer <bjorn@lindeijer.nl> pkgname=enet -pkgver=1.3.4 +pkgver=1.3.5 pkgrel=1 pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('e5fb0ca3fd3a9fe7eadbcde4d6af1517') +md5sums=('c75d0be31b6f23330839a68ee66e00f9') build() { cd "${pkgname}-${pkgver}" diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index 033314c34..5a2369599 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69792 2012-04-23 09:41:50Z ibiru $ +# $Id: PKGBUILD 77628 2012-10-13 11:41:57Z allan $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> @@ -6,15 +6,15 @@ pkgname=erlang pkgver=R15B01 -pkgrel=1 +pkgrel=2 pkgdesc='A small concurrent functional programming language developed by Ericsson.' arch=(i686 x86_64 mips64el) url='http://www.erlang.org/index.html' license=('custom') depends=('ncurses' 'glibc') -makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa' 'glu') optdepends=('wxgtk: for wx support' - 'mesa: for wx support' + 'glu: for wx support' 'unixodbc: database' 'java-environment: for Java support') if [ "$CARCH" = "mips64el" ]; then diff --git a/community/esdl/PKGBUILD b/community/esdl/PKGBUILD index f9ce99d8e..58ee0f8ef 100644 --- a/community/esdl/PKGBUILD +++ b/community/esdl/PKGBUILD @@ -4,13 +4,13 @@ pkgname=esdl pkgver=1.2 -pkgrel=1 +pkgrel=2 epoch=2 arch=('x86_64' 'i686' 'mips64el') pkgdesc="SDL and OpenGL bindings for the Erlang programming language" url="http://esdl.sourceforge.net/" license=('custom') -depends=('erlang' 'sdl' 'mesa') +depends=('erlang' 'sdl' 'glu') source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tarball/master") md5sums=('d51f8e2fe07b9e82ff9c2e06af35e3eb') _dirname='dgud-esdl-4139134' diff --git a/community/ethumb-svn/PKGBUILD b/community/ethumb-svn/PKGBUILD index 0f2a67fa5..ea455b16c 100644 --- a/community/ethumb-svn/PKGBUILD +++ b/community/ethumb-svn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75153 2012-08-14 09:58:33Z rvanharen $ +# $Id: PKGBUILD 76284 2012-09-15 10:11:32Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=ethumb-svn -pkgver=75111 +pkgver=75994 pkgrel=1 pkgdesc="Thumbnailing library" arch=('i686' 'x86_64') diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index e926c1516..136f419db 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75159 2012-08-14 10:07:10Z rvanharen $ +# $Id: PKGBUILD 76268 2012-09-15 10:05:31Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=75236 +pkgver=76645 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/evas_generic_loaders-svn/PKGBUILD b/community/evas_generic_loaders-svn/PKGBUILD index 8ad8e7795..345c80acb 100644 --- a/community/evas_generic_loaders-svn/PKGBUILD +++ b/community/evas_generic_loaders-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75312 2012-08-19 08:00:14Z heftig $ +# $Id: PKGBUILD 78523 2012-10-20 09:32:58Z heftig $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas_generic_loaders-svn -pkgver=75109 +pkgver=75875 pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD index d229cb03f..3734d6aa7 100644 --- a/community/ext4magic/PKGBUILD +++ b/community/ext4magic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 67335 2012-03-09 01:54:07Z seblu $ +# $Id: PKGBUILD 76580 2012-09-23 20:37:13Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ext4magic -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url='http://developer.berlios.de/projects/ext4magic/' license=('GPL2') depends=('bzip2' 'file' 'util-linux' 'e2fsprogs') source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('54ed503730b7e279c5cddc99a8821de3') +md5sums=('59c194b71e33aa6bd098b91f802e67d5') build() { cd $pkgname-$pkgver diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD index ee02add11..a9ef5470d 100644 --- a/community/extremetuxracer/PKGBUILD +++ b/community/extremetuxracer/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 63544 2012-02-05 11:55:05Z ibiru $ +# $Id: PKGBUILD 77630 2012-10-13 11:42:09Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Eric Belanger <eric.archlinux.org> # Contributor: Fabio Scotoni <CCuleX.gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=extremetuxracer pkgver=0.4 -pkgrel=3 +pkgrel=4 pkgdesc="Downhill racing game starring Tux" arch=('i686' 'x86_64' 'mips64el') url="http://www.extremetuxracer.com" license=('GPL') -depends=('sdl_mixer' 'tcl>=8.5.0' 'mesa' 'libpng>=1.4.0' 'freetype2' 'libxi' 'libxmu') +depends=('gcc-libs' 'sdl_mixer' 'tcl>=8.5.0' 'libpng>=1.4.0' 'freetype2' 'glu') +makedepends=('mesa' 'libxi' 'libxmu') conflicts=('ppracer' 'etracer') replaces=('ppracer' 'etracer') source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz" @@ -25,7 +26,7 @@ sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d' build() { cd "$srcdir/extremetuxracer-$pkgver" - patch -Np1 -i ${srcdir}/libpng15.patch + patch -Np1 -i "${srcdir}/libpng15.patch" sed -i -e 's/libpng12/libpng15/g' configure ./configure --prefix=/usr make diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index bf9a0c177..7cfa0b279 100644 --- a/community/ffmpeg2theora/PKGBUILD +++ b/community/ffmpeg2theora/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73471 2012-07-08 09:30:01Z ibiru $ +# $Id: PKGBUILD 76759 2012-09-29 12:51:22Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ffmpeg2theora pkgver=0.29 -pkgrel=1 +pkgrel=2 pkgdesc="Simple converter to create Ogg Theora files" arch=('x86_64' 'i686' 'mips64el') url="http://www.v2v.cc/~j/ffmpeg2theora/" diff --git a/community/flac123/PKGBUILD b/community/flac123/PKGBUILD index 3c1e21b46..cb88cdcab 100644 --- a/community/flac123/PKGBUILD +++ b/community/flac123/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 66067 2012-02-22 17:27:23Z cbrannon $ +# $Id: PKGBUILD 78533 2012-10-20 10:17:22Z ebelanger $ # Maintainer: Chris Brannon <chris@the-brannons.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Patrick Burroughs <celticmadman@gmail.com> pkgname=flac123 -pkgver=0.0.11 -pkgrel=4 +pkgver=0.0.12 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') pkgdesc="A command-line program for playing FLAC audio files" url="http://flac-tools.sourceforge.net/" depends=('flac' 'libao' 'popt') -source=(http://downloads.sourceforge.net/flac-tools/${pkgname}-${pkgver}.tar.gz) -md5sums=('60204986d3556330255b87aa42a4c9d1') +source=(http://downloads.sourceforge.net/flac-tools/${pkgname}-${pkgver}-release.tar.gz) +md5sums=('59dacb2584bbe9c61d046ce995108ac6') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + autoreconf --force --install ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } # vim:set ts=2 sw=2 et: diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index 7c386c450..7005c0ff2 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 75601 2012-08-27 13:34:13Z spupykin $ +# $Id: PKGBUILD 77631 2012-10-13 11:42:12Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=flightgear pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) -depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr') +depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') makedepends=('boost' 'cmake') license=("GPL") url="http://www.flightgear.org" diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index ad657268e..646d677d0 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 74419 2012-07-27 14:49:42Z spupykin $ +# $Id: PKGBUILD 77870 2012-10-15 10:22:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ben <ben@benmazer.net> pkgname=fox pkgver=1.6.46 -pkgrel=1 +pkgrel=3 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64' 'mips64el') url="http://www.fox-toolkit.org/" license=('LGPL' 'custom') -depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff') +depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'libxi' 'libpng' 'libtiff' 'glu') +makedepends=('mesa') optdepends=('perl') options=('!libtool') source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD index dad14430d..750f9a1f9 100644 --- a/community/freedroidrpg/PKGBUILD +++ b/community/freedroidrpg/PKGBUILD @@ -1,15 +1,13 @@ -# $Id: PKGBUILD 75817 2012-09-01 20:39:32Z heftig $ +# $Id: PKGBUILD 77877 2012-10-15 10:55:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: nut543 <kfs1@online.no> -#pkgbase=freedroidrpg -#pkgname=('freedroidrpg' 'freedroidrpg-data') pkgname='freedroidrpg' pkgver=0.15.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') -# depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') -depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa') +depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'glu') +makedepends=('mesa') optdepends=('python2' 'espeak') pkgdesc="a mature science fiction role playing game set in the future" url="http://freedroid.sourceforge.net" diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD index 9eff60264..7a50ca009 100644 --- a/community/freeimage/PKGBUILD +++ b/community/freeimage/PKGBUILD @@ -6,7 +6,7 @@ pkgname=freeimage pkgver=3.15.3 -pkgrel=1 +pkgrel=2 pkgdesc="Library project for developers who would like to support popular graphics image formats" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'custom:FIPL') @@ -26,6 +26,9 @@ build() { cp -r FreeImage FreeImagefip + export CFLAGS="$CFLAGS -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS" + export CXXFLAGS="$CXXFLAGS -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS" + cd FreeImage make diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD index 7d6c53646..36da22bf8 100644 --- a/community/freemat/PKGBUILD +++ b/community/freemat/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 75755 2012-08-30 21:02:52Z spupykin $ +# $Id: PKGBUILD 77872 2012-10-15 10:33:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=freemat pkgver=4.1 -pkgrel=4 +pkgrel=6 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" arch=('i686' 'x86_64' 'mips64el') url="http://freemat.sourceforge.net" license=('GPL') -depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi') -makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2') +depends=('qt' 'ffcall' 'fftw' 'portaudio' 'libffi' 'glu') +makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2' 'mesa') install=freemat.install source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz build-fix.patch) @@ -20,6 +20,7 @@ md5sums=('929d31e2310feaff5d380fc2f7b4d1a2' build() { cd $srcdir/FreeMat-$pkgver-Source + unset LDFLAGS rm -f CMakeCache.txt find . -type f -name '*.moc.cpp' -exec rm -f {} \; find . -type f -name 'add.so' -exec rm -f {} \; @@ -30,6 +31,7 @@ build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DUSE_LLVM=OFF \ + -DFORCE_BUNDLED_UMFPACK=ON \ -DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ . @@ -38,7 +40,7 @@ build() { package() { cd $srcdir/FreeMat-$pkgver-Source - make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir install -j1 sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install rm $pkgdir/usr/bin/blas.ini } diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD index f79d9cd07..aba0ba331 100644 --- a/community/freeorion/PKGBUILD +++ b/community/freeorion/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76059 2012-09-10 08:39:54Z arodseth $ +# $Id: PKGBUILD 78495 2012-10-19 23:54:49Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: guini <sidtrun@googlemail.com> # Contributor: Forrest Loomis <cybercyst _ at _ gmail dot com> @@ -7,7 +7,7 @@ pkgname=freeorion pkgver=0.4.1 -pkgrel=1 +pkgrel=3 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion' arch=('x86_64' 'i686') url='http://www.freeorion.org/' @@ -18,7 +18,7 @@ then else depends=('nvidia-cg-toolkit') fi -depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils') +depends=('bullet>=2.81' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils') makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-12' 'graphviz' 'clang' 'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' 'libogg') diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 3a36888a5..f75a1fa80 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76105 2012-09-11 14:05:16Z spupykin $ +# $Id: PKGBUILD 77120 2012-10-05 10:52:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=1 +pkgrel=3 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeradius.org/" @@ -16,10 +16,14 @@ options=('!libtool' '!makeflags') install=$pkgname.install source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} radiusd + freeradius.tmpfiles + freeradius.service krb5-build-fix.patch) md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119' '5dd57af81ba075102581fec45316ba7b' 'f1a6530b1b69d2fa793aa45b2de379bb' + 'f959e89812bedfc9f8308076f78cd74e' + '39eba6d34f8249781e9e917646465632' 'c6a61de7576933f59154a53bfc12a2d2') build() { @@ -42,4 +46,7 @@ package() { chmod o+r $pkgdir/etc/raddb/* mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default rm -rf $pkgdir/var/run + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/freeradius/freeradius.service b/community/freeradius/freeradius.service new file mode 100644 index 000000000..635b6d6f8 --- /dev/null +++ b/community/freeradius/freeradius.service @@ -0,0 +1,15 @@ +[Unit] +Description=FreeRADIUS high performance RADIUS server. +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/radiusd/radiusd.pid +ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd +ExecStartPre=/usr/sbin/radiusd -C +ExecStart=/usr/sbin/radiusd -d /etc/raddb +ExecReload=/usr/sbin/radiusd -C +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/community/freeradius/freeradius.tmpfiles b/community/freeradius/freeradius.tmpfiles new file mode 100644 index 000000000..e4e056a36 --- /dev/null +++ b/community/freeradius/freeradius.tmpfiles @@ -0,0 +1 @@ +d /run/radiusd 0755 radiusd radiusd - diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index 47d537560..3c5b0a4a2 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 76107 2012-09-11 14:06:05Z spupykin $ +# $Id: PKGBUILD 77634 2012-10-13 11:42:27Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl pkgver=1.22.13.1 _pkgver=1.22.13 -pkgrel=1 +pkgrel=2 pkgdesc="VRML viewer" arch=('i686' 'x86_64' 'mips64el') url="http://freewrl.sourceforge.net/" license=('GPL') depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' - 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js') -makedepends=('java-environment' 'xulrunner') + 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js' 'glu') +makedepends=('java-environment' 'xulrunner' 'wget') options=(!libtool) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('27f4bf163011d8ac2088a535cb58a13d') diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD index 3190c641e..fbf3b1149 100644 --- a/community/frei0r-plugins/PKGBUILD +++ b/community/frei0r-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65204 2012-02-20 10:14:02Z spupykin $ +# $Id: PKGBUILD 76620 2012-09-25 09:17:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=frei0r-plugins pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc="frei0r is a minimalistic plugin API for video sources and filters." arch=(i686 x86_64 'mips64el') url="http://www.piksel.org/frei0r" diff --git a/community/fxdesktop/PKGBUILD b/community/fxdesktop/PKGBUILD index dd5f9a3d0..e75d296b8 100644 --- a/community/fxdesktop/PKGBUILD +++ b/community/fxdesktop/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 63570 2012-02-05 11:56:40Z ibiru $ +# $Id: PKGBUILD 77636 2012-10-13 11:42:37Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=fxdesktop pkgver=0.1.12 -pkgrel=5 +pkgrel=6 pkgdesc="Lightweight Desktop Environment" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fxdesktop/" license=('GPL') -depends=('fox>=1.6.0' ) +depends=('fox>=1.6.0') +makedepends=('glu') source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2) md5sums=('9489e7369b5e052e0b6836a3b0670832') diff --git a/community/fxprocessview/PKGBUILD b/community/fxprocessview/PKGBUILD index b735ce6b3..d65db68df 100644 --- a/community/fxprocessview/PKGBUILD +++ b/community/fxprocessview/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 63572 2012-02-05 11:56:52Z ibiru $ +# $Id: PKGBUILD 77637 2012-10-13 11:42:42Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=fxprocessview pkgver=0.5.0 -pkgrel=4 +pkgrel=5 pkgdesc="Process Viewer" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('fox>=1.4.0') +makedepends=('glu') url="http://code.google.com/p/fxdesktop/" source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.gz \ build-fix.patch) diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD index aa61c2a5e..f61078339 100644 --- a/community/galculator/PKGBUILD +++ b/community/galculator/PKGBUILD @@ -1,22 +1,23 @@ +# $Id: PKGBUILD 78485 2012-10-19 15:50:56Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=galculator -pkgver=1.3.4 -pkgrel=2 -pkgdesc="GTK+ based scientific calculator" +pkgver=2.0 +pkgrel=1 +pkgdesc='GTK+ based scientific calculator' arch=('i686' 'x86_64' 'mips64el') -url="http://galculator.sourceforge.net/" +url='http://galculator.sourceforge.net/' license=('GPL') -depends=('libglade') +depends=('gtk3' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') makedepends=('intltool') -install="$pkgname.install" -source=("http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2") -md5sums=('d30e6fbf5947bb1c873bc9d5a21046f1') +install=$pkgname.install +source=(http://downloads.sourceforge.net/galculator/galculator-$pkgver.tar.bz2) +md5sums=('2bec5c1cdab9c5421855f878f8018929') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver LDFLAGS+=' -lm' ./configure --prefix=/usr @@ -24,7 +25,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/galculator/galculator.install b/community/galculator/galculator.install index a852f0449..fe845ffb1 100644 --- a/community/galculator/galculator.install +++ b/community/galculator/galculator.install @@ -1,5 +1,6 @@ post_install() { update-desktop-database -q + [[ -e /usr/bin/gtk-update-icon-cache ]] && gtk-update-icon-cache } post_upgrade() { diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index e1bc2770e..8ae8cd258 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75313 2012-08-19 08:00:28Z heftig $ +# $Id: PKGBUILD 78524 2012-10-20 09:33:12Z heftig $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -20,12 +20,12 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=6 +pkgrel=8 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" -makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' +makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'glu' 'gtk2' 'librsvg' 'xdg-utils' + 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'mesa' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' 'libxcursor' 'libsm' 'intltool' 'mysql' 'postgresql') license=('GPL2') @@ -390,7 +390,7 @@ package_gambas2-gb-db-postgresql() { } package_gambas2-gb-db-sqlite2() { - depends=('gambas2-gb-db' 'sqlite2') + depends=('gambas2-gb-db' 'sqlite2' 'gcc-libs') pkgdesc="Gambas2 Sqlite2 database access component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 @@ -398,7 +398,7 @@ package_gambas2-gb-db-sqlite2() { } package_gambas2-gb-db-sqlite3() { - depends=('gambas2-gb-db' 'sqlite') + depends=('gambas2-gb-db' 'sqlite' 'gcc-libs') pkgdesc="Gambas2 Sqlite3 database access component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 @@ -580,7 +580,7 @@ package_gambas2-gb-gtk-svg() { } package_gambas2-gb-image() { - depends=('gambas2-runtime') + depends=('gambas2-runtime' 'gcc-libs') pkgdesc="Gambas2 image processing component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.image @@ -632,7 +632,7 @@ package_gambas2-gb-net-smtp() { } package_gambas2-gb-opengl() { - depends=('gambas2-runtime' 'libgl' 'mesa') + depends=('gambas2-runtime' 'glu') pkgdesc="Gambas2 OpenGL component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl @@ -778,7 +778,7 @@ package_gambas2-gb-report() { } package_gambas2-gb-sdl() { - depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl') + depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'glu') pkgdesc="Gambas2 SDL component" cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 198bb9272..b0d3af32d 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 75314 2012-08-19 08:00:36Z heftig $ +# $Id: PKGBUILD 78525 2012-10-20 09:33:20Z heftig $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> pkgbase=gambas3 pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' - 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' - 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' - 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' + 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' + 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' + 'gambas3-gb-desktop' 'gambas3-gb-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image' - 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-media' - 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' + 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-media' 'gambas3-gb-mime' + 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=3.2.1 -pkgrel=5 +pkgver=3.3.3 +pkgrel=2 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" @@ -26,11 +26,12 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' - 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm') -options=('!emptydirs' '!makeflags') + 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm' + 'gmime' 'glu') +options=('!emptydirs') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('e7aed820300ff8599e9f74029984f793' +md5sums=('18902ae2bbd0d66d165503aba7e89474' 'b284be39d147ec799f1116a6abc068b4' '6d9e080b66443e7246387b1716d24e31') @@ -52,16 +53,16 @@ package_gambas3-runtime() { install=gambas3-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install cd ../gbx - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install cd ../lib/debug - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install cd ../eval - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install cd ../draw - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install install -D -m644 ../gb.component \ ${pkgdir}/usr/lib/gambas3 @@ -80,13 +81,13 @@ package_gambas3-runtime() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 @@ -101,7 +102,7 @@ package_gambas3-devel() { pkgdesc="Development environment" cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install } package_gambas3-ide() { @@ -111,9 +112,9 @@ package_gambas3-ide() { pkgdesc="Integrated Development Environment" cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install -#!! with the ide !! + #!! with the ide !! install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ ${pkgdir}/usr/share/applications/gambas3.desktop install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ @@ -130,7 +131,7 @@ package_gambas3-script() { install=gambas3-script.install cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## needed for postinst with xdg-utils cd ${srcdir}/${pkgbase}-${pkgver}/app/mime @@ -145,18 +146,19 @@ package_gambas3-script() { } package_gambas3-examples() { - depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' - 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' + depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-complex' 'gambas3-gb-crypt' + 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' - 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' - 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' - 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' - 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') + 'gambas3-gb-image-io' 'gambas3-gb-media' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' + 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' + 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' + 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' + 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgdesc="Applications examples" cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install rm -r ${pkgdir}/usr/{bin,lib} rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} @@ -168,11 +170,11 @@ package_gambas3-gb-cairo() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -186,43 +188,59 @@ package_gambas3-gb-chart() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall rm -r ${pkgdir}/usr/share/gambas3/control rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* ## } +package_gambas3-gb-complex() { + depends=('gambas3-runtime') + pkgdesc="Complex numbers component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/gb.{comp{r,o}*,[d-v]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compr*,[d-v]*} + ## +} + package_gambas3-gb-compress() { depends=('gambas3-runtime' 'bzip2' 'zlib') pkgdesc="Compression support component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]* + rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp{o,l}*,gb.[d-v]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compl*,[d-v]*} ## } @@ -232,11 +250,11 @@ package_gambas3-gb-crypt() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -244,19 +262,35 @@ package_gambas3-gb-crypt() { ## } +package_gambas3-gb-data() { + depends=('gambas3-runtime') + pkgdesc="Data containers component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/gb.{c*,d{b,e,r}*,[e-v]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{c*,d{b,e}*,[e-v]*} + ## +} + package_gambas3-gb-db() { depends=('gambas3-runtime') pkgdesc="Database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## Workaround for splitting rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*} + rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{a,e,r}*,gb.[e-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.d{a,e}*,gb.[e-z]*} ## } @@ -266,13 +300,13 @@ package_gambas3-gb-db-form() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -291,11 +325,11 @@ package_gambas3-gb-db-mysql() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -309,11 +343,11 @@ package_gambas3-gb-db-odbc() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -327,11 +361,11 @@ package_gambas3-gb-db-postgresql() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -340,16 +374,16 @@ package_gambas3-gb-db-postgresql() { } package_gambas3-gb-db-sqlite2() { - depends=('gambas3-gb-db' 'sqlite2') + depends=('gambas3-gb-db' 'sqlite2' 'gcc-libs') pkgdesc="Sqlite2 database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -358,16 +392,16 @@ package_gambas3-gb-db-sqlite2() { } package_gambas3-gb-db-sqlite3() { - depends=('gambas3-gb-db' 'sqlite') + depends=('gambas3-gb-db' 'sqlite' 'gcc-libs') pkgdesc="Sqlite3 database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -376,18 +410,42 @@ package_gambas3-gb-db-sqlite3() { } package_gambas3-gb-desktop() { - depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') + depends=('gambas3-gb-image' 'libsm' 'libxtst') pkgdesc="Desktop component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome + make DESTDIR="${pkgdir}" uninstall + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-desktop-gnome() { + depends=('gambas3-gb-desktop' 'libgnome-keyring') + pkgdesc="Desktop component for Gnome" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome + make -j1 DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -403,11 +461,11 @@ package_gambas3-gb-dbus() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -421,13 +479,13 @@ package_gambas3-gb-eval-highlight() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 @@ -446,15 +504,15 @@ package_gambas3-gb-form() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -475,15 +533,15 @@ package_gambas3-gb-form-dialog() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -504,15 +562,15 @@ package_gambas3-gb-form-mdi() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -533,13 +591,13 @@ package_gambas3-gb-form-stock() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk @@ -559,11 +617,11 @@ package_gambas3-gb-gtk() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall @@ -575,16 +633,16 @@ package_gambas3-gb-gtk() { } package_gambas3-gb-gtk-opengl() { - depends=('gambas3-gb-gtk' 'gtkglext') + depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') pkgdesc="GTK+ toolkit OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -598,11 +656,11 @@ package_gambas3-gb-gsl() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -616,7 +674,7 @@ package_gambas3-gb-image() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## cleanup the workaround @@ -627,12 +685,12 @@ package_gambas3-gb-image() { } package_gambas3-gb-image-effect() { - depends=('gambas3-gb-image') + depends=('gambas3-gb-image' 'gcc-libs') pkgdesc="Image effect component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## cleanup the workaround @@ -648,11 +706,11 @@ package_gambas3-gb-image-imlib() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -662,15 +720,15 @@ package_gambas3-gb-image-imlib() { package_gambas3-gb-image-io() { depends=('gambas3-gb-image' 'gdk-pixbuf2') - pkgdesc="Input/Output component" + pkgdesc="Input/Output image component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -680,15 +738,33 @@ package_gambas3-gb-image-io() { package_gambas3-gb-jit() { depends=('gambas3-runtime' 'llvm') - pkgdesc="Just-in-time compiler for gambas" + pkgdesc="Just-in-time compiler component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-libxml() { + depends=('gambas3-runtime' 'libxml2') + pkgdesc="libxml2 component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.libxml + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -698,15 +774,33 @@ package_gambas3-gb-jit() { package_gambas3-gb-media() { depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base') - pkgdesc="Simplified interface to the GStreamer library" + pkgdesc="Simplified interface to the GStreamer library component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.media - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-mime() { + depends=('gambas3-runtime' 'gmime') + pkgdesc="MIME message component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -716,15 +810,15 @@ package_gambas3-gb-media() { package_gambas3-gb-ncurses() { depends=('gambas3-runtime' 'ncurses') - pkgdesc="Ncurses component for gambas" + pkgdesc="Ncurses component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -738,11 +832,11 @@ package_gambas3-gb-net() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -756,11 +850,11 @@ package_gambas3-gb-net-curl() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -768,17 +862,45 @@ package_gambas3-gb-net-curl() { ## } +package_gambas3-gb-net-pop3() { + depends=('gambas3-gb-net' 'gambas3-gb-mime') + pkgdesc="POP3 component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[f-m]*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[f-m]*,[s-w]*} + ## +} + package_gambas3-gb-net-smtp() { depends=('gambas3-runtime' 'glib2') pkgdesc="SMTP component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -787,16 +909,16 @@ package_gambas3-gb-net-smtp() { } package_gambas3-gb-opengl() { - depends=('gambas3-runtime' 'libgl' 'glew') + depends=('gambas3-runtime' 'glew') pkgdesc="OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl @@ -814,11 +936,11 @@ package_gambas3-gb-opengl-glu() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -832,11 +954,11 @@ package_gambas3-gb-opengl-glsl() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -850,7 +972,7 @@ package_gambas3-gb-option() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## cleanup the workaround @@ -866,11 +988,11 @@ package_gambas3-gb-pcre() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -884,11 +1006,11 @@ package_gambas3-gb-pdf() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -902,11 +1024,11 @@ package_gambas3-gb-qt4() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext @@ -926,11 +1048,11 @@ package_gambas3-gb-qt4-ext() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -939,16 +1061,16 @@ package_gambas3-gb-qt4-ext() { } package_gambas3-gb-qt4-opengl() { - depends=('gambas3-gb-qt4' 'libgl') + depends=('gambas3-gb-qt4' 'gambas3-gb-opengl') pkgdesc="Qt4 toolkit OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -962,11 +1084,11 @@ package_gambas3-gb-qt4-webkit() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -980,13 +1102,13 @@ package_gambas3-gb-report() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1000,16 +1122,16 @@ package_gambas3-gb-report() { } package_gambas3-gb-sdl() { - depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') + depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew') pkgdesc="SDL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1023,11 +1145,11 @@ package_gambas3-gb-sdl-sound() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1041,11 +1163,11 @@ package_gambas3-gb-settings() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1057,11 +1179,11 @@ package_gambas3-gb-settings() { package_gambas3-gb-signal() { depends=('gambas3-runtime') - pkgdesc="Signal component" + pkgdesc="POSIX Signals component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## cleanup the workaround @@ -1077,11 +1199,11 @@ package_gambas3-gb-v4l() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1091,11 +1213,11 @@ package_gambas3-gb-v4l() { package_gambas3-gb-vb() { depends=('gambas3-runtime') - pkgdesc="VB transitional component" + pkgdesc="Visual Basic transitional component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## ## Workaround for splitting @@ -1106,16 +1228,16 @@ package_gambas3-gb-vb() { } package_gambas3-gb-xml() { - depends=('gambas3-runtime') + depends=('gambas3-runtime' 'gcc-libs') pkgdesc="XML component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html @@ -1138,11 +1260,11 @@ package_gambas3-gb-xml-html() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1156,16 +1278,16 @@ package_gambas3-gb-xml-rpc() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/gb.net @@ -1187,11 +1309,11 @@ package_gambas3-gb-xml-xslt() { ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cleanup the workaround cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1205,11 +1327,11 @@ package_gambas3-gb-web() { ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install + make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install ## cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install + make -j1 DESTDIR="${pkgdir}" install ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1218,4 +1340,3 @@ package_gambas3-gb-web() { rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* ## } - diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index 071f2ed22..ad548df59 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 72201 2012-06-10 19:51:58Z foutrelis $ +# $Id: PKGBUILD 78187 2012-10-17 10:23:42Z allan $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> pkgname=gcompris pkgver=12.05 -pkgrel=1 +pkgrel=2 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64' 'mips64el') url="http://gcompris.net/" license=('GPL3') -depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python-pysqlite' +depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python2-pysqlite' 'gstreamer0.10-base-plugins') optdepends=('gnucap: for computer simulation within the electricity activity' 'tuxpaint: for the painting activity' diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD index e132fcdad..8cab17da6 100644 --- a/community/geany/PKGBUILD +++ b/community/geany/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72665 2012-06-18 19:58:17Z arodseth $ +# $Id: PKGBUILD 76751 2012-09-28 23:09:27Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.ro> @@ -7,14 +7,14 @@ pkgname=geany pkgver=1.22 -pkgrel=1 -pkgdesc="Fast and lightweight IDE" +pkgrel=2 +pkgdesc='Fast and lightweight IDE' arch=('i686' 'x86_64' 'mips64el') url="http://www.geany.org/" license=('GPL') -depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'python2') -makedepends=('perlxml' 'intltool') -optdepends=("vte: for terminal support") +depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('perlxml' 'setconf' 'intltool') +optdepends=('vte: for terminal support' 'python2') install=geany.install source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2") options=('!libtool') @@ -30,9 +30,9 @@ build() { msg2 "Python2 fix..." sed -i '0,/on/s//on2/' data/templates/files/main.py msg2 "Fixing FS#10318..." - sed -i 's|MimeType=text/plain;|MimeType=|' geany.desktop + setconf geany.desktop MimeType '' msg2 "Enabling colors for PKGBUILD files..." - sed -i 's|Sh=|Sh=PKGBUILD;|' data/filetype_extensions.conf + setconf data/filetype_extensions.conf Sh PKGBUILD } package() { diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD index 5066202b2..82f7ed14e 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76013 2012-09-08 21:44:20Z arodseth $ +# $Id: PKGBUILD 78189 2012-10-17 10:23:49Z allan $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: fana-m <geminin@gmx.net> @@ -7,15 +7,14 @@ pkgname=gigi pkgver=0.8.0 -pkgrel=12 +pkgrel=14 _fixedrevision=5208 pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)" url="http://gigi.sourceforge.net/" arch=('x86_64' 'i686') license=('LGPL') -depends=('boost' 'mesa' 'libpng' 'libjpeg' 'libtiff' 'freetype2' 'ogre' 'sdl' 'ois' 'python') -makedepends=('subversion' 'cmake' 'setconf' 'doxygen') -conflicts=('gigi-svn' 'mesa-full') +depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python') +makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa') build() { cd "$srcdir" @@ -67,6 +66,11 @@ package() { sed -i "s:$srcdir:/:g" "$f" done + msg2 "Fixing python3 shebang..." + for f in `find "$pkgdir/usr" -name "*.py"`; do + sed -i "s:/env python:/python3:g" "$f" + done + msg2 "Packaging license..." install -Dm 644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/COPYING" diff --git a/community/gl-117/PKGBUILD b/community/gl-117/PKGBUILD index 7bd90379b..03d7820c6 100644 --- a/community/gl-117/PKGBUILD +++ b/community/gl-117/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 65522 2012-02-21 08:42:12Z spupykin $ +# $Id: PKGBUILD 77641 2012-10-13 11:43:14Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: andrewski pkgname=gl-117 pkgver=1.3.2 -pkgrel=5 +pkgrel=6 pkgdesc="An action flight simulator" arch=('i686' 'x86_64' 'mips64el') url="http://www.heptargon.de/gl-117/gl-117.html" license=("GPL") -depends=('freeglut' 'sdl_mixer' 'libxmu' 'libxi') +depends=('freeglut' 'sdl_mixer' 'libxmu' 'libxi' 'glu') source=(http://downloads.sourceforge.net/project/gl-117/gl-117/GL-117%20Source/gl-117-$pkgver-src.tar.bz2 gl-117.desktop gl-117.png) diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD index 37d4a74fb..baad6680c 100644 --- a/community/glabels/PKGBUILD +++ b/community/glabels/PKGBUILD @@ -1,30 +1,27 @@ -# $Id: PKGBUILD 69806 2012-04-23 09:47:01Z ibiru $ +# $Id: PKGBUILD 77545 2012-10-12 03:02:27Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: yugrotavele <yugrotavele at archlinux dot us> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=glabels -pkgver=3.0.0 -pkgrel=3 +pkgver=3.0.1 +pkgrel=1 pkgdesc="Creating labels and business cards the very easy way" arch=('i686' 'x86_64') -url="http://glabels.sourceforge.net/" +url="http://glabels.org/" license=('GPL' 'LGPL') depends=('librsvg' 'evolution-data-server>=3.4.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils') makedepends=('barcode' 'intltool' 'gnome-doc-utils') options=('!libtool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 - fix-gschema.patch) -sha256sums=('a3a3db4dd25bfb1a03f4008f01c5d9045174e78e13ae77438b81bfe4bf14e64a' - 'ef4f368b49fe66fb7e9c1c4edabb96e1f10fd3e8502d695aef6b89388c38cd94') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix-gschema.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-scrollkeeper --disable-schemas-compile + --disable-static --disable-schemas-compile make } diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD index a6648727e..15a639da4 100644 --- a/community/glob2/PKGBUILD +++ b/community/glob2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 73992 2012-07-18 01:06:49Z ibiru $ +# $Id: PKGBUILD 77642 2012-10-13 11:43:21Z allan $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=glob2 pkgver=0.9.4.4 -pkgrel=12 +pkgrel=13 pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" arch=('i686' 'x86_64' 'mips64el') url="http://www.globulation2.org/" license=('GPL3') -depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu' 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('scons' 'boost') +makedepends=('scons' 'boost' 'mesa') install=glob2.install source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz glob2-0.9.4.1-gcc44.patch) diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD index b697c836d..78f1adc33 100644 --- a/community/gmerlin-avdecoder/PKGBUILD +++ b/community/gmerlin-avdecoder/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66296 2012-02-23 13:44:15Z allan $ +# $Id: PKGBUILD 76151 2012-09-12 05:56:57Z ebelanger $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin-avdecoder -pkgver=1.1.0 -pkgrel=5 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Media decoding library" arch=('i686' 'x86_64' 'mips64el') url="http://gmerlin.sourceforge.net/avdec_frame.html" @@ -11,7 +11,7 @@ license=('GPL') depends=('gmerlin' 'openjpeg' 'flac' 'smbclient' 'libmad' 'libmpcdec' 'speex' 'libdca' 'libmpeg2' 'a52dec') source=(http://downloads.sourceforge.net/sourceforge/gmerlin/gmerlin-avdecoder-$pkgver.tar.gz) -md5sums=('c1ea663e9da631453eec4ac79138b6c5') +md5sums=('37b19266b098d9d05bb05ebef138ffbd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 9cdd89b5a..6256f16eb 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66294 2012-02-23 13:44:07Z allan $ +# $Id: PKGBUILD 76142 2012-09-12 05:13:57Z ebelanger $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin -pkgver=1.0.0 -pkgrel=6 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" @@ -17,17 +17,14 @@ optdepends=('alsa-lib: for ALSA support' 'v4l-utils: for video conversion') options=('!libtool' '!makeflags') install=gmerlin.install -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz - libpng.patch) -md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6' - 'c262023434246705296d97bc7337a212') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('2f2a0880e738e71486f04c929ba067f4') build() { cd "$srcdir/$pkgname-$pkgver" rm -rf cpuinfo.sh - patch -p1 -i "$srcdir/libpng.patch" ./configure --prefix=/usr --without-doxygen sed -i 's|LIBS = -lgavl|LIBS = -lgavl -ldl -lpthread -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11|' {lib,tests,apps/*}/Makefile sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 7fcc2020b..6b205fab4 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75579 2012-08-27 10:53:33Z spupykin $ +# $Id: PKGBUILD 77710 2012-10-13 20:01:04Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -7,7 +7,7 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") pkgver=1.5.1.8 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://gmic.sourceforge.net" license=("custom:CeCILL") diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 2ab0c101b..05b970678 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 73994 2012-07-18 01:07:03Z ibiru $ +# $Id: PKGBUILD 77643 2012-10-13 11:43:30Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.10 -pkgrel=4 +pkgrel=5 arch=(i686 x86_64 mips64el) url="http://www.gnu.org/software/gnash/" license=(GPL3) -makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa +makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa glu speex fontconfig gstreamer0.10-base gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext @@ -47,7 +47,7 @@ build() { package_gnash-common() { pkgdesc="A GNU Flash movie player" - depends=(curl giflib sdl agg libjpeg libpng libltdl mesa + depends=(curl giflib sdl agg libjpeg libpng libltdl libgl glu speex fontconfig cairo gstreamer0.10-base boost-libs) diff --git a/community/gnonlin/PKGBUILD b/community/gnonlin/PKGBUILD index 7e8be49c9..92b298cc3 100644 --- a/community/gnonlin/PKGBUILD +++ b/community/gnonlin/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 76128 2012-09-11 20:32:33Z arodseth $ +# $Id: PKGBUILD 76165 2012-09-12 12:34:14Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=gnonlin -pkgver=0.10.16 -pkgrel=3 +pkgver=0.10.17 +pkgrel=1 pkgdesc='Library for creating non-linear video editors' arch=('x86_64' 'i686' 'mips64el') url='http://gnonlin.sourceforge.net/' @@ -15,7 +15,7 @@ makedepends=('python' 'gstreamer0.10-base-plugins>=0.10.36' 'pkgconfig') options=('!libtool') license=('LGPL') source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.bz2") -sha256sums=('0d32028d449c304bc8d467d02c053c64988b2fc5bbeb020c13361f9d7206bbf5') +sha256sums=('e4a2dd8af1c0c97f2f63e918a25c26e871c896e88b7ee85948509f68f29e8935') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnuchess/PKGBUILD b/community/gnuchess/PKGBUILD new file mode 100644 index 000000000..ab77e7855 --- /dev/null +++ b/community/gnuchess/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 76871 2012-10-01 14:52:29Z bisson $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=gnuchess +pkgver=6.0.2 +pkgrel=1 +pkgdesc="Lets most modern computers play a full game of chess" +url="http://www.gnu.org/software/chess/chess.html" +arch=('i686' 'x86_64') +license=('GPL') +depends=('glibc' 'ncurses' 'readline') +source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('566a145479c47f2f9d7d9b7b8119e1b0' + '044487606aa14ecb29ab9613f83918d9') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr install +} diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index e9e17f0ad..7fbf3f806 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71937 2012-06-03 21:24:21Z spupykin $ +# $Id: PKGBUILD 78354 2012-10-17 15:17:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64' 'mips64el') url="http://gnunet.org" @@ -17,8 +17,14 @@ options=('!libtool' '!makeflags') install=gnunet.install source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz{,.sig} gnunet.rc + gnunet.service gnunet.conf.d defaults.conf) +md5sums=('4234ad22e3204941773632a1d0c2e0e8' + '5baf691913b007fb33e365239e3f7217' + '54cce3d2415d95b2e5bd1bd88db3a0ea' + 'f161b46915736e4017e77ad735521453' + '0fe23b2ca5b3fc47a0b5645e04406da0') build() { cd $srcdir/gnunet-$pkgver @@ -34,9 +40,5 @@ package() { install -D -m0644 $srcdir/gnunet.conf.d $pkgdir/etc/conf.d/gnunetd install -D -m0644 $srcdir/defaults.conf $pkgdir/etc/gnunetd.conf rm -rf $pkgdir/usr/include/libltdl $pkgdir/usr/lib/libltdl.* $pkgdir/usr/include/ltdl.h + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } -md5sums=('4234ad22e3204941773632a1d0c2e0e8' - '26135208534eb638f8585ccf19472c6f' - '5baf691913b007fb33e365239e3f7217' - 'f161b46915736e4017e77ad735521453' - '0fe23b2ca5b3fc47a0b5645e04406da0') diff --git a/community/gnunet/gnunet.service b/community/gnunet/gnunet.service new file mode 100644 index 000000000..5625978a5 --- /dev/null +++ b/community/gnunet/gnunet.service @@ -0,0 +1,10 @@ +[Unit] +Description=A framework for secure peer-to-peer networking + +[Service] +User=nobody +Type=forking +ExecStart=/usr/bin/gnunet-arm -s -c /etc/gnunetd.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 7b9c24ce0..d57e9373a 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72888 2012-06-24 13:42:51Z arodseth $ +# $Id: PKGBUILD 77818 2012-10-15 00:41:07Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -9,12 +9,12 @@ # Contributor: Daniel YC Lin <dlin.tw@gmail.com> pkgname=go -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=2 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') -url="http://golang.org/" +url='http://golang.org/' license=('custom') depends=('perl' 'gawk') makedepends=('inetutils') @@ -22,77 +22,84 @@ options=('!strip' '!emptydirs') install=go.install backup=('usr/lib/go/bin') source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" - "$pkgname.sh") -sha256sums=('70fcfb455087c14cc59b7a65c78003fcd1323d73f9b991c1e52db535d6bc95a8' + $pkgname.sh) +sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df' 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') build() { - cd "$srcdir/$pkgname" + if [ "$CARCH" == 'x86_64' ]; then + export GOARCH=amd64 + fi + if [ "$CARCH" == 'i686' ]; then + export GOARCH=386 + fi - export GOROOT_FINAL="/usr/lib/go" - export GOOS=linux - export GOARCH=arm + # Set GOARCH to arm for crosscompilation (currently doesn't work) + cd $srcdir/$pkgname + export GOROOT_FINAL=/usr/lib/go + export GOOS=linux cd src bash make.bash } check() { - cd "$srcdir/$pkgname" + cd $srcdir/$pkgname - export GOROOT="$srcdir/$pkgname" - export PATH="$srcdir/$pkgname/bin:$PATH" + export GOROOT=$srcdir/$pkgname + export PATH=$srcdir/$pkgname/bin:$PATH # TestSimpleMulticastListener will fail in standard chroot. cd src && bash run.bash --no-rebuild || true } package() { - cd "$srcdir/$pkgname" + cd $srcdir/$pkgname install -Dm644 LICENSE \ - "$pkgdir/usr/share/licenses/go/LICENSE" + $pkgdir/usr/share/licenses/go/LICENSE install -Dm644 misc/bash/go \ - "$pkgdir/usr/share/bash-completion/completions/go" + $pkgdir/usr/share/bash-completion/completions/go install -Dm644 misc/emacs/go-mode-load.el \ - "$pkgdir/usr/share/emacs/site-lisp/go-mode-load.el" + $pkgdir/usr/share/emacs/site-lisp/go-mode-load.el install -Dm644 misc/emacs/go-mode.el \ - "$pkgdir/usr/share/emacs/site-lisp/go-mode.el" + $pkgdir/usr/share/emacs/site-lisp/go-mode.el install -Dm644 misc/zsh/go \ - "$pkgdir/usr/share/zsh/site-functions/_go" + $pkgdir/usr/share/zsh/site-functions/_go for f in ftdetect/gofiletype.vim autoload/go/complete.vim indent/go.vim \ ftplugin/go/fmt.vim ftplugin/go/godoc.vim ftplugin/go/import.vim \ syntax/go.vim syntax/godoc.vim plugin/godoc.vim; do - install -Dm644 "misc/vim/$f" "$pkgdir/usr/share/vim/vimfiles/$f" + install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f done - mkdir -p "$pkgdir/"{etc/profile.d,usr/{share/go,lib/go,lib/go/src}} + mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}} - cp -r doc misc -t "$pkgdir/usr/share/go" - ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc" - cp -r --preserve=timestamps bin "$pkgdir/usr" - cp -r --preserve=timestamps pkg "$pkgdir/usr/lib/go" - cp -r --preserve=timestamps $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/" - cp -r --preserve=timestamps $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd" - cp -r --preserve=timestamps $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/" - cp -r --preserve=timestamps $GOROOT/lib "$pkgdir/usr/lib/go/" + cp -r doc misc -t $pkgdir/usr/share/go + ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc + cp -a bin $pkgdir/usr + cp -a pkg $pkgdir/usr/lib/go + cp -a $GOROOT/src/pkg $pkgdir/usr/lib/go/src/ + cp -a $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd + cp -a $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/ + cp -a $GOROOT/lib $pkgdir/usr/lib/go/ + cp -a $GOROOT/include $pkgdir/usr/lib/go/ - install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src" + install -Dm644 src/Make.* $pkgdir/usr/lib/go/src # Remove object files from target src dir - find "$pkgdir/usr/lib/go/src/" -type f -name '*.[ao]' -delete - find "$pkgdir/usr/lib/go/src/pkg" -type f -executable -delete + find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete + find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete # Headers for C modules install -Dm644 src/pkg/runtime/runtime.h \ - "$pkgdir/usr/lib/go/src/pkg/runtime/runtime.h" + $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h install -Dm644 src/pkg/runtime/cgocall.h \ - "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h" + $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h # For packages that source /etc/profile.d/go.sh - install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" + install -Dm755 $srcdir/$pkgname.sh $pkgdir/etc/profile.d/$pkgname.sh # This is to make go get code.google.com/p/go-tour/gotour and # then running the gotour executable work out of the box. @@ -101,12 +108,14 @@ package() { # not /usr/lib/go/bin. Users should use different paths by # setting the appropriate environment variables. # - ln -sf /usr/bin "$pkgdir/usr/lib/go/bin" + ln -sf /usr/bin $pkgdir/usr/lib/go/bin # For godoc - install -Dm644 favicon.ico "$pkgdir/usr/lib/go/favicon.ico" + install -Dm644 favicon.ico $pkgdir/usr/lib/go/favicon.ico + + rm -f $pkgdir/usr/share/go/doc/articles/wiki/get.bin - rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin" + install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION } # vim:set ts=2 sw=2 et: diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD index 0ac84d861..c11484565 100644 --- a/community/gogglesmm/PKGBUILD +++ b/community/gogglesmm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 61917 2012-01-10 23:41:37Z ebelanger $ +# $Id: PKGBUILD 77644 2012-10-13 11:43:35Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sander Jansen <sander@knology.net> pkgname=gogglesmm pkgver=0.12.6 -pkgrel=1 +pkgrel=2 pkgdesc="Music Manager and Player" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/gogglesmm/" license=('GPL3') install=gogglesmm.install -depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite3>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt') -makedepends=('pkgconfig' 'glproto' 'dri2proto') +depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt') +makedepends=('pkgconfig' 'glproto' 'dri2proto' 'glu') replaces=('musicmanager') conflicts=('musicmanager') source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index 0989f108c..727d77cc4 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74617 2012-07-31 19:56:05Z ebelanger $ +# $Id: PKGBUILD 77645 2012-10-13 11:43:38Z allan $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.38 -pkgrel=3 +pkgrel=4 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64 'mips64el') diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index 70f64f6c1..72e242bb4 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 73474 2012-07-08 09:30:16Z ibiru $ +# $Id: PKGBUILD 77646 2012-10-13 11:43:41Z allan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac pkgver=4065 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64' 'mips64el') url="http://gpac.sourceforge.net" license=('LGPL') -depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa') -makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad') +depends=('ffmpeg' 'libjpeg' 'libpng' 'glu') +makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad' 'mesa') optdepends=('jack: for jack support' 'a52dec: for A52 support' 'faad2: for AAC support' 'libmad: for mp3 support') options=('!makeflags') diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD index 9ecbf0343..ddff78f8b 100644 --- a/community/gpsbabel/PKGBUILD +++ b/community/gpsbabel/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 71956 2012-06-04 07:44:12Z spupykin $ +# $Id: PKGBUILD 76414 2012-09-17 13:51:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gpsbabel -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.gpsbabel.org" license=('GPL') depends=('libusb-compat' 'expat') -makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'openjdk6') +makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'java-environment=6' 'docbook-xsl') optdepends=('qt' 'qtwebkit') options=('docs') source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz" "gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD") -md5sums=('916f7e124f6df911a24e1ea323e9c529' +md5sums=('6c4c8f0cb9fcf9f8302585148878f174' '7bdbd243e29a8831842d31c079f04c45') build() { diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index 92a65115e..78e0c9de1 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 73996 2012-07-18 01:07:11Z ibiru $ +# $Id: PKGBUILD 76745 2012-09-28 20:24:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> pkgname=gpsdrive pkgver=2.11 -_pkgver=20120711 -pkgrel=13 +_pkgver=20120928 +pkgrel=14 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64" 'mips64el') url="http://www.gpsdrive.de/" @@ -17,8 +17,8 @@ depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' ' makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') install="gpsdrive.install" #source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz") -source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.xz") -md5sums=('48fe20e111c10d0826d9f05746c9cf74') +source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz") +md5sums=('bc53792529788b81c291a32d628a4850') build() { cd "$srcdir" @@ -34,6 +34,7 @@ build() { cd build sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c + sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD index bbd6c8d17..698ac86bd 100644 --- a/community/grafx2/PKGBUILD +++ b/community/grafx2/PKGBUILD @@ -1,43 +1,42 @@ -# $Id: PKGBUILD 72950 2012-06-25 12:33:19Z arodseth $ +# $Id: PKGBUILD 77732 2012-10-14 01:28:09Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Simon Parzer <simon.parzer@gmail.com> pkgname=grafx2 -pkgver=2.3 -pkgrel=2 -pkgdesc="Pixelart-oriented painting program" +pkgver=2.4 +pkgrel=1 +_pkgrev=2027 +pkgdesc='Pixelart-oriented painting program' arch=('x86_64' 'i686') -url="http://code.google.com/p/grafx2/" +url='http://code.google.com/p/grafx2/' license=('GPL2') install=grafx2.install depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils') makedepends=('gendesk' 'setconf') options=('!emptydirs') -source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz") -sha256sums=('b43fa837e30abfb0830f9a1b793a78ed690fbafdcd378e51197f01998bbf392e') +source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.$_pkgrev-src.tgz") +sha256sums=('97088d07f1bcd668c619da9f1efe7c5782da707306c90c05564df91f51afe9d7') _name=('GrafX2') _exec=('grafx2 %U') _genericname=('Drawing program') _mimetype=('image/bmp;image/gif;image/png;image/x-tga;image/tiff') build() { - cd "$srcdir" + cd $srcdir gendesk -n - setconf "$pkgname.desktop" Categories 'Graphics;2DGraphics;RasterGraphics' - cd "$pkgname/src" + setconf $pkgname.desktop Categories 'Graphics;2DGraphics;RasterGraphics' + cd $pkgname/src make } package() { - cd "$srcdir/$pkgname/src" + cd $srcdir/$pkgname/src - make prefix="/usr" DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "$srcdir/$pkgname/doc/README.txt" \ - "$pkgdir/usr/share/doc/$pkgname/readme.txt" - install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + make prefix=/usr DESTDIR=$pkgdir install + install -Dm644 $srcdir/$pkgname.desktop \ + $pkgdir/usr/share/applications/$pkgname.desktop + install -Dm644 $srcdir/$pkgname/doc/README.txt \ + $pkgdir/usr/share/doc/$pkgname/readme.txt } # vim:set ts=2 sw=2 et: diff --git a/community/gsimplecal/PKGBUILD b/community/gsimplecal/PKGBUILD new file mode 100644 index 000000000..ede1ac540 --- /dev/null +++ b/community/gsimplecal/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 76303 2012-09-15 15:56:51Z jsteel $ +# Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contributor: DrZaius <lou at fakeoutdoorsman dot com> +# Contributor: Victor Feight <vrfeight3 at gmail dot com> + +pkgname=gsimplecal +pkgver=1.6 +pkgrel=1 +pkgdesc="Simple and lightweight GTK calendar" +arch=('i686' 'x86_64' 'mips64el') +url="http://dmedvinsky.github.com/$pkgname" +license=('BSD') +depends=('gtk2') +source=(https://github.com/downloads/dmedvinsky/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('05a596de37491e52b646a0c71ec14841') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./configure --prefix=/usr + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch new file mode 100644 index 000000000..1c6a7dd65 --- /dev/null +++ b/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch @@ -0,0 +1,69 @@ +From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Wed, 12 Sep 2012 03:29:46 -0700 +Subject: [PATCH] fix for ghc 7.6.1 changes + +--- + c2hs/base/general/FileOps.hs | 3 ++- + c2hs/base/state/StateTrans.hs | 3 ++- + c2hs/toplevel/C2HSConfig.hs | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs +index 83ac70c..4914c4b 100644 +--- a/c2hs/base/general/FileOps.hs ++++ b/c2hs/base/general/FileOps.hs +@@ -39,6 +39,7 @@ import Control.Monad (liftM) + import System.Random (newStdGen, randomRs) + + import FNameOps (dirname, stripDirname, addPath) ++import System.IO.Error (catchIOError) + + + -- search for the given file in the given list of directories (EXPORTED) +@@ -89,7 +90,7 @@ mktemp pre post = + in do + h <- openFile fname ReadWriteMode + return (h, fname) +- `catch` \_ -> createLoop (attempts - 1) rs' ++ `catchIOError` \_ -> createLoop (attempts - 1) rs' + -- + sixChars :: [Int] -> ([Int], String) + sixChars is = +diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs +index ada62f4..2ab0ad1 100644 +--- a/c2hs/base/state/StateTrans.hs ++++ b/c2hs/base/state/StateTrans.hs +@@ -84,6 +84,7 @@ import System.IO (fixIO) + import Data.IORef (IORef, newIORef, readIORef, writeIORef) + + import Errors (interr) ++import System.IO.Error (catchIOError) + + infixr 1 +>=, +> + +@@ -337,7 +338,7 @@ fatalsHandledBy m handler = + ioError err + Right a -> return state + ) +- `catch` (\err -> let ++ `catchIOError` (\err -> let + STB handler' = handler err + in + handler' bs gs) +diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs +index e8deddf..af32886 100644 +--- a/c2hs/toplevel/C2HSConfig.hs ++++ b/c2hs/toplevel/C2HSConfig.hs +@@ -46,7 +46,7 @@ import Data.Array (Array, array) + + import Foreign (Ptr, FunPtr) + import Foreign (Storable(sizeOf, alignment), toBool) +-import Foreign.C (CInt) ++import Foreign.C (CInt(..)) + import System.Info (os) + + -- program settings +-- +1.7.12 + diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index 2d83c6a52..18ce2b97d 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 72381 2012-06-13 13:45:43Z tdziedzic $ +# $Id: PKGBUILD 77337 2012-10-09 04:16:44Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gtk2hs-buildtools pkgver=0.12.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." url="http://hackage.haskell.org/package/gtk2hs-buildtools" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') -makedepends=('ghc' 'alex' 'happy' 'haskell-random') +makedepends=('ghc=7.6.1-1' 'alex=3.0.2-2' 'happy=1.18.9-6' 'haskell-random=1.0.1.1-3') depends=('gmp') options=('strip') provides=('haskell-gtk2hs-buildtools') -source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz) -md5sums=('612611d831635024c953d2817b124e29') +source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz + '0001-fix-for-ghc-7.6.1-changes.patch') +md5sums=('612611d831635024c953d2817b124e29' + 'b6551d8085c97bc2c6600ab397833101') build() { cd ${srcdir}/gtk2hs-buildtools-$pkgver + + patch -Np1 -i ${srcdir}/0001-fix-for-ghc-7.6.1-changes.patch + runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} runhaskell Setup build } diff --git a/community/gtkdialog/PKGBUILD b/community/gtkdialog/PKGBUILD index ec5a6197f..92de90fb2 100644 --- a/community/gtkdialog/PKGBUILD +++ b/community/gtkdialog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55992 2011-09-28 11:47:19Z spupykin $ +# $Id: PKGBUILD 76857 2012-10-01 14:34:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dojo <joerg.doll[at]gmx.de> pkgname=gtkdialog -pkgver=0.8.0 +pkgver=0.8.2 pkgrel=1 pkgdesc="Gtkdialog is a small utility for fast and easy GUI building." arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('gtk2' 'libglade') install=gtkdialog.install options=('zipman') source=(http://gtkdialog.googlecode.com/files/gtkdialog-$pkgver.tar.gz) -md5sums=('a1f0c459a610ac3892342efbec27d93d') +md5sums=('4038a04f4ff78ca7b7e52e998754c8c2') build() { cd $srcdir/$pkgname-$pkgver @@ -25,7 +25,7 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir UPDATE_ICON_CACHE=true install rm -f $pkgdir/usr/share/info/dir mkdir -p $pkgdir/usr/share/doc/$pkgname cp -a examples $pkgdir/usr/share/doc/$pkgname/examples diff --git a/community/gtkdialog/gtkdialog.install b/community/gtkdialog/gtkdialog.install index f74f0882b..ef3856eec 100644 --- a/community/gtkdialog/gtkdialog.install +++ b/community/gtkdialog/gtkdialog.install @@ -6,6 +6,8 @@ post_install() { for file in ${filelist[@]}; do install-info $infodir/$file.gz $infodir/dir 2> /dev/null done + + gtk-update-icon-cache -f -t usr/share/icons/hicolor } post_upgrade() { diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index f1c8cc0a7..e61a9cd9d 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72340 2012-06-12 09:32:15Z kkeen $ +# $Id: PKGBUILD 76513 2012-09-20 19:33:36Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Jared Casper <jaredcasper@gmail.com> pkgname=gtkwave -pkgver=3.3.37 +pkgver=3.3.40 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('8747205c6cf1abb34b5a8b2f157f37e0') +md5sums=('f7b4cd0d056084f6725173b7f939152c') build() { cd "${srcdir}/gtkwave-${pkgver}" diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD index a607444d4..af49cd896 100644 --- a/community/guake/PKGBUILD +++ b/community/guake/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 74682 2012-08-02 06:19:50Z bgyorgy $ +# $Id: PKGBUILD 78192 2012-10-17 10:24:02Z allan $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org> pkgname=guake pkgver=0.4.4 -pkgrel=1 +pkgrel=2 pkgdesc='Drop-down terminal for GNOME' arch=('i686' 'x86_64' 'mips64el') url="http://guake.org/" license=('GPL') -depends=('python-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils') +depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool') options=('!libtool') install=$pkgname.install diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD index 833cadbd0..dcb0e0c78 100644 --- a/community/gwibber/PKGBUILD +++ b/community/gwibber/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 72619 2012-06-17 14:19:03Z bgyorgy $ +# $Id: PKGBUILD 78193 2012-10-17 10:24:07Z allan $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=gwibber pkgver=3.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku" arch=('i686' 'x86_64') url="http://gwibber.com/" license=('GPL') -depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'python2-dbus' 'python2-httplib2' 'python-egenix-mx-base' 'python2-oauth' 'python-imaging' 'pyxdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils') +depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'python2-dbus' 'python2-httplib2' 'python2-egenix-mx-base' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool' 'vala>=0.15.0') options=('!libtool') install=$pkgname.install diff --git a/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch new file mode 100644 index 000000000..2e687db21 --- /dev/null +++ b/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch @@ -0,0 +1,33 @@ +From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Tue, 11 Sep 2012 07:43:41 -0700 +Subject: [PATCH] fix incorrect types in documentation/haddock + +--- + src/Documentation/Haddock.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs +index 60bb314..8fd9674 100644 +--- a/src/Documentation/Haddock.hs ++++ b/src/Documentation/Haddock.hs +@@ -59,6 +59,7 @@ import Haddock.Types + import Haddock.Options + import Haddock.Utils + import Main ++import GHC (Ghc) + + + -- | Create 'Interface' structures from a given list of Haddock command-line +@@ -68,7 +69,7 @@ import Main + createInterfaces + :: [Flag] -- ^ A list of command-line flags + -> [String] -- ^ File or module names +- -> IO [Interface] -- ^ Resulting list of interfaces ++ -> Ghc [Interface] -- ^ Resulting list of interfaces + createInterfaces flags modules = do + (_, ifaces, _) <- readPackagesAndProcessModules flags modules + return ifaces +-- +1.7.12 + diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index 10cf419f9..c57706999 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,31 +1,30 @@ -# Maintainer: -# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haddock -pkgver=2.10.0 -pkgrel=2 +pkgver=2.12.0 +pkgrel=1 pkgdesc="Tool for generating documentation for Haskell libraries" url="http://hackage.haskell.org/package/haddock" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -makedepends=('alex' 'happy') -depends=('ghc=7.4.2-1' 'haskell-xhtml=3000.2.1-1' 'haskell-ghc-paths=0.1.0.8-8') +makedepends=('alex=3.0.2-2' 'happy=1.18.9-6') +depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9') install=$pkgname.install -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410') +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" + '0001-fix-incorrect-types-in-documentation-haddock.patch') +sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02' + 'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a') build() { cd "$srcdir/$pkgname-$pkgver" - - # These doesn't make haddock work for ghc 7.4.1 - #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal - #sed -i 's:base >= 4.3 && < 4.5:base:' haddock.cabal - #sed -i 's:#elif __GLASGOW_HASKELL__ == 703:#elif __GLASGOW_HASKELL__ == 704:' src/Haddock/InterfaceFile.hs - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid + patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.patch + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \ + --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock runhaskell Setup register --gen-script @@ -37,11 +36,15 @@ package() { cd "$srcdir/$pkgname-$pkgver" install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -m744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname" runhaskell Setup copy --destdir="$pkgdir" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal" } + +# vim:set ts=2 sw=2 et: diff --git a/community/happy/PKGBUILD b/community/happy/PKGBUILD index fb8ecf1f5..99e4581d9 100644 --- a/community/happy/PKGBUILD +++ b/community/happy/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 72383 2012-06-13 13:45:51Z tdziedzic $ +# $Id: PKGBUILD 77339 2012-10-09 04:16:54Z tdziedzic $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> pkgname=happy -pkgver=1.18.9 -pkgrel=5 +pkgver=1.18.10 +pkgrel=1 pkgdesc="The Parser Generator for Haskell" -url="http://www.haskell.org/happy/" +url="http://hackage.haskell.org/package/happy" arch=('i686' 'x86_64') license=("custom:BSD3") depends=('gmp') -makedepends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1') +makedepends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1') source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('aeb565fe572f979f15a24db0df2de37d') +md5sums=('a1638e89434427e57f68ef311761dc30') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # try was deprecated and removed into control.exception + # we really want tryIOError + #sed 's/try/&IOError/' -i Setup.lhs + runhaskell Setup.lhs configure -O --prefix=/usr runhaskell Setup.lhs build } diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD index 081f77510..3f0ee6008 100644 --- a/community/haskell-bytestring-show/PKGBUILD +++ b/community/haskell-bytestring-show/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 75911 2012-09-05 10:26:10Z spupykin $ +# $Id: PKGBUILD 77340 2012-10-09 04:16:59Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-bytestring-show -pkgver=0.3.5.2 +pkgver=0.3.5.3 pkgrel=1 pkgdesc="Efficient conversion of values into readable byte strings." -#url="http://code.haskell.org/~dolio/" -url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/bytestring-show" +url="http://hackage.haskell.org/package/bytestring-show" license=("BSD3") arch=('i686' 'x86_64') -depends=("ghc=7.4.2-1") +depends=("ghc=7.6.1-1") install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") -md5sums=('bd7cc8c9da04814d5c81041f8f087a8c') +md5sums=('cbcc94f57fc754685f428aba003ba058') build() { cd ${srcdir}/bytestring-show-${pkgver} + # update outdated dependency + sed 's/build-depends: integer-gmp >= 0.2 && < 0.5/build-depends: integer-gmp >= 0.2 \&\& < 0.6/' -i bytestring-show.cabal + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index a292c37c8..f5053689a 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 72385 2012-06-13 13:46:01Z tdziedzic $ +# $Id: PKGBUILD 77341 2012-10-09 04:17:04Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-cairo pkgver=0.12.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'cairo' 'haskell-mtl=2.1.1-1') +depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1') makedepends=("gtk2hs-buildtools") options=('strip') conflicts=('gtk2hs-cairo') diff --git a/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch new file mode 100644 index 000000000..9f544bb27 --- /dev/null +++ b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch @@ -0,0 +1,25 @@ +From 961892779b5f5a2f46d6baa44c31d06c39e56470 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Tue, 11 Sep 2012 05:06:59 -0700 +Subject: [PATCH] update build deps for ghc 7.6.1 + +--- + dataenc.cabal | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dataenc.cabal b/dataenc.cabal +index 1ad42ca..3a4f5bb 100644 +--- a/dataenc.cabal ++++ b/dataenc.cabal +@@ -21,7 +21,7 @@ flag BuildTests + + library + hs-source-dirs: src +- build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.6, containers >= 0.1.0 && < 0.5 ++ build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6 + exposed-modules: + Codec.Binary.Base16 + Codec.Binary.Base32 +-- +1.7.12 + diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD index aa3d36b36..34a0373b3 100644 --- a/community/haskell-dataenc/PKGBUILD +++ b/community/haskell-dataenc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72386 2012-06-13 13:46:06Z tdziedzic $ +# $Id: PKGBUILD 77342 2012-10-09 04:17:11Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.5 @@ -6,18 +6,24 @@ _hkgname=dataenc pkgname=haskell-dataenc pkgver=0.14.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Data encoding library" url="http://hackage.haskell.org/package/dataenc" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.2-1' sh) -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +depends=('ghc=7.6.1-1' sh) +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz + '0001-update-build-deps-for-ghc-7.6.1.patch') install=${pkgname}.install -md5sums=('643a8c022b9c840f801faf9a661fe637') +md5sums=('643a8c022b9c840f801faf9a661fe637' + '662056adcb79efe8898298c271b49600') build() { cd ${srcdir}/${_hkgname}-${pkgver} + + # update build deps for ghc 7.6.1 + patch -Np1 -i ${srcdir}/0001-update-build-deps-for-ghc-7.6.1.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/community/haskell-extensible-exceptions/PKGBUILD b/community/haskell-extensible-exceptions/PKGBUILD new file mode 100644 index 000000000..2f2fbaa3c --- /dev/null +++ b/community/haskell-extensible-exceptions/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 77370 2012-10-09 08:29:13Z foutrelis $ +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> + +_hkgname=extensible-exceptions +pkgname=haskell-${_hkgname} +pkgver=0.1.1.4 +pkgrel=3 +pkgdesc="extensible exceptions for both new and old versions of GHC" +url="http://hackage.haskell.org/package/extensible-exceptions" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.6.1-1' sh) +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=$pkgname.install +md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b') + +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install b/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install new file mode 100644 index 000000000..20c7dce30 --- /dev/null +++ b/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install @@ -0,0 +1,19 @@ +HS_DIR=usr/share/haskell/haskell-extensible-exceptions +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD index b9a2f1e68..8afbfc68f 100644 --- a/community/haskell-ghc-paths/PKGBUILD +++ b/community/haskell-ghc-paths/PKGBUILD @@ -4,12 +4,13 @@ pkgname=haskell-ghc-paths pkgver=0.1.0.8 -pkgrel=8 +pkgrel=9 pkgdesc="Knowledge of GHC's installation directories" url="http://hackage.haskell.org/package/ghc-paths" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.2-1') +arch=('x86_64' 'i686') +depends=('ghc=7.6.1-1') source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") install=haskell-ghc-paths.install md5sums=('d2b23dc563888e380588501d2ce1d82b') diff --git a/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch new file mode 100644 index 000000000..845beb2bd --- /dev/null +++ b/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch @@ -0,0 +1,55 @@ +From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Thu, 27 Sep 2012 04:48:10 -0700 +Subject: [PATCH] compatibility with ghc 7.6.1 + +--- + System/Glib/GObject.chs | 4 +--- + System/Glib/MainLoop.chs | 4 ++-- + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs +index 5f0fe5c..9925d2c 100644 +--- a/System/Glib/GObject.chs ++++ b/System/Glib/GObject.chs +@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do + + {#pointer GDestroyNotify as DestroyNotify#} + +-foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify +- + -- | This function wraps any newly created objects that derives from + -- GInitiallyUnowned also known as objects with + -- \"floating-references\". The object will be refSink (for glib +@@ -225,4 +223,4 @@ isA obj gType = + -- at this point we would normally implement the notify signal handler; + -- I've moved this definition into the Object class of the gtk package + -- since there's a quite a bit of machinery missing here (generated signal +--- register functions and the problem of recursive modules) +\ No newline at end of file ++-- register functions and the problem of recursive modules) +diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs +index 72fecb6..feb4c77 100644 +--- a/System/Glib/MainLoop.chs ++++ b/System/Glib/MainLoop.chs +@@ -71,7 +71,7 @@ import System.Glib.GObject (DestroyNotify, destroyFunPtr) + + {#pointer SourceFunc#} + +-foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc ++foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc + + type HandlerId = {#type guint#} + +@@ -79,7 +79,7 @@ type HandlerId = {#type guint#} + -- + makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify) + makeCallback fun = do +- funPtr <- mkSourceFunc fun ++ funPtr <- mkSourceFunc (const fun) + return (funPtr, destroyFunPtr) + + -- | Sets a function to be called at regular intervals, with the default +-- +1.7.12.1 + diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD index 367c45adb..2ea2ff587 100644 --- a/community/haskell-glib/PKGBUILD +++ b/community/haskell-glib/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 72388 2012-06-13 13:46:17Z tdziedzic $ +# $Id: PKGBUILD 77344 2012-10-09 04:17:23Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-glib pkgver=0.12.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the GLIB library for Gtk2Hs." url="http://hackage.haskell.org/package/glib" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'glib2') +depends=('ghc=7.6.1-1' 'glib2') makedepends=("gtk2hs-buildtools") options=('strip') install=gtk2hs-glib.install provides=('gtk2hs-glib') replaces=('gtk2hs-glib') conflicts=('gtk2hs-glib') -source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) -md5sums=('f2899bd2a2850fe95479ddb63490eb04') +source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz + '0001-compatibility-with-ghc-7.6.1.patch') +md5sums=('f2899bd2a2850fe95479ddb63490eb04' + 'b00660b7102542942b0b9d84b59d1f3c') build() { - cd ${srcdir}/glib-$pkgver + cd glib-$pkgver + + patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/haskell-glib \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index 064702b29..89e49dc07 100644 --- a/community/haskell-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,40 +1,48 @@ -# $Id: PKGBUILD 73280 2012-07-05 11:48:30Z spupykin $ +# $Id: PKGBUILD 77345 2012-10-09 04:17:32Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-gtk pkgver=0.12.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'gtk2' "haskell-pango=0.12.3-2" 'haskell-mtl=2.1.1-1') +depends=('ghc' 'gtk2' "haskell-pango" 'haskell-mtl') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-gtk') replaces=('gtk2hs-gtk') conflicts=('gtk2hs-gtk') options=('strip') install=gtk2hs-gtk.install -source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz) -md5sums=('b10dfe92d2e4dfe3c0c92dd349489727') +source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz + ghc-7.6.1.patch) +md5sums=('b10dfe92d2e4dfe3c0c92dd349489727' + '5fb93f37fe3f494b30ee682a36b8f1b6') build() { - cd ${srcdir}/gtk-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${srcdir}/gtk-${pkgver} + patch -p1 <$srcdir/ghc-7.6.1.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ + --libsubdir=\$compiler/site-local/\$pkgid + sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/UI/Gtk/Types.chs + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/gtk-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk - runhaskell Setup copy --destdir=${pkgdir} + _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-` + _hpangover=`pacman -Q haskell-pango | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc" "gtk2" "haskell-pango=${_hpangover}" "haskell-mtl=${_hmtlver}") + + cd ${srcdir}/gtk-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk + runhaskell Setup copy --destdir=${pkgdir} } diff --git a/community/haskell-gtk/ghc-7.6.1.patch b/community/haskell-gtk/ghc-7.6.1.patch new file mode 100644 index 000000000..5e259a38f --- /dev/null +++ b/community/haskell-gtk/ghc-7.6.1.patch @@ -0,0 +1,574 @@ +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs gtk/Graphics/UI/Gtk/Abstract/Object.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Abstract/Object.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -126,7 +126,8 @@ + + {#pointer GWeakNotify#} + +-foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify ++foreign import ccall "wrapper" mkDestructor ++ :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify + + -- | Attach a callback that will be called after the + -- destroy hooks have been called +@@ -134,7 +135,7 @@ + objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify + objectWeakref obj uFun = do + funPtrContainer <- newIORef nullFunPtr +- uFunPtr <- mkDestructor $ do ++ uFunPtr <- mkDestructor $ \_ _ -> do + uFun + funPtr <- readIORef funPtrContainer + freeHaskellFunPtr funPtr +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs gtk/Graphics/UI/Gtk/Entry/Entry.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Entry/Entry.chs 2012-10-02 16:27:26.000000000 +0400 +@@ -78,6 +78,10 @@ + entrySetCompletion, + entryGetCompletion, + #endif ++#if GTK_CHECK_VERSION (2,18,0) ++ entryGetBuffer, ++ entrySetBuffer, ++#endif + #if GTK_CHECK_VERSION(2,20,0) + entryGetIconWindow, + entryGetTextWindow, +@@ -104,6 +108,9 @@ + entryAlignment, + entryCompletion, + #endif ++#if GTK_CHECK_VERSION (2,18,0) ++ entryBuffer, ++#endif + + -- * Signals + entryActivate, +@@ -157,6 +164,9 @@ + import Graphics.UI.Gtk.Gdk.EventM (EventM, EButton, EKey) + import Control.Monad.Reader ( ask ) + import Control.Monad.Trans ( liftIO ) ++#if GTK_CHECK_VERSION (2,18,0) ++import Graphics.UI.Gtk.Entry.EntryBuffer ++#endif + {#import Graphics.UI.Gtk.Types#} + {#import Graphics.UI.Gtk.Signals#} + +@@ -429,6 +439,23 @@ + (toEntry self) + #endif + ++#if GTK_CHECK_VERSION(2,18,0) ++-- | Get the 'EntryBuffer' object which holds the text for this widget. ++entryGetBuffer :: EntryClass self => self ++ -> IO EntryBuffer ++entryGetBuffer self = ++ makeNewGObject mkEntryBuffer $ ++ {# call gtk_entry_get_buffer #} ++ (toEntry self) ++ ++-- | Set the 'EntryBuffer' object which holds the text for this widget. ++entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self ++ -> buffer -> IO () ++entrySetBuffer self = ++ {# call gtk_entry_set_buffer #} ++ (toEntry self) . toEntryBuffer ++#endif ++ + #if GTK_CHECK_VERSION(2,20,0) + -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when + -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to +@@ -623,6 +650,15 @@ + entrySetCompletion + #endif + ++#if GTK_CHECK_VERSION(2,18,0) ++entryBuffer :: (EntryClass self, EntryBufferClass buffer) => ++ ReadWriteAttr self EntryBuffer buffer ++entryBuffer = newAttr ++ entryGetBuffer ++ entrySetBuffer ++#endif ++ ++ + -------------------- + -- Signals + +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc gtk/Graphics/UI/Gtk/Gdk/EventM.hsc +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-10-02 16:27:27.000000000 +0400 +@@ -639,14 +639,16 @@ + + + -- | Execute an event handler and assume it handled the event unless it +--- threw a pattern match exception. ++-- threw a pattern match exception or calls mzero (e.g. via guard). + tryEvent :: EventM any () -> EventM any Bool + tryEvent act = do + ptr <- ask + liftIO $ (runReaderT (act >> return True) ptr) + #if __GLASGOW_HASKELL__ >= 610 + `catches` [ Handler (\ (PatternMatchFail _) -> return False) +- , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e ++ , Handler (\ e -> if isUserError e && ++ ("Pattern" `isPrefixOf` ioeGetErrorString e || ++ "mzero" == ioeGetErrorString e) + then return False + else throw e) ] + #else +@@ -654,6 +656,8 @@ + IOException e + | "user error (Pattern" `isPrefixOf` show e -> + return False ++ | "user error (mzero" `isPrefixOf` show e -> ++ return False + PatternMatchFail _ -> return False + _ -> throw e) + #endif +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-10-02 16:27:28.000000000 +0400 +@@ -69,6 +69,7 @@ + + -- * Constructors + pixbufNew, ++ pixbufNewFromData, + pixbufNewFromFile, + #if GTK_CHECK_VERSION(2,4,0) + pixbufNewFromFileAtSize, +@@ -402,6 +403,19 @@ + (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width) + (fromIntegral height) + ++pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf ++pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride ++ = wrapNewGObject mkPixbuf $ ++ {#call pixbuf_new_from_data #} ++ imData ++ (fromIntegral . fromEnum $ cSpace) ++ (fromBool hasAlpha) ++ (fromIntegral bitsPerSample) ++ (fromIntegral width) ++ (fromIntegral height) ++ (fromIntegral rowStride) ++ nullFunPtr nullPtr ++ + -- | Create a new image from a String. + -- + -- * Creates a new pixbuf from a string description. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs gtk/Graphics/UI/Gtk/General/Clipboard.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/General/Clipboard.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -260,7 +260,7 @@ + -- data succeeded. + clipboardSetWithData self targets getFunc clearFunc = do + gFunPtr <- mkClipboardGetFunc +- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) ++ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) + cFunPtr <- mkClipboardClearFunc + (\_ _ -> clearFunc) + res <- withTargetEntries targets $ \nTargets targets -> +@@ -282,7 +282,7 @@ + {#pointer ClipboardClearFunc#} + + foreign import ccall "wrapper" mkClipboardGetFunc :: +- (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc ++ (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc + + foreign import ccall "wrapper" mkClipboardClearFunc :: + (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc +@@ -313,7 +313,7 @@ + -- ignored. + clipboardSetWithOwner self targets getFunc clearFunc owner = do + gFunPtr <- mkClipboardGetFunc +- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) ++ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) + cFunPtr <- mkClipboardClearFunc + (\_ _ -> clearFunc) + res <- withTargetEntries targets $ \nTargets targets -> +@@ -404,7 +404,7 @@ + clipboardRequestContents self (Atom target) callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + runReaderT callback sPtr + return ()) +@@ -418,7 +418,7 @@ + {#pointer ClipboardReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardReceivedFunc :: +- (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc ++ (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc + + -- %hash c:7bb1 d:4ef1 + -- | Requests the contents of the clipboard as text. When the text is later +@@ -439,7 +439,7 @@ + clipboardRequestText self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardTextReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mStr <- if sPtr==nullPtr then return Nothing else + liftM Just $ peekUTFString sPtr +@@ -453,7 +453,7 @@ + {#pointer ClipboardTextReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardTextReceivedFunc :: +- (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc ++ (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc + + + #if GTK_CHECK_VERSION(2,6,0) +@@ -477,7 +477,7 @@ + clipboardRequestImage self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardImageReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr) + callback mPixbuf) +@@ -490,7 +490,7 @@ + {#pointer ClipboardImageReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardImageReceivedFunc :: +- (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc ++ (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc + + #endif + +@@ -513,7 +513,7 @@ + clipboardRequestTargets self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardTargetsReceivedFunc +- (\_ tPtr len -> do ++ (\_ tPtr len _ -> do + -- We must free Haskell pointer *in* the callback to avoid segfault. + freeHaskellFunPtr =<< readIORef cbRef + mTargets <- if tPtr==nullPtr then return Nothing else +@@ -528,7 +528,7 @@ + {#pointer ClipboardTargetsReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc :: +- (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc ++ (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc + + #if GTK_CHECK_VERSION(2,10,0) + -- %hash c:5601 d:d6a6 +@@ -552,10 +552,10 @@ + clipboardRequestRichText self buffer callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardRichTextReceivedFunc +- (\_ tPtr sPtr len -> do ++ (\_ tPtr sPtr len _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do +- str <- peekUTFStringLen (sPtr,fromIntegral len) ++ str <- peekUTFStringLen (castPtr sPtr,fromIntegral len) + return (Atom tPtr, str) + callback mRes) + writeIORef cbRef cbPtr +@@ -568,7 +568,7 @@ + {#pointer ClipboardRichTextReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc :: +- (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) -> ++ (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) -> + IO ClipboardRichTextReceivedFunc + #endif + #endif +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs gtk/Graphics/UI/Gtk/General/General.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/General/General.chs 2012-10-02 16:27:28.000000000 +0400 +@@ -202,7 +202,7 @@ + -- their arguments from the main loop, that is, from the OS thread of Gtk, + -- thereby ensuring that any Gtk and OS function can be called. + -- +-{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #} ++{#fun gdk_threads_enter as threadsEnter {} -> `()' #} + + -- | Release the global Gtk lock. + -- +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -493,17 +493,17 @@ + {# call gtk_combo_box_set_row_separator_func #} + (toComboBox self) nullFunPtr nullPtr nullFunPtr + comboBoxSetRowSeparatorSource self (Just (model, extract)) = do +- funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do ++ funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do + iter <- peek iterPtr + value <- customStoreGetRow model iter +- return (extract value) ++ return (fromBool $ extract value) + {# call gtk_combo_box_set_row_separator_func #} + (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr + + {#pointer TreeViewRowSeparatorFunc#} + + foreign import ccall "wrapper" mkRowSeparatorFunc :: +- (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc ++ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc + + -- %hash c:5bf8 + -- | Sets whether the popup menu should have a tearoff menu item. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-10-02 16:27:30.000000000 +0400 +@@ -76,6 +76,12 @@ + menuItemNewWithMnemonic, + + -- * Methods ++#if GTK_CHECK_VERSION(2,16,0) ++ menuItemSetLabel, ++ menuItemGetLabel, ++ menuItemSetUseUnderline, ++ menuItemGetUseUnderline, ++#endif + menuItemSetSubmenu, + menuItemGetSubmenu, + menuItemRemoveSubmenu, +@@ -89,6 +95,10 @@ + -- * Attributes + menuItemSubmenu, + menuItemRightJustified, ++#if GTK_CHECK_VERSION(2,16,0) ++ menuItemLabel, ++ menuItemUseUnderline, ++#endif + + -- * Signals + menuItemActivateItem, +@@ -163,7 +173,36 @@ + + -------------------- + -- Methods ++#if GTK_CHECK_VERSION(2,16,0) ++-- | Sets text on the MenuItem label ++ ++menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO () ++menuItemSetLabel self label = ++ withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self) ++ ++-- | Gets text on the MenuItem label ++menuItemGetLabel :: (MenuItemClass self) => self -> IO String ++menuItemGetLabel self = ++ {# call gtk_menu_item_get_label #} ++ (toMenuItem self) ++ >>= \strPtr -> if strPtr == nullPtr ++ then return "" ++ else peekUTFString strPtr ++ ++-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key. ++-- ++menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO () ++menuItemSetUseUnderline self = ++ {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool + ++-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key. ++-- ++menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool ++menuItemGetUseUnderline self = ++ liftM toBool $ {# call gtk_menu_item_get_use_underline #} ++ (toMenuItem self) ++ ++#endif + -- | Sets the item's submenu, or changes it. + -- + menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO () +@@ -278,6 +317,22 @@ + menuItemGetRightJustified + menuItemSetRightJustified + ++#if GTK_CHECK_VERSION(2,16,0) ++-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel' ++-- ++menuItemLabel :: MenuItemClass self => Attr self String ++menuItemLabel = newAttr ++ menuItemGetLabel ++ menuItemSetLabel ++ ++-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and ++-- 'menuItemGetUseEUnderline' ++-- ++menuItemUseUnderline :: MenuItemClass self => Attr self Bool ++menuItemUseUnderline = newAttr ++ menuItemGetUseUnderline ++ menuItemSetUseUnderline ++#endif + -------------------- + -- Signals + +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-10-02 16:27:33.000000000 +0400 +@@ -239,7 +239,7 @@ + customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource, + customTreeDragDestIface = fromMaybe dummyDragDest mDragDest } + privPtr <- newStablePtr priv +- liftM con $ makeNewGObject (CustomStore, objectUnref) $ ++ liftM con $ wrapNewGObject (CustomStore, objectUnref) $ + gtk2hs_store_new implPtr privPtr + + foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new" +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -427,7 +427,7 @@ + {#pointer TreeModelForeachFunc#} + + foreign import ccall "wrapper" mkTreeModelForeachFunc :: +- (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) -> ++ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) -> + IO TreeModelForeachFunc + + #if GTK_CHECK_VERSION(2,2,0) +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -160,7 +160,7 @@ + {#pointer TreeModelFilterVisibleFunc #} + + foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc :: +- (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> ++ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> + IO TreeModelFilterVisibleFunc + + -- %hash c:a56d d:b42e +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -151,7 +151,7 @@ + treeSelectionSetSelectFunction :: TreeSelectionClass self => self + -> TreeSelectionCB -> IO () + treeSelectionSetSelectFunction ts fun = do +- fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do ++ fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do + path <- peekTreePath (castPtr tp) + liftM fromBool $ fun path + ) +@@ -168,7 +168,7 @@ + {#pointer TreeSelectionFunc#} + + foreign import ccall "wrapper" mkTreeSelectionFunc :: +- (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)-> ++ (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)-> + IO TreeSelectionFunc + + -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on. +@@ -199,7 +199,7 @@ + -> TreeSelectionForeachCB + -> IO () + treeSelectionSelectedForeach self fun = do +- fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do ++ fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do + -- make a deep copy of the iterator. This makes it possible to store this + -- iterator in Haskell land somewhere. The TreeModel parameter is not + -- passed to the function due to performance reasons. But since it is +@@ -219,7 +219,7 @@ + {#pointer TreeSelectionForeachFunc#} + + foreign import ccall "wrapper" mkTreeSelectionForeachFunc :: +- (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc ++ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc + + #if GTK_CHECK_VERSION(2,2,0) + -- | Creates a list of paths of all selected rows. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs gtk/Graphics/UI/Gtk/ModelView/TreeView.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -582,7 +582,7 @@ + {#pointer TreeViewColumnDropFunc#} + + foreign import ccall "wrapper" mkTreeViewColumnDropFunc :: +- (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> ++ (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> + Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc + + -- | Scroll to a coordinate. +@@ -798,7 +798,7 @@ + {#pointer TreeViewMappingFunc#} + + foreign import ccall "wrapper" mkTreeViewMappingFunc :: +- (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) -> ++ (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) -> + IO TreeViewMappingFunc + + -- | Check if row is expanded. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-10-02 16:27:34.000000000 +0400 +@@ -1251,16 +1251,26 @@ + + -- | A 'Pixbuf' is inserted into the buffer. + -- ++-- * See note in 'bufferInsertText'. ++-- + insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ()) + insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy) + + -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'. + -- Insertion actually occurs in the default handler. + -- ++-- * See note in 'bufferInsertText'. ++-- + insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ()) + insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy) + +--- | Some text was inserted. ++-- | Some text is inserted. Insertion actually occurs in the default handler. ++-- ++-- * The function connected to this handler may not modify the buffer since ++-- this would invalidate the iterator. If this function replaces the ++-- default handler, it needs to stop the emission of this signal in order ++-- to prevent the default handler from running. If additional text should ++-- be inserted, this can be done using the 'after' function to connect. + -- + bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ()) + bufferInsertText = Signal $ \after obj handler -> +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs gtk/Graphics/UI/Gtk/Multiline/TextIter.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -797,7 +797,7 @@ + {#pointer TextCharPredicate#} + + foreign import ccall "wrapper" mkTextCharPredicate :: +- ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate ++ ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate + + -- | Move 'TextIter' forward until a + -- predicate function returns True. +@@ -810,7 +810,7 @@ + textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> + IO Bool + textIterForwardFindChar ti pred limit = do +- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) ++ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) + res <- liftM toBool $ {#call text_iter_forward_find_char#} + ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) + freeHaskellFunPtr fPtr +@@ -827,7 +827,7 @@ + textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> + IO Bool + textIterBackwardFindChar ti pred limit = do +- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) ++ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) + res <- liftM toBool $ {#call text_iter_backward_find_char#} + ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) + freeHaskellFunPtr fPtr +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs gtk/Graphics/UI/Gtk/Windows/Assistant.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Windows/Assistant.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -274,7 +274,7 @@ + {#pointer AssistantPageFunc#} + + foreign import ccall "wrapper" mkAssistantPageFunc :: +- ({#type glong#} -> Ptr () -> IO {#type glong#}) ++ ({#type gint#} -> Ptr () -> IO {#type gint#}) + -> IO AssistantPageFunc + + -- | Sets the page type for @page@. The page type determines the page behavior diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD index efa76ace8..403cb1a18 100644 --- a/community/haskell-haskeline/PKGBUILD +++ b/community/haskell-haskeline/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 72390 2012-06-13 13:46:29Z tdziedzic $ +# $Id: PKGBUILD 77346 2012-10-09 04:17:37Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.6 _hkgname=haskeline pkgname=haskell-haskeline -pkgver=0.6.4.7 +pkgver=0.7.0.3 pkgrel=1 pkgdesc="A command-line interface for user input, written in Haskell." url="http://hackage.haskell.org/package/haskeline" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.2-1' 'sh' 'haskell-utf8-string=0.3.7-2' 'haskell-mtl=2.1.1-1' 'haskell-terminfo=0.3.2.3-2') +depends=('ghc=7.6.1-1' 'sh' 'haskell-utf8-string=0.3.7-3' 'haskell-mtl=2.1.2-1' 'haskell-terminfo=0.3.2.5-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('d8d0a90a9965f4f68935e76e4e777035') +md5sums=('3a78043dc80b5510202e71e77c0a9923') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index bc06dc50b..a0fcbab1b 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 75909 2012-09-05 10:20:43Z spupykin $ +# $Id: PKGBUILD 78308 2012-10-17 13:44:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-hslogger -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/hslogger" license=('LGPL') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1') +depends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz) -md5sums=('e0737887b0df75a3781989c8f6689850') +md5sums=('d94e39cd6a262565cf0758a6ead74919') build() { cd ${srcdir}/hslogger-${pkgver} diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD index f9aaa0f0f..8eb9fc6f4 100644 --- a/community/haskell-html/PKGBUILD +++ b/community/haskell-html/PKGBUILD @@ -5,12 +5,12 @@ _hkgname=html pkgname=haskell-html pkgver=1.0.1.2 -pkgrel=11 +pkgrel=12 pkgdesc="HTML combinator library" url="http://hackage.haskell.org/package/html" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh) +depends=('ghc=7.6.1-1' sh) source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD index aa044c1ad..347c3a31d 100644 --- a/community/haskell-pango/PKGBUILD +++ b/community/haskell-pango/PKGBUILD @@ -1,43 +1,46 @@ -# $Id: PKGBUILD 72393 2012-06-13 13:46:44Z tdziedzic $ +# $Id: PKGBUILD 77349 2012-10-09 04:17:52Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-pango pkgver=0.12.3 -pkgrel=2 +pkgrel=3 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'pango' 'haskell-glib=0.12.3.1-1' 'haskell-cairo=0.12.3.1-1') +depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-pango') replaces=('gtk2hs-pango') conflicts=('gtk2hs-pango') options=('strip') -source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) install=gtk2hs-pango.install +source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) md5sums=('1ef3132cb569703d5b1bc262c9d86fe3') build() { - cd ${srcdir}/pango-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd ${srcdir}/pango-${pkgver} + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ + --libsubdir=\$compiler/site-local/\$pkgid + sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/Rendering/Pango/Types.chs + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - #_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - #depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo') + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + _hglibver=`pacman -Q haskell-glib | cut -f2 -d\ | cut -f1 -d-` + _hcairover=`pacman -Q haskell-cairo | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" "pango" "haskell-glib=${_hglibver}" "haskell-cairo=${_hcairover}") - cd ${srcdir}/pango-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango - runhaskell Setup copy --destdir=${pkgdir} + cd ${srcdir}/pango-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango + runhaskell Setup copy --destdir=${pkgdir} } diff --git a/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch b/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch new file mode 100644 index 000000000..a25506e67 --- /dev/null +++ b/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch @@ -0,0 +1,50 @@ +From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Tue, 11 Sep 2012 03:59:50 -0700 +Subject: [PATCH] update code to support extensible exceptions no longer being + a part of ghc >= 7.6.1 + +--- + QuickCheck.cabal | 6 +++++- + Test/QuickCheck/Exception.hs | 6 ++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/QuickCheck.cabal b/QuickCheck.cabal +index 1a9126e..5afd6fb 100644 +--- a/QuickCheck.cabal ++++ b/QuickCheck.cabal +@@ -60,9 +60,13 @@ library + Build-depends: ghc + + -- We want to use extensible-exceptions even if linking against base-3. +- if impl(ghc >= 6.9) ++ if impl(ghc >= 6.9) && impl(ghc < 7.6) + Build-depends: extensible-exceptions + ++ -- GHC >= 7.6.1 no longer provides extensible exceptions ++ if impl(ghc >= 7.6) ++ cpp-options: -DNEW_EXCEPTIONS ++ + -- Modules that are always built. + Exposed-Modules: + Test.QuickCheck, +diff --git a/Test/QuickCheck/Exception.hs b/Test/QuickCheck/Exception.hs +index f895351..d463195 100644 +--- a/Test/QuickCheck/Exception.hs ++++ b/Test/QuickCheck/Exception.hs +@@ -18,6 +18,12 @@ module Test.QuickCheck.Exception where + + #if defined(OLD_EXCEPTIONS) + import Control.Exception(evaluate, try, Exception(..), throw) ++#elif defined(NEW_EXCEPTIONS) ++import Control.Exception(evaluate, try, SomeException(SomeException), ErrorCall(..), throw ++#if defined(GHC_INTERRUPT) ++ , AsyncException(UserInterrupt) ++#endif ++ ) + #else + import Control.Exception.Extensible(evaluate, try, SomeException(SomeException), ErrorCall(..), throw + #if defined(GHC_INTERRUPT) +-- +1.7.12 + diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD index 2ee16af54..e96121f81 100644 --- a/community/haskell-quickcheck/PKGBUILD +++ b/community/haskell-quickcheck/PKGBUILD @@ -4,19 +4,20 @@ _hkgname=QuickCheck pkgname=haskell-quickcheck -pkgver=2.5 +pkgver=2.5.1.1 pkgrel=1 pkgdesc="Automatic testing of Haskell programs" url="http://hackage.haskell.org/package/QuickCheck" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'haskell-random=1.0.1.1-2' 'sh') +depends=('ghc=7.6.1-1' 'haskell-random=1.0.1.1-3' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('ad647a3f208092e5d41469369c18185e') +md5sums=('2631b41c8b6e297b52622d1698387f09') build() { cd ${srcdir}/${_hkgname}-${pkgver} + runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD index d787c6007..d4e951cc6 100644 --- a/community/haskell-regex-base/PKGBUILD +++ b/community/haskell-regex-base/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=6 +pkgrel=7 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa" url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh 'haskell-mtl=2.1.1-1') +depends=('ghc=7.6.1-1' sh 'haskell-mtl=2.1.2-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3') diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD index f1e91b553..c546442ec 100644 --- a/community/haskell-regex-compat/PKGBUILD +++ b/community/haskell-regex-compat/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-compat pkgname=haskell-regex-compat pkgver=0.95.1 -pkgrel=2 +pkgrel=3 pkgdesc="Replaces and enhances Text.Regex" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6' 'haskell-regex-posix=0.95.2-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7' 'haskell-regex-posix=0.95.2-2') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('d0573ab4e2f3de5faa61380b67333320') diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD index f49daf3b2..3c570e4d1 100644 --- a/community/haskell-regex-posix/PKGBUILD +++ b/community/haskell-regex-posix/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-posix pkgname=haskell-regex-posix pkgver=0.95.2 -pkgrel=1 +pkgrel=2 pkgdesc="The posix regex backend for regex-base" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6') +depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('1df0f9494aab110c7231f36393285c7c') diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD index 8eba45641..fec52e949 100644 --- a/community/haskell-stm/PKGBUILD +++ b/community/haskell-stm/PKGBUILD @@ -3,16 +3,16 @@ # Package generated by cabal2arch 0.7.5 _hkgname=stm pkgname=haskell-stm -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc="A modular composable concurrency abstraction." url="http://hackage.haskell.org/package/stm" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('fcaf091a492974045cc04b231a3b7c9c') +md5sums=('fe8ab1a8231202f1748da53454cf55fc') build() { cd ${srcdir}/${_hkgname}-$pkgver diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD index 301c463b5..a2595bf2c 100644 --- a/community/haskell-syb/PKGBUILD +++ b/community/haskell-syb/PKGBUILD @@ -2,17 +2,17 @@ # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=syb pkgname=haskell-syb -pkgver=0.3.6.1 +pkgver=0.3.7 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh) +depends=('ghc=7.6.1-1' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('50e0a755fcc735cccd0d77a89714ae38') +md5sums=('fa653976a4ee43918cc7546089f94b60') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch new file mode 100644 index 000000000..b8c2264bc --- /dev/null +++ b/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch @@ -0,0 +1,50 @@ +From bd14edd6240c72baa22822338fc872e6827af680 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Tue, 11 Sep 2012 06:24:09 -0700 +Subject: [PATCH] update changed time code for ghc 7.6.1 + +--- + Codec/Archive/Tar/Pack.hs | 9 +++++---- + tar.cabal | 2 +- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs +index 8e43091..0af6103 100644 +--- a/Codec/Archive/Tar/Pack.hs ++++ b/Codec/Archive/Tar/Pack.hs +@@ -28,8 +28,8 @@ import qualified System.FilePath as FilePath.Native + import System.Directory + ( getDirectoryContents, doesDirectoryExist, getModificationTime + , Permissions(..), getPermissions ) +-import System.Time +- ( ClockTime(..) ) ++import Data.Time.Clock.POSIX ++ ( utcTimeToPOSIXSeconds ) + import System.IO + ( IOMode(ReadMode), openBinaryFile, hFileSize ) + import System.IO.Unsafe (unsafeInterleaveIO) +@@ -170,5 +170,6 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do + + getModTime :: FilePath -> IO EpochTime + getModTime path = do +- (TOD s _) <- getModificationTime path +- return $! fromIntegral s ++ utcTime <- getModificationTime path ++ let s = truncate . utcTimeToPOSIXSeconds $ utcTime ++ return $! s +diff --git a/tar.cabal b/tar.cabal +index e748b07..d85b0da 100644 +--- a/tar.cabal ++++ b/tar.cabal +@@ -25,7 +25,7 @@ source-repository head + + library + build-depends: base >= 3 && < 5, filepath, +- directory, old-time, bytestring ++ directory, bytestring, time + + exposed-modules: + Codec.Archive.Tar +-- +1.7.12 + diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index f6890f827..e7e830647 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 72400 2012-06-13 13:47:19Z tdziedzic $ +# $Id: PKGBUILD 77797 2012-10-14 20:10:04Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-tar -pkgver=0.4.0.0 -pkgrel=2 -pkgdesc="Reading, writing and manipulating \".tar\" archive files." +pkgver=0.4.0.1 +pkgrel=1 +pkgdesc="Reading, writing and manipulating tar archive files" url="http://hackage.haskell.org/package/tar" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.2-1') -options=('strip') +depends=('ghc=7.6.1-1') source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") install=haskell-tar.install -sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113') +sha256sums=('a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d') build() { - cd "$srcdir/tar-$pkgver" + cd $srcdir/tar-$pkgver runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ @@ -29,18 +28,18 @@ build() { } package() { - cd "$srcdir/tar-$pkgver" + cd $srcdir/tar-$pkgver install -Dm 744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" + $pkgdir/usr/share/haskell/$pkgname/register.sh install -m 744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/tar" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" + $pkgdir/usr/share/haskell/$pkgname/unregister.sh + install -dm 755 $pkgdir/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/$pkgname/html \ + $pkgdir/usr/share/doc/ghc/html/libraries/tar + runhaskell Setup copy --destdir=$pkgdir + install -Dm 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + rm -f $pkgdir/usr/share/doc/$pkgname/LICENSE } # vim:set ts=2 sw=2 et: diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD index b1036e177..974779c1e 100644 --- a/community/haskell-terminfo/PKGBUILD +++ b/community/haskell-terminfo/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 72401 2012-06-13 13:47:24Z tdziedzic $ +# $Id: PKGBUILD 77357 2012-10-09 04:18:36Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=terminfo pkgname=haskell-terminfo -pkgver=0.3.2.3 -pkgrel=2 +pkgver=0.3.2.5 +pkgrel=1 pkgdesc="Haskell bindings to the terminfo library." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('706f546c629ac100a402c9c2629c25fa') +md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD index 5f5a528da..d167aa9d2 100644 --- a/community/haskell-utf8-string/PKGBUILD +++ b/community/haskell-utf8-string/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 72402 2012-06-13 13:47:29Z tdziedzic $ +# $Id: PKGBUILD 77358 2012-10-09 04:18:41Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.6 _hkgname=utf8-string pkgname=haskell-utf8-string pkgver=0.3.7 -pkgrel=2 +pkgrel=3 pkgdesc="Support for reading and writing UTF8 Strings" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) md5sums=('50e5c395713e716e0e4a56da73f87ccd') diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD index 0a5d0b0f3..bb4e05077 100644 --- a/community/haskell-x11-xft/PKGBUILD +++ b/community/haskell-x11-xft/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 72404 2012-06-13 13:47:39Z tdziedzic $ +# $Id: PKGBUILD 77360 2012-10-09 04:18:51Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> _hkgname=X11-xft pkgname=haskell-x11-xft pkgver=0.3.1 -pkgrel=4 +pkgrel=5 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts" url="http://hackage.haskell.org/package/${_hkgname}" license=('LGPL') arch=('i686' 'x86_64' 'mips64el') -depends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-utf8-string=0.3.7' 'libxft') +depends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-utf8-string=0.3.7' 'libxft') options=('strip') install=haskell-x11-xft.install source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD index 4e2bf7feb..5d4c3a7bb 100644 --- a/community/haskell-x11/PKGBUILD +++ b/community/haskell-x11/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 72403 2012-06-13 13:47:34Z tdziedzic $ +# $Id: PKGBUILD 77359 2012-10-09 04:18:46Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: shild <sxp@bk.ru> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> _hkgname=X11 pkgname=haskell-x11 -pkgver=1.6.0 +pkgver=1.6.0.2 pkgrel=1 pkgdesc="A Haskell binding to the X11 graphics library." arch=(i686 x86_64 'mips64el') url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11" license=('custom:BSD3') options=('strip') -depends=("ghc=7.4.2-1" "haskell-syb=0.3.6.1" 'libx11' 'libxinerama' 'libxrandr') +depends=("ghc=7.6.1-1" "haskell-syb=0.3.7" 'libx11' 'libxinerama' 'libxrandr') conflicts=(haskell-x11-extras) install=hsmod.install source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) -md5sums=('8199520ce58e91762d31d54ed081b99c') +md5sums=('0227ba7a8788c3cfd146e952a5fafc82') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD index 68041976a..7ccfca159 100644 --- a/community/haskell-xhtml/PKGBUILD +++ b/community/haskell-xhtml/PKGBUILD @@ -1,38 +1,49 @@ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 +# Contributor: Alexander Rødseth <rodseth@gmail.com> _hkgname=xhtml pkgname=haskell-xhtml pkgver=3000.2.1 -pkgrel=1 -pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants." -url="http://hackage.haskell.org/package/xhtml" +pkgrel=2 +pkgdesc='Combinators for producing XHTML 1.0' +url='http://hackage.haskell.org/package/xhtml' license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('c63487bea16cbf0ecf252d6ed73106bf') +arch=('x86_64' 'i686') +depends=('ghc=7.6.1-1' 'sh') +source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") +install=$pkgname.install +sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid + cd "$srcdir/$_hkgname-$pkgver" + + runhaskell Setup configure -O -p \ + --enable-split-objs \ + --enable-shared \ + --prefix=/usr \ + --docdir="/usr/share/doc/$pkgname" \ + --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock - runhaskell Setup register --gen-script + runhaskell Setup register --gen-script runhaskell Setup unregister --gen-script sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$srcdir/$_hkgname-$pkgver" + + install -Dm744 register.sh \ + "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" } + +# vim:set ts=2 sw=2 et: diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index c95de8618..d1542e75f 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 75756 2012-08-30 21:02:59Z spupykin $ +# $Id: PKGBUILD 77362 2012-10-09 04:19:03Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.17 -pkgrel=4 +pkgrel=5 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" license=('GPL' 'custom') depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua') makedepends=('fpc' 'cmake' - # haskell specific - 'ghc=7.4.2-1' - 'haskell-network=2.3.0.14-1' 'haskell-bytestring-show=0.3.5.1-3' - 'haskell-utf8-string=0.3.7-2' 'haskell-dataenc=0.14.0.3-2' - 'haskell-hslogger=1.1.5-7') + # haskell specific + 'ghc' + 'haskell-network' 'haskell-bytestring-show' + 'haskell-utf8-string' 'haskell-dataenc' + 'haskell-hslogger') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png) @@ -26,6 +26,7 @@ build() { cd $pkgname-src-$pkgver # sed -i 's|.*misc/liblua.*||' CMakeLists.txt + sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD index 0780965be..31bb2505a 100644 --- a/community/highlight/PKGBUILD +++ b/community/highlight/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 70241 2012-05-02 18:03:17Z bluewind $ +# $Id: PKGBUILD 77163 2012-10-06 07:36:47Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Jan Fader <jan.fader@web.de> pkgbase=highlight pkgname=(highlight highlight-gui) -pkgver=3.9 +pkgver=3.12 pkgrel=1 url="http://www.andre-simon.de/doku/highlight/highlight.html" license=('GPL') arch=('i686' 'x86_64' 'mips64el') makedepends=(qt lua boost) source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2) -md5sums=('8b666baaf3638cc4b4f26b84816bc558') +md5sums=('4b3f01e86a6b3fa25f3c4905a9cd63c7') build() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/community/hitori/PKGBUILD b/community/hitori/PKGBUILD index a4a8ed903..d609f0fa5 100644 --- a/community/hitori/PKGBUILD +++ b/community/hitori/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 69054 2012-04-08 19:56:12Z bgyorgy $ +# $Id: PKGBUILD 77547 2012-10-12 03:16:10Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=hitori -pkgver=0.3.2 +pkgver=0.4.0 pkgrel=1 pkgdesc="GTK+ application to generate and let you play games of Hitori" arch=('i686' 'x86_64' 'mips64el') url="https://live.gnome.org/Hitori" license=('GPL') depends=('gtk3' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool' 'itstool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9e72bb0c84b0e0b66a96fcee6918cf15832f45458df4d8dd5f8091a20bba4350') +sha256sums=('5d9e1c0f5d33c960167a126242bf57ff4865a6aaf6602da4a25aae56dc491030') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index 9be57907a..9a72caf7c 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71887 2012-06-02 21:17:12Z heftig $ +# $Id: PKGBUILD 76540 2012-09-22 15:17:46Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.2 +pkgver=4.3 pkgrel=2 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') @@ -11,16 +11,15 @@ url="http://i3wm.org/" license=('BSD') replaces=("i3" "i3bar") groups=("i3") -depends=('libxcursor' 'xcb-util-wm' 'xcb-util-keysyms' 'libev' 'yajl' 'startup-notification' 'pcre') +depends=('libxcursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl' 'startup-notification' 'pango') makedepends=('bison' 'flex') -optdepends=('rxvt-unicode: The terminal emulator used in the default config.' - 'dmenu: As menu.' +optdepends=('dmenu: As menu.' 'i3lock: For locking your screen.' 'i3status: To display systeminformation with a bar.' 'perl: To migrate your configuration to v4 format.') options=('docs' '!strip') source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2") -md5sums=('11b7e5ecdd837341978c72341cb890c6') +md5sums=('6e0258e08f644532497cc97bde937a6c') build() { cd "$srcdir/$_pkgsourcename-$pkgver" @@ -37,7 +36,7 @@ package() { install -Dm644 man/i3.1 \ ${pkgdir}/usr/share/man/man1/i3.1 - install -Dm644 i3bar/doc/i3bar.1 \ + install -Dm644 man/i3bar.1 \ ${pkgdir}/usr/share/man/man1/i3bar.1 install -Dm644 man/i3-config-wizard.1 \ ${pkgdir}/usr/share/man/man1/i3-config-wizard.1 diff --git a/community/i3status/PKGBUILD b/community/i3status/PKGBUILD index 1bfc6a24e..91a799014 100644 --- a/community/i3status/PKGBUILD +++ b/community/i3status/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 70601 2012-05-12 12:03:50Z ttopper $ +# $Id: PKGBUILD 77036 2012-10-03 18:05:35Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3status -pkgver=2.5.1 +pkgver=2.6 pkgrel=1 pkgdesc="Generates status bar to use with dzen2 or xmobar" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=('etc/i3status.conf') install=i3status.install options=('docs') source=("http://i3.zekjur.net/i3status/$pkgname-$pkgver.tar.bz2") -md5sums=('28c27fc0c2294e12ae6ae390f3d89973') +md5sums=('98f649429d7845682846de36fb38f780') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/i7z/PKGBUILD b/community/i7z/PKGBUILD index f573fc123..bd3cda36c 100644 --- a/community/i7z/PKGBUILD +++ b/community/i7z/PKGBUILD @@ -1,8 +1,9 @@ +# $Id: PKGBUILD 76391 2012-09-17 08:17:57Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Nathan O <ndowens.aur at gmail dot com> pkgname=i7z -pkgver=0.27.1 +pkgver=0.27.2 pkgrel=1 pkgdesc="A better i7 (and now i3, i5) reporting tool for Linux" arch=('i686' 'x86_64') @@ -12,7 +13,7 @@ makedepends=('qt') optdepends=('qt: for i7z-gui') url="http://code.google.com/p/i7z/" source=("http://i7z.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('4408e0e39b195b8fe6383cadc971a862') +md5sums=('7f2c4928146b722d67ecdd0d905a4353') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/ibus/PKGBUILD b/community/ibus/PKGBUILD index 4225ae44b..3486353fa 100644 --- a/community/ibus/PKGBUILD +++ b/community/ibus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75443 2012-08-24 03:59:47Z ebelanger $ +# $Id: PKGBUILD 78196 2012-10-17 10:24:17Z allan $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,13 +6,13 @@ pkgname=ibus pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ibus.googlecode.com" license=('LGPL') depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \ - 'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme') + 'iso-codes' 'librsvg' 'python2-notify' 'hicolor-icon-theme') makedepends=('intltool' 'gobject-introspection') optdepends=('notification-daemon') options=('!libtool') diff --git a/community/ico2xpm/PKGBUILD b/community/ico2xpm/PKGBUILD index cb2e95463..2c006dc97 100644 --- a/community/ico2xpm/PKGBUILD +++ b/community/ico2xpm/PKGBUILD @@ -1,15 +1,17 @@ +# $Id: PKGBUILD 76155 2012-09-12 10:40:28Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ico2xpm -pkgver=1.2 -pkgrel=2 +pkgver=1.3 +pkgrel=1 pkgdesc="A utility which converts Windows icons into X pixmaps" arch=('i686' 'x86_64' 'mips64el') url="http://ico2xpm.sourceforge.net/" license=('GPL') -source=(http://downloads.sourceforge.net/ico2xpm/1.2/ico2xpm-1_2-src.tar.gz) -md5sums=('b3dbe027e2420ee33e57d67140f40896') +source=(http://downloads.sourceforge.net/ico2xpm/$pkgver/ico2xpm-${pkgver/./_}-src.tar.gz) +md5sums=('fbae5631281cb6b48ca31f78bbbcba85') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/icoutils/PKGBUILD b/community/icoutils/PKGBUILD index 8b9a09d7e..2ebfec26b 100644 --- a/community/icoutils/PKGBUILD +++ b/community/icoutils/PKGBUILD @@ -1,17 +1,19 @@ +# $Id: PKGBUILD 76157 2012-09-12 10:41:13Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: neodreams <yanbrodeur@videotron.ca> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=icoutils -pkgver=0.29.1 -pkgrel=2 +pkgver=0.30.0 +pkgrel=1 pkgdesc='Extracts and converts images in MS Windows(R) icon and cursor files.' arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://www.nongnu.org/icoutils/' depends=('libpng>=1.0.0' 'perl-libwww>=5.64') source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b58f375e0f8731595e8d0ecdc3a0acb9') +md5sums=('2574eb4ff5c0d3b2a59ad5a7d8848ced') build() { cd ${pkgname}-${pkgver} diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index 6ec234af4..ab6e3ca69 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71743 2012-06-02 10:29:04Z bluewind $ +# $Id: PKGBUILD 76159 2012-09-12 10:42:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Edward Tjörnhammar <xhemi@cube2.se> # Contributor: Edward Tjörnhammar <xhemi@cube2.se> pkgname=inn -pkgver=2.5.2 -pkgrel=10 +pkgver=2.5.3 +pkgrel=1 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64' 'mips64el') @@ -51,12 +51,14 @@ source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz nnrpd.rc innd.conf nnrpd.conf + innd.service site.make.patch) -md5sums=('a6e577dceb90d07501b96149508b974b' +md5sums=('353fe95232828ddbc80debff86c240bc' 'a243d9498568f1beee20da5684b5fbfc' 'a0b1ff8501ac8a31ce81a2f9c9b4bac9' 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a' 'bb4bbe86ae52fbbf08b0f6f370dea052' + '9da925a486fcf0cd67fdf462cbb9c0b4' '960c800026ed6e03901cf0bafdfd53d8') build() { @@ -129,4 +131,6 @@ package() { install -D -m0644 $srcdir/inn-$pkgver/LICENSE $pkgdir/usr/share/licenses/inn/LICENSE chown root:root $pkgdir/usr/bin/innbind chmod 05555 $pkgdir/usr/bin/innbind + + install -Dm0644 $srcdir/innd.service $pkgdir/usr/lib/systemd/system/innd.service } diff --git a/community/inn/innd.service b/community/inn/innd.service new file mode 100644 index 000000000..724baf90c --- /dev/null +++ b/community/inn/innd.service @@ -0,0 +1,16 @@ +[Unit] +Description=Inetnet News Daemon +After=syslog.target network.target +ConditionPathExists=/etc/inn/inn.conf + +[Service] +User=news +PermissionsStartOnly=true +PIDFile=/run/inn/innd.pid +Type=forking +ExecStart=/usr/bin/rc.news +ExecStop=/bin/su -m news -c '/usr/bin/rc.news stop' +KillMode=control-group + +[Install] +WantedBy=multi-user.target diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD index 0f74382b8..e084af3bc 100644 --- a/community/inputattach/PKGBUILD +++ b/community/inputattach/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65570 2012-02-21 09:01:06Z spupykin $ +# $Id: PKGBUILD 77899 2012-10-15 16:07:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=inputattach pkgver=1.24 -pkgrel=5 +pkgrel=6 pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system" arch=('i686' 'x86_64' 'mips64el') url="http://linuxconsole.sourceforge.net/" @@ -19,26 +19,38 @@ source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c' 'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h' 'inputattach.conf.d' 'inputattach.rc.d' + 'inputattach.service' + 'inputattachctl' '0001-Add-w8001-flag.patch' '0002-Allow-for-custom-baud-rates.patch') md5sums=('eb595a766ca363edb3b14c25404596ce' '93d34d96cd3ad19ea1aeca7f68a66b4a' '7ca903e54829764c8241233af5069216' 'aa2e404fc113abdd2ab14e2a6352c331' + 'c19b9ed38b243191cf5378b87a42a4cc' + '84c6463660c10bd34c0390102da087d5' 'f1b3ddae308351357f557cbd5c6cda81' '8f76908449cae24a95adbf0bc0a17721') build() { cd "$srcdir" + + mkdir src + cp inputattach.c serio-ids.h src/ + cd src + # Add support for serial wacom tablets patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch" patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch" + cc $CFLAGS inputattach.c -o inputattach } package() { - cd "$srcdir" + cd "$srcdir/src" install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach" install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" install -Dm755 $srcdir/inputattach.rc.d "$pkgdir/etc/rc.d/inputattach" + install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl + install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service } diff --git a/community/inputattach/inputattach.service b/community/inputattach/inputattach.service new file mode 100644 index 000000000..2ec902c09 --- /dev/null +++ b/community/inputattach/inputattach.service @@ -0,0 +1,11 @@ +[Unit] +Description=Attach serial input devices to kernel input subsystem +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/bin/inputattachctl start +ExecStop=/usr/bin/inputattachctl stop + +[Install] +WantedBy=multi-user.target diff --git a/community/inputattach/inputattachctl b/community/inputattach/inputattachctl new file mode 100755 index 000000000..291c531ae --- /dev/null +++ b/community/inputattach/inputattachctl @@ -0,0 +1,14 @@ +#!/bin/bash + +. /etc/conf.d/inputattach + +case "$1" in + start) + for i in "${IAPARAMS[@]}"; do + /usr/sbin/inputattach --daemon $i || exit 1 + done + ;; + stop) + killall inputattach || exit 1 + ;; +esac diff --git a/community/instead-launcher/PKGBUILD b/community/instead-launcher/PKGBUILD new file mode 100644 index 000000000..1a118f518 --- /dev/null +++ b/community/instead-launcher/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 76496 2012-09-19 14:12:35Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Peter Kosyh <p.kosyhgmail.com> + +pkgname=instead-launcher +pkgver=0.6.1 +pkgrel=2 +pkgdesc="launcher and games downloader for INSTEAD quest interpreter" +arch=('i686' 'x86_64') +url="http://instead-launcher.googlecode.com/" +license=('GPL') +makedepends=('sed' 'qt') +source=(http://instead-launcher.googlecode.com/files/instead-launcher_$pkgver.tar.gz) +md5sums=('b2136e535dbb77eacb79e3357dc2a173') + +build() { + cd $srcdir/instead-launcher-$pkgver + sed -i 's|/usr/local/bin/sdl-instead|/usr/bin/sdl-instead|g' platform.cpp + qmake PREFIX=/usr + make +} + +package() { + depends=('qt' 'instead') + cd $srcdir/instead-launcher-$pkgver + make INSTALL_ROOT=$pkgdir install +} diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD new file mode 100644 index 000000000..5cc378466 --- /dev/null +++ b/community/instead/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 76494 2012-09-19 14:03:04Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Peter Kosyh <p.kosyhgmail.com> + +pkgname=instead +pkgver=1.8.0 +pkgrel=1 +pkgdesc="instead quest interpreter" +arch=('i686' 'x86_64') +url="http://instead.googlecode.com/" +license=('GPL') +depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua') +optdepends=('instead-launcher: install and update INSTEAD games from net') +source=(http://instead.googlecode.com/files/instead_${pkgver}.tar.gz) +md5sums=('08acf9f7de60b8e1c23d6e9368093d1f') + +build() { + cd "${srcdir}/instead-${pkgver}" + echo "2" | ./configure.sh + make PREFIX=/usr +} + +package() { + cd "${srcdir}/instead-${pkgver}" + make DESTDIR="${pkgdir}" PREFIX=/usr install +} diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD index 0220e4316..b93442377 100644 --- a/community/intel-tbb/PKGBUILD +++ b/community/intel-tbb/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74680 2012-08-02 00:56:11Z stephane $ +# $Id: PKGBUILD 76482 2012-09-18 21:17:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=4.0_20120613 +pkgver=4.1_20120718 pkgrel=1 pkgdesc='High level abstract threading library' arch=('i686' 'x86_64' 'mips64el') url='http://www.threadingbuildingblocks.org/' license=('GPL') depends=('gcc-libs') -source=("http://threadingbuildingblocks.org/uploads/77/187/4.0%20update%205/tbb${pkgver/\./}oss_src.tgz") -sha1sums=('48569b88450a78e8f1e7251500fdd951bb197f1b') +source=("http://threadingbuildingblocks.org/uploads/77/188/4.1/tbb${pkgver/\./}oss_src.tgz") +sha1sums=('3fad942c867f032dc5ddeccd7ca19606eda7065d') build() { cd "${srcdir}"/tbb${pkgver/\./}oss diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index 4d521abbd..e727d5644 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65574 2012-02-21 09:02:39Z spupykin $ +# $Id: PKGBUILD 78385 2012-10-17 16:23:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> pkgname=ipsec-tools pkgver=0.8.0 -pkgrel=3 +pkgrel=5 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ipsec-tools.sourceforge.net/" @@ -14,10 +14,14 @@ license=('GPL') options=('!makeflags' '!libtool') source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 racoon.rc - ipsec.rc) + ipsec.rc + racoon.service + ipsec.service) md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619' '416b8e362d86987b8c55f7153cdafbeb' - '90d0810267cbd847383ae3101699b192') + '90d0810267cbd847383ae3101699b192' + '1632fce55ba5592dea1f8bf661106e7d' + 'bc05a2b85e41bf89dac809657e857730') build() { cd $srcdir/$pkgname-$pkgver @@ -33,4 +37,6 @@ package() { make DESTDIR=$pkgdir install install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec + install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service + install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service } diff --git a/community/ipsec-tools/ipsec.service b/community/ipsec-tools/ipsec.service new file mode 100644 index 000000000..63db40b22 --- /dev/null +++ b/community/ipsec-tools/ipsec.service @@ -0,0 +1,11 @@ +[Unit] +Description=Load IPSec Security Policy Database +After=syslog.target network.target + +[Service] +Type=simple +ExecStart=/usr/sbin/setkey -f /etc/ipsec.conf +ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F + +[Install] +WantedBy=multi-user.target diff --git a/community/ipsec-tools/racoon.service b/community/ipsec-tools/racoon.service new file mode 100644 index 000000000..792cfd395 --- /dev/null +++ b/community/ipsec-tools/racoon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Racoon IKEv1 key management daemon for IPSEC +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/racoon + +[Install] +WantedBy=multi-user.target diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 5828a7a3f..4270bf249 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 73450 2012-07-07 23:42:48Z seblu $ +# $Id: PKGBUILD 76538 2012-09-22 15:01:58Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ipset -pkgver=6.13 +pkgver=6.14 pkgrel=1 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.rc" "$pkgname.systemd" "$pkgname.service") -md5sums=('0b7f5db12a1852d9c31b1ec13d31ade1' +md5sums=('70f2d4c054592236dcda285855a4ee58' '3e606a2823a700b4e9c5f17511a6f6a5' 'de89b054d967036e08b13bc6a7235286' 'dfc3105b89ed41fc4a1feb4f4f13f2a3' diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD index 89e9d7a5d..3611b9eca 100644 --- a/community/jack2/PKGBUILD +++ b/community/jack2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70089 2012-04-29 08:01:28Z allan $ +# $Id: PKGBUILD 77160 2012-10-06 07:11:43Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Daniele Paolella <danielepaolella@email.it> # Contributor: Philipp Überbacher <hollunder at gmx dot at> @@ -9,7 +9,7 @@ pkgname=('jack2' 'jack2-dbus') #pkgname= # single build (overrides split) _tarname=jack pkgver=1.9.8 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://jackaudio.org/" backup=(etc/security/limits.d/99-audio.conf) @@ -21,10 +21,12 @@ makedepends=('python2' 'doxygen' 'libsamplerate' 'dbus-core' 'celt') source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz" '99-audio.conf' - '40-hpet-permissions.rules') + '40-hpet-permissions.rules' + 'ffado_setbuffsize-jack2.patch') md5sums=('1dd2ff054cab79dfc11d134756f27165' 'ae65b7c9ebe0fff6c918ba9d97ae342d' - '471aad533ff56c5d3cbbf65ce32cadef') + '471aad533ff56c5d3cbbf65ce32cadef' + '1502d82fe2276d6f224fff6467a0b6f9') _pyfix() { sed -i 's:bin/env python:bin/env python2:' \ @@ -50,6 +52,19 @@ _isbuild() { build() { cd "$srcdir/$_tarname-$pkgver" + # backport firewire stuff + # - needed for setbuffsize feature in latest stable ffado + # from https://github.com/jackaudio/jack2/commit/96e0251 + ( + cd $_tarname-$pkgver + patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch" + ) + + # Some optimisation bug exists for current GCC + # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 + export CFLAGS="${CFLAGS/-O[0-9]/-O0}" + export CXXFLAGS="$CFLAGS" + # fix doxygen building sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript diff --git a/community/jack2/ffado_setbuffsize-jack2.patch b/community/jack2/ffado_setbuffsize-jack2.patch new file mode 100644 index 000000000..0c74aad24 --- /dev/null +++ b/community/jack2/ffado_setbuffsize-jack2.patch @@ -0,0 +1,139 @@ +From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth <adi@drcomp.erfurt.thur.de> +Date: Sat, 17 Mar 2012 22:36:30 +0100 +Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size + +This is a port of Jonathan Woithe's patch from jackd1. +With sufficiently recent versions of FFADO, it allows to change +the buffersize at runtime. +--- + linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- + linux/firewire/JackFFADODriver.h | 6 ++++ + 2 files changed, 65 insertions(+), 6 deletions(-) + +diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp +index b33e1cd..085b78a 100644 +--- a/linux/firewire/JackFFADODriver.cpp ++++ b/linux/firewire/JackFFADODriver.cpp +@@ -3,6 +3,7 @@ + Copyright (C) 2004 Grame + Copyright (C) 2007 Pieter Palmers + Copyright (C) 2009 Devin Anderson ++Copyright (C) 2012 Jonathan Woithe, Adrian Knoth + + 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 +@@ -48,7 +49,10 @@ + namespace Jack + { + ++// Basic functionality requires API version 8. If version 9 or later ++// is present the buffers can be resized at runtime. + #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 ++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 + + #define jack_get_microseconds GetMicroSeconds + +@@ -281,19 +285,68 @@ + int + JackFFADODriver::SetBufferSize (jack_nframes_t nframes) + { +- printError("Buffer size change requested but not supported!!!"); ++ ffado_driver_t* driver = (ffado_driver_t*)fDriver; ++ signed int chn; ++ ++ // The speed of this function isn't critical; we can afford the ++ // time to check the FFADO API version. ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || ++ ffado_streaming_set_period_size == NULL) { ++ printError("unsupported on current version of FFADO; please upgrade FFADO"); ++ return -1; ++ } + +- /* + driver->period_size = nframes; + driver->period_usecs = + (jack_time_t) floor ((((float) nframes) / driver->sample_rate) + * 1000000.0f); +- */ ++ ++ ++ // Reallocate the null and scratch buffers. ++ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->nullbuffer == NULL) { ++ printError("could not allocate memory for null buffer"); ++ return -1; ++ } ++ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->scratchbuffer == NULL) { ++ printError("could not allocate memory for scratch buffer"); ++ return -1; ++ } ++ ++ // MIDI buffers need reallocating ++ for (chn = 0; chn < driver->capture_nchannels; chn++) { ++ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { ++ // setup the midi buffer ++ if (driver->capture_channels[chn].midi_buffer != NULL) ++ free(driver->capture_channels[chn].midi_buffer); ++ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ for (chn = 0; chn < driver->playback_nchannels; chn++) { ++ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { ++ if (driver->playback_channels[chn].midi_buffer != NULL) ++ free(driver->playback_channels[chn].midi_buffer); ++ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ ++ // Notify FFADO of the period size change ++ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { ++ printError("could not alter FFADO device period size"); ++ return -1; ++ } ++ ++ // This is needed to give the shadow variables a chance to ++ // properly update to the changes. ++ sleep(1); + + /* tell the engine to change its buffer size */ +- //driver->engine->set_buffer_size (driver->engine, nframes); ++ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails + +- return -1; // unsupported ++ UpdateLatencies(); ++ ++ return 0; + } + + typedef void (*JackDriverFinishFunction) (jack_driver_t *); +@@ -306,7 +359,7 @@ + + assert(params); + +- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { + printError("Incompatible libffado version! (%s)", ffado_get_version()); + return NULL; + } +diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h +index cb2a45d..790f4dd 100644 +--- a/linux/firewire/JackFFADODriver.h ++++ b/linux/firewire/JackFFADODriver.h +@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver + int Read(); + int Write(); + ++ // BufferSize can be changed ++ bool IsFixedBufferSize() ++ { ++ return false; ++ } ++ + int SetBufferSize(jack_nframes_t nframes); + }; + +-- +1.7.10 + diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD index 66a4a4910..e5803b06d 100644 --- a/community/jansson/PKGBUILD +++ b/community/jansson/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 62893 2012-01-28 22:13:43Z kkeen $ +# $Id: PKGBUILD 76779 2012-09-29 19:28:30Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dave Reisner <d@falconindy.com> pkgname=jansson -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc='C library for encoding, decoding and manipulating JSON data' arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ url='http://www.digip.org/jansson/' depends=('glibc') license=('MIT') options=('!libtool') -source=("$url/releases/$pkgname-$pkgver.tar.bz2") -md5sums=('9f322b4b43b1b4f38473c52b49dabf99') +source=("http://www.digip.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2") +md5sums=('3aaa1bb1195d705fac602b7504c9b945') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index f0dfc250a..e7c33a05f 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,8 +6,8 @@ pkgname=john pkgver=1.7.9 -pkgrel=6 -_jumbover=6 +pkgrel=7 +_jumbover=7 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64' 'mips64el') url="http://www.openwall.com/$pkgname/" @@ -23,7 +23,7 @@ source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) md5sums=('45f54fc59386ecd67daaef9f19781d93' - '685c759ec6f865ea81f40a487cd56882' + 'b953fcb7f743eeeb5f938a28c352b8ef' 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index 2dd156623..66a55c829 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 61131 2011-12-22 05:37:54Z kkeen $ +# $Id: PKGBUILD 77050 2012-10-03 23:55:24Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=jshon -pkgver=20111222 +pkgver=20120914 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64' 'mips64el') @@ -11,15 +11,15 @@ depends=('jansson') makedepends=() optdepends=() source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('bcc8b8b6e8c09af7d053471a473ef6e8') +md5sums=('4b1cae2237db068ee4738789286a0409') build() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" make } package() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$pkgver" install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname" install -Dm644 $pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1" } diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index 74484c70e..79275b998 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 76119 2012-09-11 16:47:42Z bpiotrowski $ +# $Id: PKGBUILD 76360 2012-09-16 14:56:37Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.12.2 +pkgver=0.12.3 pkgrel=1 -pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" +pkgdesc='A Qt-based Jabber/XMPP and Gadu-Gadu client' arch=('i686' 'x86_64' 'mips64el') -url="http://www.kadu.net/" +url='http://www.kadu.net/' license=('GPL') depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') install=kadu.install source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('e546834f85bed14279691998545d203c') +md5sums=('c5d6f0bd384cd96090819ea018eb8ad8') build() { - cd "$srcdir" + cd $srcdir mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../$pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install - mv "$pkgdir"/usr/sdk "$pkgdir"/usr/share/kadu/sdk - rm -rf "$pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}" - rm -rf "$pkgdir/usr/share/kadu/{HISTORY,README}" + cd $srcdir/build + make DESTDIR=$pkgdir install + mv $pkgdir/usr/sdk "$pkgdir"/usr/share/kadu/sdk + rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} + rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} } diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 5a1c3ea57..40a4dff43 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75757 2012-08-30 21:03:04Z spupykin $ +# $Id: PKGBUILD 77647 2012-10-13 11:43:46Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive pkgver=0.9.2 -pkgrel=3 +pkgrel=4 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') # http://download.kde.org/stable/kdenlive/ @@ -13,7 +13,7 @@ url="http://www.kdenlive.org/" license=('GPL') depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' 'libqzeitgeist') -makedepends=('automoc4' 'cmake' 'gettext' 'mesa') +makedepends=('automoc4' 'cmake' 'gettext' 'mesa' 'glu') optdepends=('recordmydesktop' 'dvdauthor' 'mkisolinux' diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD index 6bedf50a6..c35adf1c2 100644 --- a/community/kicad/PKGBUILD +++ b/community/kicad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75041 2012-08-12 14:50:10Z jelle $ +# $Id: PKGBUILD 77648 2012-10-13 11:43:53Z allan $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Marq Schneider <queueRAM@gmail.com> @@ -6,13 +6,13 @@ pkgname=kicad pkgver=20120119 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} _pkgbzr=3256 -pkgrel=2 +pkgrel=3 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools" arch=('i686' 'x86_64') url="http://iut-tice.ujf-grenoble.fr/kicad/" license=('GPL') -depends=('mesa' 'wxgtk') -makedepends=('boost' 'cmake' 'zlib') +depends=('glu' 'wxgtk' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('boost' 'cmake' 'zlib' 'mesa') optdepends=('kicad-docs-bzr: for documentation' 'kicad-library-bzr: for footprints') install=kicad.install diff --git a/community/kleansweep/PKGBUILD b/community/kleansweep/PKGBUILD index 32452cf45..ed39fecf1 100644 --- a/community/kleansweep/PKGBUILD +++ b/community/kleansweep/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 65612 2012-02-21 09:38:19Z spupykin $ +# $Id: PKGBUILD 77134 2012-10-05 11:29:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Guillermo A. Amaral <me@guillermoamaral.com> pkgname=kleansweep pkgver=0.2.9 -pkgrel=5 +pkgrel=6 pkgdesc="Allows you to reclaim disk space by finding unneeded files" license=("GPL") url="http://linux.bydg.org/~yogin/" arch=(i686 x86_64 'mips64el') -depends=('kdelibs3' 'python') +depends=('kdelibs3') makedepends=('scons') options=('libtool') #source=(http://linux-projects.net/d/kleansweep-$pkgver.tar.gz diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD index a74cc3e00..1012a35ad 100644 --- a/community/kphotoalbum/PKGBUILD +++ b/community/kphotoalbum/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74835 2012-08-06 23:08:56Z andrea $ +# $Id: PKGBUILD 76830 2012-09-30 21:12:00Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com> @@ -6,8 +6,8 @@ # Contributor: chfoxli <lg ][ romandie ? com> pkgname=kphotoalbum -pkgver=4.2 -pkgrel=4 +pkgver=4.3 +pkgrel=1 pkgdesc="KDE Photo Album, picture collection manager" url="http://www.kphotoalbum.org/" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ optdepends=('kdeedu-marble: integration with Marble' 'kdemultimedia-mplayerthumbs: video thumbnails') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7cb484089477f3633657b67ce59b85f2') +md5sums=('09b5ba7d44ee7426802b233454927b8f') build() { cd ${srcdir} diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD index 50c3257d1..07f068037 100644 --- a/community/ktoblzcheck/PKGBUILD +++ b/community/ktoblzcheck/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74858 2012-08-07 14:19:39Z spupykin $ +# $Id: PKGBUILD 78201 2012-10-17 10:24:34Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> pkgname=ktoblzcheck pkgver=1.39 -pkgrel=1 +pkgrel=3 pkgdesc="A library to check account numbers and bank codes of German banks" arch=(i686 x86_64 'mips64el') url="http://ktoblzcheck.sourceforge.net" @@ -13,18 +13,18 @@ license=("LGPL") depends=('gcc-libs' 'python') optdepends=('perl') source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz - ktoblzcheck-python3.patch) + ktoblzcheck-python3.patch) md5sums=('ef5efd6e2c31aaf6405060ec477c200c' 'a81a697bb3aaeffb7fac0ad7d9166e3f') build() { cd "$srcdir/ktoblzcheck-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr patch -p1 <$srcdir/ktoblzcheck-python3.patch make } package() { cd "$srcdir/ktoblzcheck-$pkgver" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 6bb13765b..8d1f24767 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75791 2012-08-31 12:11:31Z spupykin $ +# $Id: PKGBUILD 77496 2012-10-11 11:35:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') -pkgver=1.0 +pkgver=1.0.2 _pkgsubver=0 pkgrel=1 url='http://www.lazarus.freepascal.org/' @@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz" 'lazcontrols2.diff') -md5sums=('2412545d740059d006485f5d17ef0eca' +md5sums=('738ee29686de71cd599b468eabf034e8' '288bca6ad5ade79deec34c3602daaaa9') build() { @@ -40,7 +40,7 @@ package_lazarus() { optdepends=( 'perl: to run some scirpts in the tools directory' 'gtk2: to compile gtk2 apps' - 'qt4pas: to compile qt apps' + 'qt4pas: to compile qt apps and use help viewer' ) cd $srcdir/${pkgbase} @@ -69,6 +69,9 @@ package_lazarus() { ln -s /usr/lib/lazarus/lazbuild $pkgdir/usr/bin/lazbuild cp -R install/man/man1/* $pkgdir/usr/share/man/man1/ mv $pkgdir/usr/lib/lazarus/docs $pkgdir/usr/share/doc/lazarus + mkdir -p $pkgdir/usr/lib/lazarus/docs + ln -s /usr/share/doc/lazarus/chm $pkgdir/usr/lib/lazarus/docs/html + rm -r $pkgdir/usr/lib/lazarus/install # license files: /usr/lib/lazarus/COPYING* diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 50d0a1589..7871f776a 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 72875 2012-06-24 11:09:33Z svenstaro $ +# $Id: PKGBUILD 76840 2012-10-01 01:55:21Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=ldc -pkgver=20120624 +pkgver=20121001 pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ md5sums=() _gitroot=git://github.com/ldc-developers/ldc.git _gitname=ldc -_gitbranch=llvm-3.1 +_gitbranch=master [[ $CARCH == "x86_64" ]] && _multilib="ON" [[ $CARCH == "i686" ]] && _multilib="OFF" diff --git a/community/lib32-libphobos-ldc/PKGBUILD b/community/lib32-libphobos-ldc/PKGBUILD index cc43715a9..d33790daf 100644 --- a/community/lib32-libphobos-ldc/PKGBUILD +++ b/community/lib32-libphobos-ldc/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 72029 2012-06-06 11:58:40Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=lib32-libphobos-ldc -pkgver=20120607 +pkgver=20120917 pkgrel=1 pkgdesc="libphobos for ldc (32-bit)" arch=('x86_64') @@ -14,7 +14,7 @@ md5sums=() _gitroot=git://github.com/ldc-developers/ldc.git _gitname=ldc -_gitbranch=llvm-3.1 +_gitbranch=master build() { cd "$srcdir" diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index 9a103c268..8fd21df7d 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74867 2012-08-07 16:06:46Z idevolder $ +# $Id: PKGBUILD 78553 2012-10-20 20:21:09Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: Philippe Cherel <philippe.cherel@mayenne.org> pkgname=libcec -pkgver=1.8.1 -pkgrel=1 +pkgver=1.9.0 +pkgrel=2 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/Pulse-Eight/libcec" license=('GPL') depends=('udev' 'lockdev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-34a9cec -sha256sums=('97cda7935404360b56e3c0698deabcc97548bc357a4e4fecbe89de3db12ca0bc') +_srcfolder=Pulse-Eight-libcec-217b236 +sha256sums=('93c0c56b446f82ef71499fd88186c7212a92b037cb8a19516140216cc0aae68f') options=(!libtool) build() { diff --git a/community/libcryptui/PKGBUILD b/community/libcryptui/PKGBUILD index 160bdd7fd..335780a1d 100644 --- a/community/libcryptui/PKGBUILD +++ b/community/libcryptui/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69509 2012-04-17 14:38:21Z bgyorgy $ +# $Id: PKGBUILD 77551 2012-10-12 03:46:14Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libcryptui -pkgver=3.4.1 +pkgver=3.6.0 pkgrel=1 pkgdesc="Library for OpenPGP prompts" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('fad4addf5c5b6588f492a720edce59f925190e4cdf3672984f53b25327f10fd5') +sha256sums=('0a4a747fff33acd03d1381d27454f8aa5eaca026b7475e24c4b8f8272bbe1c87') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libestr/PKGBUILD b/community/libestr/PKGBUILD index de3465b94..d779bb0f1 100644 --- a/community/libestr/PKGBUILD +++ b/community/libestr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62740 2012-01-25 15:38:28Z spupykin $ +# $Id: PKGBUILD 76517 2012-09-21 10:06:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Brian Knox <taotetek@gmail.com> pkgname=libestr -pkgver=0.1.2 -pkgrel=2 +pkgver=0.1.4 +pkgrel=1 pkgdesc="essentials for string handling (and a bit more)" url="http://libestr.adiscon.com/" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=() options=(!libtool) source=("http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz") -md5sums=('30ec4054155dc7d7e9b06418181c4f12') +md5sums=('ee3ff39f421f47b2a9551a7f9011d084') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 66b8d7780..51a064c9a 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75315 2012-08-19 08:00:41Z heftig $ +# $Id: PKGBUILD 78526 2012-10-20 09:33:25Z heftig $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor pkgver=0.6.3 -pkgrel=7 +pkgrel=8 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64" 'mips64el') license=('GPL') diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index 8011689e3..bf8aba504 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 75270 2012-08-17 10:52:47Z bpiotrowski $ +# $Id: PKGBUILD 76525 2012-09-21 15:37:33Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=libfm -pkgver=1.0 -pkgrel=2 +pkgver=1.0.1 +pkgrel=1 pkgdesc="A library for file management" url="http://pcmanfm.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') @@ -14,9 +14,9 @@ license=('GPL') groups=('lxde') options=('!libtool') install=libfm.install -depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils') +depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils' 'vala') source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz) -md5sums=('9f978eb58c72a6623021504832a9da1b') +md5sums=('7fb406f38f99c9171661f72fa6d4da7f') build() { cd $srcdir/$pkgname-$pkgver @@ -25,7 +25,7 @@ build() { --sysconfdir=/etc \ --enable-udisks \ --with-gnu-ld - make + make LDFLAGS+=' -lgobject-2.0 -lglib-2.0' } package() { diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index a73b95e44..684e721d3 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74634 2012-07-31 20:58:13Z foutrelis $ +# $Id: PKGBUILD 78493 2012-10-19 20:57:01Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached -pkgver=1.0.10 +pkgver=1.0.13 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64' 'mips64el') url="http://libmemcached.org/" license=('GPL') depends=('glibc' 'libsasl' 'libevent') -makedepends=('perl') +makedepends=('perl' 'python-sphinx') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha256sums=('0bbb5e310b3d175dfbde99a463ba4474aa22b4ad88ffea2afe76c868d6e1290b') +sha256sums=('41efd1b5e1a8839ebe6c51714ae013f1a4b547bee0973cd8d87cdebdefdc4b28') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD index 4bdacafd9..c2b21f98c 100644 --- a/community/libnetfilter_acct/PKGBUILD +++ b/community/libnetfilter_acct/PKGBUILD @@ -1,12 +1,13 @@ # $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> # Maintainer: Filip Wojciechowski, filip at loka dot pl pkgname=libnetfilter_acct -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 -pkgdesc="userspace library providing interface to extended accounting infrastructure" +pkgdesc='userspace library providing interface to extended accounting infrastructure' arch=('i686' 'x86_64' 'mips64el') url="http://www.netfilter.org/projects/libnetfilter_acct/index.html" license=('GPL') @@ -14,11 +15,15 @@ depends=('libnfnetlink' 'libmnl') makedepends=('pkgconfig') options=('!libtool') source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('246e97feb9cf98f7ddf70d71a3813336') +md5sums=('4755429cbd46ad0ed32bb30f84da0dee') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make - make DESTDIR=$pkgdir install +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD index 0efd23631..84a8ced75 100644 --- a/community/libnetfilter_conntrack/PKGBUILD +++ b/community/libnetfilter_conntrack/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 70936 2012-05-20 08:39:06Z spupykin $ +# $Id: PKGBUILD 77383 2012-10-09 10:14:26Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libnetfilter_conntrack -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 -pkgdesc="userspace library providing a programming interface (API) to the in-kernel connection tracking state table" +pkgdesc='Library providing an API to the in-kernel connection tracking state table' arch=('i686' 'x86_64' 'mips64el') -depends=(libnfnetlink) -makedepends=(pkgconfig) -url="http://www.netfilter.org/projects/libnetfilter_conntrack/index.html" -license=("GPL") +depends=('libnfnetlink' 'libmnl') +url='http://www.netfilter.org/projects/libnetfilter_conntrack/' +license=('GPL') options=('!libtool') -source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('2d17d9da1404728d61a29b4a8338ad0c') +source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") +md5sums=('447114b5d61bb9a9617ead3217c3d3ff') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make - make DESTDIR=$pkgdir install } +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + + +# vim:set ts=2 sw=2 et: diff --git a/community/libnetfilter_cthelper/PKGBUILD b/community/libnetfilter_cthelper/PKGBUILD new file mode 100644 index 000000000..0cca5f479 --- /dev/null +++ b/community/libnetfilter_cthelper/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 77960 2012-10-16 01:20:23Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgname=libnetfilter_cthelper +pkgver=1.0.0 +pkgrel=1 +pkgdesc='Library for the connection tracking helper infrastructure' +arch=('i686' 'x86_64') +url='http://www.netfilter.org/projects/libnetfilter_cthelper/' +license=('GPL2') +depends=('libmnl') +options=('!libtool') +source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") +md5sums=('b2efab1a3a198a5add448960ba011acd') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/libnetfilter_queue/PKGBUILD b/community/libnetfilter_queue/PKGBUILD index 9607bf44b..f9559cb90 100644 --- a/community/libnetfilter_queue/PKGBUILD +++ b/community/libnetfilter_queue/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 71614 2012-05-31 08:52:14Z spupykin $ +# $Id: PKGBUILD 77377 2012-10-09 09:50:14Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> # Maintainer: Filip Wojciechowski, filip at loka dot pl pkgname=libnetfilter_queue -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 -pkgdesc="userspace library providing an API to packets that have been queued by the kernel packet filter" +pkgdesc='Userspace API to packets that have been queued by the kernel packet filter' arch=('i686' 'x86_64' 'mips64el') -url="http://www.netfilter.org/projects/libnetfilter_queue/index.html" +url='http://www.netfilter.org/projects/libnetfilter_queue/' license=('GPL') -depends=(libnfnetlink) -makedepends=(pkgconfig) +depends=('libnfnetlink' 'libmnl') options=('!libtool') -source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('08b968cb2d36c24deb7f26a69f5d8602') +source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") +md5sums=('df09befac35cb215865b39a36c96a3fa') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install } + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/libnfnetlink/PKGBUILD b/community/libnfnetlink/PKGBUILD index 1d984263b..cd0661983 100644 --- a/community/libnfnetlink/PKGBUILD +++ b/community/libnfnetlink/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 55539 2011-09-14 08:04:26Z andrea $ +# $Id: PKGBUILD 77381 2012-10-09 10:06:36Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> # Contributor: Filip Wojciechowski, filip at loka dot pl pkgname=libnfnetlink -pkgver=1.0.0 -pkgrel=2 -pkgdesc="low-level library for netfilter related kernel/userspace communication" +pkgver=1.0.1 +pkgrel=1 +pkgdesc='Low-level library for netfilter related kernel/userspace communication' arch=('i686' 'x86_64' 'mips64el') -url="http://www.netfilter.org/projects/libnfnetlink/index.html" +url='http://www.netfilter.org/projects/libnfnetlink/' license=('GPL') depends=('glibc') options=('!libtool') source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -md5sums=('016fdec8389242615024c529acc1adb8') +md5sums=('98927583d2016a9fb1936fed992e2c5e') build() { - cd "${srcdir}"/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index ab5b60a27..50a78c5e4 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68974 2012-04-06 18:12:22Z jlichtblau $ +# $Id: PKGBUILD 76466 2012-09-18 18:52:24Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> # Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=libraw -pkgver=0.14.6 +pkgver=0.14.7 pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('lcms') options=('!makeflags') changelog=$pkgname.changelog source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz) -sha256sums=('dad1ebe182584630d4b0fa8801bfefb83ebccf83d89be2f0e1ca3abcfa0ea80d') +sha256sums=('7307a607249043bb544f3ab3b3a999e1923d72fbed12e4e2239d172e522143da') build() { cd ${srcdir}/LibRaw-${pkgver} diff --git a/community/libraw/libraw.changelog b/community/libraw/libraw.changelog index 4a34b34b0..858be0c3f 100644 --- a/community/libraw/libraw.changelog +++ b/community/libraw/libraw.changelog @@ -1,3 +1,6 @@ +2012-09-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * libraw 0.14.7-1 + 2012-04-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * libraw 0.14.6-1 diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 638c534d9..8c35c0f67 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75795 2012-08-31 14:01:54Z spupykin $ +# $Id: PKGBUILD 76586 2012-09-24 09:56:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') @@ -36,7 +36,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd-guests.conf.d libvirt.tmpfiles.d openbsd-netcat-default.patch) -md5sums=('5f628e53437b0b0e78477904ba3310af' +md5sums=('a5e50860d9da238ba270b528411c4a0d' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '8297b1be794a24cc77f66af9380ace59' diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 73f7cac04..37fb3c64b 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75534 2012-08-26 20:38:31Z spupykin $ +# $Id: PKGBUILD 77506 2012-10-11 12:11:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,7 +6,7 @@ pkgname=lilypond pkgver=2.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64' 'mips64el') url="http://lilypond.org" @@ -39,5 +39,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" vimdir="/usr/share/vim/vimfiles" install } diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD index 7949b4cdd..7ad656779 100644 --- a/community/lockdev/PKGBUILD +++ b/community/lockdev/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 57817 2011-11-03 10:01:23Z lfleischer $ +# $Id: PKGBUILD 76820 2012-09-30 13:49:03Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de> pkgname=lockdev -pkgver=1.0.3_1.2 +pkgver=1.0.3_1.5 _pkgver=1.0.3 -pkgrel=3 +pkgrel=1 pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.' url='http://packages.qa.debian.org/l/lockdev.html' license=("GPL") @@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el') source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz" "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz") md5sums=('64b9c1b87b125fc348e892e24625524a' - 'afe2995ad3fc6551e107364d66a8e938') + 'c4e8a5a2e46b76b48339c232b358f579') build() { cd "${pkgname}-${_pkgver}" @@ -22,8 +22,8 @@ build() { patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff" sed -i "s|CFLAGS = -g|CFLAGS = -g -fPIC|" Makefile - make shared - make static + make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\"" + make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\"" } package() { diff --git a/community/lsdvd/PKGBUILD b/community/lsdvd/PKGBUILD new file mode 100644 index 000000000..69fca75c9 --- /dev/null +++ b/community/lsdvd/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 76873 2012-10-01 14:53:57Z bisson $ +# Maintainer: Aaron Griffin <aaron@archlinux.org> + +pkgname=lsdvd +pkgver=0.16 +pkgrel=6 +pkgdesc="A C application for reading the contents of a DVD and printing the contents to your terminal" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/lsdvd/" +depends=('libdvdread') +license=('GPL2') +#Special thanks to Mathieu Clabaut <mathieu.clabaut@gmail.com> for patches +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'stdint_usage.patch') +md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7' + '6cbcbfde873f894bd3c784f65141b2fc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/stdint_usage.patch" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/lsdvd/stdint_usage.patch b/community/lsdvd/stdint_usage.patch new file mode 100644 index 000000000..67b9ee82d --- /dev/null +++ b/community/lsdvd/stdint_usage.patch @@ -0,0 +1,22 @@ +--- a/lsdvd.c 2006-03-02 07:48:11.000000000 -0600 ++++ b/lsdvd.c 2007-09-27 19:15:28.000000000 -0500 +@@ -13,6 +13,7 @@ + * 2003-04-19 Cleanups get_title_name, added dvdtime2msec, added helper macros, + * output info structures in form of a Perl module, by Henk Vergonet. + */ ++#include <stdint.h> + #include <dvdread/ifo_read.h> + #include <string.h> + #include <sys/stat.h> +--- a/configure 2005-12-12 14:22:45.000000000 -0600 ++++ b/configure 2007-09-27 19:15:13.000000000 -0500 +@@ -2887,8 +2887,8 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <dvdread/ifo_read.h> + #include <stdint.h> ++#include <dvdread/ifo_read.h> + int + main () + { diff --git a/community/luabitop/PKGBUILD b/community/luabitop/PKGBUILD index 9e8a83683..755ec5ea8 100644 --- a/community/luabitop/PKGBUILD +++ b/community/luabitop/PKGBUILD @@ -6,7 +6,7 @@ pkgname=luabitop pkgver=1.0.2 pkgrel=1 pkgdesc='C extension adding bitwise operations on numbers' -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) url='http://bitop.luajit.org/index.html' depends=('lua') source=("http://bitop.luajit.org/download/LuaBitOp-$pkgver.tar.gz") diff --git a/community/luafilesystem/PKGBUILD b/community/luafilesystem/PKGBUILD index 189f3305a..737148c23 100644 --- a/community/luafilesystem/PKGBUILD +++ b/community/luafilesystem/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 66063 2012-02-22 17:23:57Z cbrannon $ +# $Id: PKGBUILD 78389 2012-10-17 16:41:35Z bpiotrowski $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> + pkgname=luafilesystem -pkgver=1.5.0 -pkgrel=2 -pkgdesc="File System Library for the Lua Programming Language" +pkgver=1.6.2 +pkgrel=1 +pkgdesc='File System Library for the Lua Programming Language' arch=('i686' 'x86_64' 'mips64el') -url="http://www.keplerproject.org/luafilesystem/" +url='http://www.keplerproject.org/luafilesystem/' license=('MIT') -depends=(lua) +depends=('lua') source=(http://github.com/downloads/keplerproject/$pkgname/$pkgname-$pkgver.tar.gz LICENSE) +md5sums=('4e7ec93678c760c4e42cea7d28aafa13' + 'beb2b58c4b5c2782304a5b0267a5651b') build() { - cd "$srcdir/$pkgname-$pkgver" - make + cd $srcdir/$pkgname-$pkgver + make PREFIX=$pkgdir/usr } package() { - cd "$srcdir/$pkgname-$pkgver" - install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm755 src/lfs.so "$pkgdir/usr/lib/lua/5.1/lfs.so" + cd $srcdir/$pkgname-$pkgver + make PREFIX=$pkgdir/usr install + install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } - -md5sums=('3cf4882bbce956e7a0b010f148f194a3' - 'beb2b58c4b5c2782304a5b0267a5651b') diff --git a/community/luajit/Makefile.patch b/community/luajit/Makefile.patch index 69e172145..395a04501 100644 --- a/community/luajit/Makefile.patch +++ b/community/luajit/Makefile.patch @@ -1,6 +1,15 @@ ---- Makefile.orig 2011-12-14 15:15:00.000000000 +0100 -+++ Makefile 2012-03-04 14:53:43.137778596 +0100 -@@ -41,7 +41,7 @@ +--- Makefile.orig 2012-10-16 20:30:00.000000000 +0200 ++++ Makefile 2012-10-17 17:17:05.707727130 +0200 +@@ -34,7 +34,7 @@ + INSTALL_SHARE= $(DPREFIX)/share + INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) + +-INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) ++INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit + INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit + INSTALL_LMODD= $(INSTALL_SHARE)/lua + INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) +@@ -43,7 +43,7 @@ INSTALL_MAN= $(INSTALL_SHARE)/man/man1 INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD index 3e56a034b..ae3b5b636 100644 --- a/community/luajit/PKGBUILD +++ b/community/luajit/PKGBUILD @@ -1,37 +1,35 @@ -# $Id: PKGBUILD 70509 2012-05-09 20:30:54Z bpiotrowski $ +# $Id: PKGBUILD 78428 2012-10-18 04:30:04Z bpiotrowski $ # Maintainer: Chris Brannon <chris@the-brannons.com> # Maintainer: Bartłomiej Piotrowski # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Anders Bergh <anders1@gmail.com> pkgname=luajit -pkgver=2.0.0b10 -pkgrel=1 -pkgdesc="A Just-In-Time Compiler for Lua" +pkgver=2.0.0b11 +pkgrel=3 +pkgdesc='A Just-In-Time Compiler for Lua' arch=('i686' 'x86_64' 'mips64el') -url="http://luajit.org/" +url='http://luajit.org/' license=('MIT') depends=('gcc-libs') -source=("http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz" - 'luaconf.patch' - 'Makefile.patch') -md5sums=('ed66689b96f7ad7bfeffe0b4ff2d63d4' - 'c8da9c6790e20a12a0e2496f438d9dc3' - '8997c5e5fa4f6e8e0b86cc6b888de631') +source=(http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz + Makefile.patch) +md5sums=('824aa2684a11e3cc3abe87350a7b6139' + 'c9dff2a84424fa0af322379a5f115fb7') build() { - cd "$srcdir/LuaJIT-${pkgver/b/-beta}" - - patch -Np0 -i "$srcdir/luaconf.patch" - patch -Np0 -i "$srcdir/Makefile.patch" - - make + cd $srcdir/LuaJIT-${pkgver/b/-beta} + patch -Np0 -i $srcdir/Makefile.patch + make PREFIX=/usr } package() { - cd "$srcdir/LuaJIT-${pkgver/b/-beta}" - make install DESTDIR="$pkgdir" PREFIX=/usr + cd $srcdir/LuaJIT-${pkgver/b/-beta} + make install DESTDIR=$pkgdir PREFIX=/usr + + install -Dm644 $srcdir/LuaJIT-${pkgver/b/-beta}/COPYRIGHT \ + $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT - install -Dm644 "$srcdir/LuaJIT-${pkgver/b/-beta}/COPYRIGHT" \ - "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" + # Poor man's slot system + ln -s /usr/share/$pkgname $pkgdir/usr/share/$pkgname-${pkgver/b/-beta} } diff --git a/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch b/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch index 4553df933..0e5a9d1a2 100644 --- a/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch +++ b/community/luakit/0001-Dont-mark-desktop-file-as-executable.patch @@ -4,7 +4,7 @@ Date: Thu, 12 Apr 2012 16:43:41 +0200 Subject: [PATCH] Don't mark desktop file as executable. --- - Makefile | 2 +- + Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile @@ -12,14 +12,13 @@ index be1567b..50973d6 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ install: - install -d $(DESTDIR)/usr/share/pixmaps - install extras/luakit.png $(DESTDIR)/usr/share/pixmaps/ - install -d $(DESTDIR)/usr/share/applications -- install extras/luakit.desktop $(DESTDIR)/usr/share/applications/ -+ install -m0644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/ - install -d $(MANPREFIX)/man1/ - install -m644 luakit.1 $(MANPREFIX)/man1/ - --- -1.7.10 + install -d $(DESTDIR)/usr/share/pixmaps + install extras/luakit.png $(DESTDIR)/usr/share/pixmaps/ + install -d $(DESTDIR)/usr/share/applications +- install extras/luakit.desktop $(DESTDIR)/usr/share/applications/ ++ install -m0644 extras/luakit.desktop $(DESTDIR)/usr/share/applications/ + install -d $(MANPREFIX)/man1/ + install -m644 luakit.1 $(MANPREFIX)/man1/ +--- +1.7.10 diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD index 6666e044a..09392ace9 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -1,10 +1,12 @@ +# $Id: PKGBUILD 78446 2012-10-18 17:40:26Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com> pkgname=luakit -pkgver=2012.03.25 -pkgrel=2 +pkgver=2012.09.13.r1 +_pkgver=2012.09.13-r1 +pkgrel=3 pkgdesc='Fast, small, webkit based browser framework extensible by Lua' arch=('i686' 'x86_64' 'mips64el') url='http://www.luakit.org/projects/luakit' @@ -12,20 +14,16 @@ license=('GPL3') depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils' 'luajit') makedepends=('git' 'help2man') options=(!makeflags) -conflicts=('luakit-git' 'luakit-develop-git') install='luakit.install' -source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}" - 0001-Dont-mark-desktop-file-as-executable.patch) -md5sums=('e25aaeacfa5758127b3f677eafba9aa2' - 'a1caf95b03659cd02a392a376a13edd7') +source=($pkgname-$pkgver.tar.gz::https://github.com/mason-larobina/luakit/tarball/$_pkgver) +md5sums=('77b02e6d19ba021409f1778fddd94a42') build() { cd mason-larobina-luakit-* - patch -Np1 -i $srcdir/0001-Dont-mark-desktop-file-as-executable.patch - make USE_LUAJIT=1 PREFIX=/usr DESTDIR=${pkgdir} all + make USE_LUAJIT=1 PREFIX=/usr all } package() { cd mason-larobina-luakit-* - make PREFIX=/usr DESTDIR=${pkgdir} install + make PREFIX=/usr DESTDIR=$pkgdir install } diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD index 89637e555..d81969ca7 100644 --- a/community/luaposix/PKGBUILD +++ b/community/luaposix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76132 2012-09-11 21:50:55Z seblu $ +# $Id: PKGBUILD 77213 2012-10-07 01:13:25Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Laszlo Papp <djszapi at archlinux us> # Contributor: Donald Ephraim Curtis <dcurtis@gmail.com> pkgname=luaposix -pkgver=5.1.21 +pkgver=5.1.23 pkgrel=1 pkgdesc='A POSIX library for Lua programming language' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('lua' 'luabitop') #checkdepends=('lunit') options=('!libtool') source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('7bc06747199f6bd2994ed5a7b2bdf089') +md5sums=('ebe7d335741ca736e003a6844a0fbf92') build() { cd $pkgname-$pkgver diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 21a4736f9..8f5c27e83 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74839 2012-08-06 23:09:16Z andrea $ +# $Id: PKGBUILD 77594 2012-10-13 06:46:05Z allan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr pkgver=2.3.0 -pkgrel=2 +pkgrel=3 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64' 'mips64el') url='http://qtpfsgui.sourceforge.net/' diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 0f59eb835..704adc119 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 76091 2012-09-11 09:36:55Z stativ $ +# $Id: PKGBUILD 78368 2012-10-17 15:33:35Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=luxrays -pkgver=1.0 -_pkgver=77f43d452539 -pkgrel=1 +pkgver=1.1 +_pkgver=589aa5dac899 +pkgrel=2 epoch=0 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') url="http://www.luxrender.net/" license=('GPL') depends=('freeimage' 'freeglut' 'glew' 'libcl') -makedepends=('cmake' 'boost' 'opencl-headers') +makedepends=('cmake' 'boost' 'mesa' 'opencl-headers') source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('04dbda4a999f60a9ec26418bac5243cd') +md5sums=('7513d71148fa14bc1779b816816580b9') build() { cd "$srcdir/luxrender-$pkgname-$_pkgver" diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index c3211a00e..be12d5880 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76093 2012-09-11 09:48:44Z stativ $ +# $Id: PKGBUILD 78304 2012-10-17 13:34:29Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> pkgname=luxrender -pkgver=1.0 -_pkgver=a041e87b9732 -pkgrel=1 +pkgver=1.1 +_pkgver=4b4289cda943 +pkgrel=2 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') url="http://www.luxrender.net/" @@ -16,25 +16,22 @@ optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ 'nvidia-utils: OpenCL support for nVidia GPUs' \ 'amdstream: OpenCL support for AMD GPUs' \ 'intel-opencl-sdk: OpenCL support for Intel CPUs') -makedepends=('cmake' 'boost' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers') -source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ - boost_1.50_fix.diff) -md5sums=('28228a8ef311aa5e665e7b9d3708b026' - '4cddc606ef3ea7f0bbbc9b3415be38b0') +makedepends=('cmake' 'boost' 'mesa' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers') +source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2) +md5sums=('accca65afdc4cc38db49a6e54f20e0f2') build() { cd "$srcdir"/luxrender-lux-$_pkgver - # fix for boost 1.50 - # the boost::TIME_UTC has been renamed due to the conflict with C++11 - patch -Np1 < "$srcdir"/boost_1.50_fix.diff || true + # fix the installation + sed -i '/.*wxgui.*/ d' CMakeLists.txt export CXXFLAGS="$CXXFLAGS -lpthread" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.2mu.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.2mu/ \ + -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \ . make } @@ -47,7 +44,7 @@ package() { [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib #install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.2/pylux.so + install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so } # vim:set ts=2 sw=2 et: diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 1e39fe06c..9da1bb987 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74705 2012-08-02 08:51:42Z bpiotrowski $ +# $Id: PKGBUILD 76688 2012-09-26 21:14:05Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=14 +pkgrel=15 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install index eaf2339cd..4d1285dc5 100644 --- a/community/lxdm/lxdm.install +++ b/community/lxdm/lxdm.install @@ -1,24 +1,18 @@ -pkgname=lxdm - post_install() { - if [ -z "`getent group "lxdm" 2> /dev/null`" ]; then - groupadd lxdm - chown root:lxdm /etc/lxdm/lxdm.conf - fi - chown -R root:lxdm /var/lib/lxdm > /dev/null - chmod +r /etc/lxdm/lxdm.conf + if ! getent group lxdm > /dev/null ; then + groupadd --system lxdm + chgrp -R lxdm /var/lib/lxdm + chgrp lxdm /etc/lxdm/lxdm.conf + chmod +r /etc/lxdm/lxdm.conf + fi } post_upgrade() { - post_install + post_install $1 } post_remove() { - getent group "lxdm" &>/dev/null && groupdel lxdm #1>/dev/null - return 0 + if ! getent group lxdm > /dev/null ; then + groupdel lxdm + fi } - -op=$1 -shift - -$op "$@" diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 89184044b..c9e0d4941 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74816 2012-08-06 08:20:52Z spupykin $ +# $Id: PKGBUILD 76741 2012-09-28 19:41:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ optdepends=('libxslt: Web Map Service' makedepends=('scons' 'boost') install="mapnik.install" source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2") -md5sums=('c00f4fa2d5f3c344d93d71afdfce3a5e') +md5sums=('d580c558a957444873bec9e24526b0a0') build() { cd "$srcdir/$pkgname-v$pkgver" diff --git a/community/mayavi/PKGBUILD b/community/mayavi/PKGBUILD index 4e9fcafc9..888251cd7 100644 --- a/community/mayavi/PKGBUILD +++ b/community/mayavi/PKGBUILD @@ -1,31 +1,64 @@ -# $Id: PKGBUILD 75627 2012-08-27 16:59:37Z aginiewicz $ +# $Id: PKGBUILD 76178 2012-09-12 16:35:27Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> pkgname=mayavi pkgver=4.2.0 _githubtag=a1e562a -pkgrel=2 +pkgrel=4 pkgdesc="A 3-dimensional visualizer of scientific data" arch=('i686' 'x86_64') url="http://code.enthought.com/projects/mayavi/" license=('BSD') depends=('ipython2' 'vtk' 'python2-envisage' 'wxpython') -makedepends=('python2-distribute' 'python2-sphinx') +makedepends=('python2-distribute' 'python2-sphinx' 'xorg-server-xvfb' 'twisted') replaces=('python2-mayavi') provides=('python2-mayavi') options=(!emptydirs) -source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/tarball/${pkgver}") -md5sums=('b46fb048176002738de64eed8d2b447a') +source=("$pkgname-$pkgver.tar.gz::https://github.com/enthought/mayavi/tarball/${pkgver}" + vtk-5.10.patch) +md5sums=('b46fb048176002738de64eed8d2b447a' + '01b8375392b5d3f587e81ba388a8089f') build() { cd "$srcdir"/enthought-mayavi-${_githubtag} - python2 setup.py build + # Add compatibility for vtk 5.10 (FS#31498) + patch -p1 < ../vtk-5.10.patch + + # Use python2-sphinx provided sphinx-build2 + sed -i -e 's/sphinx-build/sphinx-build2/' docs/Makefile* + + # Fix distutils compatibility + sed -i -e 's/distutils.Version/distutils.version/' mayavi/modules/text.py + sed -i -e 's/distutils.Version/distutils.version/' tvtk/tools/mlab.py - cd docs + # set path so autodoc can find just built modules + echo "sys.path.append('$srcdir/enthought-mayavi-${_githubtag}/build/lib.linux-$CARCH-2.7/')" >> docs/source/mayavi/conf.py + mkdir -p build/lib.linux-$CARCH-2.7/{tvtk/plugins/scene,mayavi/preferences,mayavi/core} + ln -s "$srcdir"/enthought-mayavi-${_githubtag}/tvtk/tvtk_classes.zip \ + build/lib.linux-$CARCH-2.7/tvtk/tvtk_classes.zip + ln -s "$srcdir"/enthought-mayavi-${_githubtag}/mayavi/preferences/preferences.ini \ + build/lib.linux-$CARCH-2.7/mayavi/preferences/preferences.ini + ln -s "$srcdir"/enthought-mayavi-${_githubtag}/tvtk/plugins/scene/preferences.ini \ + build/lib.linux-$CARCH-2.7/tvtk/plugins/scene/preferences.ini + ln -s "$srcdir"/enthought-mayavi-${_githubtag}/mayavi/core/lut \ + build/lib.linux-$CARCH-2.7/mayavi/core/lut + + # now this is ugly, but docs do not build without X. We setup X according to: + # http://docs.enthought.com/mayavi/mayavi/tips.html#rendering-using-the-virtual-framebuffer + export DISPLAY=:69 + Xvfb $DISPLAY & + + # build! + python2 setup.py build - make SPHINXBUILD=sphinx-build2 html + # have to kill the server to proceed, and do other cleanup + kill `cat /tmp/.X${DISPLAY/:/}-lock` + rm build/lib.linux-$CARCH-2.7/tvtk/tvtk_classes.zip + rm build/lib.linux-$CARCH-2.7/mayavi/preferences/preferences.ini + rm build/lib.linux-$CARCH-2.7/tvtk/plugins/scene/preferences.ini + rm build/lib.linux-$CARCH-2.7/mayavi/core/lut } package() { diff --git a/community/mayavi/vtk-5.10.patch b/community/mayavi/vtk-5.10.patch new file mode 100644 index 000000000..34fbbcf34 --- /dev/null +++ b/community/mayavi/vtk-5.10.patch @@ -0,0 +1,83 @@ +From e61d4afa02072b48a332c7250b293704f57c6b2a Mon Sep 17 00:00:00 2001 +From: "mluessi@nmr.mgh.harvard.edu" <mluessi@nmr.mgh.harvard.edu> +Date: Mon, 9 Jul 2012 17:48:20 -0400 +Subject: [PATCH 01/13] FIX: version comp. for VTK 5.10 + +--- + mayavi/modules/text.py | 8 +++++--- + tvtk/tools/mlab.py | 5 +++-- + 2 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/mayavi/modules/text.py b/mayavi/modules/text.py +index 1fcc0e0..d1c79c0 100644 +--- a/mayavi/modules/text.py ++++ b/mayavi/modules/text.py +@@ -5,6 +5,8 @@ + # Copyright (c) 2005, Enthought, Inc. + # License: BSD Style. + ++from distutils.Version import StrictVersion ++ + # Enthought library imports. + from traits.api import Instance, Range, Str, Bool, Property, \ + Float +@@ -16,7 +18,7 @@ from apptools.persistence import state_pickler + from mayavi.core.module import Module + from mayavi.core.pipeline_info import PipelineInfo + +-VTK_VER = float(tvtk.Version().vtk_version[:3]) ++VTK_VER = StrictVersion(tvtk.Version().vtk_version) + + + ###################################################################### +@@ -68,7 +70,7 @@ class Text(Module): + ######################################## + # The view of this object. + +- if VTK_VER > 5.1: ++ if VTK_VER > '5.1': + _text_actor_group = Group(Item(name='visibility'), + Item(name='text_scale_mode'), + Item(name='alignment_point'), +@@ -152,7 +154,7 @@ class Text(Module): + set the `actors` attribute up at this point. + """ + actor = self.actor = tvtk.TextActor(input=str(self.text)) +- if VTK_VER > 5.1: ++ if VTK_VER > '5.1': + actor.set(text_scale_mode='prop', width=0.4, height=1.0) + else: + actor.set(scaled_text=True, width=0.4, height=1.0) +diff --git a/tvtk/tools/mlab.py b/tvtk/tools/mlab.py +index 8262da0..dfe9230 100644 +--- a/tvtk/tools/mlab.py ++++ b/tvtk/tools/mlab.py +@@ -92,6 +92,7 @@ functions:: + # Copyright (c) 2005-2007, Enthought, Inc. + # License: BSD Style. + ++from distutils.Version import StrictVersion + + import numpy + +@@ -107,7 +108,7 @@ from tvtk.tools import ivtk + # Set this to False to not use LOD Actors. + USE_LOD_ACTOR = True + +-VTK_VER = float(tvtk.Version().vtk_version[:3]) ++VTK_VER = StrictVersion(tvtk.Version().vtk_version) + + ###################################################################### + # Utility functions. +@@ -639,7 +640,7 @@ class Title(MLabBase): + super(Title, self).__init__(**traits) + + ta = self.text_actor +- if VTK_VER > 5.1: ++ if VTK_VER > '5.1': + ta.set(text_scale_mode='prop', height=0.05, input=self.text) + else: + ta.set(scaled_text=True, height=0.05, input=self.text) +-- +1.7.12 + diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index 27302f56d..9d60906c3 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57954 2011-11-04 21:05:32Z lcarlier $ +# $Id: PKGBUILD 77126 2012-10-05 11:04:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> pkgname=mcelog pkgver=1.0pre3 -pkgrel=3 +pkgrel=4 pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") @@ -13,23 +13,24 @@ arch=('i686' 'x86_64' 'mips64el') options=('docs') #source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz" source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz" - "${pkgname}.rc") + "${pkgname}.rc" + "mcelog.service") md5sums=('b42f2214de6f4feb992556149edc67fa' - 'f039a77d7bde3518d3d695b144816e8a') + 'f039a77d7bde3518d3d695b144816e8a' + '4e563f1124c09b3368532d37f9f4bba3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - mkdir -p $pkgdir/usr/share/doc/mcelog make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron" install -Dm0755 "${srcdir}/mcelog.rc" "${pkgdir}/etc/rc.d/mcelog" install -Dm0644 mcelog.logrotate "${pkgdir}/etc/logrotate.d/mcelog.logrotate" install -Dm0644 README "${pkgdir}/usr/share/doc/mcelog/README" + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service new file mode 100644 index 000000000..62d8cbed0 --- /dev/null +++ b/community/mcelog/mcelog.service @@ -0,0 +1,17 @@ +[Unit] +Description=Machine Check Exception Logging Daemon +After=syslog.target + +# FIXME - due to upstream kernel bug always start the mcelog process +# twice using the following ExecStartPre hack. This needs fixing. +# There is a bug filed against systemd for the ExecStartPre bit +# since it is not possible to specify that the ExecStarPre bit +# is allowed and expected to fail without aborting the daemon. + +[Service] +ExecStartPre=/etc/mcelog/mcelog.setup +ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground +StandardOutput=syslog + +[Install] +WantedBy=multi-user.target diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD index c339165b5..7a3096254 100644 --- a/community/mediaproxy/PKGBUILD +++ b/community/mediaproxy/PKGBUILD @@ -1,25 +1,33 @@ -# $Id: PKGBUILD 56530 2011-10-07 21:31:08Z spupykin $ +# $Id: PKGBUILD 78383 2012-10-17 15:54:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=mediaproxy pkgver=2.5.2 -pkgrel=1 +pkgrel=3 pkgdesc="Open-source media proxy for OpenSER" url="http://mediaproxy.ag-projects.com/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('python2' 'libnetfilter_conntrack' 'iptables' - 'python-application' 'python-cjson' 'python-gnutls') -backup=('opt/mediaproxy/config.ini') + 'python2-application' 'python2-cjson' 'python2-gnutls') +#backup=('opt/mediaproxy/config.ini') source=("http://download.ag-projects.com/MediaProxy/mediaproxy-$pkgver.tar.gz" - "mediaproxy.init") + "mediaproxy.init" + "mediaproxy-dispatcher.service" + "mediaproxy-relay.service" + "mediaproxy.tmpfiles") md5sums=('840de8f52e656991be728c15ec30bb5e' - '64042f4686de69a9bdd27d51cbe8a548') + '66f4417f40dda0dfa31569ee4ccc32c7' + '4a1fa0b6ce0a8bd44bf0f1d9d36a6154' + '23c1a584835de00a958ef963cdd40040' + '60a25f2cb6429a0a7d62d45d0c75a0ea') -build() -{ +build() { cd $srcdir/mediaproxy-$pkgver install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy python2 setup.py install --root=$pkgdir + install -Dm0644 $srcdir/$pkgname-dispatcher.service $pkgdir/usr/lib/systemd/system/$pkgname-dispatcher.service + install -Dm0644 $srcdir/$pkgname-relay.service $pkgdir/usr/lib/systemd/system/$pkgname-relay.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/mediaproxy/mediaproxy-dispatcher.service b/community/mediaproxy/mediaproxy-dispatcher.service new file mode 100644 index 000000000..500bb33c7 --- /dev/null +++ b/community/mediaproxy/mediaproxy-dispatcher.service @@ -0,0 +1,11 @@ +[Unit] +Description=Mediaproxy dispatcher service +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/var/run/mediaproxy/dispatcher.pid +ExecStart=media-dispatcher + +[Install] +WantedBy=multi-user.target diff --git a/community/mediaproxy/mediaproxy-relay.service b/community/mediaproxy/mediaproxy-relay.service new file mode 100644 index 000000000..2618800e6 --- /dev/null +++ b/community/mediaproxy/mediaproxy-relay.service @@ -0,0 +1,11 @@ +[Unit] +Description=Mediaproxy relay service +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/var/run/mediaproxy/relay.pid +ExecStart=media-relay + +[Install] +WantedBy=multi-user.target diff --git a/community/mediaproxy/mediaproxy.init b/community/mediaproxy/mediaproxy.init index c8c600aea..ba9fe90b2 100755 --- a/community/mediaproxy/mediaproxy.init +++ b/community/mediaproxy/mediaproxy.init @@ -1,6 +1,6 @@ #!/bin/sh -# -# mediaproxy starts and stops the SER MediaProxy server + +# mediaproxy starts and stops the SER MediaProxy server . /etc/rc.conf . /etc/rc.d/functions @@ -14,19 +14,19 @@ case "$1" in else stat_done fi - ;; + ;; stop) stat_busy "Stopping mediaproxy" - kill `cat /var/run/mediaproxy/relay.pid` - kill `cat /var/run/mediaproxy/dispatcher.pid` - stat_done - ;; + kill `cat /var/run/mediaproxy/relay.pid` + kill `cat /var/run/mediaproxy/dispatcher.pid` + stat_done + ;; restart) - $0 stop - sleep 3 - $0 start - ;; + $0 stop + sleep 3 + $0 start + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" ;; esac diff --git a/community/mediaproxy/mediaproxy.tmpfiles b/community/mediaproxy/mediaproxy.tmpfiles new file mode 100644 index 000000000..a102c489f --- /dev/null +++ b/community/mediaproxy/mediaproxy.tmpfiles @@ -0,0 +1 @@ +d /var/run/mediaproxy 0755 root root - diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 1c1804fe7..a76a0e2f2 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 74620 2012-07-31 19:56:16Z ebelanger $ +# $Id: PKGBUILD 77649 2012-10-13 11:43:58Z allan $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest pkgver=3.6.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/megaglest/" license=('GPL3') depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew' -'libircclient' 'miniupnpc' 'wxgtk') +'libircclient' 'miniupnpc' 'wxgtk' 'glu') makedepends=('ftjam' 'cmake' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz" lol.patch) diff --git a/community/mesa-dri1/PKGBUILD b/community/mesa-dri1/PKGBUILD index 4676e046a..f63f0d717 100644 --- a/community/mesa-dri1/PKGBUILD +++ b/community/mesa-dri1/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: ConnorBehan <connor.behan@gmail.com> pkgbase=mesa-dri1 -pkgname=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') +pkgname=('unichrome-dri' 'i810-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') pkgver=7.11.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.14' 'dri2proto' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'llvm' 'udev') @@ -18,7 +18,7 @@ build() { autoreconf -vfi ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-dri-drivers=unichrome,mach64,mga,r128,savage,sis,tdfx \ + --with-dri-drivers=unichrome,i810,mach64,mga,r128,savage,sis,tdfx \ --with-gallium-drivers= \ --disable-gallium-llvm \ --enable-glx-tls \ @@ -41,6 +41,13 @@ package_unichrome-dri() { make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install } +package_i810-dri() { + depends=("libgl") + pkgdesc="Mesa DRI drivers for Intel i810" + + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install +} + package_mach64-dri() { depends=("libgl") pkgdesc="Mesa DRI drivers for ATI Mach64" diff --git a/community/mezogis/PKGBUILD b/community/mezogis/PKGBUILD index 83ce2c160..f9c1e3759 100644 --- a/community/mezogis/PKGBUILD +++ b/community/mezogis/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67954 2012-03-16 12:03:52Z giovanni $ +# $Id: PKGBUILD 78274 2012-10-17 10:28:19Z allan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=mezogis pkgver=0.1.5 -pkgrel=5 +pkgrel=6 pkgdesc="A GIS application to query and analyse spatial data" arch=('i686' 'x86_64' 'mips64el') url="http://www.mezogis.org" license=('GPL') -depends=('pygtk' 'python-geotypes' 'postgis') +depends=('pygtk' 'python2-geotypes' 'postgis') source=("http://www.mezogis.org/files/mezogis-$pkgver.tar.gz") md5sums=('1f886b849109a1a1bd3e165353b82368') diff --git a/community/mftrace/PKGBUILD b/community/mftrace/PKGBUILD index e356cd945..7a17a5166 100644 --- a/community/mftrace/PKGBUILD +++ b/community/mftrace/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 66235 2012-02-23 05:09:11Z spupykin $ +# $Id: PKGBUILD 76923 2012-10-02 09:37:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=mftrace -pkgver=1.2.17 -pkgrel=2 +pkgver=1.2.18 +pkgrel=1 pkgdesc="Traces TeX bitmap fonts into PFA, PFB, or TTF" arch=('i686' 'x86_64' 'mips64el') url="http://lilypond.org/mftrace/" license=("GPL") depends=('python2' 'potrace' 't1utils') source=(http://lilypond.org/download/sources/mftrace/mftrace-$pkgver.tar.gz) -md5sums=('1a40b28e94594d215d5c4401b5ac76cb') +md5sums=('7d660226b6f933a239b2413ac010fe0c') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/midori/0.4.7-private-mode.patch b/community/midori/0.4.7-private-mode.patch new file mode 100644 index 000000000..599780b78 --- /dev/null +++ b/community/midori/0.4.7-private-mode.patch @@ -0,0 +1,12 @@ +diff -aur midori-0.4.7/katze/midori-paths.vala midori-0.4.7.patch/katze/midori-paths.vala +--- midori-0.4.7/katze/midori-paths.vala 2012-09-19 23:17:43.000000000 +0200 ++++ midori-0.4.7.patch/katze/midori-paths.vala 2012-09-24 20:36:04.585209437 +0200 +@@ -74,7 +74,7 @@ + else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) { + /* Use mock folders in development builds */ + if ("." in MIDORI_VERSION_SUFFIX) +- config_dir = cache_dir = user_data_dir = config_base; ++ config_dir = cache_dir = user_data_dir = config_base ?? Path.DIR_SEPARATOR_S; + else + config_dir = cache_dir = user_data_dir = "/"; + readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S, diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index d5f878be8..bfab30b7c 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73311 2012-07-06 07:26:16Z bpiotrowski $ +# $Id: PKGBUILD 76712 2012-09-27 13:47:42Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -7,43 +7,46 @@ # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> pkgname=midori -pkgver=0.4.6 +pkgver=0.4.7 pkgrel=2 -pkgdesc="Lightweight web browser based on Gtk WebKit" +pkgdesc='Lightweight web browser based on Gtk WebKit' arch=('x86_64' 'i686' 'mips64el') -url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" +url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' license=('LGPL2.1') install=midori.install depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support') options=('!emptydirs') -source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + 0.4.7-private-mode.patch) +md5sums=('06db7b88a41e9b2265728960d5e98f35' + 'b2f21a853038662fd0e6c2274ed9dfb7') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $srcdir/$pkgname-$pkgver + + # fs#31641 + patch -Np1 -i $srcdir/0.4.7-private-mode.patch + # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf - ./configure \ - --prefix=/usr \ - --jobs=${MAKEFLAGS/-j/} \ - --enable-addons \ - --disable-hildon \ - --enable-unique \ - --enable-nls \ - --enable-docs \ - --enable-apidocs + ./configure --prefix=/usr \ + --jobs=${MAKEFLAGS/-j/} \ + --enable-addons \ + --disable-hildon \ + --enable-unique \ + --enable-nls \ + --enable-docs \ + --enable-apidocs make } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } # vim:set ts=2 sw=2 et: diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD index 6882392cb..694a30ae6 100644 --- a/community/mingw32-gcc-base/PKGBUILD +++ b/community/mingw32-gcc-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72373 2012-06-13 10:03:53Z spupykin $ +# $Id: PKGBUILD 76624 2012-09-25 09:56:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> @@ -8,8 +8,8 @@ _w32apiver=3.17 _runtimever=3.20 _uprel=1 _upw32rel=1 -pkgrel=1 -arch=(i686 x86_64 'mips64el') +pkgrel=2 +arch=(i686 x86_64) pkgdesc="A C cross-compiler for building Windows executables on Linux" depends=(mingw32-binutils) makedepends=(p7zip mingw32-runtime mingw32-w32api) diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index e18712450..7ff2dd8be 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73806 2012-07-15 20:17:53Z spupykin $ +# $Id: PKGBUILD 76403 2012-09-17 10:17:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -7,7 +7,7 @@ pkgname=minidlna pkgver=1.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" @@ -19,12 +19,12 @@ backup=('etc/minidlna.conf' changelog=changelog source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz minidlna.rc - minidlna.conf - minidlna.service) + minidlna.service + minidlna.tmpfiles) md5sums=('d966256baf2f9b068b9de871ab5dade5' 'c9863d5703e0a8469cc200f2739567e7' - 'af1b8c0fef9902f797b0324c255da5a1' - '1903ed9ceee43b8bb86146b9ad8eb50c') + '1903ed9ceee43b8bb86146b9ad8eb50c' + '26de27b12d6a37c47d9714107d07aac9') build() { cd "$srcdir/$pkgname-$pkgver" @@ -43,6 +43,6 @@ package() { echo 'MINIDLNA_OPTS=""' >>$pkgdir/etc/conf.d/minidlna # systemd files - install -Dm0644 $srcdir/minidlna.conf $pkgdir/usr/lib/tmpfiles.d/minidlna.conf + install -Dm0644 $srcdir/minidlna.tmpfiles $pkgdir/usr/lib/tmpfiles.d/minidlna.conf install -Dm0644 $srcdir/minidlna.service $pkgdir/usr/lib/systemd/system/minidlna.service } diff --git a/community/minidlna/minidlna.tmpfiles b/community/minidlna/minidlna.tmpfiles new file mode 100644 index 000000000..56e057f62 --- /dev/null +++ b/community/minidlna/minidlna.tmpfiles @@ -0,0 +1,5 @@ +# systemd tmpfile settings for minidlna +# See tmpfiles.d(5) for details + +d /var/run/minidlna 0755 nobody nobody - +d /var/cache/minidlna 0755 nobody nobody - diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD index e70d353be..1c75dffee 100644 --- a/community/minitube/PKGBUILD +++ b/community/minitube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 73056 2012-06-29 18:18:46Z andrea $ +# $Id: PKGBUILD 76714 2012-09-27 15:50:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=minitube -pkgver=1.8 +pkgver=1.9 pkgrel=1 pkgdesc="A native YouTube client in QT. Watch YouTube videos without Flash Player" arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +12,11 @@ depends=('phonon') install="${pkgname}.install" source=("http://flavio.tordini.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'fix-build.patch') -md5sums=('dabfe4776ab6a19eff14e644f68714bb' +md5sums=('a60bb568519eb91035d5d6dc27ff1406' 'b6d67acdfc5ef17235449ca13575ba97') build() { - cd "${srcdir}"/${pkgname} + cd ${pkgname} patch -p1 -i "${srcdir}"/fix-build.patch @@ -24,6 +24,6 @@ build() { } package() { - cd "${srcdir}"/${pkgname} + cd ${pkgname} make install INSTALL_ROOT="${pkgdir}" } diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 40aec561d..049527180 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75855 2012-09-03 16:08:44Z tdziedzic $ +# $Id: PKGBUILD 76844 2012-10-01 05:33:09Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Mathias Stearn <mathias@10gen.com> @@ -6,7 +6,7 @@ pkgname=mongodb pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' @@ -19,12 +19,13 @@ backup=('etc/mongodb.conf') install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' 'mongodb.conf' 'mongodb.service' - 'SConscript.client.patch') + 'SConscript.client.patch' 'boost1.50.patch') md5sums=('832bdb6cc659176fd8d6b16a660ccfc6' '9c67e00f4626ad761a8f7d4e037a54d7' '4839fe1d638187ca3226e8267b947318' '96ab4517b48974ce0e566d9746a75a4f' - 'a9529e2a6e392ffecef7a9178394c814') + 'a9529e2a6e392ffecef7a9178394c814' + 'da8a9d78e4a38d1ed8e92a210d4b5ba7') build() { export SCONSFLAGS="$MAKEFLAGS" @@ -34,11 +35,10 @@ build() { # fix https://jira.mongodb.org/browse/SERVER-5575 patch -Np1 -i ${srcdir}/SConscript.client.patch - sed -i '/nixLibPrefix/s/lib64/lib/' SConstruct + # fix boost incompatibility + patch -Np1 -i ${srcdir}/boost1.50.patch - # --sharedclient generates an error that the source .so could not be found - # --use-system-sm --use-system-pcre - scons all --full + scons all --use-system-boost # --sharedclient currently fails } <<COMMENT @@ -56,11 +56,16 @@ package() { cd mongodb-src-r${pkgver} - scons install --full --prefix=$pkgdir/usr + scons install --use-system-boost --full --prefix=$pkgdir/usr # --sharedclient currently fails - install -D -m755 $srcdir/mongodb.rc $pkgdir/etc/rc.d/mongodb - install -D -m644 $srcdir/mongodb.conf $pkgdir/etc/mongodb.conf - install -D -m644 $srcdir/mongodb.service $pkgdir/usr/lib/systemd/system/mongodb.service - install -d -m700 $pkgdir/var/lib/mongodb - install -d -m755 $pkgdir/var/log/mongodb + install -Dm755 $srcdir/mongodb.rc $pkgdir/etc/rc.d/mongodb + install -Dm644 $srcdir/mongodb.conf $pkgdir/etc/mongodb.conf + [[ -f $pkgdir/usr/lib ]] && rm $pkgdir/usr/lib # wtf mongo + install -Dm644 $srcdir/mongodb.service $pkgdir/usr/lib/systemd/system/mongodb.service + install -dm700 $pkgdir/var/lib/mongodb + install -dm755 $pkgdir/var/log/mongodb + + # the earlier SConscript patch actually gives us some trouble on x86_64 so we need to hack it out again + mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ + rm -r ${pkgdir}/usr/lib64 } diff --git a/community/mongodb/boost1.50.patch b/community/mongodb/boost1.50.patch new file mode 100644 index 000000000..203826ae7 --- /dev/null +++ b/community/mongodb/boost1.50.patch @@ -0,0 +1,237 @@ +diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp +index 6a80fe9..4a42e73 100644 +--- a/src/mongo/db/db.cpp ++++ b/src/mongo/db/db.cpp +@@ -18,6 +18,7 @@ + + #include "mongo/pch.h" + ++#include <boost/version.hpp> + #include <boost/thread/thread.hpp> + #include <boost/filesystem/operations.hpp> + #include <fstream> +@@ -348,7 +349,7 @@ namespace mongo { + boost::filesystem::path path( dbpath ); + for ( boost::filesystem::directory_iterator i( path ); + i != boost::filesystem::directory_iterator(); ++i ) { +- string fileName = boost::filesystem::path(*i).leaf(); ++ string fileName = boost::filesystem::path(*i).leaf().string(); + if ( boost::filesystem::is_directory( *i ) && + fileName.length() && fileName[ 0 ] == '$' ) + boost::filesystem::remove_all( *i ); +@@ -748,11 +749,6 @@ static int mongoDbMain(int argc, char* argv[]) { + dbExecCommand = argv[0]; + + srand(curTimeMicros()); +-#if( BOOST_VERSION >= 104500 ) +- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); +-#else +- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); +-#endif + + { + unsigned x = 0x12345678; +@@ -1083,7 +1079,7 @@ static int mongoDbMain(int argc, char* argv[]) { + if (params.count("shutdown")){ + bool failed = false; + +- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); ++ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); + if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 ) + failed = true; + +diff --git a/src/mongo/db/dur.cpp b/src/mongo/db/dur.cpp +index b83957b..242fe00 100644 +--- a/src/mongo/db/dur.cpp ++++ b/src/mongo/db/dur.cpp +@@ -770,7 +770,7 @@ namespace mongo { + + bool samePartition = true; + try { +- const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string(); ++ const string dbpathDir = boost::filesystem::path(dbpath).string(); + samePartition = onSamePartition(getJournalDir().string(), dbpathDir); + } + catch(...) { +diff --git a/src/mongo/db/dur_journal.cpp b/src/mongo/db/dur_journal.cpp +index 9957d41..9f693b9 100644 +--- a/src/mongo/db/dur_journal.cpp ++++ b/src/mongo/db/dur_journal.cpp +@@ -176,7 +176,7 @@ namespace mongo { + for ( boost::filesystem::directory_iterator i( getJournalDir() ); + i != boost::filesystem::directory_iterator(); + ++i ) { +- string fileName = boost::filesystem::path(*i).leaf(); ++ string fileName = boost::filesystem::path(*i).leaf().string(); + if( anyFiles || str::startsWith(fileName, "j._") ) + return true; + } +@@ -194,7 +194,7 @@ namespace mongo { + for ( boost::filesystem::directory_iterator i( getJournalDir() ); + i != boost::filesystem::directory_iterator(); + ++i ) { +- string fileName = boost::filesystem::path(*i).leaf(); ++ string fileName = boost::filesystem::path(*i).leaf().string(); + if( str::startsWith(fileName, "j._") ) { + try { + removeOldJournalFile(*i); +diff --git a/src/mongo/db/dur_recover.cpp b/src/mongo/db/dur_recover.cpp +index a7efd4d..e352db6 100644 +--- a/src/mongo/db/dur_recover.cpp ++++ b/src/mongo/db/dur_recover.cpp +@@ -72,7 +72,7 @@ namespace mongo { + i != boost::filesystem::directory_iterator(); + ++i ) { + boost::filesystem::path filepath = *i; +- string fileName = boost::filesystem::path(*i).leaf(); ++ string fileName = boost::filesystem::path(*i).leaf().string(); + if( str::startsWith(fileName, "j._") ) { + unsigned u = str::toUnsigned( str::after(fileName, '_') ); + if( m.count(u) ) { +@@ -85,7 +85,7 @@ namespace mongo { + if( i != m.begin() && m.count(i->first - 1) == 0 ) { + uasserted(13532, + str::stream() << "unexpected file in journal directory " << dir.string() +- << " : " << boost::filesystem::path(i->second).leaf() << " : can't find its preceeding file"); ++ << " : " << boost::filesystem::path(i->second).leaf().string() << " : can't find its preceeding file"); + } + files.push_back(i->second); + } +diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp +index 218fb9e..42794f0 100644 +--- a/src/mongo/db/instance.cpp ++++ b/src/mongo/db/instance.cpp +@@ -833,13 +833,13 @@ namespace mongo { + i != boost::filesystem::directory_iterator(); ++i ) { + if ( directoryperdb ) { + boost::filesystem::path p = *i; +- string dbName = p.leaf(); ++ string dbName = p.leaf().string(); + p /= ( dbName + ".ns" ); + if ( exists( p ) ) + names.push_back( dbName ); + } + else { +- string fileName = boost::filesystem::path(*i).leaf(); ++ string fileName = boost::filesystem::path(*i).leaf().string(); + if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" ) + names.push_back( fileName.substr( 0, fileName.length() - 3 ) ); + } +@@ -1102,7 +1102,7 @@ namespace mongo { + } + + void acquirePathLock(bool doingRepair) { +- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); ++ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); + + bool oldFile = false; + +diff --git a/src/mongo/db/pdfile.cpp b/src/mongo/db/pdfile.cpp +index 0c424f0..9fbbde7 100644 +--- a/src/mongo/db/pdfile.cpp ++++ b/src/mongo/db/pdfile.cpp +@@ -1675,7 +1675,7 @@ namespace mongo { + virtual bool apply( const Path &p ) { + if ( !boost::filesystem::exists( p ) ) + return false; +- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) ); ++ boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) ); + return true; + } + virtual const char * op() const { +@@ -1783,7 +1783,7 @@ namespace mongo { + uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ? + "backup" : "_tmp" ); + MONGO_ASSERT_ON_EXCEPTION( boost::filesystem::create_directory( reservedPath ) ); +- string reservedPathString = reservedPath.native_directory_string(); ++ string reservedPathString = reservedPath.string(); + + bool res; + { +diff --git a/src/mongo/dbtests/framework.cpp b/src/mongo/dbtests/framework.cpp +index 813705a..d0a3ba4 100644 +--- a/src/mongo/dbtests/framework.cpp ++++ b/src/mongo/dbtests/framework.cpp +@@ -199,7 +199,7 @@ namespace mongo { + boost::filesystem::create_directory(p); + } + +- string dbpathString = p.native_directory_string(); ++ string dbpathString = p.string(); + dbpath = dbpathString.c_str(); + + cmdLine.prealloc = false; +diff --git a/src/mongo/pch.h b/src/mongo/pch.h +index 7044097..6bb9df6 100644 +--- a/src/mongo/pch.h ++++ b/src/mongo/pch.h +@@ -44,7 +44,7 @@ + #include "string.h" + #include "limits.h" + +-#define BOOST_FILESYSTEM_VERSION 2 ++#define BOOST_FILESYSTEM_VERSION 3 + #include <boost/shared_ptr.hpp> + #include <boost/smart_ptr.hpp> + #include <boost/function.hpp> +diff --git a/src/mongo/shell/shell_utils_launcher.cpp b/src/mongo/shell/shell_utils_launcher.cpp +index 60af4f3..fa0d6ad 100644 +--- a/src/mongo/shell/shell_utils_launcher.cpp ++++ b/src/mongo/shell/shell_utils_launcher.cpp +@@ -184,7 +184,7 @@ namespace mongo { + } + #endif + +- _argv.push_back( programPath.native_file_string() ); ++ _argv.push_back( programPath.string() ); + + _port = -1; + +diff --git a/src/mongo/tools/restore.cpp b/src/mongo/tools/restore.cpp +index d7779e6..5c68bde 100644 +--- a/src/mongo/tools/restore.cpp ++++ b/src/mongo/tools/restore.cpp +@@ -174,7 +174,7 @@ public: + log(2) << "drillDown: " << root.string() << endl; + + // skip hidden files and directories +- if (root.leaf()[0] == '.' && root.leaf() != ".") ++ if (root.leaf().string()[0] == '.' && root.leaf().string() != ".") + return; + + if ( is_directory( root ) ) { +@@ -255,7 +255,7 @@ public: + + verify( ns.size() ); + +- string oldCollName = root.leaf(); // Name of the collection that was dumped from ++ string oldCollName = root.leaf().string(); // Name of the collection that was dumped from + oldCollName = oldCollName.substr( 0 , oldCollName.find_last_of( "." ) ); + if (use_coll) { + ns += "." + _coll; +@@ -287,7 +287,7 @@ public: + if (!boost::filesystem::exists(metadataFile.string())) { + // This is fine because dumps from before 2.1 won't have a metadata file, just print a warning. + // System collections shouldn't have metadata so don't warn if that file is missing. +- if (!startsWith(metadataFile.leaf(), "system.")) { ++ if (!startsWith(metadataFile.leaf().string(), "system.")) { + log() << metadataFile.string() << " not found. Skipping." << endl; + } + } else { +diff --git a/src/mongo/tools/tool.cpp b/src/mongo/tools/tool.cpp +index c092cdb..76834fa 100644 +--- a/src/mongo/tools/tool.cpp ++++ b/src/mongo/tools/tool.cpp +@@ -118,12 +118,6 @@ namespace mongo { + // we want durability to be disabled. + cmdLine.dur = false; + +-#if( BOOST_VERSION >= 104500 ) +- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); +-#else +- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); +-#endif +- + _name = argv[0]; + + /* using the same style as db.cpp */ diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD index 5f56584cd..8768a69b5 100644 --- a/community/monit/PKGBUILD +++ b/community/monit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70938 2012-05-20 10:06:55Z jlichtblau $ +# $Id: PKGBUILD 76973 2012-10-02 18:27:38Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Marco Bartholomew <marco@marcobartholomew.com> pkgname=monit -pkgver=5.4 +pkgver=5.5 pkgrel=1 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=('etc/monitrc') changelog=$pkgname.changelog source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \ monitd) -sha256sums=('805c6545de2dd7f3d9e6e0c68018b2aadd5fc98b243c8868178f247a60906038' +sha256sums=('8276b060b3f0e6453c9748d421dec044ddae09d3e4c4666e13472aab294d7c53' 'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496') build() { diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog index f0472719c..7c26c1a39 100644 --- a/community/monit/monit.changelog +++ b/community/monit/monit.changelog @@ -1,3 +1,6 @@ +2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * monit 5.5-1 + 2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * monit 5.4-1 diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD index f2996f957..77ec7bf24 100644 --- a/community/moreutils/PKGBUILD +++ b/community/moreutils/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 74174 2012-07-22 18:31:30Z spupykin $ +# $Id: PKGBUILD 77069 2012-10-04 09:18:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=moreutils pkgver=0.47 -pkgrel=1 +pkgrel=2 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" arch=('i686' 'x86_64' 'mips64el') url="http://joeyh.name/code/moreutils/" license=('GPL') makedepends=('docbook2x' 'docbook-xml' 'perl-xml-sax') -depends=('perl') -optdepends=('perl-timedate' 'perl-time-duration' 'perl-ipc-run') +depends=('perl' 'perl-ipc-run' 'perl-timedate' 'perl-time-duration') options=('!emptydirs' 'zipman') replaces=(moreutils-svn) source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz) diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD index bee3d101b..58f42ea53 100644 --- a/community/mosh/PKGBUILD +++ b/community/mosh/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Thomas Weißschuh <thomas_weissschuh lavabit.com> pkgname=mosh -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc='Mobile shell, surviving disconnects with local echo and line editing' arch=('x86_64' 'i686' 'mips64el') @@ -13,11 +13,11 @@ license=('GPL3') depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty') #optdepends=('libutempter: record of session in {u,t}wmp (recompile mosh afterwards)') source=("https://github.com/downloads/keithw/mosh/$pkgname-$pkgver.tar.gz") -sha1sums=('f0227800298d80e9f1353db3b29a807de833d7d2') +sha256sums=('93f09fda77e57f05485a61f3ac679bf9f3f359a9b0b93c216ddd53cd124a768f') options=('!emptydirs') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver ./autogen.sh ./configure --prefix=/usr @@ -25,13 +25,13 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver - make DESTDIR="$pkgdir/" install - install -Dm644 "conf/bash_completion.d/$pkgname" \ - "$pkgdir/usr/share/bash-completion/completions/$pkgname" - install -Dm644 "conf/ufw/applications.d/$pkgname" \ - "$pkgdir/etc/ufw/applications.d/ufw-$pkgname" + make DESTDIR=$pkgdir install + install -Dm644 conf/bash_completion.d/$pkgname \ + $pkgdir/usr/share/bash-completion/completions/$pkgname + install -Dm644 conf/ufw/applications.d/$pkgname \ + $pkgdir/etc/ufw/applications.d/ufw-$pkgname } # vim:set ts=2 sw=2 et: diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index c342bd7bf..6f29bd109 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73478 2012-07-08 09:30:42Z ibiru $ +# $Id: PKGBUILD 76588 2012-09-24 09:58:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion pkgver=3.2.12 -pkgrel=6 +pkgrel=7 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,11 +13,15 @@ backup=('etc/motion/motion.conf') options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion + motion.service + motion.tmpfiles ffmpeg-0.8.patch linux-headers.patch ffmpeg-compat.patch) md5sums=('1ba0065ed50509aaffb171594c689f46' '2e8c53c4980edddd420f08fdd572c9be' + 'b5b589f8f39939b7a1802cbd9dbe2e1a' + 'f863f8c025f7f025b2178def8418decd' 'd36687710837d69fbce4608b1345fa34' 'd8c3c4fdded5cfbd729710475559a21d' 'e85c596292aceb425fcf17e5072e2fff') @@ -42,4 +46,6 @@ package(){ make DESTDIR="${pkgdir}" install mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf" install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion" + install -Dm644 "${srcdir}/motion.service" "${pkgdir}/usr/lib/systemd/system/motion.service" + install -Dm644 "${srcdir}/motion.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/motion.conf" } diff --git a/community/motion/motion.service b/community/motion/motion.service new file mode 100644 index 000000000..23aba29cd --- /dev/null +++ b/community/motion/motion.service @@ -0,0 +1,12 @@ +[Unit] +Description=Motion daemon +After=local-fs.target + +[Service] +ExecStart=/usr/bin/motion +Type=forking +#StandardOutput=null +StandardError=null + +[Install] +WantedBy=multi-user.target diff --git a/community/motion/motion.tmpfiles b/community/motion/motion.tmpfiles new file mode 100644 index 000000000..b558b66df --- /dev/null +++ b/community/motion/motion.tmpfiles @@ -0,0 +1 @@ +D /var/run/motion 0755 root root diff --git a/community/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD index 47a33bfe0..7d9f8a2bb 100644 --- a/community/mp3splt-gtk/PKGBUILD +++ b/community/mp3splt-gtk/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 70795 2012-05-16 17:11:55Z jlichtblau $ +# $Id: PKGBUILD 76430 2012-09-18 04:50:32Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=mp3splt-gtk -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Split mp3 and ogg files without decoding" arch=('i686' 'x86_64' 'mips64el') url="http://mp3splt.sourceforge.net/" license=('GPL') -depends=('desktop-file-utils' 'gstreamer0.10-ffmpeg' 'gtk2' 'libmp3splt') +depends=('desktop-file-utils' 'gstreamer0.10-ffmpeg' 'gtk3' 'libmp3splt') makedepends=('pkgconfig') install=$pkgname.install changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz \ - $pkgname.desktop) -sha256sums=('58d2e562b004bc99ad206b4a6726126d170dc9093a35689888b010fe663be23a' - 'a50dd43c28a723c824d658b9468ff3719dcc302c57ecb3b122124e63c20800ed') +source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz) +sha256sums=('7300383453ca8d3268776163e2afb9b03a0d907d2f29ec6fc1826b41679d4e1c') build() { cd ${srcdir}/$pkgname-$pkgver @@ -26,9 +24,6 @@ build() { package() { cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install -#install .desktop file - install -D -m644 ${srcdir}/$pkgname.desktop \ - ${pkgdir}/usr/share/applications/$pkgname.desktop + make DESTDIR=${pkgdir} install } diff --git a/community/mp3splt-gtk/mp3splt-gtk.changelog b/community/mp3splt-gtk/mp3splt-gtk.changelog index 50b711d96..939aa6841 100644 --- a/community/mp3splt-gtk/mp3splt-gtk.changelog +++ b/community/mp3splt-gtk/mp3splt-gtk.changelog @@ -1,24 +1,27 @@ +2012-09-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * mp3splt-gtk 0.7.3-1 + 2012-05-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * mp3splt-gtk O.7.2-1 + * mp3splt-gtk 0.7.2-1 2012-02-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * mp3splt-gtk O.7.1-1 + * mp3splt-gtk 0.7.1-1 2011-08-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * mp3splt-gtk O.7-1 + * mp3splt-gtk 0.7-1 2011-04-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * mp3splt-gtk O.6.1a-1 + * mp3splt-gtk 0.6.1a-1 * FS#23275 fixed 2010-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.6 + * Update to major release 0.6 2010-04-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.5.9 + * Update to major release 0.5.9 2009-11-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.5.8a + * Update to major release 0.5.8a 2009-11-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Moved to [community] - 67 votes in AUR diff --git a/community/mp3unicode/PKGBUILD b/community/mp3unicode/PKGBUILD index 60cd17584..8f4c29006 100644 --- a/community/mp3unicode/PKGBUILD +++ b/community/mp3unicode/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 67970 2012-03-16 13:11:55Z giovanni $ +# $Id: PKGBUILD 76345 2012-09-16 07:08:17Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=mp3unicode -pkgver=1.2 -pkgrel=5 +pkgver=1.2.1 +pkgrel=1 pkgdesc="A command line utility to convert ID3 tags in mp3 files between different encodings" arch=('i686' 'x86_64' 'mips64el') url="http://mp3unicode.yellowsite.ru/" license=('GPL') depends=('taglib') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('36665ee3ed71585e377f46fda6124a09') +source=(https://github.com/downloads/alonbl/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('375b432ce784407e74fceb055d115bf83b1bd04a83b95256171e1a36e00cfe07') build() { cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr \ - --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man make } diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD index dc8c305c7..9496b00da 100644 --- a/community/mygui/PKGBUILD +++ b/community/mygui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69363 2012-04-14 17:09:46Z svenstaro $ +# $Id: PKGBUILD 76650 2012-09-25 16:18:14Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrew Belitsky <belitsky.a@gmail.com> pkgbase=mygui pkgname=('mygui' 'mygui-docs') pkgver=3.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A multilayer and overlappable GUI System for OGRE" arch=('i686' 'x86_64' 'mips64el') url="http://mygui.info/" @@ -24,6 +24,7 @@ build() { -e 's:"bin":"../opt/MYGUI":' \ CMake/InstallResources.cmake sed -i '71 i set(MYGUI_GCC_VISIBILITY_FLAGS "")' CMakeLists.txt + sed -i 's/\${OIS_LIBRARIES}/${OIS_LIBRARIES} boost_system/g' Common/CMakeLists.txt # get a clean build dir [[ -d build ]] && rm -rf build diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index d933da1aa..e7f709f19 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70836 2012-05-17 14:29:47Z spupykin $ +# $Id: PKGBUILD 76626 2012-09-25 10:38:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc -pkgver=5.1.11 -pkgrel=3 +pkgver=5.2.2 +pkgrel=1 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64 'mips64el') url="http://dev.mysql.com/downloads/connector/odbc/" @@ -11,8 +11,8 @@ depends=('unixodbc' 'libmysqlclient') makedepends=('cmake') license=('GPL') options=('libtool') -source=("http://mysql.skynet.be/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-$pkgver-src.tar.gz") -md5sums=('1d868f404038bbce6623a28255c8a9f7') +source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-$pkgver-src.tar.gz") +md5sums=('bb7829c68338b99debe312839edb79ad') build() { cd $srcdir/mysql-connector-odbc-${pkgver}-src diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 29ff10aaf..5c2b5b070 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74031 2012-07-18 09:43:20Z jconder $ +# $Id: PKGBUILD 77158 2012-10-05 23:55:11Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -13,7 +13,7 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweather' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') -pkgver=0.25.2 +pkgver=0.26.0 pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') @@ -23,19 +23,16 @@ makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif' 'libvorbis' 'mplayer' 'mythtv' 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' - 'python2-oauth' 'python-imaging' 'python-pycurl' 'taglib' 'zlib') + 'python2-oauth' 'python-imaging' 'python2-pycurl' 'taglib' 'zlib') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" - 'php54.patch' 'mtd.rc') -md5sums=('80466458a82759d213fe69af63d6dc80' - '7a114c1b5a84ab5ee190e63cc9514086' +md5sums=('15bd7b2f4173488966f3d761e0eacffa' '476c12ba074794ad7f4ae092bdf949d6') build() { cd "$srcdir/$pkgbase-$pkgver" find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - patch -d 'mythweb' -Np0 -i "$srcdir/php54.patch" sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb/mythweb.php' sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i 'mythzoneminder/mythzmserver/zmserver.cpp' diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 12f45c209..4a9e0c106 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75832 2012-09-02 02:47:28Z jconder $ +# $Id: PKGBUILD 78022 2012-10-16 04:42:30Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=0.25.2 +pkgver=0.26.0 pkgrel=2 epoch=1 pkgdesc="A Homebrew PVR project" @@ -14,11 +14,11 @@ arch=('i686' 'x86_64') url="http://www.mythtv.org/" license=('GPL') depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883' - 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mesa' + 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber' 'x264') -makedepends=('glew' 'libcec' 'libxml2' 'openssl' 'yasm') +makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'openssl' 'yasm') optdepends=('glew: for GPU commercial flagging' 'libcec: for consumer electronics control capabilities' 'libxml2: to read blu-ray metadata' @@ -32,7 +32,7 @@ source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'mythbackend.rc' 'mythbackend.conf' 'mythbackend.service') -md5sums=('2bf8c0aa75e88d39747e59c27aa6072e' +md5sums=('f57066bf75e6f14824c494d41639f4f9' 'c8f935d42fb8617e9279bd539811ca5f' 'ab962d83614cbd0ac11ce3fcc929829d' 'e4d572dcc307d6d8ae26bee5aebf9f3a') @@ -41,8 +41,6 @@ build() { cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - sed -re 's@Key, &@Key, @' -i 'bindings/php/MythBase.php' - ARCH="${CARCH/_/-}" ./configure --prefix=/usr \ --cpu="$ARCH" \ diff --git a/community/mythtv/mythtv.install b/community/mythtv/mythtv.install index eed25b868..90ad79d28 100644 --- a/community/mythtv/mythtv.install +++ b/community/mythtv/mythtv.install @@ -3,6 +3,8 @@ post_upgrade() { getent group mythtv &>/dev/null || groupadd -r mythtv >/dev/null useradd -rmd /var/lib/mythtv -g mythtv -G video,audio,optical -s /bin/bash mythtv >/dev/null fi + + echo -e "You may need to load time zone tables in MySQL.\nSee http://www.mythtv.org/wiki/MySQL_Time_Zone_Tables" } post_install() { diff --git a/community/ncdu/PKGBUILD b/community/ncdu/PKGBUILD index 24876e435..398ab5ec2 100644 --- a/community/ncdu/PKGBUILD +++ b/community/ncdu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59391 2011-11-24 07:32:15Z bisson $ +# $Id: PKGBUILD 76727 2012-09-27 22:43:52Z bisson $ # Contributor: lp76 <l.peduto@gmail.com> # Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=ncdu -pkgver=1.8 +pkgver=1.9 pkgrel=1 pkgdesc='Disk usage analyzer with an ncurses interface' url='http://dev.yorhel.nl/ncdu/' @@ -13,7 +13,7 @@ license=('custom:MIT') depends=('ncurses') arch=('i686' 'x86_64' 'mips64el') source=("http://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('3d98e78cf7035e32333d263d301d12e9b4352598') +sha1sums=('27cb5464b192db8ffdf0a894fe51d29985348eb0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/neatx/PKGBUILD b/community/neatx/PKGBUILD index e59f6f61c..2c029f51f 100644 --- a/community/neatx/PKGBUILD +++ b/community/neatx/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 69462 2012-04-16 14:21:32Z spupykin $ +# $Id: PKGBUILD 78204 2012-10-17 10:24:52Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Nicolas Doualot <packages@slubman.info> pkgname=neatx pkgver=0.3.1 -pkgrel=12 +pkgrel=13 pkgdesc="A free NX server by google" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/neatx/" license=('GPL') -depends=('nxserver' 'python-pexpect' 'python-simplejson' 'netcat' 'pygtk') +depends=('nxserver' 'python2-pexpect' 'python2-simplejson' 'netcat' 'pygtk') makedepends=('docutils') optdepends=('xorg-xdm: if you want to use KDE or GNOME session' 'xorg-fonts-misc: to use default font' @@ -26,6 +26,11 @@ build() { ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html2 make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install chmod 777 "$pkgdir/var/lib/neatx/sessions" diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD index c73ddbce7..d03528a26 100644 --- a/community/nestopia/PKGBUILD +++ b/community/nestopia/PKGBUILD @@ -1,46 +1,30 @@ -# $Id: PKGBUILD 63676 2012-02-05 12:05:46Z ibiru $ +# $Id: PKGBUILD 77858 2012-10-15 10:08:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> # Contributor: robb_force <robb_force@holybuffalo.net> pkgname=nestopia -pkgver=1.40h -pkgrel=5 +pkgver=1.42 +pkgrel=4 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' -url='http://rbelmont.mameworld.info/?page_id=200' +url='http://0ldsk00l.ca/nestopia.html' license=('GPL') arch=('i686' 'x86_64') -depends=('sdl>=1.2.12' 'alsa-lib' 'gtk2>=2.4' 'mesa') -makedepends=('unzip') -# rbelmont.mameworld.info blocks some user-agents -DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --user-agent=Mozilla/5.0 -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') -source=("https://downloads.sourceforge.net/project/nestopia/Nestopia/v${pkgver//[a-z]/}/Nestopia${pkgver//[.a-z]/}src.zip" - "http://rbelmont.mameworld.info/nst${pkgver//[a.a-z]/}_lnx_release_${pkgver:${#pkgver}-1:1}.zip" - "nestopia" - "nestopia_bogus_error_on_save_settings.patch") -md5sums=('526c99a06d2b257135e7047b0ed95ae0' - 'f9a9a905bada67e11dac1364612d0b35' - 'abc2f030dd291f58d65c9095ef024225' - '0160078c9afcbb1a6ac389c3989929f7') +depends=('sdl' 'alsa-lib' 'gtk3' 'glu') +makedepends=('unzip' 'mesa') +source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver" + "build-fix.patch") +md5sums=('ce7ffba59f19c764f08546e015777172' + '49dc5a51243a023b47f25ff3d6aabd89') build() { - cd ${srcdir} - # remove a bogus error message on exit - patch -p0 < nestopia_bogus_error_on_save_settings.patch - make -j1 - - # Install the nestopia script that copies required files to ~/.nestopia - install -Dm755 ${srcdir}/${pkgname} ${pkgdir}/usr/bin/${pkgname} - - # Older releases used a .sh file. Make a symlink to make everyone happy - cd ${pkgdir}/usr/bin - ln -s ${pkgname} ${pkgname}.sh + cd ${srcdir}/rdanbrook-nestopia-* + patch -p1 <$srcdir/build-fix.patch + make PREFIX=/usr -j1 +} - # Install the required files and executable in /usr/share - cd ${srcdir} - install -Dm755 nst ${pkgdir}/usr/bin/${pkgname}-bin - install -dm775 ${pkgdir}/usr/share/${pkgname}/ - install -m644 nstcontrols ${pkgdir}/usr/share/${pkgname}/ - install -m644 NstDatabase.xml ${pkgdir}/usr/share/${pkgname}/ +package() { + cd ${srcdir}/rdanbrook-nestopia-* + mkdir -p $pkgdir/usr/{bin,share/nestopia} + make install PREFIX=$pkgdir/usr } diff --git a/community/nestopia/build-fix.patch b/community/nestopia/build-fix.patch new file mode 100644 index 000000000..7b8609f8d --- /dev/null +++ b/community/nestopia/build-fix.patch @@ -0,0 +1,19 @@ +diff -wbBur rdanbrook-nestopia-53aa38a/Makefile rdanbrook-nestopia-53aa38a.my/Makefile +--- rdanbrook-nestopia-53aa38a/Makefile 2012-09-26 04:21:32.000000000 +0400 ++++ rdanbrook-nestopia-53aa38a.my/Makefile 2012-10-01 21:12:08.000000000 +0400 +@@ -186,12 +186,12 @@ + install -m 0644 NstDatabase.xml $(DATADIR) + install -m 0644 source/linux/icons/*.png $(DATADIR)/icons + install -m 0644 source/linux/icons/*.svg $(DATADIR)/icons +- install -m 0644 source/linux/icons/nestopia.svg /usr/share/pixmaps +- xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop ++ install -Dm0644 source/linux/icons/nestopia.svg $(PREFIX)/share/pixmaps/nestopia.svg ++ install -Dm0644 $(DATADIR)/nestopia.desktop $(PREFIX)/share/applications/nestopia.desktop + + uninstall: + xdg-desktop-menu uninstall $(DATADIR)/nestopia.desktop +- rm /usr/share/pixmaps/nestopia.svg ++ rm $(PREFIX)/share/pixmaps/nestopia.svg + rm $(BINDIR)/$(EXE) + rm -rf $(DATADIR) + diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD index 7ae560ff5..eea127bfd 100644 --- a/community/netcf/PKGBUILD +++ b/community/netcf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70813 2012-05-16 21:38:44Z spupykin $ +# $Id: PKGBUILD 77847 2012-10-15 09:41:41Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> pkgname=netcf -pkgver=0.1.9 -pkgrel=2 +pkgver=0.2.2 +pkgrel=1 pkgdesc="A library for configuring network interfaces" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -12,25 +12,23 @@ url="https://fedorahosted.org/netcf/" depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl') makedepends=('gcc') options=(!libtool) -source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz" - "netcf-libnl3.patch::https://bugs.archlinux.org/task/29908?getfile=8775") -md5sums=('4d62010a79d56c12438969da9035b63c' - 'a509be4b819f669fac21e1eaa621e3e0') +source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz") +md5sums=('fbcd47101797b8fcd9519e22002cd200') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/netcf-libnl3.patch aclocal automake --add-missing || true autoreconf -# CFLAGS="`pkg-config --cflags libnl-3.0` -DRTNL_LINK_NOT_FOUND=-1" - CFLAGS="-DNETCF_TRANSACTION=\"true\"" ./configure --prefix=/usr \ + ./configure --prefix=/usr \ --disable-static \ - --with-init-script=none + --with-init-script=none \ + --with-driver=redhat make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install + rm -rf $pkgdir/etc/rc.d/init.d } diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 02752388f..62ffecfaa 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74874 2012-08-08 06:49:13Z spupykin $ +# $Id: PKGBUILD 76652 2012-09-25 18:40:48Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -7,7 +7,7 @@ _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.2.3 +pkgver=1.2.4 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') @@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz rc.d service nginx.logrotate) -md5sums=('0a986e60826d9e3b453dbefc36bf8f6c' +md5sums=('a7c9a515f632c8cbb07ab67392208088' 'f62c7c9b5a53471d4666a4c49ad363fb' '62d494d23aef31d0b867161f9fffa6eb' 'b38744739022876554a0444d92e6603b') diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index bffd562b4..59db457f8 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75455 2012-08-24 19:14:55Z bpiotrowski $ +# $Id: PKGBUILD 77604 2012-10-13 08:08:33Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,18 +8,17 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.8.8 +pkgver=0.8.12 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') url='http://nodejs.org/' license=('MIT') -depends=('python2') +depends=('openssl' 'python2') #'v8') checkdepends=('curl') # curl used for check() -optdepends=('openssl: TLS support') options=('!emptydirs') -source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('f4dae84e96a94b768404c14633bccd49') +source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) +md5sums=('2d053e4d08e6b44747ed2f519a8b20be') build() { cd node-v${pkgver} @@ -33,7 +32,10 @@ build() { ./configure \ --prefix=/usr \ - --shared-openssl + --shared-openssl \ +# --shared-v8 \ +# --shared-v8-libpath=/usr/lib \ +# --shared-v8-includes=/usr/include make } @@ -46,15 +48,15 @@ check() { package() { cd node-v${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR=$pkgdir install # install docs as per user request - install -d ${pkgdir}/usr/share/doc/nodejs + install -d $pkgdir/usr/share/doc/nodejs cp -r doc/api/*.html \ - ${pkgdir}/usr/share/doc/nodejs + $pkgdir/usr/share/doc/nodejs install -D -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/nodejs/LICENSE + $pkgdir/usr/share/licenses/nodejs/LICENSE } # vim:set ts=2 sw=2 et: diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index e531de80e..7fe814c91 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 75890 2012-09-04 18:45:38Z seblu $ +# $Id: PKGBUILD 77539 2012-10-11 23:18:29Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=1.12.6 +pkgver=2.0.0 pkgrel=1 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/oath-toolkit/' license=('GPL3') -depends=('pam') +depends=('glibc' 'pam' 'libxml2') options=('!libtool') source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('7c8c4231aecfc5d74467b2a9e6bf054c') +md5sums=('2da5d9211062dfd746539c783185fae1') build() { cd $pkgname-$pkgver @@ -24,7 +24,6 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - # Install basic docs too install -D -m 644 pam_oath/README "$pkgdir/usr/share/doc/$pkgname/PAM_README" install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README" diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD index aa9e065a8..77528d596 100644 --- a/community/ocaml-findlib/PKGBUILD +++ b/community/ocaml-findlib/PKGBUILD @@ -6,7 +6,7 @@ pkgname=ocaml-findlib pkgver=1.3.3 -pkgrel=1 +pkgrel=2 license=('MIT') arch=('i686' 'x86_64' 'mips64el') pkgdesc='Objective Caml (OCaml) package manager' diff --git a/community/onboard/1012_1011.diff b/community/onboard/1012_1011.diff new file mode 100644 index 000000000..233478ac9 --- /dev/null +++ b/community/onboard/1012_1011.diff @@ -0,0 +1,17 @@ +=== modified file 'setup.py' +--- setup.py 2012-08-09 13:21:31 +0000 ++++ setup.py 2012-10-18 17:17:38 +0000 +@@ -11,12 +11,6 @@ + from distutils.core import Extension, Command + from distutils import version + +-# Work around encoding error in python3-distutils-extra +-# when building in pbuilder with LANG=C (LP# 1017468). +-if sys.version_info.major == 3: +- import locale +- locale.getpreferredencoding = lambda: 'UTF-8' +- + try: + import DistUtilsExtra.auto + except ImportError: + diff --git a/community/onboard/1013_1012.diff b/community/onboard/1013_1012.diff new file mode 100644 index 000000000..a00b4ecf9 --- /dev/null +++ b/community/onboard/1013_1012.diff @@ -0,0 +1,22 @@ +=== modified file 'Onboard/Config.py' +--- Onboard/Config.py 2012-10-18 16:17:12 +0000 ++++ Onboard/Config.py 2012-10-18 17:19:00 +0000 +@@ -73,7 +73,7 @@ + DEFAULT_RESIZE_HANDLES = list(Handle.RESIZERS) + + SCHEMA_VERSION_0_97 = Version(1, 0) # Onboard 0.97 +-SCHEMA_VERSION_0_98 = Version(2, 0) # Onboard 0.97.1 ++SCHEMA_VERSION_0_98 = Version(2, 0) # Onboard 0.97.1 + SCHEMA_VERSION = SCHEMA_VERSION_0_98 + + +@@ -145,7 +145,7 @@ + Singleton magic. + """ + if not hasattr(cls, "self"): +- cls.self = object.__new__(cls, args, kwargs) ++ cls.self = object.__new__(cls, *args, **kwargs) + cls.self.construct() + return cls.self + + diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD index b1d123308..9b72ec7f5 100644 --- a/community/onboard/PKGBUILD +++ b/community/onboard/PKGBUILD @@ -1,24 +1,32 @@ -# $Id: PKGBUILD 75934 2012-09-05 19:46:18Z bgyorgy $ +# $Id: PKGBUILD 78453 2012-10-18 21:14:21Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=onboard -pkgver=0.98.0 -pkgrel=1 +pkgver=0.98.1 +pkgrel=2 pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/onboard" license=('GPL') -depends=('python-cairo' 'python-dbus' 'python-gobject' 'gtk3' 'python-virtkey' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') +depends=('python-dbus' 'python-gobject' 'gtk3' 'python-virtkey' 'librsvg' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') makedepends=('python-distutils-extra') optdepends=('at-spi2-atk: auto-show when editing text' 'mousetweaks: hover click with mouse') options=('!emptydirs') install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('0a2627840740f271e5daba4c1c9c9096') +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz + 1012_1011.diff + 1013_1012.diff) +md5sums=('107e031b429329b71deb67c9b90195d6' + '4323f43510003850e127cd0fefdd3e4c' + '6c7751ecd92532844ecb7e65e4f4746b') package() { cd "$srcdir/$pkgname-$pkgver" - python setup.py install --root=$pkgdir/ --optimize=1 + # Python 3.3 compatibility fixes + patch -Np0 -i "$srcdir/1012_1011.diff" + patch -Np0 -i "$srcdir/1013_1012.diff" + + python3 setup.py install --root=$pkgdir/ --optimize=1 } diff --git a/community/openbsd-netcat/PKGBUILD b/community/openbsd-netcat/PKGBUILD index bcc1f52f6..0ec2d4194 100644 --- a/community/openbsd-netcat/PKGBUILD +++ b/community/openbsd-netcat/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70324 2012-05-04 10:32:12Z spupykin $ +# $Id: PKGBUILD 76590 2012-09-24 09:58:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname="openbsd-netcat" pkgver=1.105 -pkgrel=3 -_patch=6 +pkgrel=4 +_patch=7 pkgdesc="TCP/IP swiss army knife. OpenBSD variant." arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/sid/netcat-openbsd" @@ -15,7 +15,7 @@ makedepends=('gcc' 'make') 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}-${_patch}.debian.tar.gz") md5sums=('7e67b22f1ad41a1b7effbb59ff28fca1' - '1928b269b86d404ffb8ff57d3ead1d2c') + 'e914f8eb7eda5c75c679dd77787ac76b') build() { cd $srcdir/netcat-openbsd-${pkgver} diff --git a/community/opencolorio/PKGBUILD b/community/opencolorio/PKGBUILD new file mode 100644 index 000000000..80b9323e2 --- /dev/null +++ b/community/opencolorio/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Dumitru Ursu <dima@ceata.org> + +pkgname=opencolorio +pkgver=1.0.7 +pkgrel=1 +pkgdesc="A color management framework for visual effects and animation" +arch=('i686' 'x86_64') +url="http://opencolorio.org" +license=('BSD') +depends=('python') +makedepends=('cmake') +source=(http://github.com/imageworks/OpenColorIO/tarball/v$pkgver) +sha1sums=('01befa5c4198254b8848946ba3c85cce9a0f38d4') + +build() +{ + mv imageworks-OpenColorIO-b3cb224 $pkgname-$pkgver + cd $pkgname-$pkgver + + cmake -DCMAKE_INSTALL_PREFIX=/usr . + make +} + +package() +{ + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index b822689f8..8bfab528d 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75522 2012-08-26 20:09:44Z spupykin $ +# $Id: PKGBUILD 78344 2012-10-17 14:52:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim pkgver=2.6.7 -pkgrel=1 +pkgrel=2 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" @@ -15,11 +15,13 @@ options=(!libtool) backup=(etc/conf.d/opendkim) install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz - opendkim.conf - opendkim.rc) + opendkim.conf + opendkim.rc + opendkim.service) md5sums=('8dd327c1c3f3ffdbc436ef7df877940e' '3e2bb1058ac0662f01e675aa6ac7ee8f' - '093f5c098a45cc68753f97e45a5b374c') + '093f5c098a45cc68753f97e45a5b374c' + 'bc1b73856bc1941faaa4842e00437cb5') build() { cd "$srcdir/$pkgname-$pkgver" @@ -55,4 +57,6 @@ package() { for f in LICENSE LICENSE.Sendmail; do ln -s ../../doc/opendkim/$f "$pkgdir/usr/share/licenses/opendkim/$f" done + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/opendkim/opendkim.service b/community/opendkim/opendkim.service new file mode 100644 index 000000000..d34c62960 --- /dev/null +++ b/community/opendkim/opendkim.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenDKIM daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/opendkim +ExecStart=/usr/sbin/opendkim $OPENDKIM_FILTER + +[Install] +WantedBy=multi-user.target diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index d19e13a0d..d76723397 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74621 2012-07-31 19:56:19Z ebelanger $ +# $Id: PKGBUILD 77692 2012-10-13 14:45:45Z svenstaro $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio -pkgver=1.0.8 -pkgrel=1 +pkgver=1.0.9 +pkgrel=3 pkgdesc="A library for reading and writing images, including classes, utilities, and applications." arch=(i686 x86_64) url="http://www.openimageio.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'qt' 'python2' 'boost') optdepends=('qt: iv image viewer' 'python2: bindings support') source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('7d8ee962f29cea749d02ab992e2874df') +md5sums=('4b98a057515cc95fc954743c987f19ba') build() { cd "$srcdir"/$_pkgname*/src diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD index 889755cbc..a30f719a8 100644 --- a/community/openocd/PKGBUILD +++ b/community/openocd/PKGBUILD @@ -1,33 +1,31 @@ +# $Id: PKGBUILD 77217 2012-10-07 07:16:10Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Matthias Bauch <matthias.bauch@gmail.com> # Contributor: Laszlo Papp <djszapi2 at gmail com> # Contributor: Samuel Tardieu <sam@rfc1149.net> pkgname=openocd -pkgver=0.5.0 +pkgver=0.6.0 pkgrel=2 -pkgdesc="Debugging, in-system programming and boundary-scan testing for embedded target devices" +pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices' arch=('i686' 'x86_64') -url="http://openocd.berlios.de" +url='http://openocd.berlios.de' license=('GPL') depends=('libftdi') options=(!strip !libtool) install=openocd.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('43434c2b5353c9b853278b8bff22cb1a') +md5sums=('824cbe192ca2c79055b6ae82579123cf') -# what features should be enabled on build -# 'ecos','zy1000' seams not to be supported on linux - -_features=(parport ft2232_libftdi amtjtagaccel ep93xx at91rm9200 gw16012 presto_libftdi usbprog oocd_trace jlink vsllink rlink arm-jtag-ew buspirate) +_features=(parport ft2232_libftdi amtjtagaccel ep93xxat91rm9200gw16012 presto_libftdi usbprog oocd_trace jlink vsllink rlink arm-jtag-ew buspirate stlink) build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror - make + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 9b2fd912b..17f8d3473 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73317 2012-07-06 09:18:06Z spupykin $ +# $Id: PKGBUILD 78328 2012-10-17 14:22:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips -pkgver=1.7.1 -pkgrel=2 +pkgver=1.8.1 +pkgrel=3 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') @@ -24,9 +24,11 @@ license=('GPL') install=opensips.install options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz - opensips.init) -md5sums=('275ecad5146a7571713baf9f3395fe0f' - '685fbe00826df1285b410d4610dcbb0c') + opensips.init + opensips.service) +md5sums=('9fa0f8b7c58668ff4669e5c54bf4c00a' + '685fbe00826df1285b410d4610dcbb0c' + '0d80ef75b5c10324e6db790b7741c2eb') build() { @@ -64,4 +66,6 @@ build() cd $pkgdir/etc find -type f -exec sed -i "s#$pkgdir##" {} \; + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/opensips/opensips.service b/community/opensips/opensips.service new file mode 100644 index 000000000..042ff7c9a --- /dev/null +++ b/community/opensips/opensips.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenSIPS daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +PIDFile=/var/run/opensips.pid +ExecStart=/usr/bin/opensips -f /etc/opensips/opensips.cfg -w /var/tmp -P /var/run/opensips.pid + +[Install] +WantedBy=multi-user.target diff --git a/community/optipng/PKGBUILD b/community/optipng/PKGBUILD index 7572c7688..48c7ed414 100644 --- a/community/optipng/PKGBUILD +++ b/community/optipng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68497 2012-03-26 08:52:32Z lfleischer $ +# $Id: PKGBUILD 76515 2012-09-21 06:14:03Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=optipng -pkgver=0.7.1 +pkgver=0.7.3 pkgrel=1 pkgdesc='Compresses PNG files to a smaller size, without losing any information.' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url='http://optipng.sourceforge.net/' license=('ZLIB') depends=('glibc') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('b6181d566998ad489397b985ebfc4a03') +md5sums=('ceceb66b4d2e1f632ea6786a0adafd11') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/osdbattery/PKGBUILD b/community/osdbattery/PKGBUILD index 737e55fa9..6782acfce 100644 --- a/community/osdbattery/PKGBUILD +++ b/community/osdbattery/PKGBUILD @@ -1,31 +1,36 @@ -# $Id: PKGBUILD 67719 2012-03-14 08:59:42Z giovanni $ +# $Id: PKGBUILD 76967 2012-10-02 18:09:45Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker <dibblethewrecker@jiwe.org> pkgname=osdbattery pkgver=1.4 -pkgrel=4 +pkgrel=5 pkgdesc="Displays battery information in the OSD style" arch=('i686' 'x86_64' 'mips64el') -url="http://osdbattery.sourceforge.net" +url="http://osdbattery.sourceforge.net/" license=('GPL2') depends=('xosd') -install=osdbattery.install -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${pkgver}.tar.gz" - 'showbatt') -md5sums=('43f9cc0428b6cb25baf1e6e2286e88b1' - 'a786cd645135a369c8ed55b837174c92') +makedepends=('patch') +install=$pkgname.install +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${pkgver}.tar.gz + sysfs.patch::"http://sourceforge.net/tracker/download.php?group_id=120528&atid=687314&file_id=429967&aid=3450277" + showbatt) +sha256sums=('b1f775c746cd78b6aa7fc9ee75ecf2806ef3da93a42dd806c0414dcae55aed9f' + 'd7a00e918929d36aaf3eb398649ea070ed6c4840e3da2407226fc5d9ae15d776' + '69969053235642315b49fe6ea5df7f8c391befbf492fd4ff71afbf4d438333b2') build() { - cd "${srcdir}/${pkgname}_${pkgver}" + cd ${srcdir}/${pkgname}_${pkgver} + + patch -i ${srcdir}/sysfs.patch make } package() { - cd "${srcdir}/${pkgname}_${pkgver}" + cd ${srcdir}/${pkgname}_${pkgver} - install -D -m755 $pkgname "${pkgdir}/usr/bin/${pkgname}" - install -D -m755 ${srcdir}/showbatt "${pkgdir}/usr/bin/showbatt" - install -D -m644 $pkgname.cfg "${pkgdir}/etc/${pkgname}/${pkgname}.cfg" + install -D -m755 $pkgname ${pkgdir}/usr/bin/${pkgname} + install -D -m755 ${srcdir}/showbatt ${pkgdir}/usr/bin/showbatt + install -D -m644 $pkgname.cfg ${pkgdir}/etc/${pkgname}/${pkgname}.cfg } diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD index 9d169ea9e..b3ca2cb1a 100644 --- a/community/osiris/PKGBUILD +++ b/community/osiris/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66263 2012-02-23 05:35:33Z spupykin $ +# $Id: PKGBUILD 78366 2012-10-17 15:27:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: jlvsimoes pkgname=osiris pkgver=4.2.3 -pkgrel=4 +pkgrel=5 pkgdesc="A file integrity management system" arch=('i686' 'x86_64' 'mips64el') url="http://osiris.shmoo.com/" @@ -14,10 +14,14 @@ install=$pkgname.install #source=(http://osiris.shmoo.com/data/osiris-$pkgver.tar.gz source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz osirismd.init - osirisd.init) + osirisd.init + osirismd.service + osirisd.service) md5sums=('1951c7dc0fe729af9ffaf58910340d12' - '44281b8fc30ab3d452c6f35d3539d7ff' - 'b859445803e4df59a4f82d7f411e1297') + '96c1ba5433bd0ed7d9520583a07b9bdd' + 'b6dde0a539ca798fa81489f717507f25' + '48644676b88b231803785b8e2da956e5' + 'c0355b453770f6bbc6a58f5cd80766b4') build() { cd $srcdir/$pkgname-$pkgver @@ -38,4 +42,7 @@ build() { install -D -m755 $srcdir/osirismd.init $pkgdir/etc/rc.d/osirismd install -D -m755 $srcdir/osirisd.init $pkgdir/etc/rc.d/osirisd rm -rf $pkgdir/usr/osiris + + install -Dm0644 $srcdir/osirisd.service $pkgdir/usr/lib/systemd/system/osirisd.service + install -Dm0644 $srcdir/osirismd.service $pkgdir/usr/lib/systemd/system/osirismd.service } diff --git a/community/osiris/osiris.install b/community/osiris/osiris.install index 5b139f45f..24497d8fd 100644 --- a/community/osiris/osiris.install +++ b/community/osiris/osiris.install @@ -1,10 +1,10 @@ post_install() { - if [ ! `/bin/grep osiris /etc/group` ]; then - /usr/sbin/groupadd -g 18 osiris &>/dev/null; + if [ ! `grep osiris etc/group` ]; then + groupadd -g 18 osiris &>/dev/null; fi - /usr/bin/id osiris &>/dev/null || \ - /usr/sbin/useradd -u 18 -g osiris -d /var/lib/osiris -s /bin/false osiris + id osiris &>/dev/null || \ + useradd -u 18 -g osiris -d /var/lib/osiris -s /bin/false osiris } post_upgrade() { @@ -12,12 +12,6 @@ post_upgrade() { } pre_remove() { - /usr/sbin/userdel osiris &> /dev/null - /usr/sbin/groupdel osiris &> /dev/null + userdel osiris &> /dev/null + groupdel osiris &> /dev/null } - -post_remove() { - /bin/true -} - -# vim: ts=2 sw=2 et ft=sh diff --git a/community/osiris/osirisd.init b/community/osiris/osirisd.init index d38255621..8262d902e 100755 --- a/community/osiris/osirisd.init +++ b/community/osiris/osirisd.init @@ -30,6 +30,6 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/community/osiris/osirisd.service b/community/osiris/osirisd.service new file mode 100644 index 000000000..199737c9f --- /dev/null +++ b/community/osiris/osirisd.service @@ -0,0 +1,10 @@ +[Unit] +Description=A file integrity management system + +[Service] +User=osiris +Type=forking +ExecStart=/usr/sbin/osirisd + +[Install] +WantedBy=multi-user.target diff --git a/community/osiris/osirismd.init b/community/osiris/osirismd.init index 3b9e38598..0bdae5e10 100755 --- a/community/osiris/osirismd.init +++ b/community/osiris/osirismd.init @@ -30,6 +30,6 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/community/osiris/osirismd.service b/community/osiris/osirismd.service new file mode 100644 index 000000000..d51cef22c --- /dev/null +++ b/community/osiris/osirismd.service @@ -0,0 +1,10 @@ +[Unit] +Description=A file integrity management system + +[Service] +User=osiris +Type=forking +ExecStart=/usr/sbin/osirismd + +[Install] +WantedBy=multi-user.target diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index 23e8d00a6..d799639c8 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,12 +1,14 @@ -# $Id: PKGBUILD 73700 2012-07-14 13:07:06Z allan $ -# Maintainer: Florian Pritz <bluewind@xinu.at> +# $Id: PKGBUILD 76238 2012-09-14 22:52:02Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgbase=oss -pkgname=(oss libflashsupport-oss) -pkgver=4.2_2006 -pkgrel=4 +pkgname=oss +true && pkgname=(oss libflashsupport-oss) +pkgver=4.2_2007 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://developer.opensound.com/" license=('GPL2') @@ -18,7 +20,7 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_ "remove-hal.patch" "oss.service" ) -md5sums=('ca25c06bb7d0c6495e1b6f55d1bad96c' +md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7' 'b9a380a0ac8896390d71ac13676f27e1' 'cbcbce5c03b127df5eafa8faa091492c' '65f07fe241bfbf912f76d8b6d8f276b5' diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD index 9ce420845..8791c00f4 100644 --- a/community/p3scan/PKGBUILD +++ b/community/p3scan/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 64345 2012-02-11 23:22:52Z allan $ +# $Id: PKGBUILD 78346 2012-10-17 14:53:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: v01d <phreakuencies@gmail.com> pkgname=p3scan pkgver=2.3.2 -pkgrel=6 +pkgrel=7 pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection" arch=('i686' 'x86_64' 'mips64el') url="http://p3scan.sourceforge.net/" depends=('pcre' 'openssl') license=('GPL') -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "rc.p3scan") -md5sums=('9f8decc7d4701228788e3c8717096ca0' 'f6e3450c3a932477c49082559b7abef8') install=p3scan.install +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" + "rc.p3scan" + "p3scan.service" + "p3scan.tmpfiles") md5sums=('9f8decc7d4701228788e3c8717096ca0' - '482a783e699b6532cbc478977f429eb5') + '482a783e699b6532cbc478977f429eb5' + 'dc724b50963d80be7924fc4d9d4856f0' + '265a730e20e3d8aaf0cd7816dc98ca71') build() { cd $srcdir/$pkgname-$pkgver @@ -52,4 +56,7 @@ package() { mv $pkgdir/usr/man $pkgdir/usr/share/ mv $pkgdir/usr/doc $pkgdir/usr/share/ rm -rf $pkgdir/var/run + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/p3scan/p3scan.service b/community/p3scan/p3scan.service new file mode 100644 index 000000000..0bab3e7ec --- /dev/null +++ b/community/p3scan/p3scan.service @@ -0,0 +1,10 @@ +[Unit] +Description=p3scan proxy + +[Service] +Type=forking +PIDFile=/var/run/p3scan/p3scan.pid +ExecStart=/usr/sbin/p3scan + +[Install] +WantedBy=multi-user.target diff --git a/community/p3scan/p3scan.tmpfiles b/community/p3scan/p3scan.tmpfiles new file mode 100644 index 000000000..17f0a4c22 --- /dev/null +++ b/community/p3scan/p3scan.tmpfiles @@ -0,0 +1 @@ +d /run/p3scan 0755 root root - diff --git a/community/packeth/PKGBUILD b/community/packeth/PKGBUILD index 0bc4bb223..8b0573b2c 100644 --- a/community/packeth/PKGBUILD +++ b/community/packeth/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 68633 2012-03-30 15:24:47Z tredaelli $ +# $Id: PKGBUILD 77004 2012-10-03 15:04:34Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Rudy Matela <rudy.matela@gmail.com> pkgname=packeth -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 pkgdesc="A Linux GUI packet generator tool for ethernet." depends=(gtk2) source=("http://downloads.sourceforge.net/packeth/packETH-$pkgver.tar.bz2") url="http://packeth.sourceforge.net/" -md5sums=('38403ec01072f13ba7f0145abf15b12d') +md5sums=('dab613ab413e959cb5c1ef6fd385a041') arch=('i686' 'x86_64' 'mips64el') license=('GPL') build() { - cd "$srcdir"/packETH-1.7 + cd "$srcdir"/packETH-$pkgver + + sed -i 's/^LIBS=/LIBS+=/' Makefile.am + autoreconf ./configure --prefix=/usr make } package() { - cd "$srcdir"/packETH-1.7 + cd "$srcdir"/packETH-$pkgver make install DESTDIR="$pkgdir/" } diff --git a/community/pam-krb5/PKGBUILD b/community/pam-krb5/PKGBUILD index 7a6a625fe..c0e35c92b 100644 --- a/community/pam-krb5/PKGBUILD +++ b/community/pam-krb5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70351 2012-05-04 23:55:05Z allan $ +# $Id: PKGBUILD 78535 2012-10-20 10:30:17Z ebelanger $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Ryan Corder <ryanc@greengrey.org> @@ -11,8 +11,9 @@ url='http://www.eyrie.org/~eagle/software/pam-krb5/' license=('custom') options=('!libtool') depends=('krb5' 'pam') -source=("http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz") -md5sums=('296e9c8281419ce1fc41d537d18f74b8') +source=(http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('296e9c8281419ce1fc41d537d18f74b8' + 'c68a521345d79d54fb129a3f4ca2767b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD index 9b226e9f2..d652fe0c3 100644 --- a/community/pam_mount/PKGBUILD +++ b/community/pam_mount/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 77500 2012-10-11 11:40:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: Sirius Bakke <sirius\at/nonline.org> pkgname=pam_mount pkgver=2.13 -pkgrel=3 +pkgrel=4 pkgdesc="A PAM module that can mount volumes for a user session" arch=('i686' 'x86_64') url="http://pam-mount.sourceforge.net/" @@ -13,11 +13,18 @@ depends=('util-linux' 'libhx>=3.12.1' 'libxml2>=2.6' 'openssl>0.9.7' 'cryptsetup optdepends=('hxtools: If you have something like <logout wait="1000" hup="0" term="1" kill="1" /> in your config') backup=('etc/security/pam_mount.conf.xml') options=(!emptydirs !libtool) -source=("http://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz") -md5sums=('9f75fc8e84ea9cde619cdd6a62c7de33') +source=("http://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz" + "$pkgname-git.patch") +md5sums=('9f75fc8e84ea9cde619cdd6a62c7de33' + 'f018cb901eb6a18447a3a1b0a50c14dd') build() { cd -- "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/$pkgname-git.patch + aclocal + automake --add-missing + libtoolize + autoreconf ./configure \ --prefix=/usr \ --with-ssbindir=/usr/sbin \ diff --git a/community/pam_mount/pam_mount-git.patch b/community/pam_mount/pam_mount-git.patch new file mode 100644 index 000000000..5890d83f3 --- /dev/null +++ b/community/pam_mount/pam_mount-git.patch @@ -0,0 +1,1345 @@ +diff -wbBurN pam_mount-2.13/configure.ac pam-mount/configure.ac +--- pam_mount-2.13/configure.ac 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/configure.ac 2012-10-11 15:28:24.848220631 +0400 +@@ -13,9 +13,10 @@ + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) + AC_PROG_INSTALL +-AM_INIT_AUTOMAKE([-Wall no-dist foreign subdir-objects]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax no-dist-gzip dist-xz]) + AC_PROG_CC + AM_PROG_CC_C_O ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AC_DISABLE_STATIC + AM_PROG_LIBTOOL + AC_PROG_LN_S +diff -wbBurN pam_mount-2.13/doc/changelog.txt pam-mount/doc/changelog.txt +--- pam_mount-2.13/doc/changelog.txt 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/doc/changelog.txt 2012-10-11 15:28:24.851553965 +0400 +@@ -3,6 +3,15 @@ + + HEAD + ==== ++Fixes: ++- fix "feature 1 already set to zero" ++- pmt-ehd: avoid miscalculating blockdev size obtained from BLKGETSIZE64 ++- pam_mount: give more verbose output on "unknown digest/cipher" ++- pam_mount: fix crash when an unknown digest/cipher was specified ++- pam_mount: correctly mkdir mountpoint if requested ++- pam_mount: only remove mountpoint if actually created ++Changes: ++- Complain louder when EUID is not 0 + + + v2.13 (2011-12-15) +diff -wbBurN pam_mount-2.13/doc/Makefile.am pam-mount/doc/Makefile.am +--- pam_mount-2.13/doc/Makefile.am 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/doc/Makefile.am 2012-10-11 15:28:24.848220631 +0400 +@@ -5,8 +5,9 @@ + pmvarrun.8 pmt-ehd.8 \ + umount.crypt.8 umount.crypt_LUKS.8 \ + umount.crypto_LUKS.8 +-dist_noinst_DATA = pam_mount.txt +-EXTRA_DIST = bugs.txt changelog.txt faq.txt install.txt options.txt todo.txt ++EXTRA_DIST = bugs.txt changelog.txt faq.txt install.txt options.txt todo.txt \ ++ pam_mount.8.in pam_mount.conf.5.in ++DISTCLEANFILES = pam_mount.txt + CLEANFILES = ${man_MANS} + + replcmd = perl -lpe 's/\@''PACKAGE\@/@PACKAGE@/g;s/\@''PACKAGE_VERSION\@/@PACKAGE_VERSION@/g;s/\@''PACKAGE_RELDATE\@/@PACKAGE_RELDATE@/g;' +diff -wbBurN pam_mount-2.13/doc/mount.crypt.8 pam-mount/doc/mount.crypt.8 +--- pam_mount-2.13/doc/mount.crypt.8 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/doc/mount.crypt.8 2012-10-11 15:28:24.851553965 +0400 +@@ -37,10 +37,6 @@ + Select the name for the crypto device (optional). This option is currently + only usable with dm-crypt systems. + .TP +-\fBdm\-timeout=\fP\fIseconds\fP +-Wait at most this many seconds for udev to create /dev/mapper/\fIname\fP after +-calling cryptsetup(8). The default value is 0 seconds. +-.TP + \fBfsck\fP + Run fsck on the container before mounting it. + .TP +diff -wbBurN pam_mount-2.13/doc/options.txt pam-mount/doc/options.txt +--- pam_mount-2.13/doc/options.txt 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/doc/options.txt 2012-10-11 15:28:24.851553965 +0400 +@@ -4,6 +4,11 @@ + + auth optional pam_mount.so debug + ++Options are to be separated by whitespace, hence specifying more than ++one is to look like: ++ ++ auth optional pam_mount.so debug disable_interactive ++ + + enable_pam_password (default) + disable_pam_password +diff -wbBurN pam_mount-2.13/doc/pam_mount.conf.5.in pam-mount/doc/pam_mount.conf.5.in +--- pam_mount-2.13/doc/pam_mount.conf.5.in 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/doc/pam_mount.conf.5.in 2012-10-11 15:28:24.851553965 +0400 +@@ -171,35 +171,33 @@ + processes and optionally wait before sending signals. + .TP + \fB<luserconf name="\fP\fI.pam_mount.conf.xml\fP\fB" />\fP +-Individual users may define additional volumes (usually in +-~/.pam_mount.conf.xml) to mount if allowed by the master configuration file by +-the presence of the \fB<luserconf>\fP element. With it, users may mount and +-unmount any volumes they specify that they have ownership of (in case of +-local mounts) - the mount process is called \fBas +-superuser\fP. On some filesystem configurations this may be a security risk so +-user-defined volumes are not allowed by the default pam_mount.conf.xml +-distributed with pam_mount. Luserconfigs are parsed after any volumes from +-the global configuration file are mounted, so mounting home directories with a +-global config and then mounting further volumes from luserconfigs is possible. ++Individual users may define additional volumes in a file by the specified ++\fIname\fP relative to their home directory. The presence of \fB<luserconf>\fP ++in the master config file enables this feature. If turned on, users may mount ++and unmount any volumes they specify and that they have ownership of (in case ++of local mounts). The mount process is executed \fBas superuser\fP. This may ++have security implications, so this feature is disabled by default. ++Luserconfigs are parsed after any volumes from the global configuration file ++have been mounted, so that first mounting home directories with a global config ++and then mounting further volumes from luserconfigs is possible. + .TP + \fB<mntoptions allow="\fP\fIoptions,...\fP\fB" />\fP +-The <mntoptions> elements determine which options may be specified in per\-user +-configuration files (see <luserconf>). It does not apply to the master file. +-Specifying <mntoptions> is forbidden and ignored in per\-user configs. +-It defaults to \fIallow="nosuid,nodev"\fP, and the default is cleared when the +-first <mntoptions allow="..."> tag is seen. All further <mntoptions> are +-additive, though. ++The <mntoptions> elements determine which options may be specified in <volumes> ++in per-user configuration files (see <luserconf>). It does not apply to the ++master file. Specifying <mntoptions> is forbidden and ignored in per-user ++configs. The default allowed list consists of "\fInosuid,nodev\fP", and this ++default is cleared when the first allow="..." attribute is seen by the config ++parser. All further allow="..." are additive, though. + .TP + \fB<mntoptions deny="\fP\fIoptions,...\fP\fB" />\fP +-Any options listed in deny may not appear in the option list of per\-user +-mounts. (Does not apply to the master file.) ++Any options listed in deny may not appear in the option list of per-user ++mounts. The default deny list is empty. + .TP + \fB<mntoptions require="\fP\fIoptions,...\fP\fB" />\fP +-All options listed in require must appear in the option list of per\-user +-mounts. (Does not apply to the master file.) +-It defaults to \fInosuid,nodev\fP, and the default is cleared when the +-first <mntoptions require="..."> tag is seen. All further <mntoptions> are +-additive, though. ++All options listed in require must appear in the option list of per-user ++mounts. The default require list consists of "\fInosuid,nodev\fP", and like ++allow="", is cleared when first encountered by the parser, and is otherwise ++additive. + .TP + \fB<path>\fP\fIdirectories...\fP\fB</path>\fP + The default for the PATH environmental variable is not consistent across +diff -wbBurN pam_mount-2.13/Makefile.am pam-mount/Makefile.am +--- pam_mount-2.13/Makefile.am 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/Makefile.am 2012-10-11 15:28:24.848220631 +0400 +@@ -24,14 +24,11 @@ + tar --use=${packer} -C ${tmpdir} -cf ${PACKAGE_NAME}-${PACKAGE_VERSION}${packext} --owner=root --group=root ${PACKAGE_NAME}-${PACKAGE_VERSION}/; + rm -Rf ${tmpdir}; + +-dist-hook: +- tar --use=${packer} -cf ${PACKAGE_NAME}-${PACKAGE_VERSION}${packext} --owner=root --group=root ${distdir} +- + DISTCHECK_CONFIGURE_FLAGS = \ + --with-ssbindir='$${abs_builddir}/ssbin' \ + --with-slibdir='$${abs_builddir}/slib' \ + --enable-la + + DISTCLEANFILES = ${PACKAGE_NAME}-${PACKAGE_VERSION}${packext} +-EXTRA_DIST = autogen.sh dist/pam_mount.spec LICENSE.GPL2 LICENSE.GPL3 \ ++EXTRA_DIST = LICENSE.GPL2 LICENSE.GPL3 \ + LICENSE.LGPL2 LICENSE.LGPL3 +diff -wbBurN pam_mount-2.13/src/cmt-internal.h pam-mount/src/cmt-internal.h +--- pam_mount-2.13/src/cmt-internal.h 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/cmt-internal.h 2012-10-11 15:28:24.851553965 +0400 +@@ -3,6 +3,7 @@ + + #include <stdbool.h> + #include <libHX/string.h> ++#include "libcryptmount.h" + + /** + * struct ehd_mount - EHD mount info +@@ -12,6 +13,7 @@ + * @loop_device: loop device that was created, if any + * @crypto_name: crypto device that was created (basename only) + * @crypto_device: full path to the crypto device ++ * @mountpoint: assigned mountpoint + */ + struct ehd_mount_info { + char *container; +@@ -19,25 +21,36 @@ + char *loop_device; + hxmc_t *crypto_name; + hxmc_t *crypto_device; ++ hxmc_t *mountpoint; + }; + + /** + * struct ehd_mount_request - mapping and mount request for EHD + * @container: path to disk image ++ * @fstype: filesystem type ++ * @mount_opts: mount options for fs + * @mountpoint: where to mount the volume on + * @fs_cipher: cipher used for filesystem, if any. (cryptsetup name) + * @fs_hash: hash used for filesystem, if any. (cryptsetup name) + * @key_data: key material/password + * @key_size: size of key data, in bytes + * @trunc_keysize: extra cryptsetup instruction for truncation (in bytes) ++ * @loop_hook: hook function to run after loop device setup ++ * @crypto_hook: hook function to run after crypto device setup ++ * @hook_priv: user data +++ * @last_stage: stop after setup of given component + * @readonly: whether to create a readonly vfsmount ++ * @allow_discards: allow fs trim requests + */ + struct ehd_mount_request { +- char *container, *crypto_name, *mountpoint; ++ char *container, *crypto_name, *fstype, *mount_opts, *mountpoint; + char *fs_cipher, *fs_hash; + void *key_data; ++ ehd_hook_fn_t loop_hook, crypto_hook; ++ void *hook_priv; + unsigned int key_size, trunc_keysize; +- bool readonly; ++ enum ehd_mtreq_stage last_stage; ++ bool readonly, allow_discards; + }; + + struct ehd_crypto_ops { +diff -wbBurN pam_mount-2.13/src/crypto.c pam-mount/src/crypto.c +--- pam_mount-2.13/src/crypto.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/crypto.c 2012-10-11 15:28:24.851553965 +0400 +@@ -100,6 +100,9 @@ + case EHD_MTINFO_LOOPDEV: + *static_cast(const char **, ptr) = mt->loop_device; + break; ++ case EHD_MTINFO_LOWERDEV: ++ *static_cast(const char **, ptr) = mt->lower_device; ++ break; + default: + return 0; + } +@@ -129,6 +132,7 @@ + rq = calloc(1, sizeof(*rq)); + if (rq == NULL) + return NULL; ++ rq->last_stage = EHD_MTREQ_STAGE_MOUNT; + return rq; + } + +@@ -147,7 +151,7 @@ + { + va_list args; + const void *orig; +- void *nv; ++ void *nv = NULL; + + va_start(args, opt); + switch (opt) { +@@ -156,6 +160,8 @@ + case EHD_MTREQ_MOUNTPOINT: + case EHD_MTREQ_FS_CIPHER: + case EHD_MTREQ_FS_HASH: ++ case EHD_MTREQ_FSTYPE: ++ case EHD_MTREQ_MOUNT_OPTS: + orig = va_arg(args, const char *); + nv = HX_strdup(orig); + if (nv == NULL && orig != NULL) +@@ -178,6 +184,21 @@ + case EHD_MTREQ_READONLY: + rq->readonly = va_arg(args, unsigned int); + break; ++ case EHD_MTREQ_LOOP_HOOK: ++ rq->loop_hook = va_arg(args, ehd_hook_fn_t); ++ break; ++ case EHD_MTREQ_HOOK_PRIV: ++ rq->hook_priv = va_arg(args, void *); ++ break; ++ case EHD_MTREQ_CRYPTO_HOOK: ++ rq->crypto_hook = va_arg(args, ehd_hook_fn_t); ++ break; ++ case EHD_MTREQ_LAST_STAGE: ++ rq->last_stage = va_arg(args, enum ehd_mtreq_stage); ++ break; ++ case EHD_MTREQ_ALLOW_DISCARDS: ++ rq->allow_discards = va_arg(args, unsigned int); ++ break; + } + switch (opt) { + case EHD_MTREQ_CONTAINER: +@@ -200,6 +221,14 @@ + free(rq->fs_hash); + rq->fs_hash = nv; + break; ++ case EHD_MTREQ_FSTYPE: ++ free(rq->fstype); ++ rq->fstype = nv; ++ break; ++ case EHD_MTREQ_MOUNT_OPTS: ++ free(rq->mount_opts); ++ rq->mount_opts = nv; ++ break; + default: + break; + } +@@ -210,25 +239,52 @@ + return -errno; + } + ++static int ehd_wait_for_file(const char *path) ++{ ++ static const struct timespec delay = {0, 100000000}; ++ unsigned int retries = 50; ++ struct stat sb; ++ bool done = false; ++ int ret; ++ ++ /* Nicer way to do these wait loops? libudev? */ ++ while (retries-- > 0) { ++ ret = stat(path, &sb); ++ if (ret == 0) ++ break; ++ ret = -errno; ++ if (ret != -ENOENT) ++ return -errno; ++ if (!done) { ++ w4rn("Waiting for %s to appear\n", path); ++ done = true; ++ } ++ fprintf(stderr, "."); ++ nanosleep(&delay, NULL); ++ } ++ if (ret == -ENOENT) ++ w4rn("Device node %s was not created\n", path); ++ return (ret == 0) ? 1 : ret; ++} ++ + /** + * ehd_load - set up crypto device for an EHD container + * @req: parameters for setting up the mount + * @mt: EHD mount state + */ +-EXPORT_SYMBOL int ehd_load(const struct ehd_mount_request *req, ++EXPORT_SYMBOL int ehd_load(struct ehd_mount_request *req, + struct ehd_mount_info **mtp) + { + struct stat sb; + int saved_errno, ret; + struct ehd_mount_info *mt; + +- *mtp = mt = malloc(sizeof(*mt)); + if (stat(req->container, &sb) < 0) { + l0g("Could not stat %s: %s\n", req->container, strerror(errno)); + return -errno; + } + +- *mtp = mt = malloc(sizeof(*mt)); ++ *mtp = mt = calloc(1, sizeof(*mt)); + if (mt == NULL) + goto out_err; + if ((mt->container = HX_strdup(req->container)) == NULL) +@@ -252,7 +308,19 @@ + w4rn("Using %s\n", mt->loop_device); + mt->lower_device = mt->loop_device; + } ++ ++ ret = ehd_wait_for_file(mt->loop_device); ++ if (ret <= 0) ++ goto out_ser; ++ } ++ ++ if (req->loop_hook != NULL) { ++ ret = req->loop_hook(req, mt, req->hook_priv); ++ if (ret <= 0) ++ goto out_ser; + } ++ if (req->last_stage == EHD_MTREQ_STAGE_LOOP) ++ return 1; + + #ifdef HAVE_LIBCRYPTSETUP + ret = ehd_dmcrypt_ops.load(req, mt); +@@ -264,6 +332,18 @@ + if (ret <= 0) + goto out_ser; + ++ ret = ehd_wait_for_file(mt->crypto_device); ++ if (ret <= 0) ++ goto out_ser; ++ ++ if (req->crypto_hook != NULL) { ++ ret = req->crypto_hook(req, mt, req->hook_priv); ++ if (ret <= 0) ++ goto out_ser; ++ } ++ if (req->last_stage == EHD_MTREQ_STAGE_CRYPTO) ++ return 1; ++ + return ret; + + out_err: +@@ -294,6 +374,7 @@ + { + int ret, ret2; + ++ if (mt->crypto_device != NULL) { + #ifdef HAVE_LIBCRYPTSETUP + ret = ehd_dmcrypt_ops.unload(mt); + #elif defined(HAVE_DEV_CGDVAR_H) +@@ -301,6 +382,9 @@ + #else + ret = -EOPNOTSUPP; + #endif ++ } else { ++ ret = 1; ++ } + /* Try to free loop device even if cryptsetup remove failed */ + if (mt->loop_device != NULL) { + ret2 = ehd_loop_release(mt->loop_device); +@@ -445,7 +529,7 @@ + { + va_list args; + const void *orig; +- void *nv; ++ void *nv = NULL; + + va_start(args, opt); + switch (opt) { +diff -wbBurN pam_mount-2.13/src/crypto-dmc.c pam-mount/src/crypto-dmc.c +--- pam_mount-2.13/src/crypto-dmc.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/crypto-dmc.c 2012-10-11 15:28:24.851553965 +0400 +@@ -97,6 +97,14 @@ + } + if (req->readonly) + flags |= CRYPT_ACTIVATE_READONLY; ++ if (req->allow_discards) { ++#ifdef CRYPT_ACTIVATE_ALLOW_DISCARDS ++ flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS; ++#else ++ fprintf(stderr, "CRYPT_ACTIVATE_ALLOW_DISCARDS requested, " ++ "but not provided by your libcryptsetup.\n"); ++#endif ++ } + + ret = crypt_load(cd, CRYPT_LUKS1, NULL); + if (ret == 0) { +diff -wbBurN pam_mount-2.13/src/ehd.c pam-mount/src/ehd.c +--- pam_mount-2.13/src/ehd.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/ehd.c 2012-10-11 15:28:24.851553965 +0400 +@@ -41,8 +41,6 @@ + /** + * @size: container size in bytes + * @path: store container at this path +- * @loop_dev: loop device in use (may be %NULL) +- * @device: pointer to either @path or @loop_dev as crypto demands + * @fstype: initialize container with this filesystem + * @cipher: cipher specification as understood by cryptsetup + * @keybits: block size, as understood by cryptsetup and the cipher +@@ -51,7 +49,7 @@ + */ + struct container_ctl { + unsigned long long size; +- char *path, *loop_dev, *device, *fstype, *cipher, *hash, *user; ++ char *path, *fstype, *cipher, *hash, *user; + unsigned int keybits, skip_random, uid; + bool blkdev; + }; +@@ -61,11 +59,12 @@ + * @force_level: number of "-f"s passed + * @interactive: if stdin is a tty + * @cont: container control substructure +- * @fskey: fskey control substructure ++ * @password: master key password + */ + struct ehd_ctl { + unsigned int force_level; + struct container_ctl cont; ++ const char *password; + bool interactive; + }; + +@@ -239,16 +238,23 @@ + return ret; + } + +-static bool ehd_mkfs(const struct ehd_ctl *pg, const hxmc_t *crypto_device) ++static bool ehd_mkfs(struct ehd_mount_request *rq, ++ struct ehd_mount_info *mtinfo, void *priv) + { ++ const struct ehd_ctl *pg = priv; + const struct container_ctl *cont = &pg->cont; ++ const char *crypto_device = NULL; ++ int ret; ++ ++ ehd_mtinfo_get(mtinfo, EHD_MTINFO_CRYPTODEV, &crypto_device); ++ if (!cont->skip_random) ++ ehd_xfer2(crypto_device, cont->size); + + hxmc_t *fsprog = HXmc_strinit("mkfs."); + HXmc_strcat(&fsprog, cont->fstype); + const char *const argv[] = {fsprog, crypto_device, NULL}; +- int ret; + +- fprintf(stderr, "-- Calling %s\n", fsprog); ++ fprintf(stderr, "-- Calling %s %s\n", fsprog, crypto_device); + if ((ret = HXproc_run_sync(argv, HXPROC_VERBOSE)) < 0 || ret != 0) + fprintf(stderr, "%s failed with run_sync status %d\n", + fsprog, ret); +@@ -273,24 +279,34 @@ + HX_strlcpy(cipher_mode, p, cm_size); + } + +-static int ehd_init_volume_luks(struct ehd_ctl *pg, const char *password) ++static int ehd_init_volume_luks(struct ehd_mount_request *rq, ++ struct ehd_mount_info *mtinfo, void *priv) + { + /* + * Pick what? WP specifies that XTS has a wider support range than + * ESSIV. But XTS is also double complexity due to the double key, + * without adding anything of value. + */ ++ struct ehd_ctl *pg = priv; + struct container_ctl *cont = &pg->cont; + char cipher[32], cipher_mode[32]; + struct crypt_params_luks1 format_params = {.hash = cont->hash}; + struct crypt_device *cd = NULL; ++ const char *lower_dev = NULL; + int ret; + ++ BUILD_BUG_ON(!__builtin_types_compatible_p( ++ __typeof__(&ehd_init_volume_luks), ehd_hook_fn_t)); ++ + ehd_parse_name(cont->cipher, cipher, sizeof(cipher), + cipher_mode, sizeof(cipher_mode)); +- ret = crypt_init(&cd, cont->device); ++ ret = ehd_mtinfo_get(mtinfo, EHD_MTINFO_LOWERDEV, &lower_dev); ++ if (ret <= 0 || lower_dev == NULL) ++ goto out; ++ ret = crypt_init(&cd, lower_dev); + if (ret < 0) { +- fprintf(stderr, "crypt_init: %s\n", strerror(-ret)); ++ fprintf(stderr, "crypt_init: %s: %s\n", ++ lower_dev, strerror(-ret)); + goto out; + } + ret = crypt_format(cd, CRYPT_LUKS1, cipher, cipher_mode, NULL, NULL, +@@ -300,7 +316,7 @@ + goto out2; + } + ret = crypt_keyslot_add_by_volume_key(cd, CRYPT_ANY_SLOT, NULL, 0, +- password, strlen(password)); ++ pg->password, strlen(pg->password)); + if (ret < 0) { + fprintf(stderr, "add_by_volume_key: %s\n", strerror(-ret)); + goto out2; +@@ -315,70 +331,53 @@ + /** + * ehd_init_volume - set up loop device association if necessary + */ +-static bool ehd_init_volume(struct ehd_ctl *pg, const char *password) ++static bool ehd_init_volume(struct ehd_ctl *pg) + { + struct container_ctl *cont = &pg->cont; + struct ehd_mount_info *mount_info; + struct ehd_mount_request *mount_request; +- bool f_ret = false; + int ret; + +- if (cont->blkdev) { +- cont->device = cont->path; +- } else { +- /* +- * Need manual setup of loop device here, since ehd_load +- * always does a crypt mount too, which we do not have yet. +- */ +- ret = ehd_loop_setup(cont->path, &cont->loop_dev, EHD_LOSETUP_RW); +- if (ret == 0) { +- fprintf(stderr, "loop_setup: error: no free loop " +- "devices\n"); +- return false; +- } else if (ret < 0) { +- fprintf(stderr, "loop_setup: error: %s\n", +- strerror(-ret)); +- return false; +- } +- cont->device = cont->loop_dev; +- } +- +- ehd_init_volume_luks(pg, password); +- ret = ehd_loop_release(cont->device); +- if (ret <= 0) +- fprintf(stderr, "loop_release: warning: %s\n", strerror(-ret)); +- + mount_request = ehd_mtreq_new(); + if (mount_request == NULL) + return -errno; + ret = ehd_mtreq_set(mount_request, EHD_MTREQ_CONTAINER, cont->path); + if (ret < 0) + goto out; +- ret = ehd_mtreq_set(mount_request, EHD_MTREQ_KEY_SIZE, strlen(password)); ++ ret = ehd_mtreq_set(mount_request, EHD_MTREQ_KEY_SIZE, ++ strlen(pg->password)); + if (ret < 0) + goto out; +- ret = ehd_mtreq_set(mount_request, EHD_MTREQ_KEY_DATA, password); ++ ret = ehd_mtreq_set(mount_request, EHD_MTREQ_KEY_DATA, pg->password); + if (ret < 0) + goto out; + ret = ehd_mtreq_set(mount_request, EHD_MTREQ_READONLY, EHD_LOSETUP_RW); + if (ret < 0) + goto out; ++ ret = ehd_mtreq_set(mount_request, EHD_MTREQ_LOOP_HOOK, ++ ehd_init_volume_luks); ++ if (ret < 0) ++ goto out; ++ ret = ehd_mtreq_set(mount_request, EHD_MTREQ_HOOK_PRIV, pg); ++ if (ret < 0) ++ goto out; ++ ret = ehd_mtreq_set(mount_request, EHD_MTREQ_CRYPTO_HOOK, ehd_mkfs); ++ if (ret < 0) ++ goto out; ++ /* We don't need to mount it */ ++ ret = ehd_mtreq_set(mount_request, EHD_MTREQ_LAST_STAGE, ++ EHD_MTREQ_STAGE_CRYPTO); ++ if (ret < 0) ++ goto out; + +- if (ehd_load(mount_request, &mount_info) > 0) { +- const char *crypto_device = NULL; +- ehd_mtinfo_get(mount_info, EHD_MTINFO_CRYPTODEV, &crypto_device); +- if (!cont->skip_random) +- ehd_xfer2(crypto_device, cont->size); +- f_ret = ehd_mkfs(pg, crypto_device); ++ ret = ehd_load(mount_request, &mount_info); ++ if (ret > 0) { + ret = ehd_unload(mount_info); +- /* If mkfs failed, use its code. */ + ehd_mtinfo_free(mount_info); +- if (f_ret) +- f_ret = ret > 0; + } + out: + ehd_mtreq_free(mount_request); +- return f_ret; ++ return ret > 0; + } + + static void ehd_final_printout(const struct ehd_ctl *pg) +@@ -463,16 +462,15 @@ + HX_getl(&tmp, stdin); + HX_chomp(tmp); + s = strtoul(tmp, NULL, 0); ++ s <<= 20; /* megabytes -> bytes */ + } while (*tmp == '\0' || s == 0); + cont->size = s; + } + +- if (strcmp(cont->fstype, "xfs") == 0 && cont->size < 16) ++ if (strcmp(cont->fstype, "xfs") == 0 && cont->size < 16*1048576) + fprintf(stderr, "Warning: XFS volumes need to be " + "at least 16 MB\n"); + +- cont->size <<= 20; /* megabytes -> bytes */ +- + if (cont->cipher == NULL) { + cont->cipher = HX_strdup(ehd_default_dmcipher); + if (cont->keybits == 0) +@@ -544,6 +542,7 @@ + HXOPT_ERR_SUCCESS) + return false; + ++ cont->size <<= 20; /* mb -> b */ + pg->interactive = isatty(fileno(stdin)); + return ehd_fill_options_container(pg); + } +@@ -574,8 +573,8 @@ + goto out; + } + +- ret = ehd_init_volume(pg, password != NULL ? password : "") ? +- EXIT_SUCCESS : EXIT_FAILURE; ++ pg->password = (password != NULL) ? password : ""; ++ ret = ehd_init_volume(pg) ? EXIT_SUCCESS : EXIT_FAILURE; + if (ret == EXIT_SUCCESS) + ehd_final_printout(pg); + +diff -wbBurN pam_mount-2.13/src/ismnt.c pam-mount/src/ismnt.c +--- pam_mount-2.13/src/ismnt.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/ismnt.c 1970-01-01 03:00:00.000000000 +0300 +@@ -1,45 +0,0 @@ +-/* +- * Internal diagnostic tool to debug pmt mtab.c +- * Copyright © Jan Engelhardt, 2009 +- * +- * This file is part of pam_mount; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public License +- * as published by the Free Software Foundation; either version 2.1 +- * of the License, or (at your option) any later version. +- */ +-#include <errno.h> +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +-#include <libHX/init.h> +-#include "pam_mount.h" +- +-int main(int argc, const char **argv) +-{ +- int ret; +- +- ret = HX_init(); +- if (ret <= 0) { +- fprintf(stderr, "HX_init: %s\n", strerror(errno)); +- abort(); +- } +- +- if (argc < 3) { +- fprintf(stderr, "Usage: %s dev mountpoint\n", *argv); +- return EXIT_FAILURE; +- } +- +- ret = pmt_cmtab_mounted(argv[1], argv[2]); +- if (ret < 0) { +- fprintf(stderr, "%s\n", strerror(-ret)); +- ret = 2; +- } else if (ret == 0) { +- printf("Not mounted\n"); +- ret = EXIT_FAILURE; +- } else { +- printf("Mounted\n"); +- ret = EXIT_SUCCESS; +- } +- HX_exit(); +- return ret; +-} +diff -wbBurN pam_mount-2.13/src/libcryptmount.h pam-mount/src/libcryptmount.h +--- pam_mount-2.13/src/libcryptmount.h 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/libcryptmount.h 2012-10-11 15:28:24.851553965 +0400 +@@ -69,6 +69,13 @@ + EHD_MTREQ_TRUNC_KEYSIZE, + EHD_MTREQ_READONLY, + EHD_MTREQ_CRYPTONAME, ++ EHD_MTREQ_LOOP_HOOK, ++ EHD_MTREQ_HOOK_PRIV, ++ EHD_MTREQ_CRYPTO_HOOK, ++ EHD_MTREQ_LAST_STAGE, ++ EHD_MTREQ_FSTYPE, ++ EHD_MTREQ_MOUNT_OPTS, ++ EHD_MTREQ_ALLOW_DISCARDS, + }; + + enum ehd_mtinfo_opt { +@@ -76,11 +83,22 @@ + EHD_MTINFO_CRYPTONAME, + EHD_MTINFO_CRYPTODEV, + EHD_MTINFO_LOOPDEV, ++ EHD_MTINFO_LOWERDEV, ++}; ++ ++enum ehd_mtreq_stage { ++ EHD_MTREQ_STAGE_NONE, ++ EHD_MTREQ_STAGE_LOOP, ++ EHD_MTREQ_STAGE_CRYPTO, ++ EHD_MTREQ_STAGE_MOUNT, + }; + + struct ehd_mount_info; + struct ehd_mount_request; + ++typedef int (*ehd_hook_fn_t)(struct ehd_mount_request *, ++ struct ehd_mount_info *, void *); ++ + extern int cryptmount_init(void); + extern void cryptmount_exit(void); + +@@ -91,7 +109,7 @@ + extern int ehd_mtinfo_get(struct ehd_mount_info *, enum ehd_mtinfo_opt, void *); + extern void ehd_mtinfo_free(struct ehd_mount_info *); + +-extern int ehd_load(const struct ehd_mount_request *, struct ehd_mount_info **); ++extern int ehd_load(struct ehd_mount_request *, struct ehd_mount_info **); + extern int ehd_unload(struct ehd_mount_info *); + extern int ehd_is_luks(const char *, bool); + +diff -wbBurN pam_mount-2.13/src/Makefile.am pam-mount/src/Makefile.am +--- pam_mount-2.13/src/Makefile.am 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/Makefile.am 2012-10-11 15:28:24.851553965 +0400 +@@ -8,9 +8,11 @@ + moduledir = @PAM_MODDIR@ + module_LTLIBRARIES = pam_mount.la + sbin_PROGRAMS = pmvarrun ++if HAVE_LIBCRYPTSETUP + sbin_PROGRAMS += pmt-ehd ++endif + ssbin_PROGRAMS = mount.crypt +-noinst_PROGRAMS = autoloop ismnt ++noinst_PROGRAMS = autoloop + noinst_SCRIPTS = umount.crypt + + lib_LTLIBRARIES = libcryptmount.la +@@ -64,10 +66,6 @@ + autoloop_SOURCES = autoloop.c + autoloop_LDADD = libcryptmount.la ${libHX_LIBS} + +-ismnt_SOURCES = ismnt.c log.c +-ismnt_CFLAGS = ${AM_CFLAGS} +-ismnt_LDADD = libpmt_mtab.la +- + # + # mount helpers + # +@@ -75,7 +73,7 @@ + mount_crypt_LDADD = libcryptmount.la libpmt_mtab.la ${libHX_LIBS} + + pmt_ehd_SOURCES = ehd.c bdev.c misc.c spawn.c +-pmt_ehd_LDADD = libcryptmount.la ${libHX_LIBS} ++pmt_ehd_LDADD = libcryptmount.la ${libHX_LIBS} ${libcryptsetup_LIBS} + + # + # runtime helpers +@@ -83,10 +81,10 @@ + pmvarrun_SOURCES = pmvarrun.c + pmvarrun_LDADD = libcryptmount.la ${libHX_LIBS} + +-EXTRA_DIST = misc.h mount.h pam_mount.h readconfig.h spawn.h ++EXTRA_DIST = cmt-internal.h libcryptmount.h pam_mount.h libcryptmount.map + + umount.crypt${EXEEXT}: mount.crypt${EXEEXT} +- -${LN_S} $^ $@; ++ -${LN_S} -f $^ $@; + + if !KEEP_LA + install-data-hook: +diff -wbBurN pam_mount-2.13/src/misc.c pam-mount/src/misc.c +--- pam_mount-2.13/src/misc.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/misc.c 2012-10-11 15:28:24.851553965 +0400 +@@ -28,18 +28,6 @@ + struct HXbtree; + + /** +- * misc_dump_id - print user IDs +- */ +-void misc_dump_id(const char *where) +-{ +- w4rn("%s: (ruid/rgid=%u/%u, e=%u/%u)\n", where, +- static_cast(unsigned int, getuid()), +- static_cast(unsigned int, getgid()), +- static_cast(unsigned int, geteuid()), +- static_cast(unsigned int, getegid())); +-} +- +-/** + * pmt_fileop_exists - + * @file: file to check + * +@@ -47,7 +35,7 @@ + * non-zero if that was successful. Returns 0 for error. %errno will be set + * in case of error. + */ +-int pmt_fileop_exists(const char *file) ++bool pmt_fileop_exists(const char *file) + { + struct stat sb; + assert(file != NULL); +@@ -61,7 +49,7 @@ + * Check if a path is a regular file and return positive non-zero if that was + * successful. Returns 0 for error. %errno will be set in case of error. + */ +-int pmt_fileop_isreg(const char *path) ++bool pmt_fileop_isreg(const char *path) + { + struct stat sb; + +@@ -75,11 +63,10 @@ + * @user: user to check for + * @file: file to check + * +- * Checks whether @user owns @file. Returns positive non-zero if this is the +- * case, otherwise zero. If an error occurred, zero is returned and %errno +- * is set. (For the success case, %errno is undefined.) ++ * Checks whether @user owns @file. If an error occurred, false is returned and ++ * %errno is set. (For the success case, %errno is undefined.) + */ +-int pmt_fileop_owns(const char *user, const char *file) ++bool pmt_fileop_owns(const char *user, const char *file) + { + struct stat filestat; + struct passwd *userinfo; +@@ -90,12 +77,12 @@ + if ((userinfo = getpwnam(user)) == NULL) { + l0g("user %s could not be translated to UID\n", + user); +- return 0; ++ return false; + } + + if (stat(file, &filestat) != 0) { + w4rn("file %s could not be stat'ed\n", file); +- return 0; ++ return false; + } + + return filestat.st_uid == userinfo->pw_uid && +diff -wbBurN pam_mount-2.13/src/mount.c pam-mount/src/mount.c +--- pam_mount-2.13/src/mount.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/mount.c 2012-10-11 15:28:24.851553965 +0400 +@@ -295,6 +295,7 @@ + dtmp = HXmc_strinit(d); + if (dtmp == NULL || (!is_file && HXmc_strcat(&dtmp, "/") == NULL)) { + l0g("HXmc_strinit: %s\n", strerror(errno)); ++ HXmc_free(dtmp); + return false; + } + +@@ -350,6 +351,7 @@ + w4rn("chown %s -> %ld:%ld\n", dtmp, + static_cast(long, pe->pw_uid), + static_cast(long, pe->pw_gid)); ++ *last = '/'; + } + HXmc_free(dtmp); + +@@ -435,10 +437,11 @@ + ret = proc.p_exited && proc.p_status == 0; + + out: +- if (config->mkmntpoint && config->rmdir_mntpt && vpt->created_mntpt) ++ if (vpt->created_mntpt && config->rmdir_mntpt) + if (rmdir(vpt->mountpoint) < 0) + /* non-fatal, but warn */ +- w4rn("could not remove %s\n", vpt->mountpoint); ++ w4rn("could not remove %s: %s\n", vpt->mountpoint, ++ strerror(errno)); + return ret; + } + +@@ -577,9 +580,14 @@ + if (ret < 0) + goto out; + ret = ehd_keydec_run(dp, result); +- if (ret != EHD_KEYDEC_SUCCESS) +- l0g("ehd_keydec_run: %s\n", +- ehd_keydec_strerror(ret)); ++ if (ret == EHD_KEYDEC_NODIGEST) ++ l0g("ehd_keydec_run: %s: \"%s\"\n", ehd_keydec_strerror(ret), ++ vol->fs_key_hash); ++ else if (ret == EHD_KEYDEC_NOCIPHER) ++ l0g("ehd_keydec_run: %s: \"%s\"\n", ehd_keydec_strerror(ret), ++ vol->fs_key_cipher); ++ else if (ret != EHD_KEYDEC_SUCCESS) ++ l0g("ehd_keydec_run: %s\n", ehd_keydec_strerror(ret)); + out: + ehd_kdreq_free(dp); + return ret; +@@ -601,7 +609,7 @@ + struct HXdeque *argv; + struct HXproc proc; + const char *mount_user; +- hxmc_t *ll_password; ++ hxmc_t *ll_password = NULL; + int ret; + + assert(vinfo != NULL); +@@ -642,8 +650,11 @@ + * any openssl decryption. Without %CMD_CRYPTMOUNT however, + * we have to do this ourselves. + */ ++ w4rn("Not a crypto-type volume. Will decode OpenSSL key.\n"); + ret = pmt_decrypt_keyfile(vpt, password, &ll_password); + } else { ++ w4rn("This is a crypto-type volume. " ++ "Key decoding deferred to mount.crypt.\n"); + ll_password = HXmc_strinit(password); + } + if (ll_password == NULL) +@@ -698,7 +709,8 @@ + return 0; + } + +- if (!proc.p_exited || proc.p_status != 0) { ++ if ((!proc.p_exited || proc.p_status != 0) && ++ vpt->created_mntpt && config->rmdir_mntpt) { + /* + * Remove mountpoint if mount failed, to flag unavailability + * of service (e.g. when mntpt is the user's home directory). +diff -wbBurN pam_mount-2.13/src/mtab.c pam-mount/src/mtab.c +--- pam_mount-2.13/src/mtab.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/mtab.c 2012-10-11 15:28:24.851553965 +0400 +@@ -35,6 +35,7 @@ + #include <libHX/defs.h> + #include <libHX/io.h> + #include <libHX/string.h> ++#include "cmt-internal.h" + #include "libcryptmount.h" + #include "pam_mount.h" + +@@ -191,28 +192,27 @@ + return ret; + } + +-int pmt_cmtab_add(const char *mountpoint, const char *container, +- const char *loop_device, const char *crypto_device) ++int pmt_cmtab_add(struct ehd_mount_info *mt) + { ++ const char *loop_device, *crypto_device; + hxmc_t *line; + int ret; + +- if (container == NULL) ++ if (mt->container == NULL) + return -EINVAL; +- if (loop_device == NULL) +- loop_device = "-"; +- if (crypto_device == NULL) +- crypto_device = "-"; ++ loop_device = (mt->loop_device == NULL) ? "-" : mt->loop_device; ++ crypto_device = (mt->crypto_device == NULL) ? "-" : mt->crypto_device; + + /* Preallocate just the normal size */ +- line = HXmc_meminit(NULL, strlen(mountpoint) + strlen(container) + +- strlen(loop_device) + strlen(crypto_device) + 5); ++ line = HXmc_meminit(NULL, strlen(mt->mountpoint) + ++ strlen(mt->container) + strlen(loop_device) + ++ strlen(crypto_device) + 5); + if (line == NULL) + return -errno; + +- mt_esccat(&line, mountpoint); ++ mt_esccat(&line, mt->mountpoint); + HXmc_strcat(&line, "\t"); +- mt_esccat(&line, container); ++ mt_esccat(&line, mt->container); + HXmc_strcat(&line, "\t"); + mt_esccat(&line, loop_device); + HXmc_strcat(&line, "\t"); +diff -wbBurN pam_mount-2.13/src/mtcrypt.c pam-mount/src/mtcrypt.c +--- pam_mount-2.13/src/mtcrypt.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/mtcrypt.c 2012-10-11 15:28:24.851553965 +0400 +@@ -44,6 +44,7 @@ + * @blkdev: true if @container is a block device + * @fsck: true if fsck should be performed + * @remount: issue a remount ++ * @allow_discards: allow fs trim requests + */ + struct mount_options { + hxmc_t *object, *container, *mountpoint; +@@ -53,11 +54,11 @@ + hxmc_t *fsk_password, *extra_opts, *crypto_device; + char *loop_device; + unsigned int no_update, readonly, trunc_keysize; +- int dm_timeout; + bool is_cont; + bool blkdev; + bool fsck; + bool remount; ++ bool allow_discards; + }; + + /** +@@ -120,9 +121,7 @@ + else if (ret < EHD_SECURITY_UNSPEC) + fprintf(stderr, "Hash \"%s\" is considered " + "insecure.\n", value); +- } else if (strcmp(key, "dm-timeout") == 0) +- mo->dm_timeout = strtoul(value, NULL, 0); +- else if (strcmp(key, "fstype") == 0) ++ } else if (strcmp(key, "fstype") == 0) + mo->fstype = value; + else if (strcmp(key, "keyfile") == 0) + mo->fsk_file = value; +@@ -165,6 +164,8 @@ + mo->readonly = EHD_LOSETUP_RO; + else if (strcmp(key, "rw") == 0) + mo->readonly = EHD_LOSETUP_RW; ++ else if (strcmp(key, "discard") == 0) ++ mo->allow_discards = true; + } + + if (*passthru != '\0') { +@@ -397,6 +398,26 @@ + return ret; + } + ++static int mtcr_fsck(struct ehd_mount_request *rq, ++ struct ehd_mount_info *mtinfo) ++{ ++ const char *const fsck_args[4] = ++ {"fsck", "-p", mtinfo->crypto_device, NULL}; ++ int ret; ++ ++ arglist_llog(fsck_args); ++ ret = HXproc_run_sync(fsck_args, HXPROC_VERBOSE); ++ /* ++ * Return codes higher than 1 indicate that manual intervention ++ * is required, therefore abort the mount/login. ++ * Lower than 0: internal error (e.g. fork). ++ */ ++ if (ret != 0 && ret != 1) ++ fprintf(stderr, "Automatic fsck failed, manual intervention " ++ "required, run_status/exit status %d\n", ret); ++ return ret == 0; ++} ++ + /** + * mtcr_mount + * +@@ -405,8 +426,6 @@ + static int mtcr_mount(struct mount_options *opt) + { + const char *mount_args[8]; +- const char *fsck_args[4]; +- struct stat sb; + hxmc_t *key = NULL; + int ret, argk; + struct ehd_mount_info *mount_info; +@@ -433,6 +452,10 @@ + ret = ehd_mtreq_set(mount_request, EHD_MTREQ_READONLY, opt->readonly); + if (ret < 0) + goto out_r; ++ ret = ehd_mtreq_set(mount_request, EHD_MTREQ_ALLOW_DISCARDS, ++ opt->allow_discards); ++ if (ret < 0) ++ goto out_r; + /* Hack for CRYPT_PLAIN: default to 256 */ + trunc_keysize = 256 / CHAR_BIT; + ret = ehd_mtreq_set(mount_request, EHD_MTREQ_TRUNC_KEYSIZE, trunc_keysize); +@@ -482,6 +505,12 @@ + if (ret < 0) + goto out_r; + } ++ if (opt->fsck) { ++ ret = ehd_mtreq_set(mount_request, EHD_MTREQ_CRYPTO_HOOK, ++ mtcr_fsck); ++ if (ret < 0) ++ goto out_r; ++ } + + w4rn("keysize=%u trunc_keysize=%u\n", key_size, trunc_keysize); + if ((ret = ehd_load(mount_request, &mount_info)) < 0) { +@@ -490,44 +519,6 @@ + } else if (ret == 0) { + goto out_z; + } +- if (mount_info->crypto_device == NULL) { +- if (mtcr_debug) +- fprintf(stderr, "No crypto device assigned\n"); +- ehd_unload(mount_info); +- ehd_mtinfo_free(mount_info); +- goto out_z; +- } +- +- opt->dm_timeout *= 3; +- while (stat(mount_info->crypto_device, &sb) < 0 && errno == ENOENT && +- opt->dm_timeout-- > 0) +- usleep(333333); +- +- if (opt->fsck) { +- argk = 0; +- fsck_args[argk++] = "fsck"; +- fsck_args[argk++] = "-p"; +- fsck_args[argk++] = mount_info->crypto_device; +- fsck_args[argk] = NULL; +- assert(argk < ARRAY_SIZE(fsck_args)); +- +- arglist_llog(fsck_args); +- ret = HXproc_run_sync(fsck_args, HXPROC_VERBOSE); +- +- /* +- * Return codes higher than 1 indicate that manual intervention +- * is required, therefore abort the mount/login. +- * Lower than 0: internal error (e.g. fork). +- */ +- if (ret != 0 && ret != 1) { +- fprintf(stderr, "Automatic fsck failed, manual " +- "intervention required, run_sync status %d\n", +- ret); +- ehd_unload(mount_info); +- ehd_mtinfo_free(mount_info); +- goto out_z; +- } +- } + + /* candidate for replacement by some libmount calls, I guess. */ + argk = 0; +@@ -550,19 +541,24 @@ + fprintf(stderr, "mount failed with run_sync status %d\n", ret); + ehd_unload(mount_info); + ret = 0; +- } else if ((ret = pmt_cmtab_add(opt->mountpoint, +- mount_info->container, mount_info->loop_device, +- mount_info->crypto_device)) <= 0) { ++ goto out_i; ++ } ++ ret = HX_realpath(&mount_info->mountpoint, opt->mountpoint, ++ HX_REALPATH_DEFAULT | HX_REALPATH_ABSOLUTE); ++ if (ret <= 0) ++ goto out_i; ++ if ((ret = pmt_cmtab_add(mount_info)) <= 0) { + fprintf(stderr, "pmt_cmtab_add: %s\n", strerror(errno)); + /* ignore error on cmtab - let user have his crypto */ + } else if (opt->no_update) { + /* awesome logic */; + } else { +- pmt_smtab_add(mount_info->container, opt->mountpoint, ++ pmt_smtab_add(mount_info->container, mount_info->mountpoint, + "crypt", (opt->extra_opts != NULL) ? + opt->extra_opts : "defaults"); + } + ++ out_i: + ehd_mtinfo_free(mount_info); + return ret; + +diff -wbBurN pam_mount-2.13/src/pam_mount.c pam-mount/src/pam_mount.c +--- pam_mount-2.13/src/pam_mount.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/pam_mount.c 2012-10-11 15:28:24.851553965 +0400 +@@ -526,6 +526,20 @@ + return ret; + } + ++static void assert_root(void) ++{ ++ /* ++ * I know checking for 0 is rather unflexible, but it does - so far - ++ * account for all the bugreports involving insufficient permissions. ++ */ ++ if (geteuid() == 0) ++ return; ++ l0g("*** PAM_MOUNT WAS INVOKED WITH INSUFFICIENT PRIVILEGES. (euid=%ld)\n", ++ static_cast(long, geteuid())); ++ l0g("*** THIS IS A BUG OF THE CALLER. CONSULT YOUR DISTRO.\n"); ++ l0g("*** Also see bugs.txt in the pam_mount source tarball/website documentation.\n"); ++} ++ + /** + * pam_sm_open_session - + * @pamh: PAM handle +@@ -589,7 +603,7 @@ + /* There are some volumes, so grab a password. */ + system_authtok = ses_grab_authtok(pamh); + +- misc_dump_id("Session open"); ++ assert_root(); + envpath_init(Config.path); + ret = process_volumes(&Config, system_authtok); + +@@ -690,12 +704,12 @@ + l0g("libHX init failed: %s\n", strerror(errno)); + ret = PAM_SUCCESS; + w4rn("received order to close things\n"); ++ assert_root(); + if (Config.volume_list.items == 0) { + w4rn("No volumes to umount\n"); + goto out; + } + +- misc_dump_id("Session close"); + /* + * call pam_get_user() again because ssh calls PAM fns from seperate + * processes. +diff -wbBurN pam_mount-2.13/src/pam_mount.h pam-mount/src/pam_mount.h +--- pam_mount-2.13/src/pam_mount.h 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/pam_mount.h 2012-10-11 15:28:24.851553965 +0400 +@@ -156,10 +156,9 @@ + extern void kvplist_genocide(struct HXclist_head *); + extern hxmc_t *kvplist_to_str(const struct HXclist_head *); + extern void misc_add_ntdom(struct HXformat_map *, const char *); +-extern void misc_dump_id(const char *); +-extern int pmt_fileop_exists(const char *); +-extern int pmt_fileop_isreg(const char *); +-extern int pmt_fileop_owns(const char *, const char *); ++extern bool pmt_fileop_exists(const char *); ++extern bool pmt_fileop_isreg(const char *); ++extern bool pmt_fileop_owns(const char *, const char *); + extern char *relookup_user(const char *); + extern long str_to_long(const char *); + extern char *xstrdup(const char *); +@@ -187,13 +186,14 @@ + PMT_BY_CRYPTODEV = 1 << 1, + }; + ++struct ehd_mount_info; ++ + extern int pmt_smtab_add(const char *, const char *, + const char *, const char *); + extern int pmt_smtab_remove(const char *, enum smtab_field); + extern int pmt_smtab_mounted(const char *, const char *, + int (*)(const char *, const char *)); +-extern int pmt_cmtab_add(const char *, const char *, +- const char *, const char *); ++extern int pmt_cmtab_add(struct ehd_mount_info *); + extern int pmt_cmtab_get(const char *, enum cmtab_field, + char **, char **, char **, char **); + extern int pmt_cmtab_remove(const char *); +diff -wbBurN pam_mount-2.13/src/rdconf1.c pam-mount/src/rdconf1.c +--- pam_mount-2.13/src/rdconf1.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/rdconf1.c 2012-10-11 15:28:24.851553965 +0400 +@@ -340,6 +340,7 @@ + char options_require[] = "nosuid,nodev"; + + memset(config, 0, sizeof(*config)); ++ ehd_logctl(EHD_LOGFT_DEBUG, EHD_LOG_SET); + config->debug = true; + config->mkmntpoint = true; + +@@ -1355,6 +1356,10 @@ + } + + //----------------------------------------------------------------------------- ++/* ++ * This list has no linear relation to vpt->command. Instead, what is done: ++ * config->command[default_command[i].type] = <command> ++ */ + static const struct pmt_command default_command[] = { + {CMD_SMBMOUNT, "smbfs", {"smbmount", "%(COMBOPATH)", "%(MNTPT)", "-o", "username=%(USER),uid=%(USERUID),gid=%(USERGID)%(if %(OPTIONS),\",%(OPTIONS)\")", NULL}}, + {CMD_SMBUMOUNT, "smbfs", {"smbumount", "%(MNTPT)", NULL}}, +@@ -1368,6 +1373,8 @@ + {CMD_NFSMOUNT, "nfs4"}, + {CMD_LCLMOUNT, NULL, {"mount", "-p0", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}}, + {CMD_CRYPTMOUNT, "crypt", {"mount", "-t", "crypt", "%(if %(CIPHER),-ocipher=%(CIPHER))", "%(if %(FSKEYCIPHER),-ofsk_cipher=%(FSKEYCIPHER))", "%(if %(FSKEYHASH),-ofsk_hash=%(FSKEYHASH))", "%(if %(FSKEYPATH),-okeyfile=%(FSKEYPATH))", "%(if %(OPTIONS),-o%(OPTIONS))", "%(VOLUME)", "%(MNTPT)", NULL}}, ++ {CMD_CRYPTMOUNT, "crypt_LUKS"}, ++ {CMD_CRYPTMOUNT, "crypto_LUKS"}, + {CMD_CRYPTUMOUNT, "crypt", {"umount.crypt", "%(MNTPT)", NULL}}, + {CMD_UMOUNT, NULL, {"umount", "%(MNTPT)", NULL}}, + {CMD_FSCK, NULL, {"fsck", "-p", "%(FSCKTARGET)", NULL}}, +diff -wbBurN pam_mount-2.13/src/spawn.c pam-mount/src/spawn.c +--- pam_mount-2.13/src/spawn.c 2011-12-15 16:12:10.000000000 +0400 ++++ pam-mount/src/spawn.c 2012-10-11 15:28:24.851553965 +0400 +@@ -6,10 +6,12 @@ + * as published by the Free Software Foundation; either version 2.1 + * of the License, or (at your option) any later version. + */ ++#include <errno.h> + #include <pthread.h> + #include <signal.h> + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <unistd.h> + #include <libHX/defs.h> + #include <libHX/deque.h> +@@ -124,9 +126,8 @@ + if (chdir("/") < 0) + ; + if (user == NULL) { +- misc_dump_id("set_myuid<pre>"); + if (setuid(0) < 0) { +- l0g("error setting uid to 0\n"); ++ l0g("error setting uid to 0: %s\n", strerror(errno)); + return; + } + } else { +@@ -151,7 +152,6 @@ + setenv("HOME", real_user->pw_dir, 1); + setenv("USER", real_user->pw_name, 1); + } +- misc_dump_id("set_myuid<post>"); + } + + const struct HXproc_ops pmt_dropprivs_ops = { diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD index f1387e718..13653dcd4 100644 --- a/community/pari/PKGBUILD +++ b/community/pari/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 74773 2012-08-04 00:52:49Z bisson $ +# $Id: PKGBUILD 77048 2012-10-03 23:34:04Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=pari -pkgver=2.5.2 +pkgver=2.5.3 pkgrel=1 pkgdesc='Computer algebra system designed for fast computations in number theory' url='http://pari.math.u-bordeaux.fr/' @@ -12,7 +12,7 @@ depends=('gmp' 'readline' 'libx11') makedepends=('perl' 'texlive-core') optdepends=('perl: gphelp, tex2mail') source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz") -sha1sums=('3efe590e885a7dde521b8553762d3207b919e69f') +sha1sums=('de79eee7ae017a495dc0c648b6f7d5a4f6c7a522') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 531a0e16c..4661a416f 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74176 2012-07-22 18:32:23Z spupykin $ +# $Id: PKGBUILD 76937 2012-10-02 14:00:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.6.0 -_rel=stable -#_rel=devel +pkgver=4.8.0 +#_rel=stable +_rel=devel pkgrel=1 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('2acdf1855baf04f07bac6d6e307dcd0d') +md5sums=('c00ed8867dcf69255452a2e1267906ec') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD new file mode 100644 index 000000000..f8fee5daa --- /dev/null +++ b/community/partclone/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 76351 2012-09-16 13:33:43Z jsteel $ +# Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contrinutor: Dan Serban +# Contributor: Franz Burgmann +# Contributor: Todd Partridge (Gen2ly) +# Contributor: Ivan Sichmann Freitas + +pkgname=partclone +pkgver=0.2.48 +pkgrel=4 +pkgdesc="Back up and restore used-blocks of a partition" +arch=('i686' 'x86_64') +url="http://partclone.org" +license=('GPL') +depends=('progsreiserfs' 'ntfs-3g') +source=(https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/${pkgname}_$pkgver.tar.gz) +md5sums=('c873588f26185d6ce8db7b4c5470aa00') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./configure --prefix=/usr --enable-extfs --enable-reiserfs --enable-fat \ + --enable-hfsp --enable-btrfs --enable-ncursesw --enable-ntfs + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} + diff --git a/community/partimage/PKGBUILD b/community/partimage/PKGBUILD index 8b9579ed6..7cc655b41 100644 --- a/community/partimage/PKGBUILD +++ b/community/partimage/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66450 2012-02-25 01:26:42Z lfleischer $ +# $Id: PKGBUILD 77310 2012-10-08 15:54:38Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Sven Kauber <celeon@gmail.com> @@ -7,7 +7,7 @@ pkgname=partimage pkgver=0.6.9 -pkgrel=2 +pkgrel=3 pkgdesc='Partition Image saves partitions in many formats to an image file.' arch=('i686' 'x86_64' 'mips64el') url='http://www.partimage.org/' @@ -18,11 +18,13 @@ install='partimage.install' source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'partimage-0.6.9-zlib-1.2.6.patch' 'partimaged' - 'partimaged-gencrt') + 'partimaged-gencrt' + 'partimaged.service') md5sums=('1bc046fd915c5debbafc85729464e513' '202c4334766041d98c5f67c9d62c3063' 'f3b517a62de5540f3b1a8b7edf65b7ec' - '2316b116227b07efb48266e660ca1ba1') + '2316b116227b07efb48266e660ca1ba1' + '4102983fdf6e7af7cac73fdf9d37a6f6') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -43,4 +45,6 @@ package() { install -Dm0755 "${srcdir}/partimaged" "${pkgdir}/etc/rc.d/partimaged" install -Dm0755 "${srcdir}/partimaged-gencrt" "${pkgdir}/usr/bin/partimaged-gencrt" chmod 644 "${pkgdir}/etc/partimaged/partimagedusers" + + install -Dm0755 ../partimaged.service "${pkgdir}/usr/lib/systemd/system/partimaged.service" } diff --git a/community/partimage/partimaged.service b/community/partimage/partimaged.service new file mode 100644 index 000000000..34eb87fd7 --- /dev/null +++ b/community/partimage/partimaged.service @@ -0,0 +1,10 @@ +[Unit] +Description=A partition imaging daemon +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/partimaged --daemon + +[Install] +WantedBy=multi-user.target diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index 244a40260..9d7439643 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75067 2012-08-13 13:28:46Z bpiotrowski $ +# $Id: PKGBUILD 76527 2012-09-21 15:38:13Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=pcmanfm -pkgver=1.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="An extremely fast and lightweight file manager" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') makedepends=('intltool' 'pkgconfig') install=$pkgname.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) -md5sums=('df082fde42c4036b220cd3167ceab98e') +md5sums=('f373ee514bae37b53b152d02ac465058') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 879dbf684..f55879df8 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75316 2012-08-19 08:00:44Z heftig $ +# $Id: PKGBUILD 78527 2012-10-20 09:33:28Z heftig $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu -pkgver=0.7.13 -pkgrel=4 +pkgver=0.7.15 +pkgrel=1 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') url="http://pdf2djvu.googlecode.com" @@ -12,7 +12,6 @@ license=('GPL') depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick') makedepends=('pstreams' 'python2-nose' 'ttf-liberation') source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") -md5sums=('b5327c5949057711a8250dffb6ccfd2d') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -31,3 +30,4 @@ check() { sed -i 's/nosetests/nosetests2/' tests/Makefile make test } +md5sums=('cd03b61636b8d58592e7f419b434581f') diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 83c65062f..69a2ff82e 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75924 2012-09-05 16:47:49Z mtorromeo $ +# $Id: PKGBUILD 78026 2012-10-16 09:34:44Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.27_rel28.1 +pkgver=5.5.27_rel29.0 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64' 'mips64el') @@ -36,10 +36,9 @@ build() { # CFLAGS/CXXFLAGS as suggested upstream CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ + CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fpermissive" \ cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \ - -DMANUFACTURER=Arch \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -106,7 +105,7 @@ package() { install -Dm755 "$srcdir/mysqld-post" "$pkgdir/usr/bin/mysqld-post" } -sha256sums=('bf32acb0b56d3bfabf65748bbbcb5cfce33191bd31893040ed7e2aebc3548df4' +sha256sums=('4ba9e3300d99bfdbf65dd1a00e51da5bddc1582e33a58219b5184075783889ce' 'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4' '400e9a6e6517bbfe0971b65456dfacfb363cb54a644e4c2bacd373171611d5aa' '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32' diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index 3cc073c71..a259cc7d1 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71765 2012-06-02 10:29:58Z bluewind $ +# $Id: PKGBUILD 76996 2012-10-03 07:10:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=0.72 -pkgrel=2 +pkgver=0.77 +pkgrel=1 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/DateTime" @@ -15,7 +15,7 @@ LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('f50b328919fe8bf2d2b16ca0df35c3f3') +md5sums=('1c35bb64f0a261cd3ab4cc161726290a') build() { cd $srcdir/DateTime-$pkgver diff --git a/community/perl-xml-fast/PKGBUILD b/community/perl-xml-fast/PKGBUILD new file mode 100644 index 000000000..ced5668d1 --- /dev/null +++ b/community/perl-xml-fast/PKGBUILD @@ -0,0 +1,32 @@ +$Id: PKGBUILD 76693 2012-09-27 04:18:50Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: trizen .= x@gmail.com + +pkgname=perl-xml-fast +pkgver=0.11 +pkgrel=3 +pkgdesc="Simple and very fast XML to hash conversion." +arch=('x86_64' 'i686') +url="http://search.cpan.org/dist/XML-Fast/" +license=('GPL' 'PerlArtistic') +depends=('perl') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/M/MO/MONS/XML-Fast-${pkgver}.tar.gz") +md5sums=('a2985cc2f328cf9eda6ad75c3f40f6b3') + +build() { + cd "${srcdir}/XML-Fast-${pkgver}" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd "${srcdir}/XML-Fast-${pkgver}" + + make DESTDIR="${pkgdir}" install + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index 824c02be6..e0b1f8a0b 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73360 2012-07-06 16:34:53Z spupykin $ +# $Id: PKGBUILD 76420 2012-09-17 16:09:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: bekks <eduard.warkentin@gmx.de> pkgname=pgadmin3 -pkgver=1.14.3 +pkgver=1.16.0 pkgrel=1 pkgdesc="Comprehensive design and management interface for PostgreSQL" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ license=('custom') depends=('wxgtk' 'postgresql-libs' 'libxslt') makedepends=('libpqxx' 'krb5' 'postgresql' 'gendesk' 'imagemagick') source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz) -md5sums=('0669074fda039f5128abb40f63948ff5') +md5sums=('30ba5470a625176995a21099a9ae3058') build() { cd "$srcdir" diff --git a/community/php-memcache/PKGBUILD b/community/php-memcache/PKGBUILD index 8e9d67f97..7327f30bc 100644 --- a/community/php-memcache/PKGBUILD +++ b/community/php-memcache/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70503 2012-05-09 18:48:11Z pschmitz $ +# $Id: PKGBUILD 76558 2012-09-23 05:22:53Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=php-memcache -pkgver=3.0.6 -pkgrel=3 +pkgver=3.0.7 +pkgrel=1 pkgdesc="Memcache module for PHP" arch=('i686' 'x86_64' 'mips64el') url="http://pecl.php.net/package/memcache" @@ -12,7 +12,7 @@ depends=('php') backup=('etc/php/conf.d/memcache.ini') install=php-memcache.install source=(http://pecl.php.net/get/memcache-$pkgver.tgz) -sha256sums=('cf6871f0944ee38022c5f84910f306d83b0f51564bbc08624a215e06d8486618') +sha256sums=('f34e2ef42dd8f1f7e6a2cfbb9417a9e58e3bfd7f5db7227ca5afab686cefdd1f') build() { cd "$srcdir/memcache-$pkgver" diff --git a/community/pidgin-facebookchat/PKGBUILD b/community/pidgin-facebookchat/PKGBUILD new file mode 100644 index 000000000..eeb33a871 --- /dev/null +++ b/community/pidgin-facebookchat/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 76314 2012-09-15 18:52:12Z jsteel $ +# Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contributor: Gadget3000 <gadget3000 at msn dot com> +# Contributor: Jarek jarek@eden.rutgers.edu + +pkgname=pidgin-facebookchat +pkgver=1.69 +pkgrel=4 +pkgdesc="Facebook chat plugin for Pidgin and libpurple messengers" +url='http://code.google.com/p/pidgin-facebookchat' +license=('GPL3') +depends=('json-glib') +makedepends=('libpurple') +arch=('i686' 'x86_64') +source=(http://pidgin-facebookchat.googlecode.com/files/$pkgname-source-$pkgver.tar.bz2) +md5sums=('e6855197f9cb3fc6540039b6d42841f6') + +build() { + [ "$CARCH" = "x86_64" ] && _flag="LINUX64_COMPILER=$CARCH-unknown-linux-gnu-gcc" && _arch=64 + + cd "$srcdir"/$pkgname + + make $_flag libfacebook${_arch}.so +} + +package() { + [ "$CARCH" = "x86_64" ] && _arch=64 + + install -Dm755 "$srcdir"/$pkgname/libfacebook${_arch}.so "$pkgdir"/usr/lib/purple-2/libfacebook${_arch}.so +} diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index 5bce3fd1e..25de9be79 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.9 +_dcpkgver=2.1.10 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.3.1 -pkgrel=3 +pkgver=0.3.3 +pkgrel=1 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" @@ -19,8 +19,8 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg') source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig} "dovecot.conf") options=('!libtool') -sha256sums=('e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7' - '9d4699435cb1e82d3ac943c37f2ef909cd80cab707cc8b23be0d087f0e80903f' +sha256sums=('1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e' + '8604f9c52cff28506873cf4d0026c57ef73def5f05877126ea561774f1b8ffec' 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858') build() { diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD index 8307bfc3d..ce8b81e24 100644 --- a/community/pinot/PKGBUILD +++ b/community/pinot/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 74840 2012-08-06 23:09:24Z andrea $ +# $Id: PKGBUILD 76755 2012-09-28 23:44:46Z arodseth $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=pinot -pkgver=1.0 +pkgver=1.01 pkgrel=2 pkgdesc='Personal search and metasearch tool' arch=('i686' 'x86_64' 'mips64el') @@ -26,25 +27,34 @@ options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha256sums=('d1f5ac17022014c5a29ba1e6d95fc39bcf254338a4e0bfe84bf16558d219e2e2') +sha256sums=('a2a82009db05ca7abb4ffbd8baafa8fb820a7e961fd3cdcb21af46bb05eb57d4') build() { - cd "${srcdir}/$pkgname-$pkgver" - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt + cd $srcdir/$pkgname-$pkgver + x='/usr/share/libtextcat/' sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat3_conf.txt - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat31_conf.txt - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat32_conf.txt - sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm russian-iso8859_5\n\ -/usr/share/libtextcat/LM/russian-koi8_r.lm russian-koi8_r\n\ -/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt + sed -i "s|$x|${x}LM/|" \ + textcat_conf.txt \ + textcat3_conf.txt \ + textcat31_conf.txt \ + textcat32_conf.txt + sed -i -e "s|.*russian$|${x}LM/russian-iso8859_5.lm russian-iso8859_5\n\ +${x}LM/russian-koi8_r.lm russian-koi8_r\n\ +${x}LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt - LIBS="-lboost_system" ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --enable-gtkmm3=yes + LIBS="-lboost_system" ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --enable-gtkmm3=yes \ + --enable-mempool=no make } package() { - cd "${srcdir}/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR=$pkgdir install } + +# vim:set ts=2 sw=2 et: diff --git a/community/pinot/pinot.changelog b/community/pinot/pinot.changelog index 770a1ef0a..4cf1a68a2 100644 --- a/community/pinot/pinot.changelog +++ b/community/pinot/pinot.changelog @@ -1,3 +1,9 @@ +2012-09-29 Alexander Rødseth <rodseth@gmail.com> + * fix FS#31510, adding --enable-mempool=no + +2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * pinot 1.01-1 + 2012-07-31 Eric Belanger <eric@archlinux.org> * pinot 1.0-2 : Rebuild against exiv2 0.23, Add boost-libs depends diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD index 45a667d8a..ecaea96b8 100644 --- a/community/pkgfile/PKGBUILD +++ b/community/pkgfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76000 2012-09-08 16:02:52Z dreisner $ +# $Id: PKGBUILD 76836 2012-10-01 01:25:40Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pkgfile -pkgver=5 -pkgrel=2 +pkgver=6 +pkgrel=1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64' 'mips64el') url="http://github.com/falconindy/pkgfile" @@ -13,8 +13,8 @@ conflicts=('pkgtools<24-2') makedepends=('perl') source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) install=pkgfile.install -md5sums=('87e75949ca4ed9d60cc2dfdca9dd1a04' - '14d174d2fe0b8e0a43392c2b4ec48a7a') +md5sums=('75139dd8441d60ee7682d900b610e189' + '75cca8e3c0198fa98e32b54fd5e936e6') build() { cd "$pkgname-$pkgver" diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index e2a8a1086..8fd3a5ca0 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 71631 2012-05-31 14:23:54Z andrea $ +# $Id: PKGBUILD 76606 2012-09-24 15:07:54Z dan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=postgis -pkgver=2.0.0 -pkgrel=2 +pkgver=2.0.1 +pkgrel=1 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64' 'mips64el') url="http://postgis.org/" license=('GPL') -depends=('postgresql' 'gdal' 'json-c') +depends=('postgresql>=9.2' 'postgresql<9.3' 'proj' 'geos' 'gdal' 'json-c' 'libxml2') changelog=$pkgname.changelog options=('!libtool') source=("http://postgis.org/download/${pkgname}-${pkgver}.tar.gz") -sha256sums=('12179e24e348421c60c501590fda25bd349e2f697003958d9493f5c91b280081') +sha256sums=('32d181bbf0e648fe31c95b3dd23f7e4e49094d93cb4278fdf71c8feed4e9593c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 13d851351..4e12d69f7 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,7 @@ +2012-09-24 Dan McGee <dan@archlinux.org> + * Rebuild for PostgreSQL 9.2.x + * Update to minor release 2.0.1 + 2012-05-31 Andrea Scarpino <andrea@archlinux.org> * Add JSON-C support * Build utils (FS#25836) diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD index ac4f13b38..ffa67316e 100644 --- a/community/pound/PKGBUILD +++ b/community/pound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69456 2012-04-16 13:52:48Z spupykin $ +# $Id: PKGBUILD 78356 2012-10-17 15:19:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=pound pkgver=2.6 -pkgrel=2 +pkgrel=3 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" arch=('i686' 'x86_64' 'mips64el') url="http://www.apsis.ch/pound/index_html" @@ -15,26 +15,30 @@ backup=(etc/pound/pound.cfg) source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz pound.init pound.runit + pound.service pound.cfg) md5sums=('8c913b527332694943c4c67c8f152071' 'bd3bddb6dc17fdcab824815a4705b055' '4bd5e2a8d8e707eb900ae88929e00d4c' + '23c70776fcd1cf71572f90a8809f7408' '8937808acd22c6391ebe4340af8df854') build() { - cd $srcdir/Pound-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc/pound - make + cd $srcdir/Pound-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc/pound + make } + package() { - cd $srcdir/Pound-$pkgver - install -d $pkgdir/usr/sbin - make DESTDIR=$pkgdir install - chown root.root -R $pkgdir/usr - install -d $pkgdir/etc/rc.d - install -m0755 $srcdir/pound.init $pkgdir/etc/rc.d/pound - install -d $pkgdir/etc/sv - install -d $pkgdir/etc/sv/pound - install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run - install -D -m0644 $srcdir/pound.cfg $pkgdir/etc/pound/pound.cfg + cd $srcdir/Pound-$pkgver + install -d $pkgdir/usr/sbin + make DESTDIR=$pkgdir install + chown root.root -R $pkgdir/usr + install -d $pkgdir/etc/rc.d + install -m0755 $srcdir/pound.init $pkgdir/etc/rc.d/pound + install -d $pkgdir/etc/sv + install -d $pkgdir/etc/sv/pound + install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run + install -D -m0644 $srcdir/pound.cfg $pkgdir/etc/pound/pound.cfg + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/pound/pound.service b/community/pound/pound.service new file mode 100644 index 000000000..0a91f3424 --- /dev/null +++ b/community/pound/pound.service @@ -0,0 +1,10 @@ +[Unit] +Description=A reverse proxy, load balancer, and SSL wrapper + +[Service] +Type=forking +PIDFile=/var/run/pound.pid +ExecStart=/usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid + +[Install] +WantedBy=multi-user.target diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD index b6d9382da..ab5e4d45c 100644 --- a/community/pptpd/PKGBUILD +++ b/community/pptpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74350 2012-07-25 10:18:29Z spupykin $ +# $Id: PKGBUILD 77852 2012-10-15 09:47:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pptpd pkgver=1.3.4 -pkgrel=10 +pkgrel=11 pkgdesc="Poptop server" arch=(i686 x86_64 'mips64el') url="http://poptop.sourceforge.net/" @@ -12,9 +12,11 @@ depends=(ppp glibc) backup=(etc/pptpd.conf) source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz pptpd + pptpd.service unrecognized-opt.patch) md5sums=('b38df9c431041922c997c1148bedf591' 'e09f81beb5d59a0fdfba94e3a60d992b' + '144c17c7d5c1b95cfb3450eb73aa2e50' 'cfa02c86d0413eb94fac15599986f54c') build() { @@ -38,6 +40,7 @@ package() { mkdir -p $pkgdir/etc/ echo -e "# Read man pptpd.conf, see samples in /usr/share/doc/pptpd\n# and write your pptpd configuration here" >$pkgdir/etc/pptpd.conf install -Dm0755 ../pptpd $pkgdir/etc/rc.d/pptpd + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service mkdir -p $pkgdir/usr/share/doc/pptpd cp -a samples $pkgdir/usr/share/doc/pptpd/ } diff --git a/community/pptpd/pptpd.service b/community/pptpd/pptpd.service new file mode 100644 index 000000000..739508b60 --- /dev/null +++ b/community/pptpd/pptpd.service @@ -0,0 +1,10 @@ +[Unit] +Description=PPTP Server +After=network.target + +[Service] +ExecStart=/usr/sbin/pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid -f +StandardOutput=null + +[Install] +WantedBy=multi-user.target diff --git a/community/prboom/PKGBUILD b/community/prboom/PKGBUILD index aae80d373..03f53784e 100644 --- a/community/prboom/PKGBUILD +++ b/community/prboom/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 63714 2012-02-05 12:08:47Z ibiru $ +# $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: dale <dale@archlinux.org> pkgname=prboom pkgver=2.5.0 -pkgrel=6 +pkgrel=7 pkgdesc='A game engine which provides a program to play Doom levels.' url='http://prboom.sourceforge.net/' license=('GPL2') arch=('i686' 'x86_64' 'mips64el') -depends=('libpng' 'mesa' 'sdl_mixer' 'sdl_net') +depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu') +makedepends=('mesa') source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" 'libpng-1.4.patch') md5sums=('a8a15f61fa2626ab98051ab2703378c4' diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 426d5fa11..cba279558 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72795 2012-06-22 12:52:02Z dreisner $ +# $Id: PKGBUILD 78387 2012-10-17 16:24:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.0@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> pkgname=prosody pkgver=0.8.2 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." arch=('i686' 'x86_64' 'mips64el') url="http://prosody.im/" @@ -42,12 +42,16 @@ package() { cd "$srcdir/prosody-$pkgver" make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install -C tools/migration rm $pkgdir/etc/prosody/certs/* install -d "$pkgdir/etc/rc.d" install -d "$pkgdir/etc/logrotate.d" install -d "$pkgdir/var/log/prosody" + for i in tools/*.lua; do + install -Dm0644 $i $pkgdir/usr/share/prosody/$i + done install -o root -g root -m 755 "$srcdir/prosody.rcd" \ "$pkgdir/etc/rc.d/prosody" diff --git a/community/psqlodbc/PKGBUILD b/community/psqlodbc/PKGBUILD index 1929aee36..3c790a4c6 100644 --- a/community/psqlodbc/PKGBUILD +++ b/community/psqlodbc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75081 2012-08-13 13:51:08Z spupykin $ +# $Id: PKGBUILD 78481 2012-10-19 15:10:20Z spupykin $ # Maintainer: # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux-br.org> # Contributor: Rick Rein <jeebusroxors@gmail.com> pkgname=psqlodbc -pkgver=09.01.0100 +pkgver=09.01.0200 pkgrel=1 pkgdesc="PostgreSQL ODBC driver" arch=('i686' 'x86_64' 'mips64el') @@ -13,14 +13,11 @@ url="http://www.postgresql.org" depends=('unixodbc' 'postgresql-libs') makedepends=('postgresql') options=('!libtool') -source=(ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz - fix-function-declarations.patch) -md5sums=('08121d9d57bb2dbab11c36c2cc8e8edb' - 'f1189f9c6ae0b5bfb5ee8423eaa4076f') +source=(ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz) +md5sums=('0f4ac0e6b0755af2452764db4cfe4e8f') build() { cd "$srcdir/$pkgname-$pkgver" -# patch -p1 -i "$srcdir/fix-function-declarations.patch" ./configure --prefix=/usr make } diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 88c72ee7b..8dc7976e6 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9561 +pkgver=9682 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64' 'mips64el') @@ -38,4 +38,4 @@ package() { mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox } -md5sums=('d8b900ae4a7d70c692003a412241e94f') +md5sums=('2a592b4c43d24504be327367008807f7') diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD index 990cec25f..01edb1144 100644 --- a/community/pyqt3/PKGBUILD +++ b/community/pyqt3/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 63716 2012-02-05 12:08:52Z ibiru $ +# $Id: PKGBUILD 77656 2012-10-13 11:44:31Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgname=pyqt3 pkgver=3.18.1 -pkgrel=10 +pkgrel=11 pkgdesc="A set of Python bindings for the Qt3 toolkit" arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/pyqt/intro" depends=('python2-sip' 'qscintilla-qt3') +makedepends=('glu') license=('GPL') source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") md5sums=('f1d120495d1aaf393819e988c0a7bb7e') diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD index 6f0964af8..4333319cf 100644 --- a/community/python-bsddb/PKGBUILD +++ b/community/python-bsddb/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 71894 2012-06-02 22:27:02Z allan $ +# $Id: PKGBUILD 78214 2012-10-17 10:25:23Z allan $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgbase=python-bsddb pkgname=('python2-bsddb' 'python-bsddb') pkgver=5.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python interface for BerkeleyDB" license=('MIT') arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ build () { # Build python 3 module cd bsddb3-${pkgver} - python setup.py --berkeley-db=/usr build + python3 setup.py --berkeley-db=/usr build # Build python 2 module cd ../bsddb3-${pkgver}-python2 @@ -41,9 +41,9 @@ package_python2-bsddb() { } package_python-bsddb() { - depends=('db' 'python>=3.2') + depends=('db' 'python>=3.3') cd "${srcdir}/bsddb3-${pkgver}" - python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + python3 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/community/python-gnupginterface/PKGBUILD b/community/python-gnupginterface/PKGBUILD index 61b6c09f1..76c705d4b 100644 --- a/community/python-gnupginterface/PKGBUILD +++ b/community/python-gnupginterface/PKGBUILD @@ -1,20 +1,21 @@ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Aaron Schaefer <aaron@elasticdog.com> -pkgname=python-gnupginterface +pkgbase=python-gnupginterface +pkgname=python2-gnupginterface pkgver=0.3.2 -pkgrel=6 +pkgrel=1 pkgdesc='A Python interface to GNU Privacy Guard (GnuPG).' arch=('i686' 'x86_64' 'mips64el') url='http://py-gnupg.sourceforge.net/' license=('GPL') depends=('gnupg' 'python2') -provides=('gnupginterface') -replaces=('gnupginterface') +conflicts=('python-gnupginterface<=0.3.2-6') +replaces=('python-gnupginterface<=0.3.2-6') source=("http://downloads.sourceforge.net/sourceforge/py-gnupg/GnuPGInterface-$pkgver.tar.gz") md5sums=('d4627d83446f96bd8c22f8d15db3f7c2') -build() { +package_python2-gnupginterface() { cd "$srcdir/GnuPGInterface-$pkgver" python2 setup.py install --root="$pkgdir" -O1 } diff --git a/community/python-mpi4py/PKGBUILD b/community/python-mpi4py/PKGBUILD index 454a96961..dfa2e3b82 100644 --- a/community/python-mpi4py/PKGBUILD +++ b/community/python-mpi4py/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 62551 2012-01-21 03:26:53Z stephane $ +# $Id: PKGBUILD 78230 2012-10-17 10:26:03Z allan $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sebastien Binet <binet@cern.ch> pkgbase=python-mpi4py pkgname=('python-mpi4py' 'python2-mpi4py') pkgver=1.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://mpi4py.scipy.org" license=('BSD') @@ -19,7 +19,7 @@ build() { # Build python 3 module cd mpi4py-${pkgver} - python setup.py build + python3 setup.py build # Build python 2 module cd ../mpi4py-${pkgver}-python2 @@ -28,10 +28,10 @@ build() { package_python-mpi4py() { pkgdesc="Python bindings of the Message Passing Interface (MPI)" - depends=('python>=3.2' 'openmpi') + depends=('python>=3.3' 'openmpi') cd "${srcdir}/mpi4py-${pkgver}" - python setup.py install --root "${pkgdir}" --optimize=1 --skip-build + python3 setup.py install --root "${pkgdir}" --optimize=1 --skip-build } package_python2-mpi4py() { diff --git a/community/python-numarray/PKGBUILD b/community/python-numarray/PKGBUILD index 30a7cd923..9d0a41205 100644 --- a/community/python-numarray/PKGBUILD +++ b/community/python-numarray/PKGBUILD @@ -1,15 +1,18 @@ -# $Id: PKGBUILD 57888 2011-11-04 08:26:37Z lfleischer $ +# $Id: PKGBUILD 78232 2012-10-17 10:26:10Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> -pkgname=python-numarray +pkgbase=python-numarray +pkgname=python2-numarray pkgver=1.5.2 -pkgrel=5 +pkgrel=6 pkgdesc='Provides array manipulation and computational capabilities.' arch=('i686' 'x86_64' 'mips64el') url='http://numpy.scipy.org/' license=('BSD') depends=('python2') +conflicts=('python2-numarray<=1.5.2-6') +replaces=('python2-numarray<=1.5.2-6') source=("http://downloads.sourceforge.net/sourceforge/numpy/numarray-${pkgver}.tar.gz" 'LICENSE') md5sums=('d2ecfc60fe4869c328b872540d04e0f7' @@ -22,7 +25,7 @@ build() { sed -i 's_#! /usr/bin/env python_#! /usr/bin/env python2_' Examples/convolve/benchmark.py } -package() { +package_python2-numarray() { cd "${srcdir}/numarray-${pkgver}" python2 setup.py install --root="${pkgdir}" diff --git a/community/python-openbabel/PKGBUILD b/community/python-openbabel/PKGBUILD index 2d81925c5..af13b32f7 100644 --- a/community/python-openbabel/PKGBUILD +++ b/community/python-openbabel/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67417 2012-03-11 14:35:31Z cbrannon $ +# $Id: PKGBUILD 78233 2012-10-17 10:26:13Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Michal Bozon <bozonm@vscht.cz> pkgname=python-openbabel pkgver=2.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings of openbabel library" arch=('i686' 'x86_64' 'mips64el') url="http://openbabel.org/wiki/Python" license=('GPL') -depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen') +depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen2') makedepends=('swig' 'cmake') options=('!libtool') source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz) diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index 763fcb9ba..bd8641c1e 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75268 2012-08-17 10:49:54Z seblu $ +# $Id: PKGBUILD 78236 2012-10-17 10:26:22Z allan $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') pkgver=0.6.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/psutil/' license=('custom: BSD') diff --git a/community/python-psycopg1/PKGBUILD b/community/python-psycopg1/PKGBUILD index bc465e792..0267a6a14 100755 --- a/community/python-psycopg1/PKGBUILD +++ b/community/python-psycopg1/PKGBUILD @@ -1,14 +1,17 @@ -# $Id: PKGBUILD 67660 2012-03-13 16:23:29Z lcarlier $ +# $Id: PKGBUILD 78237 2012-10-17 10:26:25Z allan $ # Contributor: William Rea <sillywilly@gmail.com> -pkgname=python-psycopg1 +pkgbase=python-psycopg1 +pkgname=python2-psycopg1 pkgver=1.1.21 -pkgrel=6 +pkgrel=8 pkgdesc="A PostgreSQL database adapter for Python" arch=('i686' 'x86_64' 'mips64el') url="http://initd.org/projects/psycopg1" license=('GPL') -depends=('python-egenix-mx-base' 'postgresql') +depends=('python2-egenix-mx-base' 'postgresql') +conflicts=('python-psycopg1<=1.1.21-7') +replaces=('python-psycopg1<=1.1.21-7') source=(http://initd.org/psycopg/tarballs/PSYCOPG-1-1/psycopg-$pkgver.tar.gz) md5sums=('a31f79f68d6d32898d6f24e11369a106') sha1sums=('02d8a8b5dd682306117896c7c63a9a1b518997b6') @@ -24,7 +27,7 @@ build() { make } -package() { +package_python2-psycopg1() { cd "$srcdir/psycopg-$pkgver" make DESTDIR="$pkgdir" install diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD index 12112a773..f3d2e9e36 100644 --- a/community/python-psycopg2/PKGBUILD +++ b/community/python-psycopg2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68833 2012-04-03 16:20:19Z foutrelis $ +# $Id: PKGBUILD 78238 2012-10-17 10:26:30Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=python-psycopg2 pkgname=('python-psycopg2' 'python2-psycopg2') pkgver=2.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="A PostgreSQL database adapter for the Python programming language." arch=('i686' 'x86_64' 'mips64el') url="http://initd.org/psycopg/" diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 867bc37b2..3b21e70d2 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,23 +1,38 @@ -# $Id: PKGBUILD 75966 2012-09-07 11:19:50Z arodseth $ +# $Id: PKGBUILD 78449 2012-10-18 18:07:43Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> +# Contributor: Jelle van der Waa <jelle@vdwaa.nl> -pkgname=python-pymongo +pkgbase=python-pymongo +pkgname=('python-pymongo' 'python2-pymongo') pkgver=2.3 -pkgrel=1 +pkgrel=3 pkgdesc='Python driver for MongoDB' arch=('x86_64' 'i686' 'mips64el') license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' -depends=('python') -makedepends=('python-distribute') +makedepends=('python-distribute' 'python2-distribute') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") sha256sums=('8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc') -package() { - cd "$srcdir/pymongo-$pkgver" +build() { + cd $srcdir - python setup.py install --root="$pkgdir" --optimize=1 + cp -a pymongo-$pkgver pymongo2-$pkgver +} + +package_python2-pymongo() { + depends=('python2') + cd $srcdir/pymongo2-$pkgver + + python2 setup.py install --root=$pkgdir --optimize=1 +} + +package_python-pymongo() { + depends=('python') + cd $srcdir/pymongo-$pkgver + + python setup.py install --root=$pkgdir --optimize=1 } # vim:set ts=2 sw=2 et: diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD index cb5cd4e25..61f8d8e78 100644 --- a/community/python-pyopencl/PKGBUILD +++ b/community/python-pyopencl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74334 2012-07-24 17:36:16Z stephane $ +# $Id: PKGBUILD 78243 2012-10-17 10:26:44Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgbase=python-pyopencl -pkgname=('python2-pyopencl' 'python-pyopencl') +pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers') pkgver=2012.1 -pkgrel=3 +pkgrel=5 pkgdesc="A complete, object-oriented language binding of OpenCL to Python" arch=('i686' 'x86_64') url="http://mathema.tician.de/software/pyopencl" @@ -21,28 +21,41 @@ build() { cp -a pyopencl-$pkgver{,-python2} cd "${srcdir}/pyopencl-${pkgver}" - python ./configure.py --cl-enable-gl --no-use-shipped-boost - python setup.py build + python3 ./configure.py --cl-enable-gl --no-use-shipped-boost + python3 setup.py build cd "$srcdir/pyopencl-$pkgver-python2" python2 ./configure.py --cl-enable-gl --no-use-shipped-boost python2 setup.py build - } package_python-pyopencl() { - depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python' 'python-numpy' 'python-mako' 'python-pytools') + depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers') cd "${srcdir}/pyopencl-${pkgver}" - python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + + rm -fr "${pkgdir}"/usr/include install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } + package_python2-pyopencl() { - depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools') + depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'pyopencl-headers') cd "${srcdir}/pyopencl-${pkgver}-python2" python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + rm -fr "${pkgdir}"/usr/include + install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } + +package_pyopencl-headers() { + cd "${srcdir}/pyopencl-${pkgver}" + install -dm755 "${pkgdir}"/usr/include/pyopencl + + for file in pyopencl-bessel-j.cl pyopencl-cephes.cl pyopencl-airy.cl pyopencl-ranluxcl.cl pyopencl-complex.h; do + install -m644 src/cl/${file} "${pkgdir}"/usr/include/pyopencl + done +} diff --git a/community/python-pyproj/PKGBUILD b/community/python-pyproj/PKGBUILD index c066a372d..70ccf4529 100644 --- a/community/python-pyproj/PKGBUILD +++ b/community/python-pyproj/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71233 2012-05-25 14:39:53Z stephane $ +# $Id: PKGBUILD 78245 2012-10-17 10:26:49Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgbase=python-pyproj pkgname=('python-pyproj' 'python2-pyproj') -pkgver=1.9.0 +pkgver=1.9.2 pkgrel=1 pkgdesc="Python interfaces to PROJ.4 library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://code.google.com/p/pyproj" license=('custom') source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz) makedepends=('python' 'python2') -sha1sums=('9a49ff24dbf88d725adddd1ba255609b558e6b03') +sha1sums=('a7a4bf95f3492e45704bccd4aeafe3bbe32fb023') build() { cd "${srcdir}" @@ -20,7 +20,7 @@ build() { # Build python 3 module cd pyproj-${pkgver} - python setup.py build + python3 setup.py build # Build python 2 module cd ../pyproj-${pkgver}-python2 @@ -28,10 +28,10 @@ build() { } package_python-pyproj() { - depends=('proj' 'python>=3.2') + depends=('proj' 'python>=3.3') cd "${srcdir}"/pyproj-${pkgver} - python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/community/python-pyxattr/PKGBUILD b/community/python-pyxattr/PKGBUILD index 27afaaeab..7a211c735 100644 --- a/community/python-pyxattr/PKGBUILD +++ b/community/python-pyxattr/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 66406 2012-02-24 13:20:20Z lfleischer $ +# $Id: PKGBUILD 78604 2012-10-21 22:13:35Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Jon Bergli Heier <snakebite@jvnv.net> pkgname=('python2-pyxattr' 'python-pyxattr') pkgbase=python-pyxattr _pkgname=pyxattr -pkgver=0.5.0 -pkgrel=3 +pkgver=0.5.1 +pkgrel=1 pkgdesc='A python extension module that allows you to manipulate the extended attributes.' arch=('i686' 'x86_64' 'mips64el') -url='http://pyxattr.sourceforge.net/' +url='http://pyxattr.k1024.org/' license=('GPL') makedepends=('python2' 'python' 'python2-distribute' 'python-distribute') -source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") -md5sums=('0f7ab1e185087329e40f7de218517c84') +source=("https://github.com/downloads/iustin/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") +md5sums=('bb9560510b17625015aa45f2fbc3b520') package_python2-pyxattr() { depends=('python2') diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD index 75629a814..0ffc13383 100644 --- a/community/python-pyzmq/PKGBUILD +++ b/community/python-pyzmq/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75372 2012-08-21 15:10:09Z kkeen $ +# $Id: PKGBUILD 78250 2012-10-17 10:27:01Z allan $ # Maintainer: Kyle Keen <keenerd at gmail dot com> pkgname=python-pyzmq pkgver=2.2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Python3 bindings for zeromq, written in Cython" arch=(i686 x86_64 mips64el) url="http://www.zeromq.org/bindings:python" diff --git a/community/python-reportlab/ChangeLog b/community/python-reportlab/ChangeLog new file mode 100644 index 000000000..85b5db51f --- /dev/null +++ b/community/python-reportlab/ChangeLog @@ -0,0 +1,18 @@ + +2009-02-17 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 2.3 + +2008-11-03 Giovanni Scafora <giovanni@archlinux.org> + + * Rebuilt against python 2.6 + +2008-09-14 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updating for x86_64: 2.2 + +2008-09-13 Douglas Soares de Andrade <douglas@archlinux.org> + + * Adding ChangeLog + * Updating for i686: 2.2 + diff --git a/community/python-reportlab/PKGBUILD b/community/python-reportlab/PKGBUILD new file mode 100644 index 000000000..6e44f03d6 --- /dev/null +++ b/community/python-reportlab/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 78251 2012-10-17 10:27:06Z allan $ +# Maintainer: +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgbase=python-reportlab +pkgname=python2-reportlab +_origname=reportlab +pkgver=2.6 +pkgrel=1 +pkgdesc="A proven industry-strength PDF generating solution" +arch=('i686' 'x86_64') +url="http://www.reportlab.org/rl_toolkit.html" +depends=('python2' 'freetype2') +conflicts=('python-reportlab<=2.5-2') +replaces=('python-reportlab<=2.5-2') +license=('CUSTOM') +source=(http://www.reportlab.org/ftp/${_origname}-$pkgver.tar.gz) +md5sums=('e5d27a24a2c8456b168913242aa1940f') + +build() { + cd $srcdir/${_origname}-$pkgver + + # python2 fix + for file in src/reportlab/graphics/widgets/table.py src/reportlab/lib/normalDate.py \ + src/reportlab/pdfgen/pycanvas.py; do + sed -i 's_#!.*/usr/bin/env python_#!/usr/bin/env python2_' $file + done +} + +package_python2-reportlab() { + cd $srcdir/${_origname}-$pkgver + python2 setup.py install --root=$pkgdir --optimize=1 + install -D -m644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/license.txt +} diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 650b6f16d..68f04fa70 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: Andrzej Giniewicz <gginiu@gmail.com> pkgname=('python-scipy' 'python2-scipy') -pkgver=0.10.1 -pkgrel=1 +pkgver=0.11.0 +pkgrel=2 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') url="http://www.scipy.org/" @@ -15,7 +15,7 @@ license=('BSD') makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') checkdepends=('python-nose' 'python2-nose') source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz") -md5sums=('6ad976549e22e04ca93e70cf55b70a22') +md5sums=('842c81d35fd63579c41a8ca21a2419b9') build() { unset LDFLAGS diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD index ccb2cc764..764bfd0b4 100644 --- a/community/python-sqlalchemy/PKGBUILD +++ b/community/python-sqlalchemy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 75475 2012-08-25 20:53:22Z jelle $ +# $Id: PKGBUILD 78255 2012-10-17 10:27:16Z allan $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-sqlalchemy pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=0.7.8 +pkgver=0.7.9 pkgrel=1 arch=('i686' 'x86_64') # python2 package contain .so url="http://www.sqlalchemy.org/" license=('custom: MIT') makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose') source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz") -md5sums=('a5346f007e79c08cccb62ccec267309a') +md5sums=('c4852d586d95a59fbc9358f4467875d5') build() { cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver diff --git a/community/python-yaml/PKGBUILD b/community/python-yaml/PKGBUILD index 571362e94..b6eb58be4 100644 --- a/community/python-yaml/PKGBUILD +++ b/community/python-yaml/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66141 2012-02-23 01:45:30Z spupykin $ +# $Id: PKGBUILD 78260 2012-10-17 10:27:30Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Michal Bozon <michal.bozon__at__gmail.com> pkgbase=python-yaml pkgname=(python2-yaml python-yaml) pkgver=3.10 -pkgrel=2 +pkgrel=3 pkgdesc="Python bindings for YAML, using fast libYAML library" arch=('i686' 'x86_64' 'mips64el') url="http://pyyaml.org" diff --git a/community/python2-cjson/PKGBUILD b/community/python2-cjson/PKGBUILD new file mode 100644 index 000000000..2d95793a4 --- /dev/null +++ b/community/python2-cjson/PKGBUILD @@ -0,0 +1,19 @@ +# $Id: PKGBUILD 66126 2012-02-23 01:35:30Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Lincoln de Sousa <lincoln@archlinux-br.org> + +pkgname=python2-cjson +pkgver=1.0.5 +pkgrel=5 +arch=('i686' 'x86_64') +license=('LGPL') +pkgdesc="Fast JSON encoder/decoder for Python" +url="http://pypi.python.org/pypi/python-cjson/" +depends=('python2') +source=("http://pypi.python.org/packages/source/p/python-cjson/python-cjson-$pkgver.tar.gz") +md5sums=('4d55b66ecdf0300313af9d030d9644a3') + +build() { + cd $srcdir/python-cjson-$pkgver + python2 setup.py install --root=$pkgdir +} diff --git a/community/python2-fonttools/PKGBUILD b/community/python2-fonttools/PKGBUILD new file mode 100644 index 000000000..ea307d2f5 --- /dev/null +++ b/community/python2-fonttools/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 76250 2012-09-15 08:59:17Z aginiewicz $ +# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> +# Contributor: Firmicus <firmicus āt gmx dōt net> + +pkgname=python2-fonttools +pkgver=2.3 +pkgrel=1 +pkgdesc="Converts OpenType and TrueType fonts to and from XML" +url="http://sourceforge.net/projects/fonttools/" +license=("BSD") +arch=('i686' 'x86_64') +depends=("python2-numpy") +makedepends=("python2-distribute") +provides=('fonttools') # temporary compatibility because of rename +replaces=('fonttools') +source=(http://downloads.sourceforge.net/fonttools/fonttools-$pkgver.tar.gz) +md5sums=('502cdf6662e1d075f1902fbd995eaace') + +build() { + cd "$srcdir"/fonttools-$pkgver + + python2 setup.py build +} + +package() { + cd "$srcdir"/fonttools-$pkgver + + python2 setup.py install --root="$pkgdir" --optimize=1 + + install -D -m755 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + chmod oga+r "$pkgdir"/usr/share/man/man1/ttx.1 + sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find "${pkgdir}" -name '*.py') +} + diff --git a/community/python2-fuse/PKGBUILD b/community/python2-fuse/PKGBUILD new file mode 100644 index 000000000..ef79aceef --- /dev/null +++ b/community/python2-fuse/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 77237 2012-10-07 19:35:53Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Chris Brannon <cmbrannon79@gmail.com> +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Alexander Fehr <pizzapunk@gmail.com> + +pkgname=python2-fuse +pkgver=0.2.1 +pkgrel=4 +arch=('i686' 'x86_64') +pkgdesc="Python bindings for FUSE" +url="http://fuse.sourceforge.net/wiki/index.php/FusePython" +license=('LGPL') +depends=('fuse' 'python2') +replaces=('python-fuse') +conflicts=('python-fuse') +makedepends=('pkgconfig') +source=(http://downloads.sourceforge.net/sourceforge/fuse/fuse-python-${pkgver}.tar.gz) +md5sums=('9d9c5c2311ac04291ce822dfece108f8') + +package() { + cd "$srcdir/fuse-python-$pkgver" + + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 +} diff --git a/community/python2-galago/PKGBUILD b/community/python2-galago/PKGBUILD new file mode 100644 index 000000000..6076c3a9e --- /dev/null +++ b/community/python2-galago/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 66128 2012-02-23 01:37:06Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=python2-galago +pkgver=0.5.0 +pkgrel=6 +pkgdesc="A library of simple functions that are optimized for various CPUs" +arch=('i686' 'x86_64') +url="http://galago-project.org" +options=('!libtool') +license=('LGPL') +depends=('libgalago' 'pygtk') +source=(http://galago-project.org/files/releases/source/galago-python/galago-python-$pkgver.tar.bz2) +md5sums=('27be31fcf2886aa21823caec15dc34aa') + +build() { + cd $srcdir/galago-python-$pkgver + ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install +} diff --git a/community/python2-gnutls/PKGBUILD b/community/python2-gnutls/PKGBUILD new file mode 100644 index 000000000..3a7c86a04 --- /dev/null +++ b/community/python2-gnutls/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 74655 2012-08-01 13:54:20Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Hugo Doria <hugo@archlinux.org> +# Contributor: N3RD3X <n3rd3x@linuxmail.org> + +pkgname=python2-gnutls +pkgver=1.2.4 +pkgrel=2 +pkgdesc="Python wrapper for the GNUTLS library" +arch=('i686' 'x86_64') +url="http://cheeseshop.python.org/pypi/python-gnutls" +depends=('python2' 'gnutls') +license=('LGPL') +source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz + gnutls3.patch) +md5sums=('e3536c421291a791869d875a41dcb26a' + '24bc95d9f5e71e9f5e180706cbb09248') + +build() { + cd ${srcdir}/python-gnutls-${pkgver} + patch -Np0 <$srcdir/gnutls3.patch + python2 setup.py install --root=${pkgdir} +} diff --git a/community/python2-gnutls/gnutls3.patch b/community/python2-gnutls/gnutls3.patch new file mode 100644 index 000000000..5110de2f2 --- /dev/null +++ b/community/python2-gnutls/gnutls3.patch @@ -0,0 +1,271 @@ +diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py +--- gnutls/library/functions.py 2011-08-19 04:48:14.000000000 +0100 ++++ gnutls.fixed/library/functions.py 2012-08-01 11:56:43.450975419 +0100 +@@ -4,7 +4,7 @@ + import sys + from ctypes import * + +-from gnutls.library import libgnutls, libgnutls_extra ++from gnutls.library import libgnutls + from gnutls.library.types import * + + +@@ -121,14 +121,6 @@ + gnutls_certificate_get_peers.argtypes = [gnutls_session_t, POINTER(c_uint)] + gnutls_certificate_get_peers.restype = POINTER(gnutls_datum_t) + +-gnutls_certificate_get_x509_cas = libgnutls.gnutls_certificate_get_x509_cas +-gnutls_certificate_get_x509_cas.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crt_t)), POINTER(c_uint)] +-gnutls_certificate_get_x509_cas.restype = None +- +-gnutls_certificate_get_x509_crls = libgnutls.gnutls_certificate_get_x509_crls +-gnutls_certificate_get_x509_crls.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crl_t)), POINTER(c_uint)] +-gnutls_certificate_get_x509_crls.restype = None +- + gnutls_certificate_send_x509_rdn_sequence = libgnutls.gnutls_certificate_send_x509_rdn_sequence + gnutls_certificate_send_x509_rdn_sequence.argtypes = [gnutls_session_t, c_int] + gnutls_certificate_send_x509_rdn_sequence.restype = None +@@ -221,10 +213,6 @@ + gnutls_certificate_type_set_priority.argtypes = [gnutls_session_t, POINTER(c_int)] + gnutls_certificate_type_set_priority.restype = c_int + +-gnutls_certificate_verify_peers = libgnutls.gnutls_certificate_verify_peers +-gnutls_certificate_verify_peers.argtypes = [gnutls_session_t] +-gnutls_certificate_verify_peers.restype = c_int +- + gnutls_certificate_verify_peers2 = libgnutls.gnutls_certificate_verify_peers2 + gnutls_certificate_verify_peers2.argtypes = [gnutls_session_t, POINTER(c_uint)] + gnutls_certificate_verify_peers2.restype = c_int +@@ -393,10 +381,6 @@ + gnutls_error_to_alert.argtypes = [c_int, POINTER(c_int)] + gnutls_error_to_alert.restype = c_int + +-gnutls_extra_check_version = libgnutls_extra.gnutls_extra_check_version +-gnutls_extra_check_version.argtypes = [c_char_p] +-gnutls_extra_check_version.restype = c_char_p +- + gnutls_fingerprint = libgnutls.gnutls_fingerprint + gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)] + gnutls_fingerprint.restype = c_int +@@ -409,10 +393,6 @@ + gnutls_global_init.argtypes = [] + gnutls_global_init.restype = c_int + +-gnutls_global_init_extra = libgnutls_extra.gnutls_global_init_extra +-gnutls_global_init_extra.argtypes = [] +-gnutls_global_init_extra.restype = c_int +- + gnutls_global_set_log_function = libgnutls.gnutls_global_set_log_function + gnutls_global_set_log_function.argtypes = [gnutls_log_func] + gnutls_global_set_log_function.restype = None +@@ -461,86 +441,6 @@ + gnutls_hex_encode.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] + gnutls_hex_encode.restype = c_int + +-gnutls_ia_allocate_client_credentials = libgnutls_extra.gnutls_ia_allocate_client_credentials +-gnutls_ia_allocate_client_credentials.argtypes = [POINTER(gnutls_ia_client_credentials_t)] +-gnutls_ia_allocate_client_credentials.restype = c_int +- +-gnutls_ia_allocate_server_credentials = libgnutls_extra.gnutls_ia_allocate_server_credentials +-gnutls_ia_allocate_server_credentials.argtypes = [POINTER(gnutls_ia_server_credentials_t)] +-gnutls_ia_allocate_server_credentials.restype = c_int +- +-gnutls_ia_enable = libgnutls_extra.gnutls_ia_enable +-gnutls_ia_enable.argtypes = [gnutls_session_t, c_int] +-gnutls_ia_enable.restype = None +- +-gnutls_ia_endphase_send = libgnutls_extra.gnutls_ia_endphase_send +-gnutls_ia_endphase_send.argtypes = [gnutls_session_t, c_int] +-gnutls_ia_endphase_send.restype = c_int +- +-gnutls_ia_extract_inner_secret = libgnutls_extra.gnutls_ia_extract_inner_secret +-gnutls_ia_extract_inner_secret.argtypes = [gnutls_session_t, c_char_p] +-gnutls_ia_extract_inner_secret.restype = None +- +-gnutls_ia_free_client_credentials = libgnutls_extra.gnutls_ia_free_client_credentials +-gnutls_ia_free_client_credentials.argtypes = [gnutls_ia_client_credentials_t] +-gnutls_ia_free_client_credentials.restype = None +- +-gnutls_ia_free_server_credentials = libgnutls_extra.gnutls_ia_free_server_credentials +-gnutls_ia_free_server_credentials.argtypes = [gnutls_ia_server_credentials_t] +-gnutls_ia_free_server_credentials.restype = None +- +-gnutls_ia_generate_challenge = libgnutls_extra.gnutls_ia_generate_challenge +-gnutls_ia_generate_challenge.argtypes = [gnutls_session_t, size_t, c_char_p] +-gnutls_ia_generate_challenge.restype = c_int +- +-gnutls_ia_get_client_avp_ptr = libgnutls_extra.gnutls_ia_get_client_avp_ptr +-gnutls_ia_get_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t] +-gnutls_ia_get_client_avp_ptr.restype = c_void_p +- +-gnutls_ia_get_server_avp_ptr = libgnutls_extra.gnutls_ia_get_server_avp_ptr +-gnutls_ia_get_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t] +-gnutls_ia_get_server_avp_ptr.restype = c_void_p +- +-gnutls_ia_handshake = libgnutls_extra.gnutls_ia_handshake +-gnutls_ia_handshake.argtypes = [gnutls_session_t] +-gnutls_ia_handshake.restype = c_int +- +-gnutls_ia_handshake_p = libgnutls_extra.gnutls_ia_handshake_p +-gnutls_ia_handshake_p.argtypes = [gnutls_session_t] +-gnutls_ia_handshake_p.restype = c_int +- +-gnutls_ia_permute_inner_secret = libgnutls_extra.gnutls_ia_permute_inner_secret +-gnutls_ia_permute_inner_secret.argtypes = [gnutls_session_t, size_t, c_char_p] +-gnutls_ia_permute_inner_secret.restype = c_int +- +-gnutls_ia_recv = libgnutls_extra.gnutls_ia_recv +-gnutls_ia_recv.argtypes = [gnutls_session_t, c_char_p, size_t] +-gnutls_ia_recv.restype = ssize_t +- +-gnutls_ia_send = libgnutls_extra.gnutls_ia_send +-gnutls_ia_send.argtypes = [gnutls_session_t, c_char_p, size_t] +-gnutls_ia_send.restype = ssize_t +- +-gnutls_ia_set_client_avp_function = libgnutls_extra.gnutls_ia_set_client_avp_function +-gnutls_ia_set_client_avp_function.argtypes = [gnutls_ia_client_credentials_t, gnutls_ia_avp_func] +-gnutls_ia_set_client_avp_function.restype = None +- +-gnutls_ia_set_client_avp_ptr = libgnutls_extra.gnutls_ia_set_client_avp_ptr +-gnutls_ia_set_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t, c_void_p] +-gnutls_ia_set_client_avp_ptr.restype = None +- +-gnutls_ia_set_server_avp_function = libgnutls_extra.gnutls_ia_set_server_avp_function +-gnutls_ia_set_server_avp_function.argtypes = [gnutls_ia_server_credentials_t, gnutls_ia_avp_func] +-gnutls_ia_set_server_avp_function.restype = None +- +-gnutls_ia_set_server_avp_ptr = libgnutls_extra.gnutls_ia_set_server_avp_ptr +-gnutls_ia_set_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t, c_void_p] +-gnutls_ia_set_server_avp_ptr.restype = None +- +-gnutls_ia_verify_endphase = libgnutls_extra.gnutls_ia_verify_endphase +-gnutls_ia_verify_endphase.argtypes = [gnutls_session_t, c_char_p] +-gnutls_ia_verify_endphase.restype = c_int +- + gnutls_init = libgnutls.gnutls_init + gnutls_init.argtypes = [POINTER(gnutls_session_t), gnutls_connection_end_t] + gnutls_init.restype = c_int +@@ -733,10 +633,6 @@ + gnutls_psk_free_server_credentials.argtypes = [gnutls_psk_server_credentials_t] + gnutls_psk_free_server_credentials.restype = None + +-gnutls_psk_netconf_derive_key = libgnutls.gnutls_psk_netconf_derive_key +-gnutls_psk_netconf_derive_key.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(gnutls_datum_t)] +-gnutls_psk_netconf_derive_key.restype = c_int +- + gnutls_psk_server_get_username = libgnutls.gnutls_psk_server_get_username + gnutls_psk_server_get_username.argtypes = [gnutls_session_t] + gnutls_psk_server_get_username.restype = c_char_p +@@ -857,10 +753,6 @@ + gnutls_session_enable_compatibility_mode.argtypes = [gnutls_session_t] + gnutls_session_enable_compatibility_mode.restype = None + +-gnutls_session_get_client_random = libgnutls.gnutls_session_get_client_random +-gnutls_session_get_client_random.argtypes = [gnutls_session_t] +-gnutls_session_get_client_random.restype = c_void_p +- + gnutls_session_get_data = libgnutls.gnutls_session_get_data + gnutls_session_get_data.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)] + gnutls_session_get_data.restype = c_int +@@ -873,18 +765,10 @@ + gnutls_session_get_id.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)] + gnutls_session_get_id.restype = c_int + +-gnutls_session_get_master_secret = libgnutls.gnutls_session_get_master_secret +-gnutls_session_get_master_secret.argtypes = [gnutls_session_t] +-gnutls_session_get_master_secret.restype = c_void_p +- + gnutls_session_get_ptr = libgnutls.gnutls_session_get_ptr + gnutls_session_get_ptr.argtypes = [gnutls_session_t] + gnutls_session_get_ptr.restype = c_void_p + +-gnutls_session_get_server_random = libgnutls.gnutls_session_get_server_random +-gnutls_session_get_server_random.argtypes = [gnutls_session_t] +-gnutls_session_get_server_random.restype = c_void_p +- + gnutls_session_is_resumed = libgnutls.gnutls_session_is_resumed + gnutls_session_is_resumed.argtypes = [gnutls_session_t] + gnutls_session_is_resumed.restype = c_int +@@ -905,10 +789,6 @@ + gnutls_set_default_priority.argtypes = [gnutls_session_t] + gnutls_set_default_priority.restype = c_int + +-gnutls_sign_algorithm_get_name = libgnutls.gnutls_sign_algorithm_get_name +-gnutls_sign_algorithm_get_name.argtypes = [gnutls_sign_algorithm_t] +-gnutls_sign_algorithm_get_name.restype = c_char_p +- + gnutls_sign_callback_get = libgnutls.gnutls_sign_callback_get + gnutls_sign_callback_get.argtypes = [gnutls_session_t, POINTER(c_void_p)] + gnutls_sign_callback_get.restype = gnutls_sign_func +@@ -937,14 +817,6 @@ + gnutls_transport_set_errno.argtypes = [gnutls_session_t, c_int] + gnutls_transport_set_errno.restype = None + +-gnutls_transport_set_global_errno = libgnutls.gnutls_transport_set_global_errno +-gnutls_transport_set_global_errno.argtypes = [c_int] +-gnutls_transport_set_global_errno.restype = None +- +-gnutls_transport_set_lowat = libgnutls.gnutls_transport_set_lowat +-gnutls_transport_set_lowat.argtypes = [gnutls_session_t, c_int] +-gnutls_transport_set_lowat.restype = None +- + gnutls_transport_set_ptr = libgnutls.gnutls_transport_set_ptr + gnutls_transport_set_ptr.argtypes = [gnutls_session_t, gnutls_transport_ptr_t] + gnutls_transport_set_ptr.restype = None +@@ -1501,10 +1373,6 @@ + gnutls_x509_privkey_sign_hash.argtypes = [gnutls_x509_privkey_t, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)] + gnutls_x509_privkey_sign_hash.restype = c_int + +-gnutls_x509_privkey_verify_data = libgnutls.gnutls_x509_privkey_verify_data +-gnutls_x509_privkey_verify_data.argtypes = [gnutls_x509_privkey_t, c_uint, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)] +-gnutls_x509_privkey_verify_data.restype = c_int +- + gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get + gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] + gnutls_x509_rdn_get.restype = c_int +diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py +--- gnutls/library/__init__.py 2011-11-11 17:23:49.000000000 +0000 ++++ gnutls.fixed/library/__init__.py 2012-08-01 11:57:42.284290997 +0100 +@@ -53,6 +53,9 @@ + else: + raise RuntimeError('cannot find lib%s on this system' % name) + ++def do_nothing(*args, **kwargs): ++ pass ++ + + def initialize_gcrypt(): + from ctypes import c_void_p +@@ -104,7 +107,7 @@ + libgcrypt = load_library(name='gcrypt', version=11) + gcry_control = libgcrypt.gcry_control + else: +- gcry_control = libgnutls.gcry_control ++ gcry_control = do_nothing + + gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr)) + if system == 'cygwin': +@@ -117,12 +120,10 @@ + + + +-libgnutls = load_library(name='gnutls', version=26) +-libgnutls_extra = load_library(name='gnutls-extra', version=26) ++libgnutls = load_library(name='gnutls', version=28) + + initialize_gcrypt() + libgnutls.gnutls_global_init() +-libgnutls_extra.gnutls_global_init_extra() + + + from gnutls.library import constants +@@ -136,9 +137,6 @@ + if functions.gnutls_check_version(__need_version__) is None: + version = functions.gnutls_check_version(None) + raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__)) +-if functions.gnutls_extra_check_version(__need_version__) is None: +- version = functions.gnutls_extra_check_version(None) +- raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__)) + + + del get_system_name, library_locations, load_library, initialize_gcrypt diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD new file mode 100644 index 000000000..49b368ada --- /dev/null +++ b/community/python2-imaging/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 78281 2012-10-17 10:28:39Z allan $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: simo <simo@archlinux.org> + +pkgname=python2-imaging +pkgver=1.1.7 +pkgrel=5 +pkgdesc="PIL. Provides image processing capabilities for python" +arch=('i686' 'x86_64') +url="http://www.pythonware.com/products/pil/index.htm" +license=('custom:"pil"') +depends=('python2' 'libjpeg' 'freetype2' 'lcms') +makedepends=('tk' 'sane') +optdepends=('tk: for the ImageTK module' + 'sane: for the ImageSane module') +provides=("pil=${pkgver}" "python-imaging=${pkgver}") +conflicts=('pil' 'python-imaging') +replaces=('pil' 'python-imaging') +source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz) +md5sums=('fc14a54e1ce02a0225be8854bfba478e') + +build() { + cd "${srcdir}/Imaging-${pkgver}" + python2 setup.py build_ext + cd Sane + python2 setup.py build_ext +} + +package() { + cd "${srcdir}/Imaging-${pkgver}" + python2 setup.py install --root="${pkgdir}" --optimize=1 + + pushd Sane + python2 setup.py install --root="${pkgdir}" --optimize=1 + popd + + install -dm755 "${pkgdir}/usr/include/python2.7/" + install -m644 -t "${pkgdir}/usr/include/python2.7/" libImaging/*.h + + # do not have files ending in .py in /usr/bin + for f in pildriver pilprint pilconvert pilfile pilfont; do + mv "${pkgdir}"/usr/bin/${f}{.py,} + done + + # Install license + install -Dm644 "${srcdir}/Imaging-${pkgver}/README" \ + "${pkgdir}/usr/share/licenses/${pkgname}/README" +} diff --git a/community/python2-lcms/PKGBUILD b/community/python2-lcms/PKGBUILD new file mode 100644 index 000000000..3b75364ab --- /dev/null +++ b/community/python2-lcms/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 66130 2012-02-23 01:39:55Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Connor Behan <connor.behan@gmail.com> + +pkgname=python2-lcms +pkgver=1.19 +_mver=1.19 +pkgrel=4 +pkgdesc="LittleCMS Python bindings" +arch=(i686 x86_64) +license=('CUSTOM') +depends=('libtiff' 'python2' 'lcms') +url="http://www.littlecms.com" +options=('!libtool') +source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz) +md5sums=('8af94611baf20d9646c7c2c285859818') + +build() { + cd $srcdir/lcms-${_mver} + ./configure --prefix=/usr --with-python + make +} + +package() { + cd $srcdir/lcms-${_mver} + make DESTDIR=$pkgdir install + install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + rm -rf $pkgdir/usr/bin \ + $pkgdir/usr/include \ + $pkgdir/usr/lib/pkgconfig \ + $pkgdir/usr/lib/liblcms.* \ + $pkgdir/usr/share/man/man1/icc2ps.1 \ + $pkgdir/usr/share/man/man1/icclink.1 \ + $pkgdir/usr/share/man/man1/jpegicc.1 \ + $pkgdir/usr/share/man/man1/tifficc.1 \ + $pkgdir/usr/share/man/man1/wtpt.1 +} diff --git a/community/python2-m2crypto/PKGBUILD b/community/python2-m2crypto/PKGBUILD new file mode 100644 index 000000000..a68c5a35d --- /dev/null +++ b/community/python2-m2crypto/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=python2-m2crypto +pkgver=0.21.1 +pkgrel=2 +pkgdesc="A crypto and SSL toolkit for Python" +arch=('i686' 'x86_64') +url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" +license=('BSD') +depends=('python2' 'openssl') +makedepends=('swig') +source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") +md5sums=('f93d8462ff7646397a9f77a2fe602d17') + +build() { + cd "${srcdir}/M2Crypto-${pkgver}" + python2 setup.py build +} + +package() { + cd "${srcdir}/M2Crypto-${pkgver}" + python2 setup.py install --root="${pkgdir}/" --optimize=1 + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/python2-m2crypto/openssl1.patch b/community/python2-m2crypto/openssl1.patch new file mode 100644 index 000000000..59dba554d --- /dev/null +++ b/community/python2-m2crypto/openssl1.patch @@ -0,0 +1,531 @@ +Index: tests/test_ssl.py +=================================================================== +--- tests/test_ssl.py (revision 698) ++++ tests/test_ssl.py (working copy) +@@ -405,8 +405,11 @@ + try: + ctx = SSL.Context('sslv23', weak_crypto=1) + s = SSL.Connection(ctx) +- s.connect(self.srv_addr) +- self.failUnlessEqual(s.get_version(), 'SSLv2') ++ if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL ++ s.connect(self.srv_addr) ++ self.failUnlessEqual(s.get_version(), 'SSLv2') ++ else: ++ self.assertRaises(SSL.SSLError, s.connect, self.srv_addr) + s.close() + finally: + self.stop_server(pid) +Index: tests/test_x509.py +=================================================================== +--- tests/test_x509.py (revision 698) ++++ tests/test_x509.py (working copy) +@@ -142,7 +142,7 @@ + cn.set_data("Hello There!") + assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text() + +- assert n.as_hash() == 1697185131 ++ self.assertEquals(n.as_hash(), 1697185131) + + self.assertRaises(IndexError, lambda: n[100]) + self.assert_(n[10]) +Index: tests/test_smime.py +=================================================================== +--- tests/test_smime.py (revision 698) ++++ tests/test_smime.py (working copy) +@@ -6,7 +6,7 @@ + """ + + import unittest +-from M2Crypto import SMIME, BIO, Rand, X509, EVP ++from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err + + class SMIMETestCase(unittest.TestCase): + cleartext = 'some text to manipulate' +@@ -213,7 +213,7 @@ + + self.filenameSmime = 'tests/sig.p7s' + f = BIO.openfile(self.filenameSmime, 'wb') +- assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1 ++ assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error() + f.close() + + def test_write_pkcs7_der(self): +Index: SWIG/_evp.i +=================================================================== +--- SWIG/_evp.i (revision 695) ++++ SWIG/_evp.i (working copy) +@@ -180,7 +180,7 @@ + + PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter, + keylen, key); +- ret = PyString_FromStringAndSize(key, keylen); ++ ret = PyString_FromStringAndSize((char*)key, keylen); + OPENSSL_cleanse(key, keylen); + return ret; + } +@@ -339,7 +339,7 @@ + klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, + (unsigned char *)dbuf, dlen, iter, + key, NULL); /* Since we are not returning IV no need to derive it */ +- ret = PyString_FromStringAndSize(key, klen); ++ ret = PyString_FromStringAndSize((char*)key, klen); + return ret; + } + +@@ -435,7 +435,7 @@ + PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error())); + return NULL; + } +- ret = PyString_FromStringAndSize(sigbuf, siglen); ++ ret = PyString_FromStringAndSize((char*)sigbuf, siglen); + OPENSSL_cleanse(sigbuf, siglen); + OPENSSL_free(sigbuf); + return ret; +@@ -513,7 +513,7 @@ + PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed"); + return NULL; + } +- der = PyString_FromStringAndSize(pp, len); ++ der = PyString_FromStringAndSize((char*)pp, len); + OPENSSL_free(pp); + return der; + } +Index: SWIG/_ssl.i +=================================================================== +--- SWIG/_ssl.i (revision 695) ++++ SWIG/_ssl.i (working copy) +@@ -17,13 +17,17 @@ + %apply Pointer NONNULL { SSL_CTX * }; + %apply Pointer NONNULL { SSL * }; + %apply Pointer NONNULL { SSL_CIPHER * }; +-%apply Pointer NONNULL { STACK * }; ++%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * }; ++%apply Pointer NONNULL { STACK_OF(X509) * }; + %apply Pointer NONNULL { BIO * }; + %apply Pointer NONNULL { DH * }; + %apply Pointer NONNULL { RSA * }; + %apply Pointer NONNULL { EVP_PKEY *}; + %apply Pointer NONNULL { PyObject *pyfunc }; + ++%rename(ssl_get_ciphers) SSL_get_ciphers; ++extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl); ++ + %rename(ssl_get_version) SSL_get_version; + extern const char *SSL_get_version(CONST SSL *); + %rename(ssl_get_error) SSL_get_error; +@@ -668,29 +672,25 @@ + return SSL_CIPHER_get_bits(c, NULL); + } + +-STACK *ssl_get_ciphers(SSL *ssl) { +- return (STACK *)SSL_get_ciphers(ssl); ++int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) { ++ return sk_SSL_CIPHER_num(stack); + } + +-int sk_ssl_cipher_num(STACK *stack) { +- return sk_num(stack); ++SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) { ++ return sk_SSL_CIPHER_value(stack, idx); + } + +-SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) { +- return (SSL_CIPHER *)sk_value(stack, idx); ++STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) { ++ return SSL_get_peer_cert_chain(ssl); + } + +-STACK *ssl_get_peer_cert_chain(SSL *ssl) { +- return (STACK *)SSL_get_peer_cert_chain(ssl); ++int sk_x509_num(STACK_OF(X509) *stack) { ++ return sk_X509_num(stack); + } + +-int sk_x509_num(STACK *stack) { +- return sk_num(stack); ++X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) { ++ return sk_X509_value(stack, idx); + } +- +-X509 *sk_x509_value(STACK *stack, int idx) { +- return (X509 *)sk_value(stack, idx); +-} + %} + + %threadallow i2d_ssl_session; +Index: SWIG/_x509.i +=================================================================== +--- SWIG/_x509.i (revision 695) ++++ SWIG/_x509.i (working copy) +@@ -148,8 +148,15 @@ + extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long); + %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp; + extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long); ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++%rename(x509_name_hash) X509_NAME_hash_old; ++extern unsigned long X509_NAME_hash_old(X509_NAME *); ++#else + %rename(x509_name_hash) X509_NAME_hash; + extern unsigned long X509_NAME_hash(X509_NAME *); ++#endif ++ + %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID; + extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int); + +@@ -171,7 +178,7 @@ + if (PyString_Check($input)) { + Py_ssize_t len; + +- $1 = PyString_AsString($input); ++ $1 = (unsigned char *)PyString_AsString($input); + len = PyString_Size($input); + if (len > INT_MAX) { + PyErr_SetString(PyExc_ValueError, "object too large"); +@@ -184,7 +191,7 @@ + } + } + %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data; +-extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int); ++extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int); + %typemap(in) (CONST unsigned char *, int); + + %rename(x509_req_new) X509_REQ_new; +@@ -230,7 +237,7 @@ + %rename(x509_store_ctx_free) X509_STORE_CTX_free; + extern void X509_STORE_CTX_free(X509_STORE_CTX *); + %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain; +-extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); ++extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); + + %rename(x509_extension_get_critical) X509_EXTENSION_get_critical; + extern int X509_EXTENSION_get_critical(X509_EXTENSION *); +@@ -348,7 +355,7 @@ + PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); + } + else { +- ret = PyString_FromStringAndSize(buf, len); ++ ret = PyString_FromStringAndSize((char*)buf, len); + OPENSSL_free(buf); + } + return ret; +@@ -435,12 +442,12 @@ + } + + int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) { +- return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0); ++ return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0); + } + + /* x509_name_add_entry_by_txt */ + int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) { +- return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set); ++ return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set); + } + + PyObject *x509_name_get_der(X509_NAME *name) +@@ -450,23 +457,23 @@ + } + + /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */ +-STACK *sk_x509_new_null(void) { +- return (STACK *)sk_X509_new_null(); ++STACK_OF(X509) *sk_x509_new_null(void) { ++ return sk_X509_new_null(); + } + + /* sk_X509_free() is a macro. */ +-void sk_x509_free(STACK *stack) { +- sk_X509_free((STACK_OF(X509) *)stack); ++void sk_x509_free(STACK_OF(X509) *stack) { ++ sk_X509_free(stack); + } + + /* sk_X509_push() is a macro. */ +-int sk_x509_push(STACK *stack, X509 *x509) { +- return sk_X509_push((STACK_OF(X509) *)stack, x509); ++int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) { ++ return sk_X509_push(stack, x509); + } + + /* sk_X509_pop() is a macro. */ +-X509 *sk_x509_pop(STACK *stack) { +- return sk_X509_pop((STACK_OF(X509) *)stack); ++X509 *sk_x509_pop(STACK_OF(X509) *stack) { ++ return sk_X509_pop(stack); + } + + int x509_store_load_locations(X509_STORE *store, const char *file) { +@@ -493,21 +500,29 @@ + return X509_REQ_set_version(x, version); + } + +-int x509_req_add_extensions(X509_REQ *req, STACK *exts) { +- return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts); ++int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) { ++ return X509_REQ_add_extensions(req, exts); + } + +-X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { +- return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len); ++X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { ++ return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len); + } + +-LHASH * +-x509v3_lhash(){ +- return lh_new(NULL,NULL); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++LHASH_OF(CONF_VALUE) ++#else ++LHASH ++#endif ++*x509v3_lhash() { ++ return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */ + } + + X509V3_CTX * +-x509v3_set_conf_lhash(LHASH * lhash){ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) { ++#else ++x509v3_set_conf_lhash(LHASH * lhash) { ++#endif + X509V3_CTX * ctx; + if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) { + PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash"); +@@ -517,11 +532,20 @@ + return ctx; + } + +-X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { ++X509_EXTENSION * ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) { ++#else ++x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { ++#endif + X509_EXTENSION * ext = NULL; + ext = X509V3_EXT_conf(conf, ctx, name, value); + PyMem_Free(ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ lh_CONF_VALUE_free(conf); ++#else + lh_free(conf); ++#endif + return ext; + } + +@@ -543,33 +567,33 @@ + } + + /* sk_X509_EXTENSION_new_null is a macro. */ +-STACK *sk_x509_extension_new_null(void) { +- return (STACK *)sk_X509_EXTENSION_new_null(); ++STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) { ++ return sk_X509_EXTENSION_new_null(); + } + + /* sk_X509_EXTENSION_free() is a macro. */ +-void sk_x509_extension_free(STACK *stack) { +- sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack); ++void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) { ++ sk_X509_EXTENSION_free(stack); + } + + /* sk_X509_EXTENSION_push() is a macro. */ +-int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) { +- return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext); ++int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) { ++ return sk_X509_EXTENSION_push(stack, x509_ext); + } + + /* sk_X509_EXTENSION_pop() is a macro. */ +-X509_EXTENSION *sk_x509_extension_pop(STACK *stack) { +- return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack); ++X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) { ++ return sk_X509_EXTENSION_pop(stack); + } + + /* sk_X509_EXTENSION_num() is a macro. */ +-int sk_x509_extension_num(STACK *stack) { +- return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack); ++int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) { ++ return sk_X509_EXTENSION_num(stack); + } + + /* sk_X509_EXTENSION_value() is a macro. */ +-X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) { +- return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i); ++X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) { ++ return sk_X509_EXTENSION_value(stack, i); + } + + /* X509_STORE_CTX_get_app_data is a macro. */ +@@ -590,7 +614,7 @@ + #define I2DTYPE int (*)() + #endif + +-STACK * ++STACK_OF(X509) * + make_stack_from_der_sequence(PyObject * pyEncodedString){ + STACK_OF(X509) *certs; + Py_ssize_t encoded_string_len; +@@ -606,7 +630,7 @@ + return NULL; + } + +- certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); ++ certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); + if (!certs) { + PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); + return NULL; +@@ -616,13 +640,13 @@ + } + + PyObject * +-get_der_encoding_stack(STACK * stack){ ++get_der_encoding_stack(STACK_OF(X509) *stack){ + PyObject * encodedString; + + unsigned char * encoding; + int len; + +- encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); ++ encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); + if (!encoding) { + PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); + return NULL; +Index: SWIG/_aes.i +=================================================================== +--- SWIG/_aes.i (revision 695) ++++ SWIG/_aes.i (working copy) +@@ -76,7 +76,7 @@ + AES_encrypt((const unsigned char *)in, out, key); + else + AES_decrypt((const unsigned char *)in, out, key); +- return PyString_FromStringAndSize(out, outlen); ++ return PyString_FromStringAndSize((char*)out, outlen); + } + + int AES_type_check(AES_KEY *key) { +Index: SWIG/_util.i +=================================================================== +--- SWIG/_util.i (revision 695) ++++ SWIG/_util.i (working copy) +@@ -48,7 +48,7 @@ + PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error())); + return NULL; + } +- obj = PyString_FromStringAndSize(ret, len); ++ obj = PyString_FromStringAndSize((char*)ret, len); + OPENSSL_free(ret); + return obj; + } +Index: SWIG/_m2crypto.i +=================================================================== +--- SWIG/_m2crypto.i (revision 695) ++++ SWIG/_m2crypto.i (working copy) +@@ -38,6 +38,19 @@ + #define CONST098 + #endif + ++/* Bring in STACK_OF macro definition */ ++%include <openssl/safestack.h> ++ ++/* Bring in LHASH_OF macro definition */ ++/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes ++ XXX stdio.h etc. which we fail to include. So we have to (re)define ++ XXX LHASH_OF here instead. ++%include <openssl/lhash.h> ++*/ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define LHASH_OF(type) struct lhash_st_##type ++#endif ++ + %include constraints.i + %include _threads.i + %include _lib.i +Index: SWIG/_rand.i +=================================================================== +--- SWIG/_rand.i (revision 695) ++++ SWIG/_rand.i (working copy) +@@ -87,7 +87,7 @@ + Py_INCREF(Py_None); + return Py_None; + } else { +- PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n)); ++ PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n)); + PyMem_Free(blob); + PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret)); + return tuple; +Index: SWIG/_pkcs7.i +=================================================================== +--- SWIG/_pkcs7.i (revision 695) ++++ SWIG/_pkcs7.i (working copy) +@@ -12,7 +12,7 @@ + %apply Pointer NONNULL { EVP_CIPHER * }; + %apply Pointer NONNULL { EVP_PKEY * }; + %apply Pointer NONNULL { PKCS7 * }; +-%apply Pointer NONNULL { STACK * }; ++%apply Pointer NONNULL { STACK_OF(X509) * }; + %apply Pointer NONNULL { X509 * }; + + %rename(pkcs7_new) PKCS7_new; +@@ -54,8 +54,8 @@ + + %threadallow pkcs7_encrypt; + %inline %{ +-PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { +- return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags); ++PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { ++ return PKCS7_encrypt(stack, bio, cipher, flags); + } + + PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) { +@@ -96,14 +96,14 @@ + + %threadallow pkcs7_sign1; + %inline %{ +-PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) { +- return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags); ++PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) { ++ return PKCS7_sign(x509, pkey, stack, bio, flags); + } + %} + + %threadallow pkcs7_verify1; + %inline %{ +-PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) { ++PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) { + int outlen; + char *outbuf; + BIO *bio; +@@ -113,7 +113,7 @@ + PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1"); + return NULL; + } +- if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) { ++ if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) { + PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error())); + BIO_free(bio); + return NULL; +@@ -131,7 +131,7 @@ + return ret; + } + +-PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) { ++PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) { + return pkcs7_verify1(pkcs7, stack, store, NULL, flags); + } + %} +@@ -229,7 +229,7 @@ + } + + /* return STACK_OF(X509)* */ +-STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) { ++STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) { + return PKCS7_get0_signers(p7, certs, flags); + } + diff --git a/community/python2-numexpr/PKGBUILD b/community/python2-numexpr/PKGBUILD index 6ce7467e1..3c5a1630d 100644 --- a/community/python2-numexpr/PKGBUILD +++ b/community/python2-numexpr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76098 2012-09-11 10:07:07Z aginiewicz $ +# $Id: PKGBUILD 76243 2012-09-15 08:46:42Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Sebastien Binet <binet@lblbox> pkgname=python2-numexpr pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A JIT compiler for Python expressions" url="http://code.google.com/p/numexpr/" arch=('i686' 'x86_64') @@ -12,6 +12,7 @@ license=('MIT') depends=('python2-numpy') makedepends=('python2-distribute') provides=('python-numexpr') # temporary compatibility because of rename +replaces=('python-numexpr') # (there is no python 3 version yet) source=(http://numexpr.googlecode.com/files/numexpr-$pkgver.tar.gz) md5sums=('5cdc05c2ef8761daeae8a3182e468ba4') diff --git a/community/python2-pybluez/PKGBUILD b/community/python2-pybluez/PKGBUILD new file mode 100644 index 000000000..6007614a6 --- /dev/null +++ b/community/python2-pybluez/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: cs-cam - me.at.camdaniel.com + +pkgname=python2-pybluez +pkgver=0.18 +pkgrel=4 +pkgdesc="Python wrapper for the BlueZ Bluetooth stack" +arch=('i686' 'x86_64') +url="http://code.google.com/p/pybluez/" +license=('GPL') +provides=('pybluez') +conflicts=('pybluez') +replaces=('pybluez') +depends=('python2' 'bluez') +source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz) +md5sums=('be8c8ce615c3189fda1aaf3d568314b2') + +build() { + cd $srcdir/PyBluez-$pkgver + python2 setup.py install --root=$pkgdir + ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so +} diff --git a/community/python2-pysqlite-legacy/PKGBUILD b/community/python2-pysqlite-legacy/PKGBUILD new file mode 100644 index 000000000..6fdb5bb66 --- /dev/null +++ b/community/python2-pysqlite-legacy/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 77909 2012-10-15 19:54:27Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor : Aaron Griffin <aaron.archlinux.org> + +pkgname=python2-pysqlite-legacy +pkgver=1.0.1 +pkgrel=1 +pkgdesc="A Python DB-API 2.0 interface for the legacy SQLite 2" +arch=('i686' 'x86_64') +url="http://initd.org/tracker/pysqlite" +replaces=('python-pysqlite-legacy') +license=('custom') +depends=('python2' 'sqlite2') +source=(http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/pysqlite-$pkgver.tar.gz) +md5sums=('4797b5ea7a3d96b87333e6b5af7b9979') + +build() +{ + cd ${srcdir}/pysqlite + python2 setup.py install --root=${pkgdir} -O1 + + # install custom license + install -Dm644 ${srcdir}/pysqlite/LICENSE \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community/python2-pytables/PKGBUILD b/community/python2-pytables/PKGBUILD index 082ebc1ba..38eecfb91 100644 --- a/community/python2-pytables/PKGBUILD +++ b/community/python2-pytables/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 76101 2012-09-11 10:23:14Z aginiewicz $ +# $Id: PKGBUILD 76245 2012-09-15 08:49:57Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Sebastien Binet <binet@cern.ch> pkgname=python2-pytables pkgver=2.4.0 -pkgrel=1 +pkgrel=2 arch=("i686" "x86_64") pkgdesc="PyTables is a package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data" url="http://www.pytables.org" license=("BSD") depends=('lzo2' 'hdf5' 'python2-numexpr' 'cython2') provides=('python-pytables') # temporary due to package rename +replaces=('python-pytables') # (there is no python 3 version yet) source=("http://pypi.python.org/packages/source/t/tables/tables-$pkgver.tar.gz") md5sums=('527ad046f92c9197ca96626b725f71f8') diff --git a/community/python2-pyxmpp/PKGBUILD b/community/python2-pyxmpp/PKGBUILD new file mode 100644 index 000000000..49096a86f --- /dev/null +++ b/community/python2-pyxmpp/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 72078 2012-06-08 09:35:02Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=python2-pyxmpp +pkgver=1.1.2 +pkgrel=2 +pkgdesc="A Python XMPP and Jabber implementation based on libxml2" +arch=('i686' 'x86_64') +url="http://pyxmpp.jajcus.net/" +license=('LGPL') +depends=('python2-dnspython' 'libxml2' 'python2-m2crypto') +source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz) +md5sums=('a38abf032aca0408b6055cd94296eb75') + +build() { + cd $srcdir/pyxmpp-$pkgver + python2 setup.py build + python2 setup.py install --root=$pkgdir +} diff --git a/community/python2-simplejson/PKGBUILD b/community/python2-simplejson/PKGBUILD new file mode 100644 index 000000000..1ec0a97b5 --- /dev/null +++ b/community/python2-simplejson/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 74926 2012-08-09 22:02:03Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: David Moore <davidm@sjsoft.com> + +pkgname=python2-simplejson +pkgver=2.6.1 +pkgrel=3 +pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" +license=('MIT') +arch=('i686' 'x86_64') +url="http://undefined.org/python/#simplejson" +depends=('python2') +makedepends=('python2-distribute') +provides=("python-simplejson=$pkgver") +conflicts=('python-simplejson') +replaces=('python-simplejson') +changelog=$pkgname.changelog +source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}) +sha256sums=('484b4cf0a545fc59a19ea8eed3a957919a89be116804b53712ec63466d7c3a31') + +build() { + cd ${srcdir}/simplejson-simplejson-* + + python2 setup.py install --root=${pkgdir} + +# License + install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \ + ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community/python2-simplejson/python2-simplejson.changelog b/community/python2-simplejson/python2-simplejson.changelog new file mode 100644 index 000000000..c1e227d24 --- /dev/null +++ b/community/python2-simplejson/python2-simplejson.changelog @@ -0,0 +1,20 @@ +2012-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * python-simplejson 2.6.1-1 + +2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * python-simplejson 2.5.2-1 + +2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * python-simplejson 2.3.3-1 + +2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * python-simplejson 2.2.1-1 + +2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * python-simplejson 2.1.3-1 + +2010-05-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 2.1.1 + +2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 2.1.0 diff --git a/community/python2-vorbissimple/PKGBUILD b/community/python2-vorbissimple/PKGBUILD new file mode 100644 index 000000000..ba0a8be63 --- /dev/null +++ b/community/python2-vorbissimple/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 66136 2012-02-23 01:43:46Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=python2-vorbissimple +pkgver=0.0.2 +pkgrel=6 +pkgdesc="Python bindings for vorbissimple" +arch=('i686' 'x86_64') +url="http://kamaelia.sourceforge.net" +license=('MPL') +depends=('python2' 'vorbissimple') +makedepends=('pyrex') +source=(http://downloads.sourceforge.net/kamaelia/vorbissimple-$pkgver.tar.gz) +md5sums=('332077b25a4c9547947ab0922361ffda') + +build() { + cd $srcdir/vorbissimple-$pkgver/python + sed -i 's#__new__#__cinit__#' vorbissimple.pyx + python2 setup.py install --root=$pkgdir +} diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index 28cacf696..610f3b6a4 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63722 2012-02-05 12:09:17Z ibiru $ +# $Id: PKGBUILD 77657 2012-10-13 11:44:42Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Giovanni Scafora <linuxmania@gmail.com> @@ -6,12 +6,13 @@ pkgname=qcad pkgver=2.0.5.0 -pkgrel=9 +pkgrel=11 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64') url="http://www.ribbonsoft.com/qcad.html" license=('GPL2') depends=('qt3') +makedepends=('glu') options=(libtool) source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz qcad.xpm @@ -31,8 +32,10 @@ build() { cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src - #Arch64 fix - gentoo patch - [ "$CARCH" = "x86_64" ] && patch -p1 < ../qcad-intptr.patch + [ "$CARCH" = "x86_64" ] && { + patch -p1 < ../qcad-intptr.patch; + sed -i '1,1i#include <stdint.h>' qcadlib/src/engine/rs_layer.cpp qcadlib/src/engine/rs_entity.cpp; + } patch -p1 < ../qcad.patch sed -i "s:"-pedantic"::g" mkspecs/defs.pro diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index f37607f79..3d9fe9505 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 75950 2012-09-06 20:00:35Z jlichtblau $ +# $Id: PKGBUILD 77658 2012-10-13 11:44:51Z allan $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt pkgver=1.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.qlandkarte.org/" license=('GPL') -depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs' +depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'glu' 'postgresql-libs' 'qt' 'shared-mime-info' 'qtwebkit') -makedepends=('cmake' 'garmindev') +makedepends=('cmake' 'garmindev' 'mesa') optdepends=('garmindev: to connect garmin devices') install=$pkgname.install changelog=$pkgname.changelog @@ -22,9 +22,7 @@ sha256sums=('095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { - cd ${srcdir}/$pkgname-$pkgver - - cd ${srcdir} + cd "${srcdir}" mkdir build cd build @@ -35,10 +33,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/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index 1dc543742..dc96f51dc 100644 --- a/community/qmc2/PKGBUILD +++ b/community/qmc2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71042 2012-05-22 09:30:39Z spupykin $ +# $Id: PKGBUILD 76435 2012-09-18 12:56:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> pkgname=qmc2 -pkgver=0.36 +pkgver=0.37 pkgrel=1 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('qtwebkit' 'phonon' 'sdl') makedepends=('rsync' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") -md5sums=('db374fcdef5f680729b26af88766c4fb') +md5sums=('0f36197cb1a7ab6f54af43f4f67d7150') build() { cd "$srcdir/$pkgname" diff --git a/community/qtcurve-gtk2/PKGBUILD b/community/qtcurve-gtk2/PKGBUILD index 7e4d603ad..798c75fbd 100644 --- a/community/qtcurve-gtk2/PKGBUILD +++ b/community/qtcurve-gtk2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69999 2012-04-28 00:40:23Z svenstaro $ +# $Id: PKGBUILD 76418 2012-09-17 15:35:37Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-gtk2 pkgver=1.8.15 -pkgrel=1 +pkgrel=2 pkgdesc="A configurable set of widget styles for KDE and Gtk" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde-look.org/content/show.php?content=40492" @@ -14,13 +14,18 @@ depends=('gtk2') makedepends=('cmake') groups=('qtcurve') options=('!libtool') -source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2") -md5sums=('00054b1923f995fa55e0573730b9f3a6') +source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2" + cairo_flush_fix.patch) +md5sums=('00054b1923f995fa55e0573730b9f3a6' + '3aec00bd00af49ed42a47855ec37f670') build() { cd "${srcdir}" - mkdir build - cd build + + patch -Np1 -i ${srcdir}/cairo_flush_fix.patch -d QtCurve-Gtk2-${pkgver} + + mkdir -p build + cd build/ cmake ../QtCurve-Gtk2-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr diff --git a/community/qtcurve-gtk2/cairo_flush_fix.patch b/community/qtcurve-gtk2/cairo_flush_fix.patch new file mode 100644 index 000000000..12ed2d291 --- /dev/null +++ b/community/qtcurve-gtk2/cairo_flush_fix.patch @@ -0,0 +1,11 @@ +diff -urB QtCurve-Gtk2-1.8.15.orig/style/shadowhelper.c QtCurve-Gtk2-1.8.15/style/shadowhelper.c +--- QtCurve-Gtk2-1.8.15.orig/style/shadowhelper.c 2012-04-24 17:19:54.000000000 -0400 ++++ QtCurve-Gtk2-1.8.15/style/shadowhelper.c 2012-09-14 08:29:55.828897057 -0400 +@@ -58,6 +58,7 @@ + cairo_rectangle(cr, 0, 0, shadowSize, shadowSize); + cairo_fill(cr); + cairo_destroy(cr); ++ cairo_surface_destroy(dest); + g_object_unref(pixbuf); + return pixmap; + } diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index b73234799..7698fd62b 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73166 2012-07-02 17:42:18Z schiv $ +# $Id: PKGBUILD 77470 2012-10-10 18:38:48Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Philipp Überbacher <hollunder at gmx dot at> pkgname=qtractor -pkgver=0.5.5 +pkgver=0.5.6 pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('qt' 'jack' 'suil' 'lilv' 'libmad' makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('ec3ad0f427a9e629fb0c42d10b4c2259') +md5sums=('1483f37c6228cab8eaee3ac1c03ded6e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD index 6439f0a8c..680aa3393 100644 --- a/community/qupzilla/PKGBUILD +++ b/community/qupzilla/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 73955 2012-07-17 13:02:36Z speps $ +# $Id: PKGBUILD 76491 2012-09-19 13:21:07Z speps $ # Maintainer: speps <speps at aur dot archlinux dot org> _name=QupZilla pkgname=qupzilla -pkgver=1.3.1 -pkgrel=1 +pkgver=1.3.5 +pkgrel=2 pkgdesc="Cross-platform QtWebKit browser" arch=(i686 x86_64) url="http://www.qupzilla.com/" license=('GPL3') -depends=('qtwebkit' 'gtk-update-icon-cache') +depends=('qtwebkit') install="$pkgname.install" source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/v$pkgver") -md5sums=('7b035f028a6ff4b20310fee4b1c3264f') +md5sums=('95d19c0e22c6dbf605b760125a4b7ef3') build() { cd "$srcdir/$_name-$pkgname-"* diff --git a/community/qupzilla/qupzilla.install b/community/qupzilla/qupzilla.install index bce670aff..029294d67 100644 --- a/community/qupzilla/qupzilla.install +++ b/community/qupzilla/qupzilla.install @@ -1,5 +1,5 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null update-desktop-database -q } diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 3039561dc..86cd0c464 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68906 2012-04-05 13:36:30Z stativ $ +# $Id: PKGBUILD 77564 2012-10-12 13:28:53Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com> # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com> # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz> @@ -7,6 +7,7 @@ pkgname=rawtherapee pkgver=4.0.8 pkgrel=1 +epoch=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.rawtherapee.com/" @@ -14,7 +15,7 @@ license=('GPL3') depends=('gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('mercurial' 'cmake') install=rawtherapee.install -source=("http://rawtherapee.googlecode.com/files/rawtherapee-source-$pkgver.tar.xz") +source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz") md5sums=('27b988200c5ff3f2863e1d83200657b2') build() { diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 06528d12d..66caacb8d 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75852 2012-09-03 15:18:26Z spupykin $ +# $Id: PKGBUILD 76882 2012-10-01 15:26:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis pkgver=2.4.17 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') url="http://redis.io/" @@ -20,7 +20,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.service" "redis.logrotate") md5sums=('f921ce282fb1780cb4a5646e242dadea' - '4f2c02b481283d1336508c988e60e8d8' + '8d843919d9f165e9a47e56cadb4ac2ed' '5ab9fdb200e15c13b450fda77fa030b6' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/redis/redis.d b/community/redis/redis.d index 4babbaaa5..e1c79dd2b 100644 --- a/community/redis/redis.d +++ b/community/redis/redis.d @@ -48,6 +48,11 @@ case "$1" in exit 1 else PID=$(cat $PIDFILE) + + # And grab the server address + REDISADDR=`egrep -o '^bind ([^#]+)' $CONF | cut -d' ' -f2` + [ -n "$REDISADDR" ] && CLIEXEC="$CLIEXEC -h $REDISADDR" + $CLIEXEC -p $REDISPORT shutdown [ -d /proc/${PID} ] && sleep 1 [ -d /proc/${PID} ] && sleep 5 diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index b83e1d5c3..9881cfc15 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 75695 2012-08-29 08:23:51Z andrea $ +# $Id: PKGBUILD 78531 2012-10-20 10:07:28Z andrea $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq -pkgver=1.1 -pkgrel=1 +pkgver=1.2 +pkgrel=2 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64' 'mips64el') url='http://rekonq.kde.org/' license=('GPL') depends=('kdebase-keditbookmarks' 'qoauth') makedepends=('cmake' 'automoc4') +optdepends=('qca-ossl: to use the sync handler') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('3ee3f965b47d790ceacac444fc83f4e4') +md5sums=('97d025df580813013643b8c51675a75d') build(){ - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -27,6 +27,6 @@ build(){ } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/community/reptyr/PKGBUILD b/community/reptyr/PKGBUILD new file mode 100644 index 000000000..0fe64d389 --- /dev/null +++ b/community/reptyr/PKGBUILD @@ -0,0 +1,25 @@ +$Id: PKGBUILD 76717 2012-09-27 16:24:59Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> + +pkgname=reptyr +pkgver=0.4 +pkgrel=2 +pkgdesc="A tool for \"re-ptying\" programs" +arch=('i686' 'x86_64') +license=('BSD') +url="https://github.com/nelhage/reptyr" +depends=('glibc') +source=("$pkgname-$pkgver.tar.gz::https://github.com/nelhage/$pkgname/tarball/$pkgname-$pkgver") +md5sums=('4846a0b22c267a154853ce1409e823da') + +build() { + cd "$srcdir"/nelhage-$pkgname-* + + make +} + +package() { + cd "$srcdir"/nelhage-$pkgname-* + + make "DESTDIR=$pkgdir" "PREFIX=/usr" install +} diff --git a/community/ristretto/PKGBUILD b/community/ristretto/PKGBUILD index 249fe361a..891dc948b 100644 --- a/community/ristretto/PKGBUILD +++ b/community/ristretto/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 75057 2012-08-13 06:21:47Z bpiotrowski $ +# $Id: PKGBUILD 78443 2012-10-18 17:04:59Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ristretto pkgver=0.6.3 -pkgrel=1 -pkgdesc="A fast and lightweight picture-viewer for Xfce" +pkgrel=3 +pkgdesc='A fast and lightweight picture-viewer for Xfce' arch=('i686' 'x86_64' 'mips64el') -url="http://goodies.xfce.org/projects/applications/ristretto" +url='http://goodies.xfce.org/projects/applications/ristretto' license=('GPL') depends=('libxfce4ui' 'libexif' 'desktop-file-utils') makedepends=('intltool') +optdepends=('librsvg: SVG support' + 'tumbler: thumbnailing support') groups=('xfce4-goodies') install=ristretto.install -source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2") +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) md5sums=('6b8c9a5d7ed319e4c84a9fefaa18792c') build() { - cd "${srcdir}/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -27,6 +29,6 @@ build() { } package() { - cd "${srcdir}/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/rng-tools/PKGBUILD b/community/rng-tools/PKGBUILD new file mode 100644 index 000000000..8e886488a --- /dev/null +++ b/community/rng-tools/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Alasdair Haswell <ali at arhaswell dot co dot uk> + +pkgname=rng-tools +pkgver=4 +pkgrel=1 +pkgdesc="Random number generator related utilities" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/gkernel/" +license=('GPL') +backup=(etc/conf.d/rngd) +source=(http://downloads.sourceforge.net/sourceforge/gkernel/$pkgname-$pkgver.tar.gz + rngd + rngd.conf + rngd.service) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm0644 "$srcdir/rngd.service" "$pkgdir/usr/lib/systemd/system/rngd.service" + install -Dm0755 "$srcdir/rngd" "$pkgdir/etc/rc.d/rngd" + install -Dm0644 "$srcdir/rngd.conf" "$pkgdir/etc/conf.d/rngd" +} + +sha256sums=('b71bdfd4222c05e8316001556be90e1606f2a1bac3efde60153bd84e873cc195' + '45084eff83306c74e707a72b44b5b20d8b94777377af414e1c43f738c7a720ed' + 'a4a19dbe5403b9dcb2bc6b3699dcaba7a47ff3e3ccf58aa3bdbfe14eb1d16003' + 'abf163089fc466e45955fd0da98a20a966b3b0b4c714c27b470d03fedfc04ca3') diff --git a/community/rng-tools/rngd b/community/rng-tools/rngd new file mode 100755 index 000000000..bd6b8d62f --- /dev/null +++ b/community/rng-tools/rngd @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +rnd_device=/dev/random +rng_device=/dev/hw_random +timeout=0 + +[ -f /etc/conf.d/rngd ] && . /etc/conf.d/rngd +PID=$(pidof -o %PPID /usr/sbin/rngd) +case "$1" in + start) + stat_busy "Starting RNG" + [ -z "$PID" ] && /usr/sbin/rngd $RNGD_OPTS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon rngd + stat_done + fi + ;; + stop) + stat_busy "Stopping RNG" + [ ! -z "$PID" ] && kill -s SIGALRM $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon rngd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/rng-tools/rngd.conf b/community/rng-tools/rngd.conf new file mode 100644 index 000000000..8ff9a639e --- /dev/null +++ b/community/rng-tools/rngd.conf @@ -0,0 +1 @@ +RNGD_OPTS="-o /dev/random -r /dev/urandom" diff --git a/community/rng-tools/rngd.service b/community/rng-tools/rngd.service new file mode 100644 index 000000000..87185bc32 --- /dev/null +++ b/community/rng-tools/rngd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Hardware RNG Entropy Gatherer Daemon + +[Service] +EnvironmentFile=/etc/conf.d/rngd +ExecStart=/usr/sbin/rngd -f $RNGD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index 57248ced1..551a9ad89 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 74624 2012-07-31 19:56:44Z ebelanger $ +# $Id: PKGBUILD 77864 2012-10-15 10:12:56Z spupykin $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=9 +pkgrel=11 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64' 'mips64el') url="http://rss-glx.sourceforge.net/" license=('GPL') -depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick') +depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick' 'glu') +makedepends=('mesa') optdepends=('xscreensaver: xscreensaver integration') install=rss-glx.install options=('!libtool') diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 534176837..49830d433 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75616 2012-08-27 14:38:49Z spupykin $ +# $Id: PKGBUILD 77498 2012-10-11 11:39:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=6.4.0 -pkgrel=1 +pkgver=6.4.2 +pkgrel=2 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') @@ -22,10 +22,10 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('d81f74b09829a38ac91cf85a08c5ab19' +md5sums=('7de0124ec7d67ce2bfda0009ab1263ee' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' - '1a0cd4530dd5d1439456d5ae230574d9') + '18565f38a4445136446a31a3c95ffc3e') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/rsyslog/rsyslog.conf.d b/community/rsyslog/rsyslog.conf.d index e39f8c3b9..fc0770666 100644 --- a/community/rsyslog/rsyslog.conf.d +++ b/community/rsyslog/rsyslog.conf.d @@ -3,4 +3,4 @@ # This should almost certainly include at least the current compatability # level, e.g. -c4 # -RSYSLOGD_ARGS="-c4" +RSYSLOGD_ARGS="-c6" diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD index 605259077..e22f6e594 100644 --- a/community/rygel/PKGBUILD +++ b/community/rygel/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 75414 2012-08-22 16:11:51Z bgyorgy $ +# $Id: PKGBUILD 77776 2012-10-14 17:40:17Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.14.3 -pkgrel=2 +pkgver=0.16.1 +pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Rygel" license=('LGPL') -depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'hicolor-icon-theme' 'xdg-utils') +depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'libunistring' 'libtracker-sparql' 'hicolor-icon-theme' 'xdg-utils') makedepends=('vala' 'intltool') optdepends=('gstreamer0.10-good-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' @@ -19,7 +19,7 @@ backup=('etc/rygel.conf') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e615d4fea616ecaedfaba57e70a455ac8339048490a423af66a70d05c7186ace') +sha256sums=('c8ffc0492c60b1c66f13f3f72cbee622307225d7e4cb20b43e299601463cd28d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index e520c5f69..8a18e68ee 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75207 2012-08-16 01:57:26Z allan $ +# $Id: PKGBUILD 76484 2012-09-19 03:50:08Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,8 +7,8 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=5.2 -pkgrel=2 +pkgver=5.3 +pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' arch=('i686' 'x86_64') @@ -40,8 +40,7 @@ build() { export MAKE="make -j${SAGE_BUILD_THREADS}" # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran - export SAGE_FORTRAN='/usr/bin/gfortran' - export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so' + export FC=/usr/bin/gfortran # disable building with debugging support export SAGE_DEBUG='no' @@ -96,5 +95,5 @@ package() { } # vim :set ts=2 sw=2 et: -md5sums=('59f55ec8cdd1ca595c56cc72620b3576' +md5sums=('0de76f570c405ecfaa46839803978542' 'dc391f12b7d17dd37326343ec0e99bbd') diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index f551664d2..980e52cdc 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74068 2012-07-19 10:19:10Z arodseth $ +# $Id: PKGBUILD 76433 2012-09-18 08:42:53Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('f95c89074fd73a22b783b5582d3b23cdbd4b7eb38ab407721a702c4a1bcb678c') +sha256sums=('9f17fe2a5dc294bd1077bf64f713bb06733eec271bab770841e55474e6c781c8') build() { cd "$srcdir" diff --git a/community/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD index 49f026c81..eafb7c22f 100644 --- a/community/scorched3d/PKGBUILD +++ b/community/scorched3d/PKGBUILD @@ -5,31 +5,29 @@ pkgname=scorched3d pkgver=43.3.d _pkgver=43.3d -pkgrel=1 -pkgdesc="A 3d artillery combat game" +pkgrel=4 +pkgdesc="3D artillery combat game" arch=('i686' 'x86_64' 'mips64el') url="http://www.scorched3d.co.uk/" license=('GPL') -depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'mesa' 'fftw' 'libjpeg>=8' 'xdg-utils') -makedepends=('sharutils') +depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils') +makedepends=('gendesk' 'mesa') install=scorched3d.install source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz" - 'scorched3d.desktop' - 'scorched3d.png.uu' + 'scorched3d.png::http://cdn.portableapps.com/Scorched3DPortable_128.png' 'scorched3d-42.1-gcc43.patch' 'scorched3d-42.1-fixups.patch' 'scorched3d-libpng1.5.patch' 'libpng14.patch') md5sums=('9c3043282a9e7451468ff325bef3b04c' - 'b951f2150004e10fdff3e6226f1a3939' - '178a281333006c6a5a92919865c1d7af' + '0f7e570f586c227873e909ebbc17c84d' '053769f77a38c252eef1d967b18e93e6' 'dfde556559d95bca07c4a390c60790b4' 'ec6958191751b5a2c44aa15abfc75269' 'c8c03855fd3693122fd39427fa3638c1') build() { - cd scorched + cd "$srcdir/scorched" # patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch # patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch @@ -43,6 +41,7 @@ build() { --disable-openaltest \ --with-wx-config=wx-config + sed -i '1 i #include <unistd.h>' src/client/client/SecureID.cpp #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1 #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1 @@ -50,14 +49,14 @@ build() { } package() { - cd scorched + cd "$srcdir" + gendesk + cd scorched make DESTDIR=${pkgdir} install - - cd ${srcdir} - - uudecode --output-file=scorched3d.png scorched3d.png.uu + cd .. - install -D -m644 scorched3d.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png - install -D -m644 scorched3d.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -D -m644 scorched3d.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/$pkgname.png" + install -D -m644 scorched3d.png "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -D -m644 scorched3d.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" } diff --git a/community/scratch/PKGBUILD b/community/scratch/PKGBUILD new file mode 100644 index 000000000..508442874 --- /dev/null +++ b/community/scratch/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 77468 2012-10-10 18:12:07Z jsteel $ +# Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contributor: Muhammed Uluyol <muhammedu@gmail.com> + +pkgname=scratch +pkgver=1.4.0.7 +pkgrel=2 +pkgdesc="Create and share your own interactive stories, games, music and art" +arch=('i686' 'x86_64') +url="http://scratch.mit.edu" +license=('GPL2') +install=$pkgname.install +depends=('squeak-vm' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'pango' + 'gtk-update-icon-cache') +source=(http://download.scratch.mit.edu/$pkgname-$pkgver.src.tar.gz) +md5sums=('f948e9e6de3ec9c7c7b4cc2a1975eb5a') + +build() { + cd "$srcdir"/$pkgname-$pkgver.src + + sed -i 's/-vm-sound-pulse/-vm-sound-ALSA/' src/$pkgname + + make build +} + +package() { + cd "$srcdir"/$pkgname-$pkgver.src + + install -Dm755 src/$pkgname "$pkgdir"/usr/bin/$pkgname + install -Dm644 Scratch.image "$pkgdir"/usr/lib/$pkgname/Scratch.image + install -m644 Scratch.ini "$pkgdir"/usr/lib/$pkgname/Scratch.ini + install -Dm644 src/$pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop + install -Dm644 src/man/$pkgname.1.gz "$pkgdir"/usr/share/man/man1/$pkgname.1.gz + install -Dm644 src/$pkgname.xml "$pkgdir"/usr/share/mime/packages/$pkgname.xml + install -dm755 "$pkgdir"/usr/share/{$pkgname,icons/hicolor} + + cp -rp Help locale Media Projects README "$pkgdir"/usr/share/$pkgname/ + cp -rp src/icons/* "$pkgdir"/usr/share/icons/hicolor/ + cp -rp Plugins "$pkgdir"/usr/lib/$pkgname/ +} diff --git a/community/scratch/scratch.install b/community/scratch/scratch.install new file mode 100644 index 000000000..7fe49829c --- /dev/null +++ b/community/scratch/scratch.install @@ -0,0 +1,9 @@ +post_install() { + update-desktop-database + update-mime-database /usr/share/mime + gtk-update-icon-cache -qf /usr/share/icons/hicolor +} + +post_remove() { + post_install +} diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD new file mode 100644 index 000000000..7ac13cb3a --- /dev/null +++ b/community/scummvm/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 160945 2012-06-07 12:04:14Z juergen $ +# Maintainer: juergen <juergen@archlinux.org> +# Contributor: Manolis Tzanidakis, Petter Gundersen + +pkgname=scummvm +pkgver=1.5.0 +pkgrel=1 +pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games." +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.scummvm.org/" +depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('d71d1df5c8262556fedbe885972fbf6e') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + ./configure --disable-debug \ + --enable-release \ + --prefix=/usr + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm644 dists/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop +} diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD index 5eac9b6df..8b43b2ade 100644 --- a/community/sdcc/PKGBUILD +++ b/community/sdcc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74603 2012-07-31 12:45:11Z spupykin $ +# $Id: PKGBUILD 78263 2012-10-17 10:27:37Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jose Negron <josenj.arch@mailnull.net> pkgname=sdcc pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -29,4 +29,6 @@ build() { mv $pkgdir/usr/lib/lib/* $pkgdir/usr/lib/sdcc/ rm -rf $pkgdir/usr/lib/lib fi + + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' $pkgdir/usr/bin/as2gbmap } diff --git a/community/seahorse-nautilus/PKGBUILD b/community/seahorse-nautilus/PKGBUILD index dae741987..efe700478 100644 --- a/community/seahorse-nautilus/PKGBUILD +++ b/community/seahorse-nautilus/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 69331 2012-04-14 01:17:42Z bgyorgy $ +# $Id: PKGBUILD 77770 2012-10-14 16:18:22Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=seahorse-nautilus -pkgver=3.4.0 +pkgver=3.6.0 pkgrel=1 pkgdesc="PGP encryption and signing for nautilus" arch=('i686' 'x86_64' 'mips64el') url="http://git.gnome.org/browse/seahorse-nautilus/" license=('GPL') -depends=('gconf' 'libcryptui' 'nautilus') +depends=('libcryptui' 'gcr' 'nautilus') makedepends=('intltool') replaces=('seahorse-plugins') options=('!libtool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4724438b8c09d5c25c30a304cbc398950d5a2fdd1e2ef3f6389ffbf18ac01480') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + fix-schema.patch) +sha256sums=('edae97cf7bab38ed928e25a7805913977f892ec9b9120783d874cda07912519d' + '3c5a3fe557fc56d5d5cda12d4b4909f513260da9b439d8bbaca2bf42b4fd114c') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix-schema.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static + --disable-static --disable-schemas-compile make } diff --git a/community/seahorse-nautilus/fix-schema.patch b/community/seahorse-nautilus/fix-schema.patch new file mode 100644 index 000000000..cd68e7a7f --- /dev/null +++ b/community/seahorse-nautilus/fix-schema.patch @@ -0,0 +1,20 @@ +From 8f48809c0fb6633bb45eac2144c1125f79933053 Mon Sep 17 00:00:00 2001 +From: Stef Walter <stefw@gnome.org> +Date: Mon, 01 Oct 2012 08:15:13 +0000 +Subject: Fix the schema identifier for GSettings window settings + +https://bugzilla.gnome.org/show_bug.cgi?id=685124 +--- +diff --git a/data/org.gnome.seahorse.nautilus.window.gschema.xml b/data/org.gnome.seahorse.nautilus.window.gschema.xml +index 9263a25..89f49f1 100644 +--- a/data/org.gnome.seahorse.nautilus.window.gschema.xml ++++ b/data/org.gnome.seahorse.nautilus.window.gschema.xml +@@ -1,5 +1,5 @@ + <schemalist> +- <schema id="org.gnome.seahorse.window"> ++ <schema id="org.gnome.seahorse.nautilus.window"> + <key name="width" type="i"> + <default>-1</default> + <summary>Width of the window</summary> +-- +cgit v0.9.0.2 diff --git a/community/seahorse-nautilus/seahorse-nautilus.install b/community/seahorse-nautilus/seahorse-nautilus.install index 2eaa60550..21f12fbda 100644 --- a/community/seahorse-nautilus/seahorse-nautilus.install +++ b/community/seahorse-nautilus/seahorse-nautilus.install @@ -1,4 +1,5 @@ post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q } diff --git a/community/ser2net/PKGBUILD b/community/ser2net/PKGBUILD index 88a056cb7..b01a9324a 100644 --- a/community/ser2net/PKGBUILD +++ b/community/ser2net/PKGBUILD @@ -1,26 +1,33 @@ -# $Id: PKGBUILD 65435 2012-02-21 05:45:30Z spupykin $ +# $Id: PKGBUILD 77110 2012-10-05 10:16:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=ser2net -pkgver=2.7 -pkgrel=2 +pkgver=2.8rc3 +pkgrel=1 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/ser2net" license=('GPL') depends=('glibc') backup=(etc/ser2net.conf) -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - ser2net.init) -md5sums=('22977477789868923a5de09a85e847dd' - '6db420d54ce8f78464e885efe935dd18') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz + ser2net.init + ser2net.service) +md5sums=('bbe95fb557781c314d321356897a50b9' + '6db420d54ce8f78464e885efe935dd18' + '7f9d879325b9ed6ddc313dcbc3f83e56') build() { - cd $srcdir/${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver/rc/-rc} ./configure --prefix=/usr make +} + +package() { + cd $srcdir/${pkgname}-${pkgver/rc/-rc} make DESTDIR=$pkgdir install - install -D -m 0644 ser2net.conf $pkgdir/etc/ser2net.conf - install -D -m 0755 ../ser2net.init $pkgdir/etc/rc.d/ser2net + install -Dm0644 ser2net.conf $pkgdir/etc/ser2net.conf + install -Dm0755 $srcdir/ser2net.init $pkgdir/etc/rc.d/ser2net + install -Dm0644 $srcdir/ser2net.service $pkgdir/usr/lib/systemd/system/ser2net.service } diff --git a/community/ser2net/ser2net.service b/community/ser2net/ser2net.service new file mode 100644 index 000000000..fcf054e22 --- /dev/null +++ b/community/ser2net/ser2net.service @@ -0,0 +1,11 @@ +[Unit] +Description=Proxy that allows tcp connections to serial ports +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/ser2net + +[Install] +WantedBy=multi-user.target + diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD index f59367fc8..cc1e707b5 100644 --- a/community/sfk/PKGBUILD +++ b/community/sfk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67087 2012-03-03 17:34:42Z seblu $ +# $Id: PKGBUILD 77369 2012-10-09 06:40:23Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Baumi <baumi@gmx.com> pkgname=sfk -pkgver=1.6.5 +pkgver=1.6.6 pkgrel=1 pkgdesc='Swiss File Knife - A Command Line Tools Collection' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url='http://stahlforce.com/dev/?tool=sfk' license=('custom: BSD') depends=('gcc-libs') source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip") -md5sums=('8694d73033dde496c023258f08daa918') +md5sums=('d32f487d783356eb15e23f5e26bf7ac7') build() { cd ${pkgname}${pkgver//./} diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD index dad5ac508..849cb918d 100644 --- a/community/shapelib/PKGBUILD +++ b/community/shapelib/PKGBUILD @@ -26,7 +26,7 @@ package() { cd ${pkgname}-${pkgver} sed -i -e s:/usr/local:${pkgdir}/usr: Makefile - sed -i -e s:/usr/bin/install:/bin/install: Makefile + #sed -i -e s:/usr/bin/install:/bin/install: Makefile make lib_install install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD index 604d62754..4e84fe2d1 100644 --- a/community/sk1/PKGBUILD +++ b/community/sk1/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 65443 2012-02-21 05:48:36Z spupykin $ +# $Id: PKGBUILD 78374 2012-10-17 15:45:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ConnorBehan <connor.behan@gmail.com> pkgname=sk1 pkgver=0.9.1 -pkgrel=7 +pkgrel=8 pkgdesc="Fork of skencil with improved CMYK support" arch=(i686 x86_64 'mips64el') url="http://sk1project.org/modules.php?name=Products&product=sk1" -depends=('tcl>=7.6' 'tk>=4.2' 'python-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') +depends=('tcl>=7.6' 'tk>=4.2' 'python2-lcms' 'pil>=1.0' 'pyxml' 'zenity' 'sk1libs') license=('GPL' 'LGPL') source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz sk1.desktop diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD index 0177981fb..8c11194a9 100644 --- a/community/smbnetfs/PKGBUILD +++ b/community/smbnetfs/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 65451 2012-02-21 05:52:02Z spupykin $ +# $Id: PKGBUILD 76408 2012-09-17 10:51:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=smbnetfs pkgver=0.5.3a -pkgrel=4 +pkgrel=5 pkgdesc="small C program that mounts Microsoft network neighborhood in single directory." arch=('i686' 'x86_64' 'mips64el') url="http://smbnetfs.sourceforge.net/" license=('GPL') depends=('fuse' 'smbclient') -backup=(etc/smbnetfs/.smb/smb.conf \ - etc/smbnetfs/.smb/smbnetfs.conf \ - etc/smbnetfs/.smb/smbnetfs.auth \ - etc/smbnetfs/.smb/smbnetfs.host) +backup=('etc/smbnetfs/.smb/smb.conf' + 'etc/smbnetfs/.smb/smbnetfs.conf' + 'etc/smbnetfs/.smb/smbnetfs.auth' + 'etc/smbnetfs/.smb/smbnetfs.host') install=smbnetfs.install options=(docs) -source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2 \ - rc-smbnetfs \ - conf-smbnetfs) +source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2 + rc-smbnetfs + conf-smbnetfs + smbnetfs.service) md5sums=('66d1477ca981f5a07b4b21c6bdbdc442' 'b6cff0ee75cafd739ad44216236b5e28' - 'e150c4cd894cc6ade11b94c95cf17ec4') + 'e150c4cd894cc6ade11b94c95cf17ec4' + '0fdd0dbaa5f16b1ecd00ec1ddcdfc223') build() { cd $srcdir/$pkgname-$pkgver @@ -33,10 +35,10 @@ build() { mv $pkgdir/usr/share/doc/smbnetfs* $pkgdir/usr/share/doc/smbnetfs mkdir -p $pkgdir/etc/smbnetfs/.smb - install -D -m 0644 $srcdir/$pkgname-$pkgver/conf/* $pkgdir/etc/smbnetfs/.smb/ -# install -D -m 0644 $srcdir/$pkgname-$pkgver/doc/INSTALL $pkgdir/usr/share/doc/smbnetfs/INSTALL - install -D -m 0644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/smbnetfs/README - install -D -m 0755 $srcdir/rc-smbnetfs $pkgdir/etc/rc.d/smbnetfs - install -D -m 0644 $srcdir/conf-smbnetfs $pkgdir/etc/conf.d/smbnetfs + install -m0644 $srcdir/$pkgname-$pkgver/conf/* $pkgdir/etc/smbnetfs/.smb/ + install -Dm0644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/smbnetfs/README + install -Dm0755 $srcdir/rc-smbnetfs $pkgdir/etc/rc.d/smbnetfs + install -Dm0644 $srcdir/conf-smbnetfs $pkgdir/etc/conf.d/smbnetfs + install -Dm0644 $srcdir/smbnetfs.service $pkgdir/usr/lib/systemd/system/smbnetfs.service touch $pkgdir/etc/smbnetfs/.smb/smb.conf } diff --git a/community/smbnetfs/smbnetfs.service b/community/smbnetfs/smbnetfs.service new file mode 100644 index 000000000..cf3cd0f58 --- /dev/null +++ b/community/smbnetfs/smbnetfs.service @@ -0,0 +1,13 @@ +[Unit] +Description=Mount Samba Shares +After=network.target + +[Service] +Environment=HOME=/etc/smbnetfs SMBNETFS_MOUNT_POINT=/mnt/smbnet +EnvironmentFile=/etc/conf.d/smbnetfs +User=nobody +ExecStart=/usr/bin/smbnetfs -f -o allow_other $SMBNETFS_MOUNT_POINT +ExecStop=/bin/fusermount -u $SMBNETFS_MOUNT_POINT + +[Install] +WantedBy=multi-user.target diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD index 4ed1af907..e7aeb49ad 100644 --- a/community/smc/PKGBUILD +++ b/community/smc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74010 2012-07-18 01:09:00Z ibiru $ +# $Id: PKGBUILD 77661 2012-10-13 11:45:22Z allan $ # Maintainer: # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=smc pkgver=1.9 -pkgrel=16 +pkgrel=17.1 pkgdesc="Secret Maryo Chronicles" arch=('i686' 'x86_64' 'mips64el') url="http://www.secretmaryo.org/" diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD index a87cc4df0..38bb767a8 100644 --- a/community/spacefm/PKGBUILD +++ b/community/spacefm/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 75235 2012-08-16 20:04:22Z bpiotrowski $ +# $Id: PKGBUILD 76236 2012-09-14 19:21:38Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> pkgname=spacefm -pkgver=0.7.11 +pkgver=0.8.0 pkgrel=1 -pkgdesc="A multi-panel tabbed file manager" -arch=('i686' 'x86_64') -url="http://ignorantguru.github.com/spacefm/" +pkgdesc='A multi-panel tabbed file manager' +arch=('i686' 'x86_64' 'mips64el') +url='http://ignorantguru.github.com/spacefm/' license=('GPL2') install=$pkgname.install depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'udev') @@ -22,7 +22,7 @@ optdepends=('lsof: device processes' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz) -md5sums=('99719d34fd60ad9514c10a25f52d0bb3') +md5sums=('e9fe71ecd1f2ac07f4cbda2036279a99') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index c076f9576..26806e3cd 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75813 2012-08-31 23:33:23Z svenstaro $ +# $Id: PKGBUILD 77576 2012-10-12 19:50:28Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> @@ -6,7 +6,7 @@ pkgname=spring pkgver=0.91.0 _pkgver=91.0 -pkgrel=1 +pkgrel=2 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" diff --git a/community/squeak-vm/PKGBUILD b/community/squeak-vm/PKGBUILD new file mode 100644 index 000000000..58fba3e21 --- /dev/null +++ b/community/squeak-vm/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 76322 2012-09-15 22:08:09Z jsteel $ +# Maintainer: Jonathan Steel <mail at jsteel dot org> +# Contributor: Piero Sartini <piero@sartini.de> +# Contributor: Cilyan Olowen <gaknar@gmail.com> +# Contributor: knut +# Contributor: kxmd + +pkgname=squeak-vm +pkgver=4.10.2.2602 +pkgrel=1 +pkgdesc="A full-featured implementation of the Smalltalk programming language + and environment" +arch=('i686' 'x86_64') +url="http://squeakvm.org" +license=('custom:MIT' 'APACHE') +conflicts=('squeak') +provides=('squeak') +depends=('alsa-lib' 'dbus-core' 'libxrender' 'libgl' 'util-linux') +makedepends=('cmake' 'mesa') +optdepends=('speex: for ogg plugin' 'gstreamer0.10: for gstreamer plugin' + 'libpulse: for pulse plugin' 'squeak-image: for the full Squeak + environment') +source=(http://squeakvm.org/unix/release/Squeak-$pkgver-src.tar.gz) +md5sums=('23b48480581c5a1c1bccf12e93611faf') + +build() { + cd "$srcdir"/Squeak-$pkgver-src/ + + ./unix/cmake/configure --prefix=/usr --without-quartz --with-x \ + --enable-mpg-mmx + + make +} + +package() { + cd "$srcdir"/Squeak-$pkgver-src + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir"/Squeak-$pkgver-src/unix/doc/LICENSE \ + "$pkgdir"/usr/share/licenses/squeak-vm/LICENSE +} diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index ab0dd4bd3..41ec998c9 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75998 2012-09-08 15:38:53Z ebelanger $ +# $Id: PKGBUILD 76846 2012-10-01 07:36:10Z mtorromeo $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=sshguard pkgver=1.5 -pkgrel=5 +pkgrel=6 pkgdesc="brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" arch=('i686' 'x86_64' 'mips64el') #url="http://sourceforge.net/projects/sshguard/" @@ -22,8 +22,8 @@ source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver. sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19' 'a810da878e40be8616a93c9984e7dbd3700367d665b78b8aa2498228bb33cb6e' '66f28e2cc81e5686f8fd5c0d5a5015d7feecbe018a259f4032cfbacf6fe8d1c3' - '299b5f73e4c53aac6007c87210fc862987042b9d4c088180721bae6ab2214b09' - '385d1dea0c6f5495a7c7e5051f1354f1eab85ee5ef599f6698ab353263b8c9bb') + '53bcf72340495bea19e15a0d80771028e933fceb08789243fef47884b7507075' + 'b1ebc5dd10374a790c7d06419694143bffa019a7c65c8a7b2541487aecec574d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl index ffb61b1cc..c919b4434 100644 --- a/community/sshguard/sshguard-journalctl +++ b/community/sshguard/sshguard-journalctl @@ -1,2 +1,2 @@ #!/bin/sh -/usr/bin/journalctl -flbp info -n0 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@" +/usr/bin/journalctl -afbp info -n0 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@" diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service index ad9f90ce2..c317d0932 100644 --- a/community/sshguard/sshguard.service +++ b/community/sshguard/sshguard.service @@ -1,6 +1,6 @@ [Unit] Description=Block hacking attempts -Wants=sshd.service +After=iptables.service [Service] EnvironmentFile=/etc/conf.d/sshguard diff --git a/community/start-stop-daemon/PKGBUILD b/community/start-stop-daemon/PKGBUILD index a884da84b..9971fdac6 100644 --- a/community/start-stop-daemon/PKGBUILD +++ b/community/start-stop-daemon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64840 2012-02-18 17:37:14Z seblu $ +# $Id: PKGBUILD 76825 2012-09-30 15:07:25Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Soup <soup a.t soultrap d.o.t n.e.t> # Contributor: Vladimir Koshelenko <koshelenko@rndavia.ru> pkgname=start-stop-daemon -pkgver=1.15.8.12 +pkgver=1.15.8.13 pkgrel=1 pkgdesc='Start and stop system daemon programs' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL2') url='http://packages.qa.debian.org/d/dpkg.html' depends=('glibc') source=("http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_$pkgver.tar.bz2") -md5sums=('0cd6f20a574d0df31298e70fc3b26173') +md5sums=('7f6ea19838311a66fdacce17991eba85') build() { cd dpkg-$pkgver @@ -27,4 +27,4 @@ package() { install -D -m 644 man/start-stop-daemon.8 "$pkgdir/usr/share/man/man8/start-stop-daemon.8" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/stk/PKGBUILD b/community/stk/PKGBUILD index 1b7a9dba8..7d857334f 100644 --- a/community/stk/PKGBUILD +++ b/community/stk/PKGBUILD @@ -1,51 +1,38 @@ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Ray Rashif <schiv@archlinux.org> +# Contributor: Mateusz Herych <heniekk@gmail.com> pkgname=stk -pkgver=4.4.2 -pkgrel=6 -pkgdesc="The Synthesis ToolKit in C++" +pkgver=4.4.4 +pkgrel=1 +pkgdesc='The Synthesis ToolKit in C++' arch=('i686' 'x86_64' 'mips64el') -url="http://ccrma.stanford.edu/software/stk/" +url='http://ccrma.stanford.edu/software/stk/' license=('MIT') depends=('gcc-libs' 'jack') makedepends=('pkg-config') -optdepends=('oss: use OSSv4 output/API' - 'tk: run provided demos/samples') -source=(http://ccrma.stanford.edu/software/stk/release/$pkgname-$pkgver.tar.gz - $pkgname.license - cxxflags.patch +optdepends=('tk: run provided demos/samples') +source=("http://ccrma.stanford.edu/software/stk/release/$pkgname-$pkgver.tar.gz" + "$pkgname.license" runtime.patch) -md5sums=('0b7bd1f913ca01fb8b2201ebcf853358' +md5sums=('66646cb1117eee2d767c4571cc51a8c3' 'a0163d75a5f516b6c93f4fc948acff73' - '1b09d29321d575ad670f6371651015c6' '36551c348340307c765fde85d4336e73') build() { cd "$srcdir/$pkgname-$pkgver" - # fails with --as-needed - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - - # optimise for our target architecture(s) - patch -Np1 -i ../cxxflags.patch - autoreconf + # add missing linker flag + export LIBS="$LIBS -lpthread" # enable shared library - sed -i \ - "s:cd src && \$(MAKE)$:& lib$pkgname.so.$pkgver:" \ - Makefile.in + sed -i 's/all : $(STATICLIB)/all : $(SHAREDLIB)/' src/Makefile.in # fix demo rawwaves path - sed -i 's:\.\./\.\.:/usr/lib/stk:' \ - projects/demo/demo.cpp + sed -i 's:\.\./\.\.:/usr/lib/stk:' projects/demo/demo.cpp # run actual build - ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ \ - --prefix=/usr \ - --with-alsa \ - --with-jack \ - --with-oss + ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ --prefix=/usr --with-alsa --with-jack make # fix executable scripts @@ -62,27 +49,18 @@ package() { # install headers install -m644 include/* "$pkgdir/usr/include/stk/" - rm "$pkgdir"/usr/include/stk/*~ # install runtime files - cp -a rawwaves projects/demo/{demo,tcl} \ - projects/effects/{effects,tcl} \ - projects/ragamatic/{ragamat,tcl,rawwaves} \ - "$pkgdir/usr/lib/stk/" + cp -a rawwaves projects/demo/{demo,tcl} projects/effects/{effects,tcl} \ + projects/ragamatic/{ragamat,tcl,rawwaves} "$pkgdir/usr/lib/stk/" # install executables - install -m755 projects/{demo/StkDemo,effects/StkEffects} \ - "$pkgdir/usr/bin/" - - install -m755 projects/ragamatic/Raga \ - "$pkgdir/usr/bin/StkRagamatic" + install -m755 projects/{demo/StkDemo,effects/StkEffects} "$pkgdir/usr/bin/" + install -m755 projects/ragamatic/Raga "$pkgdir/usr/bin/StkRagamatic" # install license - install -Dm644 ../$pkgname.license \ - "$pkgdir/usr/share/licenses/stk/LICENSE" + install -Dm644 "../$pkgname.license" "$pkgdir/usr/share/licenses/stk/LICENSE" # remove .DS_Store directory: https://bugs.archlinux.org/task/25255 - rm -rf ${pkgdir}/usr/lib/stk/rawwaves/.DS_Store + rm -rf "${pkgdir}/usr/lib/stk/rawwaves/.DS_Store" } - -# vim:set ts=2 sw=2 et: diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 8f703df80..19e9a6567 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.10.3 -pkgrel=1 +pkgver=0.11.0 +pkgrel=2 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64' 'mips64el') url='http://crawl.develz.org/' -depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'freetype2') +depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'glu' 'freetype2' 'ttf-dejavu') makedepends=('bison' 'flex' 'gendesk') conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') license=('custom') @@ -65,4 +65,4 @@ build() { } -md5sums=('ec617185bd3d5562904a401a45c65afd') +md5sums=('715d800410a7251499bf8efcc8675ca6') diff --git a/community/sylpheed/PKGBUILD b/community/sylpheed/PKGBUILD index 46feb657f..34233381c 100644 --- a/community/sylpheed/PKGBUILD +++ b/community/sylpheed/PKGBUILD @@ -7,7 +7,7 @@ pkgname=sylpheed pkgver=3.2.0 pkgrel=1 pkgdesc="Lightweight and user-friendly e-mail client" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://sylpheed.sraoss.jp/en/" license=('GPL') depends=('gpgme' 'gtkspell' 'desktop-file-utils') diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index daf196737..1552be656 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74566 2012-07-30 14:16:23Z spupykin $ +# $Id: PKGBUILD 77464 2012-10-10 16:04:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.1.1 +pkgver=10.1.2 pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64' 'mips64el') @@ -16,9 +16,11 @@ options=(zipman) backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz - sysstat) -md5sums=('8250cdcbc4a959c8a05e4186fbd13d84' - '3ce41ebf7330aba01e70b38658afed1f') + sysstat + sysstat.service) +md5sums=('c40626b96cc2b4cf303cbcf1efc96eba' + '3ce41ebf7330aba01e70b38658afed1f' + '12ba479c606620193e8b7c6e982d5088') build() { cd $srcdir/$pkgname-$pkgver @@ -37,4 +39,5 @@ package() { install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat chown -R root:root $pkgdir + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/sysstat/sysstat.service b/community/sysstat/sysstat.service new file mode 100644 index 000000000..2ff2365b3 --- /dev/null +++ b/community/sysstat/sysstat.service @@ -0,0 +1,11 @@ +[Unit] +Description= Resets System Activity Logs +After=syslog.target + +[Service] +Type=oneshot +ExecStart=/usr/lib/sa/sa1 --boot +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD index f64fd7893..481bfbd75 100644 --- a/community/task/PKGBUILD +++ b/community/task/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: coolkehon <coolkehon@gmail.com> pkgname=task -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="A command-line todo list manager" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('lua' 'util-linux') makedepends=('cmake' 'lua') optdepends=('bash-completion: for bash completion' 'python: for python export addon' 'ruby: for ruby export addon' 'perl: for perl export addon') source=(http://www.taskwarrior.org/download/$pkgname-$pkgver.tar.gz) -sha256sums=('b2a3d15093988c703ed0fc9b011c532f662fc939ea741dd8b9c996d83901b05e') +sha256sums=('cf5171b54b6d2d2dcd9c559f437cf8a2cb3836c7631edf96a16efbf8b4383e36') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/tdfsb/PKGBUILD b/community/tdfsb/PKGBUILD index 668abdad0..a3629b293 100644 --- a/community/tdfsb/PKGBUILD +++ b/community/tdfsb/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 59877 2011-12-01 15:19:47Z giovanni $ +# $Id: PKGBUILD 77663 2012-10-13 11:45:35Z allan $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=tdfsb pkgver=0.0.10 -pkgrel=5 +pkgrel=6 pkgdesc="SDL based graphical file browser" arch=('i686' 'x86_64' 'mips64el') url="http://www.determinate.net/webdata/seg/tdfsb.html" license=('GPL') -depends=('smpeg' 'freeglut' 'sdl_image' 'libxmu') +depends=('smpeg' 'freeglut' 'sdl_image' 'libxmu' 'glu') source=("http://www.determinate.net/webdata/data/${pkgname}-${pkgver}.tar.gz" 'tdfsb.desktop' 'tdfsb.png') @@ -29,7 +29,7 @@ package() { install -D -m755 tdfsb "${pkgdir}/usr/bin/tdfsb" # Install desktop file - install -D -m755 ${srcdir}/tdfsb.desktop "${pkgdir}/usr/share/applications/tdfsb.desktop" + install -D -m755 "${srcdir}/tdfsb.desktop" "${pkgdir}/usr/share/applications/tdfsb.desktop" # Install icon - install -D -m644 ${srcdir}/tdfsb.png "${pkgdir}/usr/share/pixmaps/tdfsb.png" + install -D -m644 "${srcdir}/tdfsb.png" "${pkgdir}/usr/share/pixmaps/tdfsb.png" } diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD index 97f485f7c..5fc8bcb74 100644 --- a/community/teeworlds/PKGBUILD +++ b/community/teeworlds/PKGBUILD @@ -6,37 +6,29 @@ pkgname=teeworlds pkgver=0.6.1 -_bamver=0.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="A multiplayer 2D shooter" arch=('i686' 'x86_64' 'mips64el') url="http://teeworlds.com" license=('custom') -depends=('alsa-lib' 'mesa' 'sdl' 'freetype2') -makedepends=('python2') +depends=('alsa-lib' 'glu' 'sdl' 'freetype2') +makedepends=('python2' 'bam' 'mesa') replaces=('teewars') source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz - https://github.com/downloads/matricks/bam/bam-${_bamver}.tar.bz2 teeworlds.desktop teeworlds.png) md5sums=('00de7195ecd1f23596dc3237341af512' - 'f8b62ad553c3615a725a034df4fb4257' '3944aaf7a8c19a83510b2b39c4cddf5f' '44f39e398409232a0e0a431ed46d8cc8') build() { - # Build bam (used to build teeworlds) - # Now it is released separately I should make a separate package... - cd ${srcdir}/bam-${_bamver} - ./make_unix.sh - # Build teeworlds cd ${srcdir}/${pkgname}-*-source # Use Python 2 sed -i 's/python /python2 /' bam.lua - ../bam-${_bamver}/bam server_release client_release + bam server_release client_release } package() { diff --git a/community/tig/PKGBUILD b/community/tig/PKGBUILD index 3dda790b9..b9bccd3ea 100644 --- a/community/tig/PKGBUILD +++ b/community/tig/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Nathan Jones <nathanj@insightbb.com> pkgname=tig -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc='Text-mode interface for Git.' depends=('git' 'ncurses') @@ -12,7 +12,7 @@ url='http://jonas.nitro.dk/tig/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('a2d414d1cebbc9cd4f3d545bc6f225c6') +md5sums=('adeb797a8320962eeb345a615257cbac') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/tix/PKGBUILD b/community/tix/PKGBUILD index c5aa22b3b..a8696e4e8 100644 --- a/community/tix/PKGBUILD +++ b/community/tix/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 65401 2012-02-21 03:26:02Z spupykin $ +# $Id: PKGBUILD 78264 2012-10-17 10:27:42Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brice Méalier <mealier_brice@yahoo.fr> pkgname=tix pkgver=8.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="Tk Interface eXtension, a powerful set of user interface components" arch=(i686 'x86_64' 'mips64el') url="http://tix.sourceforge.net/" license=("BSD") -depends=('tk' 'python' 'libx11') +depends=('tk' 'libx11') source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz tcl-tk-path.patch) md5sums=('2b8bf4b10a852264678182652f477e59' diff --git a/community/tmux/PKGBUILD b/community/tmux/PKGBUILD index c904ed536..69792e433 100644 --- a/community/tmux/PKGBUILD +++ b/community/tmux/PKGBUILD @@ -1,35 +1,36 @@ -# $Id: PKGBUILD 69194 2012-04-10 02:24:04Z spupykin $ +# $Id: PKGBUILD 77704 2012-10-13 15:48:59Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> pkgname=tmux -pkgver=1.6 -pkgrel=2 -pkgdesc="A terminal multiplexer" -url="http://tmux.sourceforge.net/" +pkgver=1.7 +pkgrel=1 +pkgdesc='A terminal multiplexer' +url='http://tmux.sourceforge.net/' arch=('i686' 'x86_64' 'mips64el') license=('BSD') depends=('ncurses' 'libevent') source=(http://downloads.sourceforge.net/tmux/tmux-$pkgver.tar.gz - LICENSE) -md5sums=('3e37db24aa596bf108a0442a81c845b3' + LICENSE) +md5sums=('2c48fb9beb22eedba7a5de3b78dd0c03' '71601bc37fa44e4395580b321963018e') build() { - cd "$srcdir/tmux-$pkgver" - ./configure --prefix=/usr - make + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make } package() { - cd "$srcdir/tmux-$pkgver" - make install DESTDIR=$pkgdir - install -Dm644 examples/tmux.vim "$pkgdir/usr/share/vim/vimfiles/syntax/tmux.vim" - install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE" - install -dm755 "$pkgdir/usr/share/tmux/" - install -m644 examples/* "$pkgdir/usr/share/tmux/" -# mv $pkgdir/usr/man $pkgdir/usr/share/ - mkdir -p $pkgdir/usr/share/bash-completion/completions/ - mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh $pkgdir/usr/share/bash-completion/completions/tmux + cd "$srcdir/$pkgname-$pkgver" + make install DESTDIR=$pkgdir + install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/tmux/LICENSE" + + install -dm755 "$pkgdir/usr/share/tmux/" + install -m644 examples/* "$pkgdir/usr/share/tmux/" + install -Dm644 examples/tmux.vim "$pkgdir/usr/share/vim/vimfiles/syntax/tmux.vim" + + install -d $pkgdir/usr/share/bash-completion/completions/ + mv $pkgdir/usr/share/tmux/bash_completion_tmux.sh $pkgdir/usr/share/bash-completion/completions/tmux } diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index 13bcb41da..1d2be2c85 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75652 2012-08-28 09:58:29Z lfleischer $ +# $Id: PKGBUILD 76252 2012-09-15 09:03:52Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.38 +pkgver=0.2.2.39 pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') @@ -21,8 +21,8 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'tor' 'tor.conf.d' 'tor.service') -md5sums=('91a9dd2c9d7fbd946bda5a13edbe5667' - '3486e60baeebe27d5702dbd38fa39c9d' +md5sums=('9157a1f02fcda9d7d2c5744176373abd' + '7944de0693fccf65fe0e3ea6712887b6' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa' diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index 209c125d2..5e418bb35 100644 --- a/community/torcs/PKGBUILD +++ b/community/torcs/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 64985 2012-02-19 11:26:28Z spupykin $ +# $Id: PKGBUILD 77665 2012-10-13 11:45:51Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> pkgname=torcs pkgver=1.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="A 3D racing cars simulator using OpenGL" url="http://torcs.sourceforge.net" license=("GPL") arch=('i686' 'x86_64' 'mips64el') -depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis') +depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis' 'glu') makedepends=('plib') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD index 6816bc347..51e54fff1 100644 --- a/community/ubuntuone-client-gnome/PKGBUILD +++ b/community/ubuntuone-client-gnome/PKGBUILD @@ -1,33 +1,23 @@ -# $Id: PKGBUILD 72615 2012-06-17 13:54:12Z bgyorgy $ +# $Id: PKGBUILD 77831 2012-10-15 01:46:26Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=ubuntuone-client-gnome -pkgver=3.0.2 +pkgver=4.0.0 pkgrel=1 pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client-gnome" license=('GPL') -depends=('nautilus' 'evolution-data-server' 'ubuntuone-client') +depends=('nautilus' 'gconf' 'ubuntuone-client') makedepends=('intltool' 'gnome-settings-daemon') optdepends=('gnome-settings-daemon: shows a warning when Ubuntu One runs out of space') options=('!libtool') install=$pkgname.install -source=(http://launchpad.net/ubuntuone-client-gnome/stable-3-0/$pkgver/+download/$pkgname-$pkgver.tar.gz - http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20120513.tar.gz - fix-build.patch) -md5sums=('59a871d767e832b37e95e1aca2ee4374' - 'cabbf043f9be0ea8df4c9a4b020cd2c3' - '8d34fed775be23d1743dda079a293b78') +source=(http://launchpad.net/ubuntuone-client-gnome/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('26e9e391cabe1047eeb203d99ee2d9c6') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix-build.patch" - - # Install language files - echo 'am ar ast az be bg bn bs ca ca@valencia cs da de el en_AU en_GB eo es et eu fi fo fr gd gl gu he hi hr hu id it ja kk km ko ku lt lv ms my nb nl nn oc pa pl pt pt_BR ro ru shn si sk sl sq sr sv ta te th tr ug uk vi zh_CN zh_HK zh_TW' >po/LINGUAS - rename $pkgname- '' ../po/$pkgname-*.po - mv -f -t po ../po/* ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile diff --git a/community/ubuntuone-client/1339_1338.diff b/community/ubuntuone-client/1339_1338.diff new file mode 100644 index 000000000..cbd966a70 --- /dev/null +++ b/community/ubuntuone-client/1339_1338.diff @@ -0,0 +1,57 @@ +=== modified file 'tests/platform/sync_menu/test_linux.py' +--- tests/platform/sync_menu/test_linux.py 2012-10-10 14:54:49 +0000 ++++ tests/platform/sync_menu/test_linux.py 2012-10-11 12:01:27 +0000 +@@ -124,6 +124,7 @@ + """Check that the dummy has the proper methods required by the API.""" + dummy = linux.DummySyncMenu('random', 'args') + self.assertIsInstance(dummy.update_transfers, Callable) ++ self.assertIsInstance(dummy.sync_status_changed, Callable) + + + class SyncMenuTestCase(TestCase): + +=== modified file 'ubuntuone/platform/sync_menu/linux.py' +--- ubuntuone/platform/sync_menu/linux.py 2012-10-10 17:06:14 +0000 ++++ ubuntuone/platform/sync_menu/linux.py 2012-10-11 13:00:10 +0000 +@@ -183,7 +183,7 @@ + self.timer.addCallback(self._timeout) + + +-class TransfersMenu(Dbusmenu.Menuitem): ++class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object): + """Menu that handles the recent and current transfers.""" + + def __init__(self, status_frontend): +@@ -227,7 +227,7 @@ + items_added = 0 + remove = [] + for item in self._uploading_items: +- if item in uploading_data: ++ if item in uploading_data.keys(): + size, written = uploading_data[item] + percentage = written * 100 / size + upload_item = self._uploading_items[item] +@@ -243,7 +243,7 @@ + for item in remove: + self._uploading_items.pop(item) + if items_added < 5: +- for item in uploading_data: ++ for item in uploading_data.keys(): + if item not in self._uploading_items and items_added < 5: + size, written = uploading_data[item] + percentage = written * 100 / size +@@ -270,4 +270,12 @@ + def update_transfers(self): + """Do nothing.""" + +-UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu ++ def sync_status_changed(self): ++ """Do nothing.""" ++ ++ ++if use_syncmenu: ++ UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux ++else: ++ UbuntuOneSyncMenu = DummySyncMenu ++ TransfersMenu = None + diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD index 31e198468..52f6262af 100644 --- a/community/ubuntuone-client/PKGBUILD +++ b/community/ubuntuone-client/PKGBUILD @@ -1,37 +1,34 @@ -# $Id: PKGBUILD 72611 2012-06-17 13:44:37Z bgyorgy $ +# $Id: PKGBUILD 78266 2012-10-17 10:27:54Z allan $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=ubuntuone-client -pkgver=3.0.2 -pkgrel=1 +pkgver=4.0.0 +pkgrel=2 pkgdesc="Ubuntu One helps you store, sync and share files between your computers" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client" license=('GPL') -depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'imake' 'gobject-introspection' 'vala') -optdepends=('ubuntu-sso-client-qt: required for first-time log in or' - 'ubuntu-sso-client-gtk: required for first-time log in' - 'python2-pyqt: proxy support') +depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool' 'imake' 'gobject-introspection') options=('!libtool') install=$pkgname.install -source=(http://launchpad.net/ubuntuone-client/stable-3-0/$pkgver/+download/$pkgname-$pkgver.tar.gz - http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20120513.tar.gz) -md5sums=('5251fad8d316e8730188078239a4dd73' - '6f4603f11ea21d030bfaef34d3567f68') +source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz + 1339_1338.diff + fix-notify-hint.patch) +md5sums=('738039703d4dcf54518a725f8ffbc4de' + 'e82e80c229de06692988c1f938a34fb9' + '54dfeb2be011f0a12ea7cfa0f0c19bec') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/* - # Install language files - echo 'ace af am an ar ast az be bg bn bo br bs ca ca@valencia ckb crh cv cy cs csb da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy gd gl gu he hi hr hu hy id is it ja jv kk km kn ko ku ky lt lv ml mr ms my nb nds nl nn oc pl pt pt_BR ro ru sd shn si sk sl sq sr sv ta te th tr ug uk ur uz vi zh_CN zh_HK zh_TW' >po/LINGUAS - rename $pkgname- '' ../po/$pkgname-*.po - mv -f -t po ../po/* + # Improve TransfersMenu declaration to avoid problems + patch -Np0 -i "$srcdir/1339_1338.diff" - # Fix desktop file - sed -i 's/ubuntuone-installer/ubuntuone-control-panel-qt/' \ - ubuntuone/platform/linux/{messaging,launcher}.py + # Workaround for crash in notification-daemon + # https://bugzilla.gnome.org/show_bug.cgi?id=665166 + patch -Np1 -i "$srcdir/fix-notify-hint.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static \ diff --git a/community/ubuntuone-client/fix-notify-hint.patch b/community/ubuntuone-client/fix-notify-hint.patch new file mode 100644 index 000000000..f32280de9 --- /dev/null +++ b/community/ubuntuone-client/fix-notify-hint.patch @@ -0,0 +1,20 @@ +diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py +--- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py 2012-06-19 15:51:01.000000000 +0200 ++++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py 2012-10-15 01:14:01.019476818 +0200 +@@ -40,7 +40,7 @@ + + if 'gi' in sys.modules and sys.modules['gi'] is not None: + try: +- from gi.repository import Notify ++ from gi.repository import GLib, Notify + Notify # pyflakes + NOTIFY_MODULE = 'gi' + except ImportError: +@@ -85,5 +85,6 @@ + if append: + self.notification.set_hint_string('x-canonical-append', '') + +- self.notification.set_hint_int32('transient', int(True)) ++ if NOTIFY_MODULE == 'gi': ++ self.notification.set_hint('transient', GLib.Variant.new_boolean(1)) + self.notification.show() diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD index 1887815e3..ed2a02ca2 100644 --- a/community/udevil/PKGBUILD +++ b/community/udevil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75211 2012-08-16 07:12:48Z bpiotrowski $ +# $Id: PKGBUILD 76234 2012-09-14 18:50:59Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ pkgname=udevil -pkgver=0.3.2 +pkgver=0.3.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Mount and unmount without password' @@ -24,7 +24,7 @@ provides=('devmon') backup=('etc/udevil/udevil.conf') install=$pkgname.install source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz) -md5sums=('47b8f9334266d65020daa4679f71b504') +md5sums=('81abe64e0c6d3555f0b66b7d7fa9a340') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD index 082468a11..fcf4ad439 100644 --- a/community/uget/PKGBUILD +++ b/community/uget/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75928 2012-09-05 17:18:03Z bgyorgy $ +# $Id: PKGBUILD 77782 2012-10-14 18:09:15Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=uget -pkgver=1.10 +pkgver=1.10.2 pkgrel=1 pkgdesc="GTK+ download manager featuring download classification and HTML import" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ depends=('libnotify' 'gtk3' 'gstreamer0.10' 'curl' 'hicolor-icon-theme' 'xdg-uti makedepends=('intltool') optdepends=('aria2: alternative backend') install=$pkgname.install -source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver-2.tar.gz) -md5sums=('cf6f58b838321f97aa9f3c0b0b0315cf') +source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz) +md5sums=('c766e94fcf12e4b425c53c7c598fd702') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index d32b424bb..e78329277 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,62 +1,57 @@ -# $Id: PKGBUILD 75920 2012-09-05 14:02:57Z spupykin $ +# $Id: PKGBUILD 77483 2012-10-10 23:43:02Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Sergej Pupykin <ps@lx-ltd.ru> pkgname=ulogd -pkgver=2.0.0 -pkgrel=5 +pkgver=2.0.1 +pkgrel=3 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64' 'mips64el') url='http://www.netfilter.org/projects/ulogd/index.html' license=('GPL2') -depends=('libmnl') +depends=('libmnl' 'libnfnetlink') backup=('etc/ulogd.conf') -makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi' - 'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack' - 'linuxdoc-tools' 'groff' 'texlive-core') -optdepends=('postgresql-libs' - 'sqlite' - 'libpcap' - 'libmysqlclient' - 'libdbi' - 'libnetfilter_acct' - 'libnetfilter_log' - 'libnetfilter_conntrack') +makedepends=('libmysqlclient' + 'libnetfilter_acct' + 'libnetfilter_conntrack' + 'libnetfilter_log' + 'libpcap' + 'libdbi' + 'postgresql-libs' + 'sqlite') +optdepends=("${makedepends[@]}") options=('!libtool') source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" - 'rc' - 'logrotate' - 'ulogd.conf.min' - 'ulogd.service') -md5sums=('211e68781e3860959606fc94b97cf22e' + "$pkgname.rc" + "$pkgname.logrotate" + "$pkgname.conf" + "$pkgname.service") +md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9' 'c42230c1cabf5dd9b80bf9a0fd87ca7e' 'dd32eeee0949adff4188544419acd17e' 'c21531312f95e790ed19aa267a17d35a' - '13a1227052322b4c17b258ed358f055e') + '42fc2c0568ff89ec00c2f0797280f296') + build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi make - (cd doc && make) } package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - install -dm0755 "$pkgdir/usr/share/doc/ulogd" - install -Dm0644 ulogd.conf $pkgdir/usr/share/doc/ulogd/ulogd.conf.sample - install -Dm0644 doc/ulogd.{dvi,html,ps,sgml,txt} "$pkgdir/usr/share/doc/ulogd" - - install -dm0755 "$pkgdir/usr/share/ulogd" - install -m644 doc/*.{table,sql} "$pkgdir/usr/share/ulogd" - - install -D -m644 "$srcdir/logrotate" "$pkgdir/etc/logrotate.d/ulogd" - install -D -m755 "$srcdir/rc" "$pkgdir/etc/rc.d/ulogd" - - install -Dm0644 $srcdir/ulogd.conf.min $pkgdir/etc/ulogd.conf - install -Dm0644 $srcdir/ulogd.service $pkgdir/usr/lib/systemd/system/ulogd.service + install -dm755 "$pkgdir/usr/share/doc/ulogd" + install -Dm644 ulogd.conf "$pkgdir/usr/share/doc/ulogd/ulogd.conf" + install -m644 doc/*.{table,sql} "$pkgdir/usr/share/doc/ulogd" + cd "$srcdir" + install -Dm755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service" + install -Dm644 $pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname" + install -Dm644 $pkgname.conf "$pkgdir/etc/$pkgname.conf" } + +# vim:set ts=2 sw=2 et: diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf new file mode 100644 index 000000000..822575613 --- /dev/null +++ b/community/ulogd/ulogd.conf @@ -0,0 +1,20 @@ +[global] +nlgroup=1 +logfile="/var/log/ulogd.log" +loglevel=5 +rmem=131071 +bufsize=150000 + +plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so" +plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so" +plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so" +plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so" +plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so" + +stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU + +[ulog1] +nlgroup=1 + +[emu1] +file=/var/log/ulogd.syslogemu diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate new file mode 100644 index 000000000..312c71acb --- /dev/null +++ b/community/ulogd/ulogd.logrotate @@ -0,0 +1,10 @@ +/var/log/ulogd.log /var/log/ulogd.syslogemu { + missingok + notifempty + sharedscripts + create 0640 root root + + postrotate + [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null + endscript +} diff --git a/community/ulogd/ulogd.rc b/community/ulogd/ulogd.rc new file mode 100644 index 000000000..83f0550cc --- /dev/null +++ b/community/ulogd/ulogd.rc @@ -0,0 +1,54 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof /usr/sbin/ulogd +} + +case "$1" in + start) + stat_busy "Starting ulogd daemon" + + [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid + PID=`get_pid` + if [ -z "$PID" ]; then + /usr/sbin/ulogd -d &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo `get_pid` > /var/run/ulogd.pid + add_daemon ulogd + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping ulog daemon" + PID=`get_pid` + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/ulogd.pid &> /dev/null + rm_daemon ulogd + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/ulogd/ulogd.service b/community/ulogd/ulogd.service index 3984bbced..8858427fa 100644 --- a/community/ulogd/ulogd.service +++ b/community/ulogd/ulogd.service @@ -3,10 +3,7 @@ Description=Netfilter Ulogd daemon After=network.target [Service] -Type=forking -User=root -ExecStart=/usr/sbin/ulogd -d -PIDFile=/var/run/ulogd.pid +ExecStart=/usr/sbin/ulogd [Install] WantedBy=multi-user.target diff --git a/community/ultimate-ircd/PKGBUILD b/community/ultimate-ircd/PKGBUILD index 48583050c..cdbe120c7 100644 --- a/community/ultimate-ircd/PKGBUILD +++ b/community/ultimate-ircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65335 2012-02-21 02:11:06Z spupykin $ +# $Id: PKGBUILD 78358 2012-10-17 15:20:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ultimate-ircd pkgver=3.0.2 -pkgrel=5 +pkgrel=6 pkgdesc="ultimate irc server" arch=(i686 x86_64 'mips64el') url="http://www.shadow-realm.org/" @@ -16,10 +16,14 @@ provides=(ircd) backup=() install=ircd.install source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2 - ultimate-ircd - conf-fix.patch) + ultimate-ircd + ultimate-ircd.service + ultimate-ircd.tmpfiles + conf-fix.patch) md5sums=('8bc14b97d22a3ce3415cc0540ae459f6' 'cf6ab14d8dd8805342b70a9beb01c9af' + '526fd78018b9b011787e4e9012437116' + 'e51723ab29e7a3ddc3589846815de0c9' '5e0f2a02e12675ac070a148c3234e111') build() { @@ -52,4 +56,6 @@ build() { mv ssl-search.sh irc-ssl-search.sh install -D -m 0755 $srcdir/ultimate-ircd $pkgdir/etc/rc.d/ultimate-ircd install -d -m 0755 $pkgdir/var/lib/ircd + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf } diff --git a/community/ultimate-ircd/ultimate-ircd.service b/community/ultimate-ircd/ultimate-ircd.service new file mode 100644 index 000000000..4b79c371d --- /dev/null +++ b/community/ultimate-ircd/ultimate-ircd.service @@ -0,0 +1,12 @@ +[Unit] +Description=IRC daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +User=ircd +PIDFile=/var/run/ircd/ircd.pid +ExecStart=/usr/bin/ircd -f /etc/ircd/ircd.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/ultimate-ircd/ultimate-ircd.tmpfiles b/community/ultimate-ircd/ultimate-ircd.tmpfiles new file mode 100644 index 000000000..c9a9c98e3 --- /dev/null +++ b/community/ultimate-ircd/ultimate-ircd.tmpfiles @@ -0,0 +1 @@ +d /run/ircd 0755 ircd irc - diff --git a/community/uniconvertor/PKGBUILD b/community/uniconvertor/PKGBUILD index ebe78f455..e1ee5d1d0 100644 --- a/community/uniconvertor/PKGBUILD +++ b/community/uniconvertor/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 65343 2012-02-21 02:13:57Z spupykin $ +# $Id: PKGBUILD 78268 2012-10-17 10:27:59Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=uniconvertor pkgver=1.1.5 -pkgrel=5 +pkgrel=6 pkgdesc="A universal vector graphics translator using sK1 engine." arch=('i686' 'x86_64' 'mips64el') url="http://sk1project.org/modules.php?name=Products&product=uniconvertor" license=('GPL') -depends=('python2' 'pil' 'python-reportlab' 'sk1libs') +depends=('python2' 'python2-imaging' 'python2-reportlab' 'sk1libs') makedepends=('gcc') source=(http://uniconvertor.googlecode.com/files/uniconvertor-$pkgver.tar.gz) md5sums=('d1272315a58304ece2ff588834e23f72') @@ -21,5 +21,9 @@ build() { sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py python2 setup.py build +} + +package() { + cd "$srcdir/uniconvertor-$pkgver" python2 setup.py install --root="$pkgdir" } diff --git a/community/unionfs-fuse/PKGBUILD b/community/unionfs-fuse/PKGBUILD new file mode 100644 index 000000000..e75504ae0 --- /dev/null +++ b/community/unionfs-fuse/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 76241 2012-09-15 08:29:07Z aginiewicz $ +# Maintainer: Andrzej Giniewicz <gginiu@gmail.com> +# Contributor: Smith Dhumbumroong <zodmaner at gmail dot com> + +pkgname=unionfs-fuse +pkgver=0.26 +pkgrel=1 +pkgdesc="A user space unionfs implementation" +arch=('i686' 'x86_64') +url="http://podgorny.cz/moin/UnionFsFuse" +license=('BSD') +depends=('fuse') +source=(http://podgorny.cz/unionfs-fuse/releases/$pkgname-$pkgver.tar.xz) +md5sums=('689c636484756f6f7a728ef354cbeac2') + +build() { + cd "$srcdir"/$pkgname-$pkgver + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" PREFIX=/usr install + install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 41de79973..1a9539897 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60367 2011-12-12 09:58:46Z spupykin $ +# $Id: PKGBUILD 78360 2012-10-17 15:21:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.9 -pkgrel=2 +pkgrel=3 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64' 'mips64el') url="http://unrealircd.com" @@ -15,9 +15,11 @@ provides=('ircd') backup=(etc/unrealircd/unrealircd.conf) source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.rc + unrealircd.service arch-fixes.patch) md5sums=('bde023695347969f545ce5f2a9ac9aed' '07ffa1e82a01f319a8b997e155d2af1d' + '2103ce8a4a4e79f6955920bfebea0202' '77807313c4578f2c30286b9f9e3fb21c') build() { @@ -60,4 +62,6 @@ build() { find $pkgdir/usr -type f -exec chmod ugo+r {} \; find $pkgdir/usr -type d -exec chmod ugo+rx {} \; + + install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/unrealircd/unrealircd.service b/community/unrealircd/unrealircd.service new file mode 100644 index 000000000..42279fae0 --- /dev/null +++ b/community/unrealircd/unrealircd.service @@ -0,0 +1,12 @@ +[Unit] +Description=IRC daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +User=ircd +PIDFile=/var/run/unrealircd.pid +ExecStart=/usr/bin/unrealircd -p + +[Install] +WantedBy=multi-user.target diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD index 9199268df..e497c2e6b 100644 --- a/community/viking/PKGBUILD +++ b/community/viking/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70959 2012-05-20 19:00:08Z jlichtblau $ +# $Id: PKGBUILD 76965 2012-10-02 17:50:42Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Nick Østergaard <oe.nick@gmail.com> # Contributor: Jonny Gerold <jonny@fsk141.com> pkgname=viking -pkgver=1.3 -pkgrel=2 +pkgver=1.3.2.1 +pkgrel=1 pkgdesc="GTK+2 application to manage GPS data" arch=('i686' 'x86_64' 'mips64el') url="http://viking.sourceforge.net/" @@ -16,7 +16,7 @@ options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('54dc43b0136722118b8402d51ac8d78180ad59cc37e37ddf3fb6a7ee6bf04fdf') +sha256sums=('ebd6f134a340a1b2ba582ea77bd97ddd9db16b476be7090a12649f6069fa1565') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog index d9333735f..3fc494db1 100644 --- a/community/viking/viking.changelog +++ b/community/viking/viking.changelog @@ -1,3 +1,6 @@ +2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * viking 1.3.2.1-1 + 2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * viking 1.3.0-1 diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD index 2571c418b..189f1d3b8 100644 --- a/community/vile/PKGBUILD +++ b/community/vile/PKGBUILD @@ -1,24 +1,52 @@ -# $Id: PKGBUILD 65367 2012-02-21 02:23:34Z spupykin $ +# $Id: PKGBUILD 76743 2012-09-28 19:43:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=vile -pkgver=9.8 -pkgrel=2 +pkgver=9.8_i +_basever=9.8 +pkgrel=1 pkgdesc="vi like emacs" arch=('i686' 'x86_64' 'mips64el') url="http://invisible-island.net/vile/vile.html" depends=('ncurses') license=('custom') options=(!libtool) -source=(ftp://invisible-island.net/vile/vile-$pkgver.tgz) -md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f') +source=("ftp://invisible-island.net/vile/vile-${_basever}.tgz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}a.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}b.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}c.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}d.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}e.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}f.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}g.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}h.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}i.patch.gz") +md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f' + '685cb681943e9315a1689a6a6f4734cb' + 'f3842ea427c635d0ee96f6da8566fa56' + '69cfdbb0b84a51802455bbe44a5ce32e' + '5d675193bc02ac4cab72452bf0051489' + '1e6317a15d7b2cd99f921f3af312b977' + '7f8a38272395f07e1377cc1943d37e7f' + '26ab76a7305b7ec97b22855810911ceb' + '6ea4cf22e29f5418f26ba6632985c70e' + '908e8f9cf3c9a681c3ef76a3cd04a0c3') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${_basever} + + for i in $srcdir/vile-${_basever}?.patch; do + patch -p1 <$i + done + sed -i 's|FLEX_BETA|FLEX_NOBETA|g' filters/filters.h + ./configure --prefix=/usr make +} + +package() { + cd $srcdir/$pkgname-${_basever} make install DESTDIR=$pkgdir - mv $pkgdir/usr/man $pkgdir/usr/share/ mkdir -p $pkgdir/usr/share/licenses/$pkgname cat <<EOF >$pkgdir/usr/share/licenses/$pkgname/license diff --git a/community/virtkey/PKGBUILD b/community/virtkey/PKGBUILD index bdbe2675e..7d350b553 100644 --- a/community/virtkey/PKGBUILD +++ b/community/virtkey/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=virtkey pkgname=('python2-virtkey' 'python-virtkey') pkgver=0.61.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="https://launchpad.net/virtkey" license=('LGPL') @@ -42,5 +42,5 @@ package_python-virtkey() { cd "$srcdir/$pkgbase-$pkgver" - python setup.py install --root=$pkgdir/ --optimize=1 + python3 setup.py install --root=$pkgdir/ --optimize=1 } diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD new file mode 100644 index 000000000..aa1f3d890 --- /dev/null +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 78541 2012-10-20 11:53:48Z seblu $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgbase=virtualbox-modules-lts +pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') +pkgver=4.2.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://virtualbox.org' +license=('GPL') +makedepends=('linux-lts-headers' + "virtualbox-host-source>=$pkgver" + "virtualbox-guest-source>=$pkgver" + 'expac') + +build() { + # current kernel version + _kernver=$(expac -Q '%v' linux-lts-headers)-lts + # dkms need modification to be run as user + cp -r /var/lib/dkms . + echo "dkms_tree='$srcdir/dkms'" > dkms.conf + # build host modules + msg2 'Host modules' + dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver" + # build guest modules + msg2 'Guest modules' + dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver" +} + +package_virtualbox-host-modules-lts(){ + pkgdesc='Host kernel modules for VirtualBox' + depends=('linux-lts>=3.0' 'linux-lts<3.1') + replaces=('virtualbox-modules-lts') + conflicts=('virtualbox-modules-lts') + provides=("virtualbox-host-modules=$pkgver") + install=virtualbox-host-modules-lts.install + + _kernver=$(expac -Q '%v' linux-lts-headers)-lts + _extraver=extramodules-${_kernver%.*}-lts + + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules-lts.install" +} + +package_virtualbox-guest-modules-lts(){ + pkgdesc='Guest kernel modules for VirtualBox' + license=('GPL') + depends=('linux-lts>=3.0' 'linux-lts<3.1') + replaces=('virtualbox-archlinux-modules-lts') + conflicts=('virtualbox-archlinux-modules-lts') + provides=("virtualbox-host-modules=$pkgver") + install=virtualbox-guest-modules-lts.install + + _kernver=$(expac -Q '%v' linux-lts-headers)-lts + _extraver=extramodules-${_kernver%.*}-lts + + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules-lts.install" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules-lts/build.sh b/community/virtualbox-modules-lts/build.sh new file mode 100755 index 000000000..828448cab --- /dev/null +++ b/community/virtualbox-modules-lts/build.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +if (( $# != 1 )); then + echo "usage: $0 extra" + echo " $0 testing" + exit 1 +fi + +$1-i686-build +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 + +$1-x86_64-build +makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -r /var/lib/archbuild/$1-x86_64 + + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install new file mode 100644 index 000000000..d2984a743 --- /dev/null +++ b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install @@ -0,0 +1,16 @@ +EXTRAMODULES='extramodules-3.0-lts' + +post_install() { +cat << EOF +===> You may want to load vboxguest, vboxsf and vboxvideo +EOF + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install new file mode 100644 index 000000000..07ecf7311 --- /dev/null +++ b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install @@ -0,0 +1,18 @@ +EXTRAMODULES='extramodules-3.0-lts' + +post_install() { +cat << EOF +===> You must load vboxdrv module before starting VirtualBox: +===> # modprobe vboxdrv +EOF + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use the new version, reload all virtualbox modules manually.' +} + +post_remove() { + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD new file mode 100644 index 000000000..6850f7879 --- /dev/null +++ b/community/virtualbox-modules/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 78539 2012-10-20 11:51:18Z seblu $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgbase=virtualbox-modules +pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') +pkgver=4.2.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://virtualbox.org' +license=('GPL') +makedepends=('linux-headers' + "virtualbox-host-source>=$pkgver" + "virtualbox-guest-source>=$pkgver" + 'expac') + +build() { + # current kernel version + _kernver=$(expac -Q '%v' linux-headers)-ARCH + #_kernver=3.6.0-1-ARCH + # dkms need modification to be run as user + cp -r /var/lib/dkms . + echo "dkms_tree='$srcdir/dkms'" > dkms.conf + # build host modules + msg2 'Host modules' + dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver" + # build guest modules + msg2 'Guest modules' + dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver" +} + +package_virtualbox-host-modules(){ + pkgdesc='Host kernel modules for VirtualBox' + depends=('linux>=3.6' 'linux<3.7') + replaces=('virtualbox-modules') + conflicts=('virtualbox-modules') + install=virtualbox-host-modules.install + + _kernver=$(expac -Q '%v' linux-headers)-ARCH + # _kernver=3.6.0-1-ARCH + _extraver=extramodules-${_kernver%.*}-ARCH + + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install" +} + +package_virtualbox-guest-modules(){ + pkgdesc='Guest kernel modules for VirtualBox' + license=('GPL') + depends=('linux>=3.6' 'linux<3.7') + replaces=('virtualbox-archlinux-modules') + conflicts=('virtualbox-archlinux-modules') + install=virtualbox-guest-modules.install + + _kernver=$(expac -Q '%v' linux-headers)-ARCH + #_kernver=3.6.0-1-ARCH + _extraver=extramodules-${_kernver%.*}-ARCH + + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh new file mode 100755 index 000000000..828448cab --- /dev/null +++ b/community/virtualbox-modules/build.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +if (( $# != 1 )); then + echo "usage: $0 extra" + echo " $0 testing" + exit 1 +fi + +$1-i686-build +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 + +$1-x86_64-build +makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -r /var/lib/archbuild/$1-x86_64 + + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install new file mode 100644 index 000000000..e5d1038af --- /dev/null +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -0,0 +1,17 @@ +post_install() { +cat << EOF +===> You may want to load vboxguest, vboxsf and vboxvideo +EOF + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install new file mode 100644 index 000000000..3f2ed4a10 --- /dev/null +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -0,0 +1,19 @@ +post_install() { +cat << EOF +===> You must load vboxdrv module before starting VirtualBox: +===> # modprobe vboxdrv +EOF + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use the new version, reload all virtualbox modules manually.' +} + +post_remove() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD index 547d604d7..50acdd99b 100644 --- a/community/virtviewer/PKGBUILD +++ b/community/virtviewer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73649 2012-07-12 13:51:32Z spupykin $ +# $Id: PKGBUILD 76592 2012-09-24 09:59:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <archaur at jonw dot org> pkgname=virtviewer -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS." depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt') @@ -12,11 +12,10 @@ url="http://virt-manager.et.redhat.com" arch=('i686' 'x86_64' 'mips64el') license=('GPL') source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz") -md5sums=('69a7c6d5cbd23d478396da4883567261') +md5sums=('43c269da571e65b12421b6fc9f871e98') build() { cd $srcdir/virt-viewer-$pkgver -# export LDFLAGS=-lX11 ./configure --prefix=/usr make make DESTDIR=$pkgdir install diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD index fb2c5bb40..43c26e6a0 100644 --- a/community/vsftpd/PKGBUILD +++ b/community/vsftpd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73933 2012-07-17 06:43:49Z bpiotrowski $ +# $Id: PKGBUILD 76440 2012-09-18 15:37:11Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=vsftpd -pkgver=3.0.0 -pkgrel=4 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64' 'mips64el') url="https://security.appspot.com/vsftpd.html" @@ -13,11 +13,11 @@ license=('GPL2') depends=('openssl') backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') install=vsftpd.install -source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc} +source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc} vsftpd.xinetd vsftpd.d vsftpd-ssl.socket vsftpd.socket vsftpd.service vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service) -sha1sums=('436da30cefa33e22a0266077ab95397e9432e297' - '2142ac8a84f18ecc1ebac21b9ac07858c35ae6af' +sha1sums=('f36976bb1c5df25ac236d8a29e965ba2b825ccd0' + '42c6055c1418ad93340bfa3b176b60f1e5b15e0a' 'c87b4ce56dac15223694a6e86c01ea813b877596' '24f268956c24e78be0c234c6d31f41487922eafe' 'f81dab50243f7e82dc9722ca79b2b24de0882eb2' diff --git a/community/warsow/PKGBUILD b/community/warsow/PKGBUILD index eea94f42f..277cc05e8 100644 --- a/community/warsow/PKGBUILD +++ b/community/warsow/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74467 2012-07-29 03:46:52Z svenstaro $ +# $Id: PKGBUILD 78440 2012-10-18 12:10:18Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Slash <demodevil5[at]yahoo[dot]com> # Contributor: Babets # Contributor: Vain pkgname=warsow -pkgver=1.0 +pkgver=1.02 pkgrel=1 pkgdesc="Free online multiplayer competitive FPS based on the Qfusion engine" url="http://www.warsow.net/" @@ -15,13 +15,13 @@ depends=('curl' 'libjpeg' 'libvorbis' 'libxinerama' 'libxxf86dga' 'libxxf86vm' ' makedepends=('mesa' 'openal' 'imagemagick' 'gendesk') optdepends=('openal: for openal audio support') source=('warsow.launcher' 'wsw-server.launcher' 'wswtv-server.launcher' \ - "http://funpark.warsow-esport.net/~warsow/1.0/warsow_${pkgver}_sdk.tar.gz") + "http://wsw.null.so/warsow_${pkgver}_sdk.tar.gz") _genericname=('First person shooter') _comment=('Online Mulitiplayer Competitive FPS') md5sums=('ec00081d81ad9802a8ca42fc2eac5498' 'f73e10c26197178df71b941b10bf83d7' 'd7e4a69835bbcf801e58307e9d6b951e' - '35b9a8f530b51cda15c660b3a73f377e') + 'df3dee05dd6f84b44ba131a2445a1706') build() { cd "$srcdir" diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 4db19d12c..148370ccb 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 63775 2012-02-05 12:13:50Z ibiru $ +# $Id: PKGBUILD 77666 2012-10-13 11:45:54Z allan $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 pkgver=2.3.9 -pkgrel=2 +pkgrel=3 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'mesa' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') -makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip') -source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz") +depends=('sdl' 'openal' 'libpng' 'libvorbis' 'libtheora' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') +makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'asciidoc') +source=(#"http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz" + "http://downloads.sourceforge.net/project/warzone2100/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz") md5sums=('7185090a089c9c0e0eca7535a8f25dca') build() { diff --git a/community/wbar/PKGBUILD b/community/wbar/PKGBUILD index 7d59416a3..65bc5a498 100644 --- a/community/wbar/PKGBUILD +++ b/community/wbar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67431 2012-03-11 19:04:07Z lcarlier $ +# $Id: PKGBUILD 76682 2012-09-26 19:34:38Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=wbar -pkgver=2.3.0 +pkgver=2.3.4 pkgrel=1 pkgdesc="A quick launch bar developed with speed in mind" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ url="http://code.google.com/p/wbar" license=('GPL') depends=('libglade' 'imlib2' 'gcc-libs') makedepends=('intltool') -source=(http://wbar.googlecode.com/files/${pkgname}_${pkgver}.orig.tar.gz) -sha256sums=('1a192f150eae92d1c92b86050e4f8046de960a2452c48190187dd6b7a89df63b') +source=(http://wbar.googlecode.com/files/$pkgname-$pkgver.tgz) +sha256sums=('46a69849e4436529aefb5cfb2c94b520d05a53c237e7773b90207f67f97a93e3') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/wbar/wbar.changelog b/community/wbar/wbar.changelog index 17916badd..95467b033 100644 --- a/community/wbar/wbar.changelog +++ b/community/wbar/wbar.changelog @@ -1,3 +1,6 @@ +2012-09-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * wbar 2.3.4-1 + 2011-05-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * wbar 2.2.2-1 diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 55a3c436e..a7b4ab0a5 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 75796 2012-08-31 16:11:56Z spupykin $ +# $Id: PKGBUILD 77566 2012-10-12 14:44:41Z svenstaro $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt -pkgver=3.2.2.1 -_pkgver=3.2.2-p1 -pkgrel=2 +pkgver=3.2.3rc1 +_pkgver=3.2.3-rc1 +pkgrel=1 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.webtoolkit.eu/" @@ -26,17 +26,17 @@ optdepends=('openssl: for SSL support in built-in webserver' 'qt: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('d436430a4f1ae5fbcf038e645e4b5260') +md5sums=('b58780f11d85b2da32a21f4c2be84cde') build() { cd ${srcdir}/${pkgname}-${_pkgver} mkdir -p build cd build + #-DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \ cmake \ -DCONNECTOR_HTTP=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \ -DWEBUSER=http \ -DWEBGROUP=http \ -DUSE_SYSTEM_SQLITE3=ON \ diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD index e74658b6a..ce775bbd8 100644 --- a/community/xbmc/PKGBUILD +++ b/community/xbmc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74630 2012-07-31 19:57:28Z ebelanger $ +# $Id: PKGBUILD 78434 2012-10-18 10:03:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -9,27 +9,40 @@ _prefix=/usr pkgname=xbmc pkgver=11.0 -pkgrel=6 +pkgrel=9 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') -depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez') -makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'vdpau-video' 'libcec' 'udisks' 'upower' 'bluez') -optdepends=( - 'libcec: support for Pulse-Eight USB-CEC adapter' - 'vdpau-video: accelerated video playback for nvidia cards' - 'xvba-video: accelerated video playback for amd cards' - 'pulseaudio: pulseaudio support' - 'lirc: remote controller support' - 'udisks: automount external drives' - 'upower: used to trigger suspend functionality' - 'unrar: access compressed files without unpacking them' -) +depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' + 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' + 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' + 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' + 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu') +makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' + 'udisks' 'upower' 'bluez' 'mesa') +optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' + 'vdpau-video: accelerated video playback for nvidia cards' + 'xvba-video: accelerated video playback for amd cards' + 'pulseaudio: pulseaudio support' + 'lirc: remote controller support' + 'udisks: automount external drives' + 'upower: used to trigger suspend functionality' + 'unrar: access compressed files without unpacking them' + 'xorg-xinit: autostart xbmc') install="${pkgname}.install" -source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz") +source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" + "xbmc.service") sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' + '395ca1afd3430ad66239bafbffde0eedf9c43409b77f65341ef387f09cd65588') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' + '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' + '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af') +sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19' + '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af') build() { cd "${srcdir}/xbmc-$pkgver" @@ -100,5 +113,8 @@ package() { for licensef in LICENSE.GPL copying.txt; do mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}" done + + # systemd stuff + install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service } # vim:set ts=2 sw=2 et: diff --git a/community/xbmc/xbmc.install b/community/xbmc/xbmc.install index 213889cdd..a3ae3d0d8 100644 --- a/community/xbmc/xbmc.install +++ b/community/xbmc/xbmc.install @@ -1,15 +1,16 @@ post_install() { - [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications - /bin/true + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications + groupadd xbmc + useradd -G xbmc -d /var/empty xbmc } post_upgrade() { post_install $1 - /bin/true + echo "You may want to add xbmc user and group to use xbmc standalone" } post_remove() { post_install $1 - /bin/true + echo "You may want to remove xbmc user and group" } diff --git a/community/xbmc/xbmc.service b/community/xbmc/xbmc.service new file mode 100644 index 000000000..b66e35c80 --- /dev/null +++ b/community/xbmc/xbmc.service @@ -0,0 +1,13 @@ +[Unit] +Description = Starts instance of XBMC using xinit +After = remote-fs.target + +[Service] +User = xbmc +Group = xbmc +Type = simple +ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 +Restart = on-failure + +[Install] +WantedBy = multi-user.target diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index 87fa07394..7c9722fba 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65258 2012-02-20 12:39:15Z spupykin $ +# $Id: PKGBUILD 77112 2012-10-05 10:17:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hengfu <rhfcaesar@gmail.com> pkgname=xl2tpd pkgver=1.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64' 'mips64el') url="http://www.xelerance.com/services/software/xl2tpd/" @@ -18,12 +18,16 @@ source=(http://arch.p5n.pp.ru/~sergej/dl/2012/xl2tpd-$pkgver.tar.gz xl2tpd.conf.client-example xl2tpd.conf.server-example options.l2tpd + xl2tpd.service + xl2tpd.tmpfiles ipparam.patch) md5sums=('28264284552c442b24cf421755a2bb48' '1439d13084fc09c2a19c97b24a834345' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' + '5ba9ddaf66c9827fe4a2caef67cf61c2' + '2e95e4fc03e1521ab20fd7e249efab5a' '4d258a58cc109d5c4d96af8f81d481cf') build() { @@ -38,4 +42,7 @@ build() { install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd + + install -Dm0644 $srcdir/xl2tpd.service $pkgdir/usr/lib/systemd/system/xl2tpd.service + install -Dm0644 $srcdir/xl2tpd.tmpfiles $pkgdir/usr/lib/tmpfiles.d/xl2tpd.conf } diff --git a/community/xl2tpd/xl2tpd.service b/community/xl2tpd/xl2tpd.service new file mode 100644 index 000000000..b47cadf02 --- /dev/null +++ b/community/xl2tpd/xl2tpd.service @@ -0,0 +1,15 @@ +[Unit] +Description=Level 2 Tunnel Protocol Daemon (L2TP) +After=syslog.target network.target +After=ipsec.service +# Some ISPs in Russia use l2tp without IPsec, so don't insist anymore +#Wants=ipsec.service + +[Service] +Type=simple +PIDFile=/var/run/xl2tpd/xl2tpd.pid +ExecStart=/usr/sbin/xl2tpd -D +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/community/xl2tpd/xl2tpd.tmpfiles b/community/xl2tpd/xl2tpd.tmpfiles new file mode 100644 index 000000000..139680eb2 --- /dev/null +++ b/community/xl2tpd/xl2tpd.tmpfiles @@ -0,0 +1 @@ +d /var/run/xl2tpd 0755 root root - diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index 15a7d3643..7372a74c6 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 74407 2012-07-27 05:34:52Z spupykin $ +# $Id: PKGBUILD 77869 2012-10-15 10:22:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=xlockmore pkgver=5.40 -pkgrel=1 +pkgrel=3 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64 'mips64el') license=('BSD') -depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu) +depends=(freetype2 gtk2 libxpm lesstif pam libxmu glu) +makedepends=(mesa) url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 2d609f104..3cc9f715b 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73487 2012-07-08 09:31:59Z ibiru $ +# $Id: PKGBUILD 78342 2012-10-17 14:41:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=7 +pkgrel=8 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" @@ -48,13 +48,15 @@ optdepends+=('perl: Perl language bindings' # somehow connected with resid i guess(not in repos also) conflicts=('xmms2-devel') install=xmms2.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - xmms2d.conf - xmms2d.rc - 'ffmpeg-0.11.diff') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "xmms2d.conf" + "xmms2d.rc" + "xmms2d.service" + "ffmpeg-0.11.diff") md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' '9d8e3e1a434f271423bdd228a1e9bd7c' + '19167aa54e4745853689abad72443b3e' 'e176971ef96807f72fa8fc17d260c20a') build() { @@ -79,6 +81,7 @@ build() { ./waf build ./waf --destdir=${pkgdir} install - install -D -m 0755 ../xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d - install -D -m 0644 ../xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf + install -Dm0755 $srcdir/xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d + install -Dm0644 $srcdir/xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf + install -Dm0644 $srcdir/xmms2d.service $pkgdir/usr/lib/systemd/system/xmms2d.service } diff --git a/community/xmms2/xmms2d.service b/community/xmms2/xmms2d.service new file mode 100644 index 000000000..a38584df1 --- /dev/null +++ b/community/xmms2/xmms2d.service @@ -0,0 +1,12 @@ +[Unit] +Description=XMMS2 daemon +After=network.target remote-fs.target nss-lookup.target + +[Service] +Type=forking +EnvironmentFile=/etc/conf.d/xmms2d.conf +ExecStart=su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS &>/dev/null' - $XMMS2_USER +ExecStop=su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER + +[Install] +WantedBy=multi-user.target diff --git a/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch new file mode 100644 index 000000000..d4508c916 --- /dev/null +++ b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch @@ -0,0 +1,34 @@ +From b7345a790e8026a2075ce636ac377d8f049b4b7c Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Wed, 3 Oct 2012 06:51:21 -0700 +Subject: [PATCH] Update usage of catch to catchIOError since catch has been + removed from System.IO.Error in ghc 7.6.1 + +--- + src/Plugins/Monitors/Bright.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Plugins/Monitors/Bright.hs b/src/Plugins/Monitors/Bright.hs +index 499e5bc..b5ec4c0 100644 +--- a/src/Plugins/Monitors/Bright.hs ++++ b/src/Plugins/Monitors/Bright.hs +@@ -20,6 +20,7 @@ import Data.Char + import System.FilePath ((</>)) + import System.Posix.Files (fileExist) + import System.Console.GetOpt ++import System.IO.Error (catchIOError) + + data BrightOpts = BrightOpts + { subDir :: String +@@ -101,7 +102,7 @@ readBright files = + maxVal <- grab $ (fMax files) + return $ (currVal / maxVal) + where +- grab f = catch (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0) ++ grab f = catchIOError (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0) + + + showHorizontalBar :: Float -> Monitor String +-- +1.7.12.2 + diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 50a973d61..2b61e3ba3 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,35 +1,37 @@ -# $Id: PKGBUILD 72497 2012-06-15 14:00:57Z jelle $ +# $Id: PKGBUILD 77363 2012-10-09 04:19:10Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.4 pkgname=xmobar -pkgver=0.15 -pkgrel=2 +pkgver=0.16 +pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') -makedepends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' +makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' 'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2') options=('strip') -source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-haskell-mtl.patch) +#source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-builddep.patch) +# Use Git snapshot for Ghc 7.6.1 rebuild +source=(ftp://ftp.archlinux.org/other/community/xmobar/xmobar-$pkgver.tar.gz +0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch) build() { - cd ${srcdir}/xmobar-$pkgver - # Fix haskell mtl dep - patch -Np1 -i $srcdir/xmobar-0.15-haskell-mtl.patch + cd ${srcdir}/xmobar + patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib" runhaskell Setup build } package() { - cd ${srcdir}/xmobar-$pkgver + cd ${srcdir}/xmobar runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } -md5sums=('0658679b39168f49d32fe178029ff9f1' - '0d9fb64557233c3a349feb53097c7b09') +md5sums=('b470f8253f8d2b014f59e9d657cc7ddd' + 'ffd6079c879f3b6ff7208a846d6ee241' + '149583c19ac3d0ad829f3138342bb9db') diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index 33de65a5a..2a849dfd9 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 72409 2012-06-13 13:48:15Z tdziedzic $ +# $Id: PKGBUILD 77365 2012-10-09 04:19:28Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.10 -pkgrel=4 +pkgrel=5 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.4.2-1' 'xmonad=0.10-4' 'sh' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1-4' 'haskell-utf8-string=0.3.7-2' 'haskell-random=1.0.1.1-2') +depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3') install='xmonad-contrib.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch) md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81' diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index 05065a05b..f53853afc 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 72408 2012-06-13 13:48:08Z tdziedzic $ +# $Id: PKGBUILD 77364 2012-10-09 04:19:21Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: shild <shildv@gmail.com> pkgname=xmonad pkgver=0.10 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.4.2-1' 'gmp' 'haskell-x11=1.6.0' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-utf8-string=0.3.7') +depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions') makedepends=('setconf' 'gendesk') optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' @@ -19,6 +19,7 @@ source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$p build() { cd "$srcdir" + ghc-pkg list gendesk cd $srcdir/$pkgname-$pkgver @@ -39,7 +40,7 @@ package() { install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh runhaskell Setup.lhs copy --destdir=$pkgdir - # runhaskell util/GenerateManpage.hs + #runhaskell util/GenerateManpage.hs install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1 diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD index 32710afb4..638a59ccf 100644 --- a/community/xmoto/PKGBUILD +++ b/community/xmoto/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 74121 2012-07-21 19:56:28Z giovanni $ +# $Id: PKGBUILD 77670 2012-10-13 11:46:18Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Denis (dtonator@gmail.com) pkgname=xmoto pkgver=0.5.10 -pkgrel=1 +pkgrel=2 pkgdesc="A challenging 2D motocross platform game, where physics play an important role." arch=('i686' 'x86_64' 'mips64el') url="http://xmoto.tuxfamily.org" license=('GPL') -depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' - 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' +depends=('libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' + 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'glu' 'libxdg-basedir' 'libxml++') +makedepends=('mesa') install=xmoto.install source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" 'xmoto-0.5.10-libpng15.patch' diff --git a/community/xvba-video-open/PKGBUILD b/community/xvba-video-open/PKGBUILD new file mode 100644 index 000000000..b676215f2 --- /dev/null +++ b/community/xvba-video-open/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 77096 2012-10-04 19:43:11Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Jesse Jaara <gmail.com: jesse.jaara> + +pkgname=xvba-video-open +pkgver=0.8.0 +pkgrel=1 +pkgdesc="OSS version of xvba-video lib to enable hw video acceleration on AMD's HD series of GFX cards" +arch=('i686' 'x86_64') +url="http://www.splitted-desktop.com/~gbeauchesne/xvba-video/" +license=('GPL2') +depends=('catalyst-utils' 'libva') +makedepends=('mesa') +options=(!libtool) +source=(ftp://ftp.archlinux.org/other/community/xvba-video-open/xvba-video-${pkgver}.tar.gz + http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz) +md5sums=('d9ddec2e7f02c1fa533773918e88e311' + 'b8f56bc55aa70cb19dd12857fdc184cc') + +build() { + cd "${srcdir}/xvba-video-${pkgver}" + + export CPPFLAGS="${CPPFLAGS} -I${srcdir}/include" + + ./configure --disable-debug --enable-libxvba-dlopen --prefix=/usr + make PYTHON=python2 +} + +package() { + cd "${srcdir}/xvba-video-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD index 9321c6902..204be06b7 100644 --- a/community/yagf/PKGBUILD +++ b/community/yagf/PKGBUILD @@ -1,16 +1,18 @@ -# $Id: PKGBUILD 76111 2012-09-11 14:07:51Z spupykin $ +# $Id: PKGBUILD 76879 2012-10-01 15:20:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: das-ich <das-ich@yandex.ru> pkgname=yagf pkgver=0.9.2 -pkgrel=1 -pkgdesc="QT4-based GUI for Cuneiform OCR" +pkgrel=2 +pkgdesc="QT4-based GUI for Cuneiform and Tesseract OCRs" arch=(i686 x86_64 'mips64el') url="http://symmetrica.net/cuneiform-linux/yagf-en.html" license=('GPL') -depends=('cuneiform' 'qt>=4.3' 'aspell') -optdepends=('xsane: acquire images from a scanner into YAGF directly') +depends=('qt>=4.3' 'aspell') +optdepends=('cuneiform: recognition tool' + 'tesseract: recognition tool' + 'xsane: acquire images from a scanner into YAGF directly') makedepends=('cmake') install=yagf.install source=(http://symmetrica.net/cuneiform-linux/${pkgname}-${pkgver}.tar.gz) diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD new file mode 100644 index 000000000..de678da8a --- /dev/null +++ b/community/zathura-pdf-mupdf/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 67819 2012-03-14 16:22:14Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Moritz Lipp <mlq@pwmt.org> + +pkgname=zathura-pdf-mupdf +pkgver=0.2.1 +pkgrel=1 +pkgdesc="Adds pdf support to zathura by using the mupdf library" +arch=('i686' 'x86_64') +url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/" +license=('custom') +depends=('mupdf>=1.1' 'zathura') +conflicts=('zathura-pdf-poppler') +source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") +md5sums=('954b6375b5d81e91cd7477e8a5b4552f') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + make +} + +package(){ + cd "${srcdir}/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index c9ac12199..94811a9bd 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71849 2012-06-02 10:32:56Z bluewind $ +# $Id: PKGBUILD 78271 2012-10-17 10:28:08Z allan $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc pkgver=0.206 -pkgrel=2 +pkgrel=3 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') @@ -47,4 +47,4 @@ package() { make DESTDIR="$pkgdir" install } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: |