diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-18 10:38:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-18 10:38:15 -0300 |
| commit | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (patch) | |
| tree | 452fb18314fb6d4393552d1ef1190a3168353f44 | |
| parent | bb3524a1ba0370174d0c586ae94cd503b562a207 (diff) | |
| parent | 9e3985ed7c9851da65023a0ab3d0739cce1858e2 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gambas2/PKGBUILD
community-staging/gambas3/PKGBUILD
community-staging/libextractor/PKGBUILD
community-staging/pdf2djvu/PKGBUILD
community/dante/PKGBUILD
community/gnunet/PKGBUILD
community/luafilesystem/PKGBUILD
community/luajit/PKGBUILD
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/pycrypto/PKGBUILD
extra/pygobject/PKGBUILD
extra/pygobject2/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/python/PKGBUILD
extra/vde2/PKGBUILD
gnome-unstable/clutter-gtk/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/gcr/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
staging/kdebase-workspace/PKGBUILD
testing/iputils/PKGBUILD
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php-fpm.service
testing/php/rc.d.php-fpm
155 files changed, 3479 insertions, 726 deletions
diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD index bcd07aff4..9ef4b7b07 100644 --- a/artistic/blender-spacenav-libre/PKGBUILD +++ b/artistic/blender-spacenav-libre/PKGBUILD @@ -1,65 +1,97 @@ # $Id$ # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -_pkgname=blender pkgname=blender-spacenav-libre -pkgver=2.64 +pkgver=2.64a pkgrel=1 -pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.blender.org" -depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' - 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' - 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' - 'openimageio' 'libsndfile' 'jack' 'libspnav') -makedepends=('cmake' 'boost') -replaces=("${_pkgname}") -conflicts=("${_pkgname}" "${_pkgname}-libre") -provides=("${_pkgname}=${pkgver}" "${_pkgname}-libre=${pkgver}") -install=${_pkgname}.install -source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz - ffmpeg-0.11.patch - boost-1.50.patch) -md5sums=('caec080d2a3dcd57fe1ca20c51c00e53' - '9e5649403e51654615d30b10bc460217' - '0bab80da07d980c47b8ce3cb998edaef') +pkgaev=5 +pkgdesc='A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)' +arch=( + i686 + x86_64 + mips64el +) +license=( + GPL +) +url=http://www.${pkgname%-spacenav-libre}.org +depends=( + boost-libs + desktop-file-utils + ffmpeg + fftw + freetype2 + glew + glu + hicolor-icon-theme + jack + libgl + libpng + libsndfile + libspnav + libtiff + openal + opencollada + opencolorio + openexr + openimageio + python + shared-mime-info + xdg-utils +) +makedepends=( + mesa + boost + cmake + subversion +) +replaces=( + ${pkgname%-spacenav-libre} +) +conflicts=( + ${pkgname%-spacenav-libre} +) +provides=( + ${pkgname%-spacenav-libre}=$pkgaev:$pkgver +) +install=${pkgname%-spacenav-libre}.install +source=( + http://download.${pkgname%-spacenav-libre}.org/source/${pkgname%-spacenav-libre}-$pkgver.tar.gz +) +sha512sums=( + 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5 +) build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - #patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch - #patch -Np1 < "${srcdir}"/boost-1.50.patch - #sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h - #sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c + cd $srcdir/${pkgname%-spacenav-libre}-$pkgver mkdir build cd build - [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD=OFF" + [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DWITH_INSTALL_PORTABLE=OFF \ - -DWITH_PYTHON_INSTALL=OFF \ - -DWITH_OPENCOLLADA=ON \ - -DOPENIMAGEIO_ROOT_DIR=/usr \ - -DWITH_GAMEENGINE=ON \ - -DWITH_JACK=ON \ - -DWITH_PLAYER=ON \ - -DWITH_BUILTIN_GLEW=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \ + -DPYTHON_LIBPATH=/usr/lib \ + -DPYTHON_LIBRARY=python3.2mu \ + -DPYTHON_VERSION=3.2 \ + $DSUPPORT_SSE2_BUILD \ -DWITH_CODEC_FFMPEG=ON \ -DWITH_CODEC_SNDFILE=ON \ -DWITH_CYCLES=ON \ -DWITH_CYCLES_CUDA_BINARIES=OFF \ -DWITH_FFTW3=ON \ + -DWITH_GAMEENGINE=ON \ + -DWITH_IMAGE_REDCODE=OFF \ + -DWITH_INSTALL_PORTABLE=OFF \ + -DWITH_JACK=ON \ -DWITH_MOD_OCEANSIM=ON \ - -DPYTHON_VERSION=3.2 \ - -DPYTHON_LIBPATH=/usr/lib \ - -DPYTHON_LIBRARY=python3.2mu \ - -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \ - $ENABLESSE2 + -DWITH_OPENCOLLADA=ON \ + -DWITH_PLAYER=ON \ + -DWITH_PYTHON_INSTALL=OFF \ + -DWITH_SYSTEM_GLEW=ON make $MAKEFLAGS @@ -67,7 +99,7 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - python -m compileall "${pkgdir}/usr/share/blender" + cd $srcdir/${pkgname%-spacenav-libre}-$pkgver/build + make DESTDIR=$pkgdir install + python -m compileall $pkgdir/usr/share/blender } 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/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/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/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/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/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/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/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/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/gigi/PKGBUILD b/community/gigi/PKGBUILD index ee46e850e..82f7ed14e 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77640 2012-10-13 11:43:07Z allan $ +# $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,7 +7,7 @@ pkgname=gigi pkgver=0.8.0 -pkgrel=13 +pkgrel=14 _fixedrevision=5208 pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)" url="http://gigi.sourceforge.net/" @@ -66,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/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/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/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index b20f59876..a0fcbab1b 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77347 2012-10-09 04:17:42Z tdziedzic $ +# $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 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/hslogger" license=('LGPL') @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') 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/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/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index bef043e60..e727d5644 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77124 2012-10-05 11:03:22Z 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=4 +pkgrel=5 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ipsec-tools.sourceforge.net/" @@ -15,11 +15,13 @@ options=('!makeflags' '!libtool') source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 racoon.rc ipsec.rc - racoon.service) + racoon.service + ipsec.service) md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619' '416b8e362d86987b8c55f7153cdafbeb' '90d0810267cbd847383ae3101699b192' - '1632fce55ba5592dea1f8bf661106e7d') + '1632fce55ba5592dea1f8bf661106e7d' + 'bc05a2b85e41bf89dac809657e857730') build() { cd $srcdir/$pkgname-$pkgver @@ -36,4 +38,5 @@ package() { 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/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/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..ff461694f 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 78364 2012-10-17 15:26:40Z 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=2 +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" - + cd $srcdir/LuaJIT-${pkgver/b/-beta} + patch -Np0 -i $srcdir/Makefile.patch make } 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/PKGBUILD b/community/luakit/PKGBUILD index 005a39842..20ae4d8e1 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76207 2012-09-14 04:30:59Z bpiotrowski $ +# $Id: PKGBUILD 78391 2012-10-17 16:47:33Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com> @@ -6,12 +6,12 @@ pkgname=luakit pkgver=2012.09.13.r1 _pkgver=2012.09.13-r1 -pkgrel=1 +pkgrel=2 pkgdesc='Fast, small, webkit based browser framework extensible by Lua' arch=('i686' 'x86_64' 'mips64el') url='http://www.luakit.org/projects/luakit' license=('GPL3') -depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils' 'luajit') +depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils') makedepends=('git' 'help2man') options=(!makeflags) install='luakit.install' @@ -20,7 +20,7 @@ md5sums=('77b02e6d19ba021409f1778fddd94a42') build() { cd mason-larobina-luakit-* - make USE_LUAJIT=1 PREFIX=/usr DESTDIR=$pkgdir all + make PREFIX=/usr DESTDIR=$pkgdir all } package() { 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/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD index 85dbc9304..7a3096254 100644 --- a/community/mediaproxy/PKGBUILD +++ b/community/mediaproxy/PKGBUILD @@ -1,24 +1,33 @@ -# $Id: PKGBUILD 76639 2012-09-25 15:05:50Z 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=2 +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') + '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() { 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/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/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/onboard/PKGBUILD b/community/onboard/PKGBUILD index 8b4fe0def..78977549c 100644 --- a/community/onboard/PKGBUILD +++ b/community/onboard/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76260 2012-09-15 09:38:36Z bgyorgy $ +# $Id: PKGBUILD 78206 2012-10-17 10:25:00Z allan $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=onboard -pkgver=0.98.0 -pkgrel=2 +pkgver=0.98.1 +pkgrel=1 pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/onboard" @@ -15,10 +15,13 @@ optdepends=('at-spi2-atk: auto-show when editing text' options=('!emptydirs') install=$pkgname.install source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('0a2627840740f271e5daba4c1c9c9096') +md5sums=('107e031b429329b71deb67c9b90195d6') package() { cd "$srcdir/$pkgname-$pkgver" - python setup.py install --root=$pkgdir/ --optimize=1 + # Do not set getpreferredencoding, because it breaks getstatusoutput() in the setup script + sed -i '/getpreferredencoding =/ d' setup.py + + python3 setup.py install --root=$pkgdir/ --optimize=1 } 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/opensips/PKGBUILD b/community/opensips/PKGBUILD index 6664e605e..17f8d3473 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76218 2012-09-14 10:04:13Z spupykin $ +# $Id: PKGBUILD 78328 2012-10-17 14:22:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips pkgver=1.8.1 -pkgrel=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=('b3d10665ba7a47d440d60391f162dfd2' - '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/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/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/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/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/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..7dc20c761 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,23 +1,37 @@ -# $Id: PKGBUILD 75966 2012-09-07 11:19:50Z arodseth $ +# $Id: PKGBUILD 78242 2012-10-17 10:26:39Z allan $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> -pkgname=python-pymongo +pkgbase=python-pymongo +pkgname=('python-pymongo' 'python2-pymongo') pkgver=2.3 -pkgrel=1 +pkgrel=2 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() { +build() { + cd "$srcdir" + 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..12e81af63 100644 --- a/community/python-pyxattr/PKGBUILD +++ b/community/python-pyxattr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66406 2012-02-24 13:20:20Z lfleischer $ +# $Id: PKGBUILD 78249 2012-10-17 10:26:58Z allan $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Jon Bergli Heier <snakebite@jvnv.net> @@ -6,7 +6,7 @@ pkgname=('python2-pyxattr' 'python-pyxattr') pkgbase=python-pyxattr _pkgname=pyxattr pkgver=0.5.0 -pkgrel=3 +pkgrel=4 pkgdesc='A python extension module that allows you to manipulate the extended attributes.' arch=('i686' 'x86_64' 'mips64el') url='http://pyxattr.sourceforge.net/' 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-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 7bb6b48da..68f04fa70 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('python-scipy' 'python2-scipy') pkgver=0.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') url="http://www.scipy.org/" 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-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 index d9f5b18f5..49b368ada 100644 --- a/community/python2-imaging/PKGBUILD +++ b/community/python2-imaging/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77148 2012-10-05 14:37:44Z kkeen $ +# $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> 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-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-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/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/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/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/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD index 296bed607..52f6262af 100644 --- a/community/ubuntuone-client/PKGBUILD +++ b/community/ubuntuone-client/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 77827 2012-10-15 01:33:32Z 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=4.0.0 -pkgrel=1 +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') +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 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/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/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/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/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: diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD index 7536128ff..d0f0ec89e 100644 --- a/extra/bzr/PKGBUILD +++ b/extra/bzr/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 160247 2012-05-31 16:28:09Z eric $ +# $Id: PKGBUILD 168990 2012-10-17 10:19:13Z allan $ # Maintainer : # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=bzr pkgver=2.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="A decentralized revision control system (bazaar)" arch=('i686' 'x86_64' 'mips64el') url="http://bazaar.canonical.com/en/" license=('GPL') depends=('python2') -optdepends=('python-paramiko: for sftp support') +optdepends=('python2-paramiko: for sftp support') source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig}) md5sums=('ac5079858364a046071000d5cdccb67b' 'c83dd08dd2c3e27edbab873500d7d6eb') diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD index 735c36bfe..ed1cb8240 100644 --- a/extra/dbus-python/PKGBUILD +++ b/extra/dbus-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162393 2012-06-26 18:57:06Z andyrtr $ +# $Id: PKGBUILD 168991 2012-10-17 10:19:14Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=dbus-python pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for DBUS" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') @@ -39,7 +39,7 @@ package_python-dbus-common() { package_python-dbus() { depends=('python-dbus-common' 'python' 'dbus-core') optdepends=('dbus-glib: glib mainloop support') - pkgdesc="Python 3.2 bindings for DBUS" + pkgdesc="Python 3.3 bindings for DBUS" cd "${srcdir}/build-python3" make DESTDIR="${pkgdir}" install diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD index 520d48e83..939de0ee0 100644 --- a/extra/gnome-python-desktop/PKGBUILD +++ b/extra/gnome-python-desktop/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 157924 2012-04-30 06:08:46Z eric $ +# $Id: PKGBUILD 169097 2012-10-17 22:51:16Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> pkgbase=gnome-python-desktop -pkgname=('gnome-python-desktop' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck') +pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck') pkgver=2.32.0 -pkgrel=10 +pkgrel=12 arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') options=('!libtool') @@ -25,48 +25,58 @@ build() { } package_gnome-python-desktop() { - depends=('python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'gnome-python') + depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python') pkgdesc="Python bindings for the GNOME desktop environment" cd "${srcdir}/${pkgbase}-${pkgver}" make install-pkgconfigDATA DESTDIR="${pkgdir}" } -package_python-gnomedesktop() { +package_python2-gnomedesktop() { depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs') pkgdesc="Python bindings for gnome-desktop 2.x" - + conflicts=('python-gnomedesktop<=2.32.0-10') + replaces=('python-gnomedesktop<=2.32.0-10') + cd "${srcdir}/${pkgbase}-${pkgver}" make -C gnomedesktop install DESTDIR="${pkgdir}" } -package_python-gnomekeyring() { +package_python2-gnomekeyring() { depends=('pygtk' 'libgnome-keyring') pkgdesc="Python bindings for libgnome-keyring" + conflicts=('python-gnomekeyring<=2.32.0-10') + replaces=('python-gnomekeyring<=2.32.0-10') cd "${srcdir}/${pkgbase}-${pkgver}" make -C gnomekeyring install DESTDIR="${pkgdir}" } -package_python-gtop() { +package_python2-gtop() { depends=('pygtk' 'libgtop') pkgdesc="Python bindings for libgtop" + conflicts=('python-gtop<=2.32.0-10') + replaces=('python-gtop<=2.32.0-10') cd "${srcdir}/${pkgbase}-${pkgver}" make -C gtop install DESTDIR="${pkgdir}" } -package_python-metacity() { +package_python2-metacity() { depends=('pygtk' 'metacity') pkgdesc="Python bindings for metacity" + conflicts=('python-metacity<=2.32.0-10') + replaces=('python-metacity<=2.32.0-10') cd "${srcdir}/${pkgbase}-${pkgver}" make -C metacity install DESTDIR="${pkgdir}" } -package_python-rsvg() { +package_python2-rsvg() { depends=('pygtk' 'librsvg') pkgdesc="Python bindings for librsvg" + conflicts=('python-rsvg<=2.32.0-10') + replaces=('python-rsvg<=2.32.0-10') cd "${srcdir}/${pkgbase}-${pkgver}" make -C rsvg install DESTDIR="${pkgdir}" @@ -74,9 +84,11 @@ package_python-rsvg() { install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" } -package_python-totem-plparser() { +package_python2-totem-plparser() { depends=('pygtk' 'totem-plparser' 'python2-gnomevfs') pkgdesc="Python bindings for totem-plparser" + conflicts=('python-totem-plparser<=2.32.0-10') + replaces=('python-totem-plparser<=2.32.0-10') cd "${srcdir}/${pkgbase}-${pkgver}" make -C totem install DESTDIR="${pkgdir}" @@ -84,9 +96,11 @@ package_python-totem-plparser() { install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" } -package_python-wnck() { +package_python2-wnck() { depends=('pygtk' 'libwnck') pkgdesc="Python bindings for libwnck" + conflicts=('python-wnck<=2.32.0-10') + replaces=('python-wnck<=2.32.0-10') cd "${srcdir}/${pkgbase}-${pkgver}" make -C wnck install DESTDIR="${pkgdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 1ed8f30c8..c2619bd68 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168439 2012-10-11 21:49:14Z andrea $ +# $Id: PKGBUILD 168996 2012-10-17 10:19:28Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD index 543cfd671..4ccc6a798 100644 --- a/extra/konversation/PKGBUILD +++ b/extra/konversation/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144356 2011-12-05 01:48:51Z stephane $ +# $Id: PKGBUILD 168997 2012-10-17 10:19:30Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: James Rayner <iphitus@gmail.com> @@ -6,12 +6,13 @@ pkgname=konversation pkgver=1.4 -pkgrel=1 +pkgrel=3 pkgdesc="A user friendly IRC client for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://konversation.kde.org" -depends=('kdebase-runtime' 'kdepimlibs' 'python') +depends=('kdebase-runtime' 'kdepimlibs') makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml') +optdepends=('python: python scripting support') license=('GPL2' 'FDL') install=${pkgname}.install options=('!makeflags') @@ -34,7 +35,7 @@ package() { make DESTDIR="${pkgdir}" install # Remove a bunch of symlinks pointing to non-existant files - for lang in pt_BR uk sv et de en nl; do - rm "${pkgdir}"/usr/share/doc/kde/html/${lang}/konversation/common + for _lang in pt_BR uk sv et de en nl; do + rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common done } diff --git a/extra/konversation/konversation.install b/extra/konversation/konversation.install index 5a3809d3f..8834e059a 100644 --- a/extra/konversation/konversation.install +++ b/extra/konversation/konversation.install @@ -1,12 +1,12 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-desktop-database -q } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index aee11f9d4..beb0da687 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158026 2012-05-01 10:12:56Z giovanni $ +# $Id: PKGBUILD 169082 2012-10-17 18:53:40Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.7.6 +pkgver=4.7.8 pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc') options=('!libtool' '!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('1213bc22b2239b1abe0edee25ef38823') +md5sums=('27de0300841a6e8cbd607d5cb43d4eda') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 74056ffc9..86d18e87e 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167982 2012-10-04 16:26:08Z giovanni $ +# $Id: PKGBUILD 169079 2012-10-17 18:31:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.10.04 +pkgver=2012.10.17 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('6188132efc675f2f6b298b8f5fae6b2f') +md5sums=('c9319c87a768c01f8007965db5453ca1') build() { cd ${srcdir}/live diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 7a5ac9480..94defebce 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 168768 2012-10-15 19:27:04Z ronald $ +# $Id: PKGBUILD 168998 2012-10-17 10:19:32Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro pkgver=5.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64' 'mips64el') url="http://www.getmiro.com" license=('GPL2') -depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' - 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info' +depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' + 'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info' 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' - 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar' - 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' + 'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar' + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils') makedepends=('pkg-config' 'boost') install=miro.install @@ -34,16 +34,16 @@ build() { sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro" # fix python scripts for python2 - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" ${pkgdir}/usr/share/miro/resources/searchengines/update-icons.py + sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}"/usr/share/miro/resources/searchengines/update-icons.py for i in usr/share/miro/resources/testdata/echonest-replies/generate.py usr/share/miro/resources/searchengines/update-icons.py \ usr/share/miro/resources/testdata/7digital-replies/generate.py; do - sed -i "s|/usr/bin/python|/usr/bin/python2|" ${pkgdir}/${i} + sed -i "s|/usr/bin/python|/usr/bin/python2|" "${pkgdir}"/${i} done # Fakeroot segfaults on these; remove - if [ ${arch} == "i686" ]; then - rm -f ${pkgdir}/usr/bin/codegen.Linux-x86_64 || true + if [ ${CARCH} == "i686" ]; then + rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true else - rm -f ${pkgdir}/usr/bin/codegen.Linux-i686 || true + rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true fi } diff --git a/extra/mod_wsgi/PKGBUILD b/extra/mod_wsgi/PKGBUILD index 5e03a9070..43e6fa266 100644 --- a/extra/mod_wsgi/PKGBUILD +++ b/extra/mod_wsgi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150577 2012-02-18 15:19:06Z pierre $ +# $Id: PKGBUILD 169100 2012-10-18 01:08:10Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Ryan Coyner <rcoyner@gmail.com> pkgname=mod_wsgi -pkgver=3.3 -pkgrel=3 +pkgver=3.4 +pkgrel=1 pkgdesc="Python WSGI adapter module for Apache" arch=('i686' 'x86_64' 'mips64el') url="http://www.modwsgi.org/" @@ -12,7 +12,7 @@ license=('APACHE') depends=('apache' 'python2') install=mod_wsgi.install source=("http://modwsgi.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('6172bb2bbabcd0c25867c2bc06f99dbb') +md5sums=('f42d69190ea0c337ef259cbe8d94d985') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD index deabdd2d3..c8d64320c 100644 --- a/extra/pyalpm/PKGBUILD +++ b/extra/pyalpm/PKGBUILD @@ -2,7 +2,7 @@ pkgname=pyalpm pkgver=0.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="Libalpm bindings for Python 3" arch=('i686' 'x86_64' 'mips64el') url="http://projects.archlinux.org/users/remy/pyalpm.git/" diff --git a/extra/pycrypto/PKGBUILD b/extra/pycrypto/PKGBUILD index b011e10d1..17f58e616 100644 --- a/extra/pycrypto/PKGBUILD +++ b/extra/pycrypto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165053 2012-08-09 19:15:19Z jgc $ +# $Id: PKGBUILD 169001 2012-10-17 10:19:44Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> pkgbase=pycrypto pkgname=('python2-crypto' 'python-crypto') pkgver=2.6 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'python') url="http://www.dlitz.net/software/pycrypto/" @@ -41,7 +41,7 @@ package_python2-crypto() { } package_python-crypto() { - pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Pythoni 3." + pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3." depends=('python') cd "${srcdir}/${pkgbase}-${pkgver}-py3" diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 16420af96..48c5691d2 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159046 2012-05-15 11:01:15Z heftig $ +# $Id: PKGBUILD 169002 2012-10-17 10:19:46Z allan $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) pkgver=3.2.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="https://live.gnome.org/PyGObject" license=('LGPL') diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD index b8a3ed497..6df4b19cc 100644 --- a/extra/pygobject2/PKGBUILD +++ b/extra/pygobject2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158678 2012-05-06 22:44:32Z bisson $ +# $Id: PKGBUILD 169003 2012-10-17 10:19:49Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=pygobject2 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) pkgver=2.28.6 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') url="http://www.pygtk.org/" license=('LGPL') diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD index b24f162b7..7056b53f7 100644 --- a/extra/pyopenssl/PKGBUILD +++ b/extra/pyopenssl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138458 2011-09-23 18:52:47Z ibiru $ +# $Id: PKGBUILD 169005 2012-10-17 10:19:52Z allan $ # Maintainer : Ionut Biru<ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgbase=pyopenssl -pkgname=('pyopenssl' 'python2-pyopenssl') +pkgname=('python-pyopenssl' 'python2-pyopenssl') pkgver=0.13 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://pypi.python.org/pypi/pyOpenSSL" license=('LGPL2.1') @@ -26,9 +26,12 @@ build() { python2 setup.py build } -package_pyopenssl(){ +package_python-pyopenssl(){ pkgdesc="Python3 wrapper module around the OpenSSL library" - depends=('python>=3.2' 'openssl') + depends=('python>=3.3' 'openssl') + replaces=('pyopenssl') + provides=('pyopenssl') + conflicts=('pyopenssl') cd "${srcdir}/pyOpenSSL-${pkgver}" python setup.py install --root "${pkgdir}" --optimize=1 diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index ba1efbddd..b42ef3d73 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,31 +1,24 @@ -# $Id: PKGBUILD 163679 2012-07-17 18:11:04Z andrea $ +# $Id: PKGBUILD 169006 2012-10-17 10:19:54Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') -pkgver=4.9.4 +pkgver=4.9.5 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon' - 'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') -source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" - 'fix-pyuic4.patch') -md5sums=('a0b6a820633366365af5124ddbd059c7' - '097651aea0bafded5abdfd6d62afd2ad') + 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') +source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('e4cdd6619c63655f7510efb4df8462fb') build() { - # FS#30728 - cd "${srcdir}"/PyQt-x11-gpl-${pkgver} - patch -p1 -i "${srcdir}"/fix-pyuic4.patch - cd .. - cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} - cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + cd PyQt-x11-gpl-${pkgver} python configure.py \ --confirm-license \ --qsci-api @@ -36,7 +29,7 @@ build() { make ### Python2 version ### - cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + cd ../Py2Qt-x11-gpl-${pkgver} python2 configure.py \ --confirm-license \ -v /usr/share/sip \ @@ -51,10 +44,9 @@ build() { package_pyqt-common(){ pkgdesc="Common PyQt files shared between pyqt and python2-pyqt" - cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + cd PyQt-x11-gpl-${pkgver} make -C pyrcc DESTDIR="${pkgdir}" install make -C pylupdate DESTDIR="${pkgdir}" install - make -C designer INSTALL_ROOT="${pkgdir}" install install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api } @@ -66,13 +58,12 @@ package_pyqt(){ 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + cd PyQt-x11-gpl-${pkgver} # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install # Provided by pyqt-common rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} - rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api } @@ -80,19 +71,19 @@ package_python2-pyqt(){ pkgdesc="A set of Python 2.x bindings for the Qt toolkit" depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common') optdepends=('phonon: enable audio and video in PyQt applications' - 'python-opengl: enable OpenGL 3D graphics in PyQt applications' + 'python2-opengl: enable OpenGL 3D graphics in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') provides=('python2-qt') - cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + cd Py2Qt-x11-gpl-${pkgver} # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install # Fix conflicts with pyqt mv "${pkgdir}"/usr/bin/{,python2-}pyuic4 - # Provided by pyqt-common + # Provided by pyqt rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api diff --git a/extra/python-cairo/PKGBUILD b/extra/python-cairo/PKGBUILD index 116763cc8..8034ee1b0 100644 --- a/extra/python-cairo/PKGBUILD +++ b/extra/python-cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 121116 2011-04-29 03:02:02Z angvp $ +# $Id: PKGBUILD 169010 2012-10-17 10:20:01Z allan $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=python-cairo pkgver=1.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for the cairo graphics library" arch=('i686' 'x86_64' 'mips64el') license=('LGPL3') @@ -18,19 +18,11 @@ md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5') build() { cd "${srcdir}/pycairo-${pkgver}" - # We patch the embedded copy of waf to fix compiling against python 3.2 - # (due to PEP-3149), by using the appropriate python-config tool, rather - # than trying to find the libraries by directly using PYTHON_VERSION - # Ensure that ./waf has created the cached unpacked version # of the wafadmin source tree. # This will be created to a subdirectory like # .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752 - python ./waf --version - - # Patch the unpacked version of waf: - pushd .waf3* - popd + python3 ./waf --version ./waf configure --prefix=/usr ./waf build diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD index a1f63c3b5..47a144f6a 100644 --- a/extra/python-egenix-mx-base/PKGBUILD +++ b/extra/python-egenix-mx-base/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 159295 2012-05-21 01:39:56Z stephane $ +# $Id: PKGBUILD 169013 2012-10-17 10:20:08Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -pkgname=python-egenix-mx-base +pkgbase=python-egenix-mx-base +pkgname=('python2-egenix-mx-base') _origname=egenix-mx-base pkgver=3.2.4 -pkgrel=1 +pkgrel=3 pkgdesc="A collection of Python tools" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.egenix.com/products/python/mxBase/" -depends=('python2') -replaces=('egenix-mx-base') -provides=('egenix-mx-base') +makedepends=('python2') +conflicts=('python-egenix-mx-base<=3.2.4-1') +replaces=('python-egenix-mx-base<=3.2.4-1') source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz") sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7') build() { cd "${srcdir}/${_origname}-${pkgver}" - find . -name \*.py -exec sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" \ - -e "s|#!/usr/local/.*python.*|#!/usr/bin/env python2|" {} \; + find . -name \*.py -exec sed -i -e "s|^#!.*python|#!/usr/bin/python2|" {} \; python2 setup.py build } -package() { +package_python2-egenix-mx-base() { + depends=('python2>=2.7') cd "${srcdir}/${_origname}-${pkgver}" python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1 install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/python-iwscan/PKGBUILD b/extra/python-iwscan/PKGBUILD index 603675f82..0bbb8118b 100644 --- a/extra/python-iwscan/PKGBUILD +++ b/extra/python-iwscan/PKGBUILD @@ -1,18 +1,26 @@ +# $Id: PKGBUILD 169016 2012-10-17 10:20:21Z allan $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> -pkgname=python-iwscan +pkgbase=python-iwscan +pkgname=python2-iwscan pkgver=20090609 -pkgrel=3 +pkgrel=4 pkgdesc="A Python interface to iwlist, using the iwlib library" arch=('i686' 'x86_64' 'mips64el') url="http://projects.otaku42.de/browser/python-iwscan" license=('LGPL') depends=('python2' 'wireless_tools') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-20090609.tar.gz) +conflicts=('python-iwscan<=20090609-3') +replaces=('python-iwscan<=20090609-3') +source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz) md5sums=('30fbe8ad3b07e67c1c35db2de16077d8') build() { - cd ${srcdir}/${pkgname} + cd "${srcdir}/${pkgbase}" python2 setup.py build - python2 setup.py install --root=${pkgdir} +} + +package_python2-iwscan() { + cd "${srcdir}/${pkgbase}" + python2 setup.py install --root="${pkgdir}" } diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 0701a5435..c8f808edd 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164350 2012-07-31 09:59:25Z eric $ +# $Id: PKGBUILD 169019 2012-10-17 10:20:31Z allan $ # Maintainer: pkgname=('python-lxml' 'python2-lxml') -pkgver=2.3.5 +pkgver=3.0 pkgrel=1 pkgdesc="Python binding for the libxml2 and libxslt libraries" arch=('i686' 'x86_64' 'mips64el') @@ -10,8 +10,8 @@ license=('BSD' 'custom') url="http://lxml.de/" makedepends=('python2' 'python' 'libxslt') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -sha1sums=('4fec0ca5054a8d6220d3dc7230a5066850192848' - 'd74ad6509a0048ea0e979985e12869f2e1126b78') +sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441' + 'b38447fd3f9cfb30b4d56ffe3bec42739afb2947') check() { cd "${srcdir}"/lxml-$pkgver diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD index ca5cfcea0..b18890417 100644 --- a/extra/python-markupsafe/PKGBUILD +++ b/extra/python-markupsafe/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145461 2011-12-22 18:14:12Z ibiru $ +# $Id: PKGBUILD 169021 2012-10-17 10:20:38Z allan $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Alex Anthony <alex.anthony28991@gmail.com> pkgname=('python-markupsafe' 'python2-markupsafe') pkgver=0.15 -pkgrel=1 +pkgrel=2 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python" arch=('i686' 'x86_64' 'mips64el') url="http://pypi.python.org/pypi/MarkupSafe" @@ -15,27 +15,27 @@ md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186') build() { cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver} - cd ${srcdir}/MarkupSafe-${pkgver} + cd "${srcdir}/MarkupSafe-${pkgver}" python setup.py build - cd ${srcdir}/python2-MarkupSafe-${pkgver} + cd "${srcdir}/python2-MarkupSafe-${pkgver}" python2 setup.py build } package_python-markupsafe() { depends=('python') - cd ${srcdir}/MarkupSafe-${pkgver} - python setup.py install --root=${pkgdir} --optimize=1 + cd "${srcdir}/MarkupSafe-${pkgver}" + python setup.py install --root="${pkgdir}" --optimize=1 - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE" } package_python2-markupsafe() { depends=('python2') - cd ${srcdir}/python2-MarkupSafe-${pkgver} - python2 setup.py install --root=${pkgdir} --optimize=1 + cd "${srcdir}/python2-MarkupSafe-${pkgver}" + python2 setup.py install --root="${pkgdir}" --optimize=1 - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE" } diff --git a/extra/python-notify/PKGBUILD b/extra/python-notify/PKGBUILD index 8ac31fc04..adf4ea36f 100644 --- a/extra/python-notify/PKGBUILD +++ b/extra/python-notify/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 148890 2012-02-05 11:54:24Z ibiru $ +# $Id: PKGBUILD 169024 2012-10-17 10:20:48Z allan $ # Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: Mario Danic <mario.danic@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -pkgname=python-notify + +pkgbase=python-notify +pkgname=python2-notify pkgver=0.1.1 -pkgrel=11 +pkgrel=12 pkgdesc="Python bindings for libnotify" arch=('i686' 'x86_64' 'mips64el') url="http://www.galago-project.org/" license=('GPL') depends=('pygtk>=2.22.0' 'libnotify>=0.7.1') -makedepends=('pkgconfig' 'python2') +makedepends=('python2') +conflicts=('python-notify<=0.1.1-11') +replaces=('python-notify<=0.1.1-11') options=(!libtool) source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz libnotify07.patch @@ -22,10 +22,10 @@ md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4' 'c6922028da5951e69a6a0167bdb4461c') build() { - cd ${srcdir}/notify-python-${pkgver} + cd "${srcdir}/notify-python-${pkgver}" - patch -Np1 -i ${srcdir}/libnotify07.patch - patch -Np1 -i ${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch + patch -Np1 -i "${srcdir}/libnotify07.patch" + patch -Np1 -i "${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch" ./configure --prefix=/usr @@ -37,7 +37,7 @@ build() { make } -package() { - cd ${srcdir}/notify-python-${pkgver} - make DESTDIR=${pkgdir} install +package_python2-notify() { + cd "${srcdir}/notify-python-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index d6c41b055..4ba4575da 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,33 +1,34 @@ -# $Id: PKGBUILD 164237 2012-07-28 03:14:33Z stephane $ +# $Id: PKGBUILD 169025 2012-10-17 10:20:51Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') -pkgver=1.6.2 +pkgver=1.7.0 +_pkgver=1.7.0b2 pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://numpy.scipy.org/" makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose') -source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) -md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba') +source=(http://downloads.sourceforge.net/numpy/numpy-${_pkgver}.tar.gz) +md5sums=('1b62cf0e34e2db58b0241b00d603df24') build() { cd "${srcdir}" - cp -a numpy-${pkgver} numpy-py2-${pkgver} + cp -a numpy-${_pkgver} numpy-py2-${_pkgver} export Atlas=None export LDFLAGS="$LDFLAGS -shared" echo "Building Python2" - cd "${srcdir}/numpy-py2-${pkgver}" + cd "${srcdir}/numpy-py2-${_pkgver}" python2 setup.py config_fc --fcompiler=gnu95 build echo "Building Python3" - cd "${srcdir}/numpy-${pkgver}" + cd "${srcdir}/numpy-${_pkgver}" python setup.py config_fc --fcompiler=gnu95 build } @@ -35,7 +36,7 @@ package_python2-numpy() { depends=('lapack' 'python2') optdepends=('python-nose: testsuite') - cd "${srcdir}/numpy-py2-${pkgver}" + cd "${srcdir}/numpy-py2-${_pkgver}" python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy" @@ -53,7 +54,7 @@ package_python-numpy() { replaces=('python3-numpy') conflicts=('python3-numpy') - cd "${srcdir}/numpy-${pkgver}" + cd "${srcdir}/numpy-${_pkgver}" python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1 install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy" diff --git a/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch new file mode 100644 index 000000000..072afbc0e --- /dev/null +++ b/extra/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch @@ -0,0 +1,92 @@ +diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c +index 00c71f9..0afdc17 100644 +--- a/numpy/core/src/multiarray/scalarapi.c ++++ b/numpy/core/src/multiarray/scalarapi.c +@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) + itemsize = (((itemsize - 1) >> 2) + 1) << 2; + } + } ++#if PY_VERSION_HEX >= 0x03030000 ++ if (type_num == NPY_UNICODE) { ++ PyObject *u, *args; ++ char *buffer; ++ if (swap) { ++ buffer = malloc(itemsize); ++ if (buffer == NULL) { ++ PyErr_NoMemory(); ++ return NULL; ++ } ++ memcpy(buffer, data, itemsize); ++ byte_swap_vector(buffer, itemsize >> 2, 4); ++ } else { ++ buffer = data; ++ } ++ u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer, ++ itemsize >> 2); ++ if (swap) { ++ free(buffer); ++ } ++ if (u == NULL) { ++ return NULL; ++ } ++ args = Py_BuildValue("(O)", u); ++ if (args == NULL) { ++ Py_DECREF(u); ++ return NULL; ++ } ++ obj = type->tp_new(type, args, NULL); ++ Py_DECREF(u); ++ Py_DECREF(args); ++ return obj; ++ } ++#endif + if (type->tp_itemsize != 0) { + /* String type */ + obj = type->tp_alloc(type, itemsize); +@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) + memcpy(destptr, data, itemsize); + return obj; + } ++#if PY_VERSION_HEX < 0x03030000 + else if (type_num == PyArray_UNICODE) { + /* tp_alloc inherited from Python PyBaseObject_Type */ + PyUnicodeObject *uni = (PyUnicodeObject*)obj; +@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base) + #endif + return obj; + } ++#endif // PY_VERSION_HEX < 0x03030000 + else { + PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj; + vobj->base = NULL; +diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src +index e547071..12745d7 100644 +--- a/numpy/core/src/multiarray/scalartypes.c.src ++++ b/numpy/core/src/multiarray/scalartypes.c.src +@@ -2592,7 +2592,11 @@ finish: + *((npy_@name@ *)dest) = *((npy_@name@ *)src); + #elif @default@ == 1 /* unicode and strings */ + if (itemsize == 0) { /* unicode */ ++#if PY_VERSION_HEX >= 0x03030000 ++ itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj); ++#else + itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE); ++#endif + } + memcpy(dest, src, itemsize); + /* @default@ == 2 won't get here */ +diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c +index c4147ef..119056c 100644 +--- a/numpy/core/src/multiarray/methods.c ++++ b/numpy/core/src/multiarray/methods.c +@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args) + if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) { + int swap=!PyArray_ISNOTSWAPPED(self); + self->data = datastr; +- if (!_IsAligned(self) || swap) { ++ if (!_IsAligned(self) || swap || (len <= 1000)) { + intp num = PyArray_NBYTES(self); + self->data = PyDataMem_NEW(num); + if (self->data == NULL) { +-- +1.7.12.3 diff --git a/extra/python-pyspi/PKGBUILD b/extra/python-pyspi/PKGBUILD index 9a7e2ab45..f995971a1 100644 --- a/extra/python-pyspi/PKGBUILD +++ b/extra/python-pyspi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 151344 2012-02-25 14:53:09Z pierre $ +# $Id: PKGBUILD 169029 2012-10-17 10:20:57Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> -pkgname=python-pyspi +pkgbase=python-pyspi +pkgname=python2-pyspi pkgver=0.6.1 -pkgrel=5 +pkgrel=1 pkgdesc="Python AT-SPI bindings" arch=('i686' 'x86_64' 'mips64el') url="http://people.redhat.com/zcerza/dogtail" license=('LGPL') depends=('python2' 'at-spi') makedepends=('pyrex') -conflicts=('pyspi') -provides=('pyspi') -replaces=('pyspi') +conflicts=('python-pyspi<=0.6.1-5') +conflicts=('python-pyspi<=0.6.1-5') source=("http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz" 'pyspi-build.patch') md5sums=('def336bd566ea688a06ec03db7ccf1f4' @@ -24,5 +24,9 @@ build() { patch -Np1 -i ${srcdir}/pyspi-build.patch # Pyrex tells us to use __cinit__ instead of __new__ sed -i 's/__new__/__cinit__/' pyspi.pyx +} + +package_python2-pyspi() { + cd ${srcdir}/pyspi-${pkgver} python2 setup.py install --root=${pkgdir} } diff --git a/extra/python-pysqlite/PKGBUILD b/extra/python-pysqlite/PKGBUILD index 3c01803a8..c7f2acb08 100644 --- a/extra/python-pysqlite/PKGBUILD +++ b/extra/python-pysqlite/PKGBUILD @@ -1,34 +1,38 @@ -# $Id: PKGBUILD 155872 2012-04-08 07:25:46Z remy $ +# $Id: PKGBUILD 169030 2012-10-17 10:21:00Z allan $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -pkgname=python-pysqlite + +pkgbase=python-pysqlite +pkgname=python2-pysqlite pkgver=2.6.3 -pkgrel=2 +pkgrel=3 pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" license=('custom') arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/pysqlite/" depends=('python2' 'sqlite') -replaces=('pysqlite2') +conflicts=('python-pysqlite<=2.6.3-2') +replaces=('python-pysqlite<=2.6.3-2') source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \ setup.cfg) md5sums=('711afa1062a1d2c4a67acdf02a33d86e' '86dd356c65afd14a22f2f8f64a26441e') check() { - cd ${pkgdir}/usr/lib/python2.7/site-packages + cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/ python2 -c "from pysqlite2 import test; test.test()" } build() { - cd ${srcdir}/pysqlite-${pkgver} - cp ${srcdir}/setup.cfg . - python2 setup.py install --root=${pkgdir} + cd "${srcdir}/pysqlite-${pkgver}" + cp "${srcdir}/setup.cfg" . + python2 setup.py build } -package() { - cd ${srcdir}/pysqlite-${pkgver} - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -r ${pkgdir}/usr/pysqlite2-doc +package_python2-pysqlite() { + cd "${srcdir}/pysqlite-${pkgver}" + python2 setup.py install --root="${pkgdir}" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -r "${pkgdir}/usr/pysqlite2-doc" } diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD index cfb2eb890..a17f52206 100644 --- a/extra/python-urwid/PKGBUILD +++ b/extra/python-urwid/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('python-urwid' 'python2-urwid') pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Urwid is a curses-based user interface library." license=('LGPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/python-wpactrl/PKGBUILD b/extra/python-wpactrl/PKGBUILD index 39f9ee1fc..49b4d0221 100644 --- a/extra/python-wpactrl/PKGBUILD +++ b/extra/python-wpactrl/PKGBUILD @@ -1,18 +1,26 @@ +# $Id: PKGBUILD 169034 2012-10-17 10:21:07Z allan $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> -pkgname=python-wpactrl +pkgbase=python-wpactrl +pkgname=python2-wpactrl pkgver=20090609 -pkgrel=3 +pkgrel=4 pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access" arch=('i686' 'x86_64' 'mips64el') url="http://projects.otaku42.de/wiki/PythonWpaCtrl" license=('GPL2') depends=('python2') -source=(ftp://ftp.archlinux.org/other/${pkgname}/python-wpactrl-20090609.tar.gz) +conflicts=('python-wpactrl<=20090609-3') +replaces=('python-wpactrl<=20090609-3') +source=(ftp://ftp.archlinux.org/other/${pkgbase}/python-wpactrl-20090609.tar.gz) md5sums=('8d45739aa9bfa1110a4570bb5ceda768') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgbase}-${pkgver}" python2 setup.py build - python2 setup.py install --root=${pkgdir} +} + +package_python2-wpactrl() { + cd "${srcdir}/${pkgbase}-${pkgver}" + python2 setup.py install --root="${pkgdir}" } diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index aefd1ba8e..8aea684a2 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 157411 2012-04-28 09:27:08Z allan $ +# $Id: PKGBUILD 169007 2012-10-17 10:19:56Z allan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.2.3 -pkgrel=3 -_pybasever=3.2 +pkgver=3.3.0 +pkgrel=1 +_pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -19,7 +19,7 @@ provides=('python3') replaces=('python3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('3d607dbcfdf100dd659978195ccf3ade9d221823') +sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a') build() { cd "${srcdir}/Python-${pkgver}" @@ -44,7 +44,6 @@ build() { --with-threads \ --with-computed-gotos \ --enable-ipv6 \ - --with-wide-unicode \ --with-system-expat \ --with-dbmliborder=gdbm:ndbm \ --with-system-ffi \ @@ -72,11 +71,11 @@ package() { ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1" # Fix FS#22552 - ln -sf ../../libpython${_pybasever}mu.so \ - "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so" + ln -sf ../../libpython${_pybasever}m.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so" # Clean-up reference to build directory - sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile" + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile" # License install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index db22ad69a..4c73ea48f 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168742 2012-10-15 07:00:19Z bluewind $ +# $Id: PKGBUILD 169087 2012-10-17 20:07:22Z bluewind $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=qrencode -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') options=(!libtool) source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('5af7879ab5b300663f2076c287c09030') +md5sums=('219b146d3b365a56a0f4ef58a718f295') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index d0464cec0..ca14576a1 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166361 2012-09-06 21:54:10Z andrea $ +# $Id: PKGBUILD 169036 2012-10-17 10:21:11Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> @@ -6,12 +6,12 @@ pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.6.2 -pkgrel=2 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" makedepends=('python2-pyqt' 'pyqt' 'chrpath') -source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" +source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9' '8cf9c06252e2f11ab00e62848e322fd3') @@ -31,7 +31,7 @@ build() { cd ../ cp -rf Python Python2 cd Python - python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 + python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4 make cd ../Python2 @@ -58,7 +58,7 @@ package_python-qscintilla-common() { make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install # Provided by python-qscintilla - rm "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" + rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" } package_python-qscintilla() { @@ -67,7 +67,7 @@ package_python-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ - "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" + "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so" } package_python2-qscintilla() { diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 14123a53b..a67aed93d 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 162739 2012-06-29 11:34:13Z andrea $ +# $Id: PKGBUILD 169038 2012-10-17 10:21:15Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.13.3 +pkgver=4.14 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') -source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('76192829cc42ec558db46e4f9e1d8ba9') +source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") +md5sums=('9a48ad975e04ac824188840ea498ac32') build() { - cd "${srcdir}" cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" make ### Python2 version ### - cd "${srcdir}/python2-${pkgbase}-${pkgver}" + cd ../python2-${pkgbase}-${pkgver} python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" make } @@ -32,7 +31,7 @@ package_sip() { pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries" depends=('glibc') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install -C sipgen install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" @@ -42,11 +41,11 @@ package_python-sip() { pkgdesc="Python 3.x SIP bindings for C and C++ libraries" depends=('sip' 'python') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install -C siplib - install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.2/site-packages/sipconfig.py - install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.2/site-packages/sipdistutils.py + install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } @@ -55,7 +54,7 @@ package_python2-sip() { pkgdesc="Python 2.x SIP bindings for C and C++ libraries" depends=('sip' 'python2') - cd "${srcdir}/python2-${pkgbase}-${pkgver}" + cd python2-${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install -C siplib install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index f997734ef..705869118 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163539 2012-07-15 05:04:36Z giovanni $ +# $Id: PKGBUILD 169084 2012-10-17 19:11:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> # Contributor: Ralf Barth <archlinux.org@haggy.org> pkgname=smartmontools -pkgver=5.43 +pkgver=6.0 pkgrel=1 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" @@ -17,7 +17,7 @@ backup=('etc/smartd.conf' source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'smartd.conf' 'smartd.rc') -md5sums=('a1cb2c3d8cc2de377037fe9e7cef40a9' +md5sums=('5646a07f5f4bee8e2e649de8c6b7ae87' '28c1b80c41dac52d433961dcfb4f70e0' 'fb30e07f87f2c1d99532e018291ad3e8') diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD index 00fff2cbe..fd3434969 100644 --- a/extra/sonata/PKGBUILD +++ b/extra/sonata/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 132792 2011-07-26 09:02:50Z angvp $ +# $Id: PKGBUILD 169044 2012-10-17 10:21:28Z allan $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=sonata pkgver=1.6.2.1 -pkgrel=7 +pkgrel=8 pkgdesc="Elegant GTK+ music client for MPD" arch=('i686' 'x86_64' 'mips64el') url="http://sonata.berlios.de/" license=('GPL3') -depends=('pygtk' 'python-mpd') +depends=('pygtk' 'python2-mpd') optdepends=('gnome-python-extras: Enhanced system tray support' 'tagpy: Metadata editing support' - 'dbus-python: Various extra functionality (e.g. multimedia keys support)') + 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz info.py.patch) -changelog=ChangeLog md5sums=('0b912325e7175abad3bf6c0edc071e05' '595fcf7615035829b264afecb5a1beeb') build() { cd "$srcdir/${pkgname}-$pkgver" - patch -Np0 -i $srcdir/info.py.patch + patch -Np0 -i "$srcdir/info.py.patch" + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py } package() { diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 202e1e42c..0c5bfaece 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167929 2012-10-03 20:43:11Z andrea $ +# $Id: PKGBUILD 169045 2012-10-17 10:21:29Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') pkgver=1.3.11 -pkgrel=1 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') @@ -37,7 +37,7 @@ build() { package_system-config-printer-common() { pkgdesc='Pygtk CUPS Configuration' - depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python2-pycurl' 'libusb-compat') + depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat') optdepends=('system-config-printer-gnome: for the GTK frontend' 'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings') replaces=('system-config-printer') @@ -82,7 +82,7 @@ package_system-config-printer-common() { package_system-config-printer-gnome() { pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend' - depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify') + depends=('system-config-printer-common' 'gnome-icon-theme' 'python2-notify') optdependence=('gnome-keyring: password management') cd "${srcdir}"/${pkgbase}-${pkgver} diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD index fcf2ccd1b..483ca44d9 100644 --- a/extra/twisted/PKGBUILD +++ b/extra/twisted/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 168259 2012-10-07 03:32:14Z eric $ +# $Id: PKGBUILD 169039 2012-10-17 10:21:17Z allan $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=twisted pkgver=12.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Asynchronous networking framework written in Python." arch=('i686' 'x86_64' 'mips64el') url="http://twistedmatrix.com/" license=('MIT') depends=('python2-crypto' 'python2-zope-interface') optdepends=('python2-pyopenssl' - 'python-soappy: for twisted.web.soap' + 'python2-soappy: for twisted.web.soap' 'python2-pyasn1: for using conch' 'pygtk: for using manhole' 'tk: for using tkconch') diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD index 76a887654..05785b36e 100644 --- a/extra/vde2/PKGBUILD +++ b/extra/vde2/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 145068 2011-12-16 10:55:34Z tpowa $ +# $Id: PKGBUILD 169040 2012-10-17 10:21:21Z allan $ # Contributor: Sergej Pupykin # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=vde2 pkgver=2.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Virtual Distributed Ethernet for emulators like qemu" url="http://sourceforge.net/projects/vde/" license=("GPL" "LGPL" "CUSTOM") arch=('i686' 'x86_64' 'mips64el') depends=('bash' 'libpcap' 'openssl') -makedepends=('python2') +makedepends=('python') backup=(etc/conf.d/vde) source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 dhcpd.conf.sample diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index d06fb07c6..d71166bac 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167285 2012-09-30 02:21:52Z giovanni $ +# $Id: PKGBUILD 169077 2012-10-17 18:09:33Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.3 -pkgrel=4 +pkgver=2.0.4 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -57,7 +57,7 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('a7e79565e3df07dcf9abc6cad3ac26bb') +md5sums=('f36dab8f126922c56b372388b7fade47') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/banshee/PKGBUILD b/gnome-unstable/banshee/PKGBUILD new file mode 100644 index 000000000..0cce416cd --- /dev/null +++ b/gnome-unstable/banshee/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 141668 2011-11-02 03:17:12Z eric $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> +# Contributor: György Balló <ballogy@freestart.hu> + +pkgname=banshee +pkgver=2.6.0 +pkgrel=1 +pkgdesc="Music management and playback for GNOME" +arch=('i686' 'x86_64') +url="http://banshee.fm/" +license=('MIT') +depends=(libxxf86vm gst-plugins-base mono-addins dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info gst-plugins-bad mono-upnp) +makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common') +optdepends=('gst-plugins-good: Extra media codecs' + 'gst-plugins-ugly: Extra media codecs' + 'gst-libav: Extra media codecs' + 'brasero: CD burning') +options=('!libtool') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz + gst-1.0.patch) +sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a' + 'eddf696b0be91331fae8d63c23277a355e94539a3436a8619dab2d732b30234e') + +build() { + export MONO_SHARED_DIR="$srcdir/.wabi" + mkdir -p "$MONO_SHARED_DIR" + + cd "$srcdir/$pkgname-$pkgver" + #https://bugzilla.gnome.org/show_bug.cgi?id=679433 + patch -Np1 -i "${srcdir}/gst-1.0.patch" + + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-docs \ + --disable-static \ + --disable-scrollkeeper \ + --disable-schemas-install \ + --with-vendor-build-id=ArchLinux + make +} + +package() { + export MONO_SHARED_DIR="$srcdir/.wabi" + mkdir -p "$MONO_SHARED_DIR" + + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} diff --git a/gnome-unstable/banshee/banshee-recent-gpod.patch b/gnome-unstable/banshee/banshee-recent-gpod.patch new file mode 100644 index 000000000..afb3a0fd1 --- /dev/null +++ b/gnome-unstable/banshee/banshee-recent-gpod.patch @@ -0,0 +1,24 @@ +From d4cd959c4a48ffc9da8fe0983bd31c4647669bf4 Mon Sep 17 00:00:00 2001 +From: William Witt <william@witt-family.net> +Date: Sat, 30 Jul 2011 21:54:41 -0500 +Subject: [PATCH] - Changed typecast on FileSize to uint in AppleDeviceTrackInfo to comply with libgpod-sharp + +--- + .../AppleDeviceTrackInfo.cs | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs +index 178266d..b8549f7 100644 +--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs ++++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs +@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice + track.CDs = DiscCount; + track.CDNumber = DiscNumber; + track.TrackLength = (int) Duration.TotalMilliseconds; +- track.Size = (int)FileSize; ++ track.Size = (uint)FileSize; + track.Grouping = Grouping; + try { + track.TimePlayed = LastPlayed; +-- +1.7.3.4 diff --git a/gnome-unstable/banshee/banshee.install b/gnome-unstable/banshee/banshee.install new file mode 100644 index 000000000..1d0fd332b --- /dev/null +++ b/gnome-unstable/banshee/banshee.install @@ -0,0 +1,15 @@ +pkgname=banshee + +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/banshee/gst-1.0.patch b/gnome-unstable/banshee/gst-1.0.patch new file mode 100644 index 000000000..f8fa7a7c2 --- /dev/null +++ b/gnome-unstable/banshee/gst-1.0.patch @@ -0,0 +1,1025 @@ +From ec14625f10c26ae3646f382ffd804ee28c3d7334 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> +Date: Wed, 19 Sep 2012 11:34:06 +0200 +Subject: [PATCH] Initial port to GStreamer 1.0 + +--- + build/m4/banshee/gstreamer.m4 | 19 +++--- + data/audio-profiles/wav.xml.in | 5 +- + libbanshee/banshee-bpmdetector.c | 11 ++-- + libbanshee/banshee-gst.h | 4 +- + libbanshee/banshee-player-cdda.c | 5 +- + libbanshee/banshee-player-dvd.c | 4 +- + libbanshee/banshee-player-equalizer.c | 4 +- + libbanshee/banshee-player-missing-elements.c | 2 +- + libbanshee/banshee-player-pipeline.c | 37 ++++++----- + libbanshee/banshee-player-private.h | 13 ++-- + libbanshee/banshee-player-replaygain.c | 29 ++++----- + libbanshee/banshee-player-video.c | 89 +++++++++++++------------- + libbanshee/banshee-player-vis.c | 88 ++++++++----------------- + libbanshee/banshee-player.c | 11 ++-- + libbanshee/banshee-ripper.c | 16 ++--- + libbanshee/banshee-tagger.c | 2 +- + libbanshee/banshee-transcoder.c | 19 +++--- + 17 files changed, 156 insertions(+), 202 deletions(-) + +diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4 +index 6267cce..917cf58 100644 +--- a/build/m4/banshee/gstreamer.m4 ++++ b/build/m4/banshee/gstreamer.m4 +@@ -1,17 +1,18 @@ + AC_DEFUN([BANSHEE_CHECK_GSTREAMER], + [ +- GSTREAMER_REQUIRED_VERSION=0.10.26 ++ GSTREAMER_REQUIRED_VERSION=0.11.99 + AC_SUBST(GSTREAMER_REQUIRED_VERSION) + + PKG_CHECK_MODULES(GST, +- gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION +- gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION) +- +- GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10" ++ gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION ++ gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION) + + AC_SUBST(GST_CFLAGS) + AC_SUBST(GST_LIBS) +diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in +index 35cd1d2..6dc1bab 100644 +--- a/data/audio-profiles/wav.xml.in ++++ b/data/audio-profiles/wav.xml.in +@@ -14,10 +14,7 @@ + "audioresample" + "audioconvert" + (+ "audio/x-raw-int, " +- "endianness=(int)1234, " +- "width=(int)16, " +- "depth=(int)16, " +- "signed=(boolean)true, " ++ "format=(string)S16LE, " + "rate=(int)44100, " + "channels=(int)2" ) + "wavenc") +diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c +index c06ffcb..68b0419 100644 +--- a/libbanshee/banshee-bpmdetector.c ++++ b/libbanshee/banshee-bpmdetector.c +@@ -30,6 +30,7 @@ + # include "config.h" + #endif + ++#include <stdio.h> + #include <string.h> + #include <glib/gi18n.h> + +@@ -50,7 +51,7 @@ struct BansheeBpmDetector { + + /* + * You can run this pipeline on the cmd line with: +- * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \ ++ * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \ + * audioconvert ! bpmdetect ! fakesink + */ + +@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad, + + g_return_if_fail(detector != NULL); + +- audiopad = gst_element_get_pad(detector->audioconvert, "sink"); ++ audiopad = gst_element_get_static_pad(detector->audioconvert, "sink"); + + if(GST_PAD_IS_LINKED(audiopad)) { + g_object_unref(audiopad); + return; + } + +- caps = gst_pad_get_caps(pad); ++ caps = gst_pad_query_caps(pad, NULL); + str = gst_caps_get_structure(caps, 0); + + if(!g_strrstr(gst_structure_get_name(str), "audio")) { +@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector) + return FALSE; + } + +- detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2"); ++ detector->decodebin = gst_element_factory_make ("decodebin", "decodebin"); + if (detector->decodebin == NULL) { +- bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL); ++ bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL); + return FALSE; + } + +diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h +index 85662cf..332f356 100644 +--- a/libbanshee/banshee-gst.h ++++ b/libbanshee/banshee-gst.h +@@ -41,9 +41,11 @@ + #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \ + gboolean iter##_done = FALSE; \ + while (!iter##_done) { \ ++ GValue child_value = {0, }; \ + child_type child_name; \ +- switch (gst_iterator_next (iter, (gpointer)&child_name)) { \ ++ switch (gst_iterator_next (iter, &child_value)) { \ + case GST_ITERATOR_OK: { \ ++ child_name = (child_type) g_value_get_object(&child_value); \ + { block; } \ + break; \ + } \ +diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c +index 8be2bdd..401edf0 100644 +--- a/libbanshee/banshee-player-cdda.c ++++ b/libbanshee/banshee-player-cdda.c +@@ -28,7 +28,8 @@ + // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + // + +-#include <gst/cdda/gstcddabasesrc.h> ++#include <stdlib.h> ++#include <gst/audio/gstaudiocdsrc.h> + #include "banshee-player-cdda.h" + + // --------------------------------------------------------------------------- +@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin) + + g_object_get (playbin, "source", &source, NULL); + +- if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) { ++ if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) { + if (source != NULL) { + g_object_unref (source); + } +diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c +index 55d499c..991b506 100644 +--- a/libbanshee/banshee-player-dvd.c ++++ b/libbanshee/banshee-player-dvd.c +@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player) + { + gint64 index; + GstFormat format = gst_format_get_by_nick ("chapter"); +- gst_element_query_position (player->playbin, &format, &index); ++ gst_element_query_position (player->playbin, format, &index); + gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, + GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0); + } +@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player) + { + gint64 index; + GstFormat format = gst_format_get_by_nick ("chapter"); +- gst_element_query_position (player->playbin, &format, &index); ++ gst_element_query_position (player->playbin, format, &index); + gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH, + GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0); + } +diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c +index a496ada..0cbb3b7 100644 +--- a/libbanshee/banshee-player-equalizer.c ++++ b/libbanshee/banshee-player-equalizer.c +@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain) + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + + if (player->equalizer != NULL) { +- GstObject *band; ++ GObject *band; + + g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer))); + +@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq) + count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)); + + for (i = 0; i < count; i++) { +- GstObject *band; ++ GObject *band; + + band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i); + g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL); +diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c +index 20804c4..30118c5 100644 +--- a/libbanshee/banshee-player-missing-elements.c ++++ b/libbanshee/banshee-player-missing-elements.c +@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old, + } + #endif + +- install_return = gst_install_plugins_async (details, player->install_plugins_context, ++ install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, + bp_missing_elements_handle_install_result, player); + + if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) { +diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c +index ed845f3..6c2af35 100644 +--- a/libbanshee/banshee-player-pipeline.c ++++ b/libbanshee/banshee-player-pipeline.c +@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player) + GstMessage *msg; + + // We're being called from the streaming thread, so don't do anything here +- msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL)); ++ msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed")); + gst_element_post_message (player->playbin, msg); + } + +@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata) + break; + } + ++ case GST_MESSAGE_STREAM_START: { ++ bp_next_track_starting (player); ++ break; ++ } ++ + case GST_MESSAGE_APPLICATION: { + const gchar * name; + const GstStructure * s = gst_message_get_structure (message); +@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player) + + // Playbin is the core element that handles autoplugging (finding the right + // source and decoder elements) based on source URI and stream content +- player->playbin = gst_element_factory_make ("playbin2", "playbin"); ++ player->playbin = gst_element_factory_make ("playbin", "playbin"); + + #ifdef ENABLE_GAPLESS + // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback. +- // This can be removed once playbin2 generates its own next-track signal. ++ // This can be removed once playbin generates its own next-track signal. + // bgo#584987 - this is included in >= 0.10.26 + g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player); + #endif //ENABLE_GAPLESS +@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player) + g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player); + g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player); + +- // Try to find an audio sink, prefer gconf, which typically is set to auto these days, +- // fall back on auto, which should work on windows, and as a last ditch, try alsa +- audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink"); +- if (audiosink == NULL) { +- audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); +- if (audiosink != NULL) { +- g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); +- } else { +- audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); +- if (audiosink == NULL) { +- audiosink = gst_element_factory_make ("alsasink", "audiosink"); +- } ++ audiosink = gst_element_factory_make ("directsoundsink", "audiosink"); ++ if (audiosink != NULL) { ++ g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL); ++ } else { ++ audiosink = gst_element_factory_make ("autoaudiosink", "audiosink"); ++ if (audiosink == NULL) { ++ audiosink = gst_element_factory_make ("alsasink", "audiosink"); + } + } + +@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player) + GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink)); + BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, { + player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL; +- gst_object_unref (element); + }); + } + bp_debug ("Audiosink has volume: %s", +@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player) + } + + // Ghost pad the audio bin so audio is passed from the bin into the tee +- teepad = gst_element_get_pad (player->audiotee, "sink"); ++ teepad = gst_element_get_static_pad (player->audiotee, "sink"); + gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad)); + gst_object_unref (teepad); + +@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player) + gst_bus_add_watch (bus, bp_pipeline_bus_callback, player); + + // Link the first tee pad to the primary audio sink queue +- GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink"); +- pad = gst_element_get_request_pad (player->audiotee, "src%d"); ++ GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink"); ++ pad = gst_element_get_request_pad (player->audiotee, "src_%u"); + g_object_set(player->audiotee, "alloc-pad", pad, NULL); + gst_pad_link (pad, sinkpad); + gst_object_unref (GST_OBJECT (pad)); +diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h +index 9fed356..9346911 100644 +--- a/libbanshee/banshee-player-private.h ++++ b/libbanshee/banshee-player-private.h +@@ -42,14 +42,14 @@ + #include <gst/fft/gstfftf32.h> + #include <gst/pbutils/pbutils.h> + #include <gst/tag/tag.h> +-#include <gst/interfaces/navigation.h> ++#include <gst/video/navigation.h> + + #if defined(GDK_WINDOWING_X11) + # include <gdk/gdkx.h> +-# include <gst/interfaces/xoverlay.h> ++# include <gst/video/videooverlay.h> + #elif defined(GDK_WINDOWING_WIN32) + # include <gdk/gdkwin32.h> +-# include <gst/interfaces/xoverlay.h> ++# include <gst/video/videooverlay.h> + #endif + + #include "banshee-gst.h" +@@ -155,11 +155,11 @@ struct BansheePlayer { + // Video State + BpVideoDisplayContextType video_display_context_type; + #if defined(GDK_WINDOWING_X11) +- GstXOverlay *xoverlay; ++ GstVideoOverlay *video_overlay; + GdkWindow *video_window; + XID video_window_xid; + #elif defined(GDK_WINDOWING_WIN32) +- GstXOverlay *xoverlay; ++ GstVideoOverlay *video_overlay; + GdkWindow *video_window; + HWND video_window_xid; + #endif +@@ -179,6 +179,8 @@ struct BansheePlayer { + GstFFTF32 *vis_fft; + GstFFTF32Complex *vis_fft_buffer; + gfloat *vis_fft_sample_buffer; ++ GstPad *vis_event_probe_pad; ++ gulong vis_event_probe_id; + + // Plugin Installer State + GdkWindow *window; +@@ -197,6 +199,7 @@ struct BansheePlayer { + // http://replaygain.hydrogenaudio.org/player_scale.html + gdouble rg_gain_history[10]; + gint history_size; ++ gulong rg_pad_block_id; + + //dvd navigation + GstNavigation *navigation; +diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c +index a479d4a..e42b197 100644 +--- a/libbanshee/banshee-player-replaygain.c ++++ b/libbanshee/banshee-player-replaygain.c +@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban + _bp_rgvolume_print_volume (player); + } + +-static void +-pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) ++static GstPadProbeReturn ++pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data) + { + BansheePlayer* player; + +- if (!blocked) { +- return; +- } +- + player = (BansheePlayer*) user_data; +- g_return_if_fail (IS_BANSHEE_PLAYER (player)); ++ g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK); + + // The pad_block_cb can get triggered multiple times, on different threads. + // Lock around the link/unlink code, so we don't end up going through here +@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) + if ((player->replaygain_enabled && player->rgvolume_in_pipeline) || + (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) { + // The pipeline is already in the correct state. Unblock the pad, and return. ++ player->rg_pad_block_id = 0; + g_mutex_unlock (player->replaygain_mutex); +- if (gst_pad_is_blocked (srcPad)) { +- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); +- } +- return; ++ return GST_PAD_PROBE_REMOVE; + } + + if (player->rgvolume_in_pipeline) { +@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data) + } + + // Our state is now consistent ++ player->rg_pad_block_id = 0; + g_mutex_unlock (player->replaygain_mutex); + +- if (gst_pad_is_blocked (srcPad)) { +- gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player); +- } +- + _bp_rgvolume_print_volume (player); ++ ++ return GST_PAD_PROBE_REMOVE; + } + + // --------------------------------------------------------------------------- +@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player) + srcPad = gst_element_get_static_pad (player->before_rgvolume, "src"); + + if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) { +- gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player); +- } else if (srcPad->block_callback == NULL) { +- pad_block_cb (srcPad, TRUE, player); ++ player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL); ++ } else if (!player->rg_pad_block_id) { ++ pad_block_cb (srcPad, NULL, player); + } + } + +diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c +index b901354..eb95c3f 100644 +--- a/libbanshee/banshee-player-video.c ++++ b/libbanshee/banshee-player-video.c +@@ -37,54 +37,54 @@ + #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) + + static gboolean +-bp_video_find_xoverlay (BansheePlayer *player) ++bp_video_find_video_overlay (BansheePlayer *player) + { + GstElement *video_sink = NULL; +- GstElement *xoverlay; +- GstXOverlay *previous_xoverlay; +- gboolean found_xoverlay; ++ GstElement *video_overlay; ++ GstVideoOverlay *previous_video_overlay; ++ gboolean found_video_overlay; + + g_object_get (player->playbin, "video-sink", &video_sink, NULL); + + g_mutex_lock (player->video_mutex); +- previous_xoverlay = player->xoverlay; ++ previous_video_overlay = player->video_overlay; + + if (video_sink == NULL) { +- player->xoverlay = NULL; +- if (previous_xoverlay != NULL) { +- gst_object_unref (previous_xoverlay); ++ player->video_overlay = NULL; ++ if (previous_video_overlay != NULL) { ++ gst_object_unref (previous_video_overlay); + } + g_mutex_unlock (player->video_mutex); + return FALSE; + } + +- xoverlay = GST_IS_BIN (video_sink) +- ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY) ++ video_overlay = GST_IS_BIN (video_sink) ++ ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY) + : video_sink; + +- player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL; ++ player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL; + +- if (previous_xoverlay != NULL) { +- gst_object_unref (previous_xoverlay); ++ if (previous_video_overlay != NULL) { ++ gst_object_unref (previous_video_overlay); + } + + #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink +- if (player->xoverlay != NULL && g_object_class_find_property ( +- G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) { +- g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL); ++ if (player->video_overlay != NULL && g_object_class_find_property ( ++ G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) { ++ g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL); + } + #endif + +- if (player->xoverlay != NULL && g_object_class_find_property ( +- G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) { +- g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL); ++ if (player->video_overlay != NULL && g_object_class_find_property ( ++ G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) { ++ g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL); + } + + gst_object_unref (video_sink); +- found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE; ++ found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE; + + g_mutex_unlock (player->video_mutex); +- return found_xoverlay; ++ return found_video_overlay; + } + + #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */ +@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + + #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) +- bp_video_find_xoverlay (player); ++ bp_video_find_video_overlay (player); + #endif + } + + static void + bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player) + { +- gboolean found_xoverlay; ++ gboolean found_video_overlay; + + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + + #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32) + +- if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) { ++ if (!gst_is_video_overlay_prepare_window_handle_message (message)) { + return; + } + +- found_xoverlay = bp_video_find_xoverlay (player); ++ found_video_overlay = bp_video_find_video_overlay (player); + +- if (found_xoverlay) { +- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); ++ if (found_video_overlay) { ++ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); + } + + #endif +@@ -164,7 +164,7 @@ static void + cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p) + { + GstStructure * s = NULL; +- GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj)); ++ GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj)); + + if (G_UNLIKELY (!caps)) { + return; +@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player) + } + + if (G_LIKELY (vpad)) { +- GstCaps *caps = gst_pad_get_negotiated_caps (vpad); ++ GstCaps *caps = gst_pad_get_current_caps (vpad); + if (G_LIKELY (caps)) { + cb_caps_set (G_OBJECT (vpad), NULL, player); + gst_caps_unref (caps); +@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus) + + player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW; + +- videosink = gst_element_factory_make ("gconfvideosink", "videosink"); ++ videosink = gst_element_factory_make ("autovideosink", "videosink"); + if (videosink == NULL) { +- videosink = gst_element_factory_make ("autovideosink", "videosink"); +- if (videosink == NULL) { +- player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; +- videosink = gst_element_factory_make ("fakesink", "videosink"); +- if (videosink != NULL) { +- g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); +- } ++ player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED; ++ videosink = gst_element_factory_make ("fakesink", "videosink"); ++ if (videosink != NULL) { ++ g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL); + } + } + + g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL); + +- gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player); ++ gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL); + g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player); + + if (GST_IS_BIN (videosink)) { +@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc + { + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + +- if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) { +- gst_x_overlay_expose (player->xoverlay); ++ if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) { ++ gst_video_overlay_expose (player->video_overlay); + return; + } + +- if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) { ++ if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) { + return; + } + +- gst_object_ref (player->xoverlay); ++ gst_object_ref (player->video_overlay); + +- gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid); +- gst_x_overlay_expose (player->xoverlay); ++ gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid); ++ gst_video_overlay_expose (player->video_overlay); + +- gst_object_unref (player->xoverlay); ++ gst_object_unref (player->video_overlay); + } + + // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing. +@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window) + // //Explicitly create the native window. GDK_WINDOW_XWINDOW will call this + // //function anyway, but this way we can raise a more useful message should it fail. + // if (!gdk_window_ensure_native (window)) { +-// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!"); ++// banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!"); + // } + //#endif + +diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c +index 5787c87..7e7dc78 100644 +--- a/libbanshee/banshee-player-vis.c ++++ b/libbanshee/banshee-player-vis.c +@@ -27,17 +27,17 @@ + // + + #include <math.h> ++#include <gst/audio/audio.h> + + #include "banshee-player-vis.h" + + #define SLICE_SIZE 735 + + static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS ( +- "audio/x-raw-float, " ++ "audio/x-raw, " ++ "format = (string) " GST_AUDIO_NE(F32) ", " + "rate = (int) 44100, " +- "channels = (int) 2, " +- "endianness = (int) BYTE_ORDER, " +- "width = (int) 32" ++ "channels = (int) 2" + ); + + // --------------------------------------------------------------------------- +@@ -48,6 +48,7 @@ static void + bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata) + { + BansheePlayer *player = (BansheePlayer*)userdata; ++ GstCaps *caps; + GstStructure *structure; + gint channels, wanted_size; + gfloat *data; +@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u + player->vis_thawing = FALSE; + } + +- structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0); ++ caps = gst_pad_get_current_caps (pad); ++ structure = gst_caps_get_structure (caps, 0); + gst_structure_get_int (structure, "channels", &channels); ++ gst_caps_unref (caps); + + wanted_size = channels * SLICE_SIZE * sizeof (gfloat); + +- gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer)); ++ gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer)); + +- while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) { ++ while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) { + gfloat *deinterlaced = g_malloc (wanted_size); + gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2); + +@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u + g_free (deinterlaced); + g_free (specbuf); + ++ gst_adapter_unmap (player->vis_buffer); + gst_adapter_flush (player->vis_buffer, wanted_size); + } + } +@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u + // Internal Functions + // --------------------------------------------------------------------------- + +-static void +-_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data) ++static GstPadProbeReturn ++_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data) + { + BansheePlayer *player = (BansheePlayer *) data; ++ GstEvent *event; + +- if (!blocked) { +- // Set thawing mode (discards buffers that are too old from the queue). +- player->vis_thawing = TRUE; +- } +-} +- +-static void +-_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked) +-{ +- GstPad *queue_sink; +- +- if (player->vis_resampler == NULL) +- return; +- +- queue_sink = gst_element_get_static_pad (player->vis_resampler, "src"); +- +- gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player); +- +- gst_object_unref (GST_OBJECT (queue_sink)); +-} +- +-static gboolean +-_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data) +-{ +- BansheePlayer *player = (BansheePlayer *) data; ++ if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0) ++ return GST_PAD_PROBE_PASS; + ++ event = GST_EVENT (info->data); + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_FLUSH_START: + case GST_EVENT_FLUSH_STOP: + case GST_EVENT_SEEK: +- case GST_EVENT_NEWSEGMENT: ++ case GST_EVENT_SEGMENT: + case GST_EVENT_CUSTOM_DOWNSTREAM: + player->vis_thawing = TRUE; + + default: break; + } + +- if (player->vis_enabled) +- return TRUE; +- +- switch (GST_EVENT_TYPE (event)) { +- case GST_EVENT_EOS: +- case GST_EVENT_CUSTOM_DOWNSTREAM_OOB: +- _bp_vis_pipeline_set_blocked (player, FALSE); +- break; +- case GST_EVENT_CUSTOM_DOWNSTREAM: +- case GST_EVENT_NEWSEGMENT: +- _bp_vis_pipeline_set_blocked (player, TRUE); +- break; +- +- default: break; +- } +- +- return TRUE; ++ return GST_PAD_PROBE_PASS; + } + + void +@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player) + // Core elements, if something fails here, it's the end of the world + audiosinkqueue = gst_element_factory_make ("queue", "vis-queue"); + +- pad = gst_element_get_static_pad (audiosinkqueue, "sink"); +- gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player); +- gst_object_unref (GST_OBJECT (pad)); ++ player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink"); ++ player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL); + + resampler = gst_element_factory_make ("audioresample", "vis-resample"); + converter = gst_element_factory_make ("audioconvert", "vis-convert"); +@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player) + converter, fakesink, NULL); + + pad = gst_element_get_static_pad (audiosinkqueue, "sink"); +- teepad = gst_element_get_request_pad (player->audiotee, "src%d"); ++ teepad = gst_element_get_request_pad (player->audiotee, "src_%u"); + gst_pad_link (teepad, pad); + gst_object_unref (GST_OBJECT (teepad)); + gst_object_unref (GST_OBJECT (pad)); +@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player) + player->vis_resampler = resampler; + player->vis_thawing = FALSE; + player->vis_enabled = FALSE; +- +- // Disable the pipeline till we hear otherwise from managed land. +- _bp_vis_pipeline_set_blocked (player, TRUE); + } + + void + _bp_vis_pipeline_destroy (BansheePlayer *player) + { ++ if (player->vis_event_probe_pad) { ++ gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id); ++ gst_object_unref (GST_OBJECT (player->vis_event_probe_pad)); ++ player->vis_event_probe_pad = NULL; ++ } ++ + if (player->vis_buffer != NULL) { + gst_object_unref (player->vis_buffer); + player->vis_buffer = NULL; +@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb + + player->vis_data_cb = cb; + +- _bp_vis_pipeline_set_blocked (player, cb == NULL); + player->vis_enabled = cb != NULL; + } +diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c +index c655a72..b8f98b8 100644 +--- a/libbanshee/banshee-player.c ++++ b/libbanshee/banshee-player.c +@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms) + P_INVOKE guint64 + bp_get_position (BansheePlayer *player) + { +- static GstFormat format = GST_FORMAT_TIME; + gint64 position; + + g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); + +- if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) { ++ if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) { + return position / GST_MSECOND; + } + +@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player) + P_INVOKE guint64 + bp_get_duration (BansheePlayer *player) + { +- static GstFormat format = GST_FORMAT_TIME; + gint64 duration; + + g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0); + +- if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) { ++ if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) { + return duration / GST_MSECOND; + } + +@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) + g_return_if_fail (IS_BANSHEE_PLAYER (player)); + gint64 pos = -1; + GstState state; +- GstFormat format = GST_FORMAT_BYTES; + gboolean paused = FALSE; + + // Gstreamer playbin do not support to set suburi during playback +@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) + gst_element_get_state (player->playbin, &state, NULL, 0); + paused = (state == GST_STATE_PAUSED); + if (state >= GST_STATE_PAUSED) { +- gst_element_query_position (player->playbin, &format, &pos); ++ gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos); + gst_element_set_state (player->playbin, GST_STATE_READY); + // Force to wait asynch operation + gst_element_get_state (player->playbin, &state, NULL, -1); +@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri) + gst_element_get_state (player->playbin, &state, NULL, -1); + + if (pos != -1) { +- gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); ++ gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos); + } + } + +diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c +index e0e8c85..b3f8fed 100644 +--- a/libbanshee/banshee-ripper.c ++++ b/libbanshee/banshee-ripper.c +@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug) + static gboolean + br_iterate_timeout (BansheeRipper *ripper) + { +- GstFormat format = GST_FORMAT_TIME; + GstState state; + gint64 position; + +@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper) + return TRUE; + } + +- if (!gst_element_query_position (ripper->cddasrc, &format, &position)) { ++ if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) { + return TRUE; + } + +@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin) + GstIterator *pad_iter = gst_element_iterate_src_pads (element); + + BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, { +- GstStructure *str = GST_PAD_CAPS (pad) != NULL +- ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0) ++ GstCaps *caps = gst_pad_get_current_caps (pad); ++ GstStructure *str = caps != NULL ++ ? gst_caps_get_structure (caps, 0) + : NULL; + + if (str != NULL) { +@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin) + preferred_mimetype = mimetype; + } + } +- +- gst_object_unref (pad); ++ gst_caps_unref (caps); + }); +- +- gst_object_unref (element); + }); + + return preferred_mimetype; +@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper) + return FALSE; + } + +- ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc"); ++ ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL); + if (ripper->cddasrc == NULL) { + br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL); + return FALSE; +@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path, + + // We'll warn the user in the UI if we can't tag the encoded audio files + *tagging_supported = TRUE; +- gst_object_unref (element); + } + }); + +diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c +index ca15e8f..762dfa9 100644 +--- a/libbanshee/banshee-tagger.c ++++ b/libbanshee/banshee-tagger.c +@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata + GstTagList * + bt_tag_list_new () + { +- return gst_tag_list_new (); ++ return gst_tag_list_new_empty (); + } + + void +diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c +index 10fc35c..0e241f0 100644 +--- a/libbanshee/banshee-transcoder.c ++++ b/libbanshee/banshee-transcoder.c +@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const + static gboolean + gst_transcoder_iterate_timeout(GstTranscoder *transcoder) + { +- GstFormat format = GST_FORMAT_TIME; + gint64 position; + gint64 duration; + + g_return_val_if_fail(transcoder != NULL, FALSE); + +- if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) || +- !gst_element_query_position(transcoder->sink_bin, &format, &position)) { ++ if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) || ++ !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) { + return TRUE; + } + +@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad, + + g_return_if_fail(transcoder != NULL); + +- audiopad = gst_element_get_pad(transcoder->sink_bin, "sink"); ++ audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink"); + + if(GST_PAD_IS_LINKED(audiopad)) { + g_object_unref(audiopad); + return; + } + +- caps = gst_pad_get_caps(pad); ++ caps = gst_pad_query_caps(pad, NULL); + str = gst_caps_get_structure(caps, 0); + + if(!g_strrstr(gst_structure_get_name(str), "audio")) { +@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, + + transcoder->pipeline = gst_pipeline_new("pipeline"); + +- source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source"); ++ source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL); + if(source_elem == NULL) { + gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL); + return FALSE; + } + +- decoder_elem = gst_element_factory_make("decodebin2", "decodebin2"); ++ decoder_elem = gst_element_factory_make("decodebin", "decodebin"); + if(decoder_elem == NULL) { +- gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL); ++ gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL); + return FALSE; + } + +- sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink"); ++ sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL); + if(sink_elem == NULL) { + gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL); + return FALSE; +@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, + return FALSE; + } + +- encoder_pad = gst_element_get_pad(conv_elem, "sink"); ++ encoder_pad = gst_element_get_static_pad(conv_elem, "sink"); + if(encoder_pad == NULL) { + gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL); + return FALSE; +-- +1.7.10.4
\ No newline at end of file diff --git a/gnome-unstable/eog-plugins/PKGBUILD b/gnome-unstable/eog-plugins/PKGBUILD new file mode 100644 index 000000000..fb0e2b4cd --- /dev/null +++ b/gnome-unstable/eog-plugins/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 168987 2012-10-17 09:54:32Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=eog-plugins +pkgver=3.6.1 +pkgrel=1 +pkgdesc="Plugins for Eye of Gnome" +arch=('i686' 'x86_64') +url="http://www.gnome.org/" +license=('GPL2') +depends=('eog' 'libchamplain' 'libgdata') +makedepends=('intltool') +install=eog-plugins.install +options=('!libtool') +groups=(gnome-extra) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0270ae05f6cdd9c73472323370c4779f1148c77f3f8890c89fb8488cf83051ac') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/eog-plugins/eog-plugins.install b/gnome-unstable/eog-plugins/eog-plugins.install new file mode 100644 index 000000000..24072f316 --- /dev/null +++ b/gnome-unstable/eog-plugins/eog-plugins.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gedit/PKGBUILD b/gnome-unstable/gedit/PKGBUILD index 348b60ec7..a39a2d421 100644 --- a/gnome-unstable/gedit/PKGBUILD +++ b/gnome-unstable/gedit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167879 2012-10-03 15:15:10Z jgc $ +# $Id: PKGBUILD 168973 2012-10-17 07:09:38Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2043aaa61708222f476dd1c83e43bd17c67a341b30a4baa6466a60bbfb6d9471') +sha256sums=('75fb18e32a7571900dda8cbd3a71212bded1ef714d3aa9f9513296eea02779a4') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/pangox-compat/PKGBUILD b/gnome-unstable/pangox-compat/PKGBUILD index 0006f4fc6..d6f3b6a1e 100644 --- a/gnome-unstable/pangox-compat/PKGBUILD +++ b/gnome-unstable/pangox-compat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167404 2012-10-01 23:16:23Z heftig $ +# $Id: PKGBUILD 169099 2012-10-17 23:24:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=pangox-compat -pkgver=0.0.1 +pkgver=0.0.2 pkgrel=1 pkgdesc="X Window System font support for Pango" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ depends=('pango') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('c2f46569698c080061f258847ff4030c409846ec69fe3b28fa78d199982b8f3b') +sha256sums=('552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046') build() { cd ${pkgname}-${pkgver} diff --git a/gnome-unstable/pygobject/PKGBUILD b/gnome-unstable/pygobject/PKGBUILD index 3c32f5b7f..c42b7ba78 100644 --- a/gnome-unstable/pygobject/PKGBUILD +++ b/gnome-unstable/pygobject/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 168942 2012-10-16 16:22:08Z heftig $ +# $Id: PKGBUILD 169075 2012-10-17 17:43:30Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.4.1 +pkgver=3.4.1.1 pkgrel=1 arch=('i686' 'x86_64') url="https://live.gnome.org/PyGObject" license=('LGPL') makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) options=('!libtool') -sha256sums=('21dbef53f5a29bcb547f36ba42e021f71981e1c50e8f89526e393d77b36a8b1f') +sha256sums=('dbcff64a641b4eb251a3ca72c782c8a2318c3bbf4a31bffc40446e15111e6017') build() { cp -a "$pkgbase-$pkgver" python2-build diff --git a/gnome-unstable/rhythmbox/PKGBUILD b/gnome-unstable/rhythmbox/PKGBUILD index f81235e36..820e743d3 100644 --- a/gnome-unstable/rhythmbox/PKGBUILD +++ b/gnome-unstable/rhythmbox/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 167904 2012-10-03 17:54:55Z heftig $ +# $Id: PKGBUILD 169093 2012-10-17 21:17:47Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox pkgver=2.98 -pkgrel=1 +pkgrel=2 pkgdesc="An iTunes-like music playback and management application" arch=('i686' 'x86_64') license=('GPL') url="http://www.rhythmbox.org" depends=('dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' - 'libdmapsharing' 'libgpod' 'libmtp' 'libnotify' 'libpeas' 'libwebkit3' + 'libdmapsharing' 'libgpod' 'libmtp' 'libnotify' 'libpeas' 'lirc-utils' 'media-player-info' 'python2-gobject' 'python2-mako' 'totem-plparser' 'tdb' 'libdiscid') makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala') @@ -30,7 +30,7 @@ build() { --libexecdir=/usr/lib/rhythmbox \ --localstatedir=/var --disable-static \ --enable-daap --enable-python --enable-vala \ - --with-mdns=avahi --disable-scrollkeeper + --with-mdns=avahi --disable-scrollkeeper --without-webkit make } diff --git a/gnome-unstable/seahorse/PKGBUILD b/gnome-unstable/seahorse/PKGBUILD index 92488c782..cb1623721 100644 --- a/gnome-unstable/seahorse/PKGBUILD +++ b/gnome-unstable/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167873 2012-10-03 15:09:25Z heftig $ +# $Id: PKGBUILD 168977 2012-10-17 07:36:23Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64) @@ -19,7 +19,7 @@ groups=(gnome-extra) install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('88a0bcaa3aeef6a9a2f2abf4c7ffbf94cef474b466d79d45054d19175d5ccee8' +sha256sums=('dcdd9681a7896a13a597cf02aa2d6718b5f0ab3b50ed81f8d24b8db296a9214b' '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { diff --git a/gnome-unstable/webkitgtk/PKGBUILD b/gnome-unstable/webkitgtk/PKGBUILD new file mode 100644 index 000000000..d77de3a00 --- /dev/null +++ b/gnome-unstable/webkitgtk/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 165829 2012-08-31 06:08:20Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgbase=webkitgtk +pkgname=('webkitgtk2' 'webkitgtk3') +pkgver=1.10.1 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://webkitgtk.org/" +license=('custom') +makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc') +options=('!libtool' '!emptydirs') +source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz) +sha1sums=('3a2df2eb42ffdd7f3b39873d5461c347a6330493') + +build() { + cd "$srcdir/webkitgtk-$pkgver" + mkdir build-gtk2 build-gtk3 + + cd build-gtk2 + PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ + --enable-introspection \ + --disable-silent-rules \ + --libexecdir=/usr/lib/webkitgtk2 \ + --with-gstreamer=1.0 \ + --with-gtk=2.0 \ + --disable-webkit2 + make all stamp-po + + cd ../build-gtk3 + PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ + --enable-introspection \ + --disable-silent-rules \ + --libexecdir=/usr/lib/webkitgtk3 \ + --with-gstreamer=1.0 + make all stamp-po +} + +package_webkitgtk3() { + pkgdesc="GTK+ Web content engine library for GTK+ 3.0" + depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs') + conflicts=('libwebkit3') + provides=("libwebkit3=${pkgver}") + replaces=('libwebkit3') + + cd "$srcdir/webkitgtk-$pkgver/build-gtk3" + make -j1 DESTDIR="$pkgdir" install + install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" +} + +package_webkitgtk2() { + pkgdesc="GTK+ Web content engine library for GTK+ 2.0" + depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gst-plugins-base-libs') + conflicts=('libwebkit') + provides=("libwebkit=${pkgver}") + replaces=('libwebkit') + + cd "$srcdir/webkitgtk-$pkgver/build-gtk2" + make -j1 DESTDIR="$pkgdir" install + install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index f7005d739..fcaa11298 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -1,65 +1,96 @@ # $Id$ # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -_pkgname=blender pkgname=blender-libre -pkgver=2.64 +pkgver=2.64a pkgrel=1 -pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.blender.org" -depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' - 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' - 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada' - 'openimageio' 'libsndfile' 'jack') -makedepends=('cmake' 'boost') -replaces=("${_pkgname}") -conflicts=("${_pkgname}") -provides=("${_pkgname}=${pkgver}") -install=${_pkgname}.install -source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz - ffmpeg-0.11.patch - boost-1.50.patch) -md5sums=('caec080d2a3dcd57fe1ca20c51c00e53' - '9e5649403e51654615d30b10bc460217' - '0bab80da07d980c47b8ce3cb998edaef') +pkgaev=5 +pkgdesc='A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit support' +arch=( + i686 + x86_64 + mips64el +) +license=( + GPL +) +url=http://www.${pkgname%-libre}.org +depends=( + boost-libs + desktop-file-utils + ffmpeg + fftw + freetype2 + glew + glu + hicolor-icon-theme + jack + libgl + libpng + libsndfile + libtiff + openal + opencollada + opencolorio + openexr + openimageio + python + shared-mime-info + xdg-utils +) +makedepends=( + mesa + boost + cmake + subversion +) +replaces=( + ${pkgname%-libre} +) +conflicts=( + ${pkgname%-libre} +) +provides=( + ${pkgname%-libre}=$pkgaev:$pkgver +) +install=${pkgname%-libre}.install +source=( + http://download.${pkgname%-libre}.org/source/${pkgname%-libre}-$pkgver.tar.gz +) +sha512sums=( + 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5 +) build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - #patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch - #patch -Np1 < "${srcdir}"/boost-1.50.patch - #sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h - #sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c + cd $srcdir/${pkgname%-libre}-$pkgver mkdir build cd build - [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD=OFF" + [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF' cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DWITH_INSTALL_PORTABLE=OFF \ - -DWITH_PYTHON_INSTALL=OFF \ - -DWITH_OPENCOLLADA=ON \ - -DOPENIMAGEIO_ROOT_DIR=/usr \ - -DWITH_GAMEENGINE=ON \ - -DWITH_JACK=ON \ - -DWITH_PLAYER=ON \ - -DWITH_BUILTIN_GLEW=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \ + -DPYTHON_LIBPATH=/usr/lib \ + -DPYTHON_LIBRARY=python3.2mu \ + -DPYTHON_VERSION=3.2 \ + $DSUPPORT_SSE2_BUILD \ -DWITH_CODEC_FFMPEG=ON \ -DWITH_CODEC_SNDFILE=ON \ -DWITH_CYCLES=ON \ -DWITH_CYCLES_CUDA_BINARIES=OFF \ -DWITH_FFTW3=ON \ + -DWITH_GAMEENGINE=ON \ + -DWITH_IMAGE_REDCODE=OFF \ + -DWITH_INSTALL_PORTABLE=OFF \ + -DWITH_JACK=ON \ -DWITH_MOD_OCEANSIM=ON \ - -DPYTHON_VERSION=3.2 \ - -DPYTHON_LIBPATH=/usr/lib \ - -DPYTHON_LIBRARY=python3.2mu \ - -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \ - $ENABLESSE2 + -DWITH_OPENCOLLADA=ON \ + -DWITH_PLAYER=ON \ + -DWITH_PYTHON_INSTALL=OFF \ + -DWITH_SYSTEM_GLEW=ON make $MAKEFLAGS @@ -67,7 +98,7 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - python -m compileall "${pkgdir}/usr/share/blender" + cd $srcdir/${pkgname%-libre}-$pkgver/build + make DESTDIR=$pkgdir install + python -m compileall $pkgdir/usr/share/blender } diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD index d146e02dd..78ac80d82 100644 --- a/libre/iceape-i18n/PKGBUILD +++ b/libre/iceape-i18n/PKGBUILD @@ -11,7 +11,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceape -_debver=2.7.6 +_debver=2.7.9 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,7 +22,7 @@ pkgbase=iceape-i18n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -_pkgver=2.7.6 +_pkgver=2.7.9 pkgver=${_debver}.${_debrel} pkgrel=1 @@ -58,26 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('ee7f337bb32aee98a9f2be1936843106' - '10102b3e8f81dbd91dacddb892ba68b9' - 'fef4de4746cc36bcf911fb0f7a7b2338' - 'd31e21bb4917155e159941400b86b9a8' - '76e7c36cc0fd7e200c8b0d220d05f084' - '804fbc692db4523e31fbe337c37cd958' - '7bd3d6b9d4bdfcd5c53002ed695c3be9' - 'b875123775d4aa52b747e9ef897cee4c' - 'a5ecf997b5afa853fd46840f1e9cc01e' - '352872240f6e1812fb27599f2d43ed5e' - '7f680543cca22102660e39d775ea4f1f' - '19c47a8901163e23fc937b2076812147' - '7c1b1105b5a70008c12b3a5195c5a789' - '3306f9408c61f622a185fd9e218199ef' - '88f466e2bd3ec4236f76d92b22cc5e12' - '8c655118c3cfc0063581f11f11f23817' - '0d481cfdd69a591881e358f6a4d45e3e' - '457aea13f02af3aa2bc690ab438e1f37' - '9b72f83a7e1142ab8839fd2350437dfc' - '7e640437184ff9874d50bba9ddd8b800' - '2f00074f37b3785df5781a750e4a8293' - '9b4295c47829adcc3832d2b9524c6a95' - '1dea8892db29f13a37acdb02ba635f80') +md5sums=('9ac6e3351e0d3d32e351a359e4f91062' + '9c2e0cbcd9759554d78fd050c2c30fa7' + '0ebf63ad1eeb338bc87f1abd34bc59e4' + '70c3e008980aad34875c62a8c4d1857a' + '7811bc669dd7f2ba73331b3b65258d2b' + 'd50a27578ea43b9cc926e7cae5ef4b6f' + '9afe72fe36fe5da2c1246d19e43e8158' + '9a7b0c16665e4b7b6ea20267cb7dfeaf' + 'd79e0f519763edb4c9c88528241c49f4' + '714f8c028b633e25be32c0c60f5d4ee9' + 'b84f5f9616b37c4f6b868255d214b029' + '5725445a70d4e6e1f18438e6b164eaa0' + '839ea776b1d21990bcaf67bfefbbdeeb' + '14b20bf9388eb918ed094836306ea424' + '0fcc5b00ad23e2fd823b6e32a4d5fa86' + 'd9ee55e4b53d182be6ecda64bac3686b' + '44d6a193b3c3b6a95898a455ff8d092a' + 'ebe5a81f03658b44c301a15ba2a7c7e4' + '8c4c87c2e944f850b7f6561c866bef0d' + '8072fd0512358da3bd679afb0f7b5d68' + '292b42caa14502f420bc400291af075d' + 'cbe874781488f0b95f4a84bb33b3e4c2' + 'faabe8d25b70381d6620716450203cdf') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index e1079d74e..69711ed71 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Sid _debname=iceape -_debver=2.7.7 +_debver=2.7.9 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -29,13 +29,13 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}-2.0-lang.patch clrf.patch libre.patch) -md5sums=('c1b1a38a1ee2d9ea7c4320ab6a45e380' - '0cb9bb2194cf4f9e4eb3e3d4281fef6e' +md5sums=('5fb6b60dd8a87057c04fd8ff5251883b' + '0412e9645fc06264955b78613cea0e4b' '60ba9e8f2fafd20e41268af534a55ea7' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - '98f054a054558d5e3f6603486faef11f') + '433b5cd7f02f0ed8861237e877f51ebf') build() { export QUILT_PATCHES=debian/patches diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index 96fefccbb..d25f8dbf5 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -191,17 +191,8 @@ </DL><p> #unfilter emptyLines ---- comm-release.orig/suite/browser/browser-prefs.js 2012-02-16 11:59:53.000000000 -0200 -+++ comm-release/suite/browser/browser-prefs.js 2012-05-12 04:19:25.031793983 -0300 -@@ -67,7 +67,7 @@ - - // 0 = blank, 1 = home (browser.startup.homepage), 2 = last - pref("browser.startup.page", 1); --pref("browser.startup.homepage", "chrome://navigator-region/locale/region.properties"); -+pref("browser.startup.homepage", "about:"); - pref("browser.startup.homepage.count", 1); - - pref("browser.warnOnQuit", true); +--- comm-release.orig/suite/browser/browser-prefs.js 2012-10-17 11:29:38.687716662 -0200 ++++ comm-release/suite/browser/browser-prefs.js 2012-10-17 11:39:01.778002338 -0200 @@ -110,7 +110,7 @@ pref("browser.doorhanger.enabled", true); @@ -226,7 +217,7 @@ // getMoreThemes is used by our UI under our switch theme menu pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties"); -@@ -716,7 +715,7 @@ +@@ -715,7 +715,7 @@ #endif // plugin finder service url diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD index 8213076af..6d1e339a2 100644 --- a/libre/icedove-i18n/PKGBUILD +++ b/libre/icedove-i18n/PKGBUILD @@ -56,7 +56,7 @@ pkgname=('icedove-i18n-ar' 'icedove-i18n-zh-cn' 'icedove-i18n-zh-tw') -pkgrel=1 +pkgrel=3 pkgdesc="Language pack for Debian Icedove" arch=('any') url="http://packages.debian.org/source/experimental/icedove" @@ -121,319 +121,319 @@ noextract=(${source[@]##*/}) _path="/usr/lib/icedove/extensions/" package_icedove-i18n-ar() { - pkgdesc="Arabic language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-ar.xpi "${pkgdir}/$_path/langpack-ar@icedove.mozilla.org.xpi" } package_icedove-i18n-af() { - pkgdesc="Afrikaans (South Africa) language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-af cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-af.xpi "${pkgdir}/$_path/langpack-af@icedove.mozilla.org.xpi" } package_icedove-i18n-be() { - pkgdesc="Belarusian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-be cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-be.xpi "${pkgdir}/$_path/langpack-be@icedove.mozilla.org.xpi" } package_icedove-i18n-bn-bd() { - pkgdesc="Bangladesh language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-bn-BD.xpi "${pkgdir}/$_path/langpack-bn-BE@icedove.mozilla.org.xpi" } package_icedove-i18n-bg() { - pkgdesc="Bulgarian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-bg cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-bg.xpi "${pkgdir}/$_path/langpack-bg@icedove.mozilla.org.xpi" } package_icedove-i18n-br() { - pkgdesc="Breton language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-br.xpi "${pkgdir}/$_path/langpack-br@icedove.mozilla.org.xpi" } package_icedove-i18n-ca() { - pkgdesc="Catalan language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-ca cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-ca.xpi "${pkgdir}/$_path/langpack-ca@icedove.mozilla.org.xpi" } package_icedove-i18n-cs() { - pkgdesc="Czech language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-cs cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-cs.xpi "${pkgdir}/$_path/langpack-cs@icedove.mozilla.org.xpi" } package_icedove-i18n-da() { - pkgdesc="Danish language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-da cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-da.xpi "${pkgdir}/$_path/langpack-da@icedove.mozilla.org.xpi" } package_icedove-i18n-de() { - pkgdesc="German language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-de cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-de.xpi "${pkgdir}/$_path/langpack-de@icedove.mozilla.org.xpi" } package_icedove-i18n-el() { - pkgdesc="Greek language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-el cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-el.xpi "${pkgdir}/$_path/langpack-el@icedove.mozilla.org.xpi" } package_icedove-i18n-en-gb() { - pkgdesc="English (GB) language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-en-gb cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-en-GB.xpi "${pkgdir}/$_path/langpack-en-GB@icedove.mozilla.org.xpi" } package_icedove-i18n-es-ar() { - pkgdesc="Spanish (AR) language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-es-ar cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-es-AR.xpi "${pkgdir}/$_path/langpack-es-AR@icedove.mozilla.org.xpi" } package_icedove-i18n-es() { - pkgdesc="Spanish language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-es cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-es-ES.xpi "${pkgdir}/$_path/langpack-es-ES@icedove.mozilla.org.xpi" } package_icedove-i18n-et() { - pkgdesc="Estonian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-et cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-et.xpi "${pkgdir}/$_path/langpack-et@icedove.mozilla.org.xpi" } package_icedove-i18n-eu() { - pkgdesc="Basque language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-eu cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-eu.xpi "${pkgdir}/$_path/langpack-eu@icedove.mozilla.org.xpi" } package_icedove-i18n-fi() { - pkgdesc="Finnish language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-fi cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-fi.xpi "${pkgdir}/$_path/langpack-fi@icedove.mozilla.org.xpi" } package_icedove-i18n-fr() { - pkgdesc="French language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-fr cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-fr.xpi "${pkgdir}/$_path/langpack-fr@icedove.mozilla.org.xpi" } package_icedove-i18n-fy-nl(){ - pkgdesc="Frysk (fy) language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-fy-NL.xpi "${pkgdir}/$_path/langpack-fy-NL@icedove.mozilla.org.xpi" } package_icedove-i18n-ga() { - pkgdesc="Irish language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-ga cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-ga-IE.xpi "${pkgdir}/$_path/langpack-ga-IE@icedove.mozilla.org.xpi" } package_icedove-i18n-gd() { - pkgdesc="Scottish Gaelic language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-gd.xpi "${pkgdir}/$_path/langpack-gd@icedove.mozilla.org.xpi" } package_icedove-i18n-gl() { - pkgdesc="Galician language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-gl.xpi "${pkgdir}/$_path/langpack-gl@icedove.mozilla.org.xpi" } package_icedove-i18n-he() { - pkgdesc="Hebrew language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-he cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-he.xpi "${pkgdir}/$_path/langpack-he@icedove.mozilla.org.xpi" } package_icedove-i18n-hu() { - pkgdesc="Hungarian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-hu cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-hu.xpi "${pkgdir}/$_path/langpack-hu@icedove.mozilla.org.xpi" } package_icedove-i18n-id(){ - pkgdesc="Indonesian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-id.xpi "${pkgdir}/$_path/langpack-id@icedove.mozilla.org.xpi" } package_icedove-i18n-is() { - pkgdesc="Icelandic Gaelic language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-is.xpi "${pkgdir}/$_path/langpack-is@icedove.mozilla.org.xpi" } package_icedove-i18n-it() { - pkgdesc="Italian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-it cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-it.xpi "${pkgdir}/$_path/langpack-it@icedove.mozilla.org.xpi" } package_icedove-i18n-ja() { - pkgdesc="Japanese language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-ja cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-ja.xpi "${pkgdir}/$_path/langpack-ja@icedove.mozilla.org.xpi" } package_icedove-i18n-ko() { - pkgdesc="Korean language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-ko cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-ko.xpi "${pkgdir}/$_path/langpack-ko@icedove.mozilla.org.xpi" } package_icedove-i18n-lt() { - pkgdesc="Lithuanian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-lt cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-lt.xpi "${pkgdir}/$_path/langpack-lt@icedove.mozilla.org.xpi" } package_icedove-i18n-nb() { - pkgdesc="Norwegian (Bokmal) language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-nb cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-nb-NO.xpi "${pkgdir}/$_path/langpack-nb-NO@icedove.mozilla.org.xpi" } package_icedove-i18n-mk() { - pkgdesc="Macedonian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-mk cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-mk.xpi "${pkgdir}/$_path/langpack-mk@icedove.mozilla.org.xpi" } package_icedove-i18n-nl() { - pkgdesc="Dutch language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-nl cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-nl.xpi "${pkgdir}/$_path/langpack-nl@icedove.mozilla.org.xpi" } package_icedove-i18n-nn() { - pkgdesc="Norwegian (Nynorsk) language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-nn cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-nn-NO.xpi "${pkgdir}/$_path/langpack-nn-NO@icedove.mozilla.org.xpi" } package_icedove-i18n-pa() { - pkgdesc="Punjabi language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-pa cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-pa-IN.xpi "${pkgdir}/$_path/langpack-pa-IN@icedove.mozilla.org.xpi" } package_icedove-i18n-pl() { - pkgdesc="Polish language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-pl cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-pl.xpi "${pkgdir}/$_path/langpack-pl@icedove.mozilla.org.xpi" } package_icedove-i18n-pt-br() { - pkgdesc="Brazilian Portuguese language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-pt-br cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-pt-BR.xpi "${pkgdir}/$_path/langpack-pt-BR@icedove.mozilla.org.xpi" } package_icedove-i18n-pt() { - pkgdesc="Portuguese language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-pt cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-pt-PT.xpi "${pkgdir}/$_path/langpack-pt-PT@icedove.mozilla.org.xpi" } package_icedove-i18n-ro() { - pkgdesc="Romanian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-ro cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-ro.xpi "${pkgdir}/$_path/langpack-ro@icedove.mozilla.org.xpi" } package_icedove-i18n-rm() { - pkgdesc="Romansh language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-rm.xpi "${pkgdir}/$_path/langpack-rm@icedove.mozilla.org.xpi" } package_icedove-i18n-ru() { - pkgdesc="Russian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-ru cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-ru.xpi "${pkgdir}/$_path/langpack-ru@icedove.mozilla.org.xpi" } package_icedove-i18n-si() { - pkgdesc="Sinhalese language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-si.xpi "${pkgdir}/$_path/langpack-si@icedove.mozilla.org.xpi" } package_icedove-i18n-sk() { - pkgdesc="Slovak language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-sk cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-sk.xpi "${pkgdir}/$_path/langpack-sk@icedove.mozilla.org.xpi" } package_icedove-i18n-sl() { - pkgdesc="Slovenian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-sl cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-sl.xpi "${pkgdir}/$_path/langpack-sl@icedove.mozilla.org.xpi" } package_icedove-i18n-sq() { - pkgdesc="Albanian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-sl cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-sq.xpi "${pkgdir}/$_path/langpack-sq@icedove.mozilla.org.xpi" } package_icedove-i18n-sv() { - pkgdesc="Swedish language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-sv cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-sv-SE.xpi "${pkgdir}/$_path/langpack-sv-SE@icedove.mozilla.org.xpi" } package_icedove-i18n-ta-lk() { - pkgdesc=" Tamil (Sri Lanka) language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-sv cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-ta-LK.xpi "${pkgdir}/$_path/langpack-ta-LK@icedove.mozilla.org.xpi" @@ -441,33 +441,33 @@ package_icedove-i18n-ta-lk() { package_icedove-i18n-tr() { - pkgdesc="Turkish language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-tr cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-tr.xpi "${pkgdir}/$_path/langpack-tr@icedove.mozilla.org.xpi" } package_icedove-i18n-uk() { - pkgdesc="Ukrainian language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-uk cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-uk.xpi "${pkgdir}/$_path/langpack-uk@icedove.mozilla.org.xpi" } package_icedove-i18n-vi() { - pkgdesc="Vietnamese language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-vi.xpi "${pkgdir}/$_path/langpack-vi@icedove.mozilla.org.xpi" } package_icedove-i18n-zh-cn() { - pkgdesc="Chinese (simplified) language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-zh-cn cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-zh-CN.xpi "${pkgdir}/$_path/langpack-zh-CN@icedove.mozilla.org.xpi" } package_icedove-i18n-zh-tw() { - pkgdesc="Chinese (traditional) language pack for Debian Icedove" + pkgdesc="Language packs for Debian Icedove." replaces=icedove-zh-tw cd ${srcdir} install -Dm644 icedove-i18n-$pkgver-zh-TW.xpi "${pkgdir}/$_path/langpack-zh-TW@icedove.mozilla.org.xpi" diff --git a/staging/kdebase-workspace/etc-scripts.patch b/staging/kdebase-workspace/etc-scripts.patch new file mode 100644 index 000000000..903a90a53 --- /dev/null +++ b/staging/kdebase-workspace/etc-scripts.patch @@ -0,0 +1,11 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -206,7 +190,7 @@ + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do |