diff options
158 files changed, 3920 insertions, 340 deletions
diff --git a/community-staging/haskell-extensible-exceptions/PKGBUILD b/community-staging/haskell-extensible-exceptions/PKGBUILD new file mode 100644 index 000000000..81760f8c5 --- /dev/null +++ b/community-staging/haskell-extensible-exceptions/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 76708 2012-09-27 13:34:06Z jelle $ +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> + +_hkgname=extensible-exceptions +pkgname=haskell-${_hkgname} +pkgver=0.1.1.4 +pkgrel=3 +pkgdesc="extensible exceptions for both new and old versions of GHC" +url="http://hackage.haskell.org/package/extensible-exceptions" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.6.1-1' sh) +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=$pkgname.install +md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b') + +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community-staging/haskell-extensible-exceptions/haskell-extensible-exceptions.install b/community-staging/haskell-extensible-exceptions/haskell-extensible-exceptions.install new file mode 100644 index 000000000..20c7dce30 --- /dev/null +++ b/community-staging/haskell-extensible-exceptions/haskell-extensible-exceptions.install @@ -0,0 +1,19 @@ +HS_DIR=usr/share/haskell/haskell-extensible-exceptions +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + diff --git a/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch new file mode 100644 index 000000000..845beb2bd --- /dev/null +++ b/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch @@ -0,0 +1,55 @@ +From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Thu, 27 Sep 2012 04:48:10 -0700 +Subject: [PATCH] compatibility with ghc 7.6.1 + +--- + System/Glib/GObject.chs | 4 +--- + System/Glib/MainLoop.chs | 4 ++-- + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs +index 5f0fe5c..9925d2c 100644 +--- a/System/Glib/GObject.chs ++++ b/System/Glib/GObject.chs +@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do + + {#pointer GDestroyNotify as DestroyNotify#} + +-foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify +- + -- | This function wraps any newly created objects that derives from + -- GInitiallyUnowned also known as objects with + -- \"floating-references\". The object will be refSink (for glib +@@ -225,4 +223,4 @@ isA obj gType = + -- at this point we would normally implement the notify signal handler; + -- I've moved this definition into the Object class of the gtk package + -- since there's a quite a bit of machinery missing here (generated signal +--- register functions and the problem of recursive modules) +\ No newline at end of file ++-- register functions and the problem of recursive modules) +diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs +index 72fecb6..feb4c77 100644 +--- a/System/Glib/MainLoop.chs ++++ b/System/Glib/MainLoop.chs +@@ -71,7 +71,7 @@ import System.Glib.GObject (DestroyNotify, destroyFunPtr) + + {#pointer SourceFunc#} + +-foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc ++foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc + + type HandlerId = {#type guint#} + +@@ -79,7 +79,7 @@ type HandlerId = {#type guint#} + -- + makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify) + makeCallback fun = do +- funPtr <- mkSourceFunc fun ++ funPtr <- mkSourceFunc (const fun) + return (funPtr, destroyFunPtr) + + -- | Sets a function to be called at regular intervals, with the default +-- +1.7.12.1 + diff --git a/community-staging/haskell-glib/PKGBUILD b/community-staging/haskell-glib/PKGBUILD new file mode 100644 index 000000000..09b3b870d --- /dev/null +++ b/community-staging/haskell-glib/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 76695 2012-09-27 05:01:54Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-glib +pkgver=0.12.3.1 +pkgrel=2 +pkgdesc="Binding to the GLIB library for Gtk2Hs." +url="http://hackage.haskell.org/package/glib" +license=('LGPL2.1') +arch=('i686' 'x86_64') +depends=('ghc=7.6.1-1' 'glib2') +makedepends=("gtk2hs-buildtools") +options=('strip') +install=gtk2hs-glib.install +provides=('gtk2hs-glib') +replaces=('gtk2hs-glib') +conflicts=('gtk2hs-glib') +source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz + '0001-compatibility-with-ghc-7.6.1.patch') +md5sums=('f2899bd2a2850fe95479ddb63490eb04' + 'b00660b7102542942b0b9d84b59d1f3c') + +build() { + cd glib-$pkgver + + patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-glib \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" "glib2") + + cd ${srcdir}/glib-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-glib/html ${pkgdir}/usr/share/doc/ghc/html/libraries/glib + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community-staging/haskell-glib/gtk2hs-glib.install b/community-staging/haskell-glib/gtk2hs-glib.install new file mode 100644 index 000000000..24025f5d8 --- /dev/null +++ b/community-staging/haskell-glib/gtk2hs-glib.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/gtk2hs-glib +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community-staging/python-psutil/PKGBUILD b/community-staging/python-psutil/PKGBUILD new file mode 100644 index 000000000..07f0cc833 --- /dev/null +++ b/community-staging/python-psutil/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 76777 2012-09-29 19:21:47Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgbase=python-psutil +pkgname=('python-psutil' 'python2-psutil') +pkgver=0.6.1 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://code.google.com/p/psutil/' +license=('custom: BSD') +makedepends=('python' 'python-distribute' 'python2' 'python2-distribute') +source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") +sha1sums=('f7a76e201601d8e06a1fdf434422f884888aac86') + +build() { + cd psutil-$pkgver + python setup.py build --build-lib=build/python + python2 setup.py build --build-lib=build/python2 + find build/python2 -type f -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; +} + +package_python-psutil() { + pkgdesc='A cross-platform process and system utilities module for Python' + depends=('glibc' 'python') + + cd psutil-$pkgver + python setup.py build --build-lib=build/python \ + install --root="$pkgdir" --optimize=1 + install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE +} + +package_python2-psutil() { + pkgdesc='A cross-platform process and system utilities module for Python2' + depends=('glibc' 'python2') + + cd psutil-$pkgver + python2 setup.py build --build-lib=build/python2 \ + install --root="$pkgdir" --optimize=1 + install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/xmonad-contrib/PKGBUILD b/community-staging/xmonad-contrib/PKGBUILD new file mode 100644 index 000000000..51f4ef608 --- /dev/null +++ b/community-staging/xmonad-contrib/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 76721 2012-09-27 18:19:41Z jelle $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: orbisvicis <gmail.com> + +pkgname=xmonad-contrib +pkgver=0.10 +pkgrel=5 +pkgdesc="Add-ons for xmonad" +arch=('i686' 'x86_64') +url="http://xmonad.org/" +license=('BSD') +depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3') +install='xmonad-contrib.install' +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch) +md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81' + '32163aaeb3424cf73bf831640c162a8a') + +build() { + cd $srcdir/$pkgname-$pkgver + # Patch xmonad-contrib to support haskell-x11 + patch -Np1 -i $srcdir/xmonad-contrib-0.10-x11-1.6.patch + + runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh + install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh + runhaskell Setup.lhs copy --destdir=$pkgdir + install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE +} diff --git a/community-staging/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community-staging/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch new file mode 100644 index 000000000..8372b4144 --- /dev/null +++ b/community-staging/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch @@ -0,0 +1,46 @@ +Tue Mar 20 03:53:11 FET 2012 Adam Vogt <vogt.adam@gmail.com> + * Bump version to 0.10.1 + + Raising the X11 dependency while keeping the xmonad version the same leads to + problems where cabal install uses the dependency versions following hackage, + not what is installed. +diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal +index 743bdc8..0fbf4ac 100644 +--- a/xmonad-contrib.cabal ++++ b/xmonad-contrib.cabal +@@ -61,7 +61,7 @@ library + extensions: ForeignFunctionInterface + cpp-options: -DXFT + +- build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string ++ build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string + + if true + ghc-options: -fwarn-tabs -Wall +diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs +index a485d95..5e388e2 100644 +--- a/XMonad/Layout/Spiral.hs ++++ b/XMonad/Layout/Spiral.hs +@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral ( + ) where + + import Data.Ratio +-import XMonad ++import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..)) + import XMonad.StackSet ( integrate ) + + -- $usage +diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs +index 0d78653..4b7fd3b 100644 +--- a/XMonad/Util/Paste.hs ++++ b/XMonad/Util/Paste.hs +@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage + where + + import XMonad (io, theRoot, withDisplay, X ()) +-import Graphics.X11 ++import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode) ++import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask) + import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent) + import Control.Monad.Reader (asks) + import XMonad.Operations (withFocused) diff --git a/community-staging/xmonad-contrib/xmonad-contrib.install b/community-staging/xmonad-contrib/xmonad-contrib.install new file mode 100644 index 000000000..e9208c833 --- /dev/null +++ b/community-staging/xmonad-contrib/xmonad-contrib.install @@ -0,0 +1,17 @@ +HS_DIR=usr/share/haskell/xmonad-contrib + +post_install() { + ${HS_DIR}/register.sh +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} diff --git a/community-staging/xmonad/PKGBUILD b/community-staging/xmonad/PKGBUILD new file mode 100644 index 000000000..404021eb4 --- /dev/null +++ b/community-staging/xmonad/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 76719 2012-09-27 17:41:43Z jelle $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: shild <shildv@gmail.com> + +pkgname=xmonad +pkgver=0.10 +pkgrel=5 +pkgdesc="Lightweight X11 tiled window manager written in Haskell" +arch=('i686' 'x86_64') +url="http://xmonad.org/" +license=('BSD') +depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions') +makedepends=('setconf' 'gendesk') +optdepends=('xorg-xmessage: for displaying visual error messages') +install='xmonad.install' +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz + xmonad.svg xmonad-0.10-x11-1.6.patch) + +build() { + cd "$srcdir" + ghc-pkg list + gendesk + + cd $srcdir/$pkgname-$pkgver + # Patch XMonad so we support haskell 1.6 + patch -Np1 -i $srcdir/xmonad-0.10-x11-1.6.patch + + + runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh + install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh + runhaskell Setup.lhs copy --destdir=$pkgdir + #runhaskell util/GenerateManpage.hs + + install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1 + + install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE + + install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg +} +md5sums=('f8381e1ec15137863558a454d4466467' + '72bfa5e62e4e44fe7fa59b6a7593d993' + '22d29900d71f09a8f9fa6f0d2f3fed32') diff --git a/community-staging/xmonad/xmonad-0.10-x11-1.6.patch b/community-staging/xmonad/xmonad-0.10-x11-1.6.patch new file mode 100644 index 000000000..5b7afaf3b --- /dev/null +++ b/community-staging/xmonad/xmonad-0.10-x11-1.6.patch @@ -0,0 +1,19 @@ +Tue Mar 20 03:49:24 FET 2012 Adam Vogt <vogt.adam@gmail.com> + * Address versioning problems related to X11 1.6 release. + + Bump version to 0.10.1 since cabal uses hackage dependencies even when the + locally installed package differs. + + Allow X11-1.6 dependency. +diff -rN -u old-xmonad/xmonad.cabal new-xmonad/xmonad.cabal +--- old-xmonad/xmonad.cabal 2012-05-06 12:20:26.788767220 +0300 ++++ new-xmonad/xmonad.cabal 2012-05-06 12:20:26.818766844 +0300 +@@ -46,7 +46,7 @@ + build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions + else + build-depends: base < 3 +- build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix, ++ build-depends: X11>=1.5 && < 1.7, mtl, unix, + utf8-string >= 0.3 && < 0.4 + + if true diff --git a/community-staging/xmonad/xmonad-gnome-session.session b/community-staging/xmonad/xmonad-gnome-session.session new file mode 100644 index 000000000..c0bd16781 --- /dev/null +++ b/community-staging/xmonad/xmonad-gnome-session.session @@ -0,0 +1,6 @@ +[GNOME Session] +Name=Xmonad session +RequiredComponents=gnome-panel;gnome-settings-daemon; +RequiredProviders=windowmanager;notifications; +DefaultProvider-windowmanager=xmonad +DefaultProvider-notifications=notification-daemon diff --git a/community-staging/xmonad/xmonad.install b/community-staging/xmonad/xmonad.install new file mode 100644 index 000000000..6659247db --- /dev/null +++ b/community-staging/xmonad/xmonad.install @@ -0,0 +1,22 @@ +HS_DIR=/usr/share/haskell/xmonad + +post_install() { + ${HS_DIR}/register.sh + echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs" + echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples" + echo + echo "If you would like to run xmonad as a window manager inside GNOME, please see" + echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad" +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} diff --git a/community-staging/xmonad/xmonad.svg b/community-staging/xmonad/xmonad.svg new file mode 100644 index 000000000..5fc884213 --- /dev/null +++ b/community-staging/xmonad/xmonad.svg @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2211" + sodipodi:version="0.32" + inkscape:version="0.45.1" + width="47" + height="73" + version="1.0" + sodipodi:docbase="/home/sjanssen/xmonad-web/images" + sodipodi:docname="logo.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata2216"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs2214" /> + <sodipodi:namedview + inkscape:window-height="778" + inkscape:window-width="1278" + inkscape:pageshadow="2" + inkscape:pageopacity="1" + guidetolerance="10.0" + gridtolerance="10.0" + objecttolerance="10.0" + borderopacity="1.0" + bordercolor="#666666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="4" + inkscape:cx="23.5" + inkscape:cy="22.689137" + inkscape:window-x="0" + inkscape:window-y="20" + inkscape:current-layer="g3208" /> + <g + id="g3208" + transform="translate(-44.517797,4.0967298)"> + <g + id="g3212" + transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)"> + <path + style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462" + id="text2220" + sodipodi:nodetypes="cccccccc" /> + <path + id="path3206" + d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349" + style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + sodipodi:nodetypes="ccccccccc" /> + </g> + <path + style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono" + d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z " + id="text3216" + sodipodi:nodetypes="ccccccccccccccccccccccccccc" /> + </g> +</svg> diff --git a/community-staging/znc/PKGBUILD b/community-staging/znc/PKGBUILD new file mode 100644 index 000000000..f2690b1c5 --- /dev/null +++ b/community-staging/znc/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 76775 2012-09-29 19:15:54Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: mickael9 <mickael9 at gmail dot com> + +pkgname=znc +pkgver=0.206 +pkgrel=3 +pkgdesc='An IRC bouncer with modules & scripts support' +url='http://en.znc.in/wiki/index.php/ZNC' +license=('GPL2') +arch=('i686' 'x86_64') +depends=('c-ares' 'libsasl') +#makedepends=('swig' 'tcl' 'python' 'perl') +makedepends=('tcl' 'python' 'perl') +optdepends=('tcl: modtcl module' + 'python: modpython module' + 'perl: modperl module' + 'cyrus-sasl: saslauth module') +source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz" + "http://people.znc.in/~darthgandalf/znc/modperl/modperl-znc-0.204.tar.bz2" + "http://people.znc.in/~darthgandalf/znc/modpython/modpython-znc-0.204.tar.bz2") +md5sums=('b7d3f21da81abaeb553066b0e10beb53' + 'a9c72d556d9a4ef100520433f17d71ae' + '19bf033c5cb9243171c215043c594f07') + +build() { + # swig 2.0.6 is bugged, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672035 + # use an alternate ways of building znc explain here: + # - http://wiki.znc.in/Modperl + # - http://wiki.znc.in/Modpython + mv -v modperl/* $pkgname-$pkgver/modules/modperl + mv -v modpython/* $pkgname-$pkgver/modules/modpython + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --enable-sasl \ + --enable-python \ + --enable-perl \ + --enable-tcl \ + --disable-swig \ + --enable-extra + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/jack2/40-hpet-permissions.rules b/community-testing/jack2/40-hpet-permissions.rules new file mode 100644 index 000000000..7af3780f9 --- /dev/null +++ b/community-testing/jack2/40-hpet-permissions.rules @@ -0,0 +1,2 @@ +KERNEL=="rtc0", GROUP="audio" +KERNEL=="hpet", GROUP="audio" diff --git a/community-testing/jack2/99-audio.conf b/community-testing/jack2/99-audio.conf new file mode 100644 index 000000000..eb76ef920 --- /dev/null +++ b/community-testing/jack2/99-audio.conf @@ -0,0 +1,2 @@ +@audio - rtprio 99 +@audio - memlock unlimited diff --git a/community-testing/jack2/PKGBUILD b/community-testing/jack2/PKGBUILD new file mode 100644 index 000000000..dd3ab36e0 --- /dev/null +++ b/community-testing/jack2/PKGBUILD @@ -0,0 +1,135 @@ +# $Id: PKGBUILD 76735 2012-09-28 16:17:58Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Daniele Paolella <danielepaolella@email.it> +# Contributor: Philipp Überbacher <hollunder at gmx dot at> +# Contributor: Thomas Bahn <thomas-bahn at gmx dot net> + +pkgbase=jack2 +pkgname=('jack2' 'jack2-dbus') +#pkgname= # single build (overrides split) +_tarname=jack +pkgver=1.9.8 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://jackaudio.org/" +backup=(etc/security/limits.d/99-audio.conf) +license=('GPL') +makedepends=('python2' 'doxygen' 'libffado' + 'libsamplerate' 'dbus-core' 'celt') +source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz" + '99-audio.conf' + '40-hpet-permissions.rules' + 'ffado_setbuffsize-jack2.patch') +md5sums=('1dd2ff054cab79dfc11d134756f27165' + 'ae65b7c9ebe0fff6c918ba9d97ae342d' + '471aad533ff56c5d3cbbf65ce32cadef' + '1502d82fe2276d6f224fff6467a0b6f9') + +_pyfix() { + sed -i 's:bin/env python:bin/env python2:' \ + "$pkgdir/usr/bin/jack_control" +} + +_wafconf() { + python2 waf configure --prefix=/usr \ + --alsa \ + --firewire \ + --doxygen $@ +} + +_isbuild() { + printf "%s\n" ${pkgname[@]} | grep -qx $1 +} + +build() { + cd "$srcdir/$_tarname-$pkgver" + + # backport firewire stuff + # - needed for setbuffsize feature in latest stable ffado + # from https://github.com/jackaudio/jack2/commit/96e0251 + ( + cd $_tarname-$pkgver + patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch" + ) + + # Some optimisation bug exists for current GCC + # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 + export CFLAGS="${CFLAGS/-O[0-9]/-O0}" + export CXXFLAGS="$CFLAGS" + + # fix doxygen building + sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript + + # we may do 2 different builds + cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver + + # mixed dbus/classic build + if _isbuild jack2; then + cd $_tarname-$pkgver + msg2 "Running Mixed D-Bus/Classic build" + _wafconf --classic --dbus + python2 waf build $MAKEFLAGS + cd .. + fi + + # dbus-ONLY build + if _isbuild jack2-dbus; then + cd $_tarname-dbus-$pkgver + msg2 "Running D-Bus-only build" + _wafconf --dbus + python2 waf build $MAKEFLAGS + cd .. + fi +} + +package_jack2() { + ! _isbuild jack2 && return 0 + + pkgdesc="The next-generation JACK with SMP support" + depends=('libsamplerate' 'celt') + optdepends=('libffado: FireWire support' + 'dbus-core: jackdbus' + 'python2: jack_control') + conflicts=('jack') + provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') + + cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + # fix for major python transition + _pyfix + + # configure realtime access/scheduling + # see https://bugs.archlinux.org/task/26343 + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" +} + +package_jack2-dbus() { + ! _isbuild jack2-dbus && return 0 + + pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" + depends=('libsamplerate' 'celt' 'dbus-core') + optdepends=('libffado: FireWire support' + 'python2: jack_control') + conflicts=('jack' 'jack2') + provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') + + cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver" + + python2 waf install --destdir="$pkgdir" + + _pyfix + + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/jack2/ffado_setbuffsize-jack2.patch b/community-testing/jack2/ffado_setbuffsize-jack2.patch new file mode 100644 index 000000000..0c74aad24 --- /dev/null +++ b/community-testing/jack2/ffado_setbuffsize-jack2.patch @@ -0,0 +1,139 @@ +From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth <adi@drcomp.erfurt.thur.de> +Date: Sat, 17 Mar 2012 22:36:30 +0100 +Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size + +This is a port of Jonathan Woithe's patch from jackd1. +With sufficiently recent versions of FFADO, it allows to change +the buffersize at runtime. +--- + linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- + linux/firewire/JackFFADODriver.h | 6 ++++ + 2 files changed, 65 insertions(+), 6 deletions(-) + +diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp +index b33e1cd..085b78a 100644 +--- a/linux/firewire/JackFFADODriver.cpp ++++ b/linux/firewire/JackFFADODriver.cpp +@@ -3,6 +3,7 @@ + Copyright (C) 2004 Grame + Copyright (C) 2007 Pieter Palmers + Copyright (C) 2009 Devin Anderson ++Copyright (C) 2012 Jonathan Woithe, Adrian Knoth + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -48,7 +49,10 @@ + namespace Jack + { + ++// Basic functionality requires API version 8. If version 9 or later ++// is present the buffers can be resized at runtime. + #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 ++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 + + #define jack_get_microseconds GetMicroSeconds + +@@ -281,19 +285,68 @@ + int + JackFFADODriver::SetBufferSize (jack_nframes_t nframes) + { +- printError("Buffer size change requested but not supported!!!"); ++ ffado_driver_t* driver = (ffado_driver_t*)fDriver; ++ signed int chn; ++ ++ // The speed of this function isn't critical; we can afford the ++ // time to check the FFADO API version. ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || ++ ffado_streaming_set_period_size == NULL) { ++ printError("unsupported on current version of FFADO; please upgrade FFADO"); ++ return -1; ++ } + +- /* + driver->period_size = nframes; + driver->period_usecs = + (jack_time_t) floor ((((float) nframes) / driver->sample_rate) + * 1000000.0f); +- */ ++ ++ ++ // Reallocate the null and scratch buffers. ++ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->nullbuffer == NULL) { ++ printError("could not allocate memory for null buffer"); ++ return -1; ++ } ++ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->scratchbuffer == NULL) { ++ printError("could not allocate memory for scratch buffer"); ++ return -1; ++ } ++ ++ // MIDI buffers need reallocating ++ for (chn = 0; chn < driver->capture_nchannels; chn++) { ++ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { ++ // setup the midi buffer ++ if (driver->capture_channels[chn].midi_buffer != NULL) ++ free(driver->capture_channels[chn].midi_buffer); ++ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ for (chn = 0; chn < driver->playback_nchannels; chn++) { ++ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { ++ if (driver->playback_channels[chn].midi_buffer != NULL) ++ free(driver->playback_channels[chn].midi_buffer); ++ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ ++ // Notify FFADO of the period size change ++ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { ++ printError("could not alter FFADO device period size"); ++ return -1; ++ } ++ ++ // This is needed to give the shadow variables a chance to ++ // properly update to the changes. ++ sleep(1); + + /* tell the engine to change its buffer size */ +- //driver->engine->set_buffer_size (driver->engine, nframes); ++ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails + +- return -1; // unsupported ++ UpdateLatencies(); ++ ++ return 0; + } + + typedef void (*JackDriverFinishFunction) (jack_driver_t *); +@@ -306,7 +359,7 @@ + + assert(params); + +- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { + printError("Incompatible libffado version! (%s)", ffado_get_version()); + return NULL; + } +diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h +index cb2a45d..790f4dd 100644 +--- a/linux/firewire/JackFFADODriver.h ++++ b/linux/firewire/JackFFADODriver.h +@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver + int Read(); + int Write(); + ++ // BufferSize can be changed ++ bool IsFixedBufferSize() ++ { ++ return false; ++ } ++ + int SetBufferSize(jack_nframes_t nframes); + }; + +-- +1.7.10 + diff --git a/community/clipit/PKGBUILD b/community/clipit/PKGBUILD index 5a57a6f2f..c81f2d53f 100644 --- a/community/clipit/PKGBUILD +++ b/community/clipit/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 72903 2012-06-24 18:15:32Z bpiotrowski $ +# $Id: PKGBUILD 76710 2012-09-27 13:37:18Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mihai Militaru <mihai dot militaru at xmpp dot ro> pkgname=clipit pkgver=1.4.2 -pkgrel=3 +pkgrel=4 pkgdesc="Lightweight GTK+ clipboard manager (fork of Parcellite)" arch=('i686' 'x86_64' 'mips64el') url="http://gtkclipit.sourceforge.net/" license=('GPL3') -depends=('gtk2' 'gtk-update-icon-cache' 'hicolor-icon-theme') +depends=('gtk2' 'gtk-update-icon-cache' 'hicolor-icon-theme' 'librsvg') makedepends=('intltool') optdepends=('xdotool: for automatic paste') install=$pkgname.install diff --git a/community/dunst/PKGBUILD b/community/dunst/PKGBUILD new file mode 100644 index 000000000..33337133b --- /dev/null +++ b/community/dunst/PKGBUILD @@ -0,0 +1,32 @@ +$Id: PKGBUILD 76730 2012-09-28 03:35:52Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: feuri + +pkgname=dunst +pkgver=0.4.0 +pkgrel=1 +pkgdesc="a dmenu-ish notification system " +arch=('i686' 'x86_64') +url="http://knopwob.github.com/dunst" +license=(MIT) +depends=(dbus-core libxinerama libxft libxss libxdg-basedir) +makedepends=('git' 'perl') +optdepends=('libnotify: dunst is able to listen to notifications from libnotify') +provides=(notification-daemon) +source=("${pkgname}-${pkgver}.tar.bz2::http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2") +md5sums=('615b673011222f6ab6f5df28def329a9') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + + make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 +} + +package() { + cd "${srcdir}/$pkgname-$pkgver" + + make DESTDIR="${pkgdir}" PREFIX=/usr install + + install -Dm644 "${srcdir}/$pkgname-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} +# vim:set ts=2 sw=2 et: diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index bf9a0c177..7cfa0b279 100644 --- a/community/ffmpeg2theora/PKGBUILD +++ b/community/ffmpeg2theora/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73471 2012-07-08 09:30:01Z ibiru $ +# $Id: PKGBUILD 76759 2012-09-29 12:51:22Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ffmpeg2theora pkgver=0.29 -pkgrel=1 +pkgrel=2 pkgdesc="Simple converter to create Ogg Theora files" arch=('x86_64' 'i686' 'mips64el') url="http://www.v2v.cc/~j/ffmpeg2theora/" diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD index e132fcdad..8cab17da6 100644 --- a/community/geany/PKGBUILD +++ b/community/geany/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72665 2012-06-18 19:58:17Z arodseth $ +# $Id: PKGBUILD 76751 2012-09-28 23:09:27Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.ro> @@ -7,14 +7,14 @@ pkgname=geany pkgver=1.22 -pkgrel=1 -pkgdesc="Fast and lightweight IDE" +pkgrel=2 +pkgdesc='Fast and lightweight IDE' arch=('i686' 'x86_64' 'mips64el') url="http://www.geany.org/" license=('GPL') -depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'python2') -makedepends=('perlxml' 'intltool') -optdepends=("vte: for terminal support") +depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('perlxml' 'setconf' 'intltool') +optdepends=('vte: for terminal support' 'python2') install=geany.install source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2") options=('!libtool') @@ -30,9 +30,9 @@ build() { msg2 "Python2 fix..." sed -i '0,/on/s//on2/' data/templates/files/main.py msg2 "Fixing FS#10318..." - sed -i 's|MimeType=text/plain;|MimeType=|' geany.desktop + setconf geany.desktop MimeType '' msg2 "Enabling colors for PKGBUILD files..." - sed -i 's|Sh=|Sh=PKGBUILD;|' data/filetype_extensions.conf + setconf data/filetype_extensions.conf Sh PKGBUILD } package() { diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 7b9c24ce0..1bb6e6868 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72888 2012-06-24 13:42:51Z arodseth $ +# $Id: PKGBUILD 76749 2012-09-28 22:40:14Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -9,8 +9,8 @@ # Contributor: Daniel YC Lin <dlin.tw@gmail.com> pkgname=go -pkgver=1.0.2 -pkgrel=2 +pkgver=1.0.3 +pkgrel=1 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') @@ -23,16 +23,22 @@ install=go.install backup=('usr/lib/go/bin') source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" "$pkgname.sh") -sha256sums=('70fcfb455087c14cc59b7a65c78003fcd1323d73f9b991c1e52db535d6bc95a8' +sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df' 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') build() { - cd "$srcdir/$pkgname" + if [ "$CARCH" == 'x86_64' ]; then + export GOARCH=amd64 + fi + if [ "$CARCH" == 'i686' ]; then + export GOARCH=386 + fi + + # Set GOARCH to arm for crosscompilation (currently doesn't work) + cd "$srcdir/$pkgname" export GOROOT_FINAL="/usr/lib/go" export GOOS=linux - export GOARCH=arm - cd src bash make.bash } @@ -72,12 +78,12 @@ package() { cp -r doc misc -t "$pkgdir/usr/share/go" ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc" - cp -r --preserve=timestamps bin "$pkgdir/usr" - cp -r --preserve=timestamps pkg "$pkgdir/usr/lib/go" - cp -r --preserve=timestamps $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/" - cp -r --preserve=timestamps $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd" - cp -r --preserve=timestamps $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/" - cp -r --preserve=timestamps $GOROOT/lib "$pkgdir/usr/lib/go/" + cp -a bin "$pkgdir/usr" + cp -a pkg "$pkgdir/usr/lib/go" + cp -a $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/" + cp -a $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd" + cp -a $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/" + cp -a $GOROOT/lib "$pkgdir/usr/lib/go/" install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src" diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index 92a65115e..78e0c9de1 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 73996 2012-07-18 01:07:11Z ibiru $ +# $Id: PKGBUILD 76745 2012-09-28 20:24:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> pkgname=gpsdrive pkgver=2.11 -_pkgver=20120711 -pkgrel=13 +_pkgver=20120928 +pkgrel=14 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64" 'mips64el') url="http://www.gpsdrive.de/" @@ -17,8 +17,8 @@ depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' ' makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') install="gpsdrive.install" #source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz") -source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.xz") -md5sums=('48fe20e111c10d0826d9f05746c9cf74') +source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz") +md5sums=('bc53792529788b81c291a32d628a4850') build() { cd "$srcdir" @@ -34,6 +34,7 @@ build() { cd build sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c + sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD index 9b1df661a..e5803b06d 100644 --- a/community/jansson/PKGBUILD +++ b/community/jansson/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76140 2012-09-12 04:02:41Z kkeen $ +# $Id: PKGBUILD 76779 2012-09-29 19:28:30Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Dave Reisner <d@falconindy.com> pkgname=jansson -pkgver=2.3.1 +pkgver=2.4 pkgrel=1 pkgdesc='C library for encoding, decoding and manipulating JSON data' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glibc') license=('MIT') options=('!libtool') source=("http://www.digip.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2") -md5sums=('fb529b7d96162950f2123dca8704c4c6') +md5sums=('3aaa1bb1195d705fac602b7504c9b945') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD index a74cc3e00..1012a35ad 100644 --- a/community/kphotoalbum/PKGBUILD +++ b/community/kphotoalbum/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74835 2012-08-06 23:08:56Z andrea $ +# $Id: PKGBUILD 76830 2012-09-30 21:12:00Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com> @@ -6,8 +6,8 @@ # Contributor: chfoxli <lg ][ romandie ? com> pkgname=kphotoalbum -pkgver=4.2 -pkgrel=4 +pkgver=4.3 +pkgrel=1 pkgdesc="KDE Photo Album, picture collection manager" url="http://www.kphotoalbum.org/" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ optdepends=('kdeedu-marble: integration with Marble' 'kdemultimedia-mplayerthumbs: video thumbnails') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7cb484089477f3633657b67ce59b85f2') +md5sums=('09b5ba7d44ee7426802b233454927b8f') build() { cd ${srcdir} diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD index 3dccf2057..7871f776a 100644 --- a/community/ldc/PKGBUILD +++ b/community/ldc/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 76398 2012-09-17 09:39:27Z svenstaro $ +# $Id: PKGBUILD 76840 2012-10-01 01:55:21Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=ldc -pkgver=20120917 +pkgver=20121001 pkgrel=1 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2" arch=('i686' 'x86_64') diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD index 7949b4cdd..7ad656779 100644 --- a/community/lockdev/PKGBUILD +++ b/community/lockdev/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 57817 2011-11-03 10:01:23Z lfleischer $ +# $Id: PKGBUILD 76820 2012-09-30 13:49:03Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de> pkgname=lockdev -pkgver=1.0.3_1.2 +pkgver=1.0.3_1.5 _pkgver=1.0.3 -pkgrel=3 +pkgrel=1 pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.' url='http://packages.qa.debian.org/l/lockdev.html' license=("GPL") @@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el') source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz" "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz") md5sums=('64b9c1b87b125fc348e892e24625524a' - 'afe2995ad3fc6551e107364d66a8e938') + 'c4e8a5a2e46b76b48339c232b358f579') build() { cd "${pkgname}-${_pkgver}" @@ -22,8 +22,8 @@ build() { patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff" sed -i "s|CFLAGS = -g|CFLAGS = -g -fPIC|" Makefile - make shared - make static + make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\"" + make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\"" } package() { diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 1e39fe06c..9da1bb987 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74705 2012-08-02 08:51:42Z bpiotrowski $ +# $Id: PKGBUILD 76688 2012-09-26 21:14:05Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=14 +pkgrel=15 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install index eaf2339cd..4d1285dc5 100644 --- a/community/lxdm/lxdm.install +++ b/community/lxdm/lxdm.install @@ -1,24 +1,18 @@ -pkgname=lxdm - post_install() { - if [ -z "`getent group "lxdm" 2> /dev/null`" ]; then - groupadd lxdm - chown root:lxdm /etc/lxdm/lxdm.conf - fi - chown -R root:lxdm /var/lib/lxdm > /dev/null - chmod +r /etc/lxdm/lxdm.conf + if ! getent group lxdm > /dev/null ; then + groupadd --system lxdm + chgrp -R lxdm /var/lib/lxdm + chgrp lxdm /etc/lxdm/lxdm.conf + chmod +r /etc/lxdm/lxdm.conf + fi } post_upgrade() { - post_install + post_install $1 } post_remove() { - getent group "lxdm" &>/dev/null && groupdel lxdm #1>/dev/null - return 0 + if ! getent group lxdm > /dev/null ; then + groupdel lxdm + fi } - -op=$1 -shift - -$op "$@" diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 89184044b..c9e0d4941 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74816 2012-08-06 08:20:52Z spupykin $ +# $Id: PKGBUILD 76741 2012-09-28 19:41:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ optdepends=('libxslt: Web Map Service' makedepends=('scons' 'boost') install="mapnik.install" source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2") -md5sums=('c00f4fa2d5f3c344d93d71afdfce3a5e') +md5sums=('d580c558a957444873bec9e24526b0a0') build() { cd "$srcdir/$pkgname-v$pkgver" diff --git a/community/midori/0.4.7-private-mode.patch b/community/midori/0.4.7-private-mode.patch new file mode 100644 index 000000000..599780b78 --- /dev/null +++ b/community/midori/0.4.7-private-mode.patch @@ -0,0 +1,12 @@ +diff -aur midori-0.4.7/katze/midori-paths.vala midori-0.4.7.patch/katze/midori-paths.vala +--- midori-0.4.7/katze/midori-paths.vala 2012-09-19 23:17:43.000000000 +0200 ++++ midori-0.4.7.patch/katze/midori-paths.vala 2012-09-24 20:36:04.585209437 +0200 +@@ -74,7 +74,7 @@ + else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) { + /* Use mock folders in development builds */ + if ("." in MIDORI_VERSION_SUFFIX) +- config_dir = cache_dir = user_data_dir = config_base; ++ config_dir = cache_dir = user_data_dir = config_base ?? Path.DIR_SEPARATOR_S; + else + config_dir = cache_dir = user_data_dir = "/"; + readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S, diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 7b58c4acc..bfab30b7c 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76505 2012-09-20 05:16:42Z bpiotrowski $ +# $Id: PKGBUILD 76712 2012-09-27 13:47:42Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -8,7 +8,7 @@ pkgname=midori pkgver=0.4.7 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight web browser based on Gtk WebKit' arch=('x86_64' 'i686' 'mips64el') url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' @@ -18,12 +18,17 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support') options=('!emptydirs') -source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('06db7b88a41e9b2265728960d5e98f35') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + 0.4.7-private-mode.patch) +md5sums=('06db7b88a41e9b2265728960d5e98f35' + 'b2f21a853038662fd0e6c2274ed9dfb7') build() { cd $srcdir/$pkgname-$pkgver - + + # fs#31641 + patch -Np1 -i $srcdir/0.4.7-private-mode.patch + # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD index e70d353be..1c75dffee 100644 --- a/community/minitube/PKGBUILD +++ b/community/minitube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 73056 2012-06-29 18:18:46Z andrea $ +# $Id: PKGBUILD 76714 2012-09-27 15:50:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=minitube -pkgver=1.8 +pkgver=1.9 pkgrel=1 pkgdesc="A native YouTube client in QT. Watch YouTube videos without Flash Player" arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +12,11 @@ depends=('phonon') install="${pkgname}.install" source=("http://flavio.tordini.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'fix-build.patch') -md5sums=('dabfe4776ab6a19eff14e644f68714bb' +md5sums=('a60bb568519eb91035d5d6dc27ff1406' 'b6d67acdfc5ef17235449ca13575ba97') build() { - cd "${srcdir}"/${pkgname} + cd ${pkgname} patch -p1 -i "${srcdir}"/fix-build.patch @@ -24,6 +24,6 @@ build() { } package() { - cd "${srcdir}"/${pkgname} + cd ${pkgname} make install INSTALL_ROOT="${pkgdir}" } diff --git a/community/ncdu/PKGBUILD b/community/ncdu/PKGBUILD index 24876e435..398ab5ec2 100644 --- a/community/ncdu/PKGBUILD +++ b/community/ncdu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59391 2011-11-24 07:32:15Z bisson $ +# $Id: PKGBUILD 76727 2012-09-27 22:43:52Z bisson $ # Contributor: lp76 <l.peduto@gmail.com> # Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=ncdu -pkgver=1.8 +pkgver=1.9 pkgrel=1 pkgdesc='Disk usage analyzer with an ncurses interface' url='http://dev.yorhel.nl/ncdu/' @@ -13,7 +13,7 @@ license=('custom:MIT') depends=('ncurses') arch=('i686' 'x86_64' 'mips64el') source=("http://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('3d98e78cf7035e32333d263d301d12e9b4352598') +sha1sums=('27cb5464b192db8ffdf0a894fe51d29985348eb0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 0939a556a..7a2b51408 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76180 2012-09-12 17:56:42Z bpiotrowski $ +# $Id: PKGBUILD 76757 2012-09-29 07:00:16Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.8.9 +pkgver=0.8.11 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -17,8 +17,8 @@ license=('MIT') depends=('openssl' 'python2') #'v8') checkdepends=('curl') # curl used for check() options=('!emptydirs') -source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('5470b3951a3b2684cfa71027801bd19d') +source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) +md5sums=('23cb6d6a5c3949ac73df3c6b330e834d') build() { cd node-v${pkgver} @@ -48,15 +48,15 @@ check() { package() { cd node-v${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR=$pkgdir install # install docs as per user request - install -d ${pkgdir}/usr/share/doc/nodejs + install -d $pkgdir/usr/share/doc/nodejs cp -r doc/api/*.html \ - ${pkgdir}/usr/share/doc/nodejs + $pkgdir/usr/share/doc/nodejs install -D -m644 LICENSE \ - ${pkgdir}/usr/share/licenses/nodejs/LICENSE + $pkgdir/usr/share/licenses/nodejs/LICENSE } # vim:set ts=2 sw=2 et: diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD index aa9e065a8..77528d596 100644 --- a/community/ocaml-findlib/PKGBUILD +++ b/community/ocaml-findlib/PKGBUILD @@ -6,7 +6,7 @@ pkgname=ocaml-findlib pkgver=1.3.3 -pkgrel=1 +pkgrel=2 license=('MIT') arch=('i686' 'x86_64' 'mips64el') pkgdesc='Objective Caml (OCaml) package manager' diff --git a/community/perl-xml-fast/PKGBUILD b/community/perl-xml-fast/PKGBUILD new file mode 100644 index 000000000..ced5668d1 --- /dev/null +++ b/community/perl-xml-fast/PKGBUILD @@ -0,0 +1,32 @@ +$Id: PKGBUILD 76693 2012-09-27 04:18:50Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: trizen .= x@gmail.com + +pkgname=perl-xml-fast +pkgver=0.11 +pkgrel=3 +pkgdesc="Simple and very fast XML to hash conversion." +arch=('x86_64' 'i686') +url="http://search.cpan.org/dist/XML-Fast/" +license=('GPL' 'PerlArtistic') +depends=('perl') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/M/MO/MONS/XML-Fast-${pkgver}.tar.gz") +md5sums=('a2985cc2f328cf9eda6ad75c3f40f6b3') + +build() { + cd "${srcdir}/XML-Fast-${pkgver}" + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd "${srcdir}/XML-Fast-${pkgver}" + + make DESTDIR="${pkgdir}" install + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index 5bce3fd1e..25de9be79 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.9 +_dcpkgver=2.1.10 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.3.1 -pkgrel=3 +pkgver=0.3.3 +pkgrel=1 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" @@ -19,8 +19,8 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg') source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig} "dovecot.conf") options=('!libtool') -sha256sums=('e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7' - '9d4699435cb1e82d3ac943c37f2ef909cd80cab707cc8b23be0d087f0e80903f' +sha256sums=('1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e' + '8604f9c52cff28506873cf4d0026c57ef73def5f05877126ea561774f1b8ffec' 'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858') build() { diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD index 37a9cb738..ce8b81e24 100644 --- a/community/pinot/PKGBUILD +++ b/community/pinot/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 76182 2012-09-12 19:21:50Z jlichtblau $ +# $Id: PKGBUILD 76755 2012-09-28 23:44:46Z arodseth $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=pinot pkgver=1.01 -pkgrel=1 +pkgrel=2 pkgdesc='Personal search and metasearch tool' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/pinot-search/' @@ -29,22 +30,31 @@ source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz) sha256sums=('a2a82009db05ca7abb4ffbd8baafa8fb820a7e961fd3cdcb21af46bb05eb57d4') build() { - cd "${srcdir}/$pkgname-$pkgver" - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt + cd $srcdir/$pkgname-$pkgver + x='/usr/share/libtextcat/' sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat3_conf.txt - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat31_conf.txt - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat32_conf.txt - sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm russian-iso8859_5\n\ -/usr/share/libtextcat/LM/russian-koi8_r.lm russian-koi8_r\n\ -/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt + sed -i "s|$x|${x}LM/|" \ + textcat_conf.txt \ + textcat3_conf.txt \ + textcat31_conf.txt \ + textcat32_conf.txt + sed -i -e "s|.*russian$|${x}LM/russian-iso8859_5.lm russian-iso8859_5\n\ +${x}LM/russian-koi8_r.lm russian-koi8_r\n\ +${x}LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt - LIBS="-lboost_system" ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --enable-gtkmm3=yes + LIBS="-lboost_system" ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --enable-gtkmm3=yes \ + --enable-mempool=no make } package() { - cd "${srcdir}/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR=$pkgdir install } + +# vim:set ts=2 sw=2 et: diff --git a/community/pinot/pinot.changelog b/community/pinot/pinot.changelog index ab865bc42..4cf1a68a2 100644 --- a/community/pinot/pinot.changelog +++ b/community/pinot/pinot.changelog @@ -1,3 +1,6 @@ +2012-09-29 Alexander Rødseth <rodseth@gmail.com> + * fix FS#31510, adding --enable-mempool=no + 2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * pinot 1.01-1 diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD index 45a667d8a..ecaea96b8 100644 --- a/community/pkgfile/PKGBUILD +++ b/community/pkgfile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76000 2012-09-08 16:02:52Z dreisner $ +# $Id: PKGBUILD 76836 2012-10-01 01:25:40Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=pkgfile -pkgver=5 -pkgrel=2 +pkgver=6 +pkgrel=1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64' 'mips64el') url="http://github.com/falconindy/pkgfile" @@ -13,8 +13,8 @@ conflicts=('pkgtools<24-2') makedepends=('perl') source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) install=pkgfile.install -md5sums=('87e75949ca4ed9d60cc2dfdca9dd1a04' - '14d174d2fe0b8e0a43392c2b4ec48a7a') +md5sums=('75139dd8441d60ee7682d900b610e189' + '75cca8e3c0198fa98e32b54fd5e936e6') build() { cd "$pkgname-$pkgver" diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 88c72ee7b..c5d8c2abd 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9561 +pkgver=9660 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64' 'mips64el') @@ -38,4 +38,4 @@ package() { mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox } -md5sums=('d8b900ae4a7d70c692003a412241e94f') +md5sums=('06f88f737158a1d7912b20010b75d1b1') diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 650b6f16d..7bb6b48da 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: Andrzej Giniewicz <gginiu@gmail.com> pkgname=('python-scipy' 'python2-scipy') -pkgver=0.10.1 +pkgver=0.11.0 pkgrel=1 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ license=('BSD') makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') checkdepends=('python-nose' 'python2-nose') source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz") -md5sums=('6ad976549e22e04ca93e70cf55b70a22') +md5sums=('842c81d35fd63579c41a8ca21a2419b9') build() { unset LDFLAGS diff --git a/community/reptyr/PKGBUILD b/community/reptyr/PKGBUILD new file mode 100644 index 000000000..0fe64d389 --- /dev/null +++ b/community/reptyr/PKGBUILD @@ -0,0 +1,25 @@ +$Id: PKGBUILD 76717 2012-09-27 16:24:59Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> + +pkgname=reptyr +pkgver=0.4 +pkgrel=2 +pkgdesc="A tool for \"re-ptying\" programs" +arch=('i686' 'x86_64') +license=('BSD') +url="https://github.com/nelhage/reptyr" +depends=('glibc') +source=("$pkgname-$pkgver.tar.gz::https://github.com/nelhage/$pkgname/tarball/$pkgname-$pkgver") +md5sums=('4846a0b22c267a154853ce1409e823da') + +build() { + cd "$srcdir"/nelhage-$pkgname-* + + make +} + +package() { + cd "$srcdir"/nelhage-$pkgname-* + + make "DESTDIR=$pkgdir" "PREFIX=/usr" install +} diff --git a/community/start-stop-daemon/PKGBUILD b/community/start-stop-daemon/PKGBUILD index a884da84b..9971fdac6 100644 --- a/community/start-stop-daemon/PKGBUILD +++ b/community/start-stop-daemon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64840 2012-02-18 17:37:14Z seblu $ +# $Id: PKGBUILD 76825 2012-09-30 15:07:25Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Soup <soup a.t soultrap d.o.t n.e.t> # Contributor: Vladimir Koshelenko <koshelenko@rndavia.ru> pkgname=start-stop-daemon -pkgver=1.15.8.12 +pkgver=1.15.8.13 pkgrel=1 pkgdesc='Start and stop system daemon programs' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL2') url='http://packages.qa.debian.org/d/dpkg.html' depends=('glibc') source=("http://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_$pkgver.tar.bz2") -md5sums=('0cd6f20a574d0df31298e70fc3b26173') +md5sums=('7f6ea19838311a66fdacce17991eba85') build() { cd dpkg-$pkgver @@ -27,4 +27,4 @@ package() { install -D -m 644 man/start-stop-daemon.8 "$pkgdir/usr/share/man/man8/start-stop-daemon.8" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/stk/PKGBUILD b/community/stk/PKGBUILD index 1b7a9dba8..7d857334f 100644 --- a/community/stk/PKGBUILD +++ b/community/stk/PKGBUILD @@ -1,51 +1,38 @@ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Maintainer: Mateusz Herych <heniekk@gmail.com> +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Ray Rashif <schiv@archlinux.org> +# Contributor: Mateusz Herych <heniekk@gmail.com> pkgname=stk -pkgver=4.4.2 -pkgrel=6 -pkgdesc="The Synthesis ToolKit in C++" +pkgver=4.4.4 +pkgrel=1 +pkgdesc='The Synthesis ToolKit in C++' arch=('i686' 'x86_64' 'mips64el') -url="http://ccrma.stanford.edu/software/stk/" +url='http://ccrma.stanford.edu/software/stk/' license=('MIT') depends=('gcc-libs' 'jack') makedepends=('pkg-config') -optdepends=('oss: use OSSv4 output/API' - 'tk: run provided demos/samples') -source=(http://ccrma.stanford.edu/software/stk/release/$pkgname-$pkgver.tar.gz - $pkgname.license - cxxflags.patch +optdepends=('tk: run provided demos/samples') +source=("http://ccrma.stanford.edu/software/stk/release/$pkgname-$pkgver.tar.gz" + "$pkgname.license" runtime.patch) -md5sums=('0b7bd1f913ca01fb8b2201ebcf853358' +md5sums=('66646cb1117eee2d767c4571cc51a8c3' 'a0163d75a5f516b6c93f4fc948acff73' - '1b09d29321d575ad670f6371651015c6' '36551c348340307c765fde85d4336e73') build() { cd "$srcdir/$pkgname-$pkgver" - # fails with --as-needed - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - - # optimise for our target architecture(s) - patch -Np1 -i ../cxxflags.patch - autoreconf + # add missing linker flag + export LIBS="$LIBS -lpthread" # enable shared library - sed -i \ - "s:cd src && \$(MAKE)$:& lib$pkgname.so.$pkgver:" \ - Makefile.in + sed -i 's/all : $(STATICLIB)/all : $(SHAREDLIB)/' src/Makefile.in # fix demo rawwaves path - sed -i 's:\.\./\.\.:/usr/lib/stk:' \ - projects/demo/demo.cpp + sed -i 's:\.\./\.\.:/usr/lib/stk:' projects/demo/demo.cpp # run actual build - ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ \ - --prefix=/usr \ - --with-alsa \ - --with-jack \ - --with-oss + ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ --prefix=/usr --with-alsa --with-jack make # fix executable scripts @@ -62,27 +49,18 @@ package() { # install headers install -m644 include/* "$pkgdir/usr/include/stk/" - rm "$pkgdir"/usr/include/stk/*~ # install runtime files - cp -a rawwaves projects/demo/{demo,tcl} \ - projects/effects/{effects,tcl} \ - projects/ragamatic/{ragamat,tcl,rawwaves} \ - "$pkgdir/usr/lib/stk/" + cp -a rawwaves projects/demo/{demo,tcl} projects/effects/{effects,tcl} \ + projects/ragamatic/{ragamat,tcl,rawwaves} "$pkgdir/usr/lib/stk/" # install executables - install -m755 projects/{demo/StkDemo,effects/StkEffects} \ - "$pkgdir/usr/bin/" - - install -m755 projects/ragamatic/Raga \ - "$pkgdir/usr/bin/StkRagamatic" + install -m755 projects/{demo/StkDemo,effects/StkEffects} "$pkgdir/usr/bin/" + install -m755 projects/ragamatic/Raga "$pkgdir/usr/bin/StkRagamatic" # install license - install -Dm644 ../$pkgname.license \ - "$pkgdir/usr/share/licenses/stk/LICENSE" + install -Dm644 "../$pkgname.license" "$pkgdir/usr/share/licenses/stk/LICENSE" # remove .DS_Store directory: https://bugs.archlinux.org/task/25255 - rm -rf ${pkgdir}/usr/lib/stk/rawwaves/.DS_Store + rm -rf "${pkgdir}/usr/lib/stk/rawwaves/.DS_Store" } - -# vim:set ts=2 sw=2 et: diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD index 3e205501d..189f1d3b8 100644 --- a/community/vile/PKGBUILD +++ b/community/vile/PKGBUILD @@ -1,25 +1,52 @@ -# $Id: PKGBUILD 76396 2012-09-17 08:49:52Z spupykin $ +# $Id: PKGBUILD 76743 2012-09-28 19:43:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=vile -pkgver=9.8 -pkgrel=2 +pkgver=9.8_i +_basever=9.8 +pkgrel=1 pkgdesc="vi like emacs" arch=('i686' 'x86_64' 'mips64el') url="http://invisible-island.net/vile/vile.html" depends=('ncurses') license=('custom') options=(!libtool) -source=(ftp://invisible-island.net/vile/vile-$pkgver.tgz) -md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f') +source=("ftp://invisible-island.net/vile/vile-${_basever}.tgz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}a.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}b.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}c.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}d.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}e.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}f.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}g.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}h.patch.gz" + "ftp://invisible-island.net/vile/patches/vile-${_basever}i.patch.gz") +md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f' + '685cb681943e9315a1689a6a6f4734cb' + 'f3842ea427c635d0ee96f6da8566fa56' + '69cfdbb0b84a51802455bbe44a5ce32e' + '5d675193bc02ac4cab72452bf0051489' + '1e6317a15d7b2cd99f921f3af312b977' + '7f8a38272395f07e1377cc1943d37e7f' + '26ab76a7305b7ec97b22855810911ceb' + '6ea4cf22e29f5418f26ba6632985c70e' + '908e8f9cf3c9a681c3ef76a3cd04a0c3') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-${_basever} + + for i in $srcdir/vile-${_basever}?.patch; do + patch -p1 <$i + done sed -i 's|FLEX_BETA|FLEX_NOBETA|g' filters/filters.h + ./configure --prefix=/usr make +} + +package() { + cd $srcdir/$pkgname-${_basever} make install DESTDIR=$pkgdir - mv $pkgdir/usr/man $pkgdir/usr/share/ mkdir -p $pkgdir/usr/share/licenses/$pkgname cat <<EOF >$pkgdir/usr/share/licenses/$pkgname/license diff --git a/community/wbar/PKGBUILD b/community/wbar/PKGBUILD index 7d59416a3..65bc5a498 100644 --- a/community/wbar/PKGBUILD +++ b/community/wbar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67431 2012-03-11 19:04:07Z lcarlier $ +# $Id: PKGBUILD 76682 2012-09-26 19:34:38Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=wbar -pkgver=2.3.0 +pkgver=2.3.4 pkgrel=1 pkgdesc="A quick launch bar developed with speed in mind" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ url="http://code.google.com/p/wbar" license=('GPL') depends=('libglade' 'imlib2' 'gcc-libs') makedepends=('intltool') -source=(http://wbar.googlecode.com/files/${pkgname}_${pkgver}.orig.tar.gz) -sha256sums=('1a192f150eae92d1c92b86050e4f8046de960a2452c48190187dd6b7a89df63b') +source=(http://wbar.googlecode.com/files/$pkgname-$pkgver.tgz) +sha256sums=('46a69849e4436529aefb5cfb2c94b520d05a53c237e7773b90207f67f97a93e3') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/wbar/wbar.changelog b/community/wbar/wbar.changelog index 17916badd..95467b033 100644 --- a/community/wbar/wbar.changelog +++ b/community/wbar/wbar.changelog @@ -1,3 +1,6 @@ +2012-09-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * wbar 2.3.4-1 + 2011-05-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * wbar 2.2.2-1 diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index f0bb42286..c0e94f2b0 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160678 2012-06-03 16:32:18Z dreisner $ +# $Id: PKGBUILD 167188 2012-09-27 01:16:40Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox -pkgver=1.20.1 +pkgver=1.20.2 pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,10 @@ license=('GPL') depends=('glibc') options=('!buildflags') source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" + 'glibc-2.16.patch' 'config') -sha256sums=('3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9' +sha256sums=('eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882' + 'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d' 'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0') build() { @@ -29,6 +31,8 @@ build() { sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ "$srcdir/config" > .config + patch -Np1 < "$srcdir/glibc-2.16.patch" + make } diff --git a/core/mkinitcpio-busybox/glibc-2.16.patch b/core/mkinitcpio-busybox/glibc-2.16.patch new file mode 100644 index 000000000..5e2fb4fa5 --- /dev/null +++ b/core/mkinitcpio-busybox/glibc-2.16.patch @@ -0,0 +1,10 @@ +--- a/include/libbb.h.orig 2012-09-17 08:28:35.215518120 -0400 ++++ b/include/libbb.h 2012-09-17 08:28:49.807212925 -0400 +@@ -44,6 +44,7 @@ + #include <sys/stat.h> + #include <sys/time.h> + #include <sys/types.h> ++#include <sys/resource.h> + #ifndef major + # include <sys/sysmacros.h> + #endif diff --git a/core/nfsidmap/PKGBUILD b/core/nfsidmap/PKGBUILD index 08a78b077..5f00e41da 100644 --- a/core/nfsidmap/PKGBUILD +++ b/core/nfsidmap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136619 2011-08-31 07:19:40Z tpowa $ +# $Id: PKGBUILD 167157 2012-09-26 16:38:02Z tpowa $ # Maintainer: # Contributor: Judd <jvinet@zeroflux.org> pkgname=nfsidmap -pkgver=0.24 -pkgrel=3 +pkgver=0.25 +pkgrel=1 pkgdesc="Library to help mapping IDs, mainly for NFSv4" arch=('i686' 'x86_64' 'mips64el') url="http://www.citi.umich.edu/projects/nfsv4/linux/" @@ -12,7 +12,6 @@ depends=('glibc' 'libldap>=2.4.18') license=('custom:nfsidmap') options=(!libtool) source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz) -md5sums=('d71a1ee9881d5b5814ff3ec41256937d') build() { cd $srcdir/lib$pkgname-$pkgver @@ -27,3 +26,4 @@ package() { # install license install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE } +md5sums=('2ac4893c92716add1a1447ae01df77ab') diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD index e66b9163b..d2852c447 100644 --- a/core/patch/PKGBUILD +++ b/core/patch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142074 2011-11-04 23:36:08Z allan $ +# $Id: PKGBUILD 167281 2012-09-29 22:30:14Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=patch -pkgver=2.6.1 -pkgrel=3.1 +pkgver=2.7.1 +pkgrel=1 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/patch/patch.html" @@ -12,20 +12,14 @@ license=('GPL') groups=('base-devel') depends=('glibc') makedepends=('ed') -optdepends=('ed: Interpret the patch as an ed script; for patch -e functionality(deprecated)') -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} - patch-2.6.1-get-arg.patch) -md5sums=('d758eb96d3f75047efc004a720d33daf' - 'f7953f3e472fae5118815e6138372e22' - '45cd5709adbbcdcb3ab95dc43559c07c') +optdepends=('ed: for patch -e functionality') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('e9ae5393426d3ad783a300a338c09b72' + 'b12189e0de3cb2af25268441647ec517') build() { cd ${srcdir}/${pkgname}-${pkgver} - - # Fixed argument type for --get - # see https://bugzilla.redhat.com/show_bug.cgi?id=553624 - patch -Np1 -i $srcdir/patch-2.6.1-get-arg.patch - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr make } @@ -36,5 +30,5 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} - make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install + make DESTDIR=$pkgdir install } diff --git a/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch new file mode 100644 index 000000000..9be6ef28f --- /dev/null +++ b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch @@ -0,0 +1,30 @@ +From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 27 Sep 2012 20:48:13 -0400 +Subject: [PATCH] tmpfiles: restore previous behavior for F/f + +d4e9eb91ea changed the behavior for the F and f actions, wrongly sending +them to glob_item(). Restore the old behavior and shortcut straight to +write_one_file(). +--- + src/tmpfiles/tmpfiles.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index f10f908..bf900fa 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -673,6 +673,10 @@ static int create_item(Item *i) { + + case CREATE_FILE: + case TRUNCATE_FILE: ++ r = write_one_file(i, i->path); ++ if (r < 0) ++ return r; ++ break; + case WRITE_FILE: + r = glob_item(i, write_one_file); + if (r < 0) +-- +1.7.12.1 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 9e8841aee..1c826da58 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,27 +3,30 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=189 -pkgrel=4 +pkgver=193 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' - 'pam' 'xz') + 'pam' 'quota-tools' 'xz') +checkdepends=('python') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' + '0001-tmpfiles-restore-previous-behavior-for-F-f.patch' 'use-split-usr-path.patch') -md5sums=('ac2eb313f5dce79622f60aac56bca66d' +md5sums=('732a9de2b1d2a15cab639c987ff9e90e' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - '482dba45a783f06c2239f1355f4ce72f') + '1f435290db227c3a4f4396f86819227e' + 'fd5b5f04ab0a847373d357555129d4c0') build() { cd "$pkgname-$pkgver" @@ -34,6 +37,9 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" + # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0 + patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch" + ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -49,6 +55,10 @@ build() { make } +check() { + make -C "$pkgname-$pkgver" check +} + package_systemd() { pkgdesc="system and service manager" depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' @@ -60,7 +70,8 @@ package_systemd() { 'python2-cairo: systemd-analyze' 'python2-dbus: systemd-analyze' 'systemd-sysvcompat: symlink package to provide sysvinit binaries' - 'cryptsetup: required for encrypted block devices') + 'cryptsetup: required for encrypted block devices' + 'quota-tools: kernel-level quota management') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf @@ -130,9 +141,14 @@ package_systemd() { package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit') + conflicts=('sysvinit' 'initscripts') depends=('sysvinit-tools') + # the initscripts conflict here isn't actually needed, but in order to make + # this package remove both sysvinit and initscripts, the initscripts conflict + # is needed. There's no case in which you would ever want initscripts installed + # without sysvinit, and vice versa, as in both cases, they are unusable. + mv "$srcdir/_sysvcompat"/* "$pkgdir" install -dm755 "$pkgdir/sbin" diff --git a/core/systemd/use-split-usr-path.patch b/core/systemd/use-split-usr-path.patch index 057045bf1..2fd32998d 100644 --- a/core/systemd/use-split-usr-path.patch +++ b/core/systemd/use-split-usr-path.patch @@ -1,6 +1,6 @@ ---- a/src/core/main.c 2012-07-17 19:46:24.000000000 -0400 -+++ b/src/core/main.c 2012-07-27 10:04:13.000000000 -0400 -@@ -1379,11 +1379,7 @@ +--- a/src/core/main.c 2012-09-20 23:02:54.000000000 -0400 ++++ b/src/core/main.c 2012-09-20 23:03:13.000000000 -0400 +@@ -1455,11 +1455,7 @@ /* Set up PATH unless it is already set */ setenv("PATH", @@ -9,6 +9,6 @@ -#else - "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", -#endif - arg_running_as == MANAGER_SYSTEM); + arg_running_as == SYSTEMD_SYSTEM); - if (arg_running_as == MANAGER_SYSTEM) { + if (arg_running_as == SYSTEMD_SYSTEM) { diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 8342a31e2..21258e3e1 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 162754 2012-06-29 15:28:24Z ibiru $ +# $Id: PKGBUILD 167219 2012-09-28 15:17:55Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.22 +pkgver=0.6.25 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64 'mips64el') @@ -11,11 +11,14 @@ 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=('6159898955b4c7079a8ae64cd7aa5bf1') +source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz + more-exclusions.patch) +md5sums=('8438df64afffa3bd065c9c3134adb1e7' + '1d5cf127e5aac407fe7c37b2f4fd503c') build() { cd $pkgname-$pkgver + patch -Np1 -i ../more-exclusions.patch ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/accountsservice \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ diff --git a/extra/accountsservice/more-exclusions.patch b/extra/accountsservice/more-exclusions.patch new file mode 100644 index 000000000..46a80c4c9 --- /dev/null +++ b/extra/accountsservice/more-exclusions.patch @@ -0,0 +1,12 @@ +diff --git i/src/daemon.c w/src/daemon.c +index c65eca3..9166055 100644 +--- i/src/daemon.c ++++ w/src/daemon.c +@@ -77,6 +77,7 @@ static const char *default_excludes[] = { + "games", + "man", + "at", ++ "git", + NULL + }; + diff --git a/extra/cppunit/PKGBUILD b/extra/cppunit/PKGBUILD index 936928cb9..772af4111 100644 --- a/extra/cppunit/PKGBUILD +++ b/extra/cppunit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163110 2012-07-07 09:30:05Z andyrtr $ +# $Id: PKGBUILD 167193 2012-09-27 15:30:04Z andyrtr $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=cppunit -pkgver=1.13.0 +pkgver=1.13.1 pkgrel=1 -_hash=0c65c839854edd43d9294d1431a2b292 +_hash=fa9aa839145cdf860bf596532bb8af97 pkgdesc="A C++ unit testing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/cppunit" diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD index 1caa906dd..fed53f811 100644 --- a/extra/eclipse/PKGBUILD +++ b/extra/eclipse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163219 2012-07-11 01:43:03Z ibiru $ +# $Id: PKGBUILD 167250 2012-09-29 11:01:30Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Andrew Wright <andreww@photism.org> @@ -6,9 +6,9 @@ # Contributor: Marco Crosio <marco.crosio@gmail.com> pkgname=eclipse -pkgver=4.2 +pkgver=4.2.1 pkgrel=1 -_date=201206081400 +_date=201209141800/ pkgdesc="An IDE for Java and other languages" arch=('i686' 'x86_64' 'mips64el') url="http://eclipse.org" @@ -19,12 +19,12 @@ conflicts=('xulrunner') license=("EPL/1.1") source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz" 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg') -md5sums=('506b9f4e3919ebe3d6a717cd9bef5e07' +md5sums=('b7e954f547f30704a92fd13895de6d6e' '7ea99a30fbaf06ec29261541b8eb1e23' - 'ba8a37e30a7ebd69774cec87c69e8c44' + 'ba2cf02c48e6e35bfe3685401c26bb5b' '77cff7543ccf7e177cb6667f5a20ce19') [ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz" -[ "$CARCH" = "x86_64" ] && md5sums[0]='804938dd087c310d8bfd54c8024afbbd' +[ "$CARCH" = "x86_64" ] && md5sums[0]='256a04925c033602e5dc479542f7a196' package() { # install eclipse diff --git a/extra/eclipse/eclipse.desktop b/extra/eclipse/eclipse.desktop index 5b210c81e..597b1aca8 100644 --- a/extra/eclipse/eclipse.desktop +++ b/extra/eclipse/eclipse.desktop @@ -5,5 +5,5 @@ Icon=eclipse Exec=eclipse Terminal=false Type=Application -Categories=Development;IDE;Java +Categories=Development;IDE;Java; StartupNotify=true diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 961d45133..c7c304a13 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166623 2012-09-13 11:39:21Z bisson $ +# $Id: PKGBUILD 167203 2012-09-27 22:43:39Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.6.1 +pkgver=2.6.3 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('09f2c03b0fc6b9e37fb998e42e3f7626b9fdfbad') +sha1sums=('3aa991b1596d5bc1fb35e8a1b356b5f1a8a9c04e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 3e34718c9..b3de5d0fe 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163147 2012-07-08 09:30:59Z ibiru $ +# $Id: PKGBUILD 167254 2012-09-29 12:49:31Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=0.11.1 +pkgver=1.0 pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" @@ -18,7 +18,7 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends+=('yasm' 'libvdpau') fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -md5sums=('ff8cb914f657e164dd60ea1008b555a8') +md5sums=('3ed526cea20c1bffb5a37f7730f710bd') build() { cd $pkgname-$pkgver diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index de9b28ae4..d35a8eeaa 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166873 2012-09-20 13:16:25Z dan $ +# $Id: PKGBUILD 167293 2012-09-30 15:45:48Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.12.1 +pkgver=1.7.12.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -109,8 +109,8 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('1c16e94ca43c2811806567ed6e73d704' - 'efaef000a05938971606fad472a1b9f0' +md5sums=('5aa5d146825f74fee889ca5408e4e00b' + '51db657f9e8fa70f43ae56cb6bcb631b' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD new file mode 100644 index 000000000..f71cd69b5 --- /dev/null +++ b/extra/gnu-efi-libs/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 167140 2012-09-26 06:30:46Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> + +_pkgver="3.0" +pkgname="gnu-efi-libs" +pkgver="${_pkgver}q" +pkgrel="1" +pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain" +url="http://sourceforge.net/projects/gnu-efi/" +license=('GPL') +arch=('i686' 'x86_64') +makedepends=('pciutils') +if [[ "${CARCH}" == "x86_64" ]]; then + makedepends+=('lib32-glibc') +fi +conflicts=('gnu-efi') +provides=('gnu-efi') +replaces=('gnu-efi') +options=('!strip' '!makeflags') +source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz") +sha1sums=('99d29be5fd17dfca762cf0e265477862c21d63bb') + +_build_gnu-efi-libs-x86_64() { + cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64" + cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/" + ARCH="x86_64" make + ARCH="x86_64" make -C apps all +} + +_build_gnu-efi-libs-i386() { + cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-i386" + cd "${srcdir}/gnu-efi-${_pkgver}-i386/" + ARCH="ia32" make + ARCH="ia32" make -C apps all +} + +build() { + ## Fix Makefiles to enable compile for both UEFI arch + sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults" + sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults" + sed 's|ARCH :=|ARCH ?=|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults" + sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i "${srcdir}/gnu-efi-${_pkgver}/Make.defaults" + if [[ "${CARCH}" == "x86_64" ]]; then + _build_gnu-efi-libs-x86_64 + fi + _build_gnu-efi-libs-i386 +} + +_package_gnu-efi-libs-x86_64() { + cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/" + make ARCH="x86_64" INSTALLROOT="${pkgdir}/usr/" LIBDIR="lib" install + install -d "${pkgdir}/usr/share/gnu-efi/x86_64/" + install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-x86_64/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/x86_64/" +} + +_package_gnu-efi-libs-i386() { + cd "${srcdir}/gnu-efi-${_pkgver}-i386/" + make ARCH="ia32" INSTALLROOT="${pkgdir}/usr/" LIBDIR="${_LIBDIR32}" install + install -d "${pkgdir}/usr/share/gnu-efi/i386/" + install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-i386/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/i386/" +} + +package() { + if [[ "${CARCH}" == "x86_64" ]]; then + _package_gnu-efi-libs-x86_64 + + _LIBDIR32="lib32" + _package_gnu-efi-libs-i386 + else + _LIBDIR32="lib" + _package_gnu-efi-libs-i386 + fi +} diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 8b086ac1b..3b3cbc9ed 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165900 2012-09-03 09:49:29Z andyrtr $ +# $Id: PKGBUILD 167195 2012-09-27 15:45:57Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.1.1 +pkgver=3.1.2 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit makedepends=('strace') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(http://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('59c432df79108c74c34a4582c7d7e7e7' - '00d354ec9ac8ca4329b35ea397589b6c') +md5sums=('5d722e5850d79269ba413b0e69b9e14f' + '2764135bac008654a0b2fdd9fc6e62d1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 629990304..7f80d078f 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166610 2012-09-13 02:13:20Z eric $ +# $Id: PKGBUILD 167199 2012-09-27 17:38:29Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.9.4 +pkgver=6.7.9.8 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' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('6fa1a160c85f9119047a94ad1c8d3f49d9a84492' +sha1sums=('dc61335f931ea637e7bd2e711b520d221bfe464c' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/ladspa/PKGBUILD b/extra/ladspa/PKGBUILD index e7009dfdf..be50e285b 100644 --- a/extra/ladspa/PKGBUILD +++ b/extra/ladspa/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 137623 2011-09-10 08:28:05Z pierre $ +# $Id: PKGBUILD 167138 2012-09-26 05:02:07Z foutrelis $ # Maintainer: damir <damir@archlinux.org> pkgname=ladspa pkgver=1.13 -pkgrel=3 +pkgrel=4 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)" arch=("i686" "x86_64" 'mips64el') license=('LGPL') url="http://www.ladspa.org/" depends=('gcc-libs') source=("http://www.ladspa.org/download/${pkgname}_sdk_${pkgver}.tgz" - 'hardcode-path.patch') + 'fix-memleak-in-plugin-scanning.patch' + 'fallback-ladspa-path.patch') md5sums=('671be3e1021d0722cadc7fb27054628e' - '27743258232d828575d66940e6de2858') + '478c400e04c9db9cfd6ee1198beec9c5' + '8a0ad7d442662af160381e7302c6ed4c') build() { cd "${srcdir}/${pkgname}_sdk/src" - patch -Np1 -i "${srcdir}/hardcode-path.patch" + patch -Np1 -i "${srcdir}/fix-memleak-in-plugin-scanning.patch" + patch -Np2 -i "${srcdir}/fallback-ladspa-path.patch" sed \ -e 's/mkdirhier/mkdir -p/' \ -e "s#-O3#${CFLAGS} ${LDFLAGS/,--as-needed/}#" \ diff --git a/extra/ladspa/fallback-ladspa-path.patch b/extra/ladspa/fallback-ladspa-path.patch new file mode 100644 index 000000000..7743bf4b4 --- /dev/null +++ b/extra/ladspa/fallback-ladspa-path.patch @@ -0,0 +1,27 @@ +diff -upr ladspa_sdk.orig/src/load.c ladspa_sdk/src/load.c +--- ladspa_sdk.orig/src/load.c 2012-09-26 07:37:24.000000000 +0300 ++++ ladspa_sdk/src/load.c 2012-09-26 07:38:58.000000000 +0300 +@@ -54,6 +54,8 @@ dlopenLADSPA(const char * pcFilename, in + to search. */ + + pcLADSPAPath = getenv("LADSPA_PATH"); ++ if (! pcLADSPAPath) ++ pcLADSPAPath = "/usr/lib/ladspa"; + + if (pcLADSPAPath) { + +diff -upr ladspa_sdk.orig/src/search.c ladspa_sdk/src/search.c +--- ladspa_sdk.orig/src/search.c 2012-09-26 07:37:24.000000000 +0300 ++++ ladspa_sdk/src/search.c 2012-09-26 07:38:46.000000000 +0300 +@@ -99,10 +99,7 @@ LADSPAPluginSearch(LADSPAPluginSearchCal + + pcLADSPAPath = getenv("LADSPA_PATH"); + if (!pcLADSPAPath) { +- fprintf(stderr, +- "Warning: You do not have a LADSPA_PATH " +- "environment variable set.\n"); +- return; ++ pcLADSPAPath = "/usr/lib/ladspa"; + } + + pcStart = pcLADSPAPath; diff --git a/extra/ladspa/fix-memleak-in-plugin-scanning.patch b/extra/ladspa/fix-memleak-in-plugin-scanning.patch new file mode 100644 index 000000000..76cb2e864 --- /dev/null +++ b/extra/ladspa/fix-memleak-in-plugin-scanning.patch @@ -0,0 +1,11 @@ +--- src/search.c.orig 2008-11-07 00:38:18.000000000 +0100 ++++ src/search.c 2008-11-07 00:50:51.000000000 +0100 +@@ -83,6 +83,8 @@ + dlclose(pcFilename); + free(pcFilename); + } ++ } else { ++ free(pcFilename); + } + } + } diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 53c5482b6..f16db5db5 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162978 2012-07-04 13:56:20Z andyrtr $ +# $Id: PKGBUILD 167231 2012-09-28 20:06:45Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.3.8 +pkgver=4.4.0 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') @@ -13,14 +13,13 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 - lftp-4.3.8-gets.patch) -md5sums=('adced9c3e0f6b96821811dc87c0a1eeb' - '932db2d498846be7ba90780ee4fcb158') + lftp-4.3.8-gets.patch) +md5sums=('9d6a048bb6be9bc3baecfea53b0d8330' + '77168a7f368b07eec7e079b55496fa97') build() { cd ${srcdir}/${pkgname}-${pkgver} - # A patch from Gentoo fixing build with newer glibc. - patch -Np1 -i "$srcdir/lftp-4.3.8-gets.patch" + patch -Np1 -i ${srcdir}/lftp-4.3.8-gets.patch ./configure --prefix=/usr --with-gnutls \ --without-openssl --disable-static make diff --git a/extra/lftp/lftp-4.3.8-gets.patch b/extra/lftp/lftp-4.3.8-gets.patch index 0c2cb7c8a..d4a11804e 100644 --- a/extra/lftp/lftp-4.3.8-gets.patch +++ b/extra/lftp/lftp-4.3.8-gets.patch @@ -1,15 +1,16 @@ ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -702,10 +702,12 @@ +diff -up lftp-4.3.8/lib/stdio.in.h.gets lftp-4.3.8/lib/stdio.in.h +--- lftp-4.3.8/lib/stdio.in.h.gets 2012-07-22 15:07:15.101115146 -0400 ++++ lftp-4.3.8/lib/stdio.in.h 2012-07-22 15:08:09.777098512 -0400 +@@ -702,10 +702,12 @@ _GL_WARN_ON_USE (getline, "getline is un /* It is very rare that the developer ever has full control of stdin, so any use of gets warrants an unconditional warning; besides, C11 removed it. */ -+#ifdef gets ++#if defined gets #undef gets #if HAVE_RAW_DECL_GETS _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); #endif -+#endif ++#endif // if defined gets #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD index d73db5a9d..ba2ee7b36 100644 --- a/extra/libbluray/PKGBUILD +++ b/extra/libbluray/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157790 2012-04-29 15:02:33Z ibiru $ +# $Id: PKGBUILD 167258 2012-09-29 12:58:04Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrew Cook <ariscop@gmail.com> pkgname=libbluray -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 pkgdesc="Library to access Blu-Ray disks for video playback" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ optdepends=('java-environment: Blu-ray Disc Java support library') fi options=(!libtool) source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha512sums=('a27eaa929ef05c544beb966a24dfc5425546d6035bfb3e86dc60987b8a4761031ce27c3836a64f71cc76b5308c3cd75efb3bc1f238185819385477e64883888a') +sha512sums=('b84fd172523facb207134bb1fee09c7f65914d22f6120fbfd6f312f0435229f3b110e8cc8ea121159929cda3760cfac4b52f84de39d0fb976f8c88d1f7e6d278') build() { cd "$pkgname-$pkgver" diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD index 63ac30c66..2539d70f4 100644 --- a/extra/libdmapsharing/PKGBUILD +++ b/extra/libdmapsharing/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 148816 2012-02-05 11:51:38Z ibiru $ +# $Id: PKGBUILD 167260 2012-09-29 13:02:54Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> + pkgname=libdmapsharing -pkgver=2.9.12 -pkgrel=2 +pkgver=2.9.15 +pkgrel=1 pkgdesc="A library that implements the DMAP family of protocols" arch=('i686' 'x86_64' 'mips64el') url="http://www.flyn.org/projects/libdmapsharing/index.html" license=('LGPL2.1') depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2') options=('!libtool') -source=(http://www.flyn.org/projects/libdmapsharing/${pkgname}-${pkgver}.tar.gz) -md5sums=('ec34948df21e9ba0656c917b10fed1c3') +source=(http://www.flyn.org/projects/libdmapsharing/$pkgname-$pkgver.tar.gz) +md5sums=('52c9e4d3de931d9013eeaccf7371bb2d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --with-mdns=avahi make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD index f30ccee91..be088182b 100644 --- a/extra/libtasn1/PKGBUILD +++ b/extra/libtasn1/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160686 2012-06-03 18:36:06Z andyrtr $ +# $Id: PKGBUILD 167197 2012-09-27 15:53:17Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=libtasn1 -pkgver=2.13 +pkgver=2.14 pkgrel=1 pkgdesc="The ASN.1 library used in GNUTLS" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('glibc' 'texinfo') options=('!libtool') install=libtasn1.install source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha1sums=('89120584bfedd244dab92df99e955a174c481851' - '2f9ce2aef6c1bd78f462e95de531b2b61f59d13c') +sha1sums=('22f9e0b15f870c8e03ac9cc1ead969d4d84eb931' + 'cd6fdde4f59f7c24eb738896904034f17ab490f2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 485d32204..7960dd2d6 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166690 2012-09-15 17:24:11Z giovanni $ +# $Id: PKGBUILD 167205 2012-09-27 23:00:52Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.09.13 +pkgver=2012.09.27 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=('33ffc8df7f07a6db0e923d73dfdc0547') +md5sums=('a587166b7830f1be4b829c2bf84ac195') build() { cd ${srcdir}/live diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 7b61e3dff..a7148b661 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166364 2012-09-06 22:13:20Z andrea $ +# $Id: PKGBUILD 167246 2012-09-29 09:32:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.27 -pkgrel=4 +pkgver=5.5.28 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="https://www.mysql.com/products/community/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service') -md5sums=('82baf46acfced6eef072e9d8a479c86e' +md5sums=('da8ddb3d00e6e159153d2444360f52a8' 'e7eb2faeab755cbb2fe03542bf328da9' '1c949c0dbea5206af0db14942d9927b6' '6ea6ceb360d09a774e87335ee098ddd5' diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index 934a89d95..e80bd360c 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166525 2012-09-09 15:41:23Z heftig $ +# $Id: PKGBUILD 167256 2012-09-29 12:54:29Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=openconnect -pkgver=4.06 +pkgver=4.07 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" @@ -13,7 +13,7 @@ depends=('libxml2' 'openssl' 'libproxy' 'vpnc') makedepends=('intltool') options=('!libtool' '!emptydirs') source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('e827c9d08bd4d6983e3cbd0c9c19b978') +md5sums=('61f26e7936d8b26c0f7e8119b7ef84b2') build() { cd $pkgname-$pkgver diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 680247643..f2f20250a 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166954 2012-09-23 09:22:55Z andrea $ +# $Id: PKGBUILD 167191 2012-09-27 12:38:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.3 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -21,7 +21,8 @@ source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'qtconfig.desktop' 'improve-cups-support.patch' 'fix-crash-in-assistant.patch' - 'undo-fix-jit-crash-on-x86_64.patch') + 'undo-fix-jit-crash-on-x86_64.patch' + 'disable-ssl-compression.patch') md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' @@ -29,7 +30,8 @@ md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b' '6b771c8a81dd90b45e8a79afa0e5bbfd' 'c439c7731c25387352d8453ca7574971' '57590084078b6379f0501f7728b02ae2' - '094e5a4e30e52423c77daa4a9c782df5') + '094e5a4e30e52423c77daa4a9c782df5' + '94e9e433342018bf35e8d6d968b7432c') build() { cd "${srcdir}"/${_pkgfqn} @@ -45,6 +47,9 @@ build() { # (FS#31654) patch -Rp1 -i "${srcdir}"/undo-fix-jit-crash-on-x86_64.patch + + # Security fix + patch -p1 -i "${srcdir}"/disable-ssl-compression.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} diff --git a/extra/qt/disable-ssl-compression.patch b/extra/qt/disable-ssl-compression.patch new file mode 100644 index 000000000..443af57f3 --- /dev/null +++ b/extra/qt/disable-ssl-compression.patch @@ -0,0 +1,68 @@ +From d41dc3e101a694dec98d7bbb582d428d209e5401 Mon Sep 17 00:00:00 2001 +From: Richard Moore <rich@kde.org> +Date: Fri, 14 Sep 2012 00:13:08 +0100 +Subject: [PATCH] Disable SSL compression by default. + +Disable SSL compression by default since this appears to be the a likely +cause of the currently hyped CRIME attack. + +This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74 + +Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +Reviewed-by: Peter Hartmann <phartmann@rim.com> +--- + src/network/ssl/qssl.cpp | 5 +++-- + src/network/ssl/qsslconfiguration.cpp | 4 +++- + src/network/ssl/qsslconfiguration_p.h | 4 +++- + 3 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp +index 49e086f..9578178 100644 +--- a/src/network/ssl/qssl.cpp ++++ b/src/network/ssl/qssl.cpp +@@ -148,8 +148,9 @@ QT_BEGIN_NAMESPACE + + By default, SslOptionDisableEmptyFragments is turned on since this causes + problems with a large number of servers. SslOptionDisableLegacyRenegotiation +- is also turned on, since it introduces a security risk. The other options +- are turned off. ++ is also turned on, since it introduces a security risk. ++ SslOptionDisableCompression is turned on to prevent the attack publicised by ++ CRIME. The other options are turned off. + + Note: Availability of above options depends on the version of the SSL + backend in use. +diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp +index 24c7b77..3a05f54 100644 +--- a/src/network/ssl/qsslconfiguration.cpp ++++ b/src/network/ssl/qsslconfiguration.cpp +@@ -201,7 +201,9 @@ bool QSslConfiguration::isNull() const + d->privateKey.isNull() && + d->peerCertificate.isNull() && + d->peerCertificateChain.count() == 0 && +- d->sslOptions == (QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation)); ++ d->sslOptions == ( QSsl::SslOptionDisableEmptyFragments ++ |QSsl::SslOptionDisableLegacyRenegotiation ++ |QSsl::SslOptionDisableCompression)); + } + + /*! +diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h +index 74f17cd..c36b651 100644 +--- a/src/network/ssl/qsslconfiguration_p.h ++++ b/src/network/ssl/qsslconfiguration_p.h +@@ -83,7 +83,9 @@ public: + : protocol(QSsl::SecureProtocols), + peerVerifyMode(QSslSocket::AutoVerifyPeer), + peerVerifyDepth(0), +- sslOptions(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation) ++ sslOptions(QSsl::SslOptionDisableEmptyFragments ++ |QSsl::SslOptionDisableLegacyRenegotiation ++ |QSsl::SslOptionDisableCompression) + { } + + QSslCertificate peerCertificate; +-- +1.7.10 + diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD index 99354e815..530a9925c 100644 --- a/extra/quota-tools/PKGBUILD +++ b/extra/quota-tools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 163746 2012-07-18 22:38:58Z eric $ +# $Id: PKGBUILD 167201 2012-09-27 19:22:41Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=quota-tools -pkgver=4.00 +pkgver=4.01 pkgrel=1 epoch=1 pkgdesc="Tools to manage kernel-level quotas in Linux" @@ -12,21 +12,20 @@ license=('GPL' 'BSD') depends=('e2fsprogs') backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins') options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz \ - LICENSE) -sha1sums=('9ef79933bebfd80f007600fd422616ad161c5fd0' - '57297bdc9e638c500506169bbbe12eb89bcf7d07') +source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz) +sha1sums=('64d2ab8b039cfea1aa4bd9e77e8c373488a7f0bf') build() { cd "${srcdir}/${pkgname}" ./configure --prefix=/usr --sysconfdir=/etc - make RPCGEN="rpcgen -Y /usr/bin" + make } package() { cd "${srcdir}/${pkgname}" make ROOTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -d "${pkgdir}/usr/share/licenses/${pkgname}" + head -33 quota.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # remove conflicts with glibc rm "${pkgdir}"/usr/include/rpcsvc/rquota.{h,x} diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD index 991393c27..5ef75191f 100644 --- a/extra/smplayer/PKGBUILD +++ b/extra/smplayer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155837 2012-04-07 09:33:18Z ibiru $ +# $Id: PKGBUILD 167263 2012-09-29 13:32:07Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> # Contributor: shamrok <szamrok@gmail.com> pkgname=smplayer -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ license=('GPL') depends=('qt' 'mplayer') install=smplayer.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('8f7d3a9c116e956c68976d0e5dbb83dd') +md5sums=('39556a6113afcd9ceee071a8f85477dc') build() { cd "$pkgname-$pkgver" diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index a4ad2997d..cc5acc17c 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166956 2012-09-23 09:55:03Z tomegun $ +# $Id: PKGBUILD 167235 2012-09-29 06:58:03Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.61 -pkgrel=4 +pkgver=2.71 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') @@ -71,7 +71,7 @@ package_transmission-qt() { install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png" install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop" } -md5sums=('2ed5b7815ebda65223bac6bdb09dec42' +md5sums=('26d24de210076a7625e5fe37e3252f2a' '7d6186ee2a852ae3d44980f05063e194' 'db72b02fee139e8ab416324e6c044d76' '5c289c8901221a94be74665368ab5c2c' diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index 568c7ed07..4826ccb6e 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164344 2012-07-31 02:24:37Z bisson $ +# $Id: PKGBUILD 167322 2012-10-01 01:53:47Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' @@ -17,7 +17,7 @@ optdepends=('qt: immodule and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('705c785a626ac0b498547aef5b8ff9b57f08259e') +sha1sums=('4f63836935051d52b9194572afb904892fe89595') install=install diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD index b294040a7..33e1931ab 100644 --- a/extra/usermin/PKGBUILD +++ b/extra/usermin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 140170 2011-10-08 10:02:07Z tpowa $ +# $Id: PKGBUILD 167307 2012-09-30 20:46:00Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=usermin -pkgver=1.490 +pkgver=1.520 pkgrel=1 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding" arch=(i686 x86_64 'mips64el') @@ -124,6 +124,6 @@ build() { #install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE } -md5sums=('a6d87aad595ea8abbe6639ce2c08efc1' +md5sums=('5819ba87796d9373a92116e90d1a35d4' 'cfef4490cd1ef9517c0b39a7bd75c968' 'ec37a79f948f778224550930d2a7ca07') diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index a02ba16ce..d06fb07c6 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165525 2012-08-22 19:38:08Z giovanni $ +# $Id: PKGBUILD 167285 2012-09-30 02:21:52Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -14,7 +14,7 @@ depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms' 'ttf-freefont') + 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'fluidsynth' 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' @@ -47,7 +47,9 @@ optdepends+=('libcaca: for colored ASCII art video output' 'libmtp: for MTP devices support' 'fluidsynth: for synthesizer MIDI FluidSynth' 'smbclient: for SMB access plugin' - 'libcdio: for audio CD playback support') + 'libcdio: for audio CD playback support' + 'ttf-freefont: for subtitle font ' + 'ttf-dejavu: for subtitle font') conflicts=('vlc-plugin') replaces=('vlc-plugin') backup=('usr/share/vlc/lua/http/.hosts' diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD index f667d8d4a..94fbb3a7e 100644 --- a/extra/webmin/PKGBUILD +++ b/extra/webmin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164995 2012-08-08 06:41:05Z tpowa $ +# $Id: PKGBUILD 167305 2012-09-30 19:42:57Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.590 -pkgrel=2 +pkgver=1.600 +pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64 'mips64el') license=('custom:webmin') @@ -214,7 +214,7 @@ build() { # install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE } -md5sums=('815005ed7f208dcfbda5308b446779c2' +md5sums=('8a9124bdd180aeec13fc16fa75fb1419' '43a77243acd519c4efe9577090b59912' 'bfebb75bb94029b48c46b7f1ba1aa811' 'c77dfcd621b417a7826d25f56a1e60ae' diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index 087d46185..3dff9dc7a 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160654 2012-06-03 08:20:42Z giovanni $ +# $Id: PKGBUILD 167283 2012-09-30 00:48:04Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.3.8 +pkgver=0.3.9 pkgrel=1 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') options=('!libtool') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c07047eca33c176df25e94964bdec7bf') +md5sums=('e981a357378e6ea97c91d8cb6a023da6') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD index 865b31771..79c9a9917 100644 --- a/extra/xf86-video-mga/PKGBUILD +++ b/extra/xf86-video-mga/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 163651 2012-07-17 16:31:39Z andyrtr $ +# $Id: PKGBUILD 167227 2012-09-28 19:49:02Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mga -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="X.org mga video driver" arch=(i686 x86_64) @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6a70f5015f822eef82a18eedf3d3ee5fdfa81f1c0e701103ab837ffbd61aa4b4') +sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD index e9b5ecbfe..31c15e8a5 100644 --- a/extra/xf86-video-r128/PKGBUILD +++ b/extra/xf86-video-r128/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 163655 2012-07-17 16:35:34Z andyrtr $ +# $Id: PKGBUILD 167229 2012-09-28 19:51:26Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-r128 -pkgver=6.8.4 +pkgver=6.9.1 pkgrel=1 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64) @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6fbfbba2589c1daf45f048009d6521bb687adbdf2f695eb961b316ce68935cd7') +sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 0f4b7c211..2a42af223 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162381 2012-06-26 16:12:16Z andyrtr $ +# $Id: PKGBUILD 167270 2012-09-29 15:04:11Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=281 +pkgver=282 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('bca2eb95bdd57653f8e3f2f57952c1c5' +md5sums=('eeac090c7e56ea573f7691d382a59968' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/gnome-unstable/clutter-gst/PKGBUILD b/gnome-unstable/clutter-gst/PKGBUILD index 78c557bed..ce2d5b634 100644 --- a/gnome-unstable/clutter-gst/PKGBUILD +++ b/gnome-unstable/clutter-gst/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167009 2012-09-24 18:09:58Z jgc $ +# $Id: PKGBUILD 167163 2012-09-26 17:32:54Z jgc $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=1.9.90 +pkgver=1.9.92 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('clutter' 'gst-plugins-base-libs' 'libxdamage') makedepends=('gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4b05f2d282baf308e6f2e480da5fe05d0755569778caf4c320a2d47cfc682a2d') +sha256sums=('5c09dce218f711a44bd4d741e2dd10ffc47e7fcd7b0cf514ca0e92b825c76c45') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gcalctool/PKGBUILD b/gnome-unstable/gcalctool/PKGBUILD new file mode 100644 index 000000000..0fa8e119e --- /dev/null +++ b/gnome-unstable/gcalctool/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167268 2012-09-29 15:00:51Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=gcalctool +pkgver=6.6.0 +pkgrel=1 +pkgdesc="GNOME Scientific calculator" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'dconf') +makedepends=('intltool' 'yelp-tools') +groups=('gnome-extra') +options=(!emptydirs) +url="http://www.gnome.org" +install=gcalctool.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('0d2e0729be42e3ee06ea7d02fa6a00446df6e4de601745bcbbef53a027f9542e') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \ + --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/gcalctool/gcalctool.install b/gnome-unstable/gcalctool/gcalctool.install new file mode 100644 index 000000000..2ef26aaa9 --- /dev/null +++ b/gnome-unstable/gcalctool/gcalctool.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/gdl/PKGBUILD b/gnome-unstable/gdl/PKGBUILD new file mode 100644 index 000000000..5a7581c18 --- /dev/null +++ b/gnome-unstable/gdl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 167319 2012-09-30 23:30:44Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gdl +pkgver=3.6.0 +pkgrel=1 +pkgdesc="GNOME Docking Library" +arch=(i686 x86_64) +license=('GPL') +url="http://www.gnome.org/" +depends=('gtk3') +makedepends=('gtk-doc' 'intltool' 'gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('32a04fc96667e2f7ca1e3c853b996da3e62f4811b2a90d62cb2081f68aeecac3') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gdm/PKGBUILD b/gnome-unstable/gdm/PKGBUILD new file mode 100644 index 000000000..b5f9b5f14 --- /dev/null +++ b/gnome-unstable/gdm/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 167181 2012-09-26 20:17:35Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gdm +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Gnome Display Manager" +arch=(i686 x86_64) +license=(GPL) +url="http://www.gnome.org" +backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment + etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf) +groups=(gnome) +options=('!libtool') +depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd + xorg-xrdb nss polkit-gnome) +makedepends=(itstool intltool gnome-doc-utils xorg-server gobject-introspection) +optdepends=('gnome-shell: new login interface' + 'fprintd: fingerprint authentication') +install=gdm.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + fix_external_program_directories.patch) +sha256sums=('ea63736fc8f7234aca442f4e99b3ba9cc29dce5e464ed93f7bf7eb8c49abd60b' + 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2') + +build() { + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix_external_program_directories.patch" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/gdm \ + --localstatedir=/var \ + --disable-static \ + --disable-schemas-compile \ + --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ + --with-check-accelerated-directory=/usr/lib/gnome-session \ + --with-authentication-agent-directory=/usr/lib/polkit-gnome \ + --without-tcp-wrappers \ + --without-console-kit \ + --with-systemd \ + --with-default-pam-config=exherbo + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make -j1 # race condition building gdm-client.c, does not wait for gdm-client-glue.h +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + chmod 1770 "$pkgdir/var/log/gdm" + chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" + rm -r "$pkgdir/var/run" "$pkgdir/var/gdm" +} diff --git a/gnome-unstable/gdm/fix_external_program_directories.patch b/gnome-unstable/gdm/fix_external_program_directories.patch new file mode 100644 index 000000000..5e51a776f --- /dev/null +++ b/gnome-unstable/gdm/fix_external_program_directories.patch @@ -0,0 +1,12 @@ +diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c +--- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:05.304823391 +0000 ++++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:17.004732251 +0000 +@@ -131,7 +131,7 @@ + ret = FALSE; + + error = NULL; +- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); ++ g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error); + if (error != NULL) { + g_warning ("Error starting settings daemon: %s", error->message); + g_error_free (error); diff --git a/gnome-unstable/gdm/gdm.install b/gnome-unstable/gdm/gdm.install new file mode 100644 index 000000000..c48faf4ae --- /dev/null +++ b/gnome-unstable/gdm/gdm.install @@ -0,0 +1,30 @@ +pkgname=gdm + +post_install() { + getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm + getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm + passwd -l gdm > /dev/null + chown -R gdm:gdm /var/lib/gdm > /dev/null + + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + dconf update +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then + gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas + dconf update + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + getent passwd gdm >/dev/null 2>&1 && userdel gdm + getent group gdm >/dev/null 2>&1 && groupdel gdm +} diff --git a/gnome-unstable/gnome-dictionary/PKGBUILD b/gnome-unstable/gnome-dictionary/PKGBUILD new file mode 100644 index 000000000..0e231bf4a --- /dev/null +++ b/gnome-unstable/gnome-dictionary/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 167175 2012-09-26 18:55:05Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=gnome-dictionary +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Look up words in dictionary sources" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3') +makedepends=('intltool' 'itstool' 'docbook-xsl') +install=$pkgname.install +options=(!libtool) +groups=('gnome-extra') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-dictionary/gnome-dictionary.install b/gnome-unstable/gnome-dictionary/gnome-dictionary.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/gnome-unstable/gnome-dictionary/gnome-dictionary.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-games/PKGBUILD b/gnome-unstable/gnome-games/PKGBUILD new file mode 100644 index 000000000..cce30bd0a --- /dev/null +++ b/gnome-unstable/gnome-games/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 167161 2012-09-26 17:29:17Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-games +pkgver=3.6.0.2 +pkgrel=1 +pkgdesc="Some Games for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') +makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala') +options=('!emptydirs' '!libtool') +install=gnome-games.install +url="http://www.gnome.org" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('353b416dd86e2b6f323d28011c9b478b9848fabc5686a2e01bbd35e36402ed2c') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static --disable-schemas-compile \ + --with-scores-user=root --with-scores-group=games \ + --enable-introspection=yes + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # Remove all scores, we generate them from postinstall + rm -rf "$pkgdir/var" + + sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku" +} diff --git a/gnome-unstable/gnome-games/gnome-games.install b/gnome-unstable/gnome-games/gnome-games.install new file mode 100644 index 000000000..2fad5db0b --- /dev/null +++ b/gnome-unstable/gnome-games/gnome-games.install @@ -0,0 +1,122 @@ +_scores=(glines.Small.scores + glines.Medium.scores + glines.Large.scores + gnibbles.4.0.scores + gnibbles.3.0.scores + gnibbles.2.0.scores + gnibbles.1.0.scores + gnibbles.4.1.scores + gnibbles.3.1.scores + gnibbles.2.1.scores + gnibbles.1.1.scores + gnobots2.robots2.scores + gnobots2.robots2-safe.scores + gnobots2.robots2-super-safe.scores + gnobots2.robots2_easy.scores + gnobots2.robots2_easy-safe.scores + gnobots2.robots2_easy-super-safe.scores + gnobots2.classic_robots.scores + gnobots2.classic_robots-safe.scores + gnobots2.classic_robots-super-safe.scores + gnobots2.robots_with_safe_teleport.scores + gnobots2.robots_with_safe_teleport-safe.scores + gnobots2.robots_with_safe_teleport-super-safe.scores + gnobots2.nightmare.scores + gnobots2.nightmare-safe.scores + gnobots2.nightmare-super-safe.scores + gnomine.Small.scores + gnomine.Medium.scores + gnomine.Large.scores + gnomine.Custom.scores + gnotravex.2x2.scores + gnotravex.3x3.scores + gnotravex.4x4.scores + gnotravex.5x5.scores + gnotravex.6x6.scores + gnotski.1.scores + gnotski.2.scores + gnotski.3.scores + gnotski.4.scores + gnotski.5.scores + gnotski.6.scores + gnotski.7.scores + gnotski.8.scores + gnotski.9.scores + gnotski.10.scores + gnotski.11.scores + gnotski.12.scores + gnotski.13.scores + gnotski.14.scores + gnotski.15.scores + gnotski.16.scores + gnotski.17.scores + gnotski.18.scores + gnotski.19.scores + gnotski.20.scores + gnotski.21.scores + gnotski.22.scores + gnotski.23.scores + gnotski.24.scores + gnotski.25.scores + gnotski.26.scores + gnotski.27.scores + gnotski.28.scores + gnotski.29.scores + gnotski.30.scores + gnotski.31.scores + gnotski.32.scores + gnotski.33.scores + gnotski.34.scores + gnotski.35.scores + gnotski.36.scores + gnotski.37.scores + gtali.Regular.scores + gtali.Colors.scores + gnome-mahjongg.easy.scores + gnome-mahjongg.difficult.scores + gnome-mahjongg.confounding.scores + gnome-mahjongg.pyramid.scores + gnome-mahjongg.tictactoe.scores + gnome-mahjongg.cloud.scores + gnome-mahjongg.dragon.scores + gnome-mahjongg.bridges.scores + gnome-mahjongg.ziggurat.scores + quadrapassel.scores + swell-foop.small.scores + swell-foop.normal.scores + swell-foop.large.scores) + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + if [ -e "var/games/$score" ]; then + continue + fi + + touch "var/games/$score" + chown root:games "var/games/$score" + chmod 664 "var/games/$score" + done +} + +pre_upgrade() { + (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games + return 0 +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f -t usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + rm -f "var/games/$score" + done +} diff --git a/gnome-unstable/gnome-screensaver/PKGBUILD b/gnome-unstable/gnome-screensaver/PKGBUILD new file mode 100644 index 000000000..921bcaf1f --- /dev/null +++ b/gnome-unstable/gnome-screensaver/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 167171 2012-09-26 18:49:51Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=gnome-screensaver +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Screensaver designed to integrate well with the GNOME desktop." +arch=('i686' 'x86_64') +license=('GPL') +url="http://live.gnome.org/GnomeScreensaver" +backup=(etc/pam.d/gnome-screensaver) +depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd') +makedepends=('pkgconfig' 'intltool' 'libxss') +groups=('gnome') +options=(!emptydirs) +install=gnome-screensaver.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gnome-screensaver.pam) +sha256sums=('4c6579edb764a1108f7ce374a901797cf1de666113fcdc51642d805ff16c5c26' + 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-screensaver \ + --localstatedir=/var \ + --with-mit-ext --with-systemd + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver" +} diff --git a/gnome-unstable/gnome-screensaver/gnome-screensaver.install b/gnome-unstable/gnome-screensaver/gnome-screensaver.install new file mode 100644 index 000000000..d1a42c6ce --- /dev/null +++ b/gnome-unstable/gnome-screensaver/gnome-screensaver.install @@ -0,0 +1,7 @@ +pkgname=gnome-screensaver + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + gconfpkg --uninstall ${pkgname} + fi +} diff --git a/gnome-unstable/gnome-screensaver/gnome-screensaver.pam b/gnome-unstable/gnome-screensaver/gnome-screensaver.pam new file mode 100644 index 000000000..453dae646 --- /dev/null +++ b/gnome-unstable/gnome-screensaver/gnome-screensaver.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth required pam_unix_auth.so nullok +auth optional pam_gnome_keyring.so diff --git a/gnome-unstable/grilo-plugins/PKGBUILD b/gnome-unstable/grilo-plugins/PKGBUILD new file mode 100644 index 000000000..2c518a867 --- /dev/null +++ b/gnome-unstable/grilo-plugins/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 167313 2012-09-30 23:18:47Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=grilo-plugins +pkgver=0.2.0 +pkgrel=1 +pkgdesc="Plugins for Grilo" +url="http://www.gnome.org" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('grilo') +makedepends=(gupnp-av libgdata libquvi sqlite gmime libgcrypt rest libtracker-sparql + totem-plparser gnome-common) +optdepends=('gupnp-av: uPnP plugin' + 'libgdata: Youtube plugin' + 'libquvi: Youtube plugin' + 'sqlite: Podcasts plugin' + 'gmime: Podcasts plugin' + 'sqlite: Bookmarks plugin' + 'sqlite: Metadata store plugin' + 'libgcrypt: Vimeo plugin' + 'rest: Blip.tv plugin' + 'libtracker-sparql: Tracker plugin' + 'totem-plparser: Optical media plugin') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('86ecabe5b34a15e9c00285b599461e7eb590e2fff0a8b284157b789b192db4f7') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ + --enable-shoutcast + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/grilo/PKGBUILD b/gnome-unstable/grilo/PKGBUILD new file mode 100644 index 000000000..63828fe1d --- /dev/null +++ b/gnome-unstable/grilo/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 167311 2012-09-30 23:10:51Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=grilo +pkgver=0.2.0 +pkgrel=1 +pkgdesc="Framework that provides access to various sources of multimedia content" +url="http://www.gnome.org" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gtk3' 'libxml2' 'libsoup') +makedepends=('gobject-introspection' 'gtk-doc' 'vala') +optdepends=('grilo-plugins: Plugins for grilo') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('daab3104684dd1a347aa3f3bc8e5a435f57829f594d951890692b9035c993d1f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --disable-static --disable-debug + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/libgnomekbd/PKGBUILD b/gnome-unstable/libgnomekbd/PKGBUILD new file mode 100644 index 000000000..2c7afa73b --- /dev/null +++ b/gnome-unstable/libgnomekbd/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 167169 2012-09-26 18:42:15Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libgnomekbd +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Gnome keyboard library" +url="http://gswitchit.sourceforge.net" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('libxklavier' 'gtk3' 'dconf') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool' '!emptydirs') +install=libgnomekbd.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/libgnomekbd/libgnomekbd.install b/gnome-unstable/libgnomekbd/libgnomekbd.install new file mode 100644 index 000000000..a3d820459 --- /dev/null +++ b/gnome-unstable/libgnomekbd/libgnomekbd.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/networkmanager/NetworkManager.conf b/gnome-unstable/networkmanager/NetworkManager.conf new file mode 100644 index 000000000..c37b59680 --- /dev/null +++ b/gnome-unstable/networkmanager/NetworkManager.conf @@ -0,0 +1,2 @@ +[main] +plugins=keyfile diff --git a/gnome-unstable/networkmanager/PKGBUILD b/gnome-unstable/networkmanager/PKGBUILD new file mode 100644 index 000000000..ebc84c67d --- /dev/null +++ b/gnome-unstable/networkmanager/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 167248 2012-09-29 10:55:58Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Maintainer: Jan de Groot <jgc@archlinxu.org> +# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Tor Krill <tor@krill.nu> +# Contributor: Will Rea <sillywilly@gmail.com> +# Contributor: Valentine Sinitsyn <e_val@inbox.ru> + +pkgname=networkmanager +_pkgname=NetworkManager +pkgver=0.9.6.0 +pkgrel=3 +pkgdesc="Network Management daemon" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/$_pkgname/" +depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient + libsoup systemd) +makedepends=(intltool dhcpcd iptables gobject-introspection) +optdepends=('modemmanager: for modem management service' + 'dhcpcd: alternative DHCP client; does not support DHCPv6' + 'iptables: Connection sharing' + 'dnsmasq: Connection sharing' + 'bluez: Bluetooth support' + 'openresolv: resolvconf support') +options=('!libtool') +backup=('etc/NetworkManager/NetworkManager.conf') +install=networkmanager.install +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch + nm-polkit-permissive.patch repair-signals.patch) +sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07' + '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' + 'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06' + 'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6') + +build() { + cd $_pkgname-$pkgver + + patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../dnsmasq-path.patch + patch -Np1 -i ../nm-polkit-permissive.patch + patch -Np1 -i ../repair-signals.patch # FS#31115 + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --with-crypto=nss \ + --with-distro=arch \ + --with-dhclient=/usr/sbin/dhclient \ + --with-dhcpcd=/usr/sbin/dhcpcd \ + --with-iptables=/usr/sbin/iptables \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-udev-dir=/usr/lib/udev \ + --with-resolvconf=/usr/sbin/resolvconf \ + --with-session-tracking=systemd \ + --disable-static \ + --enable-more-warnings=no \ + --disable-wimax + + make +} + +package() { + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" + + rm -r "$pkgdir/var/run" +} diff --git a/gnome-unstable/networkmanager/disable_set_hostname.patch b/gnome-unstable/networkmanager/disable_set_hostname.patch new file mode 100644 index 000000000..ee95dd0e1 --- /dev/null +++ b/gnome-unstable/networkmanager/disable_set_hostname.patch @@ -0,0 +1,19 @@ +diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c +--- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000 ++++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000 +@@ -302,6 +302,7 @@ + return; + } + ++#if 0 + /* Try automatically determined hostname from the best device's IP config */ + if (!best4) + best4 = get_best_ip4_device (policy->manager, &best_req4); +@@ -356,6 +357,7 @@ + } + } + ++#endif + /* If no automatically-configured hostname, try using the hostname from + * when NM started up. + */ diff --git a/gnome-unstable/networkmanager/dnsmasq-path.patch b/gnome-unstable/networkmanager/dnsmasq-path.patch new file mode 100644 index 000000000..c0e713266 --- /dev/null +++ b/gnome-unstable/networkmanager/dnsmasq-path.patch @@ -0,0 +1,30 @@ +diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c +--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 +@@ -52,8 +52,11 @@ + find_dnsmasq (void) + { + static const char *paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; +diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c +--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 +@@ -170,8 +170,11 @@ + nm_find_dnsmasq (void) + { + static const char *dnsmasq_binary_paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; diff --git a/gnome-unstable/networkmanager/networkmanager.install b/gnome-unstable/networkmanager/networkmanager.install new file mode 100644 index 000000000..de40c17ed --- /dev/null +++ b/gnome-unstable/networkmanager/networkmanager.install @@ -0,0 +1,9 @@ +post_upgrade() { + (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG +ATTENTION: + /etc/NetworkManager/nm-system-settings.conf has been replaced + by /etc/NetworkManager/NetworkManager.conf. Make sure you move + any custom settings to the new config file. +MSG + true +} diff --git a/gnome-unstable/networkmanager/nm-polkit-permissive.patch b/gnome-unstable/networkmanager/nm-polkit-permissive.patch new file mode 100644 index 000000000..1ac406224 --- /dev/null +++ b/gnome-unstable/networkmanager/nm-polkit-permissive.patch @@ -0,0 +1,12 @@ +diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in +--- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive 2011-03-24 14:21:35.100912222 -0500 ++++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in 2011-03-24 14:21:49.916726997 -0500 +@@ -95,7 +95,7 @@ + <_message>System policy prevents modification of network settings for all users</_message> + <defaults> + <allow_inactive>no</allow_inactive> +- <allow_active>auth_admin_keep</allow_active> ++ <allow_active>yes</allow_active> + </defaults> + </action> + diff --git a/gnome-unstable/networkmanager/repair-signals.patch b/gnome-unstable/networkmanager/repair-signals.patch new file mode 100644 index 000000000..cf1319dc5 --- /dev/null +++ b/gnome-unstable/networkmanager/repair-signals.patch @@ -0,0 +1,37 @@ +From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Thu, 13 Sep 2012 09:32:53 +0000 +Subject: core: wait until we daemonized before setting up signals (bgo #683932) + +If we mask signals before daemonizing, the daemon process will not be +able to handle them, and thus would be unkillable with anything other +than SIGKILL. +--- +diff --git a/src/main.c b/src/main.c +index 8bc6d3f..5b82cfa 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -401,10 +401,6 @@ main (int argc, char *argv[]) + exit (1); + } + +- /* Set up unix signal handling */ +- if (!setup_signals ()) +- exit (1); +- + /* Set locale to be able to use environment variables */ + setlocale (LC_ALL, ""); + +@@ -501,6 +497,10 @@ main (int argc, char *argv[]) + wrote_pidfile = TRUE; + } + ++ /* Set up unix signal handling - before creating threads, but after daemonizing! */ ++ if (!setup_signals ()) ++ exit (1); ++ + if (g_fatal_warnings) { + GLogLevelFlags fatal_mask; + +-- +cgit v0.9.0.2-2-gbebe diff --git a/gnome-unstable/polkit/fix-empty-wheel.patch b/gnome-unstable/polkit/fix-empty-wheel.patch new file mode 100644 index 000000000..d6f99c43d --- /dev/null +++ b/gnome-unstable/polkit/fix-empty-wheel.patch @@ -0,0 +1,47 @@ +From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001 +From: David Zeuthen <zeuthen@gmail.com> +Date: Tue, 18 Sep 2012 18:47:06 +0000 +Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty + +For example, this can happen if the wheel group has no members. This +was reported in Red Hat bug 834494, see + + https://bugzilla.redhat.com/show_bug.cgi?id=834494 + +Signed-off-by: David Zeuthen <zeuthen@gmail.com> +--- +diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c +index 1d4a555..3bd2f0b 100644 +--- a/src/polkitbackend/polkitbackendinteractiveauthority.c ++++ b/src/polkitbackend/polkitbackendinteractiveauthority.c +@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract + PolkitDetails *details) + { + PolkitBackendInteractiveAuthorityClass *klass; +- GList *ret; ++ GList *ret = NULL; + + klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority); + +- if (klass->get_admin_identities == NULL) +- { +- ret = g_list_prepend (NULL, polkit_unix_user_new (0)); +- } +- else ++ if (klass->get_admin_identities != NULL) + { + ret = klass->get_admin_identities (authority, + caller, +@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent *agent, + } + } + ++ /* Fall back to uid 0 if no users are available (rhbz #834494) */ ++ if (user_identities == NULL) ++ user_identities = g_list_prepend (NULL, polkit_unix_user_new (0)); ++ + session = authentication_session_new (agent, + cookie, + subject, +-- +cgit v0.9.0.2-2-gbebe diff --git a/gnome-unstable/telepathy-mission-control/PKGBUILD b/gnome-unstable/telepathy-mission-control/PKGBUILD new file mode 100644 index 000000000..fc5333e75 --- /dev/null +++ b/gnome-unstable/telepathy-mission-control/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 167244 2012-09-29 09:31:34Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Ju Liu <liuju86 at gmail dot com> +# Contributor: Bjorn Lindeijer <bjorn lindeijer nl> +# Contributor: Andreas Zwinkau <beza1e1@web.de> + +pkgname=telepathy-mission-control +pkgver=5.13.2 +pkgrel=1 +pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org/wiki/Mission Control" +license=('LGPL2.1') +depends=('telepathy-glib' 'libgnome-keyring' 'dconf' 'upower' 'networkmanager') +makedepends=('libxslt' 'python2') +install=telepathy-mission-control.install +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('3af60fa448b8fd56b65fac185a41f288') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy \ + --enable-gnome-keyring \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install b/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/zenity/PKGBUILD b/gnome-unstable/zenity/PKGBUILD new file mode 100644 index 000000000..2269a84c3 --- /dev/null +++ b/gnome-unstable/zenity/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 167165 2012-09-26 17:56:40Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=zenity +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Display graphical dialog boxes from shell scripts" +arch=(i686 x86_64) +license=('LGPL') +depends=('gtk3' 'libnotify') +makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('5de4ebbb6888ad4928fa9eebcd42dbe5bb282bee9dd7dd21475d9eaa854c74be') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index c4e72cfea..4c93e1c48 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -6,7 +6,7 @@ # We're getting this from Debian Experimental _debname=iceweasel -_debver=15.0 +_debver=15.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -30,8 +30,8 @@ options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('aa5a7f08f55a2b02a71c86f30ef75a25' - 'b93090724434e3801375730744e79950' +md5sums=('0936242388cd4c75930c1d2487e15216' + 'ce37c76476b8edf40780d00cf79d0d62' 'f2f4f4a573f549e8b494e33b3ad226bc' '27271ce647a83906ef7a24605e840d61' 'c52fac65c1e06290a5108b75c31ace79') diff --git a/multilib-testing/jack2-multilib/40-hpet-permissions.rules b/multilib-testing/jack2-multilib/40-hpet-permissions.rules new file mode 100644 index 000000000..7af3780f9 --- /dev/null +++ b/multilib-testing/jack2-multilib/40-hpet-permissions.rules @@ -0,0 +1,2 @@ +KERNEL=="rtc0", GROUP="audio" +KERNEL=="hpet", GROUP="audio" diff --git a/multilib-testing/jack2-multilib/99-audio.conf b/multilib-testing/jack2-multilib/99-audio.conf new file mode 100644 index 000000000..eb76ef920 --- /dev/null +++ b/multilib-testing/jack2-multilib/99-audio.conf @@ -0,0 +1,2 @@ +@audio - rtprio 99 +@audio - memlock unlimited diff --git a/multilib-testing/jack2-multilib/PKGBUILD b/multilib-testing/jack2-multilib/PKGBUILD new file mode 100644 index 000000000..e5b3d3b47 --- /dev/null +++ b/multilib-testing/jack2-multilib/PKGBUILD @@ -0,0 +1,158 @@ +# $Id: PKGBUILD 76737 2012-09-28 17:05:26Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: SpepS <dreamspepser at yahoo dot it> + +# This one is in response to a need for an equivalent to lib32-jack for +# jack2. A lib32-jack2 would require much patching and invading the pure +# jack2 package, and what's more, the buildsystem provides a flag just to +# build a hybrid jack2 in full. As such, we have opted to provide multilib +# users with a replacement package instead of the usual lib32 add-on. +# +# See http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html + +pkgbase=jack2-multilib +pkgname=('jack2-multilib' 'jack2-dbus-multilib') +#pkgname= # single build (overrides split) +_tarname=jack +pkgver=1.9.8 +pkgrel=4 +arch=('x86_64') +url="http://jackaudio.org/" +backup=(etc/security/limits.d/99-audio.conf) +license=('GPL') +makedepends=('python2' 'doxygen' 'libffado' + 'libsamplerate' 'lib32-dbus-core' 'lib32-celt' + 'gcc-multilib') +source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz" + '99-audio.conf' + '40-hpet-permissions.rules' + 'ffado_setbuffsize-jack2.patch') +md5sums=('1dd2ff054cab79dfc11d134756f27165' + 'ae65b7c9ebe0fff6c918ba9d97ae342d' + '471aad533ff56c5d3cbbf65ce32cadef' + '1502d82fe2276d6f224fff6467a0b6f9') + +_pyfix() { + sed -i 's:bin/env python:bin/env python2:' \ + "$pkgdir/usr/bin/jack_control" +} + +_wafconf() { + python2 waf configure --prefix=/usr \ + --alsa \ + --firewire \ + --mixed \ + --doxygen $@ +} + +_isbuild() { + printf "%s\n" ${pkgname[@]} | grep -qx $1 +} + +_mklinks() { + ln -s /usr/lib32/libjack.so.0.1.0 "$pkgdir/usr/lib32/libjack.so.0" + ln -s /usr/lib32/libjack.so.0 "$pkgdir/usr/lib32/libjack.so" +} + +build() { + cd "$srcdir/$_tarname-$pkgver" + + export LINKFLAGS="$LDFLAGS" + + # backport firewire stuff + # - needed for setbuffsize feature in latest stable ffado + # from https://github.com/jackaudio/jack2/commit/96e0251 + ( + cd $_tarname-$pkgver + patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch" + ) + + # Some optimisation bug exists for current GCC + # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 + export CFLAGS="${CFLAGS/-O[0-9]/-O0}" + export CXXFLAGS="$CFLAGS" + + # fix doxygen building + sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript + + # we may do 2 different builds + cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver + + # mixed dbus/classic build + if _isbuild jack2-multilib; then + cd $_tarname-$pkgver + msg2 "Running Mixed D-Bus/Classic build" + _wafconf --classic --dbus + python2 waf build $MAKEFLAGS + cd .. + fi + + # dbus-ONLY build + if _isbuild jack2-dbus-multilib; then + cd $_tarname-dbus-$pkgver + msg2 "Running D-Bus-only build" + _wafconf --dbus + python2 waf build $MAKEFLAGS + cd .. + fi +} + +package_jack2-multilib() { + ! _isbuild jack2-multilib && return 0 + + pkgdesc="The next-generation JACK with SMP support & mixed mode" + depends=('libsamplerate' 'lib32-celt' 'lib32-gcc-libs') + optdepends=('libffado: FireWire support' + 'lib32-dbus-core: jackdbus' + 'python2: jack_control') + conflicts=('jack' 'jack2' 'lib32-jack') + provides=('jack' 'jackmp' 'jackdmp' 'jackdbus' + 'jack2' 'lib32-jack' 'lib32-jack2') + + cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver" + + python2 waf install --destdir="$pkgdir" + + # fix for major python transition + _pyfix + + # configure realtime access/scheduling + # see https://bugs.archlinux.org/task/26343 + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" + + # should be done by upstream + # see http://trac.jackaudio.org/ticket/200 + _mklinks +} + +package_jack2-dbus-multilib() { + ! _isbuild jack2-dbus-multilib && return 0 + + pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)" + depends=('libsamplerate' 'lib32-celt' 'lib32-dbus-core' 'lib32-gcc-libs') + optdepends=('libffado: FireWire support' + 'python2: jack_control') + conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib') + provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus' + 'jack2-dbus' 'jack2-multilib' 'lib32-jack' 'lib32-jack2') + + cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver" + + python2 waf install --destdir="$pkgdir" + + _pyfix + + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" + + _mklinks +} + +# vim:set ts=2 sw=2 et: diff --git a/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch b/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch new file mode 100644 index 000000000..0c74aad24 --- /dev/null +++ b/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch @@ -0,0 +1,139 @@ +From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth <adi@drcomp.erfurt.thur.de> +Date: Sat, 17 Mar 2012 22:36:30 +0100 +Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size + +This is a port of Jonathan Woithe's patch from jackd1. +With sufficiently recent versions of FFADO, it allows to change +the buffersize at runtime. +--- + linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- + linux/firewire/JackFFADODriver.h | 6 ++++ + 2 files changed, 65 insertions(+), 6 deletions(-) + +diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp +index b33e1cd..085b78a 100644 +--- a/linux/firewire/JackFFADODriver.cpp ++++ b/linux/firewire/JackFFADODriver.cpp +@@ -3,6 +3,7 @@ + Copyright (C) 2004 Grame + Copyright (C) 2007 Pieter Palmers + Copyright (C) 2009 Devin Anderson ++Copyright (C) 2012 Jonathan Woithe, Adrian Knoth + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by +@@ -48,7 +49,10 @@ + namespace Jack + { + ++// Basic functionality requires API version 8. If version 9 or later ++// is present the buffers can be resized at runtime. + #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 ++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 + + #define jack_get_microseconds GetMicroSeconds + +@@ -281,19 +285,68 @@ + int + JackFFADODriver::SetBufferSize (jack_nframes_t nframes) + { +- printError("Buffer size change requested but not supported!!!"); ++ ffado_driver_t* driver = (ffado_driver_t*)fDriver; ++ signed int chn; ++ ++ // The speed of this function isn't critical; we can afford the ++ // time to check the FFADO API version. ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || ++ ffado_streaming_set_period_size == NULL) { ++ printError("unsupported on current version of FFADO; please upgrade FFADO"); ++ return -1; ++ } + +- /* + driver->period_size = nframes; + driver->period_usecs = + (jack_time_t) floor ((((float) nframes) / driver->sample_rate) + * 1000000.0f); +- */ ++ ++ ++ // Reallocate the null and scratch buffers. ++ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->nullbuffer == NULL) { ++ printError("could not allocate memory for null buffer"); ++ return -1; ++ } ++ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->scratchbuffer == NULL) { ++ printError("could not allocate memory for scratch buffer"); ++ return -1; ++ } ++ ++ // MIDI buffers need reallocating ++ for (chn = 0; chn < driver->capture_nchannels; chn++) { ++ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { ++ // setup the midi buffer ++ if (driver->capture_channels[chn].midi_buffer != NULL) ++ free(driver->capture_channels[chn].midi_buffer); ++ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ for (chn = 0; chn < driver->playback_nchannels; chn++) { ++ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { ++ if (driver->playback_channels[chn].midi_buffer != NULL) ++ free(driver->playback_channels[chn].midi_buffer); ++ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ ++ // Notify FFADO of the period size change ++ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { ++ printError("could not alter FFADO device period size"); ++ return -1; ++ } ++ ++ // This is needed to give the shadow variables a chance to ++ // properly update to the changes. ++ sleep(1); + + /* tell the engine to change its buffer size */ +- //driver->engine->set_buffer_size (driver->engine, nframes); ++ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails + +- return -1; // unsupported ++ UpdateLatencies(); ++ ++ return 0; + } + + typedef void (*JackDriverFinishFunction) (jack_driver_t *); +@@ -306,7 +359,7 @@ + + assert(params); + +- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { + printError("Incompatible libffado version! (%s)", ffado_get_version()); + return NULL; + } +diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h +index cb2a45d..790f4dd 100644 +--- a/linux/firewire/JackFFADODriver.h ++++ b/linux/firewire/JackFFADODriver.h +@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver + int Read(); + int Write(); + ++ // BufferSize can be changed ++ bool IsFixedBufferSize() ++ { ++ return false; ++ } ++ + int SetBufferSize(jack_nframes_t nframes); + }; + +-- +1.7.10 + diff --git a/pcr/ffmpeg-static/PKGBUILD b/pcr/ffmpeg-static/PKGBUILD new file mode 100644 index 000000000..592c4a7bf --- /dev/null +++ b/pcr/ffmpeg-static/PKGBUILD @@ -0,0 +1,61 @@ +# $Id$ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Paul Mattal <paul@archlinux.org> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=ffmpeg-static +pkgver=0.11.2 +pkgrel=1 +epoch=1 +pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library' +arch=(i686 x86_64 mips64el) +url=http://${pkgname%-static}.org/ +license=(GPL) +depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib) +makedepends=(yasm libvdpau) +provides=(${pkgname%-static}) +conflicts=(${pkgname%-static}) +source=(http://${pkgname%-static}.org/releases/${pkgname%-static}-$pkgver.tar.bz2) +md5sums=(93c1908022567b321df74db7214da6ac) + +build() { + cd ${pkgname%-static}-$pkgver + + ./configure \ + --prefix=/usr \ + --enable-libmp3lame \ + --enable-libvorbis \ + --enable-libxvid \ + --enable-libx264 \ + --enable-libvpx \ + --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ + --enable-postproc \ + --enable-shared \ + --enable-x11grab \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libschroedinger \ + --enable-libopenjpeg \ + --enable-librtmp \ + --enable-libpulse \ + --enable-libv4l2 \ + --enable-gpl \ + --enable-version3 \ + --enable-runtime-cpudetect \ + --disable-debug \ + --enable-static + make + make tools/qt-faststart + make doc/ff{mpeg,play,server}.1 +} + +package() { + cd ${pkgname%-static}-$pkgver + make DESTDIR="$pkgdir" install install-man + install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/pyalpm/PKGBUILD b/staging/pyalpm/PKGBUILD new file mode 100644 index 000000000..c9d420471 --- /dev/null +++ b/staging/pyalpm/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer : Rémy Oudompheng <remy@archlinux.org> + +pkgname=pyalpm +pkgver=0.5.3 +pkgrel=2 +pkgdesc="Libalpm bindings for Python 3" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/users/remy/pyalpm.git/" +license=('GPL') +depends=('python>=3.2' 'pacman>=4') +source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") +md5sums=('a76019106d17de3a5933c773013a63d1') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + python setup.py build +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + python setup.py install --root=${pkgdir} +} + diff --git a/staging/python/PKGBUILD b/staging/python/PKGBUILD new file mode 100644 index 000000000..ec300968b --- /dev/null +++ b/staging/python/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 167272 2012-09-29 16:34:59Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=python +pkgver=3.3.0 +pkgrel=1 +_pybasever=3.3 +pkgdesc="Next generation of the python high-level scripting language" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.python.org/" +depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') +makedepends=('tk' 'sqlite' 'valgrind') +optdepends=('tk: for tkinter' 'sqlite') +provides=('python3') +replaces=('python3') +options=('!makeflags') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) +sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a') + +build() { + cd "${srcdir}/Python-${pkgver}" + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --with-computed-gotos \ + --enable-ipv6 \ + --with-valgrind \ + --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ + --with-system-ffi + + make +} + +check() { + cd "${srcdir}/Python-${pkgver}" + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \ + test_urllib test_uuid test_pydoc +} + +package() { + cd "${srcdir}/Python-${pkgver}" + make DESTDIR="${pkgdir}" install maninstall + + # Why are these not done by default... + ln -sf python3 "${pkgdir}/usr/bin/python" + ln -sf python3-config "${pkgdir}/usr/bin/python-config" + ln -sf idle3 "${pkgdir}/usr/bin/idle" + ln -sf pydoc3 "${pkgdir}/usr/bin/pydoc" + ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1" + + # Fix FS#22552 + ln -sf ../../libpython${_pybasever}m.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so" + + # Clean-up reference to build directory + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile" + + # License + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/sip/PKGBUILD b/staging/sip/PKGBUILD new file mode 100644 index 000000000..b03e62351 --- /dev/null +++ b/staging/sip/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 167297 2012-09-30 16:56:26Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> + +pkgbase=sip +pkgname=('sip' 'python-sip' 'python2-sip') +pkgver=4.14 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.riverbankcomputing.com/software/sip/" +license=('custom:"sip"') +makedepends=('python' 'python2') +source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") +md5sums=('9a48ad975e04ac824188840ea498ac32') + +build() { + cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} + + cd ${pkgbase}-${pkgver} + python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" + make + + ### Python2 version ### + cd ../python2-${pkgbase}-${pkgver} + python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" + make +} + +package_sip() { + pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries" + depends=('glibc') + + cd ${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install -C sipgen + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_python-sip() { + pkgdesc="Python 3.x SIP bindings for C and C++ libraries" + depends=('sip' 'python') + + cd ${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install -C siplib + + install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_python2-sip() { + pkgdesc="Python 2.x SIP bindings for C and C++ libraries" + depends=('sip' 'python2') + + cd python2-${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install -C siplib + + install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py + install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch b/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch new file mode 100644 index 000000000..766dcb87f --- /dev/null +++ b/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch @@ -0,0 +1,124 @@ +From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Fri, 25 May 2012 19:43:24 -0400 +Subject: [PATCH] Reinstate TIMEOUT= handling + +This is mostly to deal with ipw2?00 drivers which have yet to be fixed +in the kernel. +--- + src/libudev/libudev-device.c | 19 +++++++++++++++++++ + src/libudev/libudev-private.h | 1 + + src/udev/udevd.c | 13 ++++++++++--- + 3 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index a8277d1..5966189 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -68,6 +68,7 @@ struct udev_device { + struct udev_list tags_list; + unsigned long long int seqnum; + unsigned long long int usec_initialized; ++ int timeout; + int devlink_priority; + int refcount; + dev_t devnum; +@@ -89,6 +90,21 @@ struct udev_device { + bool db_persist; + }; + ++int udev_device_get_timeout(struct udev_device *udev_device) ++{ ++ return udev_device->timeout; ++} ++ ++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) ++{ ++ char num[32]; ++ ++ udev_device->timeout = timeout; ++ snprintf(num, sizeof(num), "%u", timeout); ++ udev_device_add_property(udev_device, "TIMEOUT", num); ++ return 0; ++} ++ + /** + * udev_device_get_seqnum: + * @udev_device: udev device +@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, + + util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL); + udev_device_set_syspath(udev_device, path); ++ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { ++ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); + } else if (startswith(property, "SUBSYSTEM=")) { + udev_device_set_subsystem(udev_device, &property[10]); + } else if (startswith(property, "DEVTYPE=")) { +@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev) + udev_list_init(udev, &udev_device->sysattr_value_list, true); + udev_list_init(udev, &udev_device->sysattr_list, false); + udev_list_init(udev, &udev_device->tags_list, true); ++ udev_device->timeout = -1; + udev_device->watch_handle = -1; + /* copy global properties */ + udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) +diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h +index 4eb4a59..99aefeb 100644 +--- a/src/libudev/libudev-private.h ++++ b/src/libudev/libudev-private.h +@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); + void udev_device_set_is_initialized(struct udev_device *udev_device); + int udev_device_add_tag(struct udev_device *udev_device, const char *tag); + void udev_device_cleanup_tags_list(struct udev_device *udev_device); ++int udev_device_get_timeout(struct udev_device *udev_device); + unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); + void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); + int udev_device_get_devlink_priority(struct udev_device *udev_device); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 0d85960..cd24462 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -384,7 +384,7 @@ out: + } + } + +-static void event_run(struct event *event) ++static void event_run(struct event *event, bool force) + { + struct udev_list_node *loop; + +@@ -410,7 +410,7 @@ static void event_run(struct event *event) + return; + } + +- if (children >= children_max) { ++ if (!force && children >= children_max) { + if (children_max > 1) + log_debug("maximum number (%i) of children reached\n", children); + return; +@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev) + + event->state = EVENT_QUEUED; + udev_list_node_append(&event->node, &event_list); ++ ++ /* run all events with a timeout set immediately */ ++ if (udev_device_get_timeout(dev) > 0) { ++ event_run(event, true); ++ return 0; ++ } ++ + return 0; + } + +@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev) + if (is_devpath_busy(event)) + continue; + +- event_run(event); ++ event_run(event, false); + } + } + +-- +1.7.10.2 + diff --git a/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch new file mode 100644 index 000000000..9be6ef28f --- /dev/null +++ b/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch @@ -0,0 +1,30 @@ +From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 27 Sep 2012 20:48:13 -0400 +Subject: [PATCH] tmpfiles: restore previous behavior for F/f + +d4e9eb91ea changed the behavior for the F and f actions, wrongly sending +them to glob_item(). Restore the old behavior and shortcut straight to +write_one_file(). +--- + src/tmpfiles/tmpfiles.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index f10f908..bf900fa 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -673,6 +673,10 @@ static int create_item(Item *i) { + + case CREATE_FILE: + case TRUNCATE_FILE: ++ r = write_one_file(i, i->path); ++ if (r < 0) ++ return r; ++ break; + case WRITE_FILE: + r = glob_item(i, write_one_file); + if (r < 0) +-- +1.7.12.1 + diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD new file mode 100644 index 000000000..d29f4d172 --- /dev/null +++ b/staging/systemd/PKGBUILD @@ -0,0 +1,161 @@ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> + +pkgbase=systemd +pkgname=('systemd' 'systemd-sysvcompat') +pkgver=193 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2' 'LGPL2.1' 'MIT') +makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' + 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' + 'pam' 'python' 'quota-tools' 'xz') +options=('!libtool') +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + 'initcpio-hook-udev' + 'initcpio-install-udev' + 'initcpio-install-timestamp' + '0001-Reinstate-TIMEOUT-handling.patch' + '0001-tmpfiles-restore-previous-behavior-for-F-f.patch' + 'use-split-usr-path.patch') +md5sums=('732a9de2b1d2a15cab639c987ff9e90e' + 'e99e9189aa2f6084ac28b8ddf605aeb8' + '59e91c4d7a69b7bf12c86a9982e37ced' + 'df69615503ad293c9ddf9d8b7755282d' + '5543be25f205f853a21fa5ee68e03f0d' + '1f435290db227c3a4f4396f86819227e' + 'fd5b5f04ab0a847373d357555129d4c0') + +build() { + cd "$pkgname-$pkgver" + + # still waiting on ipw2x00, et al to get fixed... + patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" + + # hang onto this until we do the /{,s}bin merge + patch -Np1 <"$srcdir/use-split-usr-path.patch" + + # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0 + patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch" + + ./configure \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --enable-introspection \ + --enable-gtk-doc \ + --disable-audit \ + --disable-ima \ + --with-distro=arch \ + --with-usb-ids-path=/usr/share/hwdata/usb.ids \ + --with-pci-ids-path=/usr/share/hwdata/pci.ids + + make +} + +check() { + make -C "$pkgname-$pkgver" check +} + +package_systemd() { + pkgdesc="system and service manager" + depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' + 'pam' 'util-linux' 'xz') + provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('libsystemd' 'systemd-tools' 'udev') + conflicts=('libsystemd' 'systemd-tools' 'udev') + optdepends=('initscripts: legacy support for /etc/rc.conf' + 'python2-cairo: systemd-analyze' + 'python2-dbus: systemd-analyze' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'cryptsetup: required for encrypted block devices' + 'quota-tools: kernel-level quota management') + backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/logind.conf + etc/systemd/journald.conf + etc/udev/udev.conf) + install="systemd.install" + + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + install -dm755 "$pkgdir/bin" + ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" + + # move bash-completion and symlink for loginctl + install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ + "$pkgdir/usr/share/bash-completion/completions/systemctl" + ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" + rm -rf "$pkgdir/etc/bash_completion.d" + + # don't write units to /etc by default -- we'll enable this on post_install + # as a sane default + rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" + rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + + # get rid of RPM macros + rm -r "$pkgdir/etc/rpm" + + # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. + # https://pokersource.info/show_bug.cgi?id=50989 + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + + # the path to udevadm is hardcoded in some places + install -d "$pkgdir/sbin" + ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" + + # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? + ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" + + # add back tmpfiles.d/legacy.conf + install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + sed -i 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules + + # add mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" + install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" + install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" + + # XXX: kill off coredump rule until the journal can recover coredumps + rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" + + ### split out manpages for sysvcompat + rm -rf "$srcdir/_sysvcompat" + install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ + mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + "$srcdir"/_sysvcompat/usr/share/man/man8 +} + +package_systemd-sysvcompat() { + pkgdesc="sysvinit compat for systemd" + conflicts=('sysvinit' 'initscripts') + depends=('sysvinit-tools') + + # the initscripts conflict here isn't actually needed, but in order to make + # this package remove both sysvinit and initscripts, the initscripts conflict + # is needed. There's no case in which you would ever want initscripts installed + # without sysvinit, and vice versa, as in both cases, they are unusable. + + mv "$srcdir/_sysvcompat"/* "$pkgdir" + + install -dm755 "$pkgdir/sbin" + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + done + + ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" +} + +# vim: ft=sh syn=sh et diff --git a/staging/systemd/initcpio-hook-udev b/staging/systemd/initcpio-hook-udev new file mode 100644 index 000000000..75da7e4a8 --- /dev/null +++ b/staging/systemd/initcpio-hook-udev @@ -0,0 +1,20 @@ +#!/usr/bin/ash + +run_earlyhook() { + udevd --daemon --resolve-names=never + udevd_running=1 +} + +run_hook() { + msg ":: Triggering uevents..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle +} + +run_cleanuphook() { + udevadm control --exit + udevadm info --cleanup-db +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/systemd/initcpio-install-timestamp b/staging/systemd/initcpio-install-timestamp new file mode 100644 index 000000000..259cc705b --- /dev/null +++ b/staging/systemd/initcpio-install-timestamp @@ -0,0 +1,14 @@ +#!/bin/bash + +build() { + add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp +} + +help() { + cat <<HELPEOF +Provides support for RD_TIMESTAMP in early userspace, which can be read by a +program such as systemd-analyze to determine boot time. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/systemd/initcpio-install-udev b/staging/systemd/initcpio-install-udev new file mode 100644 index 000000000..762429983 --- /dev/null +++ b/staging/systemd/initcpio-install-udev @@ -0,0 +1,28 @@ +#!/bin/bash + +build() { + local rules tool + + add_file "/etc/udev/udev.conf" + add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd + add_binary /usr/bin/udevadm + + for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + + add_runscript +} + +help() { + cat <<HELPEOF +This hook will use udev to create your root device node and detect the needed +modules for your root device. It is also required for firmware loading in +initramfs. It is recommended to use this hook. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/systemd/systemd.install b/staging/systemd/systemd.install new file mode 100644 index 000000000..784926e17 --- /dev/null +++ b/staging/systemd/systemd.install @@ -0,0 +1,29 @@ +#!/bin/sh + +sd_booted() { + [ -e sys/fs/cgroup/systemd ] +} + +post_install() { + # enable getty@tty1 by default, but don't track the file + systemctl enable getty@.service + + systemd-machine-id-setup + + echo ":: Append 'init=/bin/systemd' to your kernel command line in your" + echo " bootloader to replace sysvinit with systemd" +} + +post_upgrade() { + systemd-machine-id-setup + + # getty@tty1.service is no longer enabled by default, but we don't want to break + # existing setups. + if [ "$(vercmp 183 "$2")" -eq 1 ]; then + # systemctl seems to be whiny on sysvinit. this will succeed unless something + # horrific happens, so just mask the error. + systemctl -q enable getty@.service || true + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/systemd/use-split-usr-path.patch b/staging/systemd/use-split-usr-path.patch new file mode 100644 index 000000000..2fd32998d --- /dev/null +++ b/staging/systemd/use-split-usr-path.patch @@ -0,0 +1,14 @@ +--- a/src/core/main.c 2012-09-20 23:02:54.000000000 -0400 ++++ b/src/core/main.c 2012-09-20 23:03:13.000000000 -0400 +@@ -1455,11 +1455,7 @@ + + /* Set up PATH unless it is already set */ + setenv("PATH", +-#ifdef HAVE_SPLIT_USR + "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", +-#else +- "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", +-#endif + arg_running_as == SYSTEMD_SYSTEM); + + if (arg_running_as == SYSTEMD_SYSTEM) { diff --git a/testing/brltty/PKGBUILD b/testing/brltty/PKGBUILD new file mode 100644 index 000000000..76d9f9466 --- /dev/null +++ b/testing/brltty/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 167187 2012-09-26 22:24:47Z tomegun $ +# Maintainer: +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=brltty +pkgver=4.3 +pkgrel=6 +pkgdesc="Braille display driver for Linux/Unix" +arch=('i686' 'x86_64') +url="http://mielke.cc/brltty" +license=('GPL' 'LGPL') +depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 'pyrex') +makedepends=('bluez') +optdepends=('bluez: bluetooth support') +backup=(etc/brltty.conf etc/conf.d/brltty.conf) +options=('!makeflags' '!emptydirs') +install=brltty.install +source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz + 'brltty' + 'brltty.conf' + 'brltty.service') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-screen-driver=a2 \ + --enable-gpm \ + --disable-java-bindings \ + --disable-caml-bindings \ + PYTHON=/usr/bin/python2 + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir" install + install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty" + install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf" + install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf" + install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service" +} +md5sums=('5ada573f88df32b6150db3b9a620e20b' + '831ebaf0c56091702929c68805d20c4f' + 'a8ab8b3dd059e96e1734bc9cdcf844fc' + '7acecd700b9f94d76fe4a6ad56cb0448') diff --git a/testing/brltty/brltty b/testing/brltty/brltty new file mode 100755 index 000000000..5ed21a52d --- /dev/null +++ b/testing/brltty/brltty @@ -0,0 +1,68 @@ +#!/bin/bash + +daemon_name=brltty + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +get_pid() { + pidof -o %PPID $daemon_name +} + +case "$1" in + start) + stat_busy "Starting $daemon_name daemon" + + PID=$(get_pid) + if [ -z "$PID" ]; then + [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid + # RUN + $daemon_name $brltty_args + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $(get_pid) > /var/run/$daemon_name.pid + add_daemon $daemon_name + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping $daemon_name daemon" + PID=$(get_pid) + # KILL + [ ! -z "$PID" ] && kill $PID &> /dev/null + # + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/$daemon_name.pid &> /dev/null + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + status) + stat_busy "Checking $daemon_name status"; + ck_status $daemon_name + ;; + + *) + echo "usage: $0 {start|stop|restart|status}" +esac + +exit 0 diff --git a/testing/brltty/brltty.conf b/testing/brltty/brltty.conf new file mode 100644 index 000000000..94115e1d5 --- /dev/null +++ b/testing/brltty/brltty.conf @@ -0,0 +1,2 @@ +# Specify any arguments to pass to brltty here. +brltty_args=""
\ No newline at end of file diff --git a/testing/brltty/brltty.install b/testing/brltty/brltty.install new file mode 100644 index 000000000..952ae58ff --- /dev/null +++ b/testing/brltty/brltty.install @@ -0,0 +1,20 @@ +post_install () { + getent group brlapi &>/dev/null || groupadd -r brlapi + if [ ! -e /etc/brlapi.key ]; then + mcookie >/etc/brlapi.key + chmod 0640 /etc/brlapi.key + chgrp brlapi /etc/brlapi.key + echo "Please add your user to the brlapi group." + fi +} + +post_upgrade () { + post_install +} + +post_remove () { + getent group brlapi >/dev/null 2>&1 && groupdel brlapi + if [ -e /etc/brlapi.key ]; then + rm -f /etc/brlapi.key + fi +} diff --git a/testing/brltty/brltty.service b/testing/brltty/brltty.service new file mode 100644 index 000000000..1b9d55e32 --- /dev/null +++ b/testing/brltty/brltty.service @@ -0,0 +1,12 @@ +[Unit] +Description=Braille Console Driver +DefaultDependencies=no +Before=sysinit.target + +[Service] +ExecStart=/usr/bin/brltty --pid-file=/run/brltty.pid +Type=forking +PIDFile=/run/brltty.pid + +[Install] +WantedBy=multi-user.target diff --git a/testing/fssos-nsvs/PKGBUILD b/testing/fssos-nsvs/PKGBUILD new file mode 100644 index 000000000..aca81ddc4 --- /dev/null +++ b/testing/fssos-nsvs/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 167185 2012-09-26 22:19:44Z tomegun $ +# Maintainer: Dale Blount <dale@archlinux.org> + +pkgname=fssos-nsvs +pkgver=0.5 +pkgrel=9 +pkgdesc="NSVS for FSSOS" +arch=('i686' 'x86_64') +url="http://fssos.sourceforge.net/" +license=('GPL') +depends=('bash' 'mysql') +backup=('etc/nsvsd.conf') +options=('!libtool' '!makeflags') +install=$pkgname.install +source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz" + 'nsvsd' + 'nsvsd.service') + +build() { + cd $srcdir/nsvs-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc + make CFLAGS="${CFLAGS} -D_GNU_SOURCE" +} + +package() { + cd $srcdir/nsvs-$pkgver + make DESTDIR=$pkgdir install + install -D -m755 "$srcdir/nsvsd" "$pkgdir/etc/rc.d/nsvsd" + install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service" +} +md5sums=('3f17c2f6339f1a322b712b467023d825' + '4dfd9dc0d69b375587e39ab2621d9ea9' + '61e970d0704875b1da83cb4e9fc0eef5') diff --git a/testing/fssos-nsvs/fssos-nsvs.install b/testing/fssos-nsvs/fssos-nsvs.install new file mode 100644 index 000000000..253ae64d2 --- /dev/null +++ b/testing/fssos-nsvs/fssos-nsvs.install @@ -0,0 +1,17 @@ +post_install() { + if [ -z "`grep '^nsvsd::' /etc/group`" ]; then + groupadd -g 83 nsvsd + fi + if [ -z "`grep '^nsvsd:' /etc/passwd`" ]; then + useradd -u 83 -d /tmp -g nsvsd -s /bin/false nsvsd + fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + userdel nsvsd &> /dev/null + groupdel nsvsd &> /dev/null +} diff --git a/testing/fssos-nsvs/nsvsd b/testing/fssos-nsvs/nsvsd new file mode 100755 index 000000000..f9b4845ab --- /dev/null +++ b/testing/fssos-nsvs/nsvsd @@ -0,0 +1,36 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting nsvsd" + /usr/sbin/nsvsd -f /etc/nsvsd.conf + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon nsvsd + stat_done + fi + ;; + stop) + stat_busy "Stopping nsvsd" + kill `cat /var/run/nsvsd.pid` &>/dev/null + rm -f /var/run/nsvsd.pid + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon nsvsd + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/fssos-nsvs/nsvsd.service b/testing/fssos-nsvs/nsvsd.service new file mode 100644 index 000000000..0df5444ab --- /dev/null +++ b/testing/fssos-nsvs/nsvsd.service @@ -0,0 +1,8 @@ +[Unit] +Description=Name Service Via Sockets Daemon + +[Service] +ExecStart=/usr/sbin/nsvsd -f /etc/nsvsd.conf + +[Install] +WantedBy=multi-user.target diff --git a/testing/hdparm/PKGBUILD b/testing/hdparm/PKGBUILD new file mode 100644 index 000000000..062bd6008 --- /dev/null +++ b/testing/hdparm/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 167301 2012-09-30 19:26:10Z tpowa $ +# Maintainer: Paul Mattal <paul@archlinux.org> + +pkgname=hdparm +pkgver=9.42 +pkgrel=1 +pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" +arch=(i686 x86_64) +depends=('glibc') +optdepends=('sh: required by idectl and ultrabayd') +source=(http://downloads.sourceforge.net/sourceforge/hdparm/${pkgname}-${pkgver}.tar.gz + wiper.sh.2_6.max-ranges.patch) +license=('BSD') +url="http://sourceforge.net/projects/hdparm/" +optdepends=('bash: for wiper.sh script') +options=('emptydirs') +md5sums=('0af5a38b212fe08f5afbe5e37f34b40b' + '74e368f384166a7710b447573cda120a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # Fix Range input/output error when wiping Intel G2 and OCZ drives + patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch + + # build + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + # install + mkdir -p ${pkgdir}/{usr,sbin} + make DESTDIR=${pkgdir} install + install -m755 contrib/idectl ${pkgdir}/sbin + install -m755 contrib/ultrabayd ${pkgdir}/sbin + + install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt + install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh + + #install license file + install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT +} diff --git a/testing/hdparm/wiper.sh.2_6.max-ranges.patch b/testing/hdparm/wiper.sh.2_6.max-ranges.patch new file mode 100644 index 000000000..c55f7b149 --- /dev/null +++ b/testing/hdparm/wiper.sh.2_6.max-ranges.patch @@ -0,0 +1,84 @@ +--- hdparm-9.28/wiper/wiper.sh.orig 2010-03-09 06:17:37.000000000 -0800 +--- hdparm-9.28/wiper/wiper.sh 2010-05-15 03:08:02.182856971 -0700 +@@ -29,7 +29,7 @@ + function usage_error(){ + echo >&2 + echo "Linux tune-up (TRIM) utility for SATA SSDs" +- echo "Usage: $0 [--verbose] [--commit] <mount_point|block_device>" >&2 ++ echo "Usage: $0 [--max-ranges <num>] [--verbose] [--commit] <mount_point|block_device>" >&2 + echo " Eg: $0 /dev/sda1" >&2 + echo >&2 + exit 1 +@@ -44,6 +44,7 @@ + + export verbose=0 + commit="" ++max_ranges=-1 + destroy_me="" + argc=$# + arg="" +@@ -51,6 +52,10 @@ + commit=yes + elif [ "$1" = "--verbose" ]; then + verbose=$((verbose + 1)) ++ elif [ "$1" = "--max-ranges" -a $argc -gt 1 ]; then ++ max_ranges=$2 ++ argc=$((argc - 1)) ++ shift + elif [ "$1" = "" ]; then + usage_error + else +@@ -499,6 +550,18 @@ + fi + fi + ++## Different SSD's have a different maximum number of ranges they'll accept ++## in a single TRIM command. ++if [ $max_ranges -le 0 ] ; then ++ model=`$HDPARM -I $rawdev | $GAWK '/Model Number/ { print $NF }'` ++ case "$model" in ++ SSDSA[12]*) max_ranges=512 ;; # Intel X18-M/X25-M ++ OCZ-VERTEX2) max_ranges=64 ;; # OCZ Vertex2 ++ *) max_ranges=65535 ++ esac ++fi ++[ $verbose -gt 0 ] && echo "max-ranges = $max_ranges" ++ + ## All ready. Now let the user know exactly what we intend to do: + ## + mountstatus="$fstype non-mounted" +@@ -608,7 +671,7 @@ + nsectors += count; + while (count > 0) { + this_count = (count > 65535) ? 65535 : count +- printf "%u:%u ", lba, this_count ++ printf "%u:%u \n", lba, this_count + if (verbose > 1) + printf "%u:%u ", lba, this_count > "/dev/stderr" + lba += this_count +@@ -695,6 +758,22 @@ + -v verbose="$verbose" \ + -v xfs_blksects="$xfs_blksects" \ + -v xfs_agoffsets="$xfs_agoffsets" \ +- "$GAWKPROG" | $TRIM ++ "$GAWKPROG" | ( ++ i=0 ++ while read range ; do ++ ranges=$ranges" "$range ++ ((i++)) ++ if [ $i -ge $max_ranges ] ; then ++ [ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n" ++ echo $ranges | $TRIM ++ ranges="" ++ i=0 ++ fi ++ done ++ if [ $i -gt 0 ] ; then ++ [ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n" ++ echo $ranges | $TRIM ++ fi ++ ) + + do_cleanup $? + + diff --git a/testing/jack/40-hpet-permissions.rules b/testing/jack/40-hpet-permissions.rules new file mode 100644 index 000000000..7af3780f9 --- /dev/null +++ b/testing/jack/40-hpet-permissions.rules @@ -0,0 +1,2 @@ +KERNEL=="rtc0", GROUP="audio" +KERNEL=="hpet", GROUP="audio" diff --git a/testing/jack/99-audio.conf b/testing/jack/99-audio.conf new file mode 100644 index 000000000..eb76ef920 --- /dev/null +++ b/testing/jack/99-audio.conf @@ -0,0 +1,2 @@ +@audio - rtprio 99 +@audio - memlock unlimited diff --git a/testing/jack/PKGBUILD b/testing/jack/PKGBUILD new file mode 100644 index 000000000..185e4d02f --- /dev/null +++ b/testing/jack/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 167217 2012-09-28 14:43:50Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: tobias <tobias@archlinux.net> +# Contributor: Robert Emil Berge <robert@rebi.no> + +pkgname=jack +_longname=jack-audio-connection-kit +pkgver=0.121.3 +pkgrel=7 +pkgdesc="A low-latency audio server" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('libsamplerate' 'readline') +makedepends=('doxygen' 'libffado' 'celt') +optdepends=('libffado: FireWire support' + 'celt: NetJACK driver') +url="http://jackaudio.org/" +backup=(etc/security/limits.d/99-audio.conf) +options=('!libtool') +provides=("$_longname=$pkgver") +conflicts=("$_longname") +replaces=("$_longname") +install=$pkgname.install +source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz" + '99-audio.conf' + '40-hpet-permissions.rules' + 'ffado_setbuffsize-jack1.patch') +md5sums=('35f470f7422c37b33eb965033f7a42e8' + 'ae65b7c9ebe0fff6c918ba9d97ae342d' + '471aad533ff56c5d3cbbf65ce32cadef' + 'c1f78ee7847c6d5e471d90626623ffb4') + +build() { + cd "$srcdir/$_longname-$pkgver" + + # backport firewire stuff + # - needed for setbuffsize feature in latest stable ffado + # from https://github.com/jackaudio/jack1/commit/025d3ad + patch -Np1 -i "$srcdir/ffado_setbuffsize-jack1.patch" + + ./configure --prefix=/usr \ + --libdir=/usr/lib + make +} + +package() { + cd "$srcdir/$_longname-$pkgver" + + make DESTDIR="$pkgdir" install + + # configure realtime access/scheduling + # see https://bugs.archlinux.org/task/26343 + install -Dm644 "$srcdir/99-audio.conf" \ + "$pkgdir/etc/security/limits.d/99-audio.conf" + + install -Dm644 "$srcdir/40-hpet-permissions.rules" \ + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" + + # install a missing header forgotten by upstream + # see https://bugs.archlinux.org/task/26865 + install -Dm644 "$srcdir/$_longname-$pkgver/jack/jslist.h" \ + "$pkgdir/usr/include/jack/jslist.h" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/jack/ffado_setbuffsize-jack1.patch b/testing/jack/ffado_setbuffsize-jack1.patch new file mode 100644 index 000000000..7e43962ee --- /dev/null +++ b/testing/jack/ffado_setbuffsize-jack1.patch @@ -0,0 +1,124 @@ +From 025d3ad4d5adeff00e97b6fafdf32d6d199d0baa Mon Sep 17 00:00:00 2001 +From: Jonathan Woithe <jwoithe@just42.net> +Date: Tue, 13 Mar 2012 15:43:03 +1030 +Subject: [PATCH] Support setbufsize in firewire driver + +--- + drivers/firewire/ffado_driver.c | 69 ++++++++++++++++++++++++++++++++++----- + 1 file changed, 60 insertions(+), 9 deletions(-) + +diff --git a/drivers/firewire/ffado_driver.c b/drivers/firewire/ffado_driver.c +index a8ad1ea..6035af3 100644 +--- a/drivers/firewire/ffado_driver.c ++++ b/drivers/firewire/ffado_driver.c +@@ -7,6 +7,7 @@ + * http://www.jackaudio.org + * + * Copyright (C) 2005-2007 Pieter Palmers ++ * Copyright (C) 2012 Jonathan Woithe + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -50,7 +51,10 @@ + + static int ffado_driver_stop (ffado_driver_t *driver); + ++// Basic functionality requires API version 8. If version 9 or later ++// is present the buffers can be resized at runtime. + #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 ++#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 + + // enable verbose messages + static int g_verbose=0; +@@ -675,24 +679,71 @@ + static int + ffado_driver_bufsize (ffado_driver_t* driver, jack_nframes_t nframes) + { +- printError("Buffer size change requested but not supported!!!"); ++ signed int chn; ++ ++ // The speed of this function isn't critical; we can afford the ++ // time to check the FFADO API version. ++ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || ++ ffado_streaming_set_period_size == NULL) { ++ printError("unsupported on current version of FFADO; please upgrade FFADO"); ++ return -1; ++ } + +- /* +- driver->period_size = nframes; ++ driver->period_size = nframes; + driver->period_usecs = + (jack_time_t) floor ((((float) nframes) / driver->sample_rate) + * 1000000.0f); +- */ +- ++ ++ // Reallocate the null and scratch buffers. ++ driver->nullbuffer = calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->nullbuffer == NULL) { ++ printError("could not allocate memory for null buffer"); ++ return -1; ++ } ++ driver->scratchbuffer = calloc(driver->period_size, sizeof(ffado_sample_t)); ++ if(driver->scratchbuffer == NULL) { ++ printError("could not allocate memory for scratch buffer"); ++ return -1; ++ } ++ ++ // MIDI buffers need reallocating ++ for (chn = 0; chn < driver->capture_nchannels; chn++) { ++ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { ++ // setup the midi buffer ++ if (driver->capture_channels[chn].midi_buffer != NULL) ++ free(driver->capture_channels[chn].midi_buffer); ++ driver->capture_channels[chn].midi_buffer = calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ for (chn = 0; chn < driver->playback_nchannels; chn++) { ++ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { ++ if (driver->playback_channels[chn].midi_buffer != NULL) ++ free(driver->playback_channels[chn].midi_buffer); ++ driver->playback_channels[chn].midi_buffer = calloc(driver->period_size, sizeof(uint32_t)); ++ } ++ } ++ ++ // Notify FFADO of the period size change ++ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { ++ printError("could not alter FFADO device period size"); ++ return -1; ++ } ++ ++ // This is needed to give the shadow variables a chance to ++ // properly update to the changes. ++ sleep(1); ++ + /* tell the engine to change its buffer size */ +-#if 0 + if (driver->engine->set_buffer_size (driver->engine, nframes)) { + jack_error ("FFADO: cannot set engine buffer size to %d (check MIDI)", nframes); + return -1; + } +-#endif + +- return -1; // unsupported ++ // Other drivers (eg: ALSA) don't seem to adjust latencies via ++ // jack_port_set_latency_range() from the bufsize() callback, so we ++ // won't either. Is this right? ++ ++ return 0; + } + + typedef void (*JackDriverFinishFunction) (jack_driver_t *); +@@ -704,7 +755,7 @@ + { + ffado_driver_t *driver; + +- if(ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { ++ if(ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { + printError("Incompatible libffado version! (%s)", ffado_get_version()); + return NULL; + } +-- +1.7.10 + diff --git a/testing/jack/jack.install b/testing/jack/jack.install new file mode 100644 index 000000000..8be532f6d --- /dev/null +++ b/testing/jack/jack.install @@ -0,0 +1,5 @@ +post_upgrade() { + rm -f etc/security/limits.d/99-realtime.conf +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/libffado/PKGBUILD b/testing/libffado/PKGBUILD index 2537c7a73..7b0928606 100644 --- a/testing/libffado/PKGBUILD +++ b/testing/libffado/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166937 2012-09-22 19:34:15Z schiv $ +# $Id: PKGBUILD 167215 2012-09-28 14:21:22Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64') url="http://www.ffado.org/" @@ -26,7 +26,6 @@ _scons-conf() { PREFIX=/usr \ MANDIR=/usr/share/man \ UDEVDIR=/usr/lib/udev/rules.d \ - ENABLE_SETBUFFERSIZE_API_VER=false \ COMPILE_FLAGS="$CFLAGS" $@ } diff --git a/testing/patch/PKGBUILD b/testing/patch/PKGBUILD index 7266d17e2..fa4b51469 100644 --- a/testing/patch/PKGBUILD +++ b/testing/patch/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166613 2012-09-13 04:53:23Z allan $ +# $Id: PKGBUILD 167233 2012-09-28 23:02:27Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=patch -pkgver=2.7 +pkgver=2.7.1 pkgrel=1 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ depends=('glibc') makedepends=('ed') optdepends=('ed: for patch -e functionality') source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('d443f9d9a7d1bf1715831883917699d9' - '874fb55b72bc5c3c44794645b04e69a9') +md5sums=('e9ae5393426d3ad783a300a338c09b72' + 'b12189e0de3cb2af25268441647ec517') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch new file mode 100644 index 000000000..9be6ef28f --- /dev/null +++ b/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch @@ -0,0 +1,30 @@ +From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 27 Sep 2012 20:48:13 -0400 +Subject: [PATCH] tmpfiles: restore previous behavior for F/f + +d4e9eb91ea changed the behavior for the F and f actions, wrongly sending +them to glob_item(). Restore the old behavior and shortcut straight to +write_one_file(). +--- + src/tmpfiles/tmpfiles.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index f10f908..bf900fa 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -673,6 +673,10 @@ static int create_item(Item *i) { + + case CREATE_FILE: + case TRUNCATE_FILE: ++ r = write_one_file(i, i->path); ++ if (r < 0) ++ return r; ++ break; + case WRITE_FILE: + r = glob_item(i, write_one_file); + if (r < 0) +-- +1.7.12.1 + |
