diff options
63 files changed, 1463 insertions, 100 deletions
diff --git a/community-testing/mplayer2/PKGBUILD b/community-testing/mplayer2/PKGBUILD new file mode 100644 index 000000000..69800fc54 --- /dev/null +++ b/community-testing/mplayer2/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Martin Panter <vadmium+aur@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=mplayer2 +pkgver=20120414 +pkgrel=1 +pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.mplayer2.org/" +install=$pkgname.install +depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' + 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' + 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'desktop-file-utils') +makedepends=('mesa' 'unzip' 'yasm') +backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') +provides=('mplayer') +conflicts=('mplayer') +options=(!emptydirs) +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('95d981808cbfa66ad238f6c044f4f746') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-arts \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --language=all \ + --enable-translation \ + --confdir=/etc/mplayer + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install + install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/ + install -dm755 "${pkgdir}"/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf + + install -dm755 "${pkgdir}"/usr/share/applications/ + install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/ +} diff --git a/community-testing/mplayer2/mplayer2.install b/community-testing/mplayer2/mplayer2.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/community-testing/mplayer2/mplayer2.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/cdemu-client/PKGBUILD b/community/cdemu-client/PKGBUILD index 279ca938c..a3166b3a5 100644 --- a/community/cdemu-client/PKGBUILD +++ b/community/cdemu-client/PKGBUILD @@ -3,7 +3,7 @@ pkgname=cdemu-client pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simple command-line client for controlling cdemu-daemon" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" @@ -20,7 +20,11 @@ build() { # python2 fix sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' src/cdemu + # bash completion dir change + sed -e 's,bashcompdir = $(sysconfdir)/bash_completion.d,bashcompdir = $(datadir)/bash-completion/completions,' -i data/Makefile.am data/Makefile.in + ./configure --prefix=/usr + make } diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index 074b0d457..9a45dd17f 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -1,26 +1,26 @@ -# $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> +# $Id: PKGBUILD 69620 2012-04-20 14:11:11Z bpiotrowski $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=dmenu pkgver=4.5 -pkgrel=2 +pkgrel=3 pkgdesc="A generic menu for X" url="http://tools.suckless.org/dmenu/" arch=('i686' 'x86_64') license=('MIT') -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') +depends=('sh' 'libxinerama') +source=(http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz) +md5sums=('9c46169ed703732ec52ed946c27d84b4') build(){ cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/dmenu-$pkgver-xft.diff - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 XFTINC=-I/usr/include/freetype2 + make \ + X11INC=/usr/include/X11 \ + X11LIB=/usr/lib/X11 } package() { diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD index 6fcfeab68..bb3f8b660 100644 --- a/community/gammu/PKGBUILD +++ b/community/gammu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61481 2012-01-01 10:15:29Z schiv $ +# $Id: PKGBUILD 69642 2012-04-20 22:20:38Z tdziedzic $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=gammu pkgver=1.31.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU All Mobile Management Utilities" arch=('i686' 'x86_64') url="http://wammu.eu/" @@ -21,7 +21,11 @@ md5sums=('9b1ff5d84730f025802b961ab9f26717') build() { cd "$srcdir/$pkgname-$pkgver" + # bash completion dir change + sed -e 's,DESTINATION "/etc/bash_completion.d",DESTINATION "/usr/share/bash-completion/completions",' -i contrib/CMakeLists.txt + cmake . -DCMAKE_INSTALL_PREFIX="/usr" + make } diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD index 969b1fc76..56470a0f6 100644 --- a/community/gecko-mediaplayer/PKGBUILD +++ b/community/gecko-mediaplayer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61721 2012-01-06 22:32:47Z lfleischer $ +# $Id: PKGBUILD 69616 2012-04-20 13:43:38Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: fancris3 <fancris3 at aol.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gecko-mediaplayer -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk') makedepends=('xulrunner' 'pkgconfig') replaces=('mplayer-plugin') source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('1a96daf878d06452c0fd9a13fd186021') +md5sums=('7675c8622c47ff8ccd22b685c48635f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD index 0704b7726..8141da27f 100644 --- a/community/gmtk/PKGBUILD +++ b/community/gmtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id$ +# $Id: PKGBUILD 69612 2012-04-20 13:39:41Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=gmtk -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc='Common functions for gnome-mplayer and gecko-mediaplay.' arch=('i686' 'x86_64') url='http://gmtk.googlecode.com/' @@ -12,7 +12,7 @@ depends=('glib2' 'gtk3' 'dconf') makedepends=('intltool' 'pkg-config') options=(!libtool) source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('e06e9ca8d61d74910343bb3ef4348f7f') +md5sums=('6bf1c63788541272717f63ec370f6b6c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD index a160d8579..ebfde0805 100644 --- a/community/gnome-mplayer/PKGBUILD +++ b/community/gnome-mplayer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61719 2012-01-06 22:32:00Z lfleischer $ +# $Id: PKGBUILD 69614 2012-04-20 13:41:25Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gnome-mplayer -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc='A simple MPlayer GUI.' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('mplayer' 'dbus-glib' 'libnotify' 'hicolor-icon-theme' 'dconf' 'gmtk') makedepends=('gnome-power-manager' 'nautilus') install="${pkgname}.install" source=("http://gnome-mplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('1d3ab24c5501b5528e357931ca4dc6da') +md5sums=('c1fc23faf70f3bbc23daf60f9b34832d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 23dd8c8c0..ff3cd3f8f 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68945 2012-04-06 12:14:22Z arodseth $ +# $Id: PKGBUILD 69644 2012-04-20 22:36:38Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Andres Perera <andres87p gmail> @@ -9,7 +9,7 @@ pkgname=go pkgver=1 -pkgrel=5 +pkgrel=6 epoch=2 pkgdesc='Google Go compiler and tools (release version)' arch=('x86_64' 'i686') @@ -62,7 +62,7 @@ package() { install -Dm644 LICENSE \ "$pkgdir/usr/share/licenses/go/LICENSE" install -Dm644 misc/bash/go \ - "$pkgdir/etc/bash_completion.d/go" + "$pkgdir/usr/share/bash-completion/completions/go" install -Dm644 misc/emacs/go-mode-load.el \ "$pkgdir/usr/share/emacs/site-lisp/go-mode-load.el" install -Dm644 misc/emacs/go-mode.el \ diff --git a/community/portaudio_cpp/PKGBUILD b/community/portaudio_cpp/PKGBUILD index 58b782570..be0d476ec 100644 --- a/community/portaudio_cpp/PKGBUILD +++ b/community/portaudio_cpp/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 55337 2011-09-10 02:09:27Z ebelanger $ +# $Id: PKGBUILD 69618 2012-04-20 13:57:47Z lfleischer $ # Maintainer: Bob Finch <w9ya@qrparci.net> pkgname=portaudio_cpp -pkgver=19_20110326 +pkgver=19_20111121 pkgrel=1 -pkgdesc="PortAudio c++ bindings" +pkgdesc='PortAudio C++ bindings' arch=('i686' 'x86_64') -url="http://www.portaudio.com/" +url='http://www.portaudio.com/' license=('custom') depends=("portaudio=${pkgver}" 'gcc-libs') options=('!libtool') -source=(http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz) -md5sums=('8f266ce03638419ef46e4efcb0fabde6') +source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz") +md5sums=('25c85c1cc5e9e657486cbc299c6c035a') build() { cd "$srcdir/portaudio" + ./configure --prefix=/usr --enable-cxx make } package() { cd "$srcdir/portaudio/bindings/cpp" - make DESTDIR=$pkgdir install - install -D -m644 ../../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" + + make DESTDIR="$pkgdir" install + install -Dm0644 ../../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" } diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index 80ce2bd02..5554745b8 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64353 2012-02-11 23:23:45Z allan $ +# $Id: PKGBUILD 69634 2012-04-20 19:51:27Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@hoetzel.info> # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy pkgver=3.0.19 -pkgrel=2 +pkgrel=3 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64') url='http://www.privoxy.org' @@ -23,7 +23,7 @@ source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src 'privoxy.conf.d') md5sums=('57acc79059565cc42eda67982842785d' '1b4ed8c4e7e5b04b10ef41b597dc3f3b' - '79480f311313cc43974f6cbe6b672927' + 'fc3046377137003726a151ee27b142a2' '27830ef79418e277b90c1c1fa933f876') build() { diff --git a/community/privoxy/privoxy.logrotate.d b/community/privoxy/privoxy.logrotate.d index 386766c3e..8c3129024 100644 --- a/community/privoxy/privoxy.logrotate.d +++ b/community/privoxy/privoxy.logrotate.d @@ -1,4 +1,4 @@ -/var/log/privoxy/* { +/var/log/privoxy/logfile { create 660 root privoxy notifempty compress diff --git a/community/qtspim/PKGBUILD b/community/qtspim/PKGBUILD index a1ac5584b..1769c6e41 100644 --- a/community/qtspim/PKGBUILD +++ b/community/qtspim/PKGBUILD @@ -1,8 +1,9 @@ +# $Id: PKGBUILD 69610 2012-04-20 10:56:45Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=qtspim -pkgver=9.1.5 +pkgver=9.1.7 pkgrel=1 pkgdesc="New user interface for spim, a MIPS simulator." arch=('i686' 'x86_64') @@ -13,7 +14,7 @@ makedepends=('subversion') __svntrunk="https://spimsimulator.svn.sourceforge.net/svnroot/spimsimulator" __svnmod=('QtSpim' 'CPU' 'Documentation' 'Setup') -__svnrev=592 +__svnrev=598 build() { cd "$srcdir" diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index 609f2b556..14cfd5aef 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69552 2012-04-18 09:36:36Z lfleischer $ +# $Id: PKGBUILD 69632 2012-04-20 19:47:13Z 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 +pkgver=4.53 pkgrel=2 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64') @@ -18,10 +18,10 @@ source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'stunnel.rc.d' 'stunnel.tmpfiles.conf') -md5sums=('f5e713dda0e8efa659f372832ecd0c2c' - '3e84d222525e724788d3c2b29b899610' +md5sums=('ab3bfc915357d67da18c73f73610d593' + 'ea8d7637e072fa1bb8706c85e6ea0152' 'f15398497e10e080c2406d2fc541660c' - 'd42a1dda7b44aab73fba670fbcfcc8a6' + '4c7e3634a9d4dc040102f5d4160fb123' '2e065a39998e57727ee79887bbd1751e') build() { diff --git a/community/stunnel/stunnel.rc.d b/community/stunnel/stunnel.rc.d index ee67e20ce..76f7b796a 100644 --- a/community/stunnel/stunnel.rc.d +++ b/community/stunnel/stunnel.rc.d @@ -3,7 +3,7 @@ . /etc/rc.conf . /etc/rc.d/functions -pidfile=/var/run/stunnel.pid +pidfile=/var/run/stunnel/stunnel.pid if [[ -r $pidfile ]]; then read -r PID < "$pidfile" if [[ $PID && ! -d /proc/$PID ]]; then diff --git a/community/xmlstarlet/PKGBUILD b/community/xmlstarlet/PKGBUILD new file mode 100644 index 000000000..b81f4a552 --- /dev/null +++ b/community/xmlstarlet/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 69626 2012-04-20 16:57:50Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: PyroPeter <abi1789@googlemail.com> +# Contributor: BlackEagle <ike.devolder@scarlet.be> +# Contributor: chochem <chochem@gmail.com> + +pkgname=xmlstarlet +pkgver=1.3.1 +pkgrel=1 +pkgdesc="A set of tools to transform, query, validate, and edit XML documents" +arch=('i686' 'x86_64') +url="http://xmlstar.sourceforge.net/" +license=('MIT') +depends=('libxslt>=1.1.9') +source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download") +md5sums=('5173ad3f01ec0ba0d54bd1fbfc057abf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + local xsltlibs=$(pkg-config --libs libxslt libexslt) + local xmllibs=$(pkg-config --libs libxml-2.0) + + LIBXSLT_PREFIX=/usr \ + LIBXML_PREFIX=/usr \ + LIBXSLT_LIBS="${xsltlibs}" \ + LIBXML_LIBS="${xmllibs}" \ + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install + + install -Dm0644 Copyright $pkgdir/usr/share/licenses/$pkgname/COPYING + ln -s xml ${pkgdir}/usr/bin/xmlstarlet +} diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD new file mode 100644 index 000000000..a437fa806 --- /dev/null +++ b/extra/calligra/PKGBUILD @@ -0,0 +1,272 @@ +# $Id: PKGBUILD 156552 2012-04-20 19:21:46Z andrea $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgbase=calligra +pkgname=('calligra-filters' + 'calligra-interfaces' + 'calligra-libs' + 'calligra-plugins' + 'calligra-pics' + 'calligra-servicetypes' + 'calligra-templates' + 'calligra-tools' + 'calligra-karbon' + 'calligra-kexi' + 'calligra-kounavail' + 'calligra-plan' + 'calligra-stage' + 'calligra-krita' + 'calligra-sheets' + 'calligra-words' + 'calligra-handbook' + 'calligra-braindump' + 'calligra-flow') +pkgver=2.4.0 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://www.calligra-suite.org/' +license=('FDL1.2' 'GPL2' 'LGPL') +makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' + 'kdepimlibs' 'libpqxx' 'freetds' 'xbase' + 'kdegraphics-okular' 'gsl' 'kdeedu-marble' + 'libwpd' 'libwpg' 'pstoedit' 'glew' + 'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2') +groups=('calligra') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" + 'do-not-build-hancomword.patch' + 'fix-docx-support.patch') +md5sums=('a45b9141c6bb750569e8f6554197dd50' + 'cc1a5fba43426003909751035d093362' + 'b694e3af26a31c36488d869f9331090c') + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/do-not-build-hancomword.patch + patch -p1 -i "${srcdir}"/fix-docx-support.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_active=OFF \ + -DBUILD_mobile=OFF \ + -DIHAVEPATCHEDQT=1 + make +} + +package_calligra-filters() { + pkgdesc="Filters for the Calligra office suite" + optdepends=('libwpg: Corel WordPerfect Graphics image importer') + conflicts=('koffice-filters') + replaces=('koffice-filters') + install=calligra-filters.install + + cd "${srcdir}"/build/filters + make DESTDIR="${pkgdir}" install +} + +package_calligra-interfaces() { + pkgdesc="Interfaces for the Calligra office suite" + depends=('calligra-libs') + conflicts=('koffice-interfaces') + replaces=('koffice-interfaces') + + cd "${srcdir}"/build/interfaces + make DESTDIR="${pkgdir}" install +} + +package_calligra-libs() { + pkgdesc="Libraries for the Calligra office suite" + depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes') + conflicts=('koffice-libs') + replaces=('koffice-libs') + + cd "${srcdir}"/build/libs + make DESTDIR="${pkgdir}" install +} + +package_calligra-plugins() { + pkgdesc="Plugins for the Calligra office suite" + depends=('calligra-libs' 'calligra-filters') + optdepends=('kdeedu-marble: map shape for Calligra') + conflicts=('koffice-plugins' 'koffice-kchart') + replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula') + + cd "${srcdir}"/build/plugins + make DESTDIR="${pkgdir}" install +} + +package_calligra-pics() { + pkgdesc="Icons for the Calligra office suite" + conflicts=('koffice-pics') + replaces=('koffice-pics') + install=calligra.install + + cd "${srcdir}"/build/pics + make DESTDIR="${pkgdir}" install +} + +package_calligra-servicetypes() { + pkgdesc="Servicetypes for the Calligra office suite" + conflicts=('koffice-servicetypes') + replaces=('koffice-servicetypes') + install=calligra.install + + cd "${srcdir}"/build/servicetypes + make DESTDIR="${pkgdir}" install +} + +package_calligra-templates() { + pkgdesc="Templates for the Calligra office suite" + conflicts=('koffice-templates') + replaces=('koffice-templates') + + cd "${srcdir}"/build/templates + make DESTDIR="${pkgdir}" install +} + +package_calligra-tools() { + pkgdesc="Tools for the Calligra office suite" + depends=('calligra-libs') + conflicts=('koffice-tools') + replaces=('koffice-tools') + install=calligra-tools.install + + cd "${srcdir}"/build/tools + make DESTDIR="${pkgdir}" install +} + +package_calligra-karbon() { + pkgdesc="Create scalable vector drawings" + depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime') + optdepends=('calligra-filters: import/export filters' + 'calligra-tools: extra calligra tools') + conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') + replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') + install=calligra-karbon.install + + cd "${srcdir}"/build/karbon + make DESTDIR="${pkgdir}" install +} + +package_calligra-kexi() { + pkgdesc="Develop desktop database applications" + depends=('calligra-libs' 'calligra-templates') + optdepends=('libmysqlclient: MySQL driver' + 'libpqxx: PostgreSQL driver' + 'freetds: Sybase & MS SQL driver' + 'xbase: XBase driver' + 'calligra-sheets: Spreadsheet-to-Kexi-table import plugin' + 'kdeedu-marble: map form widget' + 'calligra-plugins: extra calligra plugins') + conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') + replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') + install=calligra-kexi.install + + cd "${srcdir}"/build/kexi + make DESTDIR="${pkgdir}" install +} + +package_calligra-kounavail() { + pkgdesc="Unavailable Calligra Document" + depends=('calligra-libs') + conflicts=('koffice-kounavail') + replaces=('koffice-kounavail') + + cd "${srcdir}"/build/kounavail + make DESTDIR="${pkgdir}" install +} + +package_calligra-plan() { + pkgdesc="Calligra Project Management Component" + depends=('calligra-words') + conflicts=('koffice-kplato' 'calligra-kplato') + replaces=('koffice-kplato' 'calligra-kplato') + install=calligra-plan.install + + cd "${srcdir}"/build/plan + make DESTDIR="${pkgdir}" install +} + +package_calligra-stage() { + pkgdesc="Write presentation documents" + depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime') + optdepends=('calligra-plugins: extra calligra plugins') + conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') + replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') + install=calligra-stage.install + + cd "${srcdir}"/build/stage + make DESTDIR="${pkgdir}" install +} + +package_calligra-krita() { + pkgdesc="Edit and paint images" + depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' + 'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw') + conflicts=('koffice-krita' 'calligra-krita-doc') + replaces=('koffice-krita' 'calligra-krita-doc') + install=calligra-krita.install + + cd "${srcdir}"/build/krita + make DESTDIR="${pkgdir}" install +} + +package_calligra-sheets() { + pkgdesc="Write spreadsheet documents" + depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime') + optdepends=('calligra-filters: import/export filters' + 'calligra-plugins: extra calligra plugins' + 'calligra-tools: extra calligra tools') + conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') + replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') + install=calligra-sheets.install + + cd "${srcdir}"/build/sheets + make DESTDIR="${pkgdir}" install +} + +package_calligra-words() { + pkgdesc="Word Processor" + depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail' + 'calligra-plugins' 'kdegraphics-okular') + optdepends=('calligra-tools: extra calligra tools') + conflicts=('koffice-kword') + replaces=('koffice-kword') + install=calligra-words.install + + cd "${srcdir}"/build/words + make DESTDIR="${pkgdir}" install +} + +package_calligra-handbook() { + pkgdesc="Documentation for Calligra" + conflicts=('koffice-handbook') + replaces=('koffice-handbook') + + cd "${srcdir}"/build/doc/calligra + make DESTDIR="${pkgdir}" install +} + +package_calligra-braindump() { + pkgdesc="Notes and idea gathering" + depends=('calligra-libs' 'kdebase-runtime') + install=calligra-braindump.install + + cd "${srcdir}"/build/braindump + make DESTDIR="${pkgdir}" install +} + +package_calligra-flow() { + pkgdesc="Flowchart & Diagram Editing" + depends=('calligra-libs' 'kdebase-runtime') + conflicts=('calligra-flow-doc') + replaces=('calligra-flow-doc') + install=calligra-flow.install + + cd "${srcdir}"/build/flow + make DESTDIR="${pkgdir}" install +} diff --git a/extra/calligra/calligra-braindump.install b/extra/calligra/calligra-braindump.install new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/extra/calligra/calligra-braindump.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/extra/calligra/calligra-filters.install b/extra/calligra/calligra-filters.install new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/extra/calligra/calligra-filters.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/calligra/calligra-flow.install b/extra/calligra/calligra-flow.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/extra/calligra/calligra-flow.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/calligra/calligra-karbon.install b/extra/calligra/calligra-karbon.install new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/extra/calligra/calligra-karbon.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/extra/calligra/calligra-kexi.install b/extra/calligra/calligra-kexi.install new file mode 100644 index 000000000..b8c7ebf27 --- /dev/null +++ b/extra/calligra/calligra-kexi.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/calligra/calligra-krita.install b/extra/calligra/calligra-krita.install new file mode 100644 index 000000000..33d234a02 --- /dev/null +++ b/extra/calligra/calligra-krita.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/extra/calligra/calligra-plan.install b/extra/calligra/calligra-plan.install new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/extra/calligra/calligra-plan.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/extra/calligra/calligra-sheets.install b/extra/calligra/calligra-sheets.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/extra/calligra/calligra-sheets.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/calligra/calligra-stage.install b/extra/calligra/calligra-stage.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/extra/calligra/calligra-stage.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/calligra/calligra-tools.install b/extra/calligra/calligra-tools.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/extra/calligra/calligra-tools.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/calligra/calligra-words.install b/extra/calligra/calligra-words.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/extra/calligra/calligra-words.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/calligra/calligra.install b/extra/calligra/calligra.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/extra/calligra/calligra.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/calligra/do-not-build-hancomword.patch b/extra/calligra/do-not-build-hancomword.patch new file mode 100644 index 000000000..0c010b706 --- /dev/null +++ b/extra/calligra/do-not-build-hancomword.patch @@ -0,0 +1,11 @@ +--- a/filters/words/CMakeLists.txt ++++ b/filters/words/CMakeLists.txt +@@ -75,7 +75,6 @@ IF( NOT TINY ) + add_subdirectory( docbook ) + # add_subdirectory( html ) + add_subdirectory( kword1.3 ) +- add_subdirectory( hancomword ) + add_subdirectory( oowriter ) + add_subdirectory( palmdoc ) + add_subdirectory( wml ) + diff --git a/extra/calligra/fix-docx-support.patch b/extra/calligra/fix-docx-support.patch new file mode 100644 index 000000000..304e200e3 --- /dev/null +++ b/extra/calligra/fix-docx-support.patch @@ -0,0 +1,18 @@ +--- a/libs/odf/KoXmlWriter.h ++++ b/libs/odf/KoXmlWriter.h +@@ -252,6 +252,14 @@ private: + Tag(const char* t = 0, bool ind = true) + : tagName(t), hasChildren(false), lastChildIsText(false), + openingTagClosed(false), indentInside(ind) {} ++ Tag(const Tag &original) ++ { ++ tagName = original.tagName; ++ hasChildren = original.hasChildren; ++ lastChildIsText = original.lastChildIsText; ++ openingTagClosed = original.openingTagClosed; ++ indentInside = original.indentInside; ++ } + const char* tagName; + bool hasChildren : 1; ///< element or text children + bool lastChildIsText : 1; ///< last child is a text node + diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index 3b9e8e03d..50dfc9f94 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148694 2012-02-05 11:47:14Z ibiru $ +# $Id: PKGBUILD 156562 2012-04-21 01:56:35Z eric $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint -pkgver=1.0 -pkgrel=2 +pkgver=1.3 +pkgrel=1 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64') license=('LGPL' 'GPL' 'MIT') @@ -16,15 +16,17 @@ optdepends=('python2: for python plug-ins' 'ghostscript: for pdf plug-ins') options=('!libtool') install=cinepaint.install -source=(http://sourceforge.net/projects/cinepaint/files/CinePaint/${pkgname}-${pkgver}.tgz - LICENSE cinepaint-libpng15.patch) -md5sums=('7dfdb005d246578392ac9bd500534804' - '169085743f667c250ea2e4022efecf5f' - '682de65ad358512d00a8b76730453664') +source=(http://downloads.sourceforge.net/project/cinepaint/CinePaint/CinePaint-${pkgver}/${pkgname}-${pkgver}.tgz + LICENSE cinepaint-libpng15.patch cinepaint-missing-include.patch) +sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b' + 'ca8411db87f3fc51bbdfade22f4e1f555b2ee19e' + '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5' + 'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9') build() { cd "${srcdir}/${pkgname}" patch -p1 -i ../cinepaint-libpng15.patch + patch -p1 -i ../cinepaint-missing-include.patch find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in diff --git a/extra/cinepaint/cinepaint-missing-include.patch b/extra/cinepaint/cinepaint-missing-include.patch new file mode 100644 index 000000000..ed159213a --- /dev/null +++ b/extra/cinepaint/cinepaint-missing-include.patch @@ -0,0 +1,11 @@ +diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp +--- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:51:10.625503826 -0400 ++++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:52:04.478835055 -0400 +@@ -32,6 +32,7 @@ + + #include <list> + #include <string> ++#include <unistd.h> + + #include "icc_modell_beobachter.h" + diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 7b54bd725..6088c88ad 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 146707 2012-01-16 19:49:18Z dreisner $ +# $Id: PKGBUILD 156521 2012-04-20 06:48:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.7 -pkgrel=2 +pkgver=2.8.8 +pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64') +url="http://www.cmake.org/" license=('custom') -url="http://www.cmake.org" depends=('curl' 'libarchive' 'shared-mime-info') makedepends=('qt') optdepends=('qt: cmake-gui') install="${pkgname}.install" source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") -md5sums=('e1b237aeaed880f65dec9c20602452f6') +md5sums=('ba74b22c788a0c8547976b880cd02b17') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -24,7 +24,7 @@ build() { --docdir=/share/doc/cmake \ --system-libs \ --qt-gui \ - --parallel=2 + --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN) make } @@ -36,5 +36,6 @@ package() { install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el + install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 3432d31d3..7242aafe1 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Jeramy Rutley <jrutley@gmail.com> pkgname=ruby -pkgver=1.9.3_p125 -pkgrel=4 +pkgver=1.9.3_p194 +pkgrel=1 pkgdesc='An object-oriented language for quick and easy programming' arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' @@ -21,7 +21,7 @@ options=('!emptydirs' '!makeflags') install='ruby.install' source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('702529a7f8417ed79f628b77d8061aa5' +md5sums=('2278eff4cfed3cbc0653bc73085caa34' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/xfce4-clipman-plugin/PKGBUILD b/extra/xfce4-clipman-plugin/PKGBUILD index 25403c890..1ac1ba71b 100644 --- a/extra/xfce4-clipman-plugin/PKGBUILD +++ b/extra/xfce4-clipman-plugin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141959 2011-11-03 17:33:58Z eric $ +# $Id: PKGBUILD 156566 2012-04-21 02:58:41Z eric $ # Maintainer: tobias <tobias at archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-clipman-plugin -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc="A clipboard plugin for the Xfce4 panel" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('60df7769a8271d7fcab177210f4291e8') +md5sums=('61f3be97efa379cb358980c94e14692a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfce4-systemload-plugin/PKGBUILD b/extra/xfce4-systemload-plugin/PKGBUILD index 3cd62a4dc..0703806ef 100644 --- a/extra/xfce4-systemload-plugin/PKGBUILD +++ b/extra/xfce4-systemload-plugin/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 149256 2012-02-06 16:36:25Z foutrelis $ +# $Id: PKGBUILD 156568 2012-04-21 03:24:10Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-systemload-plugin -pkgver=1.0.0 -pkgrel=2 +pkgver=1.1.0 +pkgrel=1 pkgdesc="A system load plugin for the Xfce4 panel" arch=('i686' 'x86_64') license=('custom') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin" groups=('xfce4-goodies') -depends=('xfce4-panel>=4.7.4' 'libxfcegui4') -makedepends=('pkgconfig' 'intltool') +depends=('xfce4-panel>=4.7.4') +makedepends=('intltool') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2) -md5sums=('da4f0e8bfb57e18fe3e3e56507a681f7') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('130ad7befddd8705ca09a98e9cee5c3e') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -27,7 +27,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xfce4-time-out-plugin/PKGBUILD b/extra/xfce4-time-out-plugin/PKGBUILD index bf7dfc644..5c1d07fd9 100755 --- a/extra/xfce4-time-out-plugin/PKGBUILD +++ b/extra/xfce4-time-out-plugin/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 149258 2012-02-06 16:37:33Z foutrelis $ +# $Id: PKGBUILD 156570 2012-04-21 03:56:43Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=xfce4-time-out-plugin -pkgver=1.0.0 -pkgrel=2 +pkgver=1.0.1 +pkgrel=1 pkgdesc="Take a break from your computer with this plugin for XFCE4." -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://xfce-goodies.berlios.de/" groups=('xfce4-goodies') license=('GPL') -depends=('xfce4-panel>=4.7.0' 'libxfcegui4' 'hicolor-icon-theme') +depends=('xfce4-panel>=4.7.0') makedepends=('intltool') options=('!libtool') install=${pkgname}.install -source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2) -md5sums=('ef50a3fd45c169943acc8af93604d9fd') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +md5sums=('b6e4a3145d31c341e2506fb17b014587') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -29,7 +29,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/multilib/lib32-mpg123/PKGBUILD b/multilib/lib32-mpg123/PKGBUILD index df8ce1d2c..5f276adef 100644 --- a/multilib/lib32-mpg123/PKGBUILD +++ b/multilib/lib32-mpg123/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68490 2012-03-26 07:09:14Z svenstaro $ +# $Id: PKGBUILD 69628 2012-04-20 18:53:29Z svenstaro $ # Maintainer: Hugo Doria <hugo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> _pkgbasename=mpg123 pkgname=lib32-$_pkgbasename -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 (32-bit)" arch=('x86_64') @@ -15,7 +15,7 @@ makedepends=('lib32-sdl' gcc-multilib libtool-multilib) optdepends=('lib32-sdl: for additional audio support') options=('libtool') source=(http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('65a41769832e14d6dfab1809fb4a17bb') +md5sums=('e82b09c5533c414d670339a717faebab') build() { export CC="gcc -m32" diff --git a/multilib/lib32-openssl/PKGBUILD b/multilib/lib32-openssl/PKGBUILD index feabb3be0..458437e3e 100644 --- a/multilib/lib32-openssl/PKGBUILD +++ b/multilib/lib32-openssl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 68327 2012-03-21 19:26:09Z pschmitz $ +# $Id: PKGBUILD 69606 2012-04-20 10:28:01Z bluewind $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> _pkgbasename=openssl pkgname=lib32-$_pkgbasename -_ver=1.0.1 +_ver=1.0.1a # use a pacman compatible version scheme -# pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgver=$_ver +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +#pkgver=$_ver pkgrel=1 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit)' arch=('x86_64') @@ -20,8 +20,8 @@ source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz" "https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz.asc" 'no-rpath.patch' 'ca-dir.patch') -md5sums=('134f168bc2a8333f19f81d684841710b' - 'efbe93c11747fed52e60567819409d8a' +md5sums=('a0104320c0997cd33e18b8ea798609d1' + 'df6d2432d3ff03f72fa6744d6f1a7f34' 'dc78d3d06baffc16217519242ce92478' '3bf51be3a1bbd262be46dc619f92aa90') diff --git a/testing/accountsservice/PKGBUILD b/testing/accountsservice/PKGBUILD new file mode 100644 index 000000000..b922cee69 --- /dev/null +++ b/testing/accountsservice/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 156530 2012-04-20 13:55:19Z heftig $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=accountsservice +pkgver=0.6.18 +pkgrel=1 +pkgdesc="D-Bus interface for user account query and manipulation" +arch=(i686 x86_64) +url="http://cgit.freedesktop.org/accountsservice/" +license=('GPL3') +depends=('glib2' 'polkit' 'libsystemd') +makedepends=('intltool' 'gobject-introspection' 'vala') +options=('!libtool') +source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz) +md5sums=('31bc335f7d96b88e0d572a67a9df063d') + +build() { + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/accountsservice \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --localstatedir=/var --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD new file mode 100644 index 000000000..5215a441d --- /dev/null +++ b/testing/cryptsetup/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 156539 2012-04-20 18:28:42Z eric $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +pkgname=cryptsetup +pkgver=1.4.1 +pkgrel=3 +pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" +arch=(i686 x86_64) +license=('GPL') +url="http://code.google.com/p/cryptsetup/" +groups=('base') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') +conflicts=('mkinitcpio<0.7') +options=('!libtool' '!emptydirs') +source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 + http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc + encrypt_hook + encrypt_install) +sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb' + '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88' + '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757' + 'ddbbdcb8eff93a3a7622ec633e90d5c0d68e3afbeaf942dc2309adab345047d4') +build() { + cd "${srcdir}"/$pkgname-${pkgver} + ./configure --prefix=/usr --disable-static --sbindir=/sbin + make +} + +package() { + cd "${srcdir}"/$pkgname-${pkgver} + make DESTDIR="${pkgdir}" install + # install hook + install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt + install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt +} diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook new file mode 100644 index 000000000..956b18023 --- /dev/null +++ b/testing/cryptsetup/encrypt_hook @@ -0,0 +1,148 @@ +# vim: set ft=sh: +# TODO this one needs some work to work with lots of different +# encryption schemes +run_hook () +{ + /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + fi + [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" + + # Get keyfile if specified + ckeyfile="/crypto_keyfile.bin" + if [ "x${cryptkey}" != "x" ]; then + ckdev="$(echo "${cryptkey}" | cut -d: -f1)" + ckarg1="$(echo "${cryptkey}" | cut -d: -f2)" + ckarg2="$(echo "${cryptkey}" | cut -d: -f3)" + if poll_device "${ckdev}" ${rootdelay}; then + case ${ckarg1} in + *[!0-9]*) + # Use a file on the device + # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path + mkdir /ckey + mount -r -t ${ckarg1} ${ckdev} /ckey + dd if=/ckey/${ckarg2} of=${ckeyfile} >/dev/null 2>&1 + umount /ckey + ;; + *) + # Read raw data from the block device + # ckarg1 is numeric: ckarg1=offset, ckarg2=length + dd if=${ckdev} of=${ckeyfile} bs=1 skip=${ckarg1} count=${ckarg2} >/dev/null 2>&1 + ;; + esac + fi + [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." + fi + + if [ -n "${cryptdevice}" ]; then + DEPRECATED_CRYPT=0 + cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" + cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" + cryptoptions="$(echo "${cryptdevice}" | cut -d: -f3)" + else + DEPRECATED_CRYPT=1 + cryptdev="${root}" + cryptname="root" + fi + + warn_deprecated() { + echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" + echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." + } + + OLDIFS="${IFS}" + IFS="," + for cryptopt in ${cryptoptions}; do + case ${cryptopt} in + allow-discards) + echo "Enabling TRIM/discard support." + cryptargs="${cryptargs} --allow-discards" + ;; + *) + echo "Encryption option '${cryptopt}' not known, ignoring." >&2 + ;; + esac + done + IFS="${OLDIFS}" + + if poll_device "${cryptdev}" ${rootdelay}; then + if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + dopassphrase=1 + # If keyfile exists, try to use that + if [ -f ${ckeyfile} ]; then + if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then + dopassphrase=0 + else + echo "Invalid keyfile. Reverting to passphrase." + fi + fi + # Ask for a passphrase + if [ ${dopassphrase} -gt 0 ]; then + echo "" + echo "A password is required to access the ${cryptname} volume:" + + #loop until we get a real password + while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do + sleep 2; + done + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + elif [ -n "${crypto}" ]; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + msg "Non-LUKS encrypted device found..." + if [ $# -ne 5 ]; then + err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Non-LUKS decryption not attempted..." + return 1 + fi + exe="/sbin/cryptsetup create ${cryptname} ${cryptdev} ${cryptargs}" + tmp=$(echo "${crypto}" | cut -d: -f1) + [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f2) + [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f3) + [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f4) + [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f5) + [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\"" + if [ -f ${ckeyfile} ]; then + exe="${exe} --key-file ${ckeyfile}" + else + exe="${exe} --verify-passphrase" + echo "" + echo "A password is required to access the ${cryptname} volume:" + fi + eval "${exe} ${CSQUIET}" + + if [ $? -ne 0 ]; then + err "Non-LUKS device decryption failed. verify format: " + err " crypto=hash:cipher:keysize:offset:skip" + exit 1 + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + else + err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." + fi + fi + rm -f ${ckeyfile} + fi +} diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install new file mode 100644 index 000000000..9ed50e863 --- /dev/null +++ b/testing/cryptsetup/encrypt_install @@ -0,0 +1,26 @@ +# vim: set ft=sh: + +build() +{ + if [ -z "${CRYPTO_MODULES}" ]; then + MODULES=" dm-crypt $(all_modules "/crypto/") " + else + MODULES=" dm-crypt ${CRYPTO_MODULES} " + fi + FILES="" + SCRIPT="encrypt" + [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" + [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" + add_binary "/sbin/dmsetup" + add_file "/usr/lib/udev/rules.d/10-dm.rules" + add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" + add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" +} + +help () +{ +cat<<HELPEOF + This hook allows for an encrypted root device. +HELPEOF +} diff --git a/testing/dmraid/PKGBUILD b/testing/dmraid/PKGBUILD new file mode 100644 index 000000000..b3786478a --- /dev/null +++ b/testing/dmraid/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 156525 2012-04-20 11:53:35Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +#Contributor: Urs Wolfer <uwolfer @ fwo.ch> + +pkgname=dmraid +pkgver=1.0.0.rc16.3 +pkgrel=3 +pkgdesc="Device mapper RAID interface" +url="http://people.redhat.com/~heinzm/sw/dmraid/" +conflicts=('mkinitcpio<0.7') +depends=('device-mapper>=2.0.54') +arch=('i686' 'x86_64') +license=('GPL') +source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 + http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2 + dmraid_install + dmraid_hook) +install=dmraid.install +md5sums=('819338fcef98e8e25819f0516722beeb' + '94dede91754b00783f1cd5244f6647bc' + '2a1ef82fb32f065ee560dceef736475e') + +build() { + cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname + ./configure --enable-led --enable-intel_led + make +} + +package() { + cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname + make DESTDIR="$pkgdir" prefix=/ libdir=/lib mandir=/usr/share/man includedir=/usr/include install + mkdir -p "$pkgdir"/var/lock/dmraid + chmod 1777 "$pkgdir"/var/lock/ + install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid + install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid + # fix permissions + chmod 644 "$pkgdir"/lib/libdmraid.a + chmod 644 "$pkgdir"/usr/include/dmraid/* +} diff --git a/testing/dmraid/dmraid.install b/testing/dmraid/dmraid.install new file mode 100644 index 000000000..64899e785 --- /dev/null +++ b/testing/dmraid/dmraid.install @@ -0,0 +1,14 @@ +post_upgrade() { + if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then + # important upgrade notice + echo ">>>" + echo ">>> IMPORTANT DMRAID UPGRADE NOTICE" + echo ">>> -------------------------------" + echo ">>> Version 1.0.0.rc15 and greater introduce a new name scheme:" + echo ">>> You need to add an additional 'p' in front of your number." + echo ">>> e.g. <yourname><number> --> <yourname>p<number>" + echo ">>> firsthd1 --> firsthdp1" + echo ">>> Please change your bootloader and fstab accordingly." + echo ">>>" + fi +} diff --git a/testing/dmraid/dmraid_hook b/testing/dmraid/dmraid_hook new file mode 100644 index 000000000..6219a718a --- /dev/null +++ b/testing/dmraid/dmraid_hook @@ -0,0 +1,19 @@ +# vim: set ft=sh: +run_hook () +{ + /sbin/modprobe -q dm-mod >/dev/null 2>&1 + /sbin/modprobe -q dm-mirror >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + fi + msg ":: Activating dmraid arrays..." + # prevent any event monitoring calls with -I + if [ "${quiet}" = "y" ]; then + /sbin/dmraid -ay -I -Z >/dev/null + else + /sbin/dmraid -ay -I -Z + fi + fi +} diff --git a/testing/dmraid/dmraid_install b/testing/dmraid/dmraid_install new file mode 100644 index 000000000..0ebfd0c0f --- /dev/null +++ b/testing/dmraid/dmraid_install @@ -0,0 +1,19 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" dm-mod dm-mirror " + BINARIES="/sbin/dmraid /sbin/dmsetup" + FILES="" + SCRIPT="dmraid" + add_file "/usr/lib/udev/rules.d/10-dm.rules" + add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" + add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for a dmraid root device. +HELPEOF +} diff --git a/testing/lv2/PKGBUILD b/testing/lv2/PKGBUILD new file mode 100644 index 000000000..4304bb131 --- /dev/null +++ b/testing/lv2/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 156537 2012-04-20 17:48:38Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> + +pkgname=lv2 +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Successor to the LADSPA audio plug-in standard" +url="http://lv2plug.in/" +license=('LGPL' 'custom') +arch=('i686' 'x86_64') +makedepends=('python2' 'libsndfile' 'gtk2') +optdepends=('libsndfile: lv2-eg-sampler' + 'gkt2: lv2-eg-sampler') +provides=('lv2core') +conflicts=('lv2core') +replaces=('lv2core') +source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2") +md5sums=('af98a50d8dfa8318a69800ea48b421f6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf configure --prefix=/usr + python2 waf build $MAKEFLAGS +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD new file mode 100644 index 000000000..a66113877 --- /dev/null +++ b/testing/mdadm/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 156533 2012-04-20 16:54:05Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> +pkgname=mdadm +pkgver=3.2.3 +pkgrel=2 +pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" +arch=(i686 x86_64) +license=('GPL') +url="http://neil.brown.name/blog/mdadm" +groups=('base') +conflicts=('mkinitcpio<0.7') +depends=('glibc') +backup=('etc/mdadm.conf') +source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 + mdadm + mdadm.conf + mdadm_install + mdadm_hook + mdadm_udev_install + disable-werror.patch) + +install=mdadm.install +replaces=('raidtools') +md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f' + '6df172c8f77b280018cf87eb3d313f29' + '00cbed931db4f15b6ce49e3e7d433966' + '9b01e96b6c3c218fb61628c9281fe688' + 'c8c0713f5c7da51822ee6f3911473a1c' + 'cd258e1bf430c02a25f40b4329df9f57' + '4ad87b74a4bc9a34621280abe0e0c3e4') + +build() { + cd $srcdir/$pkgname-$pkgver + patch -Np0 -i ../disable-werror.patch + make CXFLAGS="$CFLAGS" + # build static mdassemble for Arch's initramfs + make MDASSEMBLE_AUTO=1 mdassemble + +} + +package() { + cd $srcdir/$pkgname-$pkgver + make INSTALL=/usr/bin/install DESTDIR=$pkgdir install + install -D -m755 mdassemble $pkgdir/sbin/mdassemble + install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf + install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm + install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm + install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm + install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev + # symlink for backward compatibility + ln -sf /usr/lib/initcpio/hooks/mdadm $pkgdir/usr/lib/initcpio/hooks/raid +} diff --git a/testing/mdadm/disable-werror.patch b/testing/mdadm/disable-werror.patch new file mode 100644 index 000000000..50a33f19d --- /dev/null +++ b/testing/mdadm/disable-werror.patch @@ -0,0 +1,11 @@ +--- Makefile.old 2011-06-17 09:38:03.269238332 +0200 ++++ Makefile 2011-06-17 09:38:14.122398837 +0200 +@@ -42,7 +42,7 @@ + + CC = $(CROSS_COMPILE)gcc + CXFLAGS = -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O + endif diff --git a/testing/mdadm/linux-3.0.patch b/testing/mdadm/linux-3.0.patch new file mode 100644 index 000000000..cd9d5473c --- /dev/null +++ b/testing/mdadm/linux-3.0.patch @@ -0,0 +1,45 @@ +From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001 +From: NeilBrown <neilb@suse.de> +Date: Fri, 17 Jun 2011 22:49:24 +1000 +Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers. + +The next version of Linux might be 3.0. If it is, get_linux_version +will fail. +So make it more robust. + +Reported-by: Namhyung Kim <namhyung@gmail.com> +Reported-by: Milan Broz <mbroz@redhat.com> +Signed-off-by: NeilBrown <neilb@suse.de> +--- + util.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/util.c b/util.c +index 10bbe56..55d171a 100644 +--- a/util.c ++++ b/util.c +@@ -146,16 +146,16 @@ int get_linux_version() + { + struct utsname name; + char *cp; +- int a,b,c; ++ int a = 0, b = 0,c = 0; + if (uname(&name) <0) + return -1; + + cp = name.release; + a = strtoul(cp, &cp, 10); +- if (*cp != '.') return -1; +- b = strtoul(cp+1, &cp, 10); +- if (*cp != '.') return -1; +- c = strtoul(cp+1, NULL, 10); ++ if (*cp == '.') ++ b = strtoul(cp+1, &cp, 10); ++ if (*cp == '.') ++ c = strtoul(cp+1, &cp, 10); + + return (a*1000000)+(b*1000)+c; + } +-- +1.7.2.3 + diff --git a/testing/mdadm/mdadm b/testing/mdadm/mdadm new file mode 100755 index 000000000..e196f3642 --- /dev/null +++ b/testing/mdadm/mdadm @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /sbin/mdadm` +case "$1" in + start) + stat_busy "Starting mdadm RAID Monitor" + if [ -z "$PID" ]; then + /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon mdadm + stat_done + fi + ;; + stop) + stat_busy "Stopping mdadm RAID Monitor" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon mdadm + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/mdadm/mdadm.conf b/testing/mdadm/mdadm.conf new file mode 100644 index 000000000..57bd4c683 --- /dev/null +++ b/testing/mdadm/mdadm.conf @@ -0,0 +1,67 @@ +# mdadm configuration file +# +# mdadm will function properly without the use of a configuration file, +# but this file is useful for keeping track of arrays and member disks. +# In general, a mdadm.conf file is created, and updated, after arrays +# are created. This is the opposite behavior of /etc/raidtab which is +# created prior to array construction. +# +# +# the config file takes two types of lines: +# +# DEVICE lines specify a list of devices of where to look for +# potential member disks +# +# ARRAY lines specify information about how to identify arrays so +# so that they can be activated +# + + +# You can have more than one device line and use wild cards. The first +# example includes SCSI the first partition of SCSI disks /dev/sdb, +# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second +# line looks for array slices on IDE disks. +# +#DEVICE /dev/sd[bcdjkl]1 +#DEVICE /dev/hda1 /dev/hdb1 +# +# The designation "partitions" will scan all partitions found in +# /proc/partitions +DEVICE partitions + + +# ARRAY lines specify an array to assemble and a method of identification. +# Arrays can currently be identified by using a UUID, superblock minor number, +# or a listing of devices. +# +# super-minor is usually the minor number of the metadevice +# UUID is the Universally Unique Identifier for the array +# Each can be obtained using +# +# mdadm -D <md> +# +# To capture the UUIDs for all your RAID arrays to this file, run these: +# to get a list of running arrays: +# # mdadm -D --scan >>/etc/mdadm.conf +# to get a list from superblocks: +# # mdadm -E --scan >>/etc/mdadm.conf +# +#ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371 +#ARRAY /dev/md1 super-minor=1 +#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1 +# +# ARRAY lines can also specify a "spare-group" for each array. mdadm --monitor +# will then move a spare between arrays in a spare-group if one array has a +# failed drive but no spare +#ARRAY /dev/md4 uuid=b23f3c6d:aec43a9f:fd65db85:369432df spare-group=group1 +#ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 spare-group=group1 +# + + +# When used in --follow (aka --monitor) mode, mdadm needs a +# mail address and/or a program. To start mdadm's monitor mode, add +# "mdadm" to your DAEMONS array in /etc/rc.conf +# +# If the lines are not found, mdadm will exit quietly +#MAILADDR root@mydomain.tld +#PROGRAM /usr/sbin/handle-mdadm-events diff --git a/testing/mdadm/mdadm.install b/testing/mdadm/mdadm.install new file mode 100644 index 000000000..e8404c260 --- /dev/null +++ b/testing/mdadm/mdadm.install @@ -0,0 +1,10 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then + echo "Attention mdadm update:" + echo "raid_partitions hook has been replaced by the more powerfull mdadm hook." + echo "Please update your /etc/mkinitcpio.conf accordingly." + fi +} diff --git a/testing/mdadm/mdadm_hook b/testing/mdadm/mdadm_hook new file mode 100755 index 000000000..7b2dc1ad1 --- /dev/null +++ b/testing/mdadm/mdadm_hook @@ -0,0 +1,44 @@ +# vim: set ft=sh: +run_hook () +{ + input="$(cat /proc/cmdline)" + mdconfig="/etc/mdadm.conf" + # for partitionable raid, we need to load md_mod first! + modprobe md_mod 2>/dev/null + # If md is specified on commandline, create config file from those parameters. + if [ "$(echo $input | grep "md=")" ]; then + #Create initial mdadm.conf + # scan all devices in /proc/partitions + echo DEVICE partitions > $mdconfig + for i in $input; do + case $i in + # raid + md=[0-9]*,/*) + device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device devices=$array" >> $mdconfig + ;; + # partitionable raid + md=d[0-9]*,/*) + device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device devices=$array" >> $mdconfig + ;; + # raid UUID + md=[0-9]*,[0-9,a-z]*) + device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + ;; + # partitionable raid UUID + md=d[0-9]*,[0-9,a-z]*) + device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + ;; + esac + done + fi + # assemble everything + [ -e $mdconfig ] && /sbin/mdassemble +} diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install new file mode 100644 index 000000000..b53258676 --- /dev/null +++ b/testing/mdadm/mdadm_install @@ -0,0 +1,45 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " + BINARIES="" + FILES="" + SCRIPT="mdadm" + # check if a custom mdadm.conf exists + if grep -q ^ARRAY /etc/mdadm.conf; then + echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." + add_file "/etc/mdadm.conf" + fi + add_binary "/sbin/mdassemble" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for any raid root device, + and assembles the raid device when run. + + If arrays are defined in /etc/mdadm.conf, the file will be used instead + of command line assembling. + + Command Line Setup: + - for raid arrays with persistent superblocks: + md=<md device no.>,dev0,dev1,...,devn + md=<md device no.>,uuid + - for partitionable raid arrays with persistent superblocks: + md=d<md device no.>,dev0,dev1,...,devn + md=d<md device no.>,uuid + + Parameters: + - <md device no.> = the number of the md device: + 0 means md0, 1 means md1, ... + - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 + or 0900878d:f95f6057:c39a36e9:55efa60a + Examples: + - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 + This will setup 2 md partitionable arrays. + - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 + This will setup 2 md arrays with persistent superblocks. +HELPEOF +} diff --git a/testing/mdadm/mdadm_udev_install b/testing/mdadm/mdadm_udev_install new file mode 100644 index 000000000..9fc161624 --- /dev/null +++ b/testing/mdadm/mdadm_udev_install @@ -0,0 +1,23 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " + BINARIES="" + FILES="" + SCRIPT="" + # check if a custom mdadm.conf exists + if grep -q ^ARRAY /etc/mdadm.conf; then + echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." + add_file "/etc/mdadm.conf" + fi + add_binary "/sbin/mdadm" + add_file "/lib/udev/rules.d/64-md-raid.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads raid arrays with udev. +HELPEOF +} diff --git a/testing/telepathy-glib/PKGBUILD b/testing/telepathy-glib/PKGBUILD index 2161b2fa6..397835c35 100644 --- a/testing/telepathy-glib/PKGBUILD +++ b/testing/telepathy-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155433 2012-04-03 17:01:01Z ibiru $ +# $Id: PKGBUILD 156554 2012-04-20 21:26:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.18.0 +pkgver=0.18.1 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('5b80faf033f91b0413907b4c380024f1') +md5sums=('461732739e3fbf8467991bbe661fb29a') build() { cd "$pkgname-$pkgver" diff --git a/~emulatorman/jitsi/PKGBUILD b/~emulatorman/jitsi/PKGBUILD new file mode 100644 index 000000000..5d8a2e4cb --- /dev/null +++ b/~emulatorman/jitsi/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be> +# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban +# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> + +pkgname=jitsi +pkgver=1.0.3967 +pkgrel=1 +pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" +arch=('i686' 'x86_64') +url="http://jitsi.org" +license=('LGPL') +depends=('java-runtime') +makedepends=('apache-ant' 'java-environment') +options=(!strip !emptydirs zipman !libtool docs) +source=("http://download.jitsi.org/jitsi/src/jitsi-src-1.0-build.${pkgver##*.}.zip" + jitsi.desktop + jitsi.sh) +md5sums=('0fb7aaaad551177c3037ae570ca2f2e1' + 'aad7cf1fb18ff5d7c964834ecc38aed8' + 'c75c74f41e613a7d17bf2f1f310adee3') + +build() +{ + cd ${srcdir}/${pkgname} + # append the build revision to the jitsi version + sed -i "s/0\.build\.by\.SVN/build.${pkgver##*.}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java + . /etc/profile.d/apache-ant.sh + ant rebuild +} + +package() { + cd ${srcdir}/${pkgname} + find lib/ lib/bundle/ -maxdepth 1 -type f \ + -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \; + find lib/os-specific/linux/ -maxdepth 1 -type f \ + -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \; + shopt -sq extglob + find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \ + -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \; + find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \ + -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \; + install -Dm755 "$srcdir/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" + install -Dm644 "$srcdir/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + local _file + for _file in resources/install/debian/*.{svg,xpm}; do + install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${pkgname}${_file/*sip-communicator/}" + done +} diff --git a/~emulatorman/jitsi/jitsi.desktop b/~emulatorman/jitsi/jitsi.desktop new file mode 100644 index 000000000..dd4de82a6 --- /dev/null +++ b/~emulatorman/jitsi/jitsi.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Jitsi +GenericName=jitsi +Comment=VoIP and Instant Messaging client +Icon=/usr/share/pixmaps/jitsi.svg +Type=Application +Categories=Network +Exec=/usr/bin/jitsi +Terminal=false diff --git a/~emulatorman/jitsi/jitsi.sh b/~emulatorman/jitsi/jitsi.sh new file mode 100644 index 000000000..c78c69f2f --- /dev/null +++ b/~emulatorman/jitsi/jitsi.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +CLIENTARGS="" +arch | grep i686 && CLIENTARGS="-client -Xmx256m" + +javabin=${JAVA_HOME}/bin/java + +SCDIR=/usr/lib/jitsi +LIBPATH=$SCDIR/lib +CLASSPATH=$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar +FELIX_CONFIG=$LIBPATH/felix.client.run.properties +LOG_CONFIG=$LIBPATH/logging.properties +COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator" + +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native + +cd $SCDIR + +exec $COMMAND $* + diff --git a/~mtjm/python2-openid/PKGBUILD b/~mtjm/python2-openid/PKGBUILD new file mode 100644 index 000000000..31cdf3290 --- /dev/null +++ b/~mtjm/python2-openid/PKGBUILD @@ -0,0 +1,19 @@ +# Based on https://aur.archlinux.org/packages.php?ID=12562 +# Contributor: Ryan Coyner <rcoyner@gmail.com> +# Maintainer: Laszlo Papp <dj szapi at archlinux us> +pkgname=python2-openid +pkgver=2.2.5 +pkgrel=1 +pkgdesc="OpenID library for Python" +arch=('any') +url="http://www.openidenabled.com/openid/libraries/python" +license=('Apache') +depends=('python2') +source=("http://pypi.python.org/packages/source/p/python-openid/python-openid-${pkgver}.tar.gz") +md5sums=('393f48b162ec29c3de9e2973548ea50d') + +build() { + cd "${srcdir}/python-openid-${pkgver}" + python2 setup.py build || return 1 + python2 setup.py install --root=$pkgdir || return 1 +} |