diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-17 01:15:52 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-17 01:15:52 -0700 |
| commit | c84b2cd310f86dc50c4f52a5907cb17652e8c87c (patch) | |
| tree | ef3dc614b68e1e6f5966a5d29f3970e27bb7c4f9 | |
| parent | 99d0ec7ebad2eda5f3a03098962e3b250e3bef4c (diff) | |
Wed Oct 17 01:14:52 PDT 2012
176 files changed, 7471 insertions, 378 deletions
diff --git a/community-testing/avr-gdb/PKGBUILD b/community-testing/avr-gdb/PKGBUILD new file mode 100644 index 000000000..2dbb56ee0 --- /dev/null +++ b/community-testing/avr-gdb/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Ivan Sichmann Freitas <ivansichfreitas at gmail dot com> +# Contributor: Laszlo Papp <djszapi2 at gmail dot com> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> +# Contributor: Vladimir Cerny <blackvladimir@gmail.com> +# Contributor: 4javier <4javieregATgmailDOTcom> + +pkgname=avr-gdb +_pkgname=gdb +pkgver=7.4 +pkgrel=2 +pkgdesc="The GNU Debugger for AVR" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/gdb/" +license=('GPL3') +depends=('python') +options=('!libtool') +source=(http://ftp.gnu.org/gnu/gdb/${_pkgname}-${pkgver}.tar.bz2) +md5sums=('95a9a8305fed4d30a30a6dc28ff9d060') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + + unset LDFLAGS + export CFLAGS="-O2 -pipe" + export CXXFLAGS="$CFLAGS" + + ./configure --prefix=/usr \ + --target=avr \ + --disable-nls \ + --enable-languages=c,c++ \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --program-prefix=avr- \ + --libexecdir=/usr/lib \ + --mandir=/usr/share/man \ + --with-system-readline + make +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + rm -f ${pkgdir}/usr/lib/libiberty.a + rm -rf ${pkgdir}/usr/share/info + rm -rf ${pkgdir}/usr/share/gdb + rm -rf ${pkgdir}/usr/include/gdb +} diff --git a/community-testing/blueman/PKGBUILD b/community-testing/blueman/PKGBUILD new file mode 100644 index 000000000..cb4ae826b --- /dev/null +++ b/community-testing/blueman/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 78034 2012-10-16 11:49:44Z allan $ +# Maintainer : Ionut Biru <ibiru@archlinux.org +# Contributor: Abhishek Dasgupta <abhidg@gmail.com> + +pkgname=blueman +pkgver=1.23 +pkgrel=5 +pkgdesc="GTK+ bluetooth manager" +arch=('i686' 'x86_64') +license=('GPL') +url="http://blueman-project.org" +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') +optdepends=('dnsmasq: For creating PAN network' + 'gconf: For gconf configuration support' + 'pulseaudio: To use the pulseaudio plugin' + 'notification-daemon: for desktop notifications' + 'libnotify: for desktop notifications' + 'modemmanager: for modem management service' + 'gnome-icon-theme: icon theme') +options=('!libtool') +install=$pkgname.install +source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz) +md5sums=('f0bee59589f4c23e35bf08c2ef8acaef') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export PYTHON=python2 + for file in apps/blueman*; do + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + done + sed -i 's|"blueman-tray"|"blueman"|' blueman/plugins/applet/StatusIcon.py + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/blueman \ + --with-no-runtime-deps-check + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + echo "OnlyShowIn=GNOME;XFCE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop +} diff --git a/community-testing/blueman/blueman.install b/community-testing/blueman/blueman.install new file mode 100644 index 000000000..8bf021487 --- /dev/null +++ b/community-testing/blueman/blueman.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/cython/PKGBUILD b/community-testing/cython/PKGBUILD new file mode 100644 index 000000000..3e20aed0f --- /dev/null +++ b/community-testing/cython/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 78039 2012-10-16 11:50:02Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Igor Scabini <furester @ gmail.com> + +pkgname=('cython' 'cython2') +pkgbase=cython +pkgver=0.17 +pkgrel=2 +pkgdesc="C-Extensions for Python " +arch=(i686 x86_64) +url="http://www.cython.org" +license=('APACHE') +makedepends=('python-distribute' 'python2-distribute') +source=("http://cython.org/release/Cython-$pkgver.tar.gz") +md5sums=('d6b669956b25babf7dd86db0a98539e4') + +build() { + true +} + +package_cython() { + depends=('python') + + cd $srcdir/Cython-$pkgver + python setup.py install --root=$pkgdir + + sed -i 's|#!.*python|#!/usr/bin/python3|' $pkgdir/usr/bin/* +} + +package_cython2() { + depends=('python2') + + cd $srcdir/Cython-$pkgver + python2 setup.py install --root=$pkgdir + + mv $pkgdir/usr/bin/cygdb $pkgdir/usr/bin/cygdb2 + mv $pkgdir/usr/bin/cython $pkgdir/usr/bin/cython2 +} diff --git a/community-testing/dee/PKGBUILD b/community-testing/dee/PKGBUILD new file mode 100644 index 000000000..577c0efdb --- /dev/null +++ b/community-testing/dee/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 78040 2012-10-16 11:50:05Z allan $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=dee +pkgver=1.0.14 +pkgrel=2 +pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" +arch=('i686' 'x86_64') +url="https://launchpad.net/dee" +license=('LGPL') +depends=('glib2' 'icu') +makedepends=('python2' 'gobject-introspection' 'vala') +options=('!libtool') +source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('473b4181e26538af0fb753255da7945c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-tests \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install + + # Install GI overrides for python 3 as well + 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-testing/duplicity/PKGBUILD b/community-testing/duplicity/PKGBUILD new file mode 100644 index 000000000..fdfac734f --- /dev/null +++ b/community-testing/duplicity/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 78042 2012-10-16 11:50:16Z allan $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: Aaron Schaefer <aaron@elasticdog.com> + +pkgname=duplicity +pkgver=0.6.19 +pkgrel=2 +pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' +arch=('i686' 'x86_64') +url='http://www.nongnu.org/duplicity/' +license=('GPL') +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') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # python2 fix + for file in $(find . -name '*.py' -print); do + 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) + chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1" + chmod 644 "$pkgdir/usr/share/man/man1/rdiffdir.1" + chmod 644 "$pkgdir/usr/share/doc/$pkgname-$pkgver"/* +} diff --git a/community-testing/duplicity/botobackend.patch b/community-testing/duplicity/botobackend.patch new file mode 100644 index 000000000..302e1e2b1 --- /dev/null +++ b/community-testing/duplicity/botobackend.patch @@ -0,0 +1,13 @@ +=== modified file duplicity/backends/botobackend.py +--- duplicity/backends/botobackend.py 2011-11-25 17:47:57 +0000 ++++ duplicity/backends/botobackend.py 2011-12-01 16:15:25 +0000 +@@ -26,6 +26,6 @@ + if sys.version_info[:2] < (2,6): + print "Sorry, S3 multiprocessing requires version 2.6 or later of python" + sys.exit(1) +- import _boto_multi.py ++ import _boto_multi + else: +- import _boto_single.py ++ import _boto_single + diff --git a/community-testing/duplicity/duplicity-0.6.17-fix-memleak.patch b/community-testing/duplicity/duplicity-0.6.17-fix-memleak.patch new file mode 100644 index 000000000..1c4c8daff --- /dev/null +++ b/community-testing/duplicity/duplicity-0.6.17-fix-memleak.patch @@ -0,0 +1,29 @@ +=== modified file 'duplicity/util.py' +--- duplicity/util.py 2011-08-23 18:14:17 +0000 ++++ duplicity/util.py 2012-01-20 21:50:01 +0000 +@@ -71,6 +71,10 @@ + else: + raise + ++class BlackHoleList(list): ++ def append(self, x): ++ pass ++ + class FakeTarFile: + debug = 0 + def __iter__(self): +@@ -83,7 +87,12 @@ + # yet. So we want to ignore ReadError exceptions, which are used to signal + # this. + try: +- return tarfile.TarFile("arbitrary", mode, fp) ++ tf = tarfile.TarFile("arbitrary", mode, fp) ++ # Now we cause TarFile to not cache TarInfo objects. It would end up ++ # consuming a lot of memory over the lifetime of our long-lasting ++ # signature files otherwise. ++ tf.members = BlackHoleList() ++ return tf + except tarfile.ReadError: + return FakeTarFile() + + diff --git a/community-testing/gcompris/PKGBUILD b/community-testing/gcompris/PKGBUILD new file mode 100644 index 000000000..ef43565a4 --- /dev/null +++ b/community-testing/gcompris/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 78045 2012-10-16 11:50:27Z allan $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> + +pkgname=gcompris +pkgver=12.05 +pkgrel=2 +pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" +arch=('i686' 'x86_64') +url="http://gcompris.net/" +license=('GPL3') +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' + 'gnuchess: for the chess activity') +makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess') +options=('!libtool') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +sha256sums=('a4e9b9d04fd405c4b9ddc30f84a5f521f7ad1966c5f66c3e873bb84269ef55d0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + depends+=('gcompris-data') + + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install-exec +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/gigi/PKGBUILD b/community-testing/gigi/PKGBUILD index 4a5bb74b8..860c05544 100644 --- a/community-testing/gigi/PKGBUILD +++ b/community-testing/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77537 2012-10-11 22:30:20Z lcarlier $ +# $Id: PKGBUILD 78047 2012-10-16 11:50:33Z 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-testing/guake/PKGBUILD b/community-testing/guake/PKGBUILD new file mode 100644 index 000000000..eda3e0c4d --- /dev/null +++ b/community-testing/guake/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 78050 2012-10-16 11:50:47Z 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=2 +pkgdesc='Drop-down terminal for GNOME' +arch=('i686' 'x86_64') +url="http://guake.org/" +license=('GPL') +depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool') +options=('!libtool') +install=$pkgname.install +source=(http://guake.org/files/$pkgname-$pkgver.tar.gz + guake-fix-notification.patch) +md5sums=('532adada29b8f0bb79dc15904aa6b70c' + '0b57227e6869dd84dd4fb0794ed0d082') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.in + sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/{guake{,-prefs},prefs.py} + + # http://guake.org/ticket/416 + patch -Np1 -i "$srcdir/guake-fix-notification.patch" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-install \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/guake/guake-fix-notification.patch b/community-testing/guake/guake-fix-notification.patch new file mode 100644 index 000000000..847dac10e --- /dev/null +++ b/community-testing/guake/guake-fix-notification.patch @@ -0,0 +1,42 @@ +--- a/src/guake 2011-02-09 20:00:35.000000000 +0100 ++++ b/src/guake 2012-02-25 00:55:28.513075769 +0100 +@@ -46,7 +46,10 @@ + TERMINAL_MATCH_EXPRS, TERMINAL_MATCH_TAGS, \ + ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER + +-pynotify.init('Guake!') ++popup_works = True ++if not pynotify.init('Guake!') or pynotify.get_server_info() == None : ++ popup_works = False ++ print "WARNING: could not use popup notification" + + GNOME_FONT_PATH = '/desktop/gnome/interface/monospace_font_name' + +@@ -637,7 +640,12 @@ + 'Please use Guake Preferences dialog to choose another ' + 'key (The trayicon was enabled)') % label, filename) + self.client.set_bool(KEY('/general/use_trayicon'), True) +- notification.show() ++ if popup_works : ++ notification.show() ++ else : ++ print _('A problem happened when binding <b>%s</b> key.\n' ++ 'Please use Guake Preferences dialog to choose another ' ++ 'key (The trayicon was enabled)') % label + + elif self.client.get_bool(KEY('/general/use_popup')): + # Pop-up that shows that guake is working properly (if not +@@ -646,7 +654,11 @@ + _('Guake!'), + _('Guake is now running,\n' + 'press <b>%s</b> to use it.') % label, filename) +- notification.show() ++ if popup_works : ++ notification.show() ++ else : ++ print _('Guake is now running,\n' ++ 'press <b>%s</b> to use it.') % label + + def execute_command(self, command, tab=None): + """Execute the `command' in the `tab'. If tab is None, the + diff --git a/community-testing/guake/guake.install b/community-testing/guake/guake.install new file mode 100644 index 000000000..8084333b1 --- /dev/null +++ b/community-testing/guake/guake.install @@ -0,0 +1,22 @@ +pkgname=guake + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + xdg-icon-resource forceupdate +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + xdg-icon-resource forceupdate +} diff --git a/community-testing/gwibber/PKGBUILD b/community-testing/gwibber/PKGBUILD new file mode 100644 index 000000000..d6c663411 --- /dev/null +++ b/community-testing/gwibber/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 78051 2012-10-16 11:50:52Z allan $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=gwibber +pkgver=3.4.2 +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' '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 +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('0ac544f8e626547312b9d0da0b57358e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile --disable-unity + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/gwibber/gwibber.install b/community-testing/gwibber/gwibber.install new file mode 100644 index 000000000..d973d53f7 --- /dev/null +++ b/community-testing/gwibber/gwibber.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/ibus/PKGBUILD b/community-testing/ibus/PKGBUILD new file mode 100644 index 000000000..63dd39df2 --- /dev/null +++ b/community-testing/ibus/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 78054 2012-10-16 11:51:03Z allan $ +# Contributor: Rainy <rainylau(at)gmail(dot)com> +# Contributor: Lee.MaRS <leemars at gmail dot com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Brad Fanella <bradfanella@archlinux.us> + +pkgname=ibus +pkgver=1.4.2 +pkgrel=2 +pkgdesc="Next Generation Input Bus for Linux" +arch=('i686' 'x86_64') +url="http://ibus.googlecode.com" +license=('LGPL') +depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \ + 'iso-codes' 'librsvg' 'python2-notify' 'hicolor-icon-theme') +makedepends=('intltool' 'gobject-introspection') +optdepends=('notification-daemon') +options=('!libtool') +install=ibus.install +source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +sha1sums=('a2d11d8bb64761691df918e9e50f0b35c711760d') + +build() { + cd ${pkgname}-${pkgver} + export PYTHON=python2 + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/ibus \ + --sysconfdir=/etc \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ + --enable-gtk3 + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/etc/xdg/autostart" + ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop" +} diff --git a/community-testing/ibus/ibus.install b/community-testing/ibus/ibus.install new file mode 100644 index 000000000..f44e3be1d --- /dev/null +++ b/community-testing/ibus/ibus.install @@ -0,0 +1,29 @@ +post_install() { + gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + + gconfpkg --install ibus + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + + # update for gkt3 + gtk-query-immodules-3.0 --update-cache +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall ibus +} + +post_remove() { + gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + gtk-update-icon-cache -fq -t usr/share/icons/hicolor + + # update for gkt3 + gtk-query-immodules-3.0 --update-cache +} diff --git a/community-testing/ktoblzcheck/PKGBUILD b/community-testing/ktoblzcheck/PKGBUILD new file mode 100644 index 000000000..da749e7bd --- /dev/null +++ b/community-testing/ktoblzcheck/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 78059 2012-10-16 11:51:20Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> + +pkgname=ktoblzcheck +pkgver=1.39 +pkgrel=3 +pkgdesc="A library to check account numbers and bank codes of German banks" +arch=(i686 x86_64) +url="http://ktoblzcheck.sourceforge.net" +options=('!libtool') +license=("LGPL") +depends=('gcc-libs' 'python') +optdepends=('perl') +source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz + ktoblzcheck-python3.patch) +md5sums=('ef5efd6e2c31aaf6405060ec477c200c' + 'a81a697bb3aaeffb7fac0ad7d9166e3f') + +build() { + cd "$srcdir/ktoblzcheck-$pkgver" + ./configure --prefix=/usr + patch -p1 <$srcdir/ktoblzcheck-python3.patch + make +} + +package() { + cd "$srcdir/ktoblzcheck-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/ktoblzcheck/ktoblzcheck-python3.patch b/community-testing/ktoblzcheck/ktoblzcheck-python3.patch new file mode 100644 index 000000000..5bfc53275 --- /dev/null +++ b/community-testing/ktoblzcheck/ktoblzcheck-python3.patch @@ -0,0 +1,57 @@ +diff -ur ktoblzcheck-1.28/src/python/ktoblzcheck.py ktoblzcheck-1.28.my/src/python/ktoblzcheck.py +--- ktoblzcheck-1.28/src/python/ktoblzcheck.py 2008-08-12 16:48:54.000000000 +0000 ++++ ktoblzcheck-1.28.my/src/python/ktoblzcheck.py 2010-09-20 09:08:36.000000000 +0000 +@@ -197,35 +197,35 @@ + + def test(): + a = AccountNumberCheck() +- print 'Number of Banks:', a.bankCount +- print 'find 20010020:', a.findBank('20010020') +- print 'find 20010033:', a.findBank('20010033') +- print 'check 20070024/9291394:', a.check('20070024','9291394') +- print 'check 20070024/9291394:', a.check('20070024','9291394023') +- print ++ print('Number of Banks:', a.bankCount) ++ print('find 20010020:', a.findBank('20010020')) ++ print('find 20010033:', a.findBank('20010033')) ++ print('check 20070024/9291394:', a.check('20070024','9291394')) ++ print('check 20070024/9291394:', a.check('20070024','9291394023')) ++ print() + ck = IbanCheck() + if not kto.IbanCheck_selftest(ck): # not publicly defined +- print "Self-Test failed!" ++ print("Self-Test failed!") + raise SystemExit + s = " iban fr14 2004 1010 0505 0001 3m02 606" +- print "test for iban :", s ++ print("test for iban :", s) + iban = Iban(s) +- print "transmission form:", iban.transmissionForm() ++ print("transmission form:", iban.transmissionForm()) + res = ck.check(iban) +- print "check result :", res, "("+IbanCheck.resultText(res)+")" +- print "printable form :", iban.printableForm() +- print +- print "expect bad checksum:" ++ print("check result :", res, "("+IbanCheck.resultText(res)+")") ++ print("printable form :", iban.printableForm()) ++ print() ++ print("expect bad checksum:") + s = "FR1420041010050500013X02606" + res = ck.check(s) +- print s + ":", res, "("+IbanCheck.resultText(res)+")" +- print ++ print(s + ":", res, "("+IbanCheck.resultText(res)+")") ++ print() + s = "IBAN DE66 2007 0024 0929 1394 00" +- print s ++ print(s) + s = Iban(s).transmissionForm() + start, end = ck.bic_position(s) +- print "prefix, checksum, BIC, account:" +- print ', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0'))) ++ print("prefix, checksum, BIC, account:") ++ print(', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0')))) + + + if __name__ == '__main__': diff --git a/community-testing/luxrays/PKGBUILD b/community-testing/luxrays/PKGBUILD new file mode 100644 index 000000000..6bc26c17c --- /dev/null +++ b/community-testing/luxrays/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 78154 2012-10-16 13:53:31Z allan $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +pkgname=luxrays +pkgver=1.1 +_pkgver=589aa5dac899 +pkgrel=1 +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') +source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) +md5sums=('7513d71148fa14bc1779b816816580b9') + +build() { + cd "$srcdir/luxrender-$pkgname-$_pkgver" + + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DLUXRAYS_DISABLE_OPENCL=OFF \ + . + make +} + +package() { + cd "$srcdir/luxrender-$pkgname-$_pkgver" + + install -d -m755 "$pkgdir"/usr/{bin,include,lib} + install -m755 bin/* "$pkgdir"/usr/bin + install -m644 lib/* "$pkgdir"/usr/lib + cp -a include/luxrays "$pkgdir"/usr/include +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/luxrender/PKGBUILD b/community-testing/luxrender/PKGBUILD new file mode 100644 index 000000000..01680e4f8 --- /dev/null +++ b/community-testing/luxrender/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 78061 2012-10-16 11:51:31Z allan $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Initial contributor: flixie <69one@gmx.net> +# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> +pkgname=luxrender +pkgver=1.1 +_pkgver=4b4289cda943 +pkgrel=1 +pkgdesc="Rendering system for physically correct, unbiased image synthesis" +arch=('i686' 'x86_64') +url="http://www.luxrender.net/" +license=('GPL') +depends=('boost-libs' 'freeimage' 'openexr' 'libcl') +optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ + 'python: Python interface (pylux)' + '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) +md5sums=('accca65afdc4cc38db49a6e54f20e0f2') + +build() { + cd "$srcdir"/luxrender-lux-$_pkgver + + # 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.3m.so \ + -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \ + . + make +} + +package() { + cd "$srcdir"/luxrender-lux-$_pkgver + make DESTDIR="$pkgdir" install + + # fix library path on x86_64 + [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib + + #install pylux + install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/mezogis/ChangeLog b/community-testing/mezogis/ChangeLog new file mode 100644 index 000000000..dba4cf7ec --- /dev/null +++ b/community-testing/mezogis/ChangeLog @@ -0,0 +1,3 @@ +2007-06-27 tardo <tardo@nagi-fanboi.net> +* Built for x86_64 + diff --git a/community-testing/mezogis/PKGBUILD b/community-testing/mezogis/PKGBUILD new file mode 100644 index 000000000..4e0f09c6c --- /dev/null +++ b/community-testing/mezogis/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 78132 2012-10-16 12:09:28Z allan $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=mezogis +pkgver=0.1.5 +pkgrel=6 +pkgdesc="A GIS application to query and analyse spatial data" +arch=('i686' 'x86_64') +url="http://www.mezogis.org" +license=('GPL') +depends=('pygtk' 'python2-geotypes' 'postgis') +source=("http://www.mezogis.org/files/mezogis-$pkgver.tar.gz") +md5sums=('1f886b849109a1a1bd3e165353b82368') + +package() { + cd $srcdir/mezogis-$pkgver + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + python2 setup.py install --root=$pkgdir +} diff --git a/community-testing/neatx/PKGBUILD b/community-testing/neatx/PKGBUILD new file mode 100644 index 000000000..3146452f5 --- /dev/null +++ b/community-testing/neatx/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 78062 2012-10-16 11:51:38Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Nicolas Doualot <packages@slubman.info> + +pkgname=neatx +pkgver=0.3.1 +pkgrel=13 +pkgdesc="A free NX server by google" +arch=('i686' 'x86_64') +url="http://code.google.com/p/neatx/" +license=('GPL') +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' + 'xterm: if you want console session') +install=neatx.install +source=(http://neatx.googlecode.com/files/$pkgname-$pkgver.tar.gz + constants.archlinux.patch) +md5sums=('5748656738d5f04fef1af01b9fe5ef20' + 'a5ca4aa399cc25fa8435280e8b03c5a3') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -i "$srcdir/constants.archlinux.patch" -p2 + + ./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" + + install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ + echo -e '/usr/lib\n/opt/NX/lib' > ${pkgdir}/etc/ld.so.conf.d/neatx.conf +} diff --git a/community-testing/neatx/constants.archlinux.patch b/community-testing/neatx/constants.archlinux.patch new file mode 100644 index 000000000..dff5e2415 --- /dev/null +++ b/community-testing/neatx/constants.archlinux.patch @@ -0,0 +1,42 @@ +--- a/neatx-0.3.1/lib/constants.py 2009-06-24 21:19:55.000000000 +0200 ++++ b/neatx-0.3.1/lib/constants.py 2009-07-08 10:50:30.000000000 +0200 +@@ -25,19 +25,19 @@ + from neatx import _autoconf + + +-NXDIR = "/usr/lib/nx" ++NXDIR = "/opt/NX/bin" + + SYSLOG_ADDRESS = "/dev/log" + BASH = "/bin/bash" +-NETCAT = "/bin/netcat" ++NETCAT = "/usr/bin/netcat" + XRDB = "/usr/bin/xrdb" + SU = "/bin/su" + SSH = "/usr/bin/ssh" + XAUTH = "/usr/bin/xauth" +-XSESSION = "/etc/X11/Xsession" ++XSESSION = "/etc/X11/xdm/Xsession" + + START_CONSOLE_COMMAND = "/usr/bin/xterm" +-START_KDE_COMMAND = XSESSION + " startkde" ++START_KDE_COMMAND = " startkde" + START_GNOME_COMMAND = XSESSION + " gnome-session" + + NXUSER = "nx" +@@ -47,12 +47,13 @@ + NXNC = _autoconf.PKGLIBDIR + "/nxnc" + NXDIALOG = _autoconf.PKGLIBDIR + "/nxdialog" + NXAGENT = NXDIR + "/nxagent" +-NXAGENT_PKGNAME = "nxagent" ++#NXAGENT_PKGNAME = "nxagent" ++NXAGENT_PKGNAME = "nxserver" + FDCOPY = _autoconf.PKGLIBDIR + "/fdcopy" + TTYSETUP = _autoconf.PKGLIBDIR + "/ttysetup" + + # Extract nxagent version using the following command. +-NXAGENT_VERSION_COMMAND = ("dpkg-query -W --showformat='${Version}' %s" % ++NXAGENT_VERSION_COMMAND = ("pacman -Qi %s | grep Version | awk '{print $3}'" % + NXAGENT_PKGNAME) + NXAGENT_VERSION_SEP = ".-~" + diff --git a/community-testing/neatx/neatx.install b/community-testing/neatx/neatx.install new file mode 100644 index 000000000..89356878c --- /dev/null +++ b/community-testing/neatx/neatx.install @@ -0,0 +1,18 @@ +post_install() { + useradd -d /opt/NX/home/nx -s /usr/lib/neatx/nxserver-login-wrapper nx &> /dev/null + mkdir -p ~nx/.ssh + cp /usr/share/neatx/authorized_keys.nomachine ~nx/.ssh/authorized_keys + chmod 600 ~nx/.ssh/authorized_keys + chown -R nx ~nx + post_remove +} + +pre_remove() { + userdel nx > /dev/null 2>&1 + rm -rf ~nx +} + +post_remove() { + sed -e '/\/opt\/NX\/lib/d' -i etc/ld.so.conf + ldconfig +} diff --git a/community-testing/onboard/PKGBUILD b/community-testing/onboard/PKGBUILD new file mode 100644 index 000000000..0b4510956 --- /dev/null +++ b/community-testing/onboard/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 78064 2012-10-16 11:51:46Z allan $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=onboard +pkgver=0.98.1 +pkgrel=1 +pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users" +arch=('i686' 'x86_64') +url="https://launchpad.net/onboard" +license=('GPL') +depends=('python-dbus' 'python-gobject' 'gtk3' 'python-virtkey' 'librsvg' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('python-distutils-extra') +optdepends=('at-spi2-atk: auto-show when editing text' + 'mousetweaks: hover click with mouse') +options=('!emptydirs') +install=$pkgname.install +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('107e031b429329b71deb67c9b90195d6') + +package() { + cd "$srcdir/$pkgname-$pkgver" + + # 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-testing/onboard/onboard.install b/community-testing/onboard/onboard.install new file mode 100644 index 000000000..aa4c3e059 --- /dev/null +++ b/community-testing/onboard/onboard.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/python-bsddb/LICENSE b/community-testing/python-bsddb/LICENSE new file mode 100644 index 000000000..7d6035775 --- /dev/null +++ b/community-testing/python-bsddb/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2008-2009 Jesus Cea Avion + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.
\ No newline at end of file diff --git a/community-testing/python-bsddb/PKGBUILD b/community-testing/python-bsddb/PKGBUILD new file mode 100644 index 000000000..64a455419 --- /dev/null +++ b/community-testing/python-bsddb/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 78072 2012-10-16 11:52:09Z allan $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# 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=3 +pkgdesc="Python interface for BerkeleyDB" +license=('MIT') +arch=('i686' 'x86_64') +url="http://www.jcea.es/programacion/pybsddb.htm" +makedepends=('python2-distribute' 'python-distribute') +source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz + LICENSE) +sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915' + 'ef4e4caf618781104dbf5824279ed39d127b4713') + +build () { + cd "${srcdir}" + + cp -r bsddb3-${pkgver}{,-python2} + + # Build python 3 module + cd bsddb3-${pkgver} + python3 setup.py --berkeley-db=/usr build + + # Build python 2 module + cd ../bsddb3-${pkgver}-python2 + python2 setup.py --berkeley-db=/usr build +} + +package_python2-bsddb() { + depends=('db' 'python2>=2.7') + cd "${srcdir}/bsddb3-${pkgver}-python2" + + python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_python-bsddb() { + depends=('db' 'python>=3.3') + cd "${srcdir}/bsddb3-${pkgver}" + + 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-testing/python-gnupginterface/PKGBUILD b/community-testing/python-gnupginterface/PKGBUILD new file mode 100644 index 000000000..33446e9b3 --- /dev/null +++ b/community-testing/python-gnupginterface/PKGBUILD @@ -0,0 +1,21 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Aaron Schaefer <aaron@elasticdog.com> + +pkgbase=python-gnupginterface +pkgname=python2-gnupginterface +pkgver=0.3.2 +pkgrel=1 +pkgdesc='A Python interface to GNU Privacy Guard (GnuPG).' +arch=('i686' 'x86_64') +url='http://py-gnupg.sourceforge.net/' +license=('GPL') +depends=('gnupg' 'python2') +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') + +package_python2-gnupginterface() { + cd "$srcdir/GnuPGInterface-$pkgver" + python2 setup.py install --root="$pkgdir" -O1 +} diff --git a/community-testing/python-mpi4py/PKGBUILD b/community-testing/python-mpi4py/PKGBUILD new file mode 100644 index 000000000..74cb41ee8 --- /dev/null +++ b/community-testing/python-mpi4py/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 78088 2012-10-16 11:52:49Z 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=2 +arch=('i686' 'x86_64') +url="http://mpi4py.scipy.org" +license=('BSD') +makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'openmpi') +source=(http://mpi4py.googlecode.com/files/mpi4py-${pkgver}.tar.gz) +sha1sums=('282c1b9e35b242c9bd86126ebc5af6c70d8c2833') + +build() { + cd "${srcdir}" + cp -a mpi4py-${pkgver}{,-python2} + + # Build python 3 module + cd mpi4py-${pkgver} + python3 setup.py build + + # Build python 2 module + cd ../mpi4py-${pkgver}-python2 + python2 setup.py build +} + +package_python-mpi4py() { + pkgdesc="Python bindings of the Message Passing Interface (MPI)" + depends=('python>=3.3' 'openmpi') + + cd "${srcdir}/mpi4py-${pkgver}" + python3 setup.py install --root "${pkgdir}" --optimize=1 --skip-build +} + +package_python2-mpi4py() { + pkgdesc="Python2 bindings of the Message Passing Interface (MPI)" + depends=('python2>=2.7' 'openmpi') + + cd "${srcdir}/mpi4py-${pkgver}-python2" + python2 setup.py install --root "${pkgdir}" --optimize=1 --skip-build +} diff --git a/community-testing/python-numarray/LICENSE b/community-testing/python-numarray/LICENSE new file mode 100644 index 000000000..30ff57fc4 --- /dev/null +++ b/community-testing/python-numarray/LICENSE @@ -0,0 +1,9 @@ +Copyright (C) 2005 Association of Universities for Research in Astronomy (AURA) + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +3. The name of AURA and its representatives may not be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community-testing/python-numarray/PKGBUILD b/community-testing/python-numarray/PKGBUILD new file mode 100644 index 000000000..327b286b5 --- /dev/null +++ b/community-testing/python-numarray/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 78090 2012-10-16 11:52:56Z allan $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> + +pkgbase=python-numarray +pkgname=python2-numarray +pkgver=1.5.2 +pkgrel=6 +pkgdesc='Provides array manipulation and computational capabilities.' +arch=('i686' 'x86_64') +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' + 'e32b4466453e530d7fb0dbeee0ca1044') + +build() { + cd "${srcdir}/numarray-${pkgver}" + + # python2 fix + sed -i 's_#! /usr/bin/env python_#! /usr/bin/env python2_' Examples/convolve/benchmark.py +} + +package_python2-numarray() { + cd "${srcdir}/numarray-${pkgver}" + + python2 setup.py install --root="${pkgdir}" + install -D ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community-testing/python-openbabel/PKGBUILD b/community-testing/python-openbabel/PKGBUILD new file mode 100644 index 000000000..130117080 --- /dev/null +++ b/community-testing/python-openbabel/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 78091 2012-10-16 11:53:00Z allan $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Michal Bozon <bozonm@vscht.cz> + +pkgname=python-openbabel +pkgver=2.3.1 +pkgrel=3 +pkgdesc="Python bindings of openbabel library" +arch=('i686' 'x86_64') +url="http://openbabel.org/wiki/Python" +license=('GPL') +depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen2') +makedepends=('swig' 'cmake') +options=('!libtool') +source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz) +md5sums=('1f029b0add12a3b55582dc2c832b04f8') + +build() { + cd "${srcdir}/openbabel-$pkgver" + + # Create babelconfig.h + cmake . + + # Regenerate interface with the patched swig 2.0.2 + cd scripts + swig -I../include/ -python -py3 -c++ openbabel-python.i + mv openbabel-python_wrap.cxx python/openbabel-python.cpp + mv openbabel.py python/ + + cd python + sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py + sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py +} + +package() { + cd "${srcdir}/openbabel-$pkgver/scripts/python" + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 +} diff --git a/community-testing/python-psutil/PKGBUILD b/community-testing/python-psutil/PKGBUILD new file mode 100644 index 000000000..2ea97fda2 --- /dev/null +++ b/community-testing/python-psutil/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 78094 2012-10-16 11:53:08Z allan $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgbase=python-psutil +pkgname=('python-psutil' 'python2-psutil') +pkgver=0.6.1 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://code.google.com/p/psutil/' +license=('custom: BSD') +makedepends=('python' 'python-distribute' 'python2' 'python2-distribute') +source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") +sha1sums=('f7a76e201601d8e06a1fdf434422f884888aac86') + +build() { + cd psutil-$pkgver + python setup.py build --build-lib=build/python + python2 setup.py build --build-lib=build/python2 + find build/python2 -type f -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; +} + +package_python-psutil() { + pkgdesc='A cross-platform process and system utilities module for Python' + depends=('glibc' 'python') + + cd psutil-$pkgver + python setup.py build --build-lib=build/python \ + install --root="$pkgdir" --optimize=1 + install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE +} + +package_python2-psutil() { + pkgdesc='A cross-platform process and system utilities module for Python2' + depends=('glibc' 'python2') + + cd psutil-$pkgver + python2 setup.py build --build-lib=build/python2 \ + install --root="$pkgdir" --optimize=1 + install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/python-psycopg1/PKGBUILD b/community-testing/python-psycopg1/PKGBUILD new file mode 100644 index 000000000..b2a54c3d5 --- /dev/null +++ b/community-testing/python-psycopg1/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 78095 2012-10-16 11:53:11Z allan $ +# Contributor: William Rea <sillywilly@gmail.com> + +pkgbase=python-psycopg1 +pkgname=python2-psycopg1 +pkgver=1.1.21 +pkgrel=8 +pkgdesc="A PostgreSQL database adapter for Python" +arch=('i686' 'x86_64') +url="http://initd.org/projects/psycopg1" +license=('GPL') +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') + +build() { + cd "$srcdir/psycopg-$pkgver" + + ./configure --prefix=/usr --with-python=/usr/bin/python2 \ + --with-mxdatetime-includes=/usr/lib/python2.7/site-packages/mx/DateTime/mxDateTime + sed -e 's:\(echo " install -m 555 $$mod \)\($(PY_MOD_DIR)\)\("; \\\):\1${DESTDIR}\2/$$mod\3:' \ + -e 's:\($(INSTALL) -m 555 $$mod \)\($(PY_MOD_DIR)\)\(; \\\):\1${DESTDIR}\2/$$mod\3:' \ + -i Makefile + make +} + +package_python2-psycopg1() { + cd "$srcdir/psycopg-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/python-psycopg2/ChangeLog b/community-testing/python-psycopg2/ChangeLog new file mode 100644 index 000000000..f31be0aaa --- /dev/null +++ b/community-testing/python-psycopg2/ChangeLog @@ -0,0 +1,25 @@ + +2009-08-05 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated to: 2.0.11 + +2009-03-24 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated for i686: 2.0.9 + +2009-01-11 Douglas Soares de Andrade <douglas@archlinux.org> + + * Rebuilt for python 2.6 + +2008-04-25 Mateusz Herych <heniekk@gmail.com> + + * Built for x86_64 - 2.0.7 + +2008-04-23 Douglas Soares de Andrade <dsa@aur.archlinux.org> + + * Built for i686 - 2.0.7 + +2007-06-27 tardo <tardo@nagi-fanboi.net> + + * Built for x86_64 + diff --git a/community-testing/python-psycopg2/PKGBUILD b/community-testing/python-psycopg2/PKGBUILD new file mode 100644 index 000000000..34534e06a --- /dev/null +++ b/community-testing/python-psycopg2/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 78096 2012-10-16 11:53:16Z 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> + +pkgbase=python-psycopg2 +pkgname=('python-psycopg2' 'python2-psycopg2') +pkgver=2.4.5 +pkgrel=2 +pkgdesc="A PostgreSQL database adapter for the Python programming language." +arch=('i686' 'x86_64') +url="http://initd.org/psycopg/" +license=('LGPL3') +makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') +source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz) +md5sums=('075e4df465e9a863f288d5bdf6e6887e') + +build() { + cd "$srcdir/psycopg2-$pkgver" + sed -i 's/,PSYCOPG_DEBUG$//' setup.cfg +} + +package_python-psycopg2() { + depends=('python' 'postgresql-libs>=8.4.1') + + cd "$srcdir/psycopg2-$pkgver" + python setup.py install --root="$pkgdir" +} + +package_python2-psycopg2() { + depends=('python2' 'postgresql-libs>=8.4.1') + + cd "$srcdir/psycopg2-$pkgver" + python2 setup.py install --root="$pkgdir" +} diff --git a/community-testing/python-pymongo/PKGBUILD b/community-testing/python-pymongo/PKGBUILD new file mode 100644 index 000000000..0106f3034 --- /dev/null +++ b/community-testing/python-pymongo/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 78100 2012-10-16 11:53:25Z allan $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Thomas S Hatch <thatch45@gmail.com> + +pkgbase=python-pymongo +pkgname=('python-pymongo' 'python2-pymongo') +pkgver=2.3 +pkgrel=2 +pkgdesc='Python driver for MongoDB' +arch=('x86_64' 'i686') +license=('APACHE') +url='http://pypi.python.org/pypi/pymongo/' +makedepends=('python-distribute' 'python2-distribute') +source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") +sha256sums=('8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc') + +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-testing/python-pyopencl/LICENSE.txt b/community-testing/python-pyopencl/LICENSE.txt new file mode 100644 index 000000000..3ce400f9d --- /dev/null +++ b/community-testing/python-pyopencl/LICENSE.txt @@ -0,0 +1,20 @@ +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/community-testing/python-pyopencl/PKGBUILD b/community-testing/python-pyopencl/PKGBUILD new file mode 100644 index 000000000..c3bf9ef7a --- /dev/null +++ b/community-testing/python-pyopencl/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 78161 2012-10-16 15:46:57Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgbase=python-pyopencl +pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers') +pkgver=2012.1 +pkgrel=5 +pkgdesc="A complete, object-oriented language binding of OpenCL to Python" +arch=('i686' 'x86_64') +url="http://mathema.tician.de/software/pyopencl" +license=('custom') +makedepends=('ctags' 'python2-distribute' 'python-distribute' 'libcl' 'opencl-headers' 'mesa' 'boost' 'python2-mako' 'python-mako' 'python-numpy' 'python2-numpy') +source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz" + 'LICENSE.txt') +sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff' + '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7') + +build() { + cd "$srcdir" + + cp -a pyopencl-$pkgver{,-python2} + + cd "${srcdir}/pyopencl-${pkgver}" + 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' 'pyopencl-headers') + + cd "${srcdir}/pyopencl-${pkgver}" + 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' '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-testing/python-pyproj/PKGBUILD b/community-testing/python-pyproj/PKGBUILD new file mode 100644 index 000000000..5df85db9d --- /dev/null +++ b/community-testing/python-pyproj/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 78103 2012-10-16 11:53:33Z allan $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgbase=python-pyproj +pkgname=('python-pyproj' 'python2-pyproj') +pkgver=1.9.2 +pkgrel=1 +pkgdesc="Python interfaces to PROJ.4 library" +arch=('i686' 'x86_64') +url="http://code.google.com/p/pyproj" +license=('custom') +source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz) +makedepends=('python' 'python2') +sha1sums=('a7a4bf95f3492e45704bccd4aeafe3bbe32fb023') + +build() { + cd "${srcdir}" + + cp -a pyproj-${pkgver}{,-python2} + + # Build python 3 module + cd pyproj-${pkgver} + python3 setup.py build + + # Build python 2 module + cd ../pyproj-${pkgver}-python2 + python2 setup.py build +} + +package_python-pyproj() { + depends=('proj' 'python>=3.3') + + cd "${srcdir}"/pyproj-${pkgver} + 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 +} + +package_python2-pyproj() { + depends=('proj' 'python2>=2.7') + replaces=('pyproj') + + cd "${srcdir}"/pyproj-${pkgver}-python2 + python2 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-testing/python-pyxattr/PKGBUILD b/community-testing/python-pyxattr/PKGBUILD new file mode 100644 index 000000000..a60dc386c --- /dev/null +++ b/community-testing/python-pyxattr/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 78107 2012-10-16 11:53:42Z allan $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Jon Bergli Heier <snakebite@jvnv.net> + +pkgname=('python2-pyxattr' 'python-pyxattr') +pkgbase=python-pyxattr +_pkgname=pyxattr +pkgver=0.5.0 +pkgrel=4 +pkgdesc='A python extension module that allows you to manipulate the extended attributes.' +arch=('i686' 'x86_64') +url='http://pyxattr.sourceforge.net/' +license=('GPL') +makedepends=('python2' 'python' 'python2-distribute' 'python-distribute') +source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") +md5sums=('0f7ab1e185087329e40f7de218517c84') + +package_python2-pyxattr() { + depends=('python2') + provides=('pyxattr') + conflicts=('pyxattr') + replaces=('pyxattr') + + cd "${srcdir}/${_pkgname}-${pkgver}" + python2 setup.py install --root="${pkgdir}" +} + +package_python-pyxattr() { + depends=('python') + + cd "${srcdir}/${_pkgname}-${pkgver}" + python setup.py install --root="${pkgdir}" +} diff --git a/community-testing/python-pyzmq/PKGBUILD b/community-testing/python-pyzmq/PKGBUILD new file mode 100644 index 000000000..a2951c651 --- /dev/null +++ b/community-testing/python-pyzmq/PKGBUILD @@ -0,0 +1,20 @@ +# $Id: PKGBUILD 78108 2012-10-16 11:53:45Z allan $ +# Maintainer: Kyle Keen <keenerd at gmail dot com> +pkgname=python-pyzmq +pkgver=2.2.0.1 +pkgrel=2 +pkgdesc="Python3 bindings for zeromq, written in Cython" +arch=(i686 x86_64) +url="http://www.zeromq.org/bindings:python" +license=('LGPL') +depends=(zeromq python) +source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) +md5sums=('f2f80709e84c8ac72d6671eee645d804') + +build() { + cd "$srcdir/pyzmq-$pkgver" + # py3 errors added in 2.2.0.1 + sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py + sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py + python3 setup.py install --root="$pkgdir" --optimize=0 +} diff --git a/community-testing/python-scipy/PKGBUILD b/community-testing/python-scipy/PKGBUILD new file mode 100644 index 000000000..49f943dc5 --- /dev/null +++ b/community-testing/python-scipy/PKGBUILD @@ -0,0 +1,82 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Ray Rashif <schiv@archlinux.org> +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com> +# Contributor: Andrzej Giniewicz <gginiu@gmail.com> + +pkgname=('python-scipy' 'python2-scipy') +pkgver=0.11.0 +pkgrel=2 +pkgdesc="SciPy is open-source software for mathematics, science, and engineering." +arch=('i686' 'x86_64') +url="http://www.scipy.org/" +license=('BSD') +makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') +checkdepends=('python-nose' 'python2-nose') +source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz") +md5sums=('842c81d35fd63579c41a8ca21a2419b9') + +build() { + unset LDFLAGS + unset FFLAGS + + # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) + sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \ + scipy-${pkgver}/scipy/special/cephes/mconf.h + + # 2 builds + cp -r scipy-${pkgver} scipy-${pkgver}-py2 + + # build for python3 + cd scipy-${pkgver} + python setup.py config_fc --fcompiler=gnu95 build + + # build for python2 + cd ../scipy-${pkgver}-py2 + + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + python2 setup.py config_fc --fcompiler=gnu95 build +} + +check() { + cd scipy-${pkgver} +# figure out how to run tests in the source tree easily +# python -c "from scipy import test; test('full')" + + cd ../scipy-${pkgver}-py2 +# figure out how to run tests in the source tree easily +# python2 -c "from scipy import test; test('full')" +} + +package_python-scipy() { + depends=('python-numpy') + provides=('python3-scipy' 'scipy') + + cd scipy-${pkgver} + + python setup.py config_fc --fcompiler=gnu95 install \ + --prefix=/usr --root=${pkgdir} --optimize=1 + + install -Dm644 LICENSE.txt \ + "${pkgdir}/usr/share/licenses/python-scipy/LICENSE" +} + +package_python2-scipy() { + depends=('python2-numpy') + conflicts=('python-scipy<0.9.0') + + cd scipy-${pkgver}-py2 + + python2 setup.py config_fc --fcompiler=gnu95 install \ + --prefix=/usr --root=${pkgdir} --optimize=1 + + install -Dm644 LICENSE.txt \ + "${pkgdir}/usr/share/licenses/python2-scipy/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/python-sqlalchemy/PKGBUILD b/community-testing/python-sqlalchemy/PKGBUILD new file mode 100644 index 000000000..e6a1ded02 --- /dev/null +++ b/community-testing/python-sqlalchemy/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 78113 2012-10-16 11:54:00Z 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.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=('c4852d586d95a59fbc9358f4467875d5') + +build() { + cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver + cd SQLAlchemy-$pkgver + python setup.py build + cd ../SQLAlchemy2-$pkgver + python2 setup.py build +} + +package_python-sqlalchemy() { + pkgdesc='Python SQL toolkit and Object Relational Mapper' + depends=('python') + + cd SQLAlchemy-${pkgver} + python setup.py install --root="${pkgdir}" + install -D -m644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-sqlalchemy() { + pkgdesc='Python 2 SQL toolkit and Object Relational Mapper' + depends=('python2') + + cd SQLAlchemy2-$pkgver + python2 setup.py install --root="$pkgdir" + install -D -m644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/python-yaml/PKGBUILD b/community-testing/python-yaml/PKGBUILD new file mode 100644 index 000000000..3d48ebc4e --- /dev/null +++ b/community-testing/python-yaml/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 78118 2012-10-16 11:54:14Z 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=3 +pkgdesc="Python bindings for YAML, using fast libYAML library" +arch=('i686' 'x86_64') +url="http://pyyaml.org" +license=('MIT') +makedepends=('python' 'python2' 'libyaml') +install='python-yaml.install' +source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz) +md5sums=('74c94a383886519e9e7b3dd1ee540247') + +build() { + true +} + +package_python2-yaml() { + depends=('python2' 'libyaml') + + cd $srcdir/PyYAML-$pkgver + python2 setup.py install --prefix=/usr --root=$pkgdir + install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} + +package_python-yaml() { + depends=('python' 'libyaml') + + cd $srcdir/PyYAML-$pkgver + python setup.py install --prefix=/usr --root=$pkgdir + install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community-testing/python-yaml/python-yaml.install b/community-testing/python-yaml/python-yaml.install new file mode 100644 index 000000000..e2ae0674b --- /dev/null +++ b/community-testing/python-yaml/python-yaml.install @@ -0,0 +1,7 @@ +post_install() { + cat << EOT +==> Note that even though this package uses libyaml library, +==> slower pure python implementation is used by default. +==> See http://pyyaml.org/wiki/PyYAMLDocumentation +EOT +} diff --git a/community-testing/python2-cjson/PKGBUILD b/community-testing/python2-cjson/PKGBUILD new file mode 100644 index 000000000..2d95793a4 --- /dev/null +++ b/community-testing/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-testing/python2-galago/PKGBUILD b/community-testing/python2-galago/PKGBUILD new file mode 100644 index 000000000..6076c3a9e --- /dev/null +++ b/community-testing/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-testing/python2-gnutls/PKGBUILD b/community-testing/python2-gnutls/PKGBUILD new file mode 100644 index 000000000..3a7c86a04 --- /dev/null +++ b/community-testing/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-testing/python2-gnutls/gnutls3.patch b/community-testing/python2-gnutls/gnutls3.patch new file mode 100644 index 000000000..5110de2f2 --- /dev/null +++ b/community-testing/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-testing/python2-imaging/PKGBUILD b/community-testing/python2-imaging/PKGBUILD new file mode 100644 index 000000000..397dfceba --- /dev/null +++ b/community-testing/python2-imaging/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 78139 2012-10-16 12:09:48Z allan $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: simo <simo@archlinux.org> + +pkgname=python2-imaging +pkgver=1.1.7 +pkgrel=5 +pkgdesc="PIL. Provides image processing capabilities for python" +arch=('i686' 'x86_64') +url="http://www.pythonware.com/products/pil/index.htm" +license=('custom:"pil"') +depends=('python2' 'libjpeg' 'freetype2' 'lcms') +makedepends=('tk' 'sane') +optdepends=('tk: for the ImageTK module' + 'sane: for the ImageSane module') +provides=("pil=${pkgver}" "python-imaging=${pkgver}") +conflicts=('pil' 'python-imaging') +replaces=('pil' 'python-imaging') +source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz) +md5sums=('fc14a54e1ce02a0225be8854bfba478e') + +build() { + cd "${srcdir}/Imaging-${pkgver}" + python2 setup.py build_ext + cd Sane + python2 setup.py build_ext +} + +package() { + cd "${srcdir}/Imaging-${pkgver}" + python2 setup.py install --root="${pkgdir}" --optimize=1 + + pushd Sane + python2 setup.py install --root="${pkgdir}" --optimize=1 + popd + + install -dm755 "${pkgdir}/usr/include/python2.7/" + install -m644 -t "${pkgdir}/usr/include/python2.7/" libImaging/*.h + + # do not have files ending in .py in /usr/bin + for f in pildriver pilprint pilconvert pilfile pilfont; do + mv "${pkgdir}"/usr/bin/${f}{.py,} + done + + # Install license + install -Dm644 "${srcdir}/Imaging-${pkgver}/README" \ + "${pkgdir}/usr/share/licenses/${pkgname}/README" +} diff --git a/community-testing/python2-lcms/PKGBUILD b/community-testing/python2-lcms/PKGBUILD new file mode 100644 index 000000000..3b75364ab --- /dev/null +++ b/community-testing/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-testing/python2-m2crypto/PKGBUILD b/community-testing/python2-m2crypto/PKGBUILD new file mode 100644 index 000000000..a68c5a35d --- /dev/null +++ b/community-testing/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-testing/python2-m2crypto/openssl1.patch b/community-testing/python2-m2crypto/openssl1.patch new file mode 100644 index 000000000..59dba554d --- /dev/null +++ b/community-testing/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-testing/python2-pybluez/PKGBUILD b/community-testing/python2-pybluez/PKGBUILD new file mode 100644 index 000000000..6007614a6 --- /dev/null +++ b/community-testing/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-testing/python2-pyxmpp/PKGBUILD b/community-testing/python2-pyxmpp/PKGBUILD new file mode 100644 index 000000000..49096a86f --- /dev/null +++ b/community-testing/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-testing/python2-simplejson/PKGBUILD b/community-testing/python2-simplejson/PKGBUILD new file mode 100644 index 000000000..1ec0a97b5 --- /dev/null +++ b/community-testing/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-testing/python2-simplejson/python2-simplejson.changelog b/community-testing/python2-simplejson/python2-simplejson.changelog new file mode 100644 index 000000000..c1e227d24 --- /dev/null +++ b/community-testing/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-testing/python2-vorbissimple/PKGBUILD b/community-testing/python2-vorbissimple/PKGBUILD new file mode 100644 index 000000000..ba0a8be63 --- /dev/null +++ b/community-testing/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-testing/sdcc/PKGBUILD b/community-testing/sdcc/PKGBUILD new file mode 100644 index 000000000..378727faa --- /dev/null +++ b/community-testing/sdcc/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 78121 2012-10-16 11:54:21Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jose Negron <josenj.arch@mailnull.net> + +pkgname=sdcc +pkgver=3.2.0 +pkgrel=2 +pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)" +arch=('i686' 'x86_64') +license=('GPL') +depends=('bash' 'gcc-libs' 'boost-libs') +makedepends=('gputils' 'flex' 'bison' 'patch' 'boost') +optdepends=('python') +url="http://sdcc.sourceforge.net/" +options=(!strip) +source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2) +md5sums=('0808a9b4109d2ba6046ddd7b679a0012') + +build() { + cd $srcdir/$pkgname + ./configure \ + --prefix=/usr \ + --includedir=/usr/include/sdcc \ + --libdir=/usr/lib/sdcc + make + make install DESTDIR=$pkgdir + + if [ -d $pkgdir/usr/lib/lib ]; then + 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-testing/tix/PKGBUILD b/community-testing/tix/PKGBUILD new file mode 100644 index 000000000..e5a35e2b2 --- /dev/null +++ b/community-testing/tix/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 78122 2012-10-16 11:54:26Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Brice Méalier <mealier_brice@yahoo.fr> + +pkgname=tix +pkgver=8.4.3 +pkgrel=4 +pkgdesc="Tk Interface eXtension, a powerful set of user interface components" +arch=(i686 'x86_64') +url="http://tix.sourceforge.net/" +license=("BSD") +depends=('tk' 'libx11') +source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz + tcl-tk-path.patch) +md5sums=('2b8bf4b10a852264678182652f477e59' + 'd4df48da39dd51872d58706a51bab505') + +build() { + cd $srcdir/Tix$pkgver + + patch -p1 <$srcdir/tcl-tk-path.patch + + export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2" + + ./configure --prefix=/usr + make + make DESTDIR=$pkgdir install + # move things around + + install -m755 tools/tixindex $pkgdir/usr/bin/tixindex + rm -rf $pkgdir/usr/lib/Tix8.4/html + rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms} + ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so + + mkdir -p $pkgdir/usr/share/man/man1 + mkdir -p $pkgdir/usr/share/man/man3 + cp -p man/tixwish.1 $pkgdir/usr/share/man/man1 + cd $srcdir/Tix$pkgver/man + for i in *.n; do + cp -p $i $pkgdir/usr/share/man/man3/${i%n}3 + done + + mkdir -p $pkgdir/usr/share/licenses/tix + cp $srcdir/Tix$pkgver/license.terms $pkgdir/usr/share/licenses/tix/ +} + diff --git a/community-testing/tix/tcl-tk-path.patch b/community-testing/tix/tcl-tk-path.patch new file mode 100644 index 000000000..2fc12671e --- /dev/null +++ b/community-testing/tix/tcl-tk-path.patch @@ -0,0 +1,22 @@ +diff -wbBur Tix8.4.3/configure Tix8.4.3.my/configure +--- Tix8.4.3/configure 2008-02-28 04:35:01.000000000 +0000 ++++ Tix8.4.3.my/configure 2009-12-28 10:57:33.000000000 +0000 +@@ -6645,7 +6645,7 @@ + ;; + esac + else +- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then ++ if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then + { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5 + echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;} + { (exit 1); exit 1; }; } +@@ -6700,7 +6700,7 @@ + ;; + esac + else +- if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then ++ if test ! -f "${TK_SRC_DIR}/tk-private/generic/tkInt.h" ; then + { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5 + echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;} + { (exit 1); exit 1; }; } + diff --git a/community-testing/ubuntuone-client/1339_1338.diff b/community-testing/ubuntuone-client/1339_1338.diff new file mode 100644 index 000000000..cbd966a70 --- /dev/null +++ b/community-testing/ubuntuone-client/1339_1338.diff @@ -0,0 +1,57 @@ +=== modified file 'tests/platform/sync_menu/test_linux.py' +--- tests/platform/sync_menu/test_linux.py 2012-10-10 14:54:49 +0000 ++++ tests/platform/sync_menu/test_linux.py 2012-10-11 12:01:27 +0000 +@@ -124,6 +124,7 @@ + """Check that the dummy has the proper methods required by the API.""" + dummy = linux.DummySyncMenu('random', 'args') + self.assertIsInstance(dummy.update_transfers, Callable) ++ self.assertIsInstance(dummy.sync_status_changed, Callable) + + + class SyncMenuTestCase(TestCase): + +=== modified file 'ubuntuone/platform/sync_menu/linux.py' +--- ubuntuone/platform/sync_menu/linux.py 2012-10-10 17:06:14 +0000 ++++ ubuntuone/platform/sync_menu/linux.py 2012-10-11 13:00:10 +0000 +@@ -183,7 +183,7 @@ + self.timer.addCallback(self._timeout) + + +-class TransfersMenu(Dbusmenu.Menuitem): ++class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object): + """Menu that handles the recent and current transfers.""" + + def __init__(self, status_frontend): +@@ -227,7 +227,7 @@ + items_added = 0 + remove = [] + for item in self._uploading_items: +- if item in uploading_data: ++ if item in uploading_data.keys(): + size, written = uploading_data[item] + percentage = written * 100 / size + upload_item = self._uploading_items[item] +@@ -243,7 +243,7 @@ + for item in remove: + self._uploading_items.pop(item) + if items_added < 5: +- for item in uploading_data: ++ for item in uploading_data.keys(): + if item not in self._uploading_items and items_added < 5: + size, written = uploading_data[item] + percentage = written * 100 / size +@@ -270,4 +270,12 @@ + def update_transfers(self): + """Do nothing.""" + +-UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu ++ def sync_status_changed(self): ++ """Do nothing.""" ++ ++ ++if use_syncmenu: ++ UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux ++else: ++ UbuntuOneSyncMenu = DummySyncMenu ++ TransfersMenu = None + diff --git a/community-testing/ubuntuone-client/PKGBUILD b/community-testing/ubuntuone-client/PKGBUILD new file mode 100644 index 000000000..e2f8b8b43 --- /dev/null +++ b/community-testing/ubuntuone-client/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 78124 2012-10-16 11:54:37Z allan $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=ubuntuone-client +pkgver=4.0.0 +pkgrel=2 +pkgdesc="Ubuntu One helps you store, sync and share files between your computers" +arch=('i686' 'x86_64') +url="https://launchpad.net/ubuntuone-client" +license=('GPL') +depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool' 'imake' 'gobject-introspection') +options=('!libtool') +install=$pkgname.install +source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz + 1339_1338.diff + fix-notify-hint.patch) +md5sums=('738039703d4dcf54518a725f8ffbc4de' + 'e82e80c229de06692988c1f938a34fb9' + '54dfeb2be011f0a12ea7cfa0f0c19bec') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/* + + # Improve TransfersMenu declaration to avoid problems + patch -Np0 -i "$srcdir/1339_1338.diff" + + # Workaround for crash in notification-daemon + # https://bugzilla.gnome.org/show_bug.cgi?id=665166 + patch -Np1 -i "$srcdir/fix-notify-hint.patch" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --disable-static \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install + + # We don't have Apport in Arch Linux + rm -r "$pkgdir"/{etc/apport,usr/share/apport} +} diff --git a/community-testing/ubuntuone-client/fix-notify-hint.patch b/community-testing/ubuntuone-client/fix-notify-hint.patch new file mode 100644 index 000000000..f32280de9 --- /dev/null +++ b/community-testing/ubuntuone-client/fix-notify-hint.patch @@ -0,0 +1,20 @@ +diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py +--- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py 2012-06-19 15:51:01.000000000 +0200 ++++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py 2012-10-15 01:14:01.019476818 +0200 +@@ -40,7 +40,7 @@ + + if 'gi' in sys.modules and sys.modules['gi'] is not None: + try: +- from gi.repository import Notify ++ from gi.repository import GLib, Notify + Notify # pyflakes + NOTIFY_MODULE = 'gi' + except ImportError: +@@ -85,5 +85,6 @@ + if append: + self.notification.set_hint_string('x-canonical-append', '') + +- self.notification.set_hint_int32('transient', int(True)) ++ if NOTIFY_MODULE == 'gi': ++ self.notification.set_hint('transient', GLib.Variant.new_boolean(1)) + self.notification.show() diff --git a/community-testing/ubuntuone-client/ubuntuone-client.install b/community-testing/ubuntuone-client/ubuntuone-client.install new file mode 100644 index 000000000..2c455e952 --- /dev/null +++ b/community-testing/ubuntuone-client/ubuntuone-client.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/uniconvertor/PKGBUILD b/community-testing/uniconvertor/PKGBUILD new file mode 100644 index 000000000..6c15816af --- /dev/null +++ b/community-testing/uniconvertor/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 78126 2012-10-16 11:54:43Z allan $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Roberto Alsina <ralsina@kde.org> + +pkgname=uniconvertor +pkgver=1.1.5 +pkgrel=6 +pkgdesc="A universal vector graphics translator using sK1 engine." +arch=('i686' 'x86_64') +url="http://sk1project.org/modules.php?name=Products&product=uniconvertor" +license=('GPL') +depends=('python2' 'python2-imaging' 'python2-reportlab' 'sk1libs') +makedepends=('gcc') +source=(http://uniconvertor.googlecode.com/files/uniconvertor-$pkgver.tar.gz) +md5sums=('d1272315a58304ece2ff588834e23f72') + +build() { + cd "$srcdir/uniconvertor-$pkgver" + + # python2 fix + 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-testing/virtkey/PKGBUILD b/community-testing/virtkey/PKGBUILD new file mode 100644 index 000000000..7d350b553 --- /dev/null +++ b/community-testing/virtkey/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: codl <codl@aquageek.net> +# Contributor: Megamixman <Megamixman@gmail.com> + +pkgbase=virtkey +pkgname=('python2-virtkey' 'python-virtkey') +pkgver=0.61.0 +pkgrel=2 +arch=('i686' 'x86_64') +url="https://launchpad.net/virtkey" +license=('LGPL') +makedepends=('python2' 'python' 'libxtst' 'gtk2') +source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz) +md5sums=('536d30acb2c8ddadc6b4a26fc01e8390') + +build() { + cd "$srcdir" + + cp -a {,python2-}$pkgbase-$pkgver + + # Build python 2 module + cd "$srcdir/python2-$pkgbase-$pkgver" + python2 setup.py build + + # Build python 3 module + cd "$srcdir/$pkgbase-$pkgver" + python setup.py build +} + +package_python2-virtkey() { + pkgdesc="Python 2 extension for emulating keypresses and getting layout information from the X server" + depends=('python2' 'libxtst' 'gtk2') + + cd "$srcdir/python2-$pkgbase-$pkgver" + + python2 setup.py install --root=$pkgdir/ --optimize=1 +} + +package_python-virtkey() { + pkgdesc="Python extension for emulating keypresses and getting layout information from the X server" + depends=('python' 'libxtst' 'gtk2') + + cd "$srcdir/$pkgbase-$pkgver" + + python3 setup.py install --root=$pkgdir/ --optimize=1 +} diff --git a/community-testing/znc/PKGBUILD b/community-testing/znc/PKGBUILD new file mode 100644 index 000000000..7222f1953 --- /dev/null +++ b/community-testing/znc/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 78129 2012-10-16 11:54:52Z 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=3 +pkgdesc='An IRC bouncer with modules & scripts support' +url='http://en.znc.in/wiki/index.php/ZNC' +license=('GPL2') +arch=('i686' 'x86_64') +depends=('c-ares' 'libsasl') +#makedepends=('swig' 'tcl' 'python' 'perl') +makedepends=('tcl' 'python' 'perl') +optdepends=('tcl: modtcl module' + 'python: modpython module' + 'perl: modperl module' + 'cyrus-sasl: saslauth module') +source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz" + "http://people.znc.in/~darthgandalf/znc/modperl/modperl-znc-0.204.tar.bz2" + "http://people.znc.in/~darthgandalf/znc/modpython/modpython-znc-0.204.tar.bz2") +md5sums=('b7d3f21da81abaeb553066b0e10beb53' + 'a9c72d556d9a4ef100520433f17d71ae' + '19bf033c5cb9243171c215043c594f07') + +build() { + # swig 2.0.6 is bugged, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672035 + # use an alternate ways of building znc explain here: + # - http://wiki.znc.in/Modperl + # - http://wiki.znc.in/Modpython + mv -v modperl/* $pkgname-$pkgver/modules/modperl + mv -v modpython/* $pkgname-$pkgver/modules/modpython + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --enable-sasl \ + --enable-python \ + --enable-perl \ + --enable-tcl \ + --disable-swig \ + --enable-extra + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/clinica/PKGBUILD b/community/clinica/PKGBUILD index 85bd9b258..54794584f 100644 --- a/community/clinica/PKGBUILD +++ b/community/clinica/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 62971 2012-01-29 17:19:57Z giovanni $ +# $Id: PKGBUILD 78165 2012-10-16 15:57:54Z bgyorgy $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gianmarco Brocchi <gianmarcobrocchi@gmail.com> pkgname=clinica pkgver=0.2.1 -pkgrel=4 +pkgrel=5 pkgdesc="Simple medical records manager" arch=('i686' 'x86_64') url="https://launchpad.net/clinica-project" license=('GPL3') -depends=('libgee' 'python' 'libpeas' 'dconf') -makedepends=('vala' 'intltool' 'pkg-config') +depends=('libgee' 'libpeas' 'dconf') +makedepends=('vala' 'intltool' 'python') optdepends=('python2-gobject: for Agenzia del Farmaco plugin') install=clinica.install -source=("http://launchpad.net/clinica-project/stable/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('327ce50d20b0e56d3de57270eed2ad23') +source=("http://launchpad.net/clinica-project/stable/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2" + vala-0.16.patch) +md5sums=('327ce50d20b0e56d3de57270eed2ad23' + 'cd619b85a1758aad846c06b11961c6a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/vala-0.16.patch" + sed -i 's@^#!.*python$@#!/usr/bin/python2@' plugins/AgenziaDelFarmaco.py + sed -i -e "s:Application;GTK;:Office;GTK;:g" clinica.desktop ./waf configure --prefix=/usr LC_ALL=C LANG=C ./waf build @@ -28,6 +33,4 @@ package() { ./waf --destdir="${pkgdir}" install rm -rf ${pkgdir}/usr/share/glib-2.0/schemas/gschemas.compiled - sed -i -e "s:Application;GTK;:Office;:g" clinica.desktop - install -Dm644 clinica.desktop "${pkgdir}/usr/share/applications" } diff --git a/community/clinica/vala-0.16.patch b/community/clinica/vala-0.16.patch new file mode 100644 index 000000000..fda32c1b2 --- /dev/null +++ b/community/clinica/vala-0.16.patch @@ -0,0 +1,242 @@ +diff -Naur clinica-0.2.1.orig/libclinica/DoctorContextMenu.vala clinica-0.2.1/libclinica/DoctorContextMenu.vala +--- clinica-0.2.1.orig/libclinica/DoctorContextMenu.vala 2011-11-30 13:42:30.000000000 +0100 ++++ clinica-0.2.1/libclinica/DoctorContextMenu.vala 2012-10-16 16:57:35.000000000 +0200 +@@ -22,7 +22,7 @@ + + namespace Clinica { + +- public class DoctorContextMenu : Menu { ++ public class DoctorContextMenu : Gtk.Menu { + + /** + * @brief The doctor associated to this popup menu +@@ -38,13 +38,13 @@ + /** + * @brief MenuItem associated to doctor deletion + */ +- private MenuItem delete_menuitem; ++ private Gtk.MenuItem delete_menuitem; + + /** + * @brief MenuItem that triggers doctor edit + * dialog. + */ +- private MenuItem edit_menuitem; ++ private Gtk.MenuItem edit_menuitem; + + private ResourceManager resource_manager; + +@@ -55,8 +55,8 @@ + + /* Create menu items, connect them to their callback + * and add it to the menu */ +- delete_menuitem = new MenuItem.with_label (_("Delete")); +- edit_menuitem = new MenuItem.with_label (_("Edit")); ++ delete_menuitem = new Gtk.MenuItem.with_label (_("Delete")); ++ edit_menuitem = new Gtk.MenuItem.with_label (_("Edit")); + + delete_menuitem.activate.connect (on_delete_menuitem_activated); + edit_menuitem.activate.connect (on_edit_menuitem_activated); +@@ -67,11 +67,11 @@ + show_all (); + } + +- private void on_delete_menuitem_activated (MenuItem item) { ++ private void on_delete_menuitem_activated (Gtk.MenuItem item) { + view.remove_selected_doctor (); + } + +- private void on_edit_menuitem_activated (MenuItem item) { ++ private void on_edit_menuitem_activated (Gtk.MenuItem item) { + var doctor_editor = new DoctorEditor.with_doctor (resource_manager, doctor); + doctor_editor.dialog.set_transient_for (resource_manager.user_interface.window); + doctor_editor.run (); +diff -Naur clinica-0.2.1.orig/libclinica/EventDetail.vala clinica-0.2.1/libclinica/EventDetail.vala +--- clinica-0.2.1.orig/libclinica/EventDetail.vala 2011-11-30 13:42:30.000000000 +0100 ++++ clinica-0.2.1/libclinica/EventDetail.vala 2012-10-16 16:55:51.000000000 +0200 +@@ -104,9 +104,9 @@ + */ + private bool on_button_press_event (Widget widget, EventButton event) { + if (event.button == 3 && event.type == EventType.BUTTON_PRESS) { +- var popup_menu = new Menu (); +- var edit_menu_item = new MenuItem.with_label (_("Edit")); +- var remove_menu_item = new MenuItem.with_label (_("Remove")); ++ var popup_menu = new Gtk.Menu (); ++ var edit_menu_item = new Gtk.MenuItem.with_label (_("Edit")); ++ var remove_menu_item = new Gtk.MenuItem.with_label (_("Remove")); + + /* Connect callbacks for the item */ + edit_menu_item.activate.connect (on_edit_menu_item_activate); +@@ -125,7 +125,7 @@ + return false; + } + +- private void on_edit_menu_item_activate (MenuItem? item = null) { ++ private void on_edit_menu_item_activate (Gtk.MenuItem? item = null) { + var event_editor = new EventEditor (resource_manager, associated_event); + event_editor.set_transient_for (resource_manager.user_interface.calendar_window); + if (event_editor.run () == EventEditor.Response.SAVE) { +@@ -137,7 +137,7 @@ + event_editor.destroy (); + } + +- private void on_remove_menu_item_activate (MenuItem? item = null) { ++ private void on_remove_menu_item_activate (Gtk.MenuItem? item = null) { + var question = new MessageDialog (null, + DialogFlags.MODAL | DialogFlags.DESTROY_WITH_PARENT, + MessageType.QUESTION, ButtonsType.YES_NO, "%s", +diff -Naur clinica-0.2.1.orig/libclinica/PatientContextMenu.vala clinica-0.2.1/libclinica/PatientContextMenu.vala +--- clinica-0.2.1.orig/libclinica/PatientContextMenu.vala 2011-12-09 18:14:42.000000000 +0100 ++++ clinica-0.2.1/libclinica/PatientContextMenu.vala 2012-10-16 16:54:59.000000000 +0200 +@@ -26,7 +26,7 @@ + * @brief Menu to be displayed when a user right click on a patient + * in the TreeView + */ +- public class PatientContextMenu : Menu { ++ public class PatientContextMenu : Gtk.Menu { + + /* Patient where that user has right clicked on */ + Patient patient; +@@ -35,9 +35,9 @@ + PatientListView view; + + /* MENU ITEMS */ +- MenuItem edit_menuitem; +- MenuItem delete_menuitem; +- MenuItem view_visits_menuitem; ++ Gtk.MenuItem edit_menuitem; ++ Gtk.MenuItem delete_menuitem; ++ Gtk.MenuItem view_visits_menuitem; + + private ResourceManager resource_manager; + +@@ -48,13 +48,13 @@ + this.view = view; + + /* Instantiate menu items */ +- edit_menuitem = new MenuItem.with_label(_("Edit")); ++ edit_menuitem = new Gtk.MenuItem.with_label(_("Edit")); + edit_menuitem.activate.connect (on_edit_menuitem_activated); + +- delete_menuitem = new MenuItem.with_label(_("Delete")); ++ delete_menuitem = new Gtk.MenuItem.with_label(_("Delete")); + delete_menuitem.activate.connect(on_delete_menuitem_activated); + +- view_visits_menuitem = new MenuItem.with_label(_("Edit visits")); ++ view_visits_menuitem = new Gtk.MenuItem.with_label(_("Edit visits")); + view_visits_menuitem.activate.connect(on_view_visits_menuitem_activated); + + /* Append menuitems */ +@@ -65,18 +65,18 @@ + show_all (); + } + +- private void on_edit_menuitem_activated (MenuItem item) { ++ private void on_edit_menuitem_activated (Gtk.MenuItem item) { + var patient_editor = new PatientEditor.with_patient (resource_manager, patient); + patient_editor.dialog.set_transient_for (resource_manager.user_interface.window); + patient_editor.run(); + patient_editor.destroy (); + } + +- private void on_delete_menuitem_activated (MenuItem item) { ++ private void on_delete_menuitem_activated (Gtk.MenuItem item) { + view.remove_selected_patient (); + } + +- private void on_view_visits_menuitem_activated (MenuItem item) { ++ private void on_view_visits_menuitem_activated (Gtk.MenuItem item) { + resource_manager.user_interface.show_visit_window (patient); + } + } +diff -Naur clinica-0.2.1.orig/libclinica/UserInterface.vala clinica-0.2.1/libclinica/UserInterface.vala +--- clinica-0.2.1.orig/libclinica/UserInterface.vala 2011-12-09 19:15:27.000000000 +0100 ++++ clinica-0.2.1/libclinica/UserInterface.vala 2012-10-16 16:56:48.000000000 +0200 +@@ -216,7 +216,7 @@ + /* Menu item */ + + [CCode (instance_pos = -1)] +- public void on_new_patient_menu_item_activate (MenuItem item) { ++ public void on_new_patient_menu_item_activate (Gtk.MenuItem item) { + var new_patient_dialog = new PatientEditor (resource_manager); + new_patient_dialog.dialog.set_transient_for (window); + new_patient_dialog.run (); +@@ -224,7 +224,7 @@ + } + + [CCode (instance_pos = -1)] +- public void on_new_doctor_menu_item_activate (MenuItem item) { ++ public void on_new_doctor_menu_item_activate (Gtk.MenuItem item) { + var new_doc_dialog = new DoctorEditor (resource_manager); + new_doc_dialog.dialog.set_transient_for (window); + new_doc_dialog.run (); +@@ -232,22 +232,22 @@ + } + + [CCode (instance_pos = -1)] +- public void on_patient_menu_item_activate (MenuItem item) { ++ public void on_patient_menu_item_activate (Gtk.MenuItem item) { + show_patient_list_page (); + } + + [CCode (instance_pos = -1)] +- public void on_doctor_menu_item_activate (MenuItem item) { ++ public void on_doctor_menu_item_activate (Gtk.MenuItem item) { + show_doctor_list_page (); + } + + [CCode (instance_pos = -1)] +- public void on_home_menu_item_activate (MenuItem item) { ++ public void on_home_menu_item_activate (Gtk.MenuItem item) { + show_start_page(); + } + + [CCode (instance_pos = -1)] +- public void on_search_medicines_menu_item_activate (MenuItem item) { ++ public void on_search_medicines_menu_item_activate (Gtk.MenuItem item) { + set_page (medicine_search_page); + } + +@@ -260,7 +260,7 @@ + } + + [CCode (instance_pos = -1)] +- public void on_settings_menu_item_activate (MenuItem item) { ++ public void on_settings_menu_item_activate (Gtk.MenuItem item) { + if (settings_manager == null){ + settings_manager = new SettingsManager (resource_manager); + /* Dereference the window on release to make it be freed and +@@ -275,7 +275,7 @@ + } + + [CCode (instance_pos = -1)] +- public void on_help_menu_item_activate (MenuItem item) { ++ public void on_help_menu_item_activate (Gtk.MenuItem item) { + try { + Gtk.show_uri (this.window.get_screen (), "ghelp:clinica", Gdk.CURRENT_TIME); + } catch (GLib.Error e) { +diff -Naur clinica-0.2.1.orig/libclinica/VisitDetail.vala clinica-0.2.1/libclinica/VisitDetail.vala +--- clinica-0.2.1.orig/libclinica/VisitDetail.vala 2011-12-09 18:29:19.000000000 +0100 ++++ clinica-0.2.1/libclinica/VisitDetail.vala 2012-10-16 16:53:08.000000000 +0200 +@@ -87,10 +87,10 @@ + */ + private bool on_button_press_event (Widget widget, EventButton event) { + if (event.button == 3 && event.type == EventType.BUTTON_PRESS) { +- var popup_menu = new Menu (); ++ var popup_menu = new Gtk.Menu (); + popup_menu.attach_to_widget (this, null); + +- var open_visit_menu_item = new MenuItem.with_label (_("Show details")); ++ var open_visit_menu_item = new Gtk.MenuItem.with_label (_("Show details")); + open_visit_menu_item.activate.connect (on_open_visit_menu_item_activate); + popup_menu.append (open_visit_menu_item); + +@@ -102,7 +102,7 @@ + return false; + } + +- private void on_open_visit_menu_item_activate (MenuItem? item = null) { ++ private void on_open_visit_menu_item_activate (Gtk.MenuItem? item = null) { + var visit_window = resource_manager.user_interface.show_visit_window (associated_visit.patient); + visit_window.select_visit (associated_visit); + } diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 9bb22db0a..4a9e0c106 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77156 2012-10-05 23:37:53Z jconder $ +# $Id: PKGBUILD 78022 2012-10-16 04:42:30Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,18 +7,18 @@ pkgname=mythtv pkgver=0.26.0 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') url="http://www.mythtv.org/" license=('GPL') depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883' - 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mesa' + 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber' 'x264') -makedepends=('glew' 'libcec' 'libxml2' 'openssl' 'yasm') +makedepends=('glew' 'libcec' 'libxml2' 'mesa' 'openssl' 'yasm') optdepends=('glew: for GPU commercial flagging' 'libcec: for consumer electronics control capabilities' 'libxml2: to read blu-ray metadata' @@ -41,8 +41,6 @@ build() { cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - sed -re 's@Key, &@Key, @' -i 'bindings/php/MythBase.php' - ARCH="${CARCH/_/-}" ./configure --prefix=/usr \ --cpu="$ARCH" \ diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 6bc5be4ad..5bd5767e0 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 75924 2012-09-05 16:47:49Z mtorromeo $ +# $Id: PKGBUILD 78026 2012-10-16 09:34:44Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server -pkgver=5.5.27_rel28.1 +pkgver=5.5.27_rel29.0 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64') @@ -36,10 +36,9 @@ build() { # CFLAGS/CXXFLAGS as suggested upstream CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ + CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fpermissive" \ cmake "${srcdir}/Percona-Server-${pkgver/_/-}" \ - -DMANUFACTURER=Arch \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -106,7 +105,7 @@ package() { install -Dm755 "$srcdir/mysqld-post" "$pkgdir/usr/bin/mysqld-post" } -sha256sums=('bf32acb0b56d3bfabf65748bbbcb5cfce33191bd31893040ed7e2aebc3548df4' +sha256sums=('4ba9e3300d99bfdbf65dd1a00e51da5bddc1582e33a58219b5184075783889ce' 'e875fac56f69634b4f1720aec3b952fc63903414e9345af630e5fd74b5373eb4' '400e9a6e6517bbfe0971b65456dfacfb363cb54a644e4c2bacd373171611d5aa' '4894d39605950d86841ad982e619daa6c8d5d60ca30928d7dbb582e8cb3ade32' diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 5098feb65..008db0424 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167203 2012-09-27 22:43:39Z bisson $ +# $Id: PKGBUILD 168900 2012-10-16 14:01:32Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.6.3 +pkgver=2.7 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('3aa991b1596d5bc1fb35e8a1b356b5f1a8a9c04e') +sha1sums=('25c3cf8af2d30b9cc176b36f2a78344ba9ae18f1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index c58a2a649..06b39fa07 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166946 2012-09-23 04:27:14Z giovanni $ +# $Id: PKGBUILD 168908 2012-10-16 14:12:00Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.0.19 +pkgver=5.0.20 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") -md5sums=('16b0a0e5e3757287462bbeb01b66b191') +md5sums=('2e33c03536082ae8156b2cbe78c0299d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 22fb7d047..65750aabc 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,34 +1,39 @@ -# $Id: PKGBUILD 167701 2012-10-03 08:00:56Z guillaume $ +# $Id: PKGBUILD 168916 2012-10-16 14:27:05Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark pkgver=1.8.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' - 'libgcrypt' 'lua' 'python') + 'libgcrypt' 'lua' 'python' 'portaudio') url="http://www.wireshark.org/" options=(!libtool) -source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -sha1sums=('3e1322eea5794c71de752b7923af9379bcc95299') +source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 + enable_version.patch) +sha1sums=('3e1322eea5794c71de752b7923af9379bcc95299' + '9a56a9153b6903e508b0375cde4f6e57ffc544e6') build() { cd "${srcdir}/${pkgbase}-${pkgver}" + patch -p0 < ${srcdir}/enable_version.patch + ./autogen.sh ./configure \ --prefix=/usr \ --with-ssl \ --with-zlib=yes \ - --with-lua + --with-lua \ + --with-portaudio make all } package_wireshark-cli() { pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version" - depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua') + depends=('krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'glib2' 'lua' 'portaudio') install=wireshark.install conflicts=(wireshark) diff --git a/extra/wireshark/enable_version.patch b/extra/wireshark/enable_version.patch new file mode 100644 index 000000000..18ad14b1f --- /dev/null +++ b/extra/wireshark/enable_version.patch @@ -0,0 +1,12 @@ +--- configure.in.init 2012-05-24 20:08:15.040038922 +0000 ++++ configure.in 2012-05-24 20:08:27.869944008 +0000 +@@ -185,7 +185,7 @@ + [use gnutls library @<:@default=yes@:>@]), + with_gnutls="$withval", with_gnutls="yes") + if test "x$with_gnutls" = "xyes"; then +- PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3], ++ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0], + [ + echo "gnuTLS found, enabling ssl decryption" + AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use gnutls library]) + diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index a5dc6dcd1..55148f003 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168424 2012-10-11 15:38:51Z andyrtr $ +# $Id: PKGBUILD 168924 2012-10-16 15:02:37Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=283 +pkgver=284 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('678fb45f749216b11d57c4ffc935df65' +md5sums=('fa6bd90b91365f41c6bb895bee054c12' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/gnome-unstable/at-spi2-atk/PKGBUILD b/gnome-unstable/at-spi2-atk/PKGBUILD index a4cca4f26..68c1e7761 100644 --- a/gnome-unstable/at-spi2-atk/PKGBUILD +++ b/gnome-unstable/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167111 2012-09-25 12:02:56Z heftig $ +# $Id: PKGBUILD 168964 2012-10-16 23:00:59Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2cfcb5e29aa6db5e8982add072dffecadd81d6ef04845afa2336be1b515bdc1f') +sha256sums=('0a796c3635b23d094d488ac3aeee1bd785debfde433640687d4b17dfeaeb3398') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/at-spi2-core/PKGBUILD b/gnome-unstable/at-spi2-core/PKGBUILD index 851a3efd0..50c633529 100644 --- a/gnome-unstable/at-spi2-core/PKGBUILD +++ b/gnome-unstable/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167110 2012-09-25 12:01:58Z heftig $ +# $Id: PKGBUILD 168963 2012-10-16 22:59:59Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8d7e685c7cda6e2831b31c66ec796dc344c5eb29d8311f69b0a47529194ec559') +sha256sums=('cb087f0a9191422bc3f44c562a0dbfdf1c2266e45c267070aeb63b874e00f867') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/baobab/PKGBUILD b/gnome-unstable/baobab/PKGBUILD index 9da564813..07dc54250 100644 --- a/gnome-unstable/baobab/PKGBUILD +++ b/gnome-unstable/baobab/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 167334 2012-10-01 11:48:40Z jgc $ +# $Id: PKGBUILD 168956 2012-10-16 22:50:28Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=baobab -pkgver=3.6.0 +pkgver=3.6.2 pkgrel=1 pkgdesc="A graphical directory tree analyzer" arch=(i686 x86_64) url="http://gnome.org" license=('GPL2') depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('intltool' 'itstool') +makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection') groups=('gnome-extra') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('cb252b5384287b31d5f945607ad4c8432fd2936087e714ab9d052ca0c08ffb55') +sha256sums=('8ffef397f11fb1e7105d1429be828e88b9ceb5746984f0bb978e66e87faf047a') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/cheese/PKGBUILD b/gnome-unstable/cheese/PKGBUILD index c995b74fb..7dfb23c44 100644 --- a/gnome-unstable/cheese/PKGBUILD +++ b/gnome-unstable/cheese/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 167536 2012-10-02 10:58:46Z jgc $ +# $Id: PKGBUILD 168959 2012-10-16 22:57:07Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64) license=('GPL') depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'libgee' 'gnome-video-effects' 'librsvg' 'gnome-desktop') makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala' 'nautilus-sendto') -optdepends=('nautilus-sendto: Send images') +optdepends=('nautilus-sendto: Send snapshots' + 'frei0r-plugins: More camera effects') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f0872c6c276fabf054e37e427cb4a4174351a439ebfae7431ecc09a1837e9a80') +sha256sums=('2db101cd16ce41764eb2f676c1bed94e58e4a89141785b95ff088b60bcf6abef') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/epiphany/PKGBUILD b/gnome-unstable/epiphany/PKGBUILD index c15e8c13a..040a42e5f 100644 --- a/gnome-unstable/epiphany/PKGBUILD +++ b/gnome-unstable/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167069 2012-09-25 09:09:57Z jgc $ +# $Id: PKGBUILD 168819 2012-10-16 09:37:58Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('54458b220e5f320b93f2f59840971627f43f2aa6b1ff5fa3e6a8fad5deef2207') +sha256sums=('1b4e33e02f7653489be9c49d182be84da13348b4ad3cb4c09c643898586a6008') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gdm/PKGBUILD b/gnome-unstable/gdm/PKGBUILD index b5f9b5f14..71f77d096 100644 --- a/gnome-unstable/gdm/PKGBUILD +++ b/gnome-unstable/gdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167181 2012-09-26 20:17:35Z heftig $ +# $Id: PKGBUILD 168821 2012-10-16 09:51:39Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="Gnome Display Manager" arch=(i686 x86_64) @@ -21,7 +21,7 @@ optdepends=('gnome-shell: new login interface' install=gdm.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz fix_external_program_directories.patch) -sha256sums=('ea63736fc8f7234aca442f4e99b3ba9cc29dce5e464ed93f7bf7eb8c49abd60b' +sha256sums=('aff69dde55e11b540145002c95cf966cd16376910283b385520431ced10c5031' 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2') build() { diff --git a/gnome-unstable/ghex/PKGBUILD b/gnome-unstable/ghex/PKGBUILD new file mode 100644 index 000000000..ebad92cf0 --- /dev/null +++ b/gnome-unstable/ghex/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 168936 2012-10-16 15:56:20Z jgc $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=ghex +pkgver=3.6.1 +pkgrel=1 +pkgdesc="A simple binary editor for the Gnome desktop" +arch=('i686' 'x86_64') +license=('GPL') +url="http://live.gnome.org/Ghex" +depends=('gtk3' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') +options=('!libtool' '!emptydirs') +install=ghex.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('ef74fc5a5a67736391b3fb7fb14f588f3a4441b1aa48d1a6eaa1adb6c0427544') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/ghex/ghex.install b/gnome-unstable/ghex/ghex.install new file mode 100644 index 000000000..084bc82ee --- /dev/null +++ b/gnome-unstable/ghex/ghex.install @@ -0,0 +1,20 @@ +pkgname=ghex + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/glib2/PKGBUILD b/gnome-unstable/glib2/PKGBUILD index 66a976220..175636d2d 100644 --- a/gnome-unstable/glib2/PKGBUILD +++ b/gnome-unstable/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166979 2012-09-24 06:15:02Z heftig $ +# $Id: PKGBUILD 168817 2012-10-16 09:14:36Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.34.0 +pkgver=2.34.1 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -14,7 +14,7 @@ optdepends=('python2: for gdbus-codegen') options=('!libtool' '!docs' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz revert-warn-glib-compile-schemas.patch) -sha256sums=('f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144' +sha256sums=('6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { diff --git a/gnome-unstable/gnome-games/PKGBUILD b/gnome-unstable/gnome-games/PKGBUILD index cce30bd0a..4c0a60276 100644 --- a/gnome-unstable/gnome-games/PKGBUILD +++ b/gnome-unstable/gnome-games/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 167161 2012-09-26 17:29:17Z jgc $ +# $Id: PKGBUILD 168946 2012-10-16 17:04:37Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.6.0.2 +pkgver=3.6.1 pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64') license=('GPL') -depends=('desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') +depends=('desktop-file-utils' 'glu' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala') options=('!emptydirs' '!libtool') install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('353b416dd86e2b6f323d28011c9b478b9848fabc5686a2e01bbd35e36402ed2c') +sha256sums=('f016068350ca2a4deceeac0374d5372610b1da07e2c4b356470f3401e6e2a43d') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-screensaver/PKGBUILD b/gnome-unstable/gnome-screensaver/PKGBUILD index 921bcaf1f..15127eccf 100644 --- a/gnome-unstable/gnome-screensaver/PKGBUILD +++ b/gnome-unstable/gnome-screensaver/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167171 2012-09-26 18:49:51Z jgc $ +# $Id: PKGBUILD 168823 2012-10-16 10:00:41Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="Screensaver designed to integrate well with the GNOME desktop." arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ options=(!emptydirs) install=gnome-screensaver.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-screensaver.pam) -sha256sums=('4c6579edb764a1108f7ce374a901797cf1de666113fcdc51642d805ff16c5c26' +sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0' 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb') build() { diff --git a/gnome-unstable/gnome-session/PKGBUILD b/gnome-unstable/gnome-session/PKGBUILD index 2d9288edd..41d664051 100644 --- a/gnome-unstable/gnome-session/PKGBUILD +++ b/gnome-unstable/gnome-session/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167167 2012-09-26 18:35:43Z jgc $ +# $Id: PKGBUILD 168827 2012-10-16 10:10:30Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) @@ -17,7 +17,7 @@ url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-session-3.3.1-llvmpipe.patch timeout.patch) -sha256sums=('f82b236f18bc78cef16d4cc3d3892f9a5afff81fdb3e04319b3505aa00e888c1' +sha256sums=('759c26230d8ac3f2d51344f5eaadce166819c4394acb733987e6d23fd42bddfb' '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD index 572a8dc8b..411564527 100644 --- a/gnome-unstable/gnome-shell/PKGBUILD +++ b/gnome-unstable/gnome-shell/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167934 2012-10-03 21:44:44Z heftig $ +# $Id: PKGBUILD 168833 2012-10-16 11:21:12Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('032ad32a4fa6c1f92010635e3076031323ac690f78c610184438c085c355e07b') +sha256sums=('566a9d902f85a89c23dc29f1789f859aa2c5a0de7dffa5235bf5a1885c76a3a7') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gst-libav/PKGBUILD b/gnome-unstable/gst-libav/PKGBUILD index e357d4435..67f877215 100644 --- a/gnome-unstable/gst-libav/PKGBUILD +++ b/gnome-unstable/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167900 2012-10-03 16:39:25Z heftig $ +# $Id: PKGBUILD 168815 2012-10-16 09:05:59Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-libav -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('yasm') options=(!libtool !emptydirs) provides=("gst-ffmpeg=$pkgver-pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('49c8b54eaae25da2c866a59b284b31ea') +sha256sums=('7c998468ffa57b5d1c2c76d6857dbc0c4ed87fd207ef71bf96aeaada6a1cfa89') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gst-plugins-bad/PKGBUILD b/gnome-unstable/gst-plugins-bad/PKGBUILD index fe92ff01c..1326152c6 100644 --- a/gnome-unstable/gst-plugins-bad/PKGBUILD +++ b/gnome-unstable/gst-plugins-bad/PKGBUILD @@ -2,18 +2,20 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-bad -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Bad Plugins" arch=('i686' 'x86_64') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'faac' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus') makedepends=('gstreamer' 'schroedinger' 'gtk3' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2') options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz) +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('5e3cffcd258c4c722c880a52ebc9920d6b38aa4153bbc49d1b5a9893885d45f3') build() { - cd "${srcdir}/gst-plugins-bad-${pkgver}" + cd $pkgname-$pkgver sed -i '/AC_PATH_XTRA/d' configure.ac autoreconf ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ @@ -25,12 +27,11 @@ build() { } check() { - cd "${srcdir}/gst-plugins-bad-${pkgver}" + cd $pkgname-$pkgver make check } package() { - cd "${srcdir}/gst-plugins-bad-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } -md5sums=('f2d2c432917fb639a510bb3ce85c5329') diff --git a/gnome-unstable/gst-plugins-ugly/PKGBUILD b/gnome-unstable/gst-plugins-ugly/PKGBUILD index 2ec191bf7..e54276afd 100644 --- a/gnome-unstable/gst-plugins-ugly/PKGBUILD +++ b/gnome-unstable/gst-plugins-ugly/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167899 2012-10-03 16:36:51Z heftig $ +# $Id: PKGBUILD 168810 2012-10-16 08:45:47Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64') @@ -11,15 +11,12 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) - #opencore-amr.patch) -md5sums=('7f20303caf4305278573fb7ef73a07b7') - #'d8feb6c99bfaff8be6b2c48ea4e98e47') +sha256sums=('378952a36e553f65fc1fcbcb0cc445304337e2e75503fb6b5f0ca2c05405e4f0') build() { cd $pkgname-$pkgver sed -i '/AC_PATH_XTRA/d' configure.ac autoreconf - #patch -Np0 -i "${srcdir}/opencore-amr.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ diff --git a/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD index c133420b8..d10f53fb2 100644 --- a/gnome-unstable/gtk3/PKGBUILD +++ b/gnome-unstable/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167066 2012-09-25 08:10:03Z jgc $ +# $Id: PKGBUILD 168831 2012-10-16 11:12:48Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini wacom.patch) -sha256sums=('e13f45225a795ebe9e4047486fa57b3232e6a21539983775db6cd4ae9046b049' +sha256sums=('fe6c89ae40145b077d7291105e81d4f876be01bf21ddfb9cba449f6be49d7996' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') build() { diff --git a/gnome-unstable/gucharmap/PKGBUILD b/gnome-unstable/gucharmap/PKGBUILD index 0a1caaa33..cb002ec81 100644 --- a/gnome-unstable/gucharmap/PKGBUILD +++ b/gnome-unstable/gucharmap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167740 2012-10-03 13:27:33Z jgc $ +# $Id: PKGBUILD 168934 2012-10-16 15:45:21Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.5.99 +pkgver=3.6.0 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl options=('!libtool' '!emptydirs') install=gucharmap.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('0f439539e6ed3fa84a8775d27c8082410652124cb124437ff4b21432f47b8864') +sha256sums=('778bbc61bedcb6c573800ccebc56d360d988a156727b5a8f8bac9787c1fe7fb4') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/libcroco/PKGBUILD b/gnome-unstable/libcroco/PKGBUILD index 2354aadb1..f25316ba6 100644 --- a/gnome-unstable/libcroco/PKGBUILD +++ b/gnome-unstable/libcroco/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167716 2012-10-03 10:14:48Z jgc $ +# $Id: PKGBUILD 168930 2012-10-16 15:30:37Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libcroco -pkgver=0.6.6 +pkgver=0.6.7 pkgrel=1 pkgdesc="A CSS parsing library" arch=('x86_64' 'i686') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) url="http://www.gnome.org" -sha256sums=('72ecace2f3d016a25f2b923c6d0cc76cced823e94171692c533f6c2088086bd9') +sha256sums=('892b8a7e311b80d0a5a633b8204fed5656d7af20e884719e5ec6e340e1f0cd88') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/libpeas/PKGBUILD b/gnome-unstable/libpeas/PKGBUILD index 77ee2a0a3..d5bcdcfb2 100644 --- a/gnome-unstable/libpeas/PKGBUILD +++ b/gnome-unstable/libpeas/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167720 2012-10-03 10:23:54Z jgc $ +# $Id: PKGBUILD 168808 2012-10-16 08:40:44Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libpeas -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="A GObject-based plugins engine" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' options=('!libtool') install=libpeas.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('23c1385cba2e32201588c988ea6894b27a115efc01cb4acb927e984456ffd63c') +sha256sums=('7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/librsvg/PKGBUILD b/gnome-unstable/librsvg/PKGBUILD new file mode 100644 index 000000000..8acf2ed45 --- /dev/null +++ b/gnome-unstable/librsvg/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 168932 2012-10-16 15:37:33Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=librsvg +pkgver=2.36.4 +pkgrel=1 +pkgdesc="A SVG viewing library" +arch=(i686 x86_64) +license=('LGPL') +depends=('gdk-pixbuf2' 'pango' 'libcroco') +makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection') +optdepends=('gtk3: for rsvg-view-3' + 'gtk2: gtk2 SVG engine module') +options=('!libtool' '!emptydirs') +url="http://librsvg.sourceforge.net/" +install=librsvg.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/librsvg/librsvg.install b/gnome-unstable/librsvg/librsvg.install new file mode 100644 index 000000000..8852ebf28 --- /dev/null +++ b/gnome-unstable/librsvg/librsvg.install @@ -0,0 +1,11 @@ +post_install() { + gdk-pixbuf-query-loaders --update-cache +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/libsoup/PKGBUILD b/gnome-unstable/libsoup/PKGBUILD index 406a4287e..22a9a3c1a 100644 --- a/gnome-unstable/libsoup/PKGBUILD +++ b/gnome-unstable/libsoup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167007 2012-09-24 18:00:04Z jgc $ +# $Id: PKGBUILD 168884 2012-10-16 11:55:47Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.40.0 +pkgver=2.40.1 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-i url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('ef65eb6d48e9525ad0fb82f964d3001e86921330317b51082d3dd0afc41d2ea9') +sha256sums=('77a55d57e7e8055acd2f44e0cc889b9ba48052e8b7f07e829157d57417ac650a') build() { cd "$pkgbase-$pkgver" diff --git a/gnome-unstable/mutter/PKGBUILD b/gnome-unstable/mutter/PKGBUILD index e71f44b8f..e31c80a0a 100644 --- a/gnome-unstable/mutter/PKGBUILD +++ b/gnome-unstable/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167751 2012-10-03 14:23:30Z heftig $ +# $Id: PKGBUILD 168829 2012-10-16 10:42:58Z jgc $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('002a7b6f0cbe054c6701cf9fcbff744494dbf49db9cbea5f8df75dbf1b752c07') +sha256sums=('4bec46ceb114a78d5f851823d8966b9b386a9319fbec740ff59bf5eb265d6637') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/pygobject/PKGBUILD b/gnome-unstable/pygobject/PKGBUILD new file mode 100644 index 000000000..3c32f5b7f --- /dev/null +++ b/gnome-unstable/pygobject/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 168942 2012-10-16 16:22:08Z heftig $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgbase=pygobject +pkgname=(python-gobject python2-gobject pygobject-devel) +pkgver=3.4.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) +options=('!libtool') +sha256sums=('21dbef53f5a29bcb547f36ba42e021f71981e1c50e8f89526e393d77b36a8b1f') + +build() { + cp -a "$pkgbase-$pkgver" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr + make + ) + + ( + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr + make + ) +} + +package_python-gobject() { + pkgdesc="Python 3 bindings for GObject" + depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") + + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/{include,lib/pkgconfig} +} + +package_python2-gobject() { + pkgdesc="Python 2 bindings for GObject" + depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") + + cd "python2-build" + make DESTDIR="$pkgdir" install + mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" +} + +package_pygobject-devel() { + pkgdesc="Development files for the pygobject bindings" + cd "devel" + mkdir -p "$pkgdir"/usr/{include,lib} + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" +} diff --git a/gnome-unstable/vinagre/PKGBUILD b/gnome-unstable/vinagre/PKGBUILD index a2764c0f6..5dd566d72 100644 --- a/gnome-unstable/vinagre/PKGBUILD +++ b/gnome-unstable/vinagre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167867 2012-10-03 14:58:56Z jgc $ +# $Id: PKGBUILD 168958 2012-10-16 22:54:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4f75882d52308ccb241ef6d76061bad54a7e13e6549fe355faa2af994765f11d') +sha256sums=('768727f9833ba9b9879d72671bc4b10577f4dfe74488cb0cf4c49edfe0165c62') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/vino/PKGBUILD b/gnome-unstable/vino/PKGBUILD index 6d7b74dd1..45ac66e11 100644 --- a/gnome-unstable/vino/PKGBUILD +++ b/gnome-unstable/vino/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167742 2012-10-03 13:54:15Z jgc $ +# $Id: PKGBUILD 168957 2012-10-16 22:51:56Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64') @@ -15,11 +15,11 @@ url="http://www.gnome.org" options=(!emptydirs) install=vino.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('590ef98a3a2c2e6eb698d8e55ec97c2755aa85839a35985bf2142b186dce91ef') +sha256sums=('60fdc2271e27c4e10bef40dc2ee836d587930a178c3f189bd975c4d477f32783') build() { cd $pkgname-$pkgver - sed -i -e '/AC_PATH_XTRA/d' -e 's/LIBSECRET_DEPS/SECRET_DEPS/g' configure.ac + sed -i -e '/AC_PATH_XTRA/d' configure.ac autoreconf --force ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vino \ diff --git a/gnome-unstable/vte3/PKGBUILD b/gnome-unstable/vte3/PKGBUILD index 4a07d2dd1..f4005fc7b 100644 --- a/gnome-unstable/vte3/PKGBUILD +++ b/gnome-unstable/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167332 2012-10-01 11:36:11Z jgc $ +# $Id: PKGBUILD 168890 2012-10-16 12:09:06Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.34.0 +pkgver=0.34.1 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz) -sha256sums=('8b5d4dcd84e36f6a89c7d747978387a3ed3eda5806a383530226dd30b0e4af53') +sha256sums=('06b78824875545ced8ebaff111b656d0b4ed370f46a4b609f43f88a0ee908f08') build() { cd "vte-$pkgver" diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index e5112c8a9..dff627829 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.0 -pkgrel=3 +pkgrel=3.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 3bd4616eb..10182a0e9 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.0 -pkgrel=6 +pkgrel=6.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 81ba99ec8..5ae72a76f 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-guest-utils' 'virtualbox-libre-guest-source') pkgver=4.2.0 -pkgrel=4 +pkgrel=4.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -109,7 +109,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' '67cc4c8611890038eb3e4114ae899525' - '1ede8951f4bebac3b50a8e0b999aa348') + 'c7b29fbf4c24a00e8646ca6dd73f38a1') #_extramodules=extramodules-3.5-LIBRE #_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index 223aeeb16..fcdb3c631 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -1,5 +1,5 @@ --- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp 2012-09-08 06:36:02.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-10-03 15:38:41.975881316 -0300 ++++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-10-16 23:00:19.998701465 -0200 @@ -33,289 +33,365 @@ VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, @@ -190,318 +190,318 @@ + VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux", "Arch Linux", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "ArchLinux", "Arch Linux", VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "ArchLinux_64", "Arch Linux (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux_64", "Arch Linux (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "ArchLinux_64", "Arch Linux (64 bit)", VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Debian", "Debian", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian", "Debian", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Debian", "Debian", VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Debian_64", "Debian (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Debian_64", "Debian (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Debian_64", "Debian (64 bit)", VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, - { "Linux", "Linux", "OpenSUSE", "openSUSE", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE", "openSUSE", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "OpenSUSE", "openSUSE", VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "OpenSUSE_64", "openSUSE (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "OpenSUSE_64", "openSUSE (64 bit)", VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Fedora", "Fedora", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora", "Fedora", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Fedora", "Fedora", VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Fedora_64", "Fedora (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Fedora_64", "Fedora (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Fedora_64", "Fedora (64 bit)", VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Gentoo", "Gentoo", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo", "Gentoo", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Gentoo", "Gentoo", VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Gentoo_64", "Gentoo (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Gentoo_64", "Gentoo (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Gentoo_64", "Gentoo (64 bit)", VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Mandriva", "Mandriva", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva", "Mandriva", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Mandriva", "Mandriva", VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Mandriva_64", "Mandriva (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Mandriva_64", "Mandriva (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Mandriva_64", "Mandriva (64 bit)", VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "RedHat", "Red Hat", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat", "Red Hat", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "RedHat", "Red Hat", VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "RedHat_64", "Red Hat (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "RedHat_64", "Red Hat (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "RedHat_64", "Red Hat (64 bit)", VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Turbolinux", "Turbolinux", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux", "Turbolinux", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Turbolinux", "Turbolinux", VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Turbolinux_64", "Turbolinux (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Turbolinux_64", "Turbolinux (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Turbolinux_64", "Turbolinux (64 bit)", VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Ubuntu", "Ubuntu", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu", "Ubuntu", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Ubuntu", "Ubuntu", VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Ubuntu_64", "Ubuntu (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Ubuntu_64", "Ubuntu (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Ubuntu_64", "Ubuntu (64 bit)", VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Xandros", "Xandros", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros", "Xandros", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Xandros", "Xandros", VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Xandros_64", "Xandros (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Xandros_64", "Xandros (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Xandros_64", "Xandros (64 bit)", VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle", "Oracle", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle", "Oracle", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Oracle", "Oracle", VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Oracle_64", "Oracle (64 bit)", -+ { "Non-free Distros", "Non-free GNU/Linux Distros", "Oracle_64", "Oracle (64 bit)", ++ { "Non-free Distros", "Non-free GNU/Linux Distros (Using it is surrendering your freedom)", "Oracle_64", "Oracle (64 bit)", VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Linux", "Linux", "Linux", "Other Linux", - VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows31", "Windows 3.1", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows31", "Windows 3.1", + VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY, + 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows95", "Windows 95", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows95", "Windows 95", + VBOXOSTYPE_Win95, VBOXOSHINT_FLOPPY, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows98", "Windows 98", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows98", "Windows 98", + VBOXOSTYPE_Win98, VBOXOSHINT_FLOPPY, + 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems", "WindowsMe", "Windows ME", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsMe", "Windows ME", + VBOXOSTYPE_WinMe, VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET, + 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4", "Windows NT 4", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT4", "Windows NT 4", + VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE, + 128, 16, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows2000", "Windows 2000", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2000", "Windows 2000", + VBOXOSTYPE_Win2k, VBOXOSHINT_USBTABLET, + 168, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP", "Windows XP", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP", "Windows XP", + VBOXOSTYPE_WinXP, VBOXOSHINT_USBTABLET, + 192, 16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64", "Windows XP (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsXP_64", "Windows XP (64 bit)", + VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 192, 16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows2003", "Windows 2003", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003", "Windows 2003", + VBOXOSTYPE_Win2k3, VBOXOSHINT_USBTABLET, + 256, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64", "Windows 2003 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2003_64", "Windows 2003 (64 bit)", + VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 256, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista", "Windows Vista", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista", "Windows Vista", + VBOXOSTYPE_WinVista, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64", "Windows Vista (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsVista_64", "Windows Vista (64 bit)", + VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows2008", "Windows 2008", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008", "Windows 2008", + VBOXOSTYPE_Win2k8, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64", "Windows 2008 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2008_64", "Windows 2008 (64 bit)", + VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows7", "Windows 7", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7", "Windows 7", + VBOXOSTYPE_Win7, VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows7_64", "Windows 7 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows7_64", "Windows 7 (64 bit)", + VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows8", "Windows 8", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8", "Windows 8", + VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE, + 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows8_64", "Windows 8 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows8_64", "Windows 8 (64 bit)", + VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64", "Windows 2012 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Windows2012_64", "Windows 2012 (64 bit)", + VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, + 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -+ { "Non-free OSs", "Non-free Operating Systems", "WindowsNT", "Other Windows", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "WindowsNT", "Other Windows", + VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, + 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier", -+ { "Non-free OSs", "Non-free Operating Systems", "Solaris", "Oracle Solaris 10 5/09 and earlier", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris", "Oracle Solaris 10 5/09 and earlier", VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "OpenSolaris", "Oracle Solaris 10 10/09 and later", -+ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris", "Oracle Solaris 10 10/09 and later", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenSolaris", "Oracle Solaris 10 10/09 and later", VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET, 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Solaris", "Solaris", "Solaris11_64", "Oracle Solaris 11 (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "Solaris11_64", "Oracle Solaris 11 (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Solaris11_64", "Oracle Solaris 11 (64 bit)", VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD", "FreeBSD", -+ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "FreeBSD", "FreeBSD", VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "FreeBSD_64", "FreeBSD (64 bit)", VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD", "OpenBSD", -+ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenBSD", "OpenBSD", VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OpenBSD_64", "OpenBSD (64 bit)", VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD", "NetBSD", -+ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "NetBSD", "NetBSD", VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "NetBSD_64", "NetBSD (64 bit)", VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3", -+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp3", "OS/2 Warp 3", VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4", -+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp4", "OS/2 Warp 4", VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5", -+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2Warp45", "OS/2 Warp 4.5", VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "OS2", "IBM OS/2", "OS2eCS", "eComStation", -+ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2eCS", "eComStation", VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, 256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "OS2", "IBM OS/2", "OS2", "Other OS/2", -+ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "OS2", "Other OS/2", VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "MacOS", "Mac OS X", "MacOS", "Mac OS X", -+ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "MacOS", "Mac OS X", VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, AudioControllerType_HDA }, - { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)", -+ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "MacOS_64", "Mac OS X (64 bit)", VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, AudioControllerType_HDA }, - { "Other", "Other", "DOS", "DOS", -+ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "DOS", "DOS", VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, - { "Other", "Other", "Netware", "Netware", -+ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "Netware", "Netware", VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "L4", "L4", -+ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "L4", "L4", VBOXOSTYPE_L4, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "QNX", "QNX", -+ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "QNX", "QNX", VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, - { "Other", "Other", "JRockitVE", "JRockitVE", -+ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE", ++ { "Non-free OSs", "Non-free Operating Systems (Using it is surrendering your freedom)", "JRockitVE", "JRockitVE", VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE, 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, --- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300 -+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-04 01:54:14.693582889 -0300 -@@ -44,45 +44,45 @@ ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-10-16 22:44:37.177454655 -0200 +@@ -44,45 +44,33 @@ static const osTypePattern gs_OSTypePattern[] = { @@ -542,18 +542,6 @@ - { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, - { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, - { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, -+ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */ -+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, -+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, -+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" }, -+ { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" }, -+ { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, -+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, -+ { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, -+ { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" }, -+ { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" }, -+ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" }, -+ + /* Code names for free GNU/Linux distributions */ + { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" }, + { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" }, @@ -585,7 +573,7 @@ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -90,7 +90,7 @@ +@@ -90,7 +78,7 @@ { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, @@ -594,7 +582,7 @@ { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, -@@ -115,15 +115,38 @@ +@@ -115,15 +103,50 @@ { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, @@ -607,6 +595,18 @@ - { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, - /* Other: */ ++ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */ ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" }, ++ { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" }, ++ { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, ++ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, ++ { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, ++ { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" }, ++ { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" }, ++ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" }, ++ + /* Regular names of non-free operating systems: */ + { QRegExp("DOS", Qt::CaseInsensitive), "DOS" }, + { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" }, diff --git a/staging/calligra/PKGBUILD b/staging/calligra/PKGBUILD index 1e3b24895..0032718b7 100644 --- a/staging/calligra/PKGBUILD +++ b/staging/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165221 2012-08-13 14:35:45Z andrea $ +# $Id: PKGBUILD 168940 2012-10-16 16:14:22Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -21,19 +21,18 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.5.0 -pkgrel=1 +pkgver=2.5.3 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' - 'kdepimlibs' 'libpqxx' 'freetds' 'xbase' - 'kdegraphics-okular' 'gsl' 'kdeedu-marble' - 'libwps' 'libwpg' 'pstoedit' 'glew' - 'fftw' 'opengtl' 'lcms2' 'libkdcraw') +makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' + 'lcms2' 'libmysqlclient' 'libpqxx' 'freetds' 'xbase' 'libwpg' + 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('bea9b5e9d95691caaba385ef5522a60d') +md5sums=('83e2679b7ecb923b953ace06db7ca4c2') build() { mkdir build @@ -41,9 +40,7 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_active=OFF \ - -DBUILD_mobile=OFF \ - -DIHAVEPATCHEDQT=1 + -DBUILD_active=OFF make } @@ -132,7 +129,7 @@ package_calligra-tools() { package_calligra-karbon() { pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime') + depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime' 'pstoedit') optdepends=('calligra-filters: import/export filters' 'calligra-tools: extra calligra tools') conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') @@ -145,7 +142,7 @@ package_calligra-karbon() { package_calligra-kexi() { pkgdesc="Develop desktop database applications" - depends=('calligra-libs' 'calligra-templates') + depends=('calligra-libs' 'calligra-templates' 'glew' 'fftw') optdepends=('libmysqlclient: MySQL driver' 'libpqxx: PostgreSQL driver' 'freetds: Sybase & MS SQL driver' @@ -159,6 +156,8 @@ package_calligra-kexi() { cd "${srcdir}"/build/kexi make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kexi + make DESTDIR="${pkgdir}" install } package_calligra-plan() { @@ -182,12 +181,14 @@ package_calligra-stage() { cd "${srcdir}"/build/stage make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/stage + make DESTDIR="${pkgdir}" install } package_calligra-krita() { pkgdesc="Edit and paint images" - depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' - 'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw') + depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' 'eigen2' + 'poppler-qt' 'libkdcraw' 'fftw' 'glew' 'opengtl') conflicts=('koffice-krita' 'calligra-krita-doc') replaces=('koffice-krita' 'calligra-krita-doc') install=calligra-krita.install @@ -208,12 +209,13 @@ package_calligra-sheets() { cd "${srcdir}"/build/sheets make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/sheets + make DESTDIR="${pkgdir}" install } package_calligra-words() { pkgdesc="Word Processor" - depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail' - 'calligra-plugins' 'kdegraphics-okular') + depends=('calligra-templates' 'calligra-pics' 'calligra-plugins' 'kdegraphics-okular') optdepends=('calligra-tools: extra calligra tools') conflicts=('koffice-kword') replaces=('koffice-kword') @@ -227,6 +229,7 @@ package_calligra-handbook() { pkgdesc="Documentation for Calligra" conflicts=('koffice-handbook') replaces=('koffice-handbook') + options=('docs') cd "${srcdir}"/build/doc/calligra make DESTDIR="${pkgdir}" install @@ -243,7 +246,7 @@ package_calligra-braindump() { package_calligra-flow() { pkgdesc="Flowchart & Diagram Editing" - depends=('calligra-words' 'kdebase-runtime') + depends=('calligra-words') conflicts=('calligra-flow-doc') replaces=('calligra-flow-doc') install=calligra-flow.install diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD index 37c272b22..bec6b0836 100644 --- a/staging/inkscape/PKGBUILD +++ b/staging/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165206 2012-08-13 03:26:48Z bisson $ +# $Id: PKGBUILD 168926 2012-10-16 15:19:57Z bisson $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.3.1 -pkgrel=5 +pkgrel=6 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD index 0f7f416ae..bdc003773 100644 --- a/staging/libreoffice/PKGBUILD +++ b/staging/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165186 2012-08-12 18:50:04Z andyrtr $ +# $Id: PKGBUILD 168948 2012-10-16 19:11:51Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -23,23 +23,22 @@ pkgname=('libreoffice-common' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' 'libreoffice-extension-wiki-publisher' - 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built -_LOver=3.5.5.3 -pkgver=3.5.5 -pkgrel=2 + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) +_LOver=3.6.2.2 +pkgver=3.6.2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' # 'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.3' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' - #'saxon' - currently broken + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' + 'apache-ant' 'gperf' 'poppler>=0.20.5' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -49,10 +48,11 @@ makedepends=( # makedepends _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" #_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - ${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 + ${_additional_source_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -76,14 +76,14 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e - smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 - fix_broken_hebrew_wordwrapping.diff + ${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 + ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz + ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + make-pyuno-work-with-system-wide-module-install.diff + buildfix.diff libreoffice-common.sh libreoffice-common.csh) -noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 +noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -92,8 +92,8 @@ noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz + 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 + 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -111,13 +111,14 @@ noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('ccb80344ae1ac546b3a6b6d85f3ae26a' - '09153713133bddc49af99bd76129e929' - 'c2e66522b8adf0b3fb5789e295129ba9' +md5sums=('ae171ba4633cc72dba4451b1bdd3385e' + 'cdad0734d247d91a79cb282fd851d2a7' + 'e9a7e3d35432b72a4603ce094deb6a67' '18f577b374d60b3c760a3a3350407632' 'f02578f5218f217a9f20e9c30e119c6a' - 'a9a1db27688bad49418667b434d29c1f' + '94e7f271e38c976462558b4278590178' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -141,14 +142,14 @@ md5sums=('ccb80344ae1ac546b3a6b6d85f3ae26a' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' '0ff7d225d087793c8c2c680d77aac3e7' - 'e1c178b18f130b40494561f02bc1a948' - '7c2549f6b0a8bb604e6c4c729ffdcfe6' + '6097739c841f671cb21332b9cc593ae7' + '0d2dcdfbf28d6208751b33057f5361f0' + 'ce5a1def34578b75959ac31210f031f6' '185d60944ea767075d27247c3162b3bc' - '60ce5dc9bd098f95c2e621a930c98dd9' - '661a52a02a31b3afbe4b3b3146061afd' - '025d9b17d9eb90dc282c5c1289a666aa' - 'f0e72d0e1bc93a50a3aa9d31350b156c' - '867c682b45f477f916786e00c45d7ab7') + '97bf43dda273d79ff90c848ab53b0e3c' + '234e91ac65945ce1ab1e3839780e90f7' + 'abcb1b0a7deaffe13ab3d7ca70becb49' + '72790a4103da259a55cadd66db931d00') build() { @@ -169,17 +170,11 @@ build() { ln -s ../libreoffice-translations-$_LOver/translations . # buildfixes & bugfixes - # one late fix to solve make distro-pack-install issue - patch -Np1 -i ${srcdir}/gmake_install.diff - patch -Np1 -i ${srcdir}/smp_buildfix.diff - # https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e - patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff - - # unset C(XX)FLAGS - # http://www.openoffice.org/issues/show_bug.cgi?id=103205 -# unset CFLAGS -# unset CXXFLAGS - + patch -Np1 -i ${srcdir}/buildfix.diff # leaves out a broken pdfimport test + + # fix not upstreamable pyuno paths - patch taken from Debian + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -191,12 +186,12 @@ build() { # python2 fix export PYTHON=python2 -# autoconf -f + #autoconf -f # non-SMP test build -# export MAKEFLAGS="-j1" + #export MAKEFLAGS="-j1" #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ -# touch autogen.lastrun + ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ @@ -230,12 +225,14 @@ build() { --without-afms\ --without-ppds\ --without-system-libwps\ + --without-system-libcdr \ --without-system-mdds\ --without-myspell-dicts \ --without-system-libvisio \ --without-system-libcmis \ - --without-system-sampleicc \ --without-system-libexttextcat \ + --without-system-jfreereport \ + --without-system-apache-commons \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -250,7 +247,7 @@ build() { --disable-mozilla \ --without-system-mozilla \ --without-system-mozilla-headers \ - --with-ant-home="/usr/share/java/apache-ant"\ + --with-ant-home="/usr/share/apache-ant"\ --without-system-boost\ --with-system-cairo\ --with-system-libs\ @@ -258,9 +255,8 @@ build() { --with-system-headers\ --with-system-hsqldb \ --with-alloc=system\ - --with-system-lucene\ - --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ - --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ + --with-system-clucene\ + --without-system-servlet-api \ --with-java-target-version=1.5 \ $EXTRAOPTS @@ -271,7 +267,7 @@ build() { make # fake installation to create split file lists mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install + make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check } #check() { @@ -284,25 +280,23 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') - #'saxon' optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' 'gconf: adds additional gnome support' 'nss: adds support for signed files/macros' 'pstoedit: translates PostScript and PDF graphics into other vector formats' - 'poppler: for shipped pdfimport extension' 'libmythes: for use in thesaurus' 'beanshell: interactive java -- good for prototyping /macros' 'vigra: C++ computer vision library, usable in Basebmp' 'libmspack: library for Microsoft compression formats for use in FontOOo' 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' - 'lucene: full-text search engine library for Java needed in the help section' 'sane: for scanner access' 'unixodbc: adds ODBC database support' - 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') + 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress' + 'gtk2: for browser plugin') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf) @@ -342,6 +336,11 @@ package_libreoffice-common() { install -dm755 ${pkgdir}/usr/share/bash-completion/completions mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh rm -rf ${pkgdir}/etc/bash_completion.d + + # some files would conflict + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb } package_libreoffice-base() { @@ -373,27 +372,22 @@ package_libreoffice-postgresql-connector() { groups=('libreoffice') replaces=('libreoffice') - # no file-list so far - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry + # workaround double entries in the file list + mv ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig + sort ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt -# # create directories from *list.txt file -# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# install -dm755 ${pkgdir}/${directory/\%dir/} -# done -# # install files into the pkg from fakeinstall dir -# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# dirname=`dirname $file` -# # check if directory has been already been created - some are missing like manpages -# [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname -# # mv file from fakeinstall to pkgdir -# mv ${srcdir}/fakeinstall${file} ${pkgdir}$file -# done + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done } package_libreoffice-calc() { @@ -467,7 +461,7 @@ package_libreoffice-impress() { pkgdesc="Presentation Application for LibreOffice." install=libreoffice-impress.install depends=('libreoffice-common') - optdepends=('mesa: for the OGLTrans extension') + optdepends=('glu: for the OGLTrans extension') backup=() groups=('libreoffice') replaces=('libreoffice') @@ -550,7 +544,6 @@ package_libreoffice-sdk() { done # fix environment path to keep compatibility with openjdk6 and openjdk7 - #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} } @@ -629,7 +622,7 @@ package_libreoffice-extension-pdfimport() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport } package_libreoffice-extension-presenter-screen() { @@ -681,8 +674,8 @@ package_libreoffice-scripting-javascript() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ + mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ + mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ } package_libreoffice-extension-scripting-python() { diff --git a/staging/libreoffice/libreoffice-common.csh b/staging/libreoffice/libreoffice-common.csh index af31d4432..5efa39404 100644 --- a/staging/libreoffice/libreoffice-common.csh +++ b/staging/libreoffice/libreoffice-common.csh @@ -1 +1,8 @@ #setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program + +# to force a certain look'n feel + +#setenv SAL_USE_VCLPLUGIN gen +#setenv SAL_USE_VCLPLUGIN kde4 +#setenv SAL_USE_VCLPLUGIN gtk +#setenv SAL_USE_VCLPLUGIN gtk3 diff --git a/staging/libreoffice/libreoffice-common.sh b/staging/libreoffice/libreoffice-common.sh index ee405b1aa..795867125 100644 --- a/staging/libreoffice/libreoffice-common.sh +++ b/staging/libreoffice/libreoffice-common.sh @@ -1 +1,8 @@ #export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" + +# to force a certain look'n feel + +#export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=kde4 +#export SAL_USE_VCLPLUGIN=gtk +#export SAL_USE_VCLPLUGIN=gtk3 diff --git a/staging/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/staging/libreoffice/make-pyuno-work-with-system-wide-module-install.diff new file mode 100644 index 000000000..e86548136 --- /dev/null +++ b/staging/libreoffice/make-pyuno-work-with-system-wide-module-install.diff @@ -0,0 +1,44 @@ +diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh +index defd7b2..ea2a809 100755 +--- a/desktop/scripts/soffice.sh ++++ b/desktop/scripts/soffice.sh +@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then + exit 1; + fi + ++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} ++export PYTHONPATH ++ + case "`uname -s`" in + NetBSD|OpenBSD|FreeBSD|DragonFly) + # this is a temporary hack until we can live with the default search paths +diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py +index f93ac5e..92a2891 100644 +--- a/pyuno/source/module/uno.py ++++ b/pyuno/source/module/uno.py +@@ -26,8 +26,12 @@ + # for a copy of the LGPLv3 License. + # + #************************************************************************* ++import os + import sys + ++sys.path.append('/usr/lib/libreoffice/program') ++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: ++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc" + import pyuno + + try: +diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py +index 610ac5f..df243d0 100755 +--- a/scripting/source/pyprov/officehelper.py ++++ b/scripting/source/pyprov/officehelper.py +@@ -53,7 +53,7 @@ def bootstrap(): + if "UNO_PATH" in os.environ: + sOffice = os.environ["UNO_PATH"] + else: +- sOffice = "" # lets hope for the best ++ sOffice = "/usr/lib/libreoffice/program" + sOffice = os.path.join(sOffice, "soffice") + if platform.startswith("win"): + sOffice += ".exe" diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD index bc60416ee..9bf72ace2 100644 --- a/staging/poppler/PKGBUILD +++ b/staging/poppler/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 165183 2012-08-12 16:28:46Z andyrtr $ +# $Id: PKGBUILD 168910 2012-10-16 14:16:26Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.3 +pkgver=0.20.5 pkgrel=1 arch=(i686 x86_64) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('28c40266f374e1960a7bcead17d39f96' +md5sums=('8a80ae83eb7a327b031808d09ee1d54d' '9dc64c254a31e570507bdd4ad4ba629a') build() { @@ -36,7 +36,7 @@ check() { cd "${srcdir}" ln -sf test-${_testtag} test cd ${pkgbase}-${pkgver} - LANG=en_US.UTF8 make check + LANG=en_US.UTF8 make check || /bin/true } package_poppler() { diff --git a/testing/bzr/PKGBUILD b/testing/bzr/PKGBUILD new file mode 100644 index 000000000..655bba6dd --- /dev/null +++ b/testing/bzr/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 168834 2012-10-16 11:53:33Z allan $ +# Maintainer : +# Contributor: Hugo Doria <hugo@archlinux.org> + +pkgname=bzr +pkgver=2.5.1 +pkgrel=2 +pkgdesc="A decentralized revision control system (bazaar)" +arch=('i686' 'x86_64') +url="http://bazaar.canonical.com/en/" +license=('GPL') +depends=('python2') +optdepends=('python2-paramiko: for sftp support') +source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig}) +md5sums=('ac5079858364a046071000d5cdccb67b' + 'c83dd08dd2c3e27edbab873500d7d6eb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|man/man1|share/man/man1|' setup.py + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py} + python2 setup.py build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 + + # bash-completion + install -D -m644 contrib/bash/bzr \ + "${pkgdir}/usr/share/bash-completion/completions/bzr" +} diff --git a/testing/dbus-python/PKGBUILD b/testing/dbus-python/PKGBUILD index ef7313c2b..69caec8f6 100644 --- a/testing/dbus-python/PKGBUILD +++ b/testing/dbus-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160769 2012-06-05 09:29:16Z jgc $ +# $Id: PKGBUILD 168835 2012-10-16 11:53:35Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=dbus-python pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') -pkgver=1.1.0 -pkgrel=1 +pkgver=1.1.1 +pkgrel=2 pkgdesc="Python bindings for DBUS" arch=('i686' 'x86_64') license=('GPL' 'LGPL') @@ -12,7 +12,7 @@ url="http://www.freedesktop.org/wiki/Software/DBusBindings" makedepends=('docutils' 'dbus-glib' 'python' 'python2') options=('!libtool') source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) -md5sums=('41a459bbbb5fd92eeebd632623af0bd7') +md5sums=('742c7432ad0f7c3f98291d58fa2e35dc') build() { cd "${srcdir}" @@ -29,6 +29,7 @@ build() { package_python-dbus-common() { pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus" + conflicts=('dbus-python<1.1.0') cd "${srcdir}/build-python3" make DESTDIR="${pkgdir}" install-data @@ -38,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/testing/gnome-python-desktop/PKGBUILD b/testing/gnome-python-desktop/PKGBUILD new file mode 100644 index 000000000..2c0833284 --- /dev/null +++ b/testing/gnome-python-desktop/PKGBUILD @@ -0,0 +1,107 @@ +# $Id: PKGBUILD 168837 2012-10-16 11:53:40Z 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' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck') +pkgver=2.32.0 +pkgrel=11 +arch=(i686 x86_64) +license=('GPL' 'LGPL') +options=('!libtool') +makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2 + gnome-python-desktop-2.32.0-metacity-build.patch) +sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9' + 'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity + make +} + +package_gnome-python-desktop() { + depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome2-python') + pkgdesc="Python bindings for the GNOME desktop environment" + + cd "${srcdir}/${pkgbase}-${pkgver}" + make install-pkgconfigDATA DESTDIR="${pkgdir}" +} + +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_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_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_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_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}" + install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs" + install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" +} + +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}" + install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs" + install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" +} + +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/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch b/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch new file mode 100644 index 000000000..5054dd2bd --- /dev/null +++ b/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch @@ -0,0 +1,42 @@ +From: Daniel Drake <dsd@laptop.org> + +Fix build against metacity-2.34.2. The port to GSettings +removed these constants from the codebase. + +Index: gnome-python-desktop-2.32.0/metacity/metacity.defs +=================================================================== +--- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs ++++ gnome-python-desktop-2.32.0/metacity/metacity.defs +@@ -120,32 +120,6 @@ + ) + ) + +-(define-enum FocusMode +- (in-module "Meta") +- (c-name "MetaFocusMode") +-; (gtype-id "META_TYPE_FOCUS_MODE") +- (values +- '("click" "META_FOCUS_MODE_CLICK") +- '("sloppy" "META_FOCUS_MODE_SLOPPY") +- '("mouse" "META_FOCUS_MODE_MOUSE") +- ) +-) +- +-(define-enum ActionTitlebar +- (in-module "Meta") +- (c-name "MetaActionTitlebar") +-; (gtype-id "META_TYPE_ACTION_TITLEBAR") +- (values +- '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE") +- '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE") +- '("minimize" "META_ACTION_TITLEBAR_MINIMIZE") +- '("none" "META_ACTION_TITLEBAR_NONE") +- '("lower" "META_ACTION_TITLEBAR_LOWER") +- '("menu" "META_ACTION_TITLEBAR_MENU") +- '("last" "META_ACTION_TITLEBAR_LAST") +- ) +-) +- + (define-enum FrameType + (in-module "Meta") + (c-name "MetaFrameType") diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD index 42f4a58fa..04965a823 100644 --- a/testing/iproute2/PKGBUILD +++ b/testing/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168760 2012-10-15 18:55:23Z ronald $ +# $Id: PKGBUILD 168945 2012-10-16 17:02:14Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 pkgver=3.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') @@ -12,6 +12,7 @@ url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" depends=('glibc' 'db' 'iptables') makedepends=('linux-atm') optdepends=('linux-atm: ATM support') +groups=('base') provides=('iproute') conflicts=('iproute') replaces=('iproute') diff --git a/testing/kdebindings-python/PKGBUILD b/testing/kdebindings-python/PKGBUILD index 7767091d2..a14201e78 100644 --- a/testing/kdebindings-python/PKGBUILD +++ b/testing/kdebindings-python/PKGBUILD @@ -1,31 +1,36 @@ -# $Id: PKGBUILD 167573 2012-10-02 19:03:28Z andrea $ +# $Id: PKGBUILD 168840 2012-10-16 11:53:48Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') pkgver=4.9.2 -pkgrel=1 +pkgrel=2 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'pyqt' 'qscintilla' 'python2-sip' 'python-sip') -source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11') +source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz" + 'pyqt495.patch') +sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11' + '0935c32e55806873f2d088613594559285da7e9c') build() { export PYTHONDONTWRITEBYTECODE="TRUE" - cd "${srcdir}" + cd pykde4-${pkgver} + patch -p1 -i "${srcdir}"/pyqt495.patch + cd ../ + mkdir build cd build cmake ../pykde4-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python \ - -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0 + -DPYTHON_EXECUTABLE=/usr/bin/python3 \ + -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0 make cd .. diff --git a/testing/kdebindings-python/pyqt495.patch b/testing/kdebindings-python/pyqt495.patch new file mode 100644 index 000000000..b8a9df258 --- /dev/null +++ b/testing/kdebindings-python/pyqt495.patch @@ -0,0 +1,95 @@ +From: Luca Beltrame <lbeltrame@kde.org> +Date: Mon, 01 Oct 2012 18:47:56 +0000 +Subject: Remove duplicated QVector<int> definition, since it's in PyQt now. +X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&a=commitdiff&h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6 +--- +Remove duplicated QVector<int> definition, since it's in PyQt now. +Simon, if you have time, please review if everything is OK. + +CCMAIL: simon@simonzone.com +--- + + +--- a/sip/kdecore/typedefs.sip ++++ b/sip/kdecore/typedefs.sip +@@ -951,78 +951,4 @@ + %End + }; + +-%MappedType QVector<int> +-{ +-%TypeHeaderCode +-#include <qvector.h> +-%End +- +-%ConvertFromTypeCode +- // Create the list. +- PyObject *l; +- +- if ((l = PyList_New(sipCpp->size())) == NULL) +- return NULL; +- +- // Set the list elements. +- for (int i = 0; i < sipCpp->size(); ++i) +- { +- int t = (sipCpp->at(i)); +- +-#if PY_MAJOR_VERSION >= 3 +- PyObject *tobj = PyLong_FromLong(t); +-#else +- PyObject *tobj = PyInt_FromLong(t); +-#endif +- +- PyList_SET_ITEM(l, i, tobj); +- } +- +- return l; +-%End +- +-%ConvertToTypeCode +- // Check the type if that is all that is required. +- if (sipIsErr == NULL) +- { +- if (!PyList_Check(sipPy)) +- return 0; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { +- PyObject *tobj = PyList_GET_ITEM(sipPy, i); +-#if PY_MAJOR_VERSION >= 3 +- if (!PyNumber_Check(tobj)) +-#else +- if (!PyInt_Check(tobj)) +-#endif +- return 0; +- } +- return 1; +- } +- +- QVector<int> *qv = new QVector<int>; +- +- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) +- { +- PyObject *tobj = PyList_GET_ITEM(sipPy, i); +- #if PY_MAJOR_VERSION >= 3 +- int t = PyLong_AsLong (tobj); +-#else +- int t = PyInt_AS_LONG (tobj); +-#endif +- +- if (*sipIsErr) +- { +- delete qv; +- return 0; +- } +- +- qv->append(t); +- } +- +- *sipCppPtr = qv; +- +- return sipGetState(sipTransferObj); +-%End +-}; +- ++ + diff --git a/testing/konversation/PKGBUILD b/testing/konversation/PKGBUILD new file mode 100644 index 000000000..6bd3741cd --- /dev/null +++ b/testing/konversation/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 168841 2012-10-16 11:53:50Z allan $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: James Rayner <iphitus@gmail.com> +# Contributor: Sergio Jovani Guzman <moret@paretux.org> + +pkgname=konversation +pkgver=1.4 +pkgrel=3 +pkgdesc="A user friendly IRC client for KDE" +arch=('i686' 'x86_64') +url="http://konversation.kde.org" +depends=('kdebase-runtime' 'kdepimlibs') +makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml') +optdepends=('python: python scripting support') +license=('GPL2' 'FDL') +install=${pkgname}.install +options=('!makeflags') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + 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 + done +} diff --git a/testing/konversation/konversation.install b/testing/konversation/konversation.install new file mode 100644 index 000000000..8834e059a --- /dev/null +++ b/testing/konversation/konversation.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/miro/PKGBUILD b/testing/miro/PKGBUILD index 7302846be..10503857b 100644 --- a/testing/miro/PKGBUILD +++ b/testing/miro/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 163062 2012-07-06 15:21:48Z ibiru $ +# $Id: PKGBUILD 168842 2012-10-16 11:53:52Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro -pkgver=5.0.1 +pkgver=5.0.4 pkgrel=2 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64') 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 source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" 'ffmpeg.patch') -sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa' +sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' 'ce0f42be2a0a3ac99f07b5abfabf0975928c841c') build() { @@ -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/testing/pyalpm/PKGBUILD b/testing/pyalpm/PKGBUILD new file mode 100644 index 000000000..c9d420471 --- /dev/null +++ b/testing/pyalpm/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer : Rémy Oudompheng <remy@archlinux.org> + +pkgname=pyalpm +pkgver=0.5.3 +pkgrel=2 +pkgdesc="Libalpm bindings for Python 3" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/users/remy/pyalpm.git/" +license=('GPL') +depends=('python>=3.2' 'pacman>=4') +source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") +md5sums=('a76019106d17de3a5933c773013a63d1') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + python setup.py build +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + python setup.py install --root=${pkgdir} +} + diff --git a/testing/pycrypto/PKGBUILD b/testing/pycrypto/PKGBUILD new file mode 100644 index 000000000..8199704f1 --- /dev/null +++ b/testing/pycrypto/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 168845 2012-10-16 11:53:59Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Kritoke <kritoke@gamebox.net> + +pkgbase=pycrypto +pkgname=('python2-crypto' 'python-crypto') +pkgver=2.6 +pkgrel=3 +arch=('i686' 'x86_64') +makedepends=('python2' 'python') +url="http://www.dlitz.net/software/pycrypto/" +license=('custom') +source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz") +sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8') + +build() { + cd "${srcdir}" + find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \; + find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \; + + cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3 + cd "${srcdir}/${pkgbase}-${pkgver}" + python2 setup.py build + + cd "${srcdir}/${pkgbase}-${pkgver}-py3" + python setup.py build +} + +package_python2-crypto() { + pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 2." + depends=('python2') + replaces=('pycrypto') + conflicts=('pycrypto') + provides=("pycrypto=${pkgver}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + python2 setup.py install --root="${pkgdir}" --optimize=1 + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/" + cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/" +} + +package_python-crypto() { + pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3." + depends=('python') + + cd "${srcdir}/${pkgbase}-${pkgver}-py3" + python setup.py install --root="${pkgdir}" --optimize=1 + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/" + cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/pygobject/PKGBUILD b/testing/pygobject/PKGBUILD new file mode 100644 index 000000000..ba46a1a38 --- /dev/null +++ b/testing/pygobject/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 168846 2012-10-16 11:54:03Z allan $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgbase=pygobject +pkgname=(python-gobject python2-gobject pygobject-devel) +pkgver=3.2.2 +pkgrel=2 +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) +options=('!libtool') +sha256sums=('4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0') + +build() { + cp -a "$pkgbase-$pkgver" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr + make + ) + + ( + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr + make + ) +} + +package_python-gobject() { + pkgdesc="Python 3 bindings for GObject" + depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") + + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/{include,lib/pkgconfig} +} + +package_python2-gobject() { + pkgdesc="Python 2 bindings for GObject" + depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") + + cd "python2-build" + make DESTDIR="$pkgdir" install + mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" +} + +package_pygobject-devel() { + pkgdesc="Development files for the pygobject bindings" + cd "devel" + mkdir -p "$pkgdir"/usr/{include,lib} + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" +} diff --git a/testing/pygobject2/PKGBUILD b/testing/pygobject2/PKGBUILD new file mode 100644 index 000000000..2aaa967e3 --- /dev/null +++ b/testing/pygobject2/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 168847 2012-10-16 11:54:08Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=pygobject2 +pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) +pkgver=2.28.6 +pkgrel=7 +arch=('i686' 'x86_64') +url="http://www.pygtk.org/" +license=('LGPL') +makedepends=('python' 'python2') +source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz + python2-fix-type.patch + python3-fix-build.patch + python3-fix-maketrans.patch) +options=('!libtool') +sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' + 'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea' + 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' + '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') + +build() { + cd "${srcdir}" + cp -a "pygobject-${pkgver}" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --disable-introspection + make + ) + + ( + cd "pygobject-${pkgver}" + #patches available in 2.28 branch but unreleased. + patch -Np1 -i "${srcdir}/python2-fix-type.patch" + patch -Np1 -i "${srcdir}/python3-fix-build.patch" + patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" + + ./configure --prefix=/usr --disable-introspection + make + ) +} + +package_python-gobject2() { + pkgdesc="Python 3 bindings for GObject2" + depends=('glib2' 'pygobject2-devel' 'python') + replaces=('py3gobject') + provides=("py3gobject=$pkgver") + + cd "${srcdir}/pygobject-${pkgver}" + make DESTDIR="${pkgdir}" install + + # Delete devel stuff + rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} +} + +package_python2-gobject2() { + pkgdesc="Python 2 bindings for GObject2" + depends=('glib2' 'pygobject2-devel' 'python2') + replaces=('pygobject') + provides=("pygobject=$pkgver") + + cd "${srcdir}/python2-build" + make DESTDIR="${pkgdir}" install + + find "$pkgdir"/usr/share/pygobject -name '*.py' | \ + xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + + # Split devel stuff + mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \ + "$srcdir/devel/" +} + +package_pygobject2-devel() { + pkgdesc="Development files for the pygobject bindings" + + cd "${srcdir}/devel" + mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject} + + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" + mv gtk-doc "$pkgdir/usr/share/" + mv xsl "$pkgdir/usr/share/pygobject/" +} diff --git a/testing/pygobject2/python2-fix-type.patch b/testing/pygobject2/python2-fix-type.patch new file mode 100644 index 000000000..78e7ddfd5 --- /dev/null +++ b/testing/pygobject2/python2-fix-type.patch @@ -0,0 +1,50 @@ +From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <desrt@desrt.ca> +Date: Mon, 12 Mar 2012 16:44:14 -0400 +Subject: gio-types.defs: change some enums to flags + +These flags types were originally incorrectly handled in glib as being +enums. That bug was fixed, but they're still enums here, leading to +warnings about the mismatch. + +Change them to flags. + +https://bugzilla.gnome.org/show_bug.cgi?id=668522 +--- + gio/gio-types.defs | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gio/gio-types.defs b/gio/gio-types.defs +index 331e0bc..7eee5c8 100644 +--- a/gio/gio-types.defs ++++ b/gio/gio-types.defs +@@ -526,7 +526,7 @@ + ) + ) + +-(define-enum MountMountFlags ++(define-flags MountMountFlags + (in-module "gio") + (c-name "GMountMountFlags") + (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") +@@ -545,7 +545,7 @@ + ) + ) + +-(define-enum DriveStartFlags ++(define-flags DriveStartFlags + (in-module "gio") + (c-name "GDriveStartFlags") + (gtype-id "G_TYPE_DRIVE_START_FLAGS") +@@ -770,7 +770,7 @@ + ) + ) + +-(define-enum SocketMsgFlags ++(define-flags SocketMsgFlags + (in-module "gio") + (c-name "GSocketMsgFlags") + (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") +-- +1.7.9.1 + diff --git a/testing/pygobject2/python3-fix-build.patch b/testing/pygobject2/python3-fix-build.patch new file mode 100644 index 000000000..4cb8cfe57 --- /dev/null +++ b/testing/pygobject2/python3-fix-build.patch @@ -0,0 +1,34 @@ +From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 +From: Ignacio Casal Quinteiro <icq@gnome.org> +Date: Thu, 21 Apr 2011 14:52:20 +0000 +Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore + +--- +diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c +index 81b9865..edf52d7 100644 +--- a/gi/pygi-foreign-cairo.c ++++ b/gi/pygi-foreign-cairo.c +@@ -30,7 +30,7 @@ + #include <pycairo/py3cairo.h> + #endif + +-Pycairo_CAPI_t *Pycairo_CAPI; ++static Pycairo_CAPI_t *Pycairo_CAPI; + + #include "pygi-foreign.h" + +@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, + static PyMethodDef _gi_cairo_functions[] = {0,}; + PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") + { ++#if PY_VERSION_HEX < 0x03000000 + Pycairo_IMPORT; ++#else ++ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); ++#endif ++ + if (Pycairo_CAPI == NULL) + return PYGLIB_MODULE_ERROR_RETURN; + +-- +cgit v0.9 diff --git a/testing/pygobject2/python3-fix-maketrans.patch b/testing/pygobject2/python3-fix-maketrans.patch new file mode 100644 index 000000000..f5bc0e77c --- /dev/null +++ b/testing/pygobject2/python3-fix-maketrans.patch @@ -0,0 +1,36 @@ +From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Wed, 13 Jul 2011 06:42:22 +0000 +Subject: [python3] Fix maketrans import + +Python3 moved the maketrans() function from the string module to a str method. +This unbreaks gi/module.py for Python 3 again. +--- +diff --git a/gi/module.py b/gi/module.py +index 70df76c..d56bdaf 100644 +--- a/gi/module.py ++++ b/gi/module.py +@@ -24,7 +24,11 @@ from __future__ import absolute_import + + import os + import gobject +-import string ++try: ++ maketrans = ''.maketrans ++except AttributeError: ++ # fallback for Python 2 ++ from string import maketrans + + import gi + from .overrides import registry +@@ -124,7 +128,7 @@ class IntrospectionModule(object): + # Don't use upper() here to avoid locale specific + # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') + # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 +- ascii_upper_trans = string.maketrans( ++ ascii_upper_trans = maketrans( + 'abcdefgjhijklmnopqrstuvwxyz', + 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') + for value_info in info.get_values(): +-- +cgit v0.9 diff --git a/testing/pyopenssl/PKGBUILD b/testing/pyopenssl/PKGBUILD new file mode 100644 index 000000000..e953a7690 --- /dev/null +++ b/testing/pyopenssl/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 168849 2012-10-16 11:54:13Z allan $ +# Maintainer : Ionut Biru<ibiru@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgbase=pyopenssl +pkgname=('python-pyopenssl' 'python2-pyopenssl') +pkgver=0.13 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/pyOpenSSL" +license=('LGPL2.1') +makedepends=('python' 'python2' 'openssl') +source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz) +md5sums=('767bca18a71178ca353dff9e10941929') + +build() { + cd "${srcdir}" + cp -a "pyOpenSSL-${pkgver}"{,-python2} + + #build python 3 module + cd "pyOpenSSL-${pkgver}" + python setup.py build + + #build python 2 module + cd ../"pyOpenSSL-${pkgver}-python2" + python2 setup.py build +} + +package_python-pyopenssl(){ + pkgdesc="Python3 wrapper module around the OpenSSL library" + depends=('python>=3.3' 'openssl') + replaces=('pyopenssl') + provides=('pyopenssl') + conflicts=('pyopenssl') + + cd "${srcdir}/pyOpenSSL-${pkgver}" + python setup.py install --root "${pkgdir}" --optimize=1 +} + +package_python2-pyopenssl(){ + pkgdesc="Python2 wrapper module around the OpenSSL library" + depends=('python2>=2.7' 'openssl') + + cd "${srcdir}/pyOpenSSL-${pkgver}-python2" + python2 setup.py install --root "${pkgdir}" --optimize=1 +} diff --git a/testing/pyqt/PKGBUILD b/testing/pyqt/PKGBUILD index 4383cd418..070912482 100644 --- a/testing/pyqt/PKGBUILD +++ b/testing/pyqt/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 162690 2012-06-28 07:30:01Z andrea $ +# $Id: PKGBUILD 168850 2012-10-16 11:54: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=pyqt pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') -pkgver=4.9.4 -pkgrel=1 +pkgver=4.9.5 +pkgrel=2 arch=('i686' 'x86_64') 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") -md5sums=('a0b6a820633366365af5124ddbd059c7') + 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') +source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('e4cdd6619c63655f7510efb4df8462fb') build() { - cd "${srcdir}" 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 @@ -30,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 \ @@ -45,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 } @@ -60,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 } @@ -74,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/testing/python-cairo/PKGBUILD b/testing/python-cairo/PKGBUILD new file mode 100644 index 000000000..7efdd37a4 --- /dev/null +++ b/testing/python-cairo/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 168854 2012-10-16 11:54:24Z allan $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=python-cairo +pkgver=1.10.0 +pkgrel=2 +pkgdesc="Python bindings for the cairo graphics library" +arch=('i686' 'x86_64') +license=('LGPL3') +depends=('python' 'cairo') +makedepends=('pkg-config') +options=('!libtool') +source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2) +url="http://www.cairographics.org/pycairo" +md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5') + +build() { + cd "${srcdir}/pycairo-${pkgver}" + + # 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 + python3 ./waf --version + + ./waf configure --prefix=/usr + ./waf build +} + +package() { + cd "${srcdir}/pycairo-${pkgver}" + ./waf install --destdir="${pkgdir}" +} diff --git a/testing/python-egenix-mx-base/PKGBUILD b/testing/python-egenix-mx-base/PKGBUILD new file mode 100644 index 000000000..c2e1b4fa9 --- /dev/null +++ b/testing/python-egenix-mx-base/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 168902 2012-10-16 14:06:20Z allan $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgbase=python-egenix-mx-base +pkgname=('python2-egenix-mx-base') +_origname=egenix-mx-base +pkgver=3.2.4 +pkgrel=3 +pkgdesc="A collection of Python tools" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.egenix.com/products/python/mxBase/" +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|^#!.*python|#!/usr/bin/python2|" {} \; + + python2 setup.py build +} + +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/testing/python-iwscan/PKGBUILD b/testing/python-iwscan/PKGBUILD new file mode 100644 index 000000000..a32038290 --- /dev/null +++ b/testing/python-iwscan/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 168860 2012-10-16 11:54:37Z allan $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> + +pkgbase=python-iwscan +pkgname=python2-iwscan +pkgver=20090609 +pkgrel=4 +pkgdesc="A Python interface to iwlist, using the iwlib library" +arch=('i686' 'x86_64') +url="http://projects.otaku42.de/browser/python-iwscan" +license=('LGPL') +depends=('python2' 'wireless_tools') +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}/${pkgbase}" + python2 setup.py build +} + +package_python2-iwscan() { + cd "${srcdir}/${pkgbase}" + python2 setup.py install --root="${pkgdir}" +} diff --git a/testing/python-lxml/PKGBUILD b/testing/python-lxml/PKGBUILD new file mode 100644 index 000000000..8980d9da3 --- /dev/null +++ b/testing/python-lxml/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 168863 2012-10-16 11:54:46Z allan $ +# Maintainer: + +pkgname=('python-lxml' 'python2-lxml') +pkgver=3.0 +pkgrel=1 +pkgdesc="Python binding for the libxml2 and libxslt libraries" +arch=('i686' 'x86_64') +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=('8dbbd03a637bb563113cf07049a4d5a109369441' + 'b38447fd3f9cfb30b4d56ffe3bec42739afb2947') + +check() { + cd "${srcdir}"/lxml-$pkgver + make PYTHON=python2 test + make PYTHON=python test +} + +package_python2-lxml() { + depends=('python2' 'libxslt') + optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML') + + cd "${srcdir}"/lxml-$pkgver + python2 setup.py install --root="${pkgdir}" --optimize=1 + + install -Dm644 LICENSES.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE + install -Dm644 doc/licenses/BSD.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt + install -Dm644 doc/licenses/elementtree.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt +} + +package_python-lxml() { + depends=('python' 'libxslt') + + cd "${srcdir}"/lxml-$pkgver + python setup.py install --root="${pkgdir}" --optimize=1 + + install -Dm644 LICENSES.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE + install -Dm644 doc/licenses/BSD.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt + install -Dm644 doc/licenses/elementtree.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt +} diff --git a/testing/python-markupsafe/PKGBUILD b/testing/python-markupsafe/PKGBUILD new file mode 100644 index 000000000..8de9c9363 --- /dev/null +++ b/testing/python-markupsafe/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 168865 2012-10-16 11:54:52Z allan $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Alex Anthony <alex.anthony28991@gmail.com> + +pkgname=('python-markupsafe' 'python2-markupsafe') +pkgver=0.15 +pkgrel=2 +pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python" +arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/MarkupSafe" +license=('custom') +makedepends=('python-distribute' 'python2-distribute') +source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz") +md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186') + +build() { + cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver} + cd "${srcdir}/MarkupSafe-${pkgver}" + python setup.py build + + 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 + + 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 + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE" +} diff --git a/testing/python-notify/PKGBUILD b/testing/python-notify/PKGBUILD new file mode 100644 index 000000000..674fb34c1 --- /dev/null +++ b/testing/python-notify/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 168868 2012-10-16 11:55:02Z allan $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> + +pkgbase=python-notify +pkgname=python2-notify +pkgver=0.1.1 +pkgrel=12 +pkgdesc="Python bindings for libnotify" +arch=('i686' 'x86_64') +url="http://www.galago-project.org/" +license=('GPL') +depends=('pygtk>=2.22.0' 'libnotify>=0.7.1') +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 + notify-python-0.1.1-fix-GTK-symbols.patch) +md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4' + 'b40c4542575d5aef559908fe60a21634' + 'c6922028da5951e69a6a0167bdb4461c') + +build() { + cd "${srcdir}/notify-python-${pkgver}" + + patch -Np1 -i "${srcdir}/libnotify07.patch" + patch -Np1 -i "${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch" + + ./configure --prefix=/usr + + # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c + # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed + touch src/pynotify.override + + make clean + make +} + +package_python2-notify() { + cd "${srcdir}/notify-python-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/python-notify/libnotify07.patch b/testing/python-notify/libnotify07.patch new file mode 100644 index 000000000..289573d50 --- /dev/null +++ b/testing/python-notify/libnotify07.patch @@ -0,0 +1,36 @@ +diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs +--- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400 ++++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400 +@@ -38,7 +38,6 @@ + '("const-gchar*" "summary") + '("const-gchar*" "message" (null-ok) (default "NULL")) + '("const-gchar*" "icon" (null-ok) (default "NULL")) +- '("GtkWidget*" "attach" (null-ok) (default "NULL")) + ) + ) + +@@ -53,24 +52,6 @@ + ) + ) + +-(define-method attach_to_widget +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_widget") +- (return-type "none") +- (parameters +- '("GtkWidget*" "attach") +- ) +-) +- +-(define-method attach_to_status_icon +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_status_icon") +- (return-type "none") +- (parameters +- '("GtkStatusIcon*" "attach") +- ) +-) +- + (define-method show + (of-object "NotifyNotification") + (c-name "notify_notification_show") diff --git a/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch new file mode 100644 index 000000000..f985c0136 --- /dev/null +++ b/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch @@ -0,0 +1,25 @@ +diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py +--- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005 -0400 ++++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300 -0400 +@@ -1 +1,21 @@ ++""" ++Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea ++was to support being linked against different parallel-installable ++GTK stacks. ++ ++Unfortunately, python needs to jump through some special hoops in order ++to share symbols with extension modules, specifically, pygtk, which does ++link against GTK2. ++ ++Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL), ++the result is: ++libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name' ++ ++Thanks to David Malcolm for figuring out the workaround. ++""" ++import ctypes ++import sys ++sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) ++import gtk ++ + from _pynotify import * diff --git a/testing/python-numpy/PKGBUILD b/testing/python-numpy/PKGBUILD new file mode 100755 index 000000000..e295dec87 --- /dev/null +++ b/testing/python-numpy/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 168869 2012-10-16 11:55:07Z 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.7.0 +_pkgver=1.7.0b2 +pkgrel=1 +pkgdesc="Scientific tools for Python" +arch=('i686' 'x86_64') +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=('1b62cf0e34e2db58b0241b00d603df24') + +build() { + cd "${srcdir}" + cp -a numpy-${_pkgver} numpy-py2-${_pkgver} + + export Atlas=None + export LDFLAGS="$LDFLAGS -shared" + + echo "Building Python2" + cd "${srcdir}/numpy-py2-${_pkgver}" + python2 setup.py config_fc --fcompiler=gnu95 build + + echo "Building Python3" + cd "${srcdir}/numpy-${_pkgver}" + python setup.py config_fc --fcompiler=gnu95 build +} + +package_python2-numpy() { + depends=('lapack' 'python2') + optdepends=('python-nose: testsuite') + + 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" + install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/" + + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ + $(find ${pkgdir} -name '*.py') +} + +package_python-numpy() { + depends=('lapack' 'python') + provides=("python3-numpy=${pkgver}") + replaces=('python3-numpy') + conflicts=('python3-numpy') + + 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" + install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/" +} diff --git a/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch new file mode 100644 index 000000000..072afbc0e --- /dev/null +++ b/testing/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/testing/python-pyspi/PKGBUILD b/testing/python-pyspi/PKGBUILD new file mode 100644 index 000000000..0fb75b940 --- /dev/null +++ b/testing/python-pyspi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 168874 2012-10-16 11:55:20Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgbase=python-pyspi +pkgname=python2-pyspi +pkgver=0.6.1 +pkgrel=1 +pkgdesc="Python AT-SPI bindings" +arch=('i686' 'x86_64') +url="http://people.redhat.com/zcerza/dogtail" +license=('LGPL') +depends=('python2' 'at-spi') +makedepends=('pyrex') +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' + '721f74cbae653a258c00b83acf7dd1da') + +build() { + cd ${srcdir}/pyspi-${pkgver} + 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/testing/python-pyspi/pyspi-build.patch b/testing/python-pyspi/pyspi-build.patch new file mode 100644 index 000000000..3d12c5ed5 --- /dev/null +++ b/testing/python-pyspi/pyspi-build.patch @@ -0,0 +1,1693 @@ +diff -Naur pyspi-0.6.1-old/cspi.pxd pyspi-0.6.1/cspi.pxd +--- pyspi-0.6.1-old/cspi.pxd 2006-08-04 06:27:10.000000000 +1000 ++++ pyspi-0.6.1/cspi.pxd 2009-05-09 15:24:31.000000000 +1000 +@@ -14,9 +14,7 @@ + + ctypedef struct AccessibleTextRange + ctypedef struct AccessibleKeySet +- ctypedef enum SPIBoolean: +- FALSE = 0, +- TRUE ++ ctypedef unsigned int SPIBoolean + + ctypedef struct AccessibleEvent: + char *type +diff -Naur pyspi-0.6.1-old/pyspi.pyx pyspi-0.6.1/pyspi.pyx +--- pyspi-0.6.1-old/pyspi.pyx 2006-10-03 02:46:41.000000000 +1000 ++++ pyspi-0.6.1/pyspi.pyx 2009-05-09 15:24:31.000000000 +1000 +@@ -25,9 +25,15 @@ + cdef class Event (EventBase) + cdef class DeviceEvent + +-ctypedef enum bool: ++ctypedef unsigned int bool ++ ++import __builtin__ ++try: ++ False = __builtin__.False ++ True = __builtin__.True ++except AttributeError: + False = 0 +- True ++ True = 1 + + # SPIExceptionCode values: + (SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) +@@ -731,7 +737,7 @@ + Wrapper around the low-level cspi.AccessibleComponent_ functions, + giving an OO-style API. + """ +- def getExtents (self, type=0): ++ def getExtents (self, key_type=0): + """ + Wraps cspi.AccessibleComponent_getExtents, returning an + (x,y,w,h) tuple. +@@ -741,7 +747,7 @@ + cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type) + return (x, y, w, h) + +- def getPosition (self, type = 0): ++ def getPosition (self, key_type = 0): + """ + Wraps cspi.AccessibleComponent_getPosition, returning an + (x,y) tuple. +@@ -991,11 +997,11 @@ + Wraps cspi.AccessibleHyperlink_getObject + """ + self.__checkSelf () +- cdef Accessible object +- object = Accessible () +- object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) +- object.__checkSelf () +- return object ++ cdef Accessible obj ++ obj = Accessible () ++ obj.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) ++ obj.__checkSelf () ++ return obj + + def getURI (self, i): + """ +@@ -1032,7 +1038,7 @@ + cspi.AccessibleImage_getImageSize(self.__item, &w, &h); + return [w, h] + +- def getImagePosition (self, type=0): ++ def getImagePosition (self, key_type=0): + """ + Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y) + pair +@@ -1042,7 +1048,7 @@ + cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type) + return [x, y] + +- def getImageExtents (self, type=0): ++ def getImageExtents (self, key_type=0): + """ + Wraps cspi.AccessibleImage_getImageExtents, returning a + (x,y,w,h) tuple +@@ -1551,7 +1557,7 @@ + cdef cspi.AccessibleDeviceListener *__item + cdef public object modMasks + +- def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED): ++ def __init__ (self, callback, eventMask = <int> cspi.SPI_KEY_PRESSED | <int> cspi.SPI_KEY_RELEASED): + """ + Registers a python callback function to be called. + +diff -Naur pyspi-0.6.1-old/pyspi.pyx.orig pyspi-0.6.1/pyspi.pyx.orig +--- pyspi-0.6.1-old/pyspi.pyx.orig 1970-01-01 10:00:00.000000000 +1000 ++++ pyspi-0.6.1/pyspi.pyx.orig 2006-10-03 02:46:41.000000000 +1000 +@@ -0,0 +1,1592 @@ ++# Authors: ++# Zack Cerza <zcerza@redhat.com> ++# Chris Lee <clee@redhat.com> ++# Lawrence Lim <llim@redhat.com> ++# David Malcolm <dmalcolm@redhat.com> ++ ++cdef class Registry ++ ++cdef class Base ++cdef class EventBase ++cdef class StateSet ++cdef class Accessible (Base) ++cdef class Desktop (Accessible) ++cdef class Application (Accessible) ++cdef class Component (Accessible) ++cdef class Action (Base) ++cdef class Text (Base) ++cdef class EditableText (Text) ++cdef class Hypertext (Text) ++cdef class Hyperlink (Base) ++cdef class Image (Base) ++cdef class Value (Base) ++cdef class Selection (Base) ++cdef class Table (Base) ++cdef class Event (EventBase) ++cdef class DeviceEvent ++ ++ctypedef enum bool: ++ False = 0 ++ True ++ ++# SPIExceptionCode values: ++(SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) ++ ++# SPIExceptionType values: ++(SPI_EXCEPTION_SOURCE_UNSPECIFIED, SPI_EXCEPTION_SOURCE_ACCESSIBLE, SPI_EXCEPTION_SOURCE_REGISTRY, SPI_EXCEPTION_SOURCE_DEVICE)=range(4) ++ ++# Accessible roles ++(SPI_ROLE_INVALID, SPI_ROLE_ACCEL_LABEL, SPI_ROLE_ALERT, SPI_ROLE_ANIMATION, SPI_ROLE_ARROW, SPI_ROLE_CALENDAR, SPI_ROLE_CANVAS, SPI_ROLE_CHECK_BOX, SPI_ROLE_CHECK_MENU_ITEM, SPI_ROLE_COLOR_CHOOSER, SPI_ROLE_COLUMN_HEADER, SPI_ROLE_COMBO_BOX, SPI_ROLE_DATE_EDITOR, SPI_ROLE_DESKTOP_ICON, SPI_ROLE_DESKTOP_FRAME, SPI_ROLE_DIAL, SPI_ROLE_DIALOG, SPI_ROLE_DIRECTORY_PANE, SPI_ROLE_DRAWING_AREA, SPI_ROLE_FILE_CHOOSER, SPI_ROLE_FILLER, SPI_ROLE_FONT_CHOOSER, SPI_ROLE_FRAME, SPI_ROLE_GLASS_PANE, SPI_ROLE_HTML_CONTAINER, SPI_ROLE_ICON, SPI_ROLE_IMAGE, SPI_ROLE_INTERNAL_FRAME, SPI_ROLE_LABEL, SPI_ROLE_LAYERED_PANE, SPI_ROLE_LIST, SPI_ROLE_LIST_ITEM, SPI_ROLE_MENU, SPI_ROLE_MENU_BAR, SPI_ROLE_MENU_ITEM, SPI_ROLE_OPTION_PANE, SPI_ROLE_PAGE_TAB, SPI_ROLE_PAGE_TAB_LIST, SPI_ROLE_PANEL, SPI_ROLE_PASSWORD_TEXT, SPI_ROLE_POPUP_MENU, SPI_ROLE_PROGRESS_BAR, SPI_ROLE_PUSH_BUTTON, SPI_ROLE_RADIO_BUTTON, SPI_ROLE_RADIO_MENU_ITEM, SPI_ROLE_ROOT_PANE, SPI_ROLE_ROW_HEADER, SPI_ROLE_SCROLL_BAR, SPI_ROLE_SCROLL_PANE, SPI_ROLE_SEPARATOR, SPI_ROLE_SLIDER, SPI_ROLE_SPIN_BUTTON, SPI_ROLE_SPLIT_PANE, SPI_ROLE_STATUS_BAR, SPI_ROLE_TABLE, SPI_ROLE_TABLE_CELL, SPI_ROLE_TABLE_COLUMN_HEADER, SPI_ROLE_TABLE_ROW_HEADER, SPI_ROLE_TEAROFF_MENU_ITEM, SPI_ROLE_TERMINAL, SPI_ROLE_TEXT, SPI_ROLE_TOGGLE_BUTTON, SPI_ROLE_TOOL_BAR, SPI_ROLE_TOOL_TIP, SPI_ROLE_TREE, SPI_ROLE_TREE_TABLE, SPI_ROLE_UNKNOWN, SPI_ROLE_VIEWPORT, SPI_ROLE_WINDOW, SPI_ROLE_EXTENDED, SPI_ROLE_HEADER, SPI_ROLE_FOOTER, SPI_ROLE_PARAGRAPH, SPI_ROLE_RULER, SPI_ROLE_APPLICATION, SPI_ROLE_AUTOCOMPLETE, SPI_ROLE_EDITBAR, SPI_ROLE_EMBEDDED, SPI_ROLE_LAST_DEFINED)=range(79) ++ ++# Accessible states ++(SPI_STATE_INVALID, SPI_STATE_ACTIVE, SPI_STATE_ARMED, SPI_STATE_BUSY, SPI_STATE_CHECKED, SPI_STATE_COLLAPSED, SPI_STATE_DEFUNCT, SPI_STATE_EDITABLE, SPI_STATE_ENABLED, SPI_STATE_EXPANDABLE, SPI_STATE_EXPANDED, SPI_STATE_FOCUSABLE, SPI_STATE_FOCUSED, SPI_STATE_HORIZONTAL, SPI_STATE_ICONIFIED, SPI_STATE_MODAL, SPI_STATE_MULTI_LINE, SPI_STATE_MULTISELECTABLE, SPI_STATE_OPAQUE, SPI_STATE_PRESSED, SPI_STATE_RESIZABLE, SPI_STATE_SELECTABLE, SPI_STATE_SELECTED, SPI_STATE_SENSITIVE, SPI_STATE_SHOWING, SPI_STATE_SINGLE_LINE, SPI_STATE_STALE, SPI_STATE_TRANSIENT, SPI_STATE_VERTICAL, SPI_STATE_VISIBLE, SPI_STATE_MANAGES_DESCENDANTS, SPI_STATE_INDETERMINATE) = range(32); ++ ++# Accessible relation types ++(SPI_RELATION_NULL, SPI_RELATION_LABEL_FOR, SPI_RELATION_LABELED_BY, SPI_RELATION_CONTROLLER_FOR, SPI_RELATION_CONTROLLED_BY, SPI_RELATION_MEMBER_OF, SPI_RELATION_NODE_CHILD_OF, SPI_RELATION_EXTENDED, SPI_RELATION_FLOWS_TO, SPI_RELATION_FLOWS_FROM, SPI_RELATION_SUBWINDOW_OF, SPI_RELATION_EMBEDS, SPI_RELATION_EMBEDDED_BY, SPI_RELATION_POPUP_FOR, SPI_RELATION_LAST_DEFINED) = range (15); ++ ++# AccessibleComponent layers ++(SPI_LAYER_INVALID, SPI_LAYER_BACKGROUND, SPI_LAYER_CANVAS, SPI_LAYER_WIDGET, SPI_LAYER_MDI, SPI_LAYER_POPUP, SPI_LAYER_OVERLAY, SPI_LAYER_WINDOW, SPI_LAYER_LAST_DEFINED) = range(9) ++ ++#AccessibleKeySynthType ++(SPI_KEY_PRESS, SPI_KEY_RELEASE, SPI_KEY_PRESSRELEASE, SPI_KEY_SYM, SPI_KEY_STRING) = range(5) ++ ++# AccessibleKeyListenerSyncType ++(SPI_KEYLISTENER_NOSYNC, SPI_KEYLISTENER_SYNCHRONOUS, SPI_KEYLISTENER_CANCONSUME, SPI_KEYLISTENER_ALL_WINDOWS) = range(4) ++ ++# AccessibleDeviceEventType ++SPI_KEY_PRESSED = 1<<0 ++SPI_KEY_RELEASED = 1<<1 ++SPI_BUTTON_PRESSED = 1<<2 ++SPI_BUTTON_RELEASED = 1<<3 ++ ++cdef cspi.AccessibleKeySet *SPI_KEYSET_ALL_KEYS ++SPI_KEYSET_ALL_KEYS = NULL ++ ++Accessibility_MODIFIER_SHIFT = 1 << 0 ++Accessibility_MODIFIER_SHIFTLOCK = 1 << 1 ++Accessibility_MODIFIER_CONTROL = 1 << 2 ++Accessibility_MODIFIER_ALT = 1 << 3 ++Accessibility_MODIFIER_META = 1 << 4 ++Accessibility_MODIFIER_META2 = 1 << 5 ++Accessibility_MODIFIER_META3 = 1 << 6 ++Accessibility_MODIFIER_NUMLOCK = 1 << 7 ++ ++ ++cdef object string(char * string): ++ cdef object pyString ++ pyString = string ++ cspi.SPI_freeString(string) ++ return pyString ++ ++import os ++class X11Exception(Exception): ++ def __init__(self, display = os.environ.get('DISPLAY', None)): ++ self.display = display ++ def __str__(self): ++ msg = "Cannot open display" ++ if self.display: return msg + ': ' + self.display ++ else: return msg ++ ++class AtspiException(Exception): ++ """ ++ Exceptions raised when calls to the AT-SPI C bindings return FALSE to ++ indicate failure. ++ """ ++ def __init__(self, message): ++ self.message = message ++ ++ def __str__(self): ++ return "AtspiException: %s"%self.message ++ ++class SpiException(Exception): ++ """ ++ Exceptions to be raised in response to an installed ++ SPIExceptionHandler, corresponding to a SPIException. These appear to ++ be short-lived structs, so we gather all applicable data immediately ++ """ ++ def __init__(self, is_fatal, sourceType, exceptionCode, description): ++ # print "got to __init__" ++ self.fatal = is_fatal ++ self.sourceType = sourceType ++ self.exceptionCode = exceptionCode ++ self.description = description ++ ++ # print "leaving __init__" ++ # print self.fatal ++ # print self.sourceType ++ # print self.exceptionCode ++ # print self.description ++ ++ def __str__(self): ++ if self.fatal: ++ fatalStr = "Fatal" ++ else: ++ fatalStr = "Non-fatal" ++ result = '%s SPIException: type:%s source:%s "%s"'%(fatalStr, self.sourceType, self.exceptionCode, self.description) ++ return result ++ ++cdef make_exception(cspi.SPIException *err, cspi.SPIBoolean is_fatal): ++ # Don't attempt to use SPIAccessibleException_getSource; this is error ++ # handling code, we don't want to introduce further complications ++ return SpiException(is_fatal, ++ cspi.SPIException_getSourceType (err), ++ cspi.SPIException_getExceptionCode (err), ++ cspi.SPIException_getDescription (err)) ++ ++ ++def event_main(): ++ cspi.SPI_event_main() ++ ++def event_quit(): ++ cspi.SPI_event_quit() ++ ++cdef cspi.SPIBoolean exception_handler (cspi.SPIException *err, cspi.SPIBoolean is_fatal) except *: ++ # print "got exception!!!" ++ e = make_exception(err, is_fatal) ++ raise e ++ ++# at-spi-<version>/cpsi.h contains: ++# typedef SPIBoolean (*SPIExceptionHandler) (SPIException *err, SPIBoolean is_fatal); ++# and ++# SPIBoolean SPI_exceptionHandlerPush (SPIExceptionHandler *handler); ++# There's thus an extra unnecessary level of indirection. ++# We have to jump through the following hoops to get pyrex to deal with this: ++cdef cspi.SPIExceptionHandler exception_handler_as_type ++cdef cspi.SPIExceptionHandler* exception_handler_ptr ++exception_handler_as_type = exception_handler ++exception_handler_ptr = &exception_handler_as_type ++ ++global_exception = None ++ ++cdef class Registry: ++ def __init__ (self): ++ cdef Xlib.Display *display ++ display = Xlib.XOpenDisplay(NULL) ++ if display == NULL: ++ raise X11Exception ++ else: ++ Xlib.XCloseDisplay(display) ++ ++ result = cspi.SPI_init () ++ #if result!=0: ++ # raise AtspiException("SPI_init: exit code %s" % str(result)) ++ ++ result = cspi.SPI_exceptionHandlerPush (exception_handler_ptr) ++ if not result: ++ raise AtspiException("Unable to install SPI exception handler") ++ ++ def __dealloc (self): ++ result = cspi.SPI_exit () ++ if result!=0: ++ raise AtspiException("SPI_init: exit code %s" % str(result)) ++ ++ def getDesktopCount (self): ++ return cspi.SPI_getDesktopCount() ++ ++ def getDesktop (self, index = 0): ++ cdef Desktop desktop ++ desktop = Desktop () ++ if not desktop.__setItem (cspi.SPI_getDesktop (index)): ++ return False ++ return desktop ++ ++ def getDesktopList (self): ++ # Using the bonobo.activation bindings, getDesktopList() returns a ++ # Python list of Desktop objects. The C bindings seem to do it differently, ++ # and Pyrex doesn't like that method. So we're re-implementing the function ++ # using getDesktopCount() and getDesktop() to work around that. ++ # Yay for Zack! ++ # ++ # -Zack ++ cdef Desktop desktop ++ desktops = [] ++ desktop = Desktop () ++ for i in xrange (cspi.SPI_getDesktopCount ()): ++ desktop.__setItem (cspi.SPI_getDesktop (i)) ++ desktops = desktops + [desktop] ++ return desktops ++ ++registry = Registry() ++ ++cdef class Base: ++ """ ++ Wrapper around a cspi.Accessible ++ """ ++ ++ cdef cspi.Accessible *__item ++ ++ def __new__ (self): ++ self.__item = NULL ++ ++ def __dealloc__ (self): ++ if self.__item != NULL: ++ cspi.Accessible_unref (self.__item) ++ ++ cdef bool __setItem (self, cspi.Accessible *obj): ++ if self.__item != NULL: ++ cspi.Accessible_unref (self.__item) ++ if obj != NULL: ++ self.__item = obj ++ cspi.Accessible_ref (self.__item) ++ return True ++ else: ++ return False ++ ++ def __checkSelf (self): ++ assert self.__item != NULL ++ ++# WHY OH WHY won't this work? :( ++# I need to be able to find out of two Accessible classes contain ++# the same cspi.Accessible objects. ++# ++# def isSameAs (self, base): ++# cdef bool foo ++# foo = self.__item == base.__item ++# return foo ++ ++cdef class EventBase: ++ """ ++ Wrapper around a cspi.AccessibleEvent ++ """ ++ cdef cspi.AccessibleEvent *__item ++ ++ def __new__ (self): ++ self.__item = NULL ++ ++ def __dealloc__ (self): ++ if self.__item != NULL: ++ cspi.AccessibleEvent_unref (self.__item) ++ ++ cdef bool __setItem (self, cspi.AccessibleEvent *obj): ++ if self.__item != NULL: ++ cspi.AccessibleEvent_unref (self.__item) ++ if obj != NULL: ++ self.__item = obj ++ cspi.AccessibleEvent_ref (self.__item) ++ return True ++ else: ++ return False ++ ++ def __checkSelf (self): ++ if self.__item == NULL: ++ raise AttributeError, "__item must not be NULL" ++ ++ def __getattr__ (self, attrName): ++ cdef cspi.Accessible* acc ++ cdef Accessible result ++ if attrName == "source": ++ acc = self.__item.source ++ if acc!=NULL: ++ result = Accessible () ++ result.__setItem (acc) ++ return result ++ elif attrName == "detail1": ++ detail1 = self.__item.detail1 ++ return detail1 ++ elif attrName == "detail2": ++ detail1 = self.__item.detail2 ++ return detail1 ++ elif attrName == "type": ++ return self.__item.type ++ ++cdef class StateSet: ++ """ ++ Wrapper around a cspi.AccessibleStateSet ++ """ ++ cdef cspi.AccessibleStateSet *__item ++ ++ def __new__ (self): ++ self.__item = NULL ++ ++ def __dealloc__ (self): ++ if self.__item != NULL: ++ cspi.AccessibleStateSet_unref (self.__item) ++ ++ def __checkSelf (self): ++ if self.__item == NULL: ++ raise AttributeError, "__item must not be NULL" ++ ++ cdef bool __setItem (self, cspi.AccessibleStateSet *obj): ++ if self.__item != NULL: ++ cspi.AccessibleStateSet_unref (self.__item) ++ if obj != NULL: ++ self.__item = obj ++ cspi.AccessibleStateSet_ref (self.__item) ++ return True ++ else: ++ return False ++ ++ cdef bool __contains (self, cspi.AccessibleState s): ++ self.__checkSelf () ++ return cspi.AccessibleStateSet_contains (self.__item, s) ++ ++ def contains (self, state): ++ self.__checkSelf () ++ return self.__contains(state) ++ ++ cdef void __add (self, cspi.AccessibleState s): ++ self.__checkSelf () ++ cspi.AccessibleStateSet_add(self.__item, s) ++ ++ def add (self, state): ++ self.__checkSelf () ++ self.__add (state) ++ ++ cdef void __remove (self, cspi.AccessibleState s): ++ self.__checkSelf () ++ cspi.AccessibleStateSet_remove (self.__item, s) ++ ++ def remove (self, state): ++ self.__checkSelf () ++ self.__remove (state) ++ ++ def __str__ (self): ++ self.__checkSelf () ++ return str(self.states) ++ ++ def __getattr__(self, name): ++ if name == "states": ++ result = [] ++ for state in range(SPI_STATE_INVALID, SPI_STATE_INDETERMINATE): ++ if self.contains(state): ++ result.append(state) ++ return result ++ else: ++ raise AttributeError, name ++ ++cdef class Relation: ++ """ ++ Wrapper around a cspi.AccessibleRelation ++ """ ++ cdef cspi.AccessibleRelation *__item ++ ++ def __new__ (self): ++ self.__item = NULL ++ ++ def __dealloc__ (self): ++ if self.__item != NULL: ++ cspi.AccessibleRelation_unref (self.__item) ++ ++ def __checkSelf (self): ++ if self.__item == NULL: ++ raise AttributeError, "__item must not be NULL" ++ ++ def __str__ (self): ++ self.__checkSelf () ++ return "relation %s -> %s"%(self.getRelationType (), self.getTargets()) ++ ++ def __repr__ (self): ++ self.__checkSelf () ++ return "relation %s -> %s"%(self.getRelationType (), self.getTargets()) ++ ++ cdef bool __setItem (self, cspi.AccessibleRelation *obj): ++ if self.__item != NULL: ++ cspi.AccessibleRelation_unref (self.__item) ++ if obj != NULL: ++ self.__item = obj ++ cspi.AccessibleRelation_ref (self.__item) ++ return True ++ else: ++ return False ++ ++ def getNTargets (self): ++ """ ++ Wrapper around cspi.AccessibleRelation_getNTargets ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleRelation_getNTargets (self.__item) ++ ++ def getTarget (self, i): ++ """ ++ Wrapper around cspi.AccessibleRelation_getTarget ++ """ ++ self.__checkSelf () ++ cdef Accessible target ++ target = Accessible () ++ target.__setItem (cspi.AccessibleRelation_getTarget (self.__item, i)) ++ target.__checkSelf () ++ return target ++ ++ def getTargets (self): ++ """ ++ Gets the targets of this AccessibleRelation as a list of atspi.Accessible ++ """ ++ self.__checkSelf () ++ result = [] ++ count = self.getNTargets() ++ for i in range(count): ++ result.append(self.getTarget(i)) ++ return result ++ ++ def getRelationType (self): ++ """ ++ Wrapper around cspi.AccessibleRelation_getRelationType ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleRelation_getRelationType (self.__item) ++ ++cdef class Accessible (Base): ++ """ ++ Wrapper around cspi.Accessible ++ """ ++ def __getattr__ (self, name): ++ if name == "name": ++ return self.getName () ++ elif name == "role": ++ return self.getRole () ++ elif name == "roleName": ++ return self.getRoleName () ++ elif name == "description": ++ return self.getDescription () ++ elif name == "parent": ++ return self.getParent () ++ elif name == "childCount": ++ return self.getChildCount () ++ elif name == "indexInParent": ++ return self.getIndexInParent () ++ elif name == "stateSet": ++ return self.getStateSet () ++ else: ++ raise AttributeError, name ++ ++ def getName (self): ++ """ ++ Wrapper around cspi.Accessible_getName ++ """ ++ self.__checkSelf() ++ return string(cspi.Accessible_getName(self.__item)) ++ ++ def getDescription (self): ++ """ ++ Wrapper around cspi.Accessible_getDescription ++ """ ++ self.__checkSelf() ++ return string(cspi.Accessible_getDescription(self.__item)) ++ ++ def getParent (self): ++ """ ++ Wrapper around cspi.Accessible_getParent, returning an ++ atspi.Accessible or None ++ """ ++ self.__checkSelf() ++ cdef Accessible parent ++ cdef cspi.Accessible* spiParent ++ ++ spiParent = cspi.Accessible_getParent (self.__item) ++ if spiParent!=NULL: ++ parent = Accessible () ++ parent.__setItem (spiParent) ++ parent.__checkSelf () ++ return parent ++ else: ++ return None ++ ++ def getChildAtIndex (self, index): ++ """ ++ Wrapper around cspi.Accessible_getChildAtIndex, returning an ++ atspi.Accessible, atspi.Application, or None ++ """ ++ self.__checkSelf() ++ cdef int i ++ i = index ++ ++ # This hairiness is due to the fact that Pyrex doesn't allow cdefs ++ # inside if blocks. ++ ++ cdef cspi.Accessible* spiChild ++ spiChild = cspi.Accessible_getChildAtIndex (self.__item, i) ++ # Workaround for GNOME bug #321273 ++ # http://bugzilla.gnome.org/show_bug.cgi?id=321273 ++ if spiChild == NULL: return None ++ ++ cdef object child ++ cdef Application app ++ cdef Accessible acc ++ cdef Text text ++ ++ if cspi.Accessible_isApplication (spiChild): ++ app = Application () ++ app.__setItem (spiChild) ++ child = app ++ else: ++ acc = Accessible () ++ acc.__setItem (spiChild) ++ child = acc ++ ++ return child ++ ++ def getIndexInParent (self): ++ """ ++ Wrapper around cspi.Accessible_getIndexInParent ++ """ ++ self.__checkSelf() ++ return cspi.Accessible_getIndexInParent (self.__item) ++ ++ def getRole (self): ++ """ ++ Wrapper around cspi.Accessible_getRole ++ """ ++ self.__checkSelf() ++ return cspi.Accessible_getRole (self.__item) ++ ++ def getRoleName (self): ++ """ ++ Wrapper around cspi.Accessible_getRoleName ++ """ ++ self.__checkSelf() ++ return string(cspi.Accessible_getRoleName (self.__item)) ++ ++ def getChildCount (self): ++ """ ++ Wrapper around cspi.Accessible_getChildCount ++ """ ++ self.__checkSelf() ++ return cspi.Accessible_getChildCount (self.__item) ++ ++ def getStateSet (self): ++ """ ++ Wrapper around cspi.Accessible_getStateSet, returning an ++ atspi.StateSet ++ """ ++ self.__checkSelf() ++ cdef StateSet set ++ set = StateSet() ++ set.__setItem (cspi.Accessible_getStateSet (self.__item)) ++ return set ++ ++ def getInterface (self, interface): ++ """ ++ This is NOT part of cspi, it is just for compatibility with ++ the bonobo bindings and will probably go away soon. ++ """ ++ self.__checkSelf() ++ return getattr(self, "get%s" % interface) () ++ ++ def getAction (self): ++ """ ++ Wrapper around cspi.Accessible_getAction, returning ++ an atspi.Action or None ++ """ ++ self.__checkSelf() ++ cdef Action action ++ action = Action () ++ action.__setItem (cspi.Accessible_getAction (self.__item)) ++ if action.__item != NULL: ++ return action ++ ++ def getText (self): ++ """ ++ Wrapper around cspi.Accessible_getText, returning an atspi.Text ++ or None ++ """ ++ self.__checkSelf () ++ cdef Text text ++ text = Text () ++ text.__setItem (cspi.Accessible_getText (self.__item)) ++ if text.__item != NULL: ++ return text ++ ++ def getEditableText (self): ++ """ ++ Wrapper around cspi.Accessible_getText, returning an ++ atspi.EditableText or None ++ """ ++ self.__checkSelf () ++ cdef EditableText etext ++ etext = EditableText () ++ etext.__setItem (cspi.Accessible_getEditableText (self.__item)) ++ if etext.__item != NULL: ++ return etext ++ ++ def getHypertext (self): ++ """ ++ Wrapper around cspi.Accessible_getHypertext, returning an ++ atspi.Hypertext or None ++ """ ++ self.__checkSelf () ++ cdef Hypertext hypertext ++ hypertext = Hypertext () ++ hypertext.__setItem (cspi.Accessible_getHypertext (self.__item)) ++ if hypertext.__item != NULL: ++ return hypertext ++ ++ def getImage (self): ++ """ ++ Wrapper around cspi.Accessible_getImage, returning an ++ atspi.Image or None ++ """ ++ self.__checkSelf () ++ cdef Image image ++ image = Image () ++ image.__setItem (cspi.Accessible_getImage (self.__item)) ++ if image.__item != NULL: ++ return image ++ ++ def getValue (self): ++ """ ++ Wrapper around cspi.Accessible_getValue, returning an ++ atspi.Value or None ++ """ ++ self.__checkSelf () ++ cdef Value value ++ value = Value () ++ value.__setItem (cspi.Accessible_getValue (self.__item)) ++ if value.__item != NULL: ++ return value ++ ++ def getSelection (self): ++ """ ++ Wrapper around cspi.Accessible_getSelection, returning an ++ atspi.Selection or None ++ """ ++ self.__checkSelf () ++ cdef Selection selection ++ selection = Selection () ++ selection.__setItem (cspi.Accessible_getSelection (self.__item)) ++ if selection.__item != NULL: ++ return selection ++ ++ def getComponent (self): ++ """ ++ Wrapper around cspi.Accessible_getComponent, returning an ++ atspi.Component or None ++ """ ++ self.__checkSelf () ++ cdef Component component ++ component = Component () ++ component.__setItem (cspi.Accessible_getComponent (self.__item)) ++ if component.__item != NULL: ++ return component ++ ++ def getRelationSet (self): ++ """ ++ Wraps Accessible_getRelationSet, returning a list ++ of atspi.Relation ++ """ ++ # looking at at-poke, result from C API appears to be a NULL-terminated list of pointers, and that we should free the buffer ++ self.__checkSelf () ++ cdef Relation relation ++ ++ relations = [] ++ cdef cspi.AccessibleRelation **relationSet ++ relationSet = cspi.Accessible_getRelationSet (self.__item) ++ ++ i=0 ++ while relationSet[i]: ++ relation = Relation () ++ relation.__setItem (relationSet[i]) ++ relations.append(relation) ++ i=i+1 ++ cspi.free (relationSet) ++ ++ return relations ++ ++ ++cdef class Desktop (Accessible): ++ pass ++ ++ ++cdef class Application (Accessible): ++ """ ++ Wrapper around the low-level cspi.AccessibleApplication_ functions, ++ giving an OO-style API. ++ """ ++ def getToolkit (self): ++ """ ++ Wraps AccessibleApplication_getToolkitName, returning a string ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleApplication_getToolkitName (self.__item) ++ ++ def getVersion (self): ++ """ ++ Wraps AccessibleApplication_getVersion, returning a string ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleApplication_getVersion(self.__item) ++ ++ def getID (self): ++ """ ++ Wraps AccessibleApplication_getID, returning a string ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleApplication_getID (self.__item) ++ ++ def pause (self): ++ """ ++ Wraps AccessibleApplication_pause ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleApplication_pause (self.__item) ++ ++ def resume (self): ++ """ ++ Wraps AccessibleApplication_resume ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleApplication_resume (self.__item) ++ ++cdef class Component (Accessible): ++ """ ++ Wrapper around the low-level cspi.AccessibleComponent_ functions, ++ giving an OO-style API. ++ """ ++ def getExtents (self, type=0): ++ """ ++ Wraps cspi.AccessibleComponent_getExtents, returning an ++ (x,y,w,h) tuple. ++ """ ++ self.__checkSelf () ++ cdef long x, y, w, h ++ cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type) ++ return (x, y, w, h) ++ ++ def getPosition (self, type = 0): ++ """ ++ Wraps cspi.AccessibleComponent_getPosition, returning an ++ (x,y) tuple. ++ """ ++ self.__checkSelf () ++ cdef long x, y ++ cspi.AccessibleComponent_getPosition (self.__item, &x, &y, type) ++ return (x, y) ++ ++ def getSize (self): ++ """ ++ Wraps cspi.AccessibleComponent_getSize, returning a ++ (w,h) tuple. ++ """ ++ self.__checkSelf () ++ cdef long w, h ++ cspi.AccessibleComponent_getSize (self.__item, &w, &h) ++ return (w, h) ++ ++ def getLayer (self): ++ """ ++ Wraps cspi.AccessibleComponent_getLayer, returning an ++ AccessibleComponentLayer. ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleComponent_getLayer (self.__item) ++ ++ def grabFocus (self): ++ """ ++ Wraps cspi.AccessibleComponent_grabFocus, raising AtspiException ++ if it fails ++ """ ++ self.__checkSelf () ++ if not cspi.AccessibleComponent_grabFocus (self.__item): ++ raise AtspiException("AccessibleComponent_grabFocus") ++ ++ def getMDIZOrder (self): ++ """ ++ Wraps cspi.AccessibleComponent_getMDIZOrder, returning an integer. ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleComponent_getMDIZOrder(self.__item) ++ ++cdef class Action (Base): ++ """ ++ Wrapper around the low-level cspi.AccessibleAction_ functions, ++ giving an OO-style API. ++ """ ++ def __getattr__ (self, name): ++ if name == "nActions": ++ return self.getNActions () ++ else: ++ raise AttributeError, name ++ ++ def getNActions (self): ++ """ ++ Wraps cspi.AccessibleAction_getNActions ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleAction_getNActions (self.__item) ++ ++ def doAction (self, index): ++ """ ++ Wraps cspi.AccessibleAction_doAction ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleAction_doAction (self.__item, index) ++ ++ def getKeyBinding (self, index): ++ """ ++ Wraps cspi.AccessibleAction_getKeyBinding ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleAction_getKeyBinding (self.__item, index) ++ ++ def getName (self, index): ++ """ ++ Wraps cspi.AccessibleAction_getName ++ """ ++ self.__checkSelf () ++ return string(cspi.AccessibleAction_getName (self.__item, index)) ++ ++ def getDescription (self, index): ++ """ ++ Wraps cspi.AccessibleAction_getDescription ++ """ ++ self.__checkSelf () ++ return string(cspi.AccessibleAction_getDescription (self.__item, index)) ++ ++ ++cdef class Text (Base): ++ """ ++ Wrapper around the low-level cspi.AccessibleText_ functions, ++ giving an OO-style API. ++ """ ++ def addSelection (self, startOffset, endOffset): ++ """ ++ Wraps cspi.AccessibleText_addSelection ++ """ ++ self.__checkSelf () ++ if not cspi.AccessibleText_addSelection (self.__item, startOffset, endOffset): ++ raise AtspiException("AccessibleText_addSelection") ++ ++ ++ #def getAttributes (self, offset, startOffset, endOffset): ++ # self.__checkSelf () ++ # return cspi.AccessibleText_getAttributes (self.__item, offset, startOffset, endOffset) ++ def getCaretOffset (self): ++ """ ++ Wraps cspi.AccessibleText_getCaretOffset ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleText_getCaretOffset (self.__item) ++ ++ def getCharacterCount (self): ++ """ ++ Wraps cspi.AccessibleText_getCharacterCount ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleText_getCharacterCount (self.__item) ++ ++ def getNSelections (self): ++ """ ++ Wraps cspi.AccessibleText_getNSelections ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleText_getNSelections (self.__item) ++ ++ #def getSelection (self, selectionNum, startOffset, endOffset): ++ # self.__checkSelf () ++ # return cspi.AccessibleText_getSelection (self.__item, selectionNum, startOffset, endOffset) ++ ++ def getText (self, startOffset, endOffset): ++ """ ++ Wraps cspi.AccessibleText_getText ++ """ ++ self.__checkSelf () ++ return string(cspi.AccessibleText_getText (self.__item, startOffset, endOffset)) ++ ++ def removeSelection (self, selectionNum): ++ """ ++ Wraps cspi.AccessibleText_removeSelection, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ if not cspi.AccessibleText_removeSelection (self.__item, selectionNum): ++ raise AtspiException("AccessibleText_removeSelection") ++ ++ def setSelection (self, selectionNum, startOffset, endOffset): ++ """ ++ Wraps cspi.AccessibleText_setSelection, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ if not cspi.AccessibleText_setSelection (self.__item, selectionNum, startOffset, endOffset): ++ raise AtspiException("AccessibleText_setSelection") ++ ++ def setCaretOffset (self, position): ++ """ ++ Wraps cspi.AccessibleText_setCaretOffset, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ if not cspi.AccessibleText_setCaretOffset (self.__item, position): ++ raise AtspiException("AccessibleText_setCaretOffset") ++ ++cdef class EditableText (Text): ++ """ ++ Wrapper around the low-level cspi.AccessibleEditableText_ functions, ++ giving an OO-style API. ++ """ ++ def setTextContents (self, newContents): ++ """ ++ Wraps cspi.AccessibleEditableText_setTextContents, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ if not cspi.AccessibleEditableText_setTextContents (self.__item, newContents): ++ raise AtspiException("AccessibleEditableText_setTextContents") ++ ++ def setAttributes (self, attributes, startOffset, endOffset): ++ """ ++ Wraps cspi.AccessibleEditableText_setAttributes, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ if not cspi.AccessibleEditableText_setAttributes (self.__item, attributes, startOffset, endOffset): ++ raise AtspiException("AccessibleEditableText_setAttributes") ++ ++ def insertText (self, position, text): ++ """ ++ Wraps cspi.AccessibleEditableText_insertText, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ if not cspi.AccessibleEditableText_insertText (self.__item, position, text, cspi.strlen(text)): ++ raise AtspiException("AccessibleEditableText_insertText") ++ ++cdef class Hypertext (Text): ++ """ ++ Wrapper around the low-level cspi.AccessibleHypertext_ functions, ++ giving an OO-style API. ++ """ ++ def getNLinks (self): ++ """ ++ Wraps cspi.AccessibleHypertext_getNLinks, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleHypertext_getNLinks (self.__item) ++ ++ def getLink (self, linkIndex): ++ """ ++ Wraps cspi.AccessibleHypertext_getLink, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ cdef Hyperlink hyperlink ++ hyperlink = Hyperlink () ++ hyperlink.__setItem (cspi.AccessibleHypertext_getLink (self.__item, linkIndex)) ++ if hyperlink.__item != NULL: ++ return hyperlink ++ ++ def getLinkIndex (self, characterOffset): ++ """ ++ Wraps cspi.AccessibleHypertext_getLinkIndex, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleHypertext_getLinkIndex (self.__item, characterOffset) ++ ++cdef class Hyperlink (Base): ++ """ ++ Wrapper around the low-level cspi.AccessibleHyperlink_ functions, ++ giving an OO-style API. ++ """ ++ def getNAnchors (self): ++ """ ++ Wraps cspi.AccessibleHyperlink_getNAnchors, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleHyperlink_getNAnchors (self.__item) ++ ++ def getIndexRange (self): ++ """ ++ Wraps cspi.AccessibleHyperlink_getIndexRange, returning [startIndex, endIndex] pair ++ """ ++ self.__checkSelf () ++ cdef long startIndex, endIndex ++ cspi.AccessibleHyperlink_getIndexRange(self.__item, &startIndex, &endIndex) ++ return [startIndex, endIndex] ++ ++ ++ def getObject (self, i): ++ """ ++ Wraps cspi.AccessibleHyperlink_getObject ++ """ ++ self.__checkSelf () ++ cdef Accessible object ++ object = Accessible () ++ object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i)) ++ object.__checkSelf () ++ return object ++ ++ def getURI (self, i): ++ """ ++ Wraps cspi.AccessibleHyperlink_getURI, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleHyperlink_getURI (self.__item, i) ++ ++ def isValid (self): ++ """ ++ Wraps cspi.AccessibleHyperlink_isValid, raising AtspiException if it fails ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleHyperlink_isValid (self.__item) ++ ++cdef class Image (Base): ++ """ ++ Wrapper around the low-level cspi.AccessibleImage_ functions, ++ giving an OO-style API. ++ """ ++ def getImageDescription (self): ++ """ ++ Wraps cspi.AccessibleImage_getImageDescription ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleImage_getImageDescription (self.__item) ++ ++ def getImageSize (self): ++ """ ++ Wraps cspi.AccessibleImage_getImageSize, returning a (w,h) pair ++ """ ++ self.__checkSelf () ++ cdef long w, h ++ cspi.AccessibleImage_getImageSize(self.__item, &w, &h); ++ return [w, h] ++ ++ def getImagePosition (self, type=0): ++ """ ++ Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y) ++ pair ++ """ ++ self.__checkSelf () ++ cdef long x, y ++ cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type) ++ return [x, y] ++ ++ def getImageExtents (self, type=0): ++ """ ++ Wraps cspi.AccessibleImage_getImageExtents, returning a ++ (x,y,w,h) tuple ++ """ ++ self.__checkSelf () ++ cdef long x, y, w, h ++ cspi.AccessibleImage_getImageExtents(self.__item, &x, &y, &w, &h, type) ++ return [x, y, w, h] ++ ++cdef class Value (Base): ++ """ ++ Wrapper around the low-level cspi.AccessibleValue_ functions, ++ giving an OO-style API. ++ """ ++ def getMinimumValue (self): ++ """ ++ Wraps cspi.AccessibleValue_getMinimumValue ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleValue_getMinimumValue(self.__item) ++ ++ def getCurrentValue (self): ++ """ ++ Wraps cspi.AccessibleValue_getMinimumValue ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleValue_getCurrentValue(self.__item) ++ ++ def getMaximumValue (self): ++ """ ++ Wraps cspi.AccessibleValue_getMinimumValue ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleValue_getMaximumValue(self.__item) ++ ++ def setCurrentValue (self, newValue): ++ """ ++ Wraps cspi.AccessibleValue_setCurrentValue ++ """ ++ self.__checkSelf () ++ if not cspi.AccessibleValue_setCurrentValue (self.__item, newValue): ++ raise AtspiException("AccessibleValue_setCurrentValue") ++ ++cdef class Selection (Base): ++ """ ++ Wrapper around the low-level cspi.AccessibleSelection_ functions, ++ giving an OO-style API. ++ """ ++ ++ def getNSelectedChildren (self): ++ """ ++ Wraps cspi.AccessibleSelection_getNSelectedChildren ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleSelection_getNSelectedChildren (self.__item) ++ ++ def getSelectedChild (self, index): ++ """ ++ Wraps cspi.AccessibleSelection_getSelectedChild ++ """ ++ self.__checkSelf () ++ ++ cdef cspi.Accessible* spiChild ++ spiChild = cspi.AccessibleSelection_getSelectedChild (self.__item, index) ++ ++ assert spiChild != NULL ++ ++ cdef object child ++ cdef Application app ++ cdef Accessible acc ++ cdef Text text ++ ++ if cspi.Accessible_isApplication (spiChild): ++ app = Application () ++ app.__setItem (spiChild) ++ child = app ++ else: ++ acc = Accessible () ++ acc.__setItem (spiChild) ++ child = acc ++ ++ return child ++ ++ def selectChild (self, index): ++ """ ++ Wraps cspi.AccessibleSelection_selectChild ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleSelection_selectChild (self.__item, index) ++ ++ def deselectSelectedChild (self, index): ++ """ ++ Wraps cspi.AccessibleSelection_deselectSelectedChild ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleSelection_deselectSelectedChild (self.__item, index) ++ ++ def isChildSelected (self, index): ++ """ ++ Wraps cspi.AccessibleSelection_isChildSelected ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleSelection_isChildSelected (self.__item, index) ++ ++ def selectAll (self): ++ """ ++ Wraps cspi.AccessibleSelection_selectAll ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleSelection_selectAll( self.__item) ++ ++ def clearSelection (self): ++ """ ++ Wraps cspi.AccessibleSelection_clearSelection ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleSelection_clearSelection (self.__item) ++ ++cdef class Table (Base): ++ """ ++ Wrapper around the low-level cspi.AccessibleTable_ functions, ++ giving an OO-style API. ++ """ ++ ++ # def getTableAccessibleAt (self, row, column): ++ # def getTableCaption (self): ++ ++ def getTableColumnAtIndex (self, index): ++ """ ++ Wraps cspi.AccessibleTable_getColumnAtIndex ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getColumnAtIndex(self.__item, index) ++ ++ def getTableColumnDescription (self, column): ++ """ ++ Wraps cspi.AccessibleTable_getColumnDescription ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getColumnDescription(self.__item, column) ++ ++ def getTableColumnExtentAt (self, row, column): ++ """ ++ Wraps cspi.AccessibleTable_getColumnExtentAt ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getColumnExtentAt(self.__item, row, column) ++ ++ # def getTableColumnHeader (self, column): ++ ++ def getTableIndexAt (self, row, column): ++ """ ++ Wraps cspi.AccessibleTable_getIndexAt ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getIndexAt(self.__item, row, column) ++ ++ def getTableNColumns (self): ++ """ ++ Wraps cspi.AccessibleTable_getNColumns ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getNColumns(self.__item) ++ ++ def getTableNRows (self): ++ """ ++ Wraps cspi.AccessibleTable_getNRows ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getNRows(self.__item) ++ ++ def getTableNSelectedColumns (self): ++ """ ++ Wraps cspi.AccessibleTable_getNSelectedColumns ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getNSelectedColumns(self.__item) ++ ++ def getTableNSelectedRows (self): ++ """ ++x Wraps cspi.AccessibleTable_getNSelectedRows ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getNSelectedRows(self.__item) ++ ++ def getTableRowAtIndex (self, index): ++ """ ++ Wraps cspi.AccessibleTable_getRowAtIndex ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getRowAtIndex(self.__item, index) ++ ++ def getTableRowDescription (self, row): ++ """ ++ Wraps cspi.AccessibleTable_getRowDescription ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getRowDescription(self.__item, row) ++ ++ def getTableRowExtentAt (self, row, column): ++ """ ++ Wraps cspi.AccessibleTable_getRowExtentAt ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_getRowExtentAt(self.__item, row, column) ++ ++ # def getTableRowHeader (self, row): ++ # def getTableSelectedRows (self, **selectedRows): - Not sure if the variable which is a pointer to a pointer is acceptable ++ # def getTableSelectedColumns (self, **selectedColumns): - Same issue as above ++ # def getTableSummary (self): ++ ++ def isTableColumnSelected (self, column): ++ """ ++ Wraps cspi.AccessibleTable_isColumnSelected ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_isColumnSelected(self.__item, column) ++ ++ def isTableRowSelected (self, row): ++ """ ++ Wraps cspi.AccessibleTable_isRowSelected ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_isRowSelected(self.__item, row) ++ ++ def isTableSelected (self, row, column): ++ """ ++ Wraps cspi.AccessibleTable_isSelected ++ """ ++ self.__checkSelf () ++ return cspi.AccessibleTable_isSelected(self.__item, row, column) ++ ++ ++cdef class Event (EventBase): ++ #def AccessibleEventListener* SPI_createAccessibleEventListener (AccessibleEventListenerCB callback, void *user_data) ++ #void AccessibleEventListener_unref (AccessibleEventListener *listener) ++ #SPIBoolean AccessibleEventListener_addCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback, void *user_data) ++ #SPIBoolean AccessibleEventListener_removeCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback) ++ ++ #Accessible* AccessibleActiveDescendantChangedEvent_getActiveDescendant (AccessibleEvent *event) ++ #Accessible* AccessibleChildChangedEvent_getChildAccessible (AccessibleEvent *event) ++ ++ def getDescriptionChangedEventDescriptionString (self): ++ self.__checkSelf() ++ return string(cspi.AccessibleDescriptionChangedEvent_getDescriptionString(self.__item)) ++ ++ def getNameChangedEventNameString (self): ++ self.__checkSelf() ++ return string(cspi.AccessibleNameChangedEvent_getNameString(self.__item)) ++ ++ # Accessible* AccessibleParentChangedEvent_getParentAccessible (AccessibleEvent *event) ++ ++ def getTableCaptionChangedEventCaptionString(self): ++ self.__checkSelf() ++ return string(cspi.AccessibleTableCaptionChangedEvent_getCaptionString(self.__item)) ++ ++ def getTableColumnDescriptionChangedEventDescriptionString(self): ++ self.__checkSelf () ++ return string(cspi.AccessibleTableColumnDescriptionChangedEvent_getDescriptionString(self.__item)) ++ ++ # Accessible* AccessibleTableHeaderChangedEvent_getHeaderAccessible (AccessibleEvent *event) ++ ++ def getTableRowDescriptionChangedEventDescriptionString(self): ++ self.__checkSelf () ++ return string(cspi.AccessibleTableRowDescriptionChangedEvent_getDescriptionString(self.__item)) ++ ++ #Accessible* AccessibleTableSummaryChangedEvent_getSummaryAccessible (AccessibleEvent *event) ++ ++ def getTextChangedEventChangeString (self): ++ self.__checkSelf () ++ return string(cspi.AccessibleTextChangedEvent_getChangeString(self.__item)) ++ ++ def getTextSelectionChangedEventSelectionString (self): ++ self.__checkSelf () ++ return string(cspi.AccessibleTextSelectionChangedEvent_getSelectionString(self.__item)) ++ ++ def getWindowEventTitleString (self): ++ self.__checkSelf () ++ return string(cspi.AccessibleWindowEvent_getTitleString(self.__item)) ++ ++class EventGenerator: ++ """ ++ Wrapper layer around SPI_generateKeyboardEvent and ++ SPI_generateMouseEvent, used for generating input events. ++ ++ Use AccessibleAction in preference to this. ++ """ ++ def injectKeyboardString (self, string): ++ """ ++ Inject a string as if it had been typed using an input method. ++ """ ++ # Seems to only work if you do it one character at a time... ++ for char in string: ++ self.__generateKeystringEvent (str(char), cspi.SPI_KEY_STRING) ++ ++ def __keyStringToKeyCode(self, keyString): ++ cdef Xlib.Display *display ++ display = Xlib.XOpenDisplay(NULL) ++ ++ cdef Xlib.KeySym sym ++ sym = Xlib.XStringToKeysym(keyString) ++ cdef Xlib.KeyCode code ++ code = Xlib.XKeysymToKeycode(display, sym) ++ ++ #print str(keyString), str(int(sym)), code ++ ++ Xlib.XCloseDisplay(display) ++ return int(code) ++ ++ def generateKeyCombo (self, keyStrings): ++ modifiers = keyStrings[:-1] ++ finalKey = keyStrings[-1] ++ ++ for modifier in modifiers: ++ code = self.__keyStringToKeyCode(modifier) ++ self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESS) ++ ++ code = self.__keyStringToKeyCode(finalKey) ++ self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESSRELEASE) ++ ++ for modifier in modifiers: ++ code = self.__keyStringToKeyCode(modifier) ++ self.generateKeyboardEvent(code, '', cspi.SPI_KEY_RELEASE) ++ ++ ++ def __generateKeyvalEvent (self, keyval, synthType): ++ self.generateKeyboardEvent (keyval, None, synthType) ++ ++ def __generateKeystringEvent (self, keystring, synthType): ++ self.generateKeyboardEvent (0, keystring, synthType) ++ ++ def generateKeyboardEvent (self, keyval, keystring, synthType): ++ if not cspi.SPI_generateKeyboardEvent (keyval, keystring, synthType): ++ raise AtspiException("SPI_generateKeyboardEvent") ++ ++ def click (self, x, y, button): ++ """ ++ Synthesize a mouse button click at (x,y) ++ """ ++ self.__generateButtonEvent (x, y, button, "c") ++ ++ def doubleClick (self, x, y, button): ++ """ ++ Synthesize a mouse button double-click at (x,y) ++ """ ++ self.__generateButtonEvent (x, y, button, "d") ++ ++ def press (self, x, y, button): ++ """ ++ Synthesize a mouse button press at (x,y) ++ """ ++ self.__generateButtonEvent (x, y, button, "p") ++ ++ def release (self, x, y, button): ++ """ ++ Synthesize a mouse button release at (x,y) ++ """ ++ self.__generateButtonEvent (x, y, button, "r") ++ ++ def absoluteMotion (self, x, y): ++ """ ++ Synthesize mouse absolute motion to (x,y) ++ """ ++ self.__generateEvent (x, y, "abs") ++ ++ def relativeMotion (self, x, y): ++ """ ++ Synthesize mouse relative motion of (x,y) ++ """ ++ self.__generateEvent (x, y, "rel") ++ ++ def drag (self, fromXY, toXY, button): ++ """ ++ Synthesize a drag (press, move and release) from (x,y) to (x,y). ++ ++ These are absolute screen coordinates ++ """ ++ (x,y) = fromXY ++ self.press (x, y, button) ++ ++ (x,y) = toXY ++ self.absoluteMotion(x,y) ++ ++ self.release (x, y, button) ++ ++ def __generateEvent (self, x, y, name): ++ """ ++ Thin wrapper around SPI_generateMouseEvent. ++ ++ Event names: b1p = button 1 press; b2r = button 2 release; ++ b3c = button 3 click; b2d = button 2 double-click; ++ abs = absolute motion; rel = relative motion. ++ """ ++ if not cspi.SPI_generateMouseEvent (x, y, name): ++ raise AtspiException("Error generating mouse event") ++ ++ def __generateButtonEvent (self, x, y, button, suffix): ++ self.__generateEvent (x, y, self.__generateButtonName(button)+suffix) ++ ++ def __generateButtonName(self, button): ++ if button==1: ++ return "b1" ++ elif button==2: ++ return "b2" ++ elif button==3: ++ return "b3" ++ else: raise ValueError, "Unknown button" ++ ++# We use this C function to marshal a call to a python function. The Python callback ++# function is installed as the userdata of this C callback function. See the ++# "cheesefinder" demo in the Pyrex sources. ++# We ignore the "const"ness of the AccessibleEvent ++cdef void marshalAccessibleEventCallback (cspi.AccessibleEvent *event, void *python_fn) except *: ++ e = Event() ++ EventBase.__setItem(e, event) ++ (<object>python_fn) (e) ++ ++cdef class EventListener: ++ """ ++ Wrapper around the low-level cspi.AccessibleEventListener_ functions, ++ giving an OO-style API. ++ """ ++ cdef cspi.AccessibleEventListener *__item ++ cdef public object eventTypes ++ ++ def __init__ (self, callback, eventTypes): ++ """ ++ Registers a python callback function to be called. ++ The callback is expected to have one input, of type atspi.Event, and no return value. ++ See documentation of SPI_registerGlobalEventListener for the event names ++ """ ++ self.eventTypes = eventTypes ++ self.__item = cspi.SPI_createAccessibleEventListener (marshalAccessibleEventCallback, <void*>callback) ++ for eventType in self.eventTypes: ++ #char *e ++ e = eventType ++ if not cspi.SPI_registerGlobalEventListener (self.__item, e): ++ raise AtspiException("Unable to register event listener") ++ ++ def deregister(self): ++ for eventType in self.eventTypes: ++ cspi.SPI_deregisterGlobalEventListener(self.__item, eventType) ++ ++ def __dealloc__ (self): ++ if self.__item != NULL: ++ self.deregister() ++ cspi.AccessibleEventListener_unref (self.__item) ++ ++ def __checkSelf (self): ++ if self.__item == NULL: ++ raise AttributeError, "__item must not be NULL" ++ ++cdef class DeviceEvent: ++ """ ++ Wrapper around a cspi.AccessibleDeviceEvent ++ """ ++ cdef cspi.AccessibleDeviceEvent *__item ++ cdef public object keyID ++ cdef public object keyCode ++ cdef public object keyString ++ cdef public object timeStamp ++ cdef public object type ++ cdef public object modifiers ++ cdef public object isText ++ ++ def __new__ (self): ++ self.__item = NULL ++ ++ cdef bool __setItem (self, cspi.AccessibleDeviceEvent *obj): ++ if obj != NULL: ++ self.__item = obj ++ self.keyID = self.__item.keyID ++ self.keyCode = self.__item.keycode ++ self.keyString = self.__item.keystring ++ self.timeStamp = self.__item.timestamp ++ self.type = self.__item.type ++ self.modifiers = self.__item.modifiers ++ if self.__item.is_text: self.isText = True ++ else: self.isText = False ++ return True ++ else: ++ return False ++ ++ def __checkSelf (self): ++ if self.__item == NULL: ++ raise AttributeError, "__item must not be NULL" ++ ++# def __dealloc__ (self): ++# if self.__item != NULL: ++# cspi.AccessibleDeviceEvent_unref (self.__item) ++ ++ ++cdef cspi.SPIBoolean marshalAccessibleDeviceEventCallback (cspi.AccessibleDeviceEvent *event, void *python_fn) except 1: ++ k = DeviceEvent() ++ #k.__setItem(event) ++ DeviceEvent.__setItem(k, event) ++ k.__checkSelf() ++ (<object>python_fn) (k) ++ return False ++ ++cdef class DeviceListener: ++ """ ++ Wrapper around the low-level cspi.AccessibleDeviceListener_ functions, ++ giving an OO-style API. ++ """ ++ cdef cspi.AccessibleDeviceListener *__item ++ cdef public object modMasks ++ ++ def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED): ++ """ ++ Registers a python callback function to be called. ++ ++ eventMask may be one of the following: ++ key pressed: 1 ++ key released: 2 ++ key pressed or released (default): 3 ++ """ ++ self.__item = cspi.SPI_createAccessibleDeviceListener (marshalAccessibleDeviceEventCallback, <void*>callback) ++ cdef cspi.AccessibleKeySet *keySet ++ keySet = SPI_KEYSET_ALL_KEYS ++ self.modMasks = [] ++ cdef short int modMask ++ syncType = SPI_KEYLISTENER_SYNCHRONOUS | SPI_KEYLISTENER_CANCONSUME ++ #syncType = SPI_KEYLISTENER_NOSYNC ++ for modMask from 0 <= modMask < (1 << 8): ++ self.modMasks.append(modMask) ++ desc = "keySet "+str(<int> keySet)+" modMask "+str(modMask)+" eventMask "+str(eventMask)+" syncType "+str(syncType) ++ desc = str(desc) ++ if not cspi.SPI_registerAccessibleKeystrokeListener (self.__item, keySet, modMask, eventMask, syncType): ++ raise AtspiException("Unable to register keystroke listener", desc) ++ ++ def deregister(self): ++ if self.__item != NULL: ++ for modMask in self.modMasks: ++ cspi.SPI_deregisterAccessibleKeystrokeListener(self.__item, modMask) ++ ++ def __dealloc__ (self): ++ if self.__item != NULL: ++ self.deregister() ++ cspi.AccessibleDeviceListener_unref (self.__item) ++ ++ def __checkSelf (self): ++ if self.__item == NULL: ++ raise AttributeError, "__item must not be NULL" ++ ++ ++# vim: sw=4 ts=4 sts=4 noet ai diff --git a/testing/python-pysqlite/PKGBUILD b/testing/python-pysqlite/PKGBUILD new file mode 100644 index 000000000..5e889eab9 --- /dev/null +++ b/testing/python-pysqlite/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 168875 2012-10-16 11:55:25Z allan $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgbase=python-pysqlite +pkgname=python2-pysqlite +pkgver=2.6.3 +pkgrel=3 +pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" +license=('custom') +arch=('i686' 'x86_64') +url="http://code.google.com/p/pysqlite/" +depends=('python2' 'sqlite') +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 "${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 build +} + +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/testing/python-pysqlite/setup.cfg b/testing/python-pysqlite/setup.cfg new file mode 100644 index 000000000..ba6c77075 --- /dev/null +++ b/testing/python-pysqlite/setup.cfg @@ -0,0 +1,5 @@ +[build_ext] +define= +include_dirs=/usr/include +library_dirs=/usr/lib +libraries=sqlite3 diff --git a/testing/python-urwid/PKGBUILD b/testing/python-urwid/PKGBUILD new file mode 100644 index 000000000..d1804969c --- /dev/null +++ b/testing/python-urwid/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> +# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org> +# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> + +pkgname=('python-urwid' 'python2-urwid') +pkgver=1.0.2 +pkgrel=2 +pkgdesc="Urwid is a curses-based user interface library." +license=('LGPL') +arch=('i686' 'x86_64') +makedepends=('python2-distribute' 'python-distribute') +url="http://excess.org/urwid/" +source=(http://excess.org/urwid/urwid-$pkgver.tar.gz) +md5sums=('00542bbd15fae7ea60b02a7570edee2b') + +build() { + cp -r urwid-$pkgver python2-urwid-$pkgver + + cd "$srcdir/urwid-$pkgver" + python setup.py build + + cd "$srcdir/python2-urwid-$pkgver" + sed -i 's#bin/python#bin/python2#' urwid/*.py + + python2 setup.py build +} + +package_python-urwid() { + depends=('python') + + cd "$srcdir/urwid-$pkgver" + python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 +} + +package_python2-urwid() { + depends=('python2') + + cd "$srcdir/python2-urwid-$pkgver" + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 +} + diff --git a/testing/python-wpactrl/PKGBUILD b/testing/python-wpactrl/PKGBUILD new file mode 100644 index 000000000..ea380a61a --- /dev/null +++ b/testing/python-wpactrl/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 168879 2012-10-16 11:55:34Z allan $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> + +pkgbase=python-wpactrl +pkgname=python2-wpactrl +pkgver=20090609 +pkgrel=4 +pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access" +arch=('i686' 'x86_64') +url="http://projects.otaku42.de/wiki/PythonWpaCtrl" +license=('GPL2') +depends=('python2') +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}/${pkgbase}-${pkgver}" + python2 setup.py build +} + +package_python2-wpactrl() { + cd "${srcdir}/${pkgbase}-${pkgver}" + python2 setup.py install --root="${pkgdir}" +} diff --git a/testing/python/PKGBUILD b/testing/python/PKGBUILD new file mode 100644 index 000000000..f35fd3cd5 --- /dev/null +++ b/testing/python/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 168851 2012-10-16 11:54:17Z allan $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=python +pkgver=3.3.0 +pkgrel=1 +_pybasever=3.3 +pkgdesc="Next generation of the python high-level scripting language" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.python.org/" +depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') +makedepends=('tk' 'sqlite' 'valgrind') +optdepends=('tk: for tkinter' 'sqlite') +provides=('python3') +replaces=('python3') +options=('!makeflags') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) +sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a') + +build() { + cd "${srcdir}/Python-${pkgver}" + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --with-computed-gotos \ + --enable-ipv6 \ + --with-valgrind \ + --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ + --with-system-ffi + + make +} + +check() { + cd "${srcdir}/Python-${pkgver}" + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \ + test_urllib test_uuid test_pydoc +} + +package() { + cd "${srcdir}/Python-${pkgver}" + make DESTDIR="${pkgdir}" install maninstall + + # Why are these not done by default... + ln -sf python3 "${pkgdir}/usr/bin/python" + ln -sf python3-config "${pkgdir}/usr/bin/python-config" + ln -sf idle3 "${pkgdir}/usr/bin/idle" + ln -sf pydoc3 "${pkgdir}/usr/bin/pydoc" + ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1" + + # Fix FS#22552 + 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}m/Makefile" + + # License + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/qscintilla/PKGBUILD b/testing/qscintilla/PKGBUILD index cc7d750c9..d43b5e295 100644 --- a/testing/qscintilla/PKGBUILD +++ b/testing/qscintilla/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 162681 2012-06-27 22:03:12Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 168881 2012-10-16 11:55:38Z allan $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.6.2 -pkgrel=1 +pkgrel=3 license=('GPL') arch=('i686' 'x86_64') 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') @@ -32,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 @@ -52,14 +51,14 @@ package_qscintilla() { } package_python-qscintilla-common() { - pkgdest="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" + pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" depends=('qscintilla') cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python 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() { @@ -68,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/testing/sip/PKGBUILD b/testing/sip/PKGBUILD index 18a53f28e..4d9a1675c 100644 --- a/testing/sip/PKGBUILD +++ b/testing/sip/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 162679 2012-06-27 22:03:02Z andrea $ +# $Id: PKGBUILD 168883 2012-10-16 11:55:44Z 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') 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/testing/sonata/PKGBUILD b/testing/sonata/PKGBUILD new file mode 100644 index 000000000..17bb77c02 --- /dev/null +++ b/testing/sonata/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 168892 2012-10-16 12:14:00Z allan $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=sonata +pkgver=1.6.2.1 +pkgrel=8 +pkgdesc="Elegant GTK+ music client for MPD" +arch=('i686' 'x86_64') +url="http://sonata.berlios.de/" +license=('GPL3') +depends=('pygtk' 'python2-mpd') +optdepends=('gnome-python-extras: Enhanced system tray support' + 'tagpy: Metadata editing support' + 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') +source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz + info.py.patch) +md5sums=('0b912325e7175abad3bf6c0edc071e05' + '595fcf7615035829b264afecb5a1beeb') + +build() { + cd "$srcdir/${pkgname}-$pkgver" + patch -Np0 -i "$srcdir/info.py.patch" + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py +} + +package() { + cd "$srcdir/${pkgname}-$pkgver" + python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir" +} diff --git a/testing/sonata/info.py.patch b/testing/sonata/info.py.patch new file mode 100644 index 000000000..e95cc3a08 --- /dev/null +++ b/testing/sonata/info.py.patch @@ -0,0 +1,15 @@ +--- sonata/info.py 2011-07-05 22:32:08.452556016 -0500 ++++ sonata/info.py 2011-07-05 22:45:50.849311466 -0500 +@@ -393,9 +393,9 @@ + if content.startswith("#REDIRECT [["): + addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0]) + content = urllib.urlopen(addr).read() +- lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0] +- if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->": +- lyrics = misc.unescape_html(lyrics) ++ content = misc.unescape_html(content) ++ lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip() ++ if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->": + lyrics = misc.wiki_to_html(lyrics) + lyrics = lyrics.decode("utf-8") + # Save lyrics to file: diff --git a/testing/system-config-printer/PKGBUILD b/testing/system-config-printer/PKGBUILD new file mode 100644 index 000000000..6ee650101 --- /dev/null +++ b/testing/system-config-printer/PKGBUILD @@ -0,0 +1,108 @@ +# $Id: PKGBUILD 168898 2012-10-16 13:51:27Z 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=2 +pkgdesc="A CUPS printer configuration tool and status applet" +url="http://cyberelk.net/tim/software/system-config-printer/" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' + 'libusb-compat' 'desktop-file-utils') +source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) +md5sums=('081fde89686ee15a9433c0035f5faed0' + '470964eb627af31f2aff9967a4b9a5bb') + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer + + # Fix build with udev 183 + sed -i 's:udev_get_sys_path (udev):"/sys":' udev/udev-configure-printer.c + + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --with-udev-rules + + make +} + +package_system-config-printer-common() { + pkgdesc='Pygtk CUPS Configuration' + 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') + provides=("system-config-printer=${pkgver}") + conflicts=('system-config-printer') + + cd "${srcdir}"/${pkgbase}-${pkgver} + install -d "${pkgdir}"/usr/share/${pkgbase} + install -m644 config.py \ + debug.py \ + installpackage.py \ + monitor.py \ + PhysicalDevice.py \ + ppdippstr.py \ + probe_printer.py \ + SearchCriterion.py \ + smburi.py \ + statereason.py \ + "${pkgdir}"/usr/share/${pkgbase}/ + + install -m755 pysmb.py \ + "${pkgdir}"/usr/share/${pkgbase}/ + + install -d "${pkgdir}"/etc/dbus-1/system.d/ + install -m644 dbus/com.redhat.NewPrinterNotification.conf \ + dbus/com.redhat.PrinterDriversInstaller.conf \ + "${pkgdir}"/etc/dbus-1/system.d/ + install -d "${pkgdir}"/etc/cupshelpers/ + install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/ + + install -d "${pkgdir}"/usr/lib/udev/rules.d + install -m755 udev/{udev-add-printer,udev-configure-printer} \ + "${pkgdir}"/usr/lib/udev/ + install -m644 udev/70-printers.rules \ + "${pkgdir}"/usr/lib/udev/rules.d + + for file in build/lib/cupshelpers/*.py; do + install -Dm644 $file \ + "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file) + done +} + +package_system-config-printer-gnome() { + pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend' + depends=('system-config-printer-common' 'gnome-icon-theme' 'python2-notify') + optdependence=('gnome-keyring: password management') + + cd "${srcdir}"/${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install + + # files provided by system-config-printer-common + cd "${pkgdir}"/usr/share/${pkgbase} + rm config.py \ + debug.py \ + installpackage.py \ + monitor.py \ + PhysicalDevice.py \ + ppdippstr.py \ + probe_printer.py \ + SearchCriterion.py \ + smburi.py \ + statereason.py \ + pysmb.py + rm -r "${pkgdir}"/etc/dbus-1/ + rm -r "${pkgdir}"/etc/cupshelpers/ + rm -r "${pkgdir}"/etc/udev/ + rm -r "${pkgdir}"/usr/lib/ +} diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index f6660eec5..073d99b15 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=194 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -61,6 +61,7 @@ package_systemd() { replaces=('libsystemd' 'systemd-tools' 'udev') conflicts=('libsystemd' 'systemd-tools' 'udev') optdepends=('initscripts: legacy support for /etc/rc.conf' + 'python: systemd library bindings' 'python2-cairo: systemd-analyze' 'python2-dbus: systemd-analyze' 'systemd-sysvcompat: symlink package to provide sysvinit binaries' @@ -131,6 +132,9 @@ package_systemd() { install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ "$srcdir"/_sysvcompat/usr/share/man/man8 + + # create /var/log/journal. users can control the actual log destination via journald.conf + install -dm755 "$pkgdir/var/log/journal" } package_systemd-sysvcompat() { diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install index 784926e17..fa3e8f29a 100644 --- a/testing/systemd/systemd.install +++ b/testing/systemd/systemd.install @@ -24,6 +24,11 @@ post_upgrade() { # horrific happens, so just mask the error. systemctl -q enable getty@.service || true fi + + if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then + printf '==> journald now writes to /var/log/journal by default. This can be\n' + printf ' controlled with the Storage setting in /etc/systemd/journald.conf\n' + fi } # vim:set ts=2 sw=2 et: diff --git a/testing/twisted/PKGBUILD b/testing/twisted/PKGBUILD new file mode 100644 index 000000000..26514d9f3 --- /dev/null +++ b/testing/twisted/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 168885 2012-10-16 11:55:48Z 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=2 +pkgdesc="Asynchronous networking framework written in Python." +arch=('i686' 'x86_64') +url="http://twistedmatrix.com/" +license=('MIT') +depends=('python2-crypto' 'python2-zope-interface') +optdepends=('python2-pyopenssl' + 'python2-soappy: for twisted.web.soap' + 'python2-pyasn1: for using conch' + 'pygtk: for using manhole' + 'tk: for using tkconch') +install=twisted.install +source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) +sha1sums=('c51834c1270e7a4bb0de9190056e4317413920f9') + +build() { + cd "$srcdir/Twisted-$pkgver" + python2 setup.py build +} + +package() { + cd "$srcdir/Twisted-$pkgver" + python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \ + "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \ + "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \ + "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py +} diff --git a/testing/twisted/twisted.install b/testing/twisted/twisted.install new file mode 100644 index 000000000..8e93ffd3c --- /dev/null +++ b/testing/twisted/twisted.install @@ -0,0 +1,11 @@ +post_install() { + python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1 +} + +post_upgrade() { + post_install +} + +post_remove() { + find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f +} diff --git a/testing/vde2/PKGBUILD b/testing/vde2/PKGBUILD new file mode 100644 index 000000000..1f706ffa1 --- /dev/null +++ b/testing/vde2/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 168886 2012-10-16 11:55:53Z allan $ +# Contributor: Sergej Pupykin +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=vde2 +pkgver=2.3.2 +pkgrel=2 +pkgdesc="Virtual Distributed Ethernet for emulators like qemu" +url="http://sourceforge.net/projects/vde/" +license=("GPL" "LGPL" "CUSTOM") +arch=('i686' 'x86_64') +depends=('bash' 'libpcap' 'openssl') +makedepends=('python') +backup=(etc/conf.d/vde) +source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 + dhcpd.conf.sample + iptables.rules.sample + vde-config.sample + vde-connection.sample + vde.conf + vde.rc) +install=vde2.install +options=(!libtool !makeflags) + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ + --enable-experimental + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install + install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde + install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde + install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample + install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample + install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample + install -D -m 644 ../iptables.rules.sample $pkgdir/usr/share/vde2/iptables.rules.sample + # install slirp license + install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde +} + +md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' + '7d9bc56d2e561d849e915000d1c0f269' + 'a920123fc620bcedbccb703a8d1bdc55' + 'cb8ace28e8efd4dad128be4be71b3b07' + '63033c33565e2030541c5e05e9d9b063' + 'a22730f051f4840da4a3162a88ff8156' + '6c7dc01bc2f039f0ff1682ee70d3d1da') diff --git a/testing/vde2/dhcpd.conf.sample b/testing/vde2/dhcpd.conf.sample new file mode 100644 index 000000000..565a78b27 --- /dev/null +++ b/testing/vde2/dhcpd.conf.sample @@ -0,0 +1,12 @@ +ddns-update-style none; + +subnet 192.168.254.0 netmask 255.255.255.0 { + range 192.168.254.1 192.168.254.253; + option routers 192.168.254.254; + option domain-name "virtual.example.com"; + # find your DNS servers from /etc/resolv.conf + # otherwise only pure IP addresses will work + option domain-name-servers 192.168.254.254; + option broadcast-address 192.168.254.255; + default-lease-time 86400; +} diff --git a/testing/vde2/iptables.rules.sample b/testing/vde2/iptables.rules.sample new file mode 100644 index 000000000..ac712ee21 --- /dev/null +++ b/testing/vde2/iptables.rules.sample @@ -0,0 +1,5 @@ +*filter +-A INPUT -i tun -j ACCEPT +-A FORWARD -s 192.168.254.0/255.255.255.0 -j ACCEPT +*nat +-A POSTROUTING -s 192.168.254.0/24 -j MASQUERADE diff --git a/testing/vde2/vde-config.sample b/testing/vde2/vde-config.sample new file mode 100644 index 000000000..c5a5b7d88 --- /dev/null +++ b/testing/vde2/vde-config.sample @@ -0,0 +1,35 @@ +# Set options vde_switch program +# To activate this vde profile add it to /etc/conf.d/vde + +# Global options +VDE_NUMPORTS="32" # Number of ports (default 32) +VDE_HUB="no" # [yes|no] Make the switch act as a hub +VDE_FSTP="no" # [yes|no] Activate the fast spanning tree protocol +VDE_MAC="" # Set the Switch MAC address +VDE_PRIOTIRY="" # Set the priority for FST (MAC extension) +VDE_HASHSIZE="" # Hash table size + +# Options from datasock module +VDE_SOCK="/var/run/vde/sample.sock" # control directory pathname +VDE_SOCK_MODE="660" # Standard access mode for comm sockets (octal) +VDE_SOCK_GROUP="root" # Group owner for comm sockets + +# Options from consmgmt module +VDE_MANAGEMENT_SOCK="/var/run/vde/sample.mgmt" # path of the management UNIX socket +VDE_MANAGEMENT_SOCK_MODE="660" # management UNIX socket access mode (octal) + +# Other options to parse to vde_switch +VDE_OPTIONS="" + +# VDE with internet support +# You can use either tuntap method or slirpvde method. + +# Options from tuntap module +VDE_TAP="" # Enable routing through TAP tap interface (comma separated array eg.:"tap0,tap1"). + +# slirpvde daemon support +SLIRP="no" # [yes|no] enable/disable SLIRP daemon support +SLIRP_DHCP="no" # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE +SLIRP_NETWORK="" # specify the network address (default 10.0.2.0) +# other options to parse to slirpvde +SLIRP_OPTIONS=""
\ No newline at end of file diff --git a/testing/vde2/vde-connection.sample b/testing/vde2/vde-connection.sample new file mode 100644 index 000000000..4a75e1f52 --- /dev/null +++ b/testing/vde2/vde-connection.sample @@ -0,0 +1,6 @@ +# You can add vde switch connections below +# just without the # at the beginning: +# vde_plug /var/run/vde/sample.sock = vde_plug /var/run/vde/sample2.sock +# or if hosts are different use this syntax: +# vde_plug /var/run/vde/sample.sock = ssh host2 vde_plug /var/run/vde/sample.sock + diff --git a/testing/vde2/vde.conf b/testing/vde2/vde.conf new file mode 100644 index 000000000..bc61dceda --- /dev/null +++ b/testing/vde2/vde.conf @@ -0,0 +1,11 @@ +# Set options for a vde daemon script +# +# Array for your vde config files, eg.: "internal-net external-net" +# You need a config file in /etc/vde/ with the same name. +# Sample config file provided: /etc/vde/vde-config.sample +VDE_CONFIG="" + +# Array for your dpipe connections, eg.: "connect-switches" +# You need a config file in /etc/vde/ with the same name. +# Sample config file provided: /etc/vde/vde-connection.sample +VDE_CONNECTION=""
\ No newline at end of file diff --git a/testing/vde2/vde.rc b/testing/vde2/vde.rc new file mode 100755 index 000000000..b368f9955 --- /dev/null +++ b/testing/vde2/vde.rc @@ -0,0 +1,113 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/vde + +case "$1" in + start) + # bring up all defined profiles + for i in $VDE_CONFIG; do + [ -e /etc/vde/$i ] && . /etc/vde/$i + stat_busy "Starting vde_switch $i" + # get options from profile + [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS" + [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x" + [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F" + [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC" + [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY" + [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH" + [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK" + [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE" + [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP" + [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK" + [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE" + [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP" + [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS" + vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null + [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK" + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + if [ "$SLIRP" = "yes" ]; then + stat_busy "Starting slirpvde for $i" + [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D" + [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK" + [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS" + [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK" + [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE" + [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP" + slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + unset OPTIONS + unset SP_OPTIONS + fi + done + for i in $VDE_CONNECTION; do + # connect specified vde_switches + if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then + stat_busy "Connecting VDE switches $i together..." + while read j; do + switch="$(echo $j | grep ^vde_plug)" + [ -n "$switch" ] && (dpipe $switch &) + done </etc/vde/$i + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + fi + done + add_daemon vde + ;; + stop) + # kill vde_plug if switches are connected + [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1 + for i in $VDE_CONFIG; do + [ -e /etc/vde/$i ] && . /etc/vde/$i + if [ "$SLIRP" = "yes" ]; then + stat_busy "Stopping slirpvde for $i" + kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + rm /var/run/slirpvde-$i.pid &> /dev/null + fi + stat_busy "Stopping vde_switch $i" + kill $(cat /var/run/vde-$i.pid) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + rm /var/run/vde-$i.pid &> /dev/null + stat_busy "Removing $i vde sockets" + rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + done + unset OPTIONS + unset SP_OPTIONS + [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out + rm_daemon vde + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/vde2/vde2.install b/testing/vde2/vde2.install new file mode 100644 index 000000000..74e1710ff --- /dev/null +++ b/testing/vde2/vde2.install @@ -0,0 +1,10 @@ +post_install() { + echo "Change /etc/conf.d/vde to your needs." + echo "vde config files should be placed in /etc/vde, sample files are provided." + echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'." + echo "Merge those examples, if needed to the according config files." +} + +post_upgrade() { + post_install $1 +} diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD index 2defe0dea..f0624b62a 100644 --- a/testing/xf86-video-intel/PKGBUILD +++ b/testing/xf86-video-intel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168228 2012-10-06 20:07:31Z andyrtr $ +# $Id: PKGBUILD 168918 2012-10-16 14:38:14Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.20.9 -pkgrel=2 +pkgver=2.20.10 +pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b9830c9fdaf2f64648cd45807883821f14dd91f9ff1cfa59af11035f62dc9389') +sha256sums=('df41a28c3d877f3c5e87cd7d840f51fd38dde8bc91f5f0d09510fb8e2336cdcd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/~lukeshu/9mount/PKGBUILD b/~lukeshu/9mount/PKGBUILD new file mode 100644 index 000000000..c0052731d --- /dev/null +++ b/~lukeshu/9mount/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (AUR): Fazlul Shahriar <fshahriar@gmail.com> + +pkgname=9mount +pkgver=1.3 +pkgdesc="A set of SUID tools for mounting 9p filesystems via v9fs." +url="http://sqweek.net/code/9mount/" +license=('custom:ISC') +source=("http://sqweek.net/9p/$pkgname-$pkgver.tar.gz" fix-checks.patch) + +pkgrel=2 +arch=('i686' 'x86_64') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -i "$srcdir/fix-checks.patch" + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + PATH=.:$PATH sh ./test.sh +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir/usr" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + ln -s 9mount.1 "$pkgdir/usr/share/man/man1/9umount.1" + ln -s 9mount.1 "$pkgdir/usr/share/man/man1/9bind.1" +} + +md5sums=('711a0a6f4d076c8275596171b0a315d0' + '7961acda05c55f91f8cd6fb0d51b5c7d') +sha256sums=('820d80b9b478d05ecb022ad658477b37cfc2414a8669c3af17d192a522064c17' + '69cd1be08cc13cdecf2851dd6f78efd734afa8b0b099484cd777edb0b1d36f79') diff --git a/~lukeshu/9mount/fix-checks.patch b/~lukeshu/9mount/fix-checks.patch new file mode 100644 index 000000000..9af711ba5 --- /dev/null +++ b/~lukeshu/9mount/fix-checks.patch @@ -0,0 +1,24 @@ +--- test.sh.orig 2012-10-15 11:15:07.000000000 -0400 ++++ test.sh 2012-10-15 11:15:11.000000000 -0400 +@@ -7,7 +7,7 @@ + shift; shift + actual=$(9mount -n "$@" 2>&1) + aopts=$(echo $actual |sed 's/.*-o \([^ ]*\) .*/\1/' |tr , '\n' |sort |tr '\n' , |sed 's/,$//') +- actual=$(echo $actual |sed 's/-o [^ ]*/-o '"$aopts"'/') ++ actual=$(echo $actual |sed -e 's/-o [^ ]*/-o '"$aopts"'/' -e 's/ ::1 / 127.0.0.1 /') + if [ "$expected" != "$actual" ]; then + echo ' '9mount "$@" + echo $expected' #expected' +@@ -48,6 +48,7 @@ + output=$(9mount -n "$@" 2>&1) && { + echo ' '9mount "$@" + echo $output' #should have failed!' ++ exit 1 + } + } + +@@ -59,3 +60,4 @@ + shouldfail unix!/tmp/9mount!qux $mtpt + shouldfail virtio!/dev/chan!bar $mtpt + shouldfail tcp!localhost!564!foo $mtpt ++exit 0 |