diff options
154 files changed, 2679 insertions, 679 deletions
diff --git a/artistic/aqsis/PKGBUILD b/artistic/aqsis/PKGBUILD new file mode 100644 index 000000000..ed04e585e --- /dev/null +++ b/artistic/aqsis/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Former contributor: Gino Pezzin <pezzin@gmail.com> +# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> +pkgname=aqsis +pkgver=1.8.1 +pkgrel=1 +pkgdesc="A high quality, photorealistic, 3D rendering solution" +arch=('i686' 'x86_64') +url="http://www.aqsis.org" +license=('GPL2') +optdepends=('qt: graphical interface' 'libgl: ptview') +depends=('boost-libs' 'openexr' 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils') +makedepends=('cmake' 'boost' 'openexr' 'libpng' 'qt' 'mesa') +options=('!libtool') +install=aqsis.install +source=(http://downloads.sourceforge.net/project/aqsis/aqsis-source/1.8.1/$pkgname-$pkgver.tar.gz) +md5sums=('1fb9b07c6d3c5195ad72e308fb584598') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + mkdir -p "$srcdir"/$pkgname-build + cd "$srcdir"/$pkgname-build + + cmake "$srcdir"/$pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc/aqsis + make +} + +package() { + cd "$srcdir"/$pkgname-build + make DESTDIR="$pkgdir" install +} diff --git a/artistic/aqsis/aqsis.install b/artistic/aqsis/aqsis.install new file mode 100644 index 000000000..b2086e07b --- /dev/null +++ b/artistic/aqsis/aqsis.install @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor/ + update-mime-database usr/share/mime > /dev/null + update-desktop-database -q +} +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/artistic/yafaray-git/PKGBUILD b/artistic/yafaray-git/PKGBUILD new file mode 100644 index 000000000..0c5d4f6e4 --- /dev/null +++ b/artistic/yafaray-git/PKGBUILD @@ -0,0 +1,78 @@ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> +pkgname=yafaray-git +_blendver=2.62 +pkgver=20120420 +pkgrel=1 +pkgdesc="A libre software raytracing engine" +arch=('i686' 'x86_64') +url="http://www.yafaray.org/" +license=('LGPL2.1') +depends=('libxml2' 'openexr' 'libjpeg') +optdepends=('qt: QT GUI' 'python: Python bindings, Blender exporter') +makedepends=('cmake' 'git' 'qt' 'swig' 'python') +provides=('yafaray') +conflicts=('yafaray') +source=('gcc47.patch') +md5sums=('d99eb7db30885549687a8f7a775a582d') + +_gitroot=git://github.com/YafaRay/Core.git +_gitname=yafaray +_gitrootexport=git://github.com/YafaRay/Blender-2.5-Exporter.git +_gitnameexport=exporter + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + # core + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + cd .. + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + # exporter + if [[ -d "$_gitnameexport" ]]; then + cd "$_gitnameexport" && git pull origin + cd .. + msg "The local files are updated." + else + git clone "$_gitrootexport" "$_gitnameexport" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + if [ -e "$srcdir"/$_gitname-build ]; then + rm -rf "$srcdir"/$_gitname-build + fi + mkdir "$srcdir/$_gitname-build" + + patch -Np0 -i "$srcdir/gcc47.patch" + + cd "$srcdir/$_gitname-build" + + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DYAF_PY_VERSION=3.2 \ + -DYAF_BINDINGS_PY_DIR=/usr/lib/python3.2 \ + "../$_gitname" + make +} + +package() { + cd "$srcdir/$_gitname-build" + make DESTDIR="$pkgdir/" install + + # install exporter + cd "$srcdir/$_gitnameexport" + git checkout-index -a -f --prefix="$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/" + # create symlinks to make exporter fully work + install -d -m755 "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin" + ln -sf "/usr/lib/libyafaraycore.so" "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin/libyafaraycore.so" + ln -sf "/usr/lib/libyafarayplugin.so" "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin/libyafarayplugin.so" + ln -sf "/usr/lib/yafaray" "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin/plugins" +} + +# vim:set ts=2 sw=2 et: diff --git a/artistic/yafaray-git/gcc47.patch b/artistic/yafaray-git/gcc47.patch new file mode 100644 index 000000000..75775498b --- /dev/null +++ b/artistic/yafaray-git/gcc47.patch @@ -0,0 +1,10 @@ +--- yafaray.orig/src/yafraycore/scene.cc 2012-04-18 00:03:16.508415920 -0300 ++++ yafaray/src/yafraycore/scene.cc 2012-04-18 00:29:59.090117108 -0300 +@@ -39,6 +39,7 @@ + #include <iostream> + #include <limits> + #include <sstream> ++#include <unistd.h> + + __BEGIN_YAFRAY + diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 66537479d..53ff54a87 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68371 2012-03-23 10:07:50Z seblu $ +# $Id: PKGBUILD 69396 2012-04-15 17:01:41Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=2.0.15 +pkgver=2.0.16 pkgrel=1 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz" 'anything' 'handler.sh' 'acpid.conf.d') -md5sums=('1b1c8775adab6a994a386c45af6b86dc' +md5sums=('d59fc02c9c34f0d5c137495302e2c074' 'd69203a032c4583f9abaafcf21a7ed84' '2d37b98d6e74bab815604b8b48c6cfd4' '615439f4a89716c747907d4fc3c8df75' diff --git a/community/assimp/PKGBUILD b/community/assimp/PKGBUILD new file mode 100644 index 000000000..8dc5bff69 --- /dev/null +++ b/community/assimp/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: jepaan <jepaan at hotmail dot com> + +pkgname=assimp +pkgver=2.0.863 +pkgrel=1 +pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner" +arch=('i686' 'x86_64') +license=('BSD') +makedepends=('cmake' 'boost') +url=('http://assimp.sourceforge.net/index.html') +source=("http://downloads.sourceforge.net/assimp/assimp--${pkgver}-sdk.zip") +md5sums=('9f41662501bd9d9533c4cf03b7c25d5b') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}--${pkgver}-sdk \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/build + + make DESTDIR=$pkgdir install + install -Dm644 ${srcdir}/${pkgname}--${pkgver}-sdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD new file mode 100644 index 000000000..00d2cc85f --- /dev/null +++ b/community/bitcoin/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 69400 2012-04-15 20:25:26Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: shahid <helllamer@gmail.com> + +pkgbase=bitcoin +pkgname=('bitcoin-daemon' 'bitcoin-qt') +pkgver=0.6.0 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.bitcoin.org/" +makedepends=('boost' 'automoc4' 'miniupnpc') +conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git') +replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git') +license=('MIT') +source=("http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}-linux.tar.gz") +sha256sums=('13faa8b7c8c9ce3518ebe31ff2d97920f4feb4f06c1d08455b272fdaaeeb1f97') + +build() { + cd "$srcdir/$pkgbase-$pkgver-linux/src" + + # FIXME GCC 4.7.0 is too strict + echo "QMAKE_CXXFLAGS += $CXXFLAGS -fpermissive" >> bitcoin-qt.pro + + # and make qt gui + qmake + make + + # make bitcoind + make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS -fpermissive" USE_UPNP=1 +} + + +package_bitcoin-qt() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT" + depends=(boost-libs qt miniupnpc) + install=bitcoin-qt.install + + cd "$srcdir/$pkgbase-$pkgver-linux/src" + install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt + install -Dm644 contrib/debian/bitcoin-qt.desktop \ + "$pkgdir"/usr/share/applications/bitcoin.desktop + install -Dm644 share/pixmaps/bitcoin80.xpm \ + "$pkgdir"/usr/share/pixmaps/bitcoin80.xpm + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +package_bitcoin-daemon() { + pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon" + depends=(boost-libs miniupnpc openssl) + + cd "$srcdir/$pkgbase-$pkgver-linux/src" + install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind + install -Dm644 contrib/debian/examples/bitcoin.conf \ + "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf" + install -Dm644 contrib/debian/manpages/bitcoind.1 \ + "$pkgdir"/usr/share/man/man1/bitcoind.1 + install -Dm644 contrib/debian/manpages/bitcoin.conf.5 \ + "$pkgdir"/usr/share/man/man5/bitcoin.conf.5 + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + diff --git a/community/bitcoin/bitcoin-qt.install b/community/bitcoin/bitcoin-qt.install new file mode 100644 index 000000000..f98ba7338 --- /dev/null +++ b/community/bitcoin/bitcoin-qt.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 7cd8d1484..065f39f20 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66360 2012-02-24 00:42:04Z spupykin $ +# $Id: PKGBUILD 69589 2012-04-19 10:16:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> @@ -11,13 +11,16 @@ url="http://www.busybox.net" license=('GPL') makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 + http://git.exherbo.org/arbor.git/plain/packages/sys-apps/busybox/files/linux-headers-fix.patch config) install=busybox.install md5sums=('9c0cae5a0379228e7b55e5b29528df8e' + '853097e2f1477f962d6f268c1b3ebd78' 'edd5c66c974ccc1b0030fd00beaa1b02') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/linux-headers-fix.patch cp $srcdir/config .config # if you want to run menuconfig uncomment the following line: # make menuconfig ; return 1 diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 58d29b681..d72b7df7b 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 68461 2012-03-25 08:30:58Z giovanni $ +# $Id: PKGBUILD 69584 2012-04-19 09:02:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.6 +pkgver=2.0.7 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('06a16582721120ae13fa04c65e3617c0') +md5sums=('aea6396d780d053e798caed5c6a95cac') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index 2c6cde67e..0897f0159 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 65291 2012-02-20 15:31:22Z stephane $ +# $Id: PKGBUILD 69536 2012-04-18 02:12:09Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck -pkgver=1.53 +pkgver=1.54 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('pcre') makedepends=('docbook-xsl') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('e1c8431cab1ef07c725f1556bdb0fc5d3e912c9f') +sha1sums=('f63abbd9bda7179c3ce3a399123bd7fb476e4537') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index 36f86cf3b..3da79f488 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 67633 2012-03-13 14:56:32Z spupykin $ +# $Id: PKGBUILD 69418 2012-04-16 09:39:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') depends=('gmime24' 'libzdb' 'mhash' 'libevent') makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1' - 'sqlite3' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') + 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve') optdepends=('postgresql-libs: for PostgreSQL storage backend' - 'sqlite3: for SQLite storage backend' + 'sqlite: for SQLite storage backend' 'libmysqlclient: for MySQL storage backend' 'libldap: for LDAP authentication' 'libsieve: for dbmail-sieve') @@ -26,7 +26,7 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail.rc.d) md5sums=('eb32235abffdf967253ee9d004e0e4a9' 'e7f72bc360decdb2475266391ad12329' - '099225611da20ec194c092ac9befc33c') + '6e287912650675011169b2dff42822cc') build() { cd $srcdir/dbmail-${pkgver/_/-}/ diff --git a/community/dbmail/dbmail.rc.d b/community/dbmail/dbmail.rc.d index 92c34e5d2..9286809df 100644 --- a/community/dbmail/dbmail.rc.d +++ b/community/dbmail/dbmail.rc.d @@ -7,9 +7,11 @@ case "$1" in start) + mkdir -p /var/run/dbmail + chown -R nobody:nobody /var/run/dbmail for daemon in $DBMAIL_DAEMONS; do stat_busy "Starting DbMail ${daemon}" - /usr/sbin/${daemon} + /usr/sbin/${daemon} -p /var/run/dbmail/${daemon}.pid if [ $? -gt 0 ]; then stat_fail else @@ -21,7 +23,7 @@ case "$1" in stop) for daemon in $DBMAIL_DAEMONS; do stat_busy "Stopping DbMail ${daemon}" - pid=$(cat /var/run/${daemon}.pid) + pid=$(cat /var/run/dbmail/${daemon}.pid) kill $pid sleep 4 stat_done diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD index a8b359d78..52599dcff 100644 --- a/community/deja-dup/PKGBUILD +++ b/community/deja-dup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 68348 2012-03-22 18:06:16Z bgyorgy $ +# $Id: PKGBUILD 69507 2012-04-17 14:32:37Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=deja-dup -pkgver=22.0 +pkgver=22.1 pkgrel=1 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('nautilus: backup extension') options=('!libtool') install=$pkgname.install source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz) -md5sums=('b8a71a26cdf3c460a9e5104212527d29') +md5sums=('cbf7af6f0392ab9ef355a3aeb74c8a79') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD index 5138954fd..187177a00 100644 --- a/community/desmume/PKGBUILD +++ b/community/desmume/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67526 2012-03-13 10:38:03Z giovanni $ +# $Id: PKGBUILD 69392 2012-04-15 16:03:24Z schuay $ # Maintainer: Jonathan Conder <jonno dot conder at gmail dot com> # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Arkham <arkham at archlinux dot us> @@ -11,27 +11,22 @@ # Contributor: Asher256 <achrafcherti at gmail dot com> pkgname=desmume -pkgver=0.9.7 -pkgrel=4 +pkgver=0.9.8 +pkgrel=1 pkgdesc="Nintendo DS emulator" arch=('i686' 'x86_64') url="http://desmume.org/" license=('GPL') -depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap') +depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap' + 'soundtouch' 'alsa-lib' 'zziplib') makedepends=('intltool') -replaces=('desmume-core' 'desmume-cli' 'desmume-gtk' 'desmume-glade') install=desmume.install -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'desmume-0.9.7-zlib.1.2.6-fix.patch') -sha256sums=('0a0f7ef3cc76ff0bbc6f3df47c3689653617074ea7ffc354e9fa1240c5336523' - 'baaf68be32f09690975d6309af6988c038e708ef322ed7e4b370d87087c7b6ba') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "${srcdir}/desmume-0.9.7-zlib.1.2.6-fix.patch" - ./configure --prefix=/usr \ - --enable-wifi + ./configure --prefix=/usr --enable-wifi make } @@ -40,3 +35,5 @@ package() { make DESTDIR="$pkgdir/" install } + +sha256sums=('f405b44e2d7ab3578d6be91a6546bbaa0afc60b2a8d193e4415fea5c5332d585') diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index a35cb8b85..e8cc28731 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63528 2012-02-05 11:53:40Z ibiru $ +# $Id: PKGBUILD 69446 2012-04-16 11:44:58Z spupykin $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,16 +6,16 @@ pkgname=dia pkgver=0.97.2 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://live.gnome.org/Dia" install=dia.install -depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2') +depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2' 'hicolor-icon-theme') makedepends=('intltool' 'python2' 'docbook-xsl') optdepends=('python2') -options=('!libtool' 'docs') +options=('!libtool' 'docs' '!emptydirs') source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" "dia-overflow-fix.patch") md5sums=('1e1180a513fb567709b09bc19f12105e' @@ -25,6 +25,9 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 + for file in `find -type f -name '*.py'`; do + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" + done sed -i 's#python2\.1#python2 python2.1#' configure # patch -p1 <$srcdir/dia-overflow-fix.patch @@ -44,5 +47,5 @@ package() { make DESTDIR="${pkgdir}" install cd doc make DESTDIR="${pkgdir}" install-html - ln -sf dia/html "${pkgdir}"/usr/share/dia/help + ln -sf ../doc/dia/html "${pkgdir}"/usr/share/dia/help } diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index 567704b27..df38eb4c2 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 61824 2012-01-08 18:20:40Z spupykin $ +# $Id: PKGBUILD 69466 2012-04-16 15:09:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -6,18 +6,21 @@ pkgname=dmenu pkgver=4.5 -pkgrel=1 +pkgrel=2 pkgdesc="A generic menu for X" url="http://tools.suckless.org/dmenu/" arch=('i686' 'x86_64' 'mips64el') license=('MIT') -depends=('sh' 'libxinerama') -source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") -md5sums=('9c46169ed703732ec52ed946c27d84b4') +depends=('sh' 'libxinerama' 'libxft' 'freetype2') +source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz" + "http://tools.suckless.org/dmenu/patches/dmenu-$pkgver-xft.diff") +md5sums=('9c46169ed703732ec52ed946c27d84b4' + 'd448ec9120718b0aedbdb338f4fa69ba') build(){ cd $srcdir/$pkgname-$pkgver - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 + patch -p1 <$srcdir/dmenu-$pkgver-xft.diff + make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 XFTINC=-I/usr/include/freetype2 } package() { diff --git a/community/e4rat/PKGBUILD b/community/e4rat/PKGBUILD index aaf86e69f..4055dd567 100644 --- a/community/e4rat/PKGBUILD +++ b/community/e4rat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67597 2012-03-13 13:26:27Z lcarlier $ +# $Id: PKGBUILD 69434 2012-04-16 10:26:17Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: graysky <graysky AT archlinux DOT us> pkgname=e4rat -pkgver=0.2.1 -pkgrel=6 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions." arch=('i686' 'x86_64') url="http://e4rat.sourceforge.net/" @@ -13,14 +13,18 @@ depends=('e2fsprogs' 'util-linux') makedepends=('audit' 'boost' 'cmake') options=(!strip) backup=(etc/e4rat.conf) -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz) -md5sums=('cbb1f3cdd2b8c96b4402028da07b11f2') -sha256sums=('c509f165eff317f80f5d13d7b370514c457df4542ff3b31bee4c26f97ce89769') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz e4rat-static_core.patch) +md5sums=('dada998e857794dc7f76ffc887e04c19' + '9432ac4a8658812828d90b2676e8519f') +sha256sums=('ec40740ac05fb0470edd682232fb6c7be0bb57420b70f6c39d1df234753f3ec9' + '9381d3cee3c24de8b1df9a4c4d626a2d9d20bad695133e3dcecc9f0a8277880a') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i "$srcdir/e4rat-static_core.patch" unset LDFLAGS + sed -i '/stdlib.h/a #include <unistd.h>' src/fiemap.cc cmake -DCMAKE_BUILD_TYPE=Release . make } @@ -31,4 +35,3 @@ package() { make DESTDIR="$pkgdir" install install -dm755 "$pkgdir/var/lib/$pkgname" } - diff --git a/community/e4rat/e4rat-static_core.patch b/community/e4rat/e4rat-static_core.patch new file mode 100644 index 000000000..f9aac8208 --- /dev/null +++ b/community/e4rat/e4rat-static_core.patch @@ -0,0 +1,15 @@ +--- src/CMakeLists.txt.orig 2012-04-16 13:52:10.993586393 +0200 ++++ src/CMakeLists.txt 2012-04-16 13:52:22.503586159 +0200 +@@ -5,11 +5,7 @@ + MESSAGE(FATAL_ERROR "Do not run cmake on subdirectories") + ENDIF() + +-if(CMAKE_SIZEOF_VOID_P MATCHES 4) +- SET(BUILD_CORE_LIBRARY_STATIC 0) +-else(CMAKE_SIZEOF_VOID_P MATCHES 4) +- SET(BUILD_CORE_LIBRARY_STATIC 1) +-endif(CMAKE_SIZEOF_VOID_P MATCHES 4) ++SET(BUILD_CORE_LIBRARY_STATIC 1) + + #TODO permit link dependencies not static + #set(LINK_DEPENDENIES "static") diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD index a6091b4e3..6577de78a 100644 --- a/community/etl/PKGBUILD +++ b/community/etl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65164 2012-02-20 05:28:07Z spupykin $ +# $Id: PKGBUILD 69579 2012-04-19 07:26:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=etl -pkgver=0.04.14 -pkgrel=2 +pkgver=0.04.15 +pkgrel=1 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library" arch=(i686 x86_64 'mips64el') url="http://synfig.org" @@ -14,7 +14,7 @@ conflicts=('synfig-etl') replaces=('synfig-etl') #source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.04.tar.gz) source=(http://downloads.sourceforge.net/project/synfig/ETL/$pkgver/ETL-$pkgver.tar.gz) -md5sums=('7cb91905cbe07af327340aeba2226c06') +md5sums=('aac5038cdb4067100e57fb52337b0cfd') build() { cd $srcdir/ETL-$pkgver diff --git a/community/fwbuilder/PKGBUILD b/community/fwbuilder/PKGBUILD new file mode 100644 index 000000000..ae559607c --- /dev/null +++ b/community/fwbuilder/PKGBUILD @@ -0,0 +1,31 @@ +# $Id +# Maintainer: Kevin Piche <kevin@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=fwbuilder +pkgver=5.1.0.3599 +pkgrel=1 +pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms" +url="http://www.fwbuilder.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libxslt' 'net-snmp' 'qt') +conflicts=('libfwbuilder') +install=fwbuilder.install +source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/${pkgver%.*}/fwbuilder-${pkgver}.tar.gz" + 'fwbuilder-gcc47.patch') +sha256sums=('452514a1ec0be1416bfca93603e6c89deb91d1a3a19671c64b5a8868a3743daf' + 'd7c602d5b99c6e40403c0b02e34abf15de83802257ca5ce80ad53d486b692f27') + +build() { + cd "${srcdir}/fwbuilder-${pkgver}" + patch -p1 -i "$srcdir/fwbuilder-gcc47.patch" + ./autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/fwbuilder-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/community/fwbuilder/fwbuilder-gcc47.patch b/community/fwbuilder/fwbuilder-gcc47.patch new file mode 100644 index 000000000..59cd64a6f --- /dev/null +++ b/community/fwbuilder/fwbuilder-gcc47.patch @@ -0,0 +1,13 @@ +Only in fwbuilder-5.0.1.3592: patches +Only in fwbuilder-5.0.1.3592: .pc +diff -upr fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h /var/tmp/build-root/home/abuild/rpmbuild/BUILD/fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h +--- fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2011-12-08 02:02:07.000000000 +0100 ++++ /var/tmp/build-root/home/abuild/rpmbuild/BUILD/fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-03-17 22:29:16.317275376 +0100 +@@ -31,6 +31,7 @@ + + #include <time.h> //for time_t definition + #include <pthread.h> ++#include <unistd.h> + + #include <string> + #include <queue> diff --git a/community/fwbuilder/fwbuilder.install b/community/fwbuilder/fwbuilder.install new file mode 100644 index 000000000..45f0c2242 --- /dev/null +++ b/community/fwbuilder/fwbuilder.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 452f0cb2e..dda84c6ff 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68357 2012-03-22 23:04:26Z svenstaro $ +# $Id: PKGBUILD 69414 2012-04-16 00:32:44Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,7 +7,7 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=2.7.4 +pkgver=2.7.5 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr') makedepends=('mesa') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('cf3843ff6b4324a3e8003252f6b20cd0') +md5sums=('b9ef11d08b6283b1b4a274fcf995fd79') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD index 1479b6c64..6606bb974 100644 --- a/community/incron/PKGBUILD +++ b/community/incron/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55563 2011-09-14 10:20:14Z andrea $ +# $Id: PKGBUILD 69436 2012-04-16 10:50:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: scj <scj(at)archlinux(dot)us> pkgname=incron -pkgver=0.5.9 -pkgrel=2 +pkgver=0.5.10 +pkgrel=1 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods" arch=('i686' 'x86_64' 'mips64el') url="http://incron.aiken.cz/" @@ -15,26 +15,27 @@ install=incron.install source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz" 'incron.init') options=('emptydirs') -md5sums=('a285b9e14af7bf9f9524fe051a06255f' +md5sums=('67f8b671db8169edccc8ef11c7d2c8be' '648e1ca1a4b1e624401d9d71aa3756b3') build() { cd "${srcdir}"/$pkgname-$pkgver - - install -D -m 755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond - install -d "${pkgdir}"/usr/share/man "${pkgdir}"/usr/{s,}bin - + sed -i '1,1i#include <unistd.h>' inotify-cxx.cpp icd-main.cpp sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp - make } package() { cd "${srcdir}"/$pkgname-$pkgver + + install -d "${pkgdir}"/usr/share/man "${pkgdir}"/usr/{s,}bin + make PREFIX="${pkgdir}"/usr \ MANPATH="${pkgdir}"/usr/share/man \ USERDATADIR="${pkgdir}"/var/spool/incron \ CFGDIR="${pkgdir}"/etc \ SYSDATADIR="${pkgdir}"/etc/incron.d install + + install -Dm0755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond } diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index ad7fa29f4..0652947d2 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 69505 2012-04-17 12:51:53Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived pkgver=1.2.2 -pkgrel=3 +pkgrel=4 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64') url='http://www.keepalived.org/' @@ -13,10 +13,12 @@ backup=('etc/keepalived/keepalived.conf' 'etc/conf.d/keepalived') depends=('openssl' 'popt' 'libnl1') source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.rc' + 'keepalived.service' 'keepalived.conf' 'ip_vs_moved.patch') md5sums=('f68327ca142616a8463d2d105db122cd' 'baeb62a682c2b59d732cea84bf52cc87' + '7a327df915700dcd45a049d099c9c42b' '9c8142da8730ad27a345587dea83ced7' '87ee19c85adaedd3eb11bea8a5865d47') @@ -37,8 +39,11 @@ package() { mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples" # add initscripts - install -D -m 755 ../$pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" - install -D -m 644 ../$pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" + cd .. + install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname" + install -D -m 644 $pkgname.service \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" } diff --git a/community/keepalived/keepalived.service b/community/keepalived/keepalived.service new file mode 100644 index 000000000..c20f18695 --- /dev/null +++ b/community/keepalived/keepalived.service @@ -0,0 +1,9 @@ +[Unit] +Description=Keepalive Daemon + +[Service] +EnvironmentFile=/etc/conf.d/keepalived +ExecStart=/usr/sbin/keepalived --dont-fork $DAEMON_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/libcryptui/PKGBUILD b/community/libcryptui/PKGBUILD index 3e015cecf..cae4d802c 100644 --- a/community/libcryptui/PKGBUILD +++ b/community/libcryptui/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 69329 2012-04-13 22:06:22Z bgyorgy $ +# $Id: PKGBUILD 69509 2012-04-17 14:38:21Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libcryptui -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Library for OpenPGP prompts" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('23e84fd9e733e58bd1640b229cfc35830287628125f0f15604ea6aecd606fac7') +sha256sums=('fad4addf5c5b6588f492a720edce59f925190e4cdf3672984f53b25327f10fd5') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index de9c8c090..51cb23690 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68074 2012-03-17 18:50:38Z spupykin $ +# $Id: PKGBUILD 69442 2012-04-16 11:13:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.54 -pkgrel=1 +pkgver=0.7.56 +pkgrel=2 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64' 'mips64el') url="http://mediainfo.sourceforge.net" @@ -13,11 +13,15 @@ depends=( 'curl' 'libmms' 'libzen') makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 - libmediainfo-0.7.50-libmms.patch) -md5sums=('4d936fc2122ad1199e3185d2d6053715' - '2f4b21cc250f663d52b497dedb963e3b') + libmediainfo-0.7.50-libmms.patch + gcc-4.7.patch) +md5sums=('a41c484fea74d34f8f1b430a4d444a72' + '2f4b21cc250f663d52b497dedb963e3b' + '3221024ca99fb941d8eb5302ae470c6d') build() { + cd $srcdir/MediaInfoLib/ + patch -p1 <$srcdir/gcc-4.7.patch cd $srcdir/MediaInfoLib/Project/GNU/Library sh ./autogen ./configure --prefix=/usr --enable-shared --disable-static --with-libcurl --with-libmms diff --git a/community/libmediainfo/gcc-4.7.patch b/community/libmediainfo/gcc-4.7.patch new file mode 100644 index 000000000..5bdfc53e3 --- /dev/null +++ b/community/libmediainfo/gcc-4.7.patch @@ -0,0 +1,79 @@ +diff -aur MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp MediaInfoLib.patched/Source/MediaInfo/Reader/Reader_libcurl.cpp +--- MediaInfoLib/Source/MediaInfo/Reader/Reader_libcurl.cpp 2012-04-08 20:25:35.000000000 +0200 ++++ MediaInfoLib.patched/Source/MediaInfo/Reader/Reader_libcurl.cpp 2012-04-13 05:14:46.924995168 +0200 +@@ -249,15 +249,15 @@ + #else
+ libcurl_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!libcurl_Module)
+- libcurl_Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ libcurl_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ #endif
+ if (!libcurl_Module)
+ {
+diff -aur MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h MediaInfoLib.patched/Source/MediaInfoDLL/MediaInfoDLL.h +--- MediaInfoLib/Source/MediaInfoDLL/MediaInfoDLL.h 2012-04-08 12:08:50.000000000 +0200 ++++ MediaInfoLib.patched/Source/MediaInfoDLL/MediaInfoDLL.h 2012-04-13 05:14:05.481020899 +0200 +@@ -248,24 +248,24 @@ +
+ #ifdef MEDIAINFO_GLIBC
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- if (!g_module_symbol (MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfo_##_Name)) \
++ if (!g_module_symbol (MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfo_##_Name)) \
+ Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- if (!g_module_symbol (MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfoList_##_Name)) \
++ if (!g_module_symbol (MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfoList_##_Name)) \
+ Errors++;
+ #elif defined (_WIN32) || defined (WIN32)
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfo_##_Name==NULL) Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfoList_##_Name==NULL) Errors++;
+ #else
+ #define MEDIAINFO_ASSIGN(_Name,_Name2) \
+- MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfo_##_Name==NULL) Errors++;
+ #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
+- MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \
++ MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \
+ if (MediaInfoList_##_Name==NULL) Errors++;
+ #endif
+
+@@ -317,15 +317,15 @@ + #else
+ MediaInfo_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ if (!MediaInfo_Module)
+- MediaInfo_Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
++ MediaInfo_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+ #endif
+ if (!MediaInfo_Module)
+ return (size_t)-1;
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 0366a92be..184aa6a1f 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69188 2012-04-10 02:21:11Z spupykin $ +# $Id: PKGBUILD 69468 2012-04-16 15:11:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.11 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -36,15 +36,17 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd-guests.conf.d openbsd-netcat-default.patch unixperms.patch - yajl-2.x.patch) + yajl-2.x.patch + "libvirt-qemu-ssh-user.patch::http://libvirt.org/git/?p=libvirt.git;a=patch;h=4eb1c2560d1ab8bae620788d343e9e7b32ddc066") md5sums=('6e9fab115075a8fd21d9bd0d7e558a52' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - '4091cf082b1b743f5e7af060b3760276' + '8297b1be794a24cc77f66af9380ace59' 'bc2971dacdbac967fc3474e50affc345' 'b0be50eb9dfe4d133decf23b60880f7d' 'db95aecdf2ccf3693fef5821cdcb7eba' - '5745bb8d0b254abb7a3528c66e03b0f9') + '5745bb8d0b254abb7a3528c66e03b0f9' + '40f6ad1d227ae2c41b4a83f7a3165ffb') build() { cd "$srcdir/$pkgname-$pkgver" @@ -62,6 +64,7 @@ build() { # patch -Np1 -i "$srcdir"/unixperms.patch [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch + [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/libvirt-qemu-ssh-user.patch export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d index e07478534..670b5431a 100755 --- a/community/libvirt/libvirtd-guests.rc.d +++ b/community/libvirt/libvirtd-guests.rc.d @@ -15,7 +15,34 @@ libvirt_get_guest_state() # list IDs of running guests libvirt_list() { - virsh $LIBVIRTD_URI list | awk 'NR > 2 {print $2}' + + list=$(virsh $LIBVIRTD_URI list) + + if [ $? -ne 0 ]; then + RETVAL=1 + return 1 + fi + + uuids= + for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do + uuid=$(virsh $LIBVIRTD_UTI dominfo $id | awk '/^UUID:/{print $2}') + if [ -z "$uuid" ]; then + RETVAL=1 + return 1 + fi + uuids="$uuids $uuid" + done + + echo $uuids + +} + +libvirt_domname() +{ + uuid=$1 + name=$(virsh $LIBVIRTD_URI dominfo $uuid | awk 'NR == 2 {$1=""; print}') + + echo $name } # suspend guest by name @@ -57,9 +84,11 @@ libvirt_stop_all() { mkdir -p `dirname $LIBVIRTD_LISTFILE` echo -n >$LIBVIRTD_LISTFILE + for i in `libvirt_list`; do + name=`libvirt_domname $i` if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then - stat_busy "Suspending libvirtd/$i guest" + stat_busy "Suspending libvirtd/$name guest" libvirt_suspend "$i" else stat_busy "Shutting libvirtd/$i guest down" @@ -75,7 +104,8 @@ libvirt_start_all() { if [ -f $LIBVIRTD_LISTFILE ]; then for i in `cat $LIBVIRTD_LISTFILE`; do - stat_busy "Starting/resuming libvirtd/$i guest" + name='libvirt_domname $i' + stat_busy "Starting/resuming libvirtd/$name guest" libvirt_start "$i" [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail done @@ -101,7 +131,7 @@ case "$1" in $0 start ;; *) - echo $"Usage: $0 {start|stop|restart}" - ;; + echo $"Usage: $0 {start|stop|restart}" + ;; esac exit 0 diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index ce3e18720..338660765 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68076 2012-03-17 18:51:40Z spupykin $ +# $Id: PKGBUILD 69420 2012-04-16 09:40:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: hydro <hydro@freenet.de> pkgname=libzen -pkgver=0.4.25 +pkgver=0.4.26 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('f30a139d506170aeeb3bc47d15e10fae') +md5sums=('6509bd3787509f4e62e48a99884db636') build() { cd $srcdir/ZenLib/Project/GNU/Library diff --git a/community/lilyterm/PKGBUILD b/community/lilyterm/PKGBUILD index 527888dcc..e554ed03a 100644 --- a/community/lilyterm/PKGBUILD +++ b/community/lilyterm/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 66757 2012-02-28 08:33:19Z giovanni $ +# $Id: PKGBUILD 69562 2012-04-18 14:35:46Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: TDY <tdy@gmx.com> # Contributor: DonVla <donvla@users.sourceforge.net> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=lilyterm -pkgver=0.9.8 -pkgrel=2 +pkgver=0.9.9 +pkgrel=1 pkgdesc="A light and easy to use libvte based X terminal emulator" arch=('i686' 'x86_64' 'mips64el') url="http://lilyterm.luna.com.tw/index_en.html" @@ -14,11 +14,10 @@ license=('GPL3') depends=('vte') makedepends=('gettext' 'intltool' 'pkgconfig>=0.16') source=(http://lilyterm.luna.com.tw/file/$pkgname-$pkgver.tar.gz) -md5sums=('995f7b4634523bf5e150b529a4bdbf6f') +md5sums=('ae89dca908951ce2fafa60b90c892d1a') build() { cd "$srcdir/lilyterm-$pkgver" - ./autogen.sh ./configure --prefix=/usr \ --sysconfdir=/etc make diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 7a6b8e2d9..d9e379ba4 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68080 2012-03-17 18:53:14Z spupykin $ +# $Id: PKGBUILD 69429 2012-04-16 09:59:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.54 +pkgver=0.7.56 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('c851998158213a6b837048d67e1c2b9a') +md5sums=('fdd41eb501e0936035046a9277c29fa5') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index 8f42bf55b..2012f0f90 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68078 2012-03-17 18:52:26Z spupykin $ +# $Id: PKGBUILD 69427 2012-04-16 09:59:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.54 +pkgver=0.7.56 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('c851998158213a6b837048d67e1c2b9a') +md5sums=('fdd41eb501e0936035046a9277c29fa5') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index de185bc66..22da899e8 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67337 2012-03-09 05:57:19Z bpiotrowski $ +# $Id: PKGBUILD 69383 2012-04-15 05:22:45Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori -pkgver=0.4.4 +pkgver=0.4.5 pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('a6578ebfd237c0f22cce49113b95f70c') +md5sums=('14288197a1e2251b7c0803e1448daa0e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index 6b420707f..6f15eab87 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64114 2012-02-08 23:57:08Z cbrannon $ +# $Id: PKGBUILD 69477 2012-04-16 17:52:09Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=mldonkey -pkgver=3.1.0 -pkgrel=3 +pkgver=3.1.1 +pkgrel=1 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64' 'mips64el') url="http://mldonkey.sourceforge.net/" @@ -18,8 +18,7 @@ backup=('etc/conf.d/mldonkey') install=mldonkey.install source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 mldonkeyd - mldonkey.conf - mldonkey.desktop) + mldonkey.conf) build() { cd "$srcdir/$pkgname-$pkgver" @@ -34,13 +33,12 @@ package() { install -Dm644 "$srcdir/$pkgname-$pkgver/icons/rsvg/type_source_normal.svg" \ "$pkgdir/usr/share/icons/mldonkey.svg" - install -Dm644 "$srcdir/mldonkey.desktop" \ - "$pkgdir/usr/share/applications/mldonkey.desktop" install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey" install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" + install -Dm644 "distrib/mldonkey.desktop" \ + "$pkgdir/usr/share/applications/mldonkey.desktop" } -md5sums=('072726d158ba1e936c554be341e7ceff' +md5sums=('5954ee7cfae18afb2732549fd990e7d6' '9e90003a012cf17b548dcc647961ffa6' - '1f86d92db51c62cded0e6f3833057dee' - '1de3266caa49f82bee73ba891eea12cf') + '1f86d92db51c62cded0e6f3833057dee') diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 7913effef..c93ca71ee 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65327 2012-02-21 01:36:41Z spupykin $ +# $Id: PKGBUILD 69518 2012-04-17 19:42:41Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -8,7 +8,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.7.8 -pkgrel=1 +pkgrel=2 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" @@ -20,7 +20,7 @@ md5sums=('4bdce45d832e065ac4c8c8ca56765e1d') build() { # mlt - cd $srcdir/mlt-$pkgver + cd "$srcdir/mlt-$pkgver" # [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= SSE2=--disable-sse2 @@ -33,7 +33,7 @@ build() { make # mlt python bindings - cd $srcdir/mlt-$pkgver/src/swig/python + cd "$srcdir/mlt-$pkgver/src/swig/python" sed -i 's_path=`which python_path=`which python2_' build sed -i 's_`python -c_`python2 -c_' build sed -i 's#python-config#python2-config#' build @@ -45,16 +45,16 @@ package_mlt() { optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa") conflicts=('mlt++<=0.3.8') - cd $srcdir/mlt-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/mlt-$pkgver" + make DESTDIR="$pkgdir" install } package_mlt-python-bindings() { depends=('python2' 'mlt') - cd $srcdir/mlt-$pkgver/src/swig/python - mkdir -p $pkgdir/usr/lib/python2.7/ - install -m755 mlt.py $pkgdir/usr/lib/python2.7/ - install -m755 _mlt.so $pkgdir/usr/lib/python2.7/ - install -m755 mlt_wrap.o $pkgdir/usr/lib/python2.7/ + cd "$srcdir/mlt-$pkgver/src/swig/python" + mkdir -p "$pkgdir/usr/lib/python2.7/" + install -m755 mlt.py "$pkgdir/usr/lib/python2.7/" + install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/" + install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/" } diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD index 7c4ef3bc9..d0b4a9644 100644 --- a/community/moreutils/PKGBUILD +++ b/community/moreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67622 2012-03-13 14:24:57Z spupykin $ +# $Id: PKGBUILD 69438 2012-04-16 10:51:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=moreutils -pkgver=0.45 -pkgrel=3 +pkgver=0.46 +pkgrel=1 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" arch=('i686' 'x86_64' 'mips64el') url="http://kitenet.net/~joey/code/moreutils.html" @@ -15,7 +15,7 @@ optdepends=('perl-timedate' 'perl-time-duration' 'perl-ipc-run') options=('!emptydirs' 'zipman') replaces=(moreutils-svn) source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz) -md5sums=('b30306cd7312219551b890fbcbf984c4') +md5sums=('658f9cc6b6dcc0b50dcff714e13b22dc') build() { cd $srcdir/moreutils diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 37a58eecd..824e33225 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69262 2012-04-11 06:53:29Z jconder $ +# $Id: PKGBUILD 69571 2012-04-19 02:21:24Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.25 -pkgrel=1 +pkgrel=3 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -24,6 +24,8 @@ optdepends=('glew: for GPU commercial flagging' 'libxml2: to read blu-ray metadata' 'openssl: for AirTunes (RAOP) support' 'xmltv: to download tv listings') +conflicts=('myththemes' 'mythplugins-mythvideo') +replaces=('myththemes' 'mythplugins-mythvideo') backup=('etc/conf.d/mythbackend') install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" @@ -33,7 +35,7 @@ source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" md5sums=('e49c81de40e279c83dcb1b2aa9a45748' '6090f5f22a8584db80b76cf19869ee41' '62fd98347c56b1d9b795792f83269d25' - '1f72db0586f97a7c3fd3155dfa9a6c6f') + 'ab962d83614cbd0ac11ce3fcc929829d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/mythtv/mythbackend.conf b/community/mythtv/mythbackend.conf index 15a248450..49bbca877 100644 --- a/community/mythtv/mythbackend.conf +++ b/community/mythtv/mythbackend.conf @@ -1,4 +1,3 @@ -#!/bin/bash # # Copyright (c) by the MythTV Development Team. # diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD index d16836288..b5b065b6e 100644 --- a/community/naev/PKGBUILD +++ b/community/naev/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68487 2012-03-26 07:00:35Z svenstaro $ +# $Id: PKGBUILD 69406 2012-04-15 22:34:54Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Johan Rehnberg <cleanrock@gmail.com> pkgname=naev -pkgver=0.5.2 +pkgver=0.5.3 pkgrel=1 pkgdesc='2D action/rpg space game' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL3') depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data') makedepends=('freeglut') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c23a2ca80553a7d1d75497dc6672e61b') +md5sums=('bec719b3daa33ec190d785120a7b0159') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/neatx/PKGBUILD b/community/neatx/PKGBUILD index a67c2df6e..e59f6f61c 100644 --- a/community/neatx/PKGBUILD +++ b/community/neatx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66247 2012-02-23 05:19:47Z spupykin $ +# $Id: PKGBUILD 69462 2012-04-16 14:21:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Nicolas Doualot <packages@slubman.info> pkgname=neatx pkgver=0.3.1 -pkgrel=11 +pkgrel=12 pkgdesc="A free NX server by google" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/neatx/" @@ -24,7 +24,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" patch -i "$srcdir/constants.archlinux.patch" -p2 - ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html + ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html2 make make DESTDIR="$pkgdir/" install chmod 777 "$pkgdir/var/lib/neatx/sessions" diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 95cf51837..cb798bf21 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 61581 2012-01-03 18:29:08Z arodseth $ +# $Id: PKGBUILD 69550 2012-04-18 07:41:47Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> + pkgname=nemiver -pkgver=0.9.1 -pkgrel=2 +pkgver=0.9.2 +pkgrel=1 pkgdesc="C/C++ debugger for GNOME" arch=('x86_64' 'i686') license=('GPL') @@ -12,8 +13,8 @@ depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsetti makedepends=('boost' 'intltool' 'gnome-doc-utils') install=nemiver.install source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") -options=(!libtool !emptydirs) -md5sums=('9c0275e7a2d9f9fb48f279387969281b') +options=('!libtool' '!emptydirs') +sha256sums=('770392965a45d728b798da3c6111c4e7cb55d51f109a78aedead99083f8e2520') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index a6a7b6939..307397266 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,10 +1,18 @@ -# $Id: PKGBUILD 67860 2012-03-15 15:25:27Z spupykin $ +# $Id: PKGBUILD 69421 2012-04-16 09:40:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> +_doc_root=/usr/share/nginx/http +_server_root=/etc/nginx +_conf_path=${_server_root}/conf +_tmp_path=/var/spool/nginx +_log_path=/var/log/nginx +_user=http +_group=http + pkgname=nginx -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') @@ -26,17 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf" "etc/conf.d/nginx") source=("http://nginx.org/download/nginx-$pkgver.tar.gz" 'nginx') -md5sums=('58360774e4875e8fc4c4286448cb54d0' - '0e8032d3ba26c3276e8c7c30588d375f') - -_doc_root=/usr/share/nginx/http -_server_root=/etc/nginx -_conf_path=${_server_root}/conf -_tmp_path=/var/spool/nginx -_log_path=/var/log/nginx -_user=http -_group=http -md5sums=('019844e48c34952253ca26dd6e28c35c' +md5sums=('17da4802209b83d9bebb0f0edd975dfc' '0e8032d3ba26c3276e8c7c30588d375f') build() { @@ -59,6 +57,7 @@ build() { --with-http_gzip_static_module \ --with-ipv6 \ --add-module=/usr/lib/passenger/ext/nginx \ + --conf-path=${_conf_path}/nginx.conf \ --http-scgi-temp-path=${_tmp_path} \ --http-uwsgi-temp-path=${_tmp_path} #--with-http_mp4_module \ @@ -92,7 +91,7 @@ package() { } EOF - sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/$_conf_path/nginx.conf + sed -i -e "s/\<user\s\+\w\+;/user $_user;/g" $pkgdir/${_conf_path}/nginx.conf install -d $pkgdir/$_tmp_path diff --git a/community/odt2txt/PKGBUILD b/community/odt2txt/PKGBUILD new file mode 100644 index 000000000..8ff16fba4 --- /dev/null +++ b/community/odt2txt/PKGBUILD @@ -0,0 +1,21 @@ +# $Id: PKGBUILD 69493 2012-04-17 10:36:52Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Vladimir Chizhov <jagoterr@gmail.com> + +pkgname=odt2txt +pkgver=0.4 +pkgrel=1 +pkgdesc="extracts the text out of OpenDocument Texts" +url="http://stosberg.net/odt2txt/" +license=("GPL2") +arch=('i686' 'x86_64') +depends=('zlib') +source=(http://stosberg.net/odt2txt/$pkgname-$pkgver.tar.gz) +md5sums=('6fe3bd261ce2dde2810244bbe969bbc5') + +build() { + cd $srcdir/$pkgname-$pkgver + make + install -Dm755 odt2txt $pkgdir/usr/bin/odt2txt + install -Dm644 odt2txt.1 $pkgdir/usr/share/man/man1/odt2txt.1 +} diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD index 2c0dcf5c3..ac4f13b38 100644 --- a/community/pound/PKGBUILD +++ b/community/pound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64351 2012-02-11 23:23:24Z allan $ +# $Id: PKGBUILD 69456 2012-04-16 13:52:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=pound pkgver=2.6 -pkgrel=1 +pkgrel=2 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" arch=('i686' 'x86_64' 'mips64el') url="http://www.apsis.ch/pound/index_html" @@ -15,18 +15,14 @@ backup=(etc/pound/pound.cfg) source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz pound.init pound.runit - pound.cfg - pound-2.5-openssl.patch) + pound.cfg) md5sums=('8c913b527332694943c4c67c8f152071' - '4df8548f106fca08323e8e4071beaa43' - '716cc0bf334b594751bece24c7d1df2d' - '8937808acd22c6391ebe4340af8df854' - 'c2c48dc395ffc045f9d35394992292d0') + 'bd3bddb6dc17fdcab824815a4705b055' + '4bd5e2a8d8e707eb900ae88929e00d4c' + '8937808acd22c6391ebe4340af8df854') build() { cd $srcdir/Pound-$pkgver - # Patch to build against OpenSSL 1.0.0 (Thanks Fedora!) -# patch -p1 -i $srcdir/pound-2.5-openssl.patch || return 1 ./configure --prefix=/usr --sysconfdir=/etc/pound make } diff --git a/community/pound/pound.init b/community/pound/pound.init index 369d6626d..b8187c81f 100755 --- a/community/pound/pound.init +++ b/community/pound/pound.init @@ -6,33 +6,33 @@ case "$1" in start) - stat_busy "Starting Pound" - /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid & - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pound - stat_done - fi - ;; + stat_busy "Starting Pound" + /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pound + stat_done + fi + ;; stop) - stat_busy "Stopping Pound" + stat_busy "Stopping Pound" [ -f /var/run/pound.pid ] && kill `cat /var/run/pound.pid` - if [ $? -gt 0 ]; then - stat_fail - else + if [ $? -gt 0 ]; then + stat_fail + else rm -f /var/run/pound.pid - rm_daemon pound - stat_done - fi - ;; + rm_daemon pound + stat_done + fi + ;; restart) - $0 stop + $0 stop sleep 1 - $0 start - ;; + $0 start + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" ;; esac exit 0 diff --git a/community/pound/pound.runit b/community/pound/pound.runit index 2e0be991e..ed59ea046 100755 --- a/community/pound/pound.runit +++ b/community/pound/pound.runit @@ -11,7 +11,7 @@ SVC=pound PID=`pidof $BIN` if [ -z "$PID" ] then - if [ -f /var/run/$SVC.pid ] + if [ -f /var/run/$SVC.pid ] then rm /var/run/$SVC.pid rm_daemon $SVC @@ -21,4 +21,3 @@ then else [ -z $PID ] || exec watchpid $PID fi - diff --git a/community/qtemu/PKGBUILD b/community/qtemu/PKGBUILD index 4e8d21cf4..bc8ea3864 100644 --- a/community/qtemu/PKGBUILD +++ b/community/qtemu/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 65491 2012-02-21 06:36:26Z spupykin $ +# $Id: PKGBUILD 69470 2012-04-16 15:12:06Z spupykin $ # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Previous Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=qtemu pkgver=1.0.5 -pkgrel=4 +pkgrel=5 pkgdesc="Graphical user interface for QEMU written in Qt4" url="http://qtemu.org" license=("GPL") arch=('i686' 'x86_64' 'mips64el') makedepends=('cmake') depends=('qemu' 'qt>=4.1') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('3b93e209dc62e52a1d94c8eb24d0b149') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + http://qtemu.svn.sourceforge.net/viewvc/qtemu/trunk/qtemu/misc/qtemu.desktop) +md5sums=('3b93e209dc62e52a1d94c8eb24d0b149' + 'b323b75384fdb327728d2603979f7202') build() { cd "$srcdir/$pkgname-$pkgver" @@ -21,4 +23,5 @@ build() { make DESTDIR="$pkgdir" install install -d "$pkgdir/usr/bin" ln -s /opt/qtemu/bin/qtemu "$pkgdir/usr/bin/qtemu" + install -Dm0644 $srcdir/qtemu.desktop $pkgdir/usr/share/applications/qtemu.desktop } diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 4a05001dd..d029f6dbe 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67278 2012-03-06 10:44:14Z arodseth $ +# $Id: PKGBUILD 69444 2012-04-16 11:14:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,13 +6,14 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.16.2 -pkgrel=2 +pkgver=1.17.1 +pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" -arch=('x86_64' 'i686' 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://www.lesbonscomptes.com/recoll/" license=('GPL') -depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme') +depends=('xapian-core>=1.0.15-1' 'qt' 'openssl' 'hicolor-icon-theme' 'qtwebkit') +makedepends=('python2') optdepends=('libxslt: for XML based formats (fb2,etc)' 'unzip: for the OpenOffice.org documents' 'xpdf: for pdf' @@ -30,16 +31,21 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('f0f29dff2d82ef8541c51963870f31daf28472f3c8822c81c17c346769b77355') +md5sums=('10726fdb6c35898f6349d475fc4097c8') build() { cd "$srcdir/$pkgname-$pkgver" msg2 "Python2 fix" - for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py,rclwar,rclrar} doc/user/usermanual.html; do + export PYTHON=/usr/bin/python2 + for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py,rclwar,rclrar} \ + doc/user/usermanual.html; do sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" done - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' desktop/hotrecoll.py + sed -i 's_python$_python2_' desktop/hotrecoll.py + sed -i 's_python _python2 _' python/recoll/Makefile recollinstall* + + sed -i '1,1i#include <unistd.h>' utils/rclionice.cpp ./configure \ --prefix=/usr \ diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD index 4e5a6c99c..c1369ee0b 100644 --- a/community/remmina/PKGBUILD +++ b/community/remmina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69336 2012-04-14 04:21:10Z lcarlier $ +# $Id: PKGBUILD 69472 2012-04-16 15:12:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=remmina pkgver=1.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="Remmina is a remote desktop client written in GTK+. " arch=(i686 x86_64 'mips64el') url="http://remmina.sourceforge.net/" @@ -11,7 +11,11 @@ license=('GPL') depends=('gtk2' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp' 'libgnome-keyring') makedepends=('intltool' 'pkgconfig' 'cmake' 'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib') -optdepends=('avahi' 'libxkbfile' 'freerdp' 'telepathy-glib') +optdepends=('avahi' + 'libxkbfile' + 'freerdp' + 'telepathy-glib' + 'gnome-keyring') replaces=('remmina-plugins') provides=("grdc" "grdc=$pkgver" 'remmina-plugins') conflicts=("grdc") diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 16d9a181a..2ced64735 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68925 2012-04-06 00:04:01Z dreisner $ +# $Id: PKGBUILD 69475 2012-04-16 15:31:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog @@ -29,7 +29,6 @@ md5sums=('03e237abaa5d47f92c6e655f92f22532' build() { cd ${srcdir}/${pkgname}-${pkgver} - export LDFLAGS="-lestr" ./configure --prefix=/usr \ --enable-mysql \ --enable-pgsql \ @@ -40,6 +39,7 @@ build() { --enable-gnutls \ --enable-inet \ --with-systemdsystemunitdir=/usr/lib/systemd/system + echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile make } package() { diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD index 2f882aa11..297188a87 100644 --- a/community/sslh/PKGBUILD +++ b/community/sslh/PKGBUILD @@ -1,22 +1,24 @@ -# $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 69412 2012-04-15 23:37:55Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> # Contributor: Jason Rodriguez <jason-aur@catloaf.net> pkgname=sslh pkgver=1.10 -pkgrel=5 +pkgrel=6 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer' arch=('i686' 'x86_64' 'mips64el') url='http://www.rutschle.net/tech/sslh.shtml' license=('GPL2') backup=('etc/conf.d/sslh') -source=("http://www.rutschle.net/tech/${pkgname}-${pkgver}.tar.gz" +source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" 'sslh.rc' - 'sslh.conf') + 'sslh.conf' + 'sslh.service') md5sums=('bc34e9a4770d634633e70589c72708cc' - '0680f09267c33205acf16ac6d4adf926' - '808199410bd6ab67421bf3544f805d1a') + 'f64da291e97f1a99c33cb6ebf939b95b' + '808199410bd6ab67421bf3544f805d1a' + 'ee8a4fcfc1f6839f7c93deb6f59f7fd6') build() { cd $pkgname-$pkgver @@ -27,10 +29,17 @@ build() { } package() { - install -D -m 755 sslh.rc "${pkgdir}/etc/rc.d/sslh" - install -D -m 644 sslh.conf "${pkgdir}/etc/conf.d/sslh" + # install initscripts + install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh" + install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh" + # install systemd service + install -Dm 644 sslh.service "$pkgdir/usr/lib/systemd/system/sslh.service" + # manually install to have both ssl-fork and ssl-select cd $pkgname-$pkgver - make PREFIX="$pkgdir/usr" install + install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork" + install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select" + ln -s sslh-fork "$pkgdir/usr/bin/sslh" + install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc index 05b03bc3e..9c31435a0 100644 --- a/community/sslh/sslh.rc +++ b/community/sslh/sslh.rc @@ -5,7 +5,7 @@ . /etc/conf.d/${0##*/} NAME=sslh -DAEMON=/usr/sbin/sslh +DAEMON=/usr/bin/sslh PID=$(pidof -o %PPID $DAEMON) case "$1" in @@ -24,7 +24,7 @@ case "$1" in $0 start exit 0 ;; - *) + *) echo "usage: ${0##*/} {start|stop|restart}" >&2 ;; esac diff --git a/community/sslh/sslh.service b/community/sslh/sslh.service new file mode 100644 index 000000000..7ccad70e9 --- /dev/null +++ b/community/sslh/sslh.service @@ -0,0 +1,9 @@ +[Unit] +Description=SSL/SSH multiplexer + +[Service] +EnvironmentFile=/etc/conf.d/sslh +ExecStart=/usr/bin/sslh --foreground $DAEMON_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index ed5f0c53c..59f678395 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61992 2012-01-13 15:53:58Z lfleischer $ +# $Id: PKGBUILD 69552 2012-04-18 09:36:36Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel pkgver=4.52 -pkgrel=1 +pkgrel=2 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') url="http://www.stunnel.org" @@ -52,8 +52,8 @@ package() { install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" # move systemd service into place - install -dm755 "$pkgdir/lib/systemd/system" - mv "tools/stunnel.service" "$pkgdir/lib/systemd/system/" + install -dm755 "$pkgdir/usr/lib/systemd/system" + mv "tools/stunnel.service" "$pkgdir/usr/lib/systemd/system/" sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 5f1719a73..397fcc26a 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64414 2012-02-13 03:46:16Z spupykin $ +# $Id: PKGBUILD 69581 2012-04-19 07:27:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig -pkgver=0.63.04 +pkgver=0.63.05 pkgrel=1 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64 'mips64el') @@ -18,7 +18,7 @@ options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz build-fix.patch ffmpeg-0.8.patch) -md5sums=('baa0df3a51d101600771e0d45fcc7d22' +md5sums=('8591cf17c26405d68d2cc050a2929292' 'b5568b06fae1a7ee465b5380b1139b83' 'ebf41046097cfd778dee9a9854561dae') diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD index 3f5f85d7e..053d9c098 100644 --- a/community/synfigstudio/PKGBUILD +++ b/community/synfigstudio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64416 2012-02-13 03:47:06Z spupykin $ +# $Id: PKGBUILD 69586 2012-04-19 09:14:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfigstudio -pkgver=0.63.04 +pkgver=0.63.05 pkgrel=1 pkgdesc="Professional vector animation program (GUI)" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi' install=synfigstudio.install options=('!libtool') source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz) -md5sums=('6bc0d5410df032df6c518adca824ddb6') +md5sums=('ca01b7523118e32c904b681d8ff0a085') build() { cd $srcdir/synfigstudio-$pkgver diff --git a/community/ted/PKGBUILD b/community/ted/PKGBUILD index d6dede015..b81d0edc9 100644 --- a/community/ted/PKGBUILD +++ b/community/ted/PKGBUILD @@ -1,36 +1,40 @@ -# $Id: PKGBUILD 64361 2012-02-11 23:24:27Z allan $ +# $Id: PKGBUILD 69512 2012-04-17 16:00:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ted -pkgver=2.21 -pkgrel=5 +pkgver=2.22 +pkgrel=1 pkgdesc="An easy rich text processor (with footnote support)" arch=('i686' 'x86_64' 'mips64el') url="http://www.nllgg.nl/Ted/" depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2') license=('GPL') -source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz +source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz ted-2.21-libpng15.patch) -md5sums=('34ae855938a3b364eb587cca504ba356' +md5sums=('08162c9164dfdde1d46e41ae64df16be' '0c339b0fa7aec6b150e07e9027cd360c') build() { cd "$srcdir/Ted-$pkgver" sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile - patch -p0 -i ../ted-2.21-libpng15.patch make compile.shared make package.shared } package() { - cd "$srcdir/Ted-$pkgver" - mkdir -p "$pkgdir/usr/share/" - cd "$pkgdir/usr/share/" - tar -zxvf "$srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz" + # unpack package + mkdir -p $pkgdir/usr/share + cd "$pkgdir/usr/share" + tar xzf $srcdir/Ted-$pkgver/tedPackage/*.tar.gz + # move bin/* and share/* mv bin ../ - mkdir -p "$pkgdir/usr/share/man/man1" + mv share/* ./ + rmdir share + # move man pages cd "$pkgdir/usr/share/Ted/" + mkdir -p "$pkgdir/usr/share/man/man1" mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/ + # fix shell script and move them to /usr/bin sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh mv *.sh "$pkgdir/usr/bin/" } diff --git a/community/ucarp/PKGBUILD b/community/ucarp/PKGBUILD index 9b2d22f94..90158ebc1 100644 --- a/community/ucarp/PKGBUILD +++ b/community/ucarp/PKGBUILD @@ -1,24 +1,27 @@ -# $Id$ +# $Id: PKGBUILD 69498 2012-04-17 12:05:31Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ucarp pkgver=1.5.2 -pkgrel=2 +pkgrel=3 pkgdesc='UCARP is a portable implementation of the CARP protocol' arch=('i686' 'x86_64') url='http://www.ucarp.org/project/ucarp' license=('GPL2') depends=('libpcap') optdepends=('iproute2') +backup=('etc/conf.d/ucarp') source=("http://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz" 'ucarp.rc' 'ucarp.conf' + 'ucarp.service' 'ucarp.8' '01-fix-getopt.patch' '02-fix-downscript-on-error.c') md5sums=('e3caa733316a32c09e5d3817617e9145' - 'd941d2978c5b43154a29212115729519' - '9b27f0cf552511716b1ce3678b7a77ca' + '11675170473c7e11131d90c3d64ff333' + '79c01b9ba580d2431997efb9df59cf5d' + '582d59cd969b6447a710f58bbaf28846' '05b64a5daeb7aab45a2a59e0f4d83c8f' '3f20699aaf2ef8139dcd337f1e7f06ab' '09d26233c37956cf08e629554a91b8cd') @@ -37,13 +40,6 @@ build() { } package() { - # add initscripts - install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" - install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" - - # add manpage - install -D -m 644 $pkgname.8 "${pkgdir}/usr/share/man/man8/$pkgname.8" - cd $pkgname-$pkgver make DESTDIR="$pkgdir" install @@ -55,6 +51,17 @@ package() { # install README install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README" + + # add initscripts + cd .. + install -D -m 755 $pkgname.rc "${pkgdir}/etc/rc.d/$pkgname" + install -D -m 644 $pkgname.conf "${pkgdir}/etc/conf.d/$pkgname" + install -D -m 644 $pkgname.service \ + "${pkgdir}/usr/lib/systemd/system/$pkgname.service" + + # add manpage + install -D -m 644 $pkgname.8 "${pkgdir}/usr/share/man/man8/$pkgname.8" + } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ucarp/ucarp.conf b/community/ucarp/ucarp.conf index 386c1df8f..1fb8eae07 100644 --- a/community/ucarp/ucarp.conf +++ b/community/ucarp/ucarp.conf @@ -1,3 +1,3 @@ # vim:set ts=2 sw=2 ft=sh noet: -DAEMON_OPTS='--daemonize --interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh' +DAEMON_OPTS='--interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh' diff --git a/community/ucarp/ucarp.rc b/community/ucarp/ucarp.rc index 33f40268f..f8c9d54f3 100644 --- a/community/ucarp/ucarp.rc +++ b/community/ucarp/ucarp.rc @@ -7,6 +7,7 @@ NAME=ucarp DAEMON=/usr/sbin/ucarp PID=$(pidof -o %PPID $DAEMON) +DAEMON_OPTS="--daemonize $DAEMON_OPTS" case "$1" in start) diff --git a/community/ucarp/ucarp.service b/community/ucarp/ucarp.service new file mode 100644 index 000000000..d4afd4d0d --- /dev/null +++ b/community/ucarp/ucarp.service @@ -0,0 +1,9 @@ +[Unit] +Description=UCARP daemon + +[Service] +EnvironmentFile=/etc/conf.d/ucarp +ExecStart=/usr/sbin/ucarp $DAEMON_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD index 01eb6df30..bf103729d 100644 --- a/community/uget/PKGBUILD +++ b/community/uget/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 68396 2012-03-24 05:49:50Z bgyorgy $ +# $Id: PKGBUILD 69404 2012-04-15 22:27:21Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=uget -pkgver=1.8.0 -pkgrel=3 +pkgver=1.8.1 +pkgrel=1 pkgdesc="GTK+ download manager featuring download classification and HTML import" arch=('i686' 'x86_64') url="http://urlget.sourceforge.net/" -license=('GPL') +license=('LGPL') depends=('libnotify' 'gtk3' 'gstreamer0.10' 'curl' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool') optdepends=('aria2: alternative backend') install=$pkgname.install source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz) -md5sums=('2e0ad66ecdd0104b8fb27b29fdb44df1') +md5sums=('e3fc14042820f0496f12c85c3847c6f8') build() { cd "$srcdir/$pkgname-$pkgver" - # Fix aria2 arguments - sed -i 's/\"--enable-xml-rpc\"/"--enable-rpc"/' uget-gtk/UgSetting.c - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-appindicator --with-gtk3 make diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD index 7141e1acb..4991b3673 100644 --- a/community/vsftpd/PKGBUILD +++ b/community/vsftpd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69224 2012-04-10 09:36:37Z bpiotrowski $ +# $Id: PKGBUILD 69566 2012-04-18 17:36:30Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=vsftpd pkgver=3.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64' 'mips64el') url="https://security.appspot.com/vsftpd.html" @@ -28,7 +28,7 @@ build() { -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ -i builddefs.h - make CFLAGS="${CFLAGS} -fPIC" + make CFLAGS="${CFLAGS} -fPIE" LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" } package() { diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index d06da0007..981e41d6e 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 67933 2012-03-16 10:22:42Z spupykin $ +# $Id: PKGBUILD 69440 2012-04-16 10:52:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=5 +pkgrel=6 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" license=('LGPL') backup=('etc/conf.d/xmms2d.conf') -depends=('sqlite3' 'libmad') +depends=('sqlite' 'libmad') makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib' 'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout' 'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex' - 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug') # avahi + 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi') optdepends=('alsa-lib: ALSA audio output' 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' 'boost: C++ language bindings' @@ -24,6 +24,7 @@ optdepends=('alsa-lib: ALSA audio output' 'flac: FLAC support' 'jack: JACK audio output' 'libao: liboa audio output' + 'libgme: game-music-emu support' 'libofa: MusicDNS fingerprinting' 'libmms: play MMS streams' 'libmodplug: to play MOD files' @@ -57,15 +58,19 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} # python2 fix - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf +# sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf ./waf configure --prefix=/usr \ - --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps \ + --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater \ --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \ --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` ./waf build ./waf --destdir=${pkgdir} install + PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d + ./waf build + ./waf --destdir=${pkgdir} install + install -D -m 0755 ../xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d install -D -m 0644 ../xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf } diff --git a/community/zathura-djvu/PKGBUILD b/community/zathura-djvu/PKGBUILD index 0c4010f3c..df7597ad2 100644 --- a/community/zathura-djvu/PKGBUILD +++ b/community/zathura-djvu/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 67824 2012-03-14 16:28:32Z spupykin $ +# $Id: PKGBUILD 69556 2012-04-18 10:59:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: karnath <karnathtorjian@gmail.com> pkgname=zathura-djvu -pkgver=0.1.0 -pkgrel=1 +pkgver=0.1.1 +pkgrel=2 pkgdesc="Adds DjVu support to zathura by using the djvulibre library" arch=('i686' 'x86_64' 'mips64el') url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/" license=('custom') depends=('djvulibre' 'zathura') source=(https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz) -md5sums=('be4d5966ba353f83b261a389789e0260') +md5sums=('d76bf25ad5c3bef220aebef693ff6aad') build(){ cd ${srcdir}/zathura-djvu-$pkgver make make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/zathura-pdf-poppler/PKGBUILD b/community/zathura-pdf-poppler/PKGBUILD index a461d153a..e35f9315e 100644 --- a/community/zathura-pdf-poppler/PKGBUILD +++ b/community/zathura-pdf-poppler/PKGBUILD @@ -4,7 +4,7 @@ pkgname=zathura-pdf-poppler pkgver=0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Adds pdf support to zathura by using the poppler engine" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/" @@ -17,5 +17,5 @@ build(){ cd ${srcdir}/zathura-pdf-poppler-$pkgver make make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } - diff --git a/community/zathura-ps/PKGBUILD b/community/zathura-ps/PKGBUILD index 89809661f..7be83cdf7 100644 --- a/community/zathura-ps/PKGBUILD +++ b/community/zathura-ps/PKGBUILD @@ -4,7 +4,7 @@ pkgname=zathura-ps pkgver=0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Adds ps support to zathura by using the libspectre library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-ps/" @@ -17,5 +17,5 @@ build(){ cd ${srcdir}/zathura-ps-$pkgver make make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } - diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index d48514e95..9013522b7 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69170 2012-04-09 22:13:58Z spupykin $ +# $Id: PKGBUILD 69464 2012-04-16 14:22:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura pkgver=0.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="a document viewer" arch=('i686' 'x86_64' 'mips64el') url="http://pwmt.org/projects/zathura/" @@ -13,8 +13,10 @@ depends=('girara-gtk2' 'cairo' 'sqlite') makedepends=('docutils') optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') install=zathura.install -source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz) -md5sums=('c018b0385a392adb87b465b0f759aaf9') +source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz + bash-completion) +md5sums=('c018b0385a392adb87b465b0f759aaf9' + 'cac20c37f0e77ba62a8138788f4ccabb') build() { cd $srcdir/zathura-$pkgver @@ -25,6 +27,5 @@ package() { cd $srcdir/zathura-$pkgver make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2 install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - mkdir -p $pkgdir/usr/share/bash-completion/completions - echo "complete -f -X '!*.[pf]df' zathura" >$pkgdir/usr/share/bash-completion/completions/zathura + install -Dm0644 $srcdir/bash-completion $pkgdir/usr/share/bash-completion/completions/zathura } diff --git a/community/zathura/bash-completion b/community/zathura/bash-completion new file mode 100644 index 000000000..41c3825b6 --- /dev/null +++ b/community/zathura/bash-completion @@ -0,0 +1,29 @@ +_zathura() { + _init_completion || return + + EXTENTIONS='' + for PLUGIN in /usr/lib/zathura/*.so; do + case ${PLUGIN##*/} in + pdf.so) + EXTENTIONS="$EXTENTIONS|pdf" + ;; + ps.so) + EXTENTIONS="$EXTENTIONS|ps|eps|epsi|epsf" + ;; + djvu.so) + EXTENTIONS="$EXTENTIONS|djvu|djv" + ;; + epub.so) + EXTENTIONS="$EXTENTIONS|epub" + ;; + cb.so) + EXTENTIONS="$EXTENTIONS|cb7|cbr|cbz|cbt|rar|zip|7z|tar" + ;; + *) + ;; + esac + done + + _filedir "${EXTENTIONS#|}" +} && +complete -F _zathura zathura diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD index a1488fcd8..5469f3265 100644 --- a/community/zynaddsubfx/PKGBUILD +++ b/community/zynaddsubfx/PKGBUILD @@ -1,36 +1,39 @@ -# $Id: PKGBUILD 66272 2012-02-23 07:06:41Z spupykin $ +# $Id: PKGBUILD 69533 2012-04-17 22:54:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: SpepS <dreamspepser at yahoo dot it> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=zynaddsubfx -pkgver=2.4.1 -pkgrel=7 -pkgdesc="An opensource software synthesizer capable of making a countless number of instruments." +pkgver=2.4.2 +pkgrel=1 +pkgdesc="Opensource software synthesizer capable of making a countless number of instruments." arch=('i686' 'x86_64') url="http://zynaddsubfx.sourceforge.net" license=('GPL') depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml') -makedepends=('cmake' 'pkgconfig' 'mesa') +makedepends=('cmake' 'pkgconfig' 'mesa' 'setconf' 'gendesk') options=('!emptydirs') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgver.tar.bz2" - "$pkgname.desktop" - "$pkgname.svg" "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch" - "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch") -md5sums=('59eb69ce24d6f8c605f8ba43958d0526' - '5da6735ee59fdfa21f171fdc4d6c80cb' - '6f7e9c3ce3947088a10c99c46a65431f' + "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch" + "$pkgname.svg") +md5sums=('4e1f15fd872f5cc649fc2217676e248e' 'eb95d339ff5deac8c6b54965f04a8c60' - '49464a33ab9c4250520eda0df7705663') + '49464a33ab9c4250520eda0df7705663' + '6f7e9c3ce3947088a10c99c46a65431f') build() { - cd "$srcdir/ZynAddSubFX-$pkgver" + cd "$srcdir" + gendesk + setconf "$pkgname.desktop" Icon "$pkgname.svg" + + cd "ZynAddSubFX-$pkgver" # patches - patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch" - patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch" +# patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch" +# patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch" + sed -i '1,1i#include <unistd.h>' src/Nio/NulEngine.cpp [ -d build ] || mkdir build && cd build cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack -DGuiModule=fltk .. diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD index 9a06455d7..a57f076ff 100644 --- a/core/expat/PKGBUILD +++ b/core/expat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155403 2012-04-03 11:10:06Z allan $ +# $Id: PKGBUILD 156201 2012-04-16 03:41:12Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD index fdf85819b..e2ddd4af4 100644 --- a/core/gmp/PKGBUILD +++ b/core/gmp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150226 2012-02-15 09:53:48Z allan $ +# $Id: PKGBUILD 156203 2012-04-16 03:46:32Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index 5a9db6545..65d6a8718 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 144590 2011-12-07 12:54:45Z stephane $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 156455 2012-04-18 12:20:44Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils pkgver=1.5.5 -pkgrel=1 +pkgrel=2 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64 'mips64el') url="http://www.kernel.org" @@ -10,15 +11,14 @@ license=('GPL2' 'LGPL2.1') depends=('glibc' 'sh') backup=(etc/request-key.conf) source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9e8ab5164bc8f84be148761cc89e9d6f') +md5sums=('d759680b2f23c99af95938f5026f25fb') build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i "s|/lib64|/lib|g" Makefile make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib" install } diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index ec4077548..84aa8284c 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 130865 2011-07-08 14:06:03Z andyrtr $ +# $Id: PKGBUILD 156348 2012-04-17 15:57:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libgcrypt pkgver=1.5.0 -pkgrel=1 +pkgrel=3 pkgdesc="a general purpose crypto library based on the code used" arch=(i686 x86_64 'mips64el') url="http://www.gnupg.org" license=('LGPL') -depends=('libgpg-error>=1.9') +depends=('libgpg-error>=1.10-2') options=('!libtool' '!emptydirs') install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 @@ -18,24 +18,18 @@ sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf') build() { cd ${srcdir}/${pkgname}-${pkgver} - [ "$CARCH" = "i686" ] && EXTRAFLAGS="--disable-aesni-support" ./configure --prefix=/usr \ --disable-static \ - --disable-padlock-support $EXTRAFLAGS + --disable-padlock-support #$EXTRAFLAGS make } check() { cd ${srcdir}/${pkgname}-${pkgver} - make -k check + make check } package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - - # Move dynamic libraries to /lib - install -d -m755 "${pkgdir}"/lib/ - mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/ - ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so } diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD index d24c58623..382465a09 100644 --- a/core/libgpg-error/PKGBUILD +++ b/core/libgpg-error/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 132298 2011-07-22 15:47:59Z andyrtr $ +# $Id: PKGBUILD 156350 2012-04-17 15:57:56Z andyrtr $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=libgpg-error pkgver=1.10 -pkgrel=1 +pkgrel=2 pkgdesc="Support library for libgcrypt" arch=(i686 x86_64 'mips64el') url="http://www.gnupg.org" @@ -29,9 +29,4 @@ check() { package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}/" install - - # Move dynamic libraries to /lib - install -d -m755 "${pkgdir}"/lib/ - mv "${pkgdir}"/usr/lib/libgpg-error.so* "${pkgdir}"/lib/ - ln -sf /lib/libgpg-error.so "${pkgdir}"/usr/lib/libgpg-error.so } diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 4835d5941..64fc2220d 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 154941 2012-03-31 12:48:22Z pierre $ +# $Id: PKGBUILD 156488 2012-04-19 14:22:45Z bisson $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl -_ver=1.0.1 +_ver=1.0.1a # use a pacman compatible version scheme -# pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgver=$_ver -pkgrel=2 +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +#pkgver=$_ver +pkgrel=1 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64' 'mips64el') url='https://www.openssl.org' @@ -18,15 +18,13 @@ backup=('etc/ssl/openssl.cnf') source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'fix-manpages.patch' 'no-rpath.patch' - 'gnu-linux-mips64el-gcc.patch' 'ca-dir.patch' - 'disable-tls12-client.patch') -md5sums=('134f168bc2a8333f19f81d684841710b' + 'openssl-1.0.1a_cpu.patch') +md5sums=('a0104320c0997cd33e18b8ea798609d1' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' - 'd7115f0cc44df346d7b68c681819f94b' '3bf51be3a1bbd262be46dc619f92aa90' - '26432b9d7af63c63828b6405c9185400') + '8edaef3ee595707c18fcbd7dafae940f') build() { cd $srcdir/$pkgname-$_ver @@ -38,10 +36,9 @@ build() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch - # workaround for PR#2771 - patch -p1 -i $srcdir/disable-tls12-client.patch - -# patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch + # fix building on non-x86 + # see http://rt.openssl.org/Ticket/Display.html?id=2795&user=guest&pass=guest + patch -p1 -i $srcdir/openssl-1.0.1a_cpu.patch case "${CARCH}" in 'x86_64') @@ -50,9 +47,6 @@ build() { 'i686') openssltarget='linux-elf' ;; 'mips64el') -# ./config - # Broken. - # openssltarget='gnu-linux-mips64el-gcc' ;; openssltarget='linux-generic32' ;; esac diff --git a/core/openssl/openssl-1.0.1a_cpu.patch b/core/openssl/openssl-1.0.1a_cpu.patch new file mode 100644 index 000000000..a6b85988a --- /dev/null +++ b/core/openssl/openssl-1.0.1a_cpu.patch @@ -0,0 +1,15 @@ +--- openssl-1.0.1a/crypto/evp/e_rc4_hmac_md5.c Wed Apr 18 17:51:33 2012 ++++ /tmp/e_rc4_hmac_md5.c Thu Apr 19 14:28:41 2012 +@@ -289,8 +289,12 @@ + + const EVP_CIPHER *EVP_rc4_hmac_md5(void) + { ++#if defined(STITCHED_CALL) + extern unsigned int OPENSSL_ia32cap_P[]; + /* RC4_CHAR flag ------------vvvvv */ + return(OPENSSL_ia32cap_P[0]&(1<<20) ? NULL : &r4_hmac_md5_cipher); ++#else ++ return(&r4_hmac_md5_cipher); ++#endif + } + #endif diff --git a/core/openssl/vpaes.patch b/core/openssl/vpaes.patch new file mode 100644 index 000000000..2688b0c0a --- /dev/null +++ b/core/openssl/vpaes.patch @@ -0,0 +1,69 @@ +Index: openssl/crypto/aes/asm/vpaes-x86.pl +RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v +rcsdiff -q -kk '-r1.5.4.4' '-r1.5.4.5' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v' 2>/dev/null +--- vpaes-x86.pl 2011/12/15 22:20:26 1.5.4.4 ++++ vpaes-x86.pl 2012/03/31 16:55:18 1.5.4.5 +@@ -843,6 +843,8 @@ + &mov ($out,&wparam(1)); # out + &mov ($round,&wparam(2)); # len + &mov ($key,&wparam(3)); # key ++ &sub ($round,16); ++ &jc (&label("cbc_abort")); + &lea ($base,&DWP(-56,"esp")); + &mov ($const,&wparam(4)); # ivp + &and ($base,-16); +@@ -853,7 +855,6 @@ + &mov (&DWP(48,"esp"),$base); + + &mov (&DWP(0,"esp"),$out); # save out +- &sub ($round,16); + &mov (&DWP(4,"esp"),$key) # save key + &mov (&DWP(8,"esp"),$const); # save ivp + &mov ($out,$round); # $out works as $len +@@ -896,6 +897,7 @@ + &mov ($base,&DWP(8,"esp")); # restore ivp + &mov ("esp",&DWP(48,"esp")); + &movdqu (&QWP(0,$base),"xmm1"); # write IV ++&set_label("cbc_abort"); + &function_end("${PREFIX}_cbc_encrypt"); + + &asm_finish(); +Index: openssl/crypto/aes/asm/vpaes-x86_64.pl +RCS File: /v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v +rcsdiff -q -kk '-r1.4.4.2' '-r1.4.4.3' -u '/v/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86_64.pl,v' 2>/dev/null +--- vpaes-x86_64.pl 2011/11/14 21:01:17 1.4.4.2 ++++ vpaes-x86_64.pl 2012/03/31 16:55:18 1.4.4.3 +@@ -263,7 +263,7 @@ + pshufb %xmm2, %xmm4 # 4 = sbou + pxor %xmm0, %xmm4 # 4 = sb1u + k + movdqa 0x70(%r10), %xmm0 # 0 : sbot +- movdqa .Lk_sr-.Lk_dsbd(%r11), %xmm2 ++ movdqa -0x160(%r11), %xmm2 # .Lk_sr-.Lk_dsbd=-0x160 + pshufb %xmm3, %xmm0 # 0 = sb1t + pxor %xmm4, %xmm0 # 0 = A + pshufb %xmm2, %xmm0 +@@ -869,6 +869,8 @@ + ___ + ($len,$key)=($key,$len); + $code.=<<___; ++ sub \$16,$len ++ jc .Lcbc_abort + ___ + $code.=<<___ if ($win64); + lea -0xb8(%rsp),%rsp +@@ -887,7 +889,6 @@ + $code.=<<___; + movdqu ($ivp),%xmm6 # load IV + sub $inp,$out +- sub \$16,$len + call _vpaes_preheat + cmp \$0,${enc}d + je .Lcbc_dec_loop +@@ -932,6 +933,7 @@ + .Lcbc_epilogue: + ___ + $code.=<<___; ++.Lcbc_abort: + ret + .size ${PREFIX}_cbc_encrypt,.-${PREFIX}_cbc_encrypt + ___ diff --git a/core/pkg-config/PKGBUILD b/core/pkg-config/PKGBUILD index ed96f3380..edaaa0a5e 100644 --- a/core/pkg-config/PKGBUILD +++ b/core/pkg-config/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142076 2011-11-04 23:36:11Z allan $ +# $Id: PKGBUILD 156205 2012-04-16 03:57:28Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD index 09ec1ca1a..504665858 100644 --- a/core/popt/PKGBUILD +++ b/core/popt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142191 2011-11-06 02:28:05Z stephane $ +# $Id: PKGBUILD 156453 2012-04-18 12:20:42Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=popt pkgver=1.16 -pkgrel=4 +pkgrel=5 pkgdesc="A commandline option parser" arch=('i686' 'x86_64' 'mips64el') url="http://rpm5.org" @@ -15,7 +15,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('3743beefa3dd6247a73f8f7a32c14c33') +sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,15 +28,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - # move libs in /lib - install -Dm755 "${pkgdir}"/usr/lib/libpopt.so.0.0.0 \ - ${pkgdir}/lib/libpopt.so.0.0.0 - - rm "${pkgdir}"/usr/lib/libpopt.so* - ln -sf /lib/libpopt.so "${pkgdir}"/usr/lib/libpopt.so - ln -sf libpopt.so.0 "${pkgdir}"/lib/libpopt.so - ln -sf libpopt.so.0.0.0 "${pkgdir}"/lib/libpopt.so.0 - - # install license install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index e86d50fcb..b2f59ddbc 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143254 2011-11-24 01:36:28Z allan $ +# $Id: PKGBUILD 156214 2012-04-16 06:12:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=readline _basever=6.2 _patchlevel=002 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=1 +pkgrel=2 pkgdesc="GNU readline library" arch=('i686' 'x86_64' 'mips64el') url="http://tiswww.case.edu/php/chet/readline/rltop.html" @@ -43,7 +43,7 @@ build() { # build with -fPIC for x86_64 (FS#15634) [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" - ./configure --prefix=/usr --libdir=/lib + ./configure --prefix=/usr make SHLIB_LIBS=-lncurses } @@ -52,13 +52,4 @@ package() { make DESTDIR=${pkgdir} install install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc - - # FHS recommends only shared libs in /lib - install -dm755 $pkgdir/usr/lib - mv $pkgdir/lib/*.a $pkgdir/usr/lib - - # to make the linker find the shared lib and fix compile issues - cd ${pkgdir}/usr/lib - ln -sv /lib/libreadline.so . - ln -sv /lib/libhistory.so . } diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD index 040eef5b6..611229827 100644 --- a/core/rfkill/PKGBUILD +++ b/core/rfkill/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 142840 2011-11-16 20:25:37Z dan $ +# $Id: PKGBUILD 156346 2012-04-17 15:19:00Z bisson $ # Maintainer: Thomas Bächler <thomas@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rfkill pkgver=0.4 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for enabling and disabling wireless devices" arch=('i686' 'x86_64' 'mips64el') url="http://linuxwireless.org/en/users/Documentation/rfkill" license=('custom') -depends=('glibc' 'filesystem>=2010.01') source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2 60-rfkill.rules rfkill.conf.d @@ -31,7 +30,7 @@ package() { # License install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # Udev rule - install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/lib/udev/rules.d/60-rfkill.rules" + install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" # Init script install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill" install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill" diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index e4fcf373b..f3b848d07 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 142968 2011-11-19 08:45:36Z tpowa $ +# $Id: PKGBUILD 156218 2012-04-16 08:21:43Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=xfsprogs -pkgver=3.1.7 +pkgver=3.1.8 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('util-linux-ng>=2.16') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('049cf9873794ea49d0bb3f12d45748a4') +md5sums=('f70b2e7200d4c29f0af1cf70e7be1db6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 1c1b4c30b..0b6b85c53 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155887 2012-04-08 22:28:42Z bisson $ +# $Id: PKGBUILD 156451 2012-04-18 12:14:05Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=2 +pkgrel=3 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -36,7 +36,6 @@ sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') -replaces=('howl' 'mdnsresponder') install=install diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD index 01aeeea8e..0dc8c8e87 100644 --- a/extra/cabal-install/PKGBUILD +++ b/extra/cabal-install/PKGBUILD @@ -3,29 +3,31 @@ # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=cabal-install -pkgver=0.10.4 -pkgrel=3 +pkgver=0.14.0 +pkgrel=1 pkgdesc="The command-line interface for Cabal and Hackage." url="http://hackage.haskell.org/package/cabal-install" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') makedepends=('haskell-http=4000.2.2-1' 'haskell-zlib=0.5.3.3-3' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1' 'haskell-random=1.0.1.1-1') depends=('ghc' 'gmp' 'zlib') -#source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz) -# switch back to regular cabal-install once it gets updated... -source=("http://hackage.haskell.org/packages/archive/cabal-install-ghc74/${pkgver}/cabal-install-ghc74-${pkgver}.tar.gz") -md5sums=('49b3301cc80775ebf19fe9d949f15df5') +source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz) +md5sums=('638514bd1a5792d75866481852148ae5') build() { - cd cabal-install-ghc74-${pkgver} + cd cabal-install-${pkgver} runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr runhaskell Setup build } package() { - cd cabal-install-ghc74-${pkgver} + cd cabal-install-${pkgver} runhaskell Setup copy --destdir=$pkgdir - #install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + # rm license installed to wrong location + rm -rf ${pkgdir}/usr/share/doc + + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE # add bash completion install -d ${pkgdir}/usr/share/bash-completion/completions diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD index 198137f1f..aefbae61b 100644 --- a/extra/crypto++/PKGBUILD +++ b/extra/crypto++/PKGBUILD @@ -27,15 +27,13 @@ md5sums=('96cbeba0907562b077e26bcffb483828' build() { cd ${srcdir} -# cp "${srcdir}/GNUmakefile.parabola" GNUmakefile -# make -f GNUmakefile - # Fix gcc 4.7 build patch -Np1 -i "${srcdir}/gcc4.7.patch" - sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile - export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC" - make -f GNUmakefile + # The upstream build system expects this file to be modified + # to e.g. use system CFLAGS or use features of modern linkers. + cp "${srcdir}/GNUmakefile.parabola" GNUmakefile + make -f GNUmakefile make libcryptopp.so } diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD index d1a44c69e..0fd7bb248 100755 --- a/extra/efibootmgr/PKGBUILD +++ b/extra/efibootmgr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149530 2012-02-08 11:51:04Z tpowa $ +# $Id: PKGBUILD 156423 2012-04-18 07:53:47Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor : Murtuza Akhtari <inxsible at gmail dot com> # Contributor: Keshav P R <skodabenz at rocketmail dot com> pkgname=efibootmgr pkgver=0.5.4 -pkgrel=2 +pkgrel=3 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables." arch=('i686' 'x86_64') url="http://linux.dell.com/efibootmgr/" @@ -49,4 +49,4 @@ package() { } md5sums=('cfcf24752d6461b73f7ba964bbf73169' '29730052de0d6911457a26011f8ddb6e' - 'd31f3c378cf8aac57b71620340c68b24') + 'b99b8f79842b96c241a0b0fcfb75c778') diff --git a/extra/efibootmgr/efibootmgr_default_to_grub2.patch b/extra/efibootmgr/efibootmgr_default_to_grub2.patch index 1a1b3c69f..35207298f 100755 --- a/extra/efibootmgr/efibootmgr_default_to_grub2.patch +++ b/extra/efibootmgr/efibootmgr_default_to_grub2.patch @@ -7,7 +7,7 @@ index 199af39..3826e03 100644 - This must tie the EFI_DEVICE_PATH to /boot/efi/elilo.efi -+ This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/grub/grub.efi ++ This must tie the EFI_DEVICE_PATH to /boot/efi/EFI/arch_grub/grubx64.efi The EFI_DEVICE_PATH will look something like: ACPI device path, length 12 bytes Hardware Device Path, PCI, length 6 bytes @@ -26,8 +26,8 @@ index 199af39..3826e03 100644 printf("\t-i | --iface name create a netboot entry for the named interface\n"); - printf("\t-l | --loader name (defaults to \\elilo.efi)\n"); - printf("\t-L | --label label Boot manager display label (defaults to \"Linux\")\n"); -+ printf("\t-l | --loader name (defaults to \\EFI\\grub\\grub.efi)\n"); -+ printf("\t-L | --label label Boot manager display label (defaults to \"GRUB2\")\n"); ++ printf("\t-l | --loader name (defaults to \\EFI\\arch_grub\\grubx64.efi)\n"); ++ printf("\t-L | --label label Boot manager display label (defaults to \"Arch Linux (GRUB2)\")\n"); printf("\t-n | --bootnext XXXX set BootNext to XXXX (hex)\n"); printf("\t-N | --delete-bootnext delete BootNext\n"); printf("\t-o | --bootorder XXXX,YYYY,ZZZZ,... explicitly set BootOrder (hex)\n"); @@ -37,8 +37,9 @@ index 199af39..3826e03 100644 opts.edd10_devicenum = 0x80; - opts.loader = "\\elilo.efi"; - opts.label = "Linux"; -+ opts.loader = "\\EFI\\grub\\grub.efi"; -+ opts.label = "GRUB2"; ++ opts.loader = "\\EFI\\arch_grub\\grubx64.efi"; ++ opts.label = "Arch Linux (GRUB2)"; opts.disk = "/dev/sda"; opts.iface = NULL; opts.part = 1; + diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD index d284831b3..08a0e8859 100644 --- a/extra/freeciv/PKGBUILD +++ b/extra/freeciv/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143020 2011-11-21 02:06:36Z eric $ +# $Id: PKGBUILD 156372 2012-04-17 18:59:36Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=freeciv -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +12,11 @@ depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme') options=('!libtool') install=freeciv.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9d9ee9f48f4c945fc6525139d340443d5a25aac4') +sha1sums=('e6267b5e0483cf9c29d01793d2f9433e73d62191') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-client=gtk --enable-shared + ./configure --prefix=/usr --enable-client=gtk2 --enable-shared --without-ggz-client make } diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD index 840803673..cff2cff4e 100644 --- a/extra/ftgl/PKGBUILD +++ b/extra/ftgl/PKGBUILD @@ -19,6 +19,10 @@ md5sums=('c7879018cde844059495b3029b0b6503') build() { cd "$srcdir/$pkgname-${_pkgver/-/~}" + + # Fix some missing libraries. Should be done in a different way. + sed -ri 's/.*_LDADD = .*/& $(GLUT_LIBS) $(GL_LIBS) -lm/' demo/Makefile.in + ./configure --prefix=/usr --with-pic make } diff --git a/extra/gnome-keyring-sharp/PKGBUILD b/extra/gnome-keyring-sharp/PKGBUILD index 734c0e2fe..37bd25238 100644 --- a/extra/gnome-keyring-sharp/PKGBUILD +++ b/extra/gnome-keyring-sharp/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 150836 2012-02-23 12:21:20Z ibiru $ +# $Id: PKGBUILD 156470 2012-04-18 17:42:37Z daniel $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-keyring-sharp pkgver=1.0.2 -pkgrel=3 +pkgrel=4 pkgdesc="A fully managed implementation of libgnome-keyring" arch=('i686' 'x86_64') url="http://www.mono-project.com/Libraries" license=('custom') -depends=('ndesk-dbus>=0.4' 'libgnome-keyring') -makedepends=('gtk-sharp-2') +depends=('libgnome-keyring' 'gtk-sharp-2') source=(http://www.go-mono.com/archive/${pkgname}/${pkgname}-${pkgver}.tar.gz) options=('!makeflags' '!libtool') md5sums=('f9a48319f3fe6123017b000d714d68b1') diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD index 08b389fa0..a4f102a5f 100644 --- a/extra/gphoto2/PKGBUILD +++ b/extra/gphoto2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 145713 2011-12-28 15:08:15Z jgc $ +# $Id: PKGBUILD 156272 2012-04-16 14:41:22Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=gphoto2 -pkgver=2.4.11 +pkgver=2.4.14 pkgrel=1 pkgdesc="A digital camera download and access program." arch=(i686 x86_64 'mips64el') url="http://www.gphoto.org" license=('GPL' 'LGPL') -depends=('libgphoto2>=2.4.11' 'popt' 'aalib' 'readline') +depends=('libgphoto2>=2.4.14' 'popt' 'readline') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2635075f702b40eb2e95a80658bd4773') +md5sums=('60fd6e44d89592f6172227be67227636') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 911ba9b54..3003bdf52 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154479 2012-03-29 01:47:21Z eric $ +# $Id: PKGBUILD 156324 2012-04-17 04:29:39Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.6.2 +pkgver=6.7.6.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('5411be21304520ae6a24d3f3e6d5c60eabdd57af' +sha1sums=('ecb6d2614ca8f44c1857ff28a88feb083403f7be' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD index 0ada5f186..24397a3af 100644 --- a/extra/kdevelop-php/PKGBUILD +++ b/extra/kdevelop-php/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153918 2012-03-20 14:06:28Z andrea $ +# $Id: PKGBUILD 156483 2012-04-19 10:23:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-php -pkgver=1.3.0 -_pkgver=4.3.0 +pkgver=1.3.1 +_pkgver=4.3.1 pkgrel=1 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ makedepends=('cmake' 'automoc4') replaces=('kdevelop-php-docs') conflicts=('kdevelop-php-docs') source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2) -sha1sums=('8ae280cf5085c473b6b95b3683629b49d19dfe12' - '398001b7d192af4c71bddb246dfd59d61db02618') +sha1sums=('c5d31de0bf0ae4b242b6265851807e5b44606525' + '2b5c3dd2b26196a83bc95cfe8ee595e160f595f0') build() { cd "${srcdir}" diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD index 2672dd3ee..ac6ba550d 100644 --- a/extra/kdevelop/PKGBUILD +++ b/extra/kdevelop/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 153916 2012-03-20 14:05:01Z andrea $ +# $Id: PKGBUILD 156481 2012-04-19 10:22:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevelop -pkgver=4.3.0 +pkgver=4.3.1 pkgrel=1 pkgdesc="A C/C++ development environment for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdevelop.org/" license=('GPL') -depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-kwrite') +depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('06a91f9ae0fc15bcec12a92bd9c30a7517b3b8e0') +sha1sums=('99596bf333bf5a62547f3dc0800674db146eb401') build() { cd "${srcdir}" diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD index 9035fb008..6b81170cb 100644 --- a/extra/kdevplatform/PKGBUILD +++ b/extra/kdevplatform/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153914 2012-03-20 14:01:46Z andrea $ +# $Id: PKGBUILD 156479 2012-04-19 10:22:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevplatform -pkgver=1.3.0 -_pkgver=4.3.0 +pkgver=1.3.1 +_pkgver=4.3.1 pkgrel=1 pkgdesc="A C/C++ development platform for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=("kdesdk-kompare: difference checking") makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('990ec335418445ae11b8ee11aa9a25729994de59') +sha1sums=('bba0cefdac6de83c8d3354534a94e8500dccda37') build() { cd "${srcdir}" diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD index f31ab3657..d2279c606 100644 --- a/extra/libdbusmenu-qt/PKGBUILD +++ b/extra/libdbusmenu-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145876 2012-01-03 14:27:41Z andrea $ +# $Id: PKGBUILD 156245 2012-04-16 13:16:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libdbusmenu-qt -pkgver=0.9.0 -pkgrel=2 +pkgver=0.9.2 +pkgrel=1 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/libdbusmenu-qt" @@ -11,7 +11,7 @@ license=('GPL') depends=('qt') makedepends=('cmake' 'doxygen' 'qjson') source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('cc6b7b551377e2a07f6fa5afef0d29ff') +md5sums=('9a49484927669cd2ec91b3bf9ba8b79e') build() { cd "${srcdir}" diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index 145f1465c..4fcbe3c0e 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -12,7 +12,8 @@ depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup' 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' 'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2' 'iso-codes' 'openssl' 'libgcrypt' 'libldap') -makedepends=('intltool' 'gobject-introspection' 'openjdk6' 'gtk-doc' 'vala') +makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala') +[ "$CARCH" != "mips64el" ] && makedepends+=('openjdk6') options=('!libtool') url="http://www.gnome-db.org" install=libgda.install diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD index 7c2ec9fbb..9319b51aa 100644 --- a/extra/libgphoto2/PKGBUILD +++ b/extra/libgphoto2/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 156010 2012-04-11 12:37:00Z tomegun $ +# $Id: PKGBUILD 156270 2012-04-16 14:30:06Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=libgphoto2 -pkgver=2.4.13 -pkgrel=2 +pkgver=2.4.14 +pkgrel=1 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." arch=(i686 x86_64 'mips64el') url="http://www.gphoto.org" @@ -15,6 +15,7 @@ depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb') install=libgphoto2.install options=('libtool') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz) +md5sums=('492bec63dd610906c3a28030be77e650') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -34,10 +35,9 @@ package() { install -m755 -d "${pkgdir}/usr/lib/udev/rules.d" LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \ - "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 > \ + "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 175 > \ "${pkgdir}/usr/lib/udev/rules.d/40-gphoto.rules" # Remove recursive symlink rm -f "${pkgdir}/usr/include/gphoto2/gphoto2" } -md5sums=('7d8a1d3ae02069af381f07a0bb4bfc15') diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index cbbfc73de..e05ad6885 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://mp3splt.sourceforge.net" license=('GPL') depends=('libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl') -makedepends=('libtool') +makedepends=('libtool' 'git') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz") md5sums=('62025951f483334f14f1b9be58162094') diff --git a/extra/libmsn/PKGBUILD b/extra/libmsn/PKGBUILD index 5d2d00ee5..0fc891526 100644 --- a/extra/libmsn/PKGBUILD +++ b/extra/libmsn/PKGBUILD @@ -12,11 +12,15 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL2') depends=('openssl') makedepends=('cmake') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('38e46e589720eefd71f92b6b76993bf0') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" + "gcc47.patch") +md5sums=('38e46e589720eefd71f92b6b76993bf0' + '23bbcfa0170aa1df8387ff6419057d7c') build() { - cd "${srcdir}" + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/gcc47.patch" + cd .. mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/libmsn/gcc47.patch b/extra/libmsn/gcc47.patch new file mode 100644 index 000000000..d8e128913 --- /dev/null +++ b/extra/libmsn/gcc47.patch @@ -0,0 +1,11 @@ +diff -ru libmsn-4.2.1.orig/msn/util.cpp libmsn-4.2.1/msn/util.cpp +--- libmsn-4.2.1.orig/msn/util.cpp 2012-04-18 19:02:12.447876971 +0200 ++++ libmsn-4.2.1/msn/util.cpp 2012-04-18 19:02:36.460762835 +0200 +@@ -30,6 +30,7 @@ + #include <openssl/rand.h> + #include <cstring> + #include <sys/timeb.h> ++#include <unistd.h> + #include "md5.h" + #include "libsiren/siren7.h" + diff --git a/extra/libofa/PKGBUILD b/extra/libofa/PKGBUILD index 0a6ad5c85..e1c7ef90b 100644 --- a/extra/libofa/PKGBUILD +++ b/extra/libofa/PKGBUILD @@ -16,11 +16,13 @@ source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz" 'gcc-4.patch' 'gcc4.3.patch' 'gcc4.5.patch' + 'gcc47.patch' 'libofa-0.9.3-curl-7.21.patch') md5sums=('51507d2c4b432bd2755f48d58471696e' 'a6f78b90bd0f4354d022a71c3e58ef6c' 'dd57db13770b8f8d196e8a3d3a50e713' 'c245363368d0e6fa2b4676364b81b74f' + '5b571a09118131d7f7c8b84617efba71' '2e1579d74613cfbb1799d0ab5f1a4cba') build() { @@ -28,6 +30,7 @@ build() { patch -p0 -i ${srcdir}/gcc-4.patch patch -p1 -i ${srcdir}/gcc4.3.patch patch -p1 -i ${srcdir}/gcc4.5.patch + patch -p1 -i ${srcdir}/gcc47.patch patch -p1 -i ${srcdir}/libofa-0.9.3-curl-7.21.patch ./configure --prefix=/usr make diff --git a/extra/libofa/gcc47.patch b/extra/libofa/gcc47.patch new file mode 100644 index 000000000..eb4b4ca20 --- /dev/null +++ b/extra/libofa/gcc47.patch @@ -0,0 +1,22 @@ +diff -ru libofa-0.9.3.orig/examples/uselame.cpp libofa-0.9.3/examples/uselame.cpp +--- libofa-0.9.3.orig/examples/uselame.cpp 2012-04-18 19:32:44.176037357 +0200 ++++ libofa-0.9.3/examples/uselame.cpp 2012-04-18 19:33:03.052805199 +0200 +@@ -12,6 +12,7 @@ + #else + #include <sys/wait.h> + #endif ++#include <unistd.h> + + AudioData *loadWaveFile(char *file); + +diff -ru libofa-0.9.3.orig/examples/wavefile.cpp libofa-0.9.3/examples/wavefile.cpp +--- libofa-0.9.3.orig/examples/wavefile.cpp 2012-04-18 19:32:44.176037357 +0200 ++++ libofa-0.9.3/examples/wavefile.cpp 2012-04-18 19:37:38.123467239 +0200 +@@ -11,6 +11,7 @@ + #include "io.h" + #endif + #include <fcntl.h> ++#include <unistd.h> + + static bool readBytes(int fd, unsigned char *buf, int size) { + int ct = 0; diff --git a/extra/libthai/PKGBUILD b/extra/libthai/PKGBUILD index cf684ed66..bb96277ef 100644 --- a/extra/libthai/PKGBUILD +++ b/extra/libthai/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142250 2011-11-07 09:20:43Z jgc $ +# $Id: PKGBUILD 156262 2012-04-16 13:46:17Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> pkgname=libthai -pkgver=0.1.16 +pkgver=0.1.17 pkgrel=1 pkgdesc="Thai language support routines" url="http://linux.thai.net/projects/libthai" @@ -13,7 +13,7 @@ depends=('libdatrie') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('631ae09f531db6c94aedcc7ce226d6a5') +md5sums=('d94ddbf5e5a09a911c459f0a4ad1c041') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index 410fd6601..e0e2ba520 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143897 2011-11-30 19:52:19Z giovanni $ +# $Id: PKGBUILD 156475 2012-04-19 09:19:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.7.4 -pkgrel=2 +pkgver=4.7.5 +pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64' 'mips64el') url="http://www.abisource.com/downloads/link-grammar/" @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc') options=('!libtool' '!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('e90e702a953641713a1292db20677bd2') +md5sums=('598e531d8f213e0a2b211631e5c7e5bb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 9a03cf8e0..b3b1cfdc7 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155693 2012-04-05 06:04:51Z giovanni $ +# $Id: PKGBUILD 156477 2012-04-19 09:35:14Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.04.04 +pkgver=2012.04.18 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('25ad098a6e4a2e329ca6295a9ba27074') +md5sums=('52248a7081e2989777258df4e37be966') build() { cd ${srcdir}/live @@ -28,7 +28,7 @@ build() { package() { cd ${srcdir}/live - for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do + for dir in BasicUsageEnvironment groupsock liveMedia UsageEnvironment; do install -dm755 ${pkgdir}/usr/{bin,lib,include/${dir}} install -m644 ${dir}/*.a "${pkgdir}/usr/lib" install -m644 ${dir}/include/*.h* "${pkgdir}/usr/include/${dir}" diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 49238012b..262416a74 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156067 2012-04-12 16:34:12Z foutrelis $ +# $Id: PKGBUILD 156168 2012-04-15 04:29:31Z heftig $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -11,7 +11,7 @@ pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') pkgver=3.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD index 2b567ab04..1c3d9ee33 100644 --- a/extra/lua/PKGBUILD +++ b/extra/lua/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153491 2012-03-14 23:43:56Z eric $ +# $Id: PKGBUILD 156332 2012-04-17 10:35:09Z bluewind $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=lua pkgver=5.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="A powerful light-weight programming language designed for extending applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.lua.org/" @@ -14,7 +14,7 @@ options=('!makeflags' '!emptydirs') source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz lua-arch.patch lua-5.1-cflags.diff) md5sums=('2e115fe26e435e33b0d5c022e4490567' - '6c5953f63904bf20a0183cdab05b80de' + 'fa25feb70ef9fec975b1c20da5098b3c' '249582bf1fd861ccf492d2c35a9fe732') build() { @@ -23,14 +23,14 @@ build() { patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" export CFLAGS="$CFLAGS -fPIC" - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ + make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ linux } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ + make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.$pkgver" \ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ install install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" diff --git a/extra/lua/lua-arch.patch b/extra/lua/lua-arch.patch index cc1f3ce1b..d8650c3a2 100644 --- a/extra/lua/lua-arch.patch +++ b/extra/lua/lua-arch.patch @@ -1,8 +1,7 @@ -diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc ---- lua-5.1.orig/etc/lua.pc 2006-03-21 11:51:53.000000000 +0100 -+++ lua-5.1/etc/lua.pc 2006-03-21 11:52:05.000000000 +0100 -@@ -6,7 +6,7 @@ - V= 5.1 +diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc +--- lua-5.1.4/etc/lua.pc 2008-08-08 14:46:11.000000000 +0200 ++++ lua-5.1.4-new/etc/lua.pc 2012-02-23 18:25:34.000000000 +0100 +@@ -8,6 +8,6 @@ # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' -prefix= /usr/local @@ -10,11 +9,23 @@ diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc INSTALL_BIN= ${prefix}/bin INSTALL_INC= ${prefix}/include INSTALL_LIB= ${prefix}/lib -diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile ---- lua-5.1.orig/src/Makefile 2006-03-21 11:51:53.000000000 +0100 -+++ lua-5.1/src/Makefile 2006-03-21 11:52:09.000000000 +0100 +diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h +--- lua-5.1.4/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100 ++++ lua-5.1.4-new/src/luaconf.h 2012-02-23 18:25:34.000000000 +0100 +@@ -94,7 +94,7 @@ + ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" + + #else +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/5.1/" + #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" + #define LUA_PATH_DEFAULT \ +diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile +--- lua-5.1.4/src/Makefile 2008-01-19 20:37:58.000000000 +0100 ++++ lua-5.1.4-new/src/Makefile 2012-02-23 18:26:43.000000000 +0100 @@ -23,6 +23,7 @@ - PLATS= aix ansi bsd generic linux macosx mingw posix solaris + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris LUA_A= liblua.a +LUA_SO= liblua.so @@ -30,26 +41,26 @@ diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile ALL_A= $(LUA_A) default: $(PLAT) -@@ -51,6 +52,10 @@ +@@ -51,6 +52,11 @@ $(AR) $@ $? $(RANLIB) $@ +$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,liblua.so -o $@.5.1 $? -lm $(MYLDFLAGS) -+ ln -s $@.5.1 $@ ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) + $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -diff -ur lua-5.1.orig/src/luaconf.h lua-5.1/src/luaconf.h ---- lua-5.1.orig/src/luaconf.h 2006-03-21 11:51:53.000000000 +0100 -+++ lua-5.1/src/luaconf.h 2006-03-21 11:52:05.000000000 +0100 -@@ -82,7 +82,7 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" +--- lua-5.1.4/Makefile 2008-08-12 02:40:48.000000000 +0200 ++++ lua-5.1.4-new/Makefile 2012-02-23 19:06:32.000000000 +0100 +@@ -53,7 +53,7 @@ + all: $(PLAT) - #else --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua test/hello.lua diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 34064fd85..5571989e1 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154304 2012-03-26 01:26:00Z eric $ +# $Id: PKGBUILD 156357 2012-04-17 16:57:42Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.13.7 +pkgver=1.13.8 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64' 'mips64el') @@ -17,8 +17,8 @@ conflicts=('mpg321') provides=('mpg321') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('33b71c932b87004f3c8fed527b1f9a4b5f4337b2' - '6f7593c0c14647c61cd57d1a03fe89eb6528aebe') +sha1sums=('ae6fe5f60502fb694527113dd7508ce042b7256b' + '6895e5e3120579418007d705836ae1d3b786e771') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 40a85f63a..60f14d42f 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151553 2012-02-27 17:17:02Z ibiru $ +# $Id: PKGBUILD 156228 2012-04-16 12:08:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.13.3 +pkgver=3.13.4 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') @@ -18,7 +18,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s nss-config.in add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch) -sha1sums=('6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6' +sha1sums=('c5a829c3bd56aa743457faf21469065f87c2db75' 'c8fcdb153af9d39689243119adb475905a657284' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD index 0b30d5fc8..8e6838aff 100644 --- a/extra/openjpeg/PKGBUILD +++ b/extra/openjpeg/PKGBUILD @@ -1,35 +1,29 @@ -# $Id: PKGBUILD 137660 2011-09-10 10:58:56Z pierre $ +# $Id: PKGBUILD 156266 2012-04-16 14:12:28Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=openjpeg -pkgver=1.4 -_pkgver=v1_4 -_revision=r697 +pkgver=1.5.0 pkgrel=1 pkgdesc="An open source JPEG 2000 codec" arch=(i686 x86_64 'mips64el') license=('BSD') url="http://www.openjpeg.org" depends=('zlib') -source=(http://openjpeg.googlecode.com/files/openjpeg_${_pkgver}_sources_${_revision}.tgz - openjpeg-1.4-autoconf.patch) -md5sums=('7870bb84e810dec63fcf3b712ebb93db' - '46d1d26b59ce546444f3fe8d7c685775') - -options=('!makeflags' '!libtool') +options=('!libtool') +source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz) +sha1sums=('dce705ae45f137e4698a8cf39d1fbf22bc434fa8') build() { - cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}" - patch -Np1 -i ${srcdir}/openjpeg-1.4-autoconf.patch + cd "${srcdir}/${pkgname}-${pkgver}" # make sure we use system libs - rm -rf libs + rm -rf thirtparty ./configure --prefix=/usr \ - --disable-static + --disable-static --disable-silent-rules make } package() { - cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg" install -m644 LICENSE "${pkgdir}/usr/share/licenses/openjpeg/LICENSE" diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 0588647ac..0b5a21ac3 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,29 +1,25 @@ -# $Id: PKGBUILD 143818 2011-11-29 13:33:44Z stephane $ +# $Id: PKGBUILD 156459 2012-04-18 12:20:59Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.2.2 -pkgrel=2 -pkgrel=1 #holdver +pkgver=3.2.3 +pkgrel=1 _pybasever=3.2 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://www.python.org/" depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') -makedepends=('tk' 'sqlite3' 'valgrind') -[ "$CARCH" = "mips64el" ] && \ -makedepends=('tk' 'sqlite3') -optdepends=('tk: for tkinter' 'sqlite3') +makedepends=('tk' 'sqlite') +[ "$CARCH" != "mips64el" ] && makedepends+=('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 - gdbm-magic-values.patch) -sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769' - '43bfbe3e23360f412b95cb284ff29b2cbe338be9') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) +sha1sums=('3d607dbcfdf100dd659978195ccf3ade9d221823') build() { cd "${srcdir}/Python-${pkgver}" @@ -31,10 +27,6 @@ build() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py - # gdbm has new magic that whichdb does not recognize - # http://bugs.python.org/issue13007 - patch -Np1 -i ../gdbm-magic-values.patch - # 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 @@ -42,29 +34,21 @@ build() { rm -r Modules/_ctypes/{darwin,libffi}* - if [ "$CARCH" = "mips64el" ]; then - ./configure --prefix=/usr \ - --enable-shared \ - --with-threads \ - --with-computed-gotos \ - --enable-ipv6 \ - --without-valgrind \ - --with-wide-unicode \ - --with-system-expat \ - --with-dbmliborder=gdbm:ndbm \ - --with-system-ffi + if [ "$CARCH" != "mips64el" ]; then + extraconf=--with-valgrind else + extraconf="" + fi ./configure --prefix=/usr \ --enable-shared \ --with-threads \ --with-computed-gotos \ --enable-ipv6 \ - --with-valgrind \ --with-wide-unicode \ --with-system-expat \ --with-dbmliborder=gdbm:ndbm \ - --with-system-ffi - fi + --with-system-ffi \ + $extraconf make } @@ -72,7 +56,8 @@ build() { 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_uuid + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \ + test_urllib test_uuid test_pydoc } package() { diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index e5c5209e9..4e22f0e37 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155309 2012-04-01 16:17:46Z bluewind $ +# $Id: PKGBUILD 156492 2012-04-19 15:59:03Z bluewind $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=qrencode -pkgver=3.3.0 +pkgver=3.3.1 pkgrel=1 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') options=(!libtool) source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b7531107ffd8e4f9ce262e87893b01ca') +md5sums=('14920ba9d0515bddcaebfbd728229c5d') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index e8a4224f7..5d56274ae 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,34 +1,41 @@ -# $Id: PKGBUILD 137306 2011-09-06 22:52:36Z bisson $ +# $Id: PKGBUILD 156513 2012-04-20 01:11:09Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim -pkgver=1.4.11 -pkgrel=2 +pkgver=1.4.12 +pkgrel=1 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') options=('!libtool') +arch=('i686' 'x86_64' 'mips64el') makedepends=('intltool') -depends=('gtk2' 'libtool') +depends=('libltdl' 'gtk2') backup=('etc/scim/config' 'etc/scim/global') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('e202e42df52f5c9a88f6ae4d4ce04f94bc22e27c') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'ftp://ftp.archlinux.org/other/scim/scim-docs-20120420.tar.xz') +sha1sums=('948180ec0af18e435a95edbdb840cf41f3b24d32' + 'b2cccb43673e1760abf6825768bc4354a981a0ad') + +# Docs tarball temporarily generated with: +# svn co https://scim.svn.sourceforge.net/svnroot/scim/scim/trunk/docs docs install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + mv ../docs . ./bootstrap + sed 's/\$nls_cv_use_gnu_gettext/yes/' -i configure + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --disable-static \ - --with-gnu-ld \ - --with-x \ + --with-gtk-version=2 # still a couple issues with 3 make } diff --git a/extra/scim/install b/extra/scim/install index 405061cb4..c05312bfd 100644 --- a/extra/scim/install +++ b/extra/scim/install @@ -1,7 +1,5 @@ post_install() { - echo -n 'updating gtk.immodules... ' /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules - echo 'done.' } post_upgrade() { diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index 8f8f8bbbf..241dee6e1 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149755 2012-02-10 04:38:45Z eric $ +# $Id: PKGBUILD 156376 2012-04-17 19:41:18Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox -pkgver=14.3.2 -pkgrel=6 +pkgver=14.4.0 +pkgrel=1 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64' 'mips64el') url="http://sox.sourceforge.net/" @@ -17,14 +17,11 @@ optdepends=('libao: for ao plugin' 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - sox-14.3.2-ffmpeg.patch) -sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3' - '86caa6aa86a0bf7a048522114d4efd11acbbda70') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Arch Linux" diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index d9c01b475..5a3ba5468 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 153509 2012-03-15 09:58:34Z stephane $ -# Maintainer: Paul Mattal <paul@archlinux.org> +# $Id: PKGBUILD 156457 2012-04-18 12:20:57Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.7.4 -pkgrel=1 +pkgrel=3 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') -depends=('neon' 'apr-util' 'sqlite3' 'file') +depends=('neon' 'apr-util' 'sqlite' 'file') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts' 'ruby: for some hook scripts') + 'python2: for some hook scripts' 'ruby: for some hook scripts' 'java-environment') makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') [ "$CARCH" = "mips64el" ] && \ @@ -19,7 +20,7 @@ makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') url="http://subversion.apache.org/" provides=('svn') -options=('!makeflags' '!libtool') +options=('!makeflags' '!libtool' '!emptydirs') source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} svnserve svn svnserve.conf subversion.rpath.fix.patch) sha1sums=('57a3cd351c1dbedddd020e7a1952df6cd2674527' @@ -65,7 +66,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH} make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ @@ -82,7 +83,10 @@ package() { install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve - # bash completion install -Dm 644 tools/client-side/bash_completion \ - "${pkgdir}"/etc/bash_completion.d/subversion + "${pkgdir}"/usr/share/bash-completion/completions/subversion + for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do + ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} + done + } diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 9e7ac5f54..37869770f 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -2,16 +2,16 @@ # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua pkgname=tomcat-native -pkgver=1.1.22 +pkgver=1.1.23 pkgrel=1 pkgdesc="The Apache Tomcat Native Library" arch=('i686' 'x86_64' 'mips64el') url="http://tomcat.apache.org/" -license="Apache" +license=("Apache") depends=('apr' 'openssl') makedepends=('java-environment') source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) -md5sums=('44d764f8d99d0454c7337ba9701558ee') +md5sums=('f2a55b5a19adbe491edc98e0c11d9028') build() { cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 428a9a9ef..1af7ebff8 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155972 2012-04-10 13:26:02Z tdziedzic $ +# $Id: PKGBUILD 156508 2012-04-20 01:03:19Z tdziedzic $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -10,7 +10,7 @@ _patchlevel=495 __hgrev=a104dae7f903 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" @@ -82,7 +82,7 @@ build() { cd "${srcdir}"/gvim-build ./configure --prefix=/usr --localstatedir=/var/lib/vim \ - --with-features=big --with-compiledby=ArchLinux \ + --with-features=big --with-compiledby=Parabola \ --enable-gpm --enable-acl --with-x=yes \ --enable-gui=gtk2 --enable-multibyte --enable-cscope \ --enable-netbeans --enable-perlinterp --enable-pythoninterp \ @@ -91,6 +91,18 @@ build() { make } +check() { + # disable tests because they seem to freeze + + cd "${srcdir}"/vim-build + + #make test + + cd "${srcdir}"/gvim-build + + #make test +} + package_vim() { pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 61b170148..cc46ffee0 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154405 2012-03-27 21:06:46Z guillaume $ -# Maintainer: Guillaume ALAUX <guillaume at alaux dot net> +# $Id: PKGBUILD 156497 2012-04-19 21:01:40Z guillaume $ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=(wireshark-cli wireshark-gtk) +pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-dev') pkgbase=wireshark -pkgver=1.6.6 +pkgver=1.6.7 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -11,7 +11,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'li url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('61145ccd7684b3cfb159fc902fedfecf') +md5sums=('7e39f1c0ea4abd8bffa5122df800ca5d') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -55,3 +55,17 @@ package_wireshark-gtk() { done install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop" } + +package_wireshark-dev() { + pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - header files" + depends=('wireshark-cli') + + cd "${srcdir}/${pkgbase}-${pkgver}" + + install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} + + install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}" + for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do + install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d} + done +} diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index 49f9f0e2b..b0f6e1b72 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 154164 2012-03-23 20:26:10Z andyrtr $ +# $Id: PKGBUILD 156284 2012-04-16 15:22:10Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-input-synaptics -pkgver=1.5.99.902 +pkgver=1.5.99.903 pkgrel=1 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ options=(!libtool) backup=('etc/X11/xorg.conf.d/10-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 10-synaptics.conf) -sha1sums=('2170854823caf39f15f47329514fdbe620e31e96' +sha1sums=('adb8e28a8aced2ff660a4058d35b8656ffdf46ce' '68e1f4ef5e1038231d210eb422fa4d18c5922f0f') build() { diff --git a/extra/xf86-video-intel/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch b/extra/xf86-video-intel/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch new file mode 100644 index 000000000..5c3b1d7d6 --- /dev/null +++ b/extra/xf86-video-intel/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch @@ -0,0 +1,533 @@ +From fbee314a4194671bfc6dfaa90141498a2f45de4e Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Mon, 27 Feb 2012 16:29:38 +0000 +Subject: [PATCH 1/5] uxa/gen3: Remove special casing of solid pictures + +Fixes use of alpha-groups and opacity masks in cairo. + +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +--- + src/i915_render.c | 366 ++++++++++++++++++----------------------------------- + 1 file changed, 122 insertions(+), 244 deletions(-) + +diff --git a/src/i915_render.c b/src/i915_render.c +index 87d2336..6210035 100644 +--- a/src/i915_render.c ++++ b/src/i915_render.c +@@ -257,11 +257,8 @@ i915_check_composite_texture(ScreenPtr screen, PicturePtr picture) + return FALSE; + } + +- if (picture->pSourcePict) { +- SourcePict *source = picture->pSourcePict; +- if (source->type == SourcePictTypeSolidFill) +- return TRUE; +- } ++ if (picture->pSourcePict) ++ return FALSE; + + if (picture->pDrawable) { + int w, h, i; +@@ -387,23 +384,6 @@ static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit) + } + + static void +-i915_emit_composite_primitive_constant(intel_screen_private *intel, +- int srcX, int srcY, +- int maskX, int maskY, +- int dstX, int dstY, +- int w, int h) +-{ +- OUT_VERTEX(dstX + w); +- OUT_VERTEX(dstY + h); +- +- OUT_VERTEX(dstX); +- OUT_VERTEX(dstY + h); +- +- OUT_VERTEX(dstX); +- OUT_VERTEX(dstY); +-} +- +-static void + i915_emit_composite_primitive_identity_source(intel_screen_private *intel, + int srcX, int srcY, + int maskX, int maskY, +@@ -470,29 +450,6 @@ i915_emit_composite_primitive_affine_source(intel_screen_private *intel, + } + + static void +-i915_emit_composite_primitive_constant_identity_mask(intel_screen_private *intel, +- int srcX, int srcY, +- int maskX, int maskY, +- int dstX, int dstY, +- int w, int h) +-{ +- OUT_VERTEX(dstX + w); +- OUT_VERTEX(dstY + h); +- OUT_VERTEX((maskX + w) * intel->scale_units[0][0]); +- OUT_VERTEX((maskY + h) * intel->scale_units[0][1]); +- +- OUT_VERTEX(dstX); +- OUT_VERTEX(dstY + h); +- OUT_VERTEX(maskX * intel->scale_units[0][0]); +- OUT_VERTEX((maskY + h) * intel->scale_units[0][1]); +- +- OUT_VERTEX(dstX); +- OUT_VERTEX(dstY); +- OUT_VERTEX(maskX * intel->scale_units[0][0]); +- OUT_VERTEX(maskY * intel->scale_units[0][1]); +-} +- +-static void + i915_emit_composite_primitive_identity_source_mask(intel_screen_private *intel, + int srcX, int srcY, + int maskX, int maskY, +@@ -536,63 +493,61 @@ i915_emit_composite_primitive(intel_screen_private *intel, + + per_vertex = 2; /* dest x/y */ + +- if (! intel->render_source_is_solid) { +- src_unit = tex_unit++; +- +- is_affine_src = intel_transform_is_affine(intel->transform[src_unit]); +- if (is_affine_src) { +- if (!intel_get_transformed_coordinates(srcX, srcY, +- intel-> +- transform[src_unit], +- &src_x[0], +- &src_y[0])) +- return; +- +- if (!intel_get_transformed_coordinates(srcX, srcY + h, +- intel-> +- transform[src_unit], +- &src_x[1], +- &src_y[1])) +- return; +- +- if (!intel_get_transformed_coordinates(srcX + w, srcY + h, +- intel-> +- transform[src_unit], +- &src_x[2], +- &src_y[2])) +- return; +- +- per_vertex += 2; /* src x/y */ +- } else { +- if (!intel_get_transformed_coordinates_3d(srcX, srcY, +- intel-> +- transform[src_unit], +- &src_x[0], +- &src_y[0], +- &src_w[0])) +- return; +- +- if (!intel_get_transformed_coordinates_3d(srcX, srcY + h, +- intel-> +- transform[src_unit], +- &src_x[1], +- &src_y[1], +- &src_w[1])) +- return; +- +- if (!intel_get_transformed_coordinates_3d(srcX + w, srcY + h, +- intel-> +- transform[src_unit], +- &src_x[2], +- &src_y[2], +- &src_w[2])) +- return; +- +- per_vertex += 4; /* src x/y/z/w */ +- } ++ src_unit = tex_unit++; ++ ++ is_affine_src = intel_transform_is_affine(intel->transform[src_unit]); ++ if (is_affine_src) { ++ if (!intel_get_transformed_coordinates(srcX, srcY, ++ intel-> ++ transform[src_unit], ++ &src_x[0], ++ &src_y[0])) ++ return; ++ ++ if (!intel_get_transformed_coordinates(srcX, srcY + h, ++ intel-> ++ transform[src_unit], ++ &src_x[1], ++ &src_y[1])) ++ return; ++ ++ if (!intel_get_transformed_coordinates(srcX + w, srcY + h, ++ intel-> ++ transform[src_unit], ++ &src_x[2], ++ &src_y[2])) ++ return; ++ ++ per_vertex += 2; /* src x/y */ ++ } else { ++ if (!intel_get_transformed_coordinates_3d(srcX, srcY, ++ intel-> ++ transform[src_unit], ++ &src_x[0], ++ &src_y[0], ++ &src_w[0])) ++ return; ++ ++ if (!intel_get_transformed_coordinates_3d(srcX, srcY + h, ++ intel-> ++ transform[src_unit], ++ &src_x[1], ++ &src_y[1], ++ &src_w[1])) ++ return; ++ ++ if (!intel_get_transformed_coordinates_3d(srcX + w, srcY + h, ++ intel-> ++ transform[src_unit], ++ &src_x[2], ++ &src_y[2], ++ &src_w[2])) ++ return; ++ ++ per_vertex += 4; /* src x/y/z/w */ + } + +- if (intel->render_mask && ! intel->render_mask_is_solid) { ++ if (intel->render_mask) { + mask_unit = tex_unit++; + + is_affine_mask = intel_transform_is_affine(intel->transform[mask_unit]); +@@ -650,15 +605,13 @@ i915_emit_composite_primitive(intel_screen_private *intel, + + OUT_VERTEX(dstX + w); + OUT_VERTEX(dstY + h); +- if (! intel->render_source_is_solid) { +- OUT_VERTEX(src_x[2] * intel->scale_units[src_unit][0]); +- OUT_VERTEX(src_y[2] * intel->scale_units[src_unit][1]); +- if (!is_affine_src) { ++ OUT_VERTEX(src_x[2] * intel->scale_units[src_unit][0]); ++ OUT_VERTEX(src_y[2] * intel->scale_units[src_unit][1]); ++ if (!is_affine_src) { + OUT_VERTEX(0.0); + OUT_VERTEX(src_w[2]); +- } + } +- if (intel->render_mask && ! intel->render_mask_is_solid) { ++ if (intel->render_mask) { + OUT_VERTEX(mask_x[2] * intel->scale_units[mask_unit][0]); + OUT_VERTEX(mask_y[2] * intel->scale_units[mask_unit][1]); + if (!is_affine_mask) { +@@ -669,15 +622,13 @@ i915_emit_composite_primitive(intel_screen_private *intel, + + OUT_VERTEX(dstX); + OUT_VERTEX(dstY + h); +- if (! intel->render_source_is_solid) { +- OUT_VERTEX(src_x[1] * intel->scale_units[src_unit][0]); +- OUT_VERTEX(src_y[1] * intel->scale_units[src_unit][1]); +- if (!is_affine_src) { ++ OUT_VERTEX(src_x[1] * intel->scale_units[src_unit][0]); ++ OUT_VERTEX(src_y[1] * intel->scale_units[src_unit][1]); ++ if (!is_affine_src) { + OUT_VERTEX(0.0); + OUT_VERTEX(src_w[1]); +- } + } +- if (intel->render_mask && ! intel->render_mask_is_solid) { ++ if (intel->render_mask) { + OUT_VERTEX(mask_x[1] * intel->scale_units[mask_unit][0]); + OUT_VERTEX(mask_y[1] * intel->scale_units[mask_unit][1]); + if (!is_affine_mask) { +@@ -688,15 +639,13 @@ i915_emit_composite_primitive(intel_screen_private *intel, + + OUT_VERTEX(dstX); + OUT_VERTEX(dstY); +- if (! intel->render_source_is_solid) { +- OUT_VERTEX(src_x[0] * intel->scale_units[src_unit][0]); +- OUT_VERTEX(src_y[0] * intel->scale_units[src_unit][1]); +- if (!is_affine_src) { ++ OUT_VERTEX(src_x[0] * intel->scale_units[src_unit][0]); ++ OUT_VERTEX(src_y[0] * intel->scale_units[src_unit][1]); ++ if (!is_affine_src) { + OUT_VERTEX(0.0); + OUT_VERTEX(src_w[0]); +- } + } +- if (intel->render_mask && ! intel->render_mask_is_solid) { ++ if (intel->render_mask) { + OUT_VERTEX(mask_x[0] * intel->scale_units[mask_unit][0]); + OUT_VERTEX(mask_y[0] * intel->scale_units[mask_unit][1]); + if (!is_affine_mask) { +@@ -729,29 +678,11 @@ i915_prepare_composite(int op, PicturePtr source_picture, + intel->render_dest_picture = dest_picture; + intel->render_dest = dest; + +- intel->render_source_is_solid = FALSE; +- if (source_picture->pSourcePict) { +- SourcePict *source = source_picture->pSourcePict; +- if (source->type == SourcePictTypeSolidFill) { +- intel->render_source_is_solid = TRUE; +- intel->render_source_solid = source->solidFill.color; +- } +- } +- if (!intel->render_source_is_solid && !intel_check_pitch_3d(source)) ++ if (!intel_check_pitch_3d(source)) + return FALSE; + +- intel->render_mask_is_solid = FALSE; +- if (mask) { +- if (mask_picture->pSourcePict) { +- SourcePict *source = mask_picture->pSourcePict; +- if (source->type == SourcePictTypeSolidFill) { +- intel->render_mask_is_solid = TRUE; +- intel->render_mask_solid = source->solidFill.color; +- } +- } +- if (!intel->render_mask_is_solid && !intel_check_pitch_3d(mask)) +- return FALSE; +- } ++ if (mask && !intel_check_pitch_3d(mask)) ++ return FALSE; + + if (!intel_check_pitch_3d(dest)) + return FALSE; +@@ -787,31 +718,27 @@ i915_prepare_composite(int op, PicturePtr source_picture, + intel->scale_units[1][1] = -1; + + floats_per_vertex = 2; /* dest x/y */ +- if (! intel->render_source_is_solid) { +- if (!i915_texture_setup(source_picture, source, tex_unit++)) { +- intel_debug_fallback(scrn, "fail to setup src texture\n"); +- return FALSE; +- } +- +- if (intel_transform_is_affine(source_picture->transform)) +- floats_per_vertex += 2; /* src x/y */ +- else +- floats_per_vertex += 4; /* src x/y/z/w */ ++ if (!i915_texture_setup(source_picture, source, tex_unit++)) { ++ intel_debug_fallback(scrn, "fail to setup src texture\n"); ++ return FALSE; + } + +- if (mask != NULL) { +- if (! intel->render_mask_is_solid) { +- if (!i915_texture_setup(mask_picture, mask, tex_unit++)) { +- intel_debug_fallback(scrn, +- "fail to setup mask texture\n"); +- return FALSE; +- } ++ if (intel_transform_is_affine(source_picture->transform)) ++ floats_per_vertex += 2; /* src x/y */ ++ else ++ floats_per_vertex += 4; /* src x/y/z/w */ + +- if (intel_transform_is_affine(mask_picture->transform)) +- floats_per_vertex += 2; /* mask x/y */ +- else +- floats_per_vertex += 4; /* mask x/y/z/w */ ++ if (mask != NULL) { ++ if (!i915_texture_setup(mask_picture, mask, tex_unit++)) { ++ intel_debug_fallback(scrn, ++ "fail to setup mask texture\n"); ++ return FALSE; + } ++ ++ if (intel_transform_is_affine(mask_picture->transform)) ++ floats_per_vertex += 2; /* mask x/y */ ++ else ++ floats_per_vertex += 4; /* mask x/y/z/w */ + } + + intel->i915_render_state.op = op; +@@ -827,17 +754,13 @@ i915_prepare_composite(int op, PicturePtr source_picture, + + intel->prim_emit = i915_emit_composite_primitive; + if (!mask) { +- if (intel->render_source_is_solid) +- intel->prim_emit = i915_emit_composite_primitive_constant; +- else if (intel->transform[0] == NULL) ++ if (intel->transform[0] == NULL) + intel->prim_emit = i915_emit_composite_primitive_identity_source; + else if (intel_transform_is_affine(intel->transform[0])) + intel->prim_emit = i915_emit_composite_primitive_affine_source; + } else { + if (intel->transform[0] == NULL) { +- if (intel->render_source_is_solid) +- intel->prim_emit = i915_emit_composite_primitive_constant_identity_mask; +- else if (intel->transform[1] == NULL) ++ if (intel->transform[1] == NULL) + intel->prim_emit = i915_emit_composite_primitive_identity_source_mask; + } + } +@@ -856,39 +779,25 @@ i915_composite_emit_shader(intel_screen_private *intel, CARD8 op) + PicturePtr mask_picture = intel->render_mask_picture; + PixmapPtr mask = intel->render_mask; + int src_reg, mask_reg; +- Bool is_solid_src, is_solid_mask; + Bool dest_is_alpha = PIXMAN_FORMAT_RGB(intel->render_dest_picture->format) == 0; +- int tex_unit, t; + FS_LOCALS(); + +- is_solid_src = intel->render_source_is_solid; +- is_solid_mask = intel->render_mask_is_solid; +- + FS_BEGIN(); + + /* Declare the registers necessary for our program. */ +- t = 0; +- if (is_solid_src) { +- i915_fs_dcl(FS_T8); +- src_reg = FS_T8; +- } else { +- i915_fs_dcl(FS_T0); +- i915_fs_dcl(FS_S0); +- t++; +- } ++ i915_fs_dcl(FS_T0); ++ i915_fs_dcl(FS_S0); + if (!mask) { + /* No mask, so load directly to output color */ +- if (! is_solid_src) { +- if (dest_is_alpha) +- src_reg = FS_R0; +- else +- src_reg = FS_OC; ++ if (dest_is_alpha) ++ src_reg = FS_R0; ++ else ++ src_reg = FS_OC; + +- if (intel_transform_is_affine(intel->transform[0])) +- i915_fs_texld(src_reg, FS_S0, FS_T0); +- else +- i915_fs_texldp(src_reg, FS_S0, FS_T0); +- } ++ if (intel_transform_is_affine(intel->transform[0])) ++ i915_fs_texld(src_reg, FS_S0, FS_T0); ++ else ++ i915_fs_texldp(src_reg, FS_S0, FS_T0); + + if (src_reg != FS_OC) { + if (dest_is_alpha) +@@ -897,35 +806,24 @@ i915_composite_emit_shader(intel_screen_private *intel, CARD8 op) + i915_fs_mov(FS_OC, i915_fs_operand_reg(src_reg)); + } + } else { +- if (is_solid_mask) { +- i915_fs_dcl(FS_T9); +- mask_reg = FS_T9; +- } else { +- i915_fs_dcl(FS_T0 + t); +- i915_fs_dcl(FS_S0 + t); +- } ++ i915_fs_dcl(FS_T1); ++ i915_fs_dcl(FS_S1); + +- tex_unit = 0; +- if (! is_solid_src) { +- /* Load the source_picture texel */ +- if (intel_transform_is_affine(intel->transform[tex_unit])) +- i915_fs_texld(FS_R0, FS_S0, FS_T0); +- else +- i915_fs_texldp(FS_R0, FS_S0, FS_T0); ++ /* Load the source_picture texel */ ++ if (intel_transform_is_affine(intel->transform[0])) ++ i915_fs_texld(FS_R0, FS_S0, FS_T0); ++ else ++ i915_fs_texldp(FS_R0, FS_S0, FS_T0); + +- src_reg = FS_R0; +- tex_unit++; +- } ++ src_reg = FS_R0; + +- if (! is_solid_mask) { +- /* Load the mask_picture texel */ +- if (intel_transform_is_affine(intel->transform[tex_unit])) +- i915_fs_texld(FS_R1, FS_S0 + t, FS_T0 + t); +- else +- i915_fs_texldp(FS_R1, FS_S0 + t, FS_T0 + t); ++ /* Load the mask_picture texel */ ++ if (intel_transform_is_affine(intel->transform[1])) ++ i915_fs_texld(FS_R1, FS_S1, FS_T1); ++ else ++ i915_fs_texldp(FS_R1, FS_S1, FS_T1); + +- mask_reg = FS_R1; +- } ++ mask_reg = FS_R1; + + if (dest_is_alpha) { + i915_fs_mul(FS_OC, +@@ -972,7 +870,6 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn) + PicturePtr dest_picture = intel->render_dest_picture; + PixmapPtr mask = intel->render_mask; + PixmapPtr dest = intel->render_dest; +- Bool is_solid_src, is_solid_mask; + int tex_count, t; + + intel->needs_render_state_emit = FALSE; +@@ -980,12 +877,7 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn) + IntelEmitInvarientState(scrn); + intel->last_3d = LAST_3D_RENDER; + +- is_solid_src = intel->render_source_is_solid; +- is_solid_mask = intel->render_mask_is_solid; +- +- tex_count = 0; +- tex_count += ! is_solid_src; +- tex_count += mask && ! is_solid_mask; ++ tex_count = 1 + (mask != NULL); + + assert(intel->in_batch_atomic); + +@@ -1007,15 +899,6 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn) + } + } + +- if (is_solid_src) { +- OUT_BATCH (_3DSTATE_DFLT_DIFFUSE_CMD); +- OUT_BATCH (intel->render_source_solid); +- } +- if (mask && is_solid_mask) { +- OUT_BATCH (_3DSTATE_DFLT_SPEC_CMD); +- OUT_BATCH (intel->render_mask_solid); +- } +- + /* BUF_INFO is an implicit flush, so avoid if the target has not changed. + * XXX However for reasons unfathomed, correct rendering in KDE requires + * at least a MI_FLUSH | INHIBIT_RENDER_CACHE_FLUSH here. +@@ -1058,20 +941,15 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn) + uint32_t ss2; + + ss2 = ~0; +- t = 0; +- if (! is_solid_src) { +- ss2 &= ~S2_TEXCOORD_FMT(t, TEXCOORDFMT_NOT_PRESENT); +- ss2 |= S2_TEXCOORD_FMT(t, +- intel_transform_is_affine(intel->transform[t]) ? +- TEXCOORDFMT_2D : TEXCOORDFMT_4D); +- t++; +- } +- if (mask && ! is_solid_mask) { +- ss2 &= ~S2_TEXCOORD_FMT(t, TEXCOORDFMT_NOT_PRESENT); +- ss2 |= S2_TEXCOORD_FMT(t, +- intel_transform_is_affine(intel->transform[t]) ? ++ ss2 &= ~S2_TEXCOORD_FMT(0, TEXCOORDFMT_NOT_PRESENT); ++ ss2 |= S2_TEXCOORD_FMT(0, ++ intel_transform_is_affine(intel->transform[0]) ? ++ TEXCOORDFMT_2D : TEXCOORDFMT_4D); ++ if (mask) { ++ ss2 &= ~S2_TEXCOORD_FMT(1, TEXCOORDFMT_NOT_PRESENT); ++ ss2 |= S2_TEXCOORD_FMT(1, ++ intel_transform_is_affine(intel->transform[1]) ? + TEXCOORDFMT_2D : TEXCOORDFMT_4D); +- t++; + } + + if (intel->needs_render_ca_pass) { +-- +1.7.10 + diff --git a/extra/xf86-video-intel/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch b/extra/xf86-video-intel/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch new file mode 100644 index 000000000..89f43459d --- /dev/null +++ b/extra/xf86-video-intel/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch @@ -0,0 +1,50 @@ +From fd25a4586b0667b1591d85b23daaa99464e9b0d8 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Mon, 19 Mar 2012 15:51:43 +0000 +Subject: [PATCH 2/5] uxa: Defer the call to EnterVT till after outputs are + initialised + +We need to do this apparently or else we never perform the VT switch. +However, we can not do it too early, especially not before we have +finished intialising the outputs. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47395 +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +--- + src/intel_driver.c | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/src/intel_driver.c b/src/intel_driver.c +index e2e43fa..ff29754 100644 +--- a/src/intel_driver.c ++++ b/src/intel_driver.c +@@ -1013,13 +1013,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) + "Hardware cursor initialization failed\n"); + } + +- /* Must force it before EnterVT, so we are in control of VT and +- * later memory should be bound when allocating, e.g rotate_mem */ +- scrn->vtSema = TRUE; +- +- if (!I830EnterVT(scrnIndex, 0)) +- return FALSE; +- + intel->BlockHandler = screen->BlockHandler; + screen->BlockHandler = I830BlockHandler; + +@@ -1092,7 +1085,11 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) + I830UeventInit(scrn); + #endif + +- return TRUE; ++ /* Must force it before EnterVT, so we are in control of VT and ++ * later memory should be bound when allocating, e.g rotate_mem */ ++ scrn->vtSema = TRUE; ++ ++ return I830EnterVT(scrnIndex, 0); + } + + static void i830AdjustFrame(int scrnIndex, int x, int y, int flags) +-- +1.7.10 + diff --git a/extra/xf86-video-intel/0003-uxa-Remove-hook-for-CompositeRectangles.patch b/extra/xf86-video-intel/0003-uxa-Remove-hook-for-CompositeRectangles.patch new file mode 100644 index 000000000..c1c4d55e8 --- /dev/null +++ b/extra/xf86-video-intel/0003-uxa-Remove-hook-for-CompositeRectangles.patch @@ -0,0 +1,255 @@ +From b669f171adece9df7f0c340c664b70e94118a55e Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Fri, 23 Mar 2012 14:56:06 +0000 +Subject: [PATCH 3/5] uxa: Remove hook for CompositeRectangles + +It was broken and not flushing damage correctly. With the +improvements made to the kernel, it is no longer a significant advantage +per se and not worth its additional complexity. + +Reported-by: Tilman Sauerbeck <tilman@code-monkey.de> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32547 +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +--- + uxa/uxa-priv.h | 1 - + uxa/uxa-render.c | 189 ------------------------------------------------------ + uxa/uxa.c | 4 -- + 3 files changed, 194 deletions(-) + +diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h +index 0de45f5..b24ec4f 100644 +--- a/uxa/uxa-priv.h ++++ b/uxa/uxa-priv.h +@@ -123,7 +123,6 @@ typedef struct { + BitmapToRegionProcPtr SavedBitmapToRegion; + #ifdef RENDER + CompositeProcPtr SavedComposite; +- CompositeRectsProcPtr SavedCompositeRects; + TrianglesProcPtr SavedTriangles; + GlyphsProcPtr SavedGlyphs; + TrapezoidsProcPtr SavedTrapezoids; +diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c +index 877b286..1e88c5d 100644 +--- a/uxa/uxa-render.c ++++ b/uxa/uxa-render.c +@@ -947,195 +947,6 @@ uxa_acquire_mask(ScreenPtr screen, + out_x, out_y); + } + +-static Bool +-_pixman_region_init_rectangles(pixman_region16_t *region, +- int num_rects, +- xRectangle *rects, +- int tx, int ty) +-{ +- pixman_box16_t stack_boxes[64], *boxes = stack_boxes; +- pixman_bool_t ret; +- int i; +- +- if (num_rects > sizeof(stack_boxes) / sizeof(stack_boxes[0])) { +- boxes = malloc(sizeof(pixman_box16_t) * num_rects); +- if (boxes == NULL) +- return FALSE; +- } +- +- for (i = 0; i < num_rects; i++) { +- boxes[i].x1 = rects[i].x + tx; +- boxes[i].y1 = rects[i].y + ty; +- boxes[i].x2 = rects[i].x + tx + rects[i].width; +- boxes[i].y2 = rects[i].y + ty + rects[i].height; +- } +- +- ret = pixman_region_init_rects(region, boxes, num_rects); +- +- if (boxes != stack_boxes) +- free(boxes); +- +- return ret; +-} +- +-void +-uxa_solid_rects (CARD8 op, +- PicturePtr dst, +- xRenderColor *color, +- int num_rects, +- xRectangle *rects) +-{ +- ScreenPtr screen = dst->pDrawable->pScreen; +- uxa_screen_t *uxa_screen = uxa_get_screen(screen); +- PixmapPtr dst_pixmap, src_pixmap = NULL; +- pixman_region16_t region; +- pixman_box16_t *boxes, *extents; +- PicturePtr src; +- int dst_x, dst_y; +- int num_boxes; +- +- if (!pixman_region_not_empty(dst->pCompositeClip)) +- return; +- +- if (uxa_screen->info->flags & UXA_USE_GLAMOR) { +- int ok; +- +- uxa_picture_prepare_access(dst, UXA_GLAMOR_ACCESS_RW); +- ok = glamor_composite_rects_nf(op, dst, color, +- num_rects, rects); +- uxa_picture_finish_access(dst, UXA_GLAMOR_ACCESS_RW); +- +- if (!ok) +- goto fallback; +- +- return; +- } +- +- if (dst->alphaMap) +- goto fallback; +- +- dst_pixmap = uxa_get_offscreen_pixmap(dst->pDrawable, &dst_x, &dst_y); +- if (!dst_pixmap) +- goto fallback; +- +- if (!_pixman_region_init_rectangles(®ion, +- num_rects, rects, +- dst->pDrawable->x, dst->pDrawable->y)) +- goto fallback; +- +- if (!pixman_region_intersect(®ion, ®ion, dst->pCompositeClip)) { +- pixman_region_fini(®ion); +- return; +- } +- +- pixman_region_translate(®ion, dst_x, dst_y); +- boxes = pixman_region_rectangles(®ion, &num_boxes); +- extents = pixman_region_extents (®ion); +- +- if (op == PictOpClear) +- color->red = color->green = color->blue = color->alpha = 0; +- if (color->alpha >= 0xff00 && op == PictOpOver) { +- color->alpha = 0xffff; +- op = PictOpSrc; +- } +- +- /* Using GEM, the relocation costs outweigh the advantages of the blitter */ +- if (num_boxes == 1 && (op == PictOpSrc || op == PictOpClear)) { +- CARD32 pixel; +- +-try_solid: +- if (uxa_screen->info->check_solid && +- !uxa_screen->info->check_solid(&dst_pixmap->drawable, GXcopy, FB_ALLONES)) +- goto err_region; +- +- if (!uxa_get_pixel_from_rgba(&pixel, +- color->red, +- color->green, +- color->blue, +- color->alpha, +- dst->format)) +- goto err_region; +- +- if (!uxa_screen->info->prepare_solid(dst_pixmap, GXcopy, FB_ALLONES, pixel)) +- goto err_region; +- +- while (num_boxes--) { +- uxa_screen->info->solid(dst_pixmap, +- boxes->x1, boxes->y1, +- boxes->x2, boxes->y2); +- boxes++; +- } +- +- uxa_screen->info->done_solid(dst_pixmap); +- } else { +- int error; +- +- src = CreateSolidPicture(0, color, &error); +- if (!src) +- goto err_region; +- +- if (!uxa_screen->info->check_composite(op, src, NULL, dst, +- extents->x2 - extents->x1, +- extents->y2 - extents->y1)) { +- if (op == PictOpSrc || op == PictOpClear) { +- FreePicture(src, 0); +- goto try_solid; +- } +- +- goto err_src; +- } +- +- if (!uxa_screen->info->check_composite_texture || +- !uxa_screen->info->check_composite_texture(screen, src)) { +- PicturePtr solid; +- int src_off_x, src_off_y; +- +- solid = uxa_acquire_solid(screen, src->pSourcePict); +- if (!solid) +- goto err_src; +- FreePicture(src, 0); +- +- src = solid; +- src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable, +- &src_off_x, &src_off_y); +- if (!src_pixmap) +- goto err_src; +- } +- +- if (!uxa_screen->info->prepare_composite(op, src, NULL, dst, src_pixmap, NULL, dst_pixmap)) +- goto err_src; +- +- while (num_boxes--) { +- uxa_screen->info->composite(dst_pixmap, +- 0, 0, 0, 0, +- boxes->x1, +- boxes->y1, +- boxes->x2 - boxes->x1, +- boxes->y2 - boxes->y1); +- boxes++; +- } +- +- uxa_screen->info->done_composite(dst_pixmap); +- FreePicture(src, 0); +- } +- +- /* XXX xserver-1.8: CompositeRects is not tracked by Damage, so we must +- * manually append the damaged regions ourselves. +- */ +- pixman_region_translate(®ion, -dst_x, -dst_y); +- DamageRegionAppend(dst->pDrawable, ®ion); +- +- pixman_region_fini(®ion); +- return; +- +-err_src: +- FreePicture(src, 0); +-err_region: +- pixman_region_fini(®ion); +-fallback: +- uxa_screen->SavedCompositeRects(op, dst, color, num_rects, rects); +-} +- + static int + uxa_try_driver_composite(CARD8 op, + PicturePtr pSrc, +diff --git a/uxa/uxa.c b/uxa/uxa.c +index eb2ae03..b4a1da6 100644 +--- a/uxa/uxa.c ++++ b/uxa/uxa.c +@@ -407,7 +407,6 @@ static Bool uxa_close_screen(int i, ScreenPtr pScreen) + #ifdef RENDER + if (ps) { + ps->Composite = uxa_screen->SavedComposite; +- ps->CompositeRects = uxa_screen->SavedCompositeRects; + ps->Glyphs = uxa_screen->SavedGlyphs; + ps->Trapezoids = uxa_screen->SavedTrapezoids; + ps->AddTraps = uxa_screen->SavedAddTraps; +@@ -536,9 +535,6 @@ Bool uxa_driver_init(ScreenPtr screen, uxa_driver_t * uxa_driver) + uxa_screen->SavedComposite = ps->Composite; + ps->Composite = uxa_composite; + +- uxa_screen->SavedCompositeRects = ps->CompositeRects; +- ps->CompositeRects = uxa_solid_rects; +- + uxa_screen->SavedGlyphs = ps->Glyphs; + ps->Glyphs = uxa_glyphs; + +-- +1.7.10 + diff --git a/extra/xf86-video-intel/0004-uxa-Remove-broken-render-glyphs-to-dst.patch b/extra/xf86-video-intel/0004-uxa-Remove-broken-render-glyphs-to-dst.patch new file mode 100644 index 000000000..3bf15c1a1 --- /dev/null +++ b/extra/xf86-video-intel/0004-uxa-Remove-broken-render-glyphs-to-dst.patch @@ -0,0 +1,391 @@ +From 1aee0af6d8296c108b6b4eb1bcf583aae385d22d Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Fri, 30 Mar 2012 12:47:21 +0100 +Subject: [PATCH 4/5] uxa: Remove broken render glyphs-to-dst + +Reported-by: Vincent Untz <vuntz@gnome.org> +Reported-by: Robert Bradford <robert.bradford@intel.com> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48045 +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +--- + uxa/uxa-glyphs.c | 330 +++--------------------------------------------------- + 1 file changed, 17 insertions(+), 313 deletions(-) + +diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c +index 6172f2f..b754f4e 100644 +--- a/uxa/uxa-glyphs.c ++++ b/uxa/uxa-glyphs.c +@@ -663,190 +663,6 @@ uxa_glyph_cache(ScreenPtr screen, GlyphPtr glyph, int *out_x, int *out_y) + return cache->picture; + } + +-static int +-uxa_glyphs_to_dst(CARD8 op, +- PicturePtr pSrc, +- PicturePtr pDst, +- INT16 src_x, INT16 src_y, +- INT16 xDst, INT16 yDst, +- int nlist, GlyphListPtr list, GlyphPtr * glyphs, +- BoxPtr extents) +-{ +- ScreenPtr screen = pDst->pDrawable->pScreen; +- uxa_screen_t *uxa_screen = uxa_get_screen(screen); +- PixmapPtr src_pixmap, dst_pixmap; +- PicturePtr localSrc, glyph_atlas; +- int x, y, n; +- BoxRec box; +- +- if (uxa_screen->info->check_composite_texture && +- uxa_screen->info->check_composite_texture(screen, pSrc)) { +- if (pSrc->pDrawable) { +- int src_off_x, src_off_y; +- +- src_pixmap = uxa_get_offscreen_pixmap(pSrc->pDrawable, &src_off_x, &src_off_y); +- if (src_pixmap == NULL) +- return -1; +- +- src_x += pSrc->pDrawable->x + src_off_x; +- src_y += pSrc->pDrawable->y + src_off_y; +- } else { +- src_pixmap = NULL; +- } +- localSrc = pSrc; +- } else { +- int width, height; +- +- if (extents == NULL) { +- uxa_glyph_extents(nlist, list, glyphs, &box); +- extents = &box; +- } +- +- width = extents->x2 - extents->x1; +- height = extents->y2 - extents->y1; +- if (width == 0 || height == 0) +- return 0; +- +- if (pSrc->pDrawable) { +- int src_off_x, src_off_y; +- +- src_off_x = extents->x1 - xDst; +- src_off_y = extents->y1 - yDst; +- localSrc = uxa_acquire_drawable(screen, pSrc, +- src_x + src_off_x, src_y + src_off_y, +- width, height, +- &src_x, &src_y); +- if (uxa_screen->info->check_composite_texture && +- !uxa_screen->info->check_composite_texture(screen, localSrc)) { +- if (localSrc != pSrc) +- FreePicture(localSrc, 0); +- return -1; +- } +- +- src_pixmap = uxa_get_offscreen_pixmap(localSrc->pDrawable, &src_off_x, &src_off_y); +- if (src_pixmap == NULL) { +- if (localSrc != pSrc) +- FreePicture(localSrc, 0); +- return -1; +- } +- +- src_x += localSrc->pDrawable->x + src_off_x; +- src_y += localSrc->pDrawable->y + src_off_y; +- } else { +- localSrc = uxa_acquire_pattern(screen, pSrc, +- PICT_a8r8g8b8, x, y, width, height); +- if (!localSrc) +- return 1; +- +- src_pixmap = uxa_get_drawable_pixmap(localSrc->pDrawable); +- if (src_pixmap == NULL) { +- FreePicture(localSrc, 0); +- return -1; +- } +- +- src_x = src_y = 0; +- } +- } +- +- dst_pixmap = uxa_get_offscreen_pixmap(pDst->pDrawable, &x, &y); +- x += xDst + pDst->pDrawable->x - list->xOff; +- y += yDst + pDst->pDrawable->y - list->yOff; +- +- glyph_atlas = NULL; +- while (nlist--) { +- x += list->xOff; +- y += list->yOff; +- n = list->len; +- while (n--) { +- GlyphPtr glyph = *glyphs++; +- PicturePtr this_atlas; +- int mask_x, mask_y, nrect; +- struct uxa_glyph *priv; +- BoxPtr rects; +- +- if (glyph->info.width == 0 || glyph->info.height == 0) +- goto next_glyph; +- +- priv = uxa_glyph_get_private(glyph); +- if (priv != NULL) { +- mask_x = priv->x; +- mask_y = priv->y; +- this_atlas = priv->cache->picture; +- } else { +- if (glyph_atlas) { +- uxa_screen->info->done_composite(dst_pixmap); +- glyph_atlas = NULL; +- } +- this_atlas = uxa_glyph_cache(screen, glyph, &mask_x, &mask_y); +- if (this_atlas == NULL) { +- /* no cache for this glyph */ +- this_atlas = GlyphPicture(glyph)[screen->myNum]; +- mask_x = mask_y = 0; +- } +- } +- +- if (this_atlas != glyph_atlas) { +- PixmapPtr mask_pixmap; +- +- if (glyph_atlas) +- uxa_screen->info->done_composite(dst_pixmap); +- +- mask_pixmap = +- uxa_get_drawable_pixmap(this_atlas->pDrawable); +- if (!uxa_pixmap_is_offscreen(mask_pixmap) || +- !uxa_screen->info->prepare_composite(op, +- localSrc, this_atlas, pDst, +- src_pixmap, mask_pixmap, dst_pixmap)) +- return -1; +- +- glyph_atlas = this_atlas; +- } +- +- rects = REGION_RECTS(pDst->pCompositeClip); +- nrect = REGION_NUM_RECTS(pDst->pCompositeClip); +- while (nrect--) { +- int x1 = x - glyph->info.x, dx = 0; +- int y1 = y - glyph->info.y, dy = 0; +- int x2 = x1 + glyph->info.width; +- int y2 = y1 + glyph->info.height; +- +- if (rects->y1 >= y2) +- break; +- +- if (x1 < rects->x1) +- dx = rects->x1 - x1, x1 = rects->x1; +- if (x2 > rects->x2) +- x2 = rects->x2; +- if (y1 < rects->y1) +- dy = rects->y1 - y1, y1 = rects->y1; +- if (y2 > rects->y2) +- y2 = rects->y2; +- +- if (x1 < x2 && y1 < y2) { +- uxa_screen->info->composite(dst_pixmap, +- x1 + src_x, y1 + src_y, +- dx + mask_x, dy + mask_y, +- x1, y1, +- x2 - x1, y2 - y1); +- } +- rects++; +- } +- +-next_glyph: +- x += glyph->info.xOff; +- y += glyph->info.yOff; +- } +- list++; +- } +- if (glyph_atlas) +- uxa_screen->info->done_composite(dst_pixmap); +- +- if (localSrc != pSrc) +- FreePicture(localSrc, 0); +- +- return 0; +-} +- + static void + uxa_clear_pixmap(ScreenPtr screen, + uxa_screen_t *uxa_screen, +@@ -894,37 +710,30 @@ uxa_glyphs_via_mask(CARD8 op, + PicturePtr pDst, + PictFormatPtr maskFormat, + INT16 xSrc, INT16 ySrc, +- INT16 xDst, INT16 yDst, +- int nlist, GlyphListPtr list, GlyphPtr * glyphs, +- BoxPtr extents) ++ int nlist, GlyphListPtr list, GlyphPtr * glyphs) + { + ScreenPtr screen = pDst->pDrawable->pScreen; + uxa_screen_t *uxa_screen = uxa_get_screen(screen); + CARD32 component_alpha; + PixmapPtr pixmap; + PicturePtr glyph_atlas, mask; ++ int xDst = list->xOff, yDst = list->yOff; + int x, y, width, height; + int dst_off_x, dst_off_y; + int n, error; + BoxRec box; + +- if (!extents) { +- uxa_glyph_extents(nlist, list, glyphs, &box); ++ uxa_glyph_extents(nlist, list, glyphs, &box); ++ if (box.x2 <= box.x1 || box.y2 <= box.y1) ++ return 0; + +- if (box.x2 <= box.x1 || box.y2 <= box.y1) +- return 0; ++ dst_off_x = box.x1; ++ dst_off_y = box.y1; + +- extents = &box; +- dst_off_x = box.x1; +- dst_off_y = box.y1; +- } else { +- dst_off_x = dst_off_y = 0; +- } +- +- width = extents->x2 - extents->x1; +- height = extents->y2 - extents->y1; +- x = -extents->x1; +- y = -extents->y1; ++ width = box.x2 - box.x1; ++ height = box.y2 - box.y1; ++ x = -box.x1; ++ y = -box.y1; + + if (maskFormat->depth == 1) { + PictFormatPtr a8Format = +@@ -1061,11 +870,6 @@ uxa_glyphs(CARD8 op, + { + ScreenPtr screen = pDst->pDrawable->pScreen; + uxa_screen_t *uxa_screen = uxa_get_screen(screen); +- int xDst = list->xOff, yDst = list->yOff; +- BoxRec extents = { 0, 0, 0, 0 }; +- Bool have_extents = FALSE; +- int width, height, ret; +- PicturePtr localDst = pDst; + + if (uxa_screen->info->flags & UXA_USE_GLAMOR) { + int ok; +@@ -1128,112 +932,12 @@ fallback: + } + } + +- if (!maskFormat && +- uxa_screen->info->check_composite_target && +- !uxa_screen->info->check_composite_target(uxa_get_drawable_pixmap(pDst->pDrawable))) { +- int depth = pDst->pDrawable->depth; +- PixmapPtr pixmap; +- int x, y, error; +- GCPtr gc; +- +- pixmap = uxa_get_drawable_pixmap(pDst->pDrawable); +- if (uxa_screen->info->check_copy && +- !uxa_screen->info->check_copy(pixmap, pixmap, GXcopy, FB_ALLONES)) +- goto fallback; +- +- uxa_glyph_extents(nlist, list, glyphs, &extents); +- +- /* clip against dst bounds */ +- if (extents.x1 < 0) +- extents.x1 = 0; +- if (extents.y1 < 0) +- extents.y1 = 0; +- if (extents.x2 > pDst->pDrawable->width) +- extents.x2 = pDst->pDrawable->width; +- if (extents.y2 > pDst->pDrawable->height) +- extents.y2 = pDst->pDrawable->height; +- +- if (extents.x2 <= extents.x1 || extents.y2 <= extents.y1) +- return; +- width = extents.x2 - extents.x1; +- height = extents.y2 - extents.y1; +- x = -extents.x1; +- y = -extents.y1; +- have_extents = TRUE; +- +- xDst += x; +- yDst += y; +- +- pixmap = screen->CreatePixmap(screen, +- width, height, depth, +- CREATE_PIXMAP_USAGE_SCRATCH); +- if (!pixmap) +- return; +- +- if (!uxa_pixmap_is_offscreen(pixmap)) { +- screen->DestroyPixmap(pixmap); +- goto fallback; +- } +- +- gc = GetScratchGC(depth, screen); +- if (!gc) { +- screen->DestroyPixmap(pixmap); +- return; +- } +- +- ValidateGC(&pixmap->drawable, gc); +- gc->ops->CopyArea(pDst->pDrawable, &pixmap->drawable, gc, +- extents.x1, extents.y1, +- width, height, +- 0, 0); +- FreeScratchGC(gc); +- +- localDst = CreatePicture(0, &pixmap->drawable, +- PictureMatchFormat(screen, depth, pDst->format), +- 0, 0, serverClient, &error); +- screen->DestroyPixmap(pixmap); +- +- if (!localDst) +- return; +- +- ValidatePicture(localDst); +- } +- +- if (maskFormat) { +- ret = uxa_glyphs_via_mask(op, +- pSrc, localDst, maskFormat, +- xSrc, ySrc, +- xDst, yDst, +- nlist, list, glyphs, +- have_extents ? &extents : NULL); +- } else { +- ret = uxa_glyphs_to_dst(op, +- pSrc, localDst, +- xSrc, ySrc, +- xDst, yDst, +- nlist, list, glyphs, +- have_extents ? &extents : NULL); +- } +- if (ret) { +- if (localDst != pDst) +- FreePicture(localDst, 0); +- ++ if (!maskFormat) + goto fallback; +- } + +- if (localDst != pDst) { +- GCPtr gc; +- +- gc = GetScratchGC(pDst->pDrawable->depth, screen); +- if (gc) { +- ValidateGC(pDst->pDrawable, gc); +- gc->ops->CopyArea(localDst->pDrawable, pDst->pDrawable, gc, +- 0, 0, +- width, height, +- extents.x1, extents.y1); +- FreeScratchGC(gc); +- } +- +- FreePicture(localDst, 0); +- } ++ if (uxa_glyphs_via_mask(op, ++ pSrc, pDst, maskFormat, ++ xSrc, ySrc, ++ nlist, list, glyphs)) ++ goto fallback; + } +-- +1.7.10 + diff --git a/extra/xf86-video-intel/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch b/extra/xf86-video-intel/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch new file mode 100644 index 000000000..865679078 --- /dev/null +++ b/extra/xf86-video-intel/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch @@ -0,0 +1,40 @@ +From af5c698fd43308c3b799783b662b9cd871f90a62 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Sat, 14 Apr 2012 19:03:25 +0100 +Subject: [PATCH 5/5] uxa: Fix leak of glyph mask for unhandled glyph + composition + +==1401== 7,344 bytes in 34 blocks are possibly lost in loss record 570 of 587 +==1401== at 0x4027034: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) +==1401== by 0x8BE5150: drm_intel_gem_bo_alloc_internal (intel_bufmgr_gem.c:689) +==1401== by 0x899FC04: intel_uxa_create_pixmap (intel_uxa.c:1077) +==1401== by 0x89C2C41: uxa_glyphs (uxa-glyphs.c:254) +==1401== by 0x21F05E: damageGlyphs (damage.c:647) +==1401== by 0x218E06: ProcRenderCompositeGlyphs (render.c:1434) +==1401== by 0x15AA40: Dispatch (dispatch.c:439) +==1401== by 0x1499E9: main (main.c:287) + +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +--- + uxa/uxa-glyphs.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c +index b754f4e..921b99c 100644 +--- a/uxa/uxa-glyphs.c ++++ b/uxa/uxa-glyphs.c +@@ -812,8 +812,10 @@ uxa_glyphs_via_mask(CARD8 op, + if (!uxa_pixmap_is_offscreen(src_pixmap) || + !uxa_screen->info->prepare_composite(PictOpAdd, + this_atlas, NULL, mask, +- src_pixmap, NULL, pixmap)) ++ src_pixmap, NULL, pixmap)) { ++ FreePicture(mask, 0); + return -1; ++ } + + glyph_atlas = this_atlas; + } +-- +1.7.10 + diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index ca1e15eb0..ad44b5329 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,23 +1,38 @@ -# $Id: PKGBUILD 153342 2012-03-12 20:53:36Z andyrtr $ +# $Id: PKGBUILD 156183 2012-04-15 12:22:45Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel pkgver=2.18.0 -pkgrel=1 +pkgrel=3 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev') -makedepends=('xorg-server-devel>=1.11.99.903' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') -conflicts=('xorg-server<1.11.99.903' 'xf86-video-i810' 'xf86-video-intel-legacy') +makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') +conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('77fae98e73414140bf214dca5da32bcf079c4463') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + 0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch + 0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch + 0003-uxa-Remove-hook-for-CompositeRectangles.patch + 0004-uxa-Remove-broken-render-glyphs-to-dst.patch + 0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch) +sha1sums=('77fae98e73414140bf214dca5da32bcf079c4463' + '8b46a5120c8c0b94fcd75801e5ce91d6baccd1ac' + 'd959c66ab40f521bfe4df66b6f43c98b13f59283' + '5525715f1bbf80edfc34d55946b0528f6b8dbf75' + '3e54a4b3911e004d29b6a8e07adb7c16eba5bc4f' + '32e2e5a53926ce29290bf6454e7dcdbd18e91d5e') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch" + patch -Np1 -i "${srcdir}/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch" + patch -Np1 -i "${srcdir}/0003-uxa-Remove-hook-for-CompositeRectangles.patch" + patch -Np1 -i "${srcdir}/0004-uxa-Remove-broken-render-glyphs-to-dst.patch" + patch -Np1 -i "${srcdir}/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch" ./configure --prefix=/usr --enable-dri make } diff --git a/extra/xorg-xinput/PKGBUILD b/extra/xorg-xinput/PKGBUILD index 86769d838..5e794b340 100644 --- a/extra/xorg-xinput/PKGBUILD +++ b/extra/xorg-xinput/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153392 2012-03-12 20:55:45Z andyrtr $ +# $Id: PKGBUILD 156282 2012-04-16 15:19:19Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xinput -pkgver=1.5.99.1 +pkgver=1.5.99.901 pkgrel=1 pkgdesc="Small commandline tool to configure devices" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('libx11' 'libxi>=1.5.99.2' 'xorg-xrandr' 'libxinerama') makedepends=('xorg-util-macros' 'inputproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xinput-${pkgver}.tar.bz2) -sha1sums=('f979d9a4005d71db7e58064dff6ca6738bd9a345') +sha1sums=('bc99cddeac306a23ad96f35d8ff3314d7e45d460') build() { cd "${srcdir}/xinput-${pkgver}" diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 36287b9fb..0af6437d1 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -13,8 +13,8 @@ pkgname=('linux-libre-rt' 'linux-libre-rt-headers') # Build stock -LIBRE kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-RT _basekernel=3.2 -_releasever=12 -_rtpatchver=rt22 +_releasever=15 +_rtpatchver=rt26 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 @@ -33,18 +33,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'i915-gpu-finish.patch' 'ext4-options.patch') md5sums=('65c669b6e4888db84a80882461851867' - 'd1d6c566dbc5b9fe6983eb6cab8fa00a' - 'd530078f8e59eda4de457041687db952' + '7dcae363be46096d15d3bb9456991048' + '0aa7c5d90e4e01e7775a1a030c24ca56' '6141ab0cb60a5cf9e6ee3bdf8c8c79b1' 'c2f3423d7c7d8e5776e961b75a52a3fc' '0d001b0277f318bc40a263aaa980d44e' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '4cd79aa147825837dc8bc9f6b736c0a0' 'c8299cf750a84e12d60b372c8ca7e1e8') build() { @@ -60,10 +58,6 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # fix FS#27883 - # drm/i915: Only clear the GPU domains upon a successful finish - patch -Np1 -i "${srcdir}/i915-gpu-finish.patch" - # Some chips detect a ghost TV output # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html # Arch Linux bug report: FS#19234 diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 410e69aa0..63ffbc03d 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.2.12-1-LIBRE-RT +KERNEL_VERSION=3.2.15-1-rt26-LIBRE-RT post_install () { # updating module dependencies @@ -44,8 +44,12 @@ post_upgrade() { echo ">>>" fi - if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then - echo "WARNING: /boot appears to be a separate partition but is not mounted." + if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then + if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then + echo "WARNING: /boot appears to be a seperate partition but is not mounted" + echo " This is most likely not what you want. Please mount your /boot" + echo " partition and reinstall the kernel unless you are sure this is OK" + fi fi # updating module dependencies diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 685710c52..caa0d045b 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -11,8 +11,7 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-XEN _basekernel=3.3 -#pkgver=${_basekernel}.11 -pkgver=${_basekernel} +pkgver=${_basekernel}.2 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -20,7 +19,7 @@ license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config.i686' # standard config files for mkinitcpio ramdisk @@ -28,29 +27,26 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'i915-gpu-finish.patch' 'ext4-options.patch') md5sums=('5487da14ca81715a469c7594d39722fa' - '1f29ffc2b18d7c37c781d7938ada59ab' + 'b43d3bdecfa355bf45bd1154819e3687' + '7e49ab7e4e63c890d0196be139a55656' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '4cd79aa147825837dc8bc9f6b736c0a0' - 'c8299cf750a84e12d60b372c8ca7e1e8') + 'bb7fd1aa23016c8057046b84fd4eb528') build() { cd "${srcdir}/linux-${_basekernel}" -# patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre" + if [ "${_basekernel}" != "${pkgver}" ]; then + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + fi # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # fix FS#27883 - # drm/i915: Only clear the GPU domains upon a successful finish - patch -Np1 -i "${srcdir}/i915-gpu-finish.patch" - # Some chips detect a ghost TV output # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html # Arch Linux bug report: FS#19234 @@ -171,7 +167,7 @@ package_linux-libre-xen-headers() { mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" for i in acpi asm-generic config crypto drm generated linux math-emu \ - media net pcmcia scsi sound trace video xen; do + media mtd net pcmcia scsi sound trace video xen; do cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686 index e6a221b4f..b1d41d390 100644 --- a/kernels/linux-libre-xen/config.i686 +++ b/kernels/linux-libre-xen/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.3.0 Kernel Configuration +# Linux/i386 3.3.2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5120,7 +5120,6 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_R8712U=m -CONFIG_R8712_AP=y CONFIG_RTS_PSTOR=m # CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m diff --git a/kernels/linux-libre-xen/ext4-options.patch b/kernels/linux-libre-xen/ext4-options.patch index 812b05f04..ea48c384b 100644 --- a/kernels/linux-libre-xen/ext4-options.patch +++ b/kernels/linux-libre-xen/ext4-options.patch @@ -46,4 +46,5 @@ index 502c61f..30de9cd 100644 +#endif default: ext4_msg(sb, KERN_ERR, - "Unrecognized mount option \"%s\" "
\ No newline at end of file + "Unrecognized mount option \"%s\" " + diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 55645b3fd..06c1f6ae8 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.3.0-1-LIBRE-XEN +KERNEL_VERSION=3.3.2-1-LIBRE-XEN post_install () { # updating module dependencies diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index f9c76e5d5..93d779d22 100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> pkgname=crosstool-ng -pkgver=1.13.2 +pkgver=1.14.1 pkgrel=1 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)" arch=('i686' 'x86_64' 'mips64el') @@ -26,4 +26,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } -md5sums=('749cf70568ad07d1b13fdcd25b163553') +md5sums=('1e8e723df67c643ebdd529990607d5bf') diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index e5c488b79..14e9eab77 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154606 2012-03-30 12:35:17Z heftig $ +# $Id: PKGBUILD 156381 2012-04-17 20:08:15Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgname=file-roller pkgname=file-roller-libre -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz) -sha256sums=('79dfb3bc2e0fb68094180ae1845e4b6c253d5f231e3cf355521193848610c5dc') +sha256sums=('94600d880ce65ab171a174a83519e4911f570fd000c33497b4805100029ebd8b') build() { cd $_pkgname-$pkgver diff --git a/libre/file-roller-libre/file-roller.install b/libre/file-roller-libre/file-roller.install index 10a148241..8b17fa3d4 100644 --- a/libre/file-roller-libre/file-roller.install +++ b/libre/file-roller-libre/file-roller.install @@ -1,22 +1,13 @@ -pkgname=file-roller - post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { - post_install $1 + post_install } - post_remove() { - post_install $1 + post_install } diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index c2b31d5eb..eb468e4da 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 154470 2012-03-28 23:15:22Z eric $ +# $Id: PKGBUILD 156321 2012-04-17 02:30:26Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.4 +pkgver=1.8.5 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64' 'mips64el') @@ -20,8 +20,8 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz remove-non-free-suggestions.patch) -sha1sums=('f887a3928116f56e1b68719c150d40bd1c3c6dff' - '0d68c567c3d37932a49709c58c37c3f138fd19cb') +sha1sums=('076cde160fff49a4b8c59fdae0571659ce8acd88' + '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 0a449ef3e..72f4c464d 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -5,8 +5,9 @@ # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-libre-api-headers -pkgver=3.3 -_basever=3.3 +_basekernel=3.3 +_sublevel=2 +pkgver=${_basekernel}.${_sublevel} pkgrel=1 pkgdesc="Kernel Libre headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') @@ -15,20 +16,24 @@ license=('GPL2') provides=("linux-api-headers=${pkgver}" "kernel-headers=${pkgver}") conflicts=('linux-api-headers' 'kernel-headers') replaces=('linux-api-headers' 'kernel-headers') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}-gnu/linux-libre-${_basever}-gnu.tar.xz") - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basever}-gnu-${pkgver}-gnu.xz") -md5sums=('5487da14ca81715a469c7594d39722fa') +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz") +md5sums=('5487da14ca81715a469c7594d39722fa' + 'b43d3bdecfa355bf45bd1154819e3687') build() { - cd ${srcdir}/linux-${_basever} - [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${_basever}-gnu-${pkgver}-gnu + cd ${srcdir}/linux-${_basekernel} + + if [ "${_basekernel}" != "${pkgver}" ]; then + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + fi make mrproper make headers_check } package() { - cd ${srcdir}/linux-${_basever} + cd ${srcdir}/linux-${_basekernel} make INSTALL_HDR_PATH=${pkgdir}/usr headers_install # use headers from libdrm diff --git a/libre/linux-libre-lts/.directory b/libre/linux-libre-lts/.directory index 60156bc93..89e875be9 100644 --- a/libre/linux-libre-lts/.directory +++ b/libre/linux-libre-lts/.directory @@ -1,2 +1,2 @@ [Dolphin] -Timestamp=2012,3,15,16,10,14 +Timestamp=2012,4,16,17,55,34 diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 790ea5e0b..5fe592460 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=27 +_sublevel=28 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.26 # nearly always the same as pkgver pkgrel=1 @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '365d490f97b1960c8880eb22257d5ef0' + '150cef79eaa9a41cd5ccd65c696e7f10' 'c7acde811ca6808b294dc06480048c61' '792766d6d403cc967977f6a46aa95d1d' 'd2c0701480bce49fd4b40dc46b9863f1' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index acb2b71f5..5f32392c0 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.27-1-LIBRE-LTS +KERNEL_VERSION=3.0.28-1-LIBRE-LTS post_install () { # updating module dependencies diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD index c813946c7..564ca267d 100644 --- a/libre/luxrays-libre/PKGBUILD +++ b/libre/luxrays-libre/PKGBUILD @@ -3,9 +3,9 @@ # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> _pkgname=luxrays pkgname=luxrays-libre -pkgver=0.8 -_pkgver=ed424ec77571 -pkgrel=7 +pkgver=1.0rc1 +_pkgver=396d39b06aa6 +pkgrel=1 epoch=0 pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)" arch=('i686' 'x86_64') @@ -17,14 +17,11 @@ replaces=('luxrays') conflicts=('luxrays') provides=("luxrays=$pkgver") source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('2ac9c588675c5971c57f473ef10ac67d') +md5sums=('a96ac693ec2900d8d1b209f88edd7e94') build() { cd "$srcdir/luxrender-$_pkgname-$_pkgver" - # fix the break caused by the change of the name of the namespace 'detail' to 'ipcdetail' - sed -i 's|::detail|::ipcdetail|' include/luxrays/utils/core/atomic.h - export CXXFLAGS="$CXXFLAGS -lpthread" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 38021313d..f4684ee7f 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -4,9 +4,9 @@ # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> pkgname=luxrender-libre -pkgver=0.8 -_pkgver=45d3e13eb94c -pkgrel=13 +pkgver=1.0rc1 +_pkgver=08ae99830f8e +pkgrel=1 pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenGL)" arch=('i686' 'x86_64') url="http://www.luxrender.net/" @@ -18,14 +18,12 @@ makedepends=('cmake' 'boost' 'qt' 'luxrays-libre' 'python') replaces=('luxrender') conflicts=('luxrender') provides=("luxrender=$pkgver") -source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2) -md5sums=('0f2d856385db72131f51e44a7ee527fa') +source=(https://bitbucket.org/luxrender/lux/get/"$_pkgver".tar.bz2) +md5sums=('738616b55ac58c98de431b98f90a05fb') build() { cd "$srcdir"/luxrender-lux-$_pkgver - sed -i 's/FIND_PACKAGE(Boost 1.43 COMPONENTS python REQUIRED)/FIND_PACKAGE(Boost 1.43 COMPONENTS python3 REQUIRED)/' CMakeLists.txt - export CXXFLAGS="$CXXFLAGS -lpthread" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=ON \ diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD index df4bb9a16..a5b733e9f 100644 --- a/libre/mariadb/PKGBUILD +++ b/libre/mariadb/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=mariadb _pkgbase=MariaDB pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") pkgver=5.5.23 -pkgrel=1.4 +pkgrel=1.5 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.${pkgbase}.org/" @@ -39,7 +39,7 @@ build() { -DMYSQL_DATADIR=/var/lib/${falsename} \ -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \ -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_general_ci \ + -DDEFAULT_COLLATION=utf8_unicode_ci \ -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/${falsename}/docs \ -DINSTALL_MANDIR=share/man \ @@ -60,6 +60,7 @@ build() { -DWITH_EMBEDDED_SERVER=ON \ -DWITH_INNOBASE_STORAGE_ENGINE=1 \ -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITH_PBXT_STORAGE_ENGINE=1 \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ diff --git a/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch b/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch new file mode 100644 index 000000000..ed8154df5 --- /dev/null +++ b/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch @@ -0,0 +1,61 @@ + +# HG changeset patch +# User Charles-François Natali <neologix@free.fr> +# Date 1318446474 -7200 +# Node ID ee4fe16d9b4822457ad855ea6c44e65030166304 +# Parent f6feed6ec3f9b024cecd0fd587595c403f55624f +Issue #13156: revert changeset f6feed6ec3f9, which was only relevant for native +TLS implementations, and fails with the ad-hoc TLS implementation when a thread +doesn't have an auto thread state (e.g. a thread created outside of Python +calling into a subinterpreter). + +diff --git a/Include/pystate.h b/Include/pystate.h +--- a/Include/pystate.h ++++ b/Include/pystate.h +@@ -111,7 +111,6 @@ PyAPI_FUNC(void) PyThreadState_Clear(PyT + PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *); + #ifdef WITH_THREAD + PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); +-PyAPI_FUNC(void) _PyGILState_Reinit(void); + #endif + + PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void); +diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c +--- a/Modules/signalmodule.c ++++ b/Modules/signalmodule.c +@@ -976,7 +976,6 @@ void + PyOS_AfterFork(void) + { + #ifdef WITH_THREAD +- _PyGILState_Reinit(); + PyEval_ReInitThreads(); + main_thread = PyThread_get_thread_ident(); + main_pid = getpid(); +diff --git a/Python/pystate.c b/Python/pystate.c +--- a/Python/pystate.c ++++ b/Python/pystate.c +@@ -537,23 +537,6 @@ void + autoInterpreterState = NULL; + } + +-/* Reset the TLS key - called by PyOS_AfterFork. +- * This should not be necessary, but some - buggy - pthread implementations +- * don't flush TLS on fork, see issue #10517. +- */ +-void +-_PyGILState_Reinit(void) +-{ +- PyThreadState *tstate = PyGILState_GetThisThreadState(); +- PyThread_delete_key(autoTLSkey); +- if ((autoTLSkey = PyThread_create_key()) == -1) +- Py_FatalError("Could not allocate TLS entry"); +- +- /* re-associate the current thread state with the new key */ +- if (PyThread_set_key_value(autoTLSkey, (void *)tstate) < 0) +- Py_FatalError("Couldn't create autoTLSkey mapping"); +-} +- + /* When a thread state is created for a thread by some mechanism other than + PyGILState_Ensure, it's important that the GILState machinery knows about + it so it doesn't try to create another thread state for the thread (this is + diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 7c1a159b0..56fc03df1 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,16 +1,16 @@ # Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> -# $Id: PKGBUILD 148521 2012-02-03 01:16:06Z remy $ +# $Id: PKGBUILD 154937 2012-03-31 10:46:09Z ronald $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> pkgname=texlive-bin-libre pkgver=2011.3 _luatex_ver=0.70.1 -pkgrel=4.1 +pkgrel=5 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('t1lib' 'gd' 'poppler>=0.18.2' 'libsigsegv' 'zziplib') +depends=('t1lib' 'gd' 'poppler' 'libsigsegv' 'zziplib') makedepends=('perl' 'clisp' 'ffcall') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') @@ -343,8 +343,9 @@ vpe" ${_pictures_scripts} \ ${_pstricks_scripts} \ ${_science_scripts} \ - tlmgr; do + tlmgr biber; do # biber is not built from source rm -f "$pkgdir"/usr/bin/$s done ################################################################### } + diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index 4d39c9116..0b66880dc 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -68,6 +68,9 @@ if [ $NOEXTRACT -eq 0 ]; then cp "$srcdir/mozconfig" .mozconfig + # Fails, claiming the page size to have changed. + [ "$CARCH" = "mips64el" ] && echo 'ac_add_options --disable-jemalloc' >> .mozconfig + #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" patch -Np1 -i "$srcdir/gcc47.patch" |