diff options
37 files changed, 569 insertions, 112 deletions
diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD index c9e9763d4..eb089f8ec 100644 --- a/community/clementine/PKGBUILD +++ b/community/clementine/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48537 2011-06-01 16:56:54Z stephane $ +# $Id: PKGBUILD 49329 2011-06-14 11:51:15Z stephane $ #Maintainer: Stéphane Gaudreault <stephane@archlinux.org> #Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=clementine pkgver=0.7.1 -pkgrel=5 +pkgrel=6 pkgdesc="A music player and library organizer" url="http://www.clementine-player.org/" license=('GPL') diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index 176fdafa7..54cb9c850 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 42958 2011-03-22 21:15:35Z spupykin $ +# $Id: PKGBUILD 50232 2011-06-27 10:23:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante -pkgver=1.2.3 +pkgver=1.3.1 pkgrel=1 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" @@ -12,10 +12,10 @@ license=('custom') depends=('tcp_wrappers' 'pam') backup=('etc/socks.conf' 'etc/sockd.conf') -options=(!libtool) +options=('!libtool') source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz sockd.rc) -md5sums=('b2874e53f5d8fe418cd40cb829536669' +md5sums=('19b8a15860ce6b9e96453ddd7f1cbfe2' '5110dfd78a2b38fff27a886ee88b58a6') build() { @@ -23,6 +23,10 @@ build() { [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install # Config files diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index 87f5c8273..0eebe2691 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 42769 2011-03-20 18:36:16Z spupykin $ +# $Id: PKGBUILD 50208 2011-06-26 20:13:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gtk2hs-buildtools pkgver=0.12.0 -pkgrel=2 +pkgrel=3 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." url="http://hackage.haskell.org/package/gtk2hs-buildtools" license=('GPL2') diff --git a/community/gtk2hs-cairo/PKGBUILD b/community/gtk2hs-cairo/PKGBUILD index 3f1afd76e..cb3fc256b 100644 --- a/community/gtk2hs-cairo/PKGBUILD +++ b/community/gtk2hs-cairo/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 41273 2011-03-04 22:51:09Z remy $ +# $Id: PKGBUILD 50211 2011-06-26 20:14:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + _hkgname=cairo pkgname=gtk2hs-cairo pkgver=0.12.0 -pkgrel=3.1 +pkgrel=4 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.0.2' 'cairo' 'haskell-mtl=2.0.1.0') +depends=('ghc' 'cairo' 'haskell-mtl=2.0.1.0') makedepends=(gtk2hs-buildtools) options=('strip') install=${pkgname}.install @@ -28,6 +29,9 @@ build() { } package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0') + 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 diff --git a/community/gtk2hs-glib/PKGBUILD b/community/gtk2hs-glib/PKGBUILD index 10f86885f..e15d65554 100644 --- a/community/gtk2hs-glib/PKGBUILD +++ b/community/gtk2hs-glib/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 41258 2011-03-04 22:36:45Z remy $ +# $Id: PKGBUILD 50214 2011-06-26 20:15:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + _hkgname=glib pkgname=gtk2hs-glib pkgver=0.12.0 -pkgrel=2.1 +pkgrel=3 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.0.2' 'glib2') +depends=('ghc' 'glib2') makedepends=('gtk2hs-buildtools=0.12.0') options=('strip') install=gtk2hs-glib.install @@ -28,6 +29,9 @@ build() { } package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" "glib2") + 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 diff --git a/community/gtk2hs-gtk/PKGBUILD b/community/gtk2hs-gtk/PKGBUILD index a647ac0db..0ce59b9b6 100644 --- a/community/gtk2hs-gtk/PKGBUILD +++ b/community/gtk2hs-gtk/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 41300 2011-03-05 00:05:06Z remy $ +# $Id: PKGBUILD 50218 2011-06-26 20:25:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + _hkgname=gtk pkgname=gtk2hs-gtk pkgver=0.12.0 -pkgrel=3.1 +pkgrel=4 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.0.2' 'gtk2' 'gtk2hs-pango=0.12.0' 'haskell-mtl=2.0.1.0') +depends=('ghc' 'gtk2' 'gtk2hs-pango=0.12.0' 'haskell-mtl=2.0.1.0') makedepends=('gtk2hs-buildtools=0.12.0') options=('strip') install=gtk2hs-gtk.install @@ -28,6 +29,9 @@ build() { } package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" 'gtk2' 'gtk2hs-pango=0.12.0' 'haskell-mtl=2.0.1.0') + 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 diff --git a/community/gtk2hs-pango/PKGBUILD b/community/gtk2hs-pango/PKGBUILD index 4b167ac6f..603918954 100644 --- a/community/gtk2hs-pango/PKGBUILD +++ b/community/gtk2hs-pango/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 41288 2011-03-04 23:27:16Z remy $ +# $Id: PKGBUILD 50217 2011-06-26 20:24:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + _hkgname=pango pkgname=gtk2hs-pango pkgver=0.12.0 -pkgrel=3.1 +pkgrel=4 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.0.2' 'pango' 'gtk2hs-glib' 'gtk2hs-cairo') +depends=('ghc' 'pango' 'gtk2hs-glib' 'gtk2hs-cairo') makedepends=('gtk2hs-buildtools=0.12.0') options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) @@ -28,6 +29,9 @@ build() { } package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" 'pango' 'gtk2hs-glib' 'gtk2hs-cairo') + 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 diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index 7b6e112b6..040763b2d 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 46145 2011-05-04 08:33:47Z spupykin $ +# $Id: PKGBUILD 50273 2011-06-27 12:56:55Z vegai $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=hslogger pkgname=haskell-hslogger pkgver=1.1.0 -pkgrel=4 +pkgrel=6 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/${_hkgname}" license=('LGPL') arch=('i686' 'x86_64') -depends=('ghc=7.0.2' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2') +depends=('ghc=7.0.3-2' 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2') options=('strip') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) @@ -18,7 +18,7 @@ md5sums=('8039e079338dae19e1273bbd73332014') build() { cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \ + runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \ --enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \ --enable-library-profiling runhaskell Setup build @@ -29,6 +29,9 @@ build() { } package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" 'haskell-mtl=2.0.1.0' 'haskell-network=2.3.0.2') + 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 diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 828951df8..267dbcdda 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 46583 2011-05-09 18:34:40Z stephane $ +# $Id: PKGBUILD 50268 2011-06-27 12:26:44Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Bartek Piotrowski <barthalion@gmail.com> pkgname=mplayer2 pkgver=2.0 -pkgrel=12 +pkgrel=13 pkgdesc="A movie player" arch=('i686' 'x86_64') license=('GPL') url="http://www.mplayer2.org/" depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' - 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123') + 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa') makedepends=('live-media' 'mesa' 'unzip' 'yasm') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') diff --git a/community/mupen64plus/PKGBUILD b/community/mupen64plus/PKGBUILD index e9fa43eb7..176980418 100644 --- a/community/mupen64plus/PKGBUILD +++ b/community/mupen64plus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 35335 2010-12-18 23:49:02Z svenstaro $ +# $Id: PKGBUILD 50291 2011-06-27 20:35:36Z jelle $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -7,7 +7,7 @@ pkgname=mupen64plus pkgver=1.99.4 -pkgrel=1 +pkgrel=2 pkgdesc='Nintendo64 Emulator' arch=('i686' 'x86_64') url='http://code.google.com/p/mupen64plus/' @@ -26,7 +26,7 @@ package() { cd mupen64plus-bundle-src-$pkgver # set LDCONFIG since we are using fakeroot and scripts run root commands by checking the uid - ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man' LDCONFIG='true' + ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man/man6' LDCONFIG='true' } # vim: ts=2:sw=2:et diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index ca6bff6ee..1426765a8 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49114 2011-06-11 08:28:49Z ibiru $ +# $Id: PKGBUILD 50284 2011-06-27 19:43:47Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.8 -pkgrel=4 +pkgver=4.0.10 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -204,8 +204,8 @@ package_virtualbox-guest-modules(){ sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" } -md5sums=('a3e81289f2357fcf4bbe3e77805f38b6' - '39712ccbc16b04c1cda209ae16446bf2' +md5sums=('956af570597850ab4d3275b54bbed049' + '75cdbfe8621be72b67666187c5acf172' '44efb3c4be214daa453a317d527f1f30' '32a232b43852b9a08cb11a7bcd64b347' '5f85710e0b8606de967716ded7b2d351' diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD index 4ecfab9c9..e65f419df 100644 --- a/core/module-init-tools/PKGBUILD +++ b/core/module-init-tools/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 126053 2011-06-01 05:32:56Z andyrtr $ +# $Id: PKGBUILD 128937 2011-06-25 14:35:00Z dreisner $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=module-init-tools -pkgver=3.13 +pkgver=3.16 pkgrel=1 pkgdesc="utilities needed by Linux systems for managing loadable kernel modules" arch=('i686' 'x86_64') url="http://kerneltools.org" license=('GPL') depends=('glibc') +makedepends=('docbook2x') backup=('etc/modprobe.d/modprobe.conf') source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2 - modprobe.conf) -md5sums=('dc575e7df00d9f745bf23b32f927b7a6' - '316f1bda4c21af02b30252eb014a0a55') + modprobe.conf + docfix.patch) +md5sums=('bc44832c6e41707b8447e2847d2019f5' + '316f1bda4c21af02b30252eb014a0a55' + '4320d19902ded43bed55c804b065cdc7') build() { cd $srcdir/$pkgname-$pkgver - - # do not regenerate man pages - touch *.{5,8} - + + # fix headers in SGML manpage sources and an XML typo + patch -Np0 < "$srcdir/docfix.patch" + ./configure --prefix=/usr --exec-prefix=/ --enable-zlib make } @@ -30,10 +33,7 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - + # Install our custom (read: empty) modprobe.conf install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf - - # fix man page (FS#17559) - sed -i "s#mod#man5/mod#" $pkgdir/usr/share/man/man5/modprobe.d.5 } diff --git a/core/module-init-tools/docfix.patch b/core/module-init-tools/docfix.patch new file mode 100644 index 000000000..0151ca3f1 --- /dev/null +++ b/core/module-init-tools/docfix.patch @@ -0,0 +1,90 @@ +--- doc/depmod.conf.sgml.orig 2011-06-25 10:07:15.897805024 -0400 ++++ doc/depmod.conf.sgml 2011-06-25 10:07:48.810805020 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/depmod.sgml.orig 2011-06-25 10:07:15.898805024 -0400 ++++ doc/depmod.sgml 2011-06-25 10:07:56.636805021 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +@@ -52,7 +52,7 @@ + <arg><option>-n</option></arg> + <arg><option>-v</option></arg> + <arg><option>-P <replaceable>prefix</replaceable></option></arg> +- <arg><option>-w</option><arg> ++ <arg><option>-w</option></arg> + <arg><option><replaceable>version</replaceable></option></arg> + <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg> + </cmdsynopsis> +--- doc/insmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400 ++++ doc/insmod.sgml 2011-06-25 10:07:59.228805019 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/lsmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400 ++++ doc/lsmod.sgml 2011-06-25 10:08:04.804805020 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/modinfo.sgml.orig 2011-06-25 10:07:15.900805024 -0400 ++++ doc/modinfo.sgml 2011-06-25 10:08:07.630805019 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/modprobe.conf.sgml.orig 2011-06-25 10:07:15.901805024 -0400 ++++ doc/modprobe.conf.sgml 2011-06-25 10:08:10.173805018 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/modprobe.sgml.orig 2011-06-25 10:07:15.902805024 -0400 ++++ doc/modprobe.sgml 2011-06-25 10:08:13.623805019 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/modules.dep.sgml.orig 2011-06-25 10:07:15.903805024 -0400 ++++ doc/modules.dep.sgml 2011-06-25 10:08:19.323805019 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/rmmod.sgml.orig 2011-06-25 10:07:15.904805024 -0400 ++++ doc/rmmod.sgml 2011-06-25 10:08:27.691805017 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 25e794422..ec25b42b8 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122696 2011-05-06 06:26:05Z andrea $ +# $Id: PKGBUILD 129446 2011-06-27 20:27:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.4.1 -pkgrel=1 +pkgrel=3 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org" diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index c3e5215e6..e376be4fc 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 126131 2011-06-01 17:33:51Z foutrelis $ +# $Id: PKGBUILD 129374 2011-06-27 05:53:20Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk -pkgver=0.7.1 -pkgrel=3 +pkgver=0.7.2 +pkgrel=1 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64') url="http://www.rodsbooks.com/gdisk/" license=('GPL2') depends=('gcc-libs' 'util-linux' 'popt' 'icu') -provides=('gdisk') +provides=("gdisk=$pkgver") conflicts=('gdisk') replaces=('gdisk') -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tgz) -md5sums=('7c8d810df61e81c821bef399b832e89e') +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) +md5sums=('31deeb7acb5104d56ba2ddeafd907513') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/krusader/PKGBUILD b/extra/krusader/PKGBUILD index 58e113545..439c1024b 100644 --- a/extra/krusader/PKGBUILD +++ b/extra/krusader/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 129354 2011-06-26 23:28:57Z eric $ +# $Id: PKGBUILD 129430 2011-06-27 12:22:42Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -7,14 +7,15 @@ pkgname=krusader pkgver=2.4.0beta1 _pkgver=2.4.0-beta1 -pkgrel=1 +pkgrel=2 pkgdesc="An alternative file manager for KDE resembling Midnight Commander" arch=('i686' 'x86_64') url="http://krusader.sourceforge.net/" license=('GPL') depends=('kdebase-runtime') -makedepends=('cmake' 'automoc4' 'docbook-xsl') -optdepends=("kdebase-keditbookmarks: to edit bookmarks") +makedepends=('cmake' 'automoc4' 'docbook-xsl' 'kdeutils-ark') +optdepends=("kdebase-keditbookmarks: to edit bookmarks" + "kdeutils-ark: extract archive with right-click") install=krusader.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2) md5sums=('d2340718d05d69e7f2a7f0846471ee12') diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD index c62b8199e..9632630d0 100644 --- a/extra/libmtp/PKGBUILD +++ b/extra/libmtp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123216 2011-05-09 10:21:51Z jgc $ +# $Id: PKGBUILD 127351 2011-06-13 11:09:19Z stephane $ # Contributor: damir <damir@archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libmtp -pkgver=1.0.6 +pkgver=1.1.0 pkgrel=1 pkgdesc="library implementation of the Media Transfer Protocol" arch=("i686" "x86_64") @@ -13,17 +13,15 @@ depends=('libusb-compat') makedepends=('doxygen') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('7d3c624d768adba8537f8bc9c0a82cbf') +md5sums=('fd7b293436528f4c780a9da6e5cc5398') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --with-udev-rules=52-libmtp.rules make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - install -D -m0644 libmtp.rules "${pkgdir}/lib/udev/rules.d/52-libmtp.rules" } diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD new file mode 100644 index 000000000..1a97bc8aa --- /dev/null +++ b/extra/mediastreamer/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 129367 2011-06-27 05:48:53Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Adrià Arrufat <swiftscythe@gmail.com> + +pkgname=mediastreamer +pkgver=2.7.3 +pkgrel=3 +pkgdesc="A library written in C that allows you to create and run audio and video streams" +arch=('i686' 'x86_64') +url="http://www.linphone.org" +license=('GPL') +depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg') +makedepends=('cmake' 'automoc4') +source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "disable-v4l1.patch") +md5sums=('5213307f557d86aa648f1a53a885138c' + '7ee15689eed1adbdcf0ddab8fadca34a') +options=('!libtool') + +build() { + cd "${srcdir}"/$pkgname-$pkgver/ + patch -p2 -i "${srcdir}"/disable-v4l1.patch + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/mediastreamer/ + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/extra/mediastreamer/disable-v4l1.patch b/extra/mediastreamer/disable-v4l1.patch new file mode 100644 index 000000000..9f6cb84d4 --- /dev/null +++ b/extra/mediastreamer/disable-v4l1.patch @@ -0,0 +1,50 @@ +diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am +--- linphone-3.4.3/mediastreamer2/src/Makefile.am 2011-02-09 08:43:11.000000000 +0000 ++++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am 2011-04-01 14:54:04.000000000 +0000 +@@ -117,7 +117,7 @@ + endif + + if BUILD_V4L +-libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c ++libmediastreamer_la_SOURCES+=msv4l2.c + endif + + if BUILD_WIN32 +diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in +--- linphone-3.4.3/mediastreamer2/src/Makefile.in 2011-03-28 18:34:07.000000000 +0000 ++++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in 2011-04-01 14:55:00.000000000 +0000 +@@ -54,7 +54,7 @@ + @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c + @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c + @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m +-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c ++@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c + @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c + @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c + @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \ +@@ -135,7 +135,7 @@ + audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \ + msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \ + msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \ +- aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \ ++ aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \ + drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \ + sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \ + h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \ +@@ -156,7 +156,7 @@ + @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo + @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo + @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo +-@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo ++@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo + @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \ + @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@ drawdib-display.lo + @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo +@@ -600,7 +600,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@ diff --git a/extra/neon/PKGBUILD b/extra/neon/PKGBUILD index 3e908b618..3732a7196 100644 --- a/extra/neon/PKGBUILD +++ b/extra/neon/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 124952 2011-05-25 12:20:04Z andrea $ +# $Id: PKGBUILD 129362 2011-06-27 05:41:06Z andrea $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=neon pkgver=0.29.6 -pkgrel=1 +pkgrel=2 pkgdesc="HTTP and WebDAV client library with a C interface" arch=('i686' 'x86_64') license=('GPL' 'LGPL') @@ -24,6 +24,9 @@ build() { --with-ssl=openssl \ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt make + + # fix invalid .so links in man pages (FS#24902) + sed -i '/^\.so/s|\.so \([^.]\+\)\.\([[:digit:]]\)|.so man\2/\1.\2|' doc/man/* } package() { diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD index c2adab552..07f51ce8b 100644 --- a/extra/rdesktop/PKGBUILD +++ b/extra/rdesktop/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 120030 2011-04-18 14:48:32Z andrea $ +# $Id: PKGBUILD 129462 2011-06-28 03:34:32Z heftig $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=rdesktop pkgver=1.7.0 -pkgrel=1 +pkgrel=2 depends=('libx11' 'openssl' 'libao' 'libsamplerate') pkgdesc="An open source client for Windows Remote Desktop Services" url="http://www.rdesktop.org/" license=('GPL') arch=('i686' 'x86_64') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'rdesktop-send_physical_buttons.diff') + 'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch') md5sums=('77fa93b21aa38837a85e81c00e757228' - '880d3aeac67b901e6bf44d1323374768') + '880d3aeac67b901e6bf44d1323374768' + 'bd2c9bc68bddcc2652c668753d787df7') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -21,6 +22,9 @@ build() { # FS#15113 patch -i ${srcdir}/rdesktop-send_physical_buttons.diff + # Fix libao segfault, from Fedora + patch -i ${srcdir}/rdesktop-libao.patch + ./configure --prefix=/usr make } diff --git a/extra/rdesktop/rdesktop-libao.patch b/extra/rdesktop/rdesktop-libao.patch new file mode 100644 index 000000000..1f3dea9ed --- /dev/null +++ b/extra/rdesktop/rdesktop-libao.patch @@ -0,0 +1,20 @@ +diff -up rdesktop-1.6.0/rdpsnd_libao.c.ao rdesktop-1.6.0/rdpsnd_libao.c +--- rdesktop-1.6.0/rdpsnd_libao.c.ao 2007-10-30 14:57:30.000000000 +0100 ++++ rdesktop-1.6.0/rdpsnd_libao.c 2010-12-02 21:22:39.000000000 +0100 +@@ -76,7 +76,7 @@ libao_open(void) + format.channels = 2; + format.rate = 44100; + format.byte_format = AO_FMT_NATIVE; +- ++ format.matrix = NULL; + + o_device = ao_open_live(default_driver, &format, NULL); + if (o_device == NULL) +@@ -115,6 +115,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx) + format.channels = pwfx->nChannels; + format.rate = 44100; + format.byte_format = AO_FMT_NATIVE; ++ format.matrix = NULL; + + if (o_device != NULL) + ao_close(o_device); diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 29a97dc46..a1644664b 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127104 2011-06-10 17:27:06Z ibiru $ +# $Id: PKGBUILD 127360 2011-06-13 15:53:46Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox pkgver=2.90.1.git20110610 -pkgrel=1 +pkgrel=2 pkgdesc="An iTunes-like music player/libary" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 95361e280..c861b3ac6 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127816 2011-06-18 16:12:17Z ibiru $ +# $Id: PKGBUILD 129407 2011-06-27 11:36:20Z stephane $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.10 -pkgrel=4 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -34,13 +34,19 @@ conflicts=('vlc-plugin') replaces=('vlc-plugin') options=('!libtool') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('066cb94b1e3aa848d828121354d6be4d') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + vlc-1.1.10-libavformat.patch) +md5sums=('066cb94b1e3aa848d828121354d6be4d' + '9b82571a594e08e67fbae9c96c3f3ed7') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c + + # FS#24872 + patch -Np1 -i ../vlc-1.1.10-libavformat.patch + ./configure --prefix=/usr \ --disable-rpath \ --enable-faad \ diff --git a/extra/vlc/vlc-1.1.10-libavformat.patch b/extra/vlc/vlc-1.1.10-libavformat.patch new file mode 100644 index 000000000..4bec72334 --- /dev/null +++ b/extra/vlc/vlc-1.1.10-libavformat.patch @@ -0,0 +1,29 @@ +From 21260bbb732d9de5540f809e1a54bde740f12a95 Mon Sep 17 00:00:00 2001 +From: Laurent Aimar <fenrir@videolan.org> +Date: Tue, 7 Jun 2011 00:43:56 +0200 +Subject: [PATCH] Fix ByteIOContext init on recent libavformat + +Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> +(cherry picked from commit 4fc3bd15a3844e41a75760fa8e100feecea969a5) + +Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> +--- + modules/demux/avformat/demux.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c +index fbb0b28..bd7c166 100644 +--- a/modules/demux/avformat/demux.c ++++ b/modules/demux/avformat/demux.c +@@ -210,6 +210,9 @@ int OpenDemux( vlc_object_t *p_this ) + */ + p_sys->url.is_streamed = 1; + p_sys->io.is_streamed = 1; ++#if defined(AVIO_SEEKABLE_NORMAL) ++ p_sys->io.seekable = 0; ++#endif + } + + +-- +1.7.2.5 diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD index bd83a8b75..51dc86269 100644 --- a/kde-unstable/kdenetwork/PKGBUILD +++ b/kde-unstable/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 128586 2011-06-24 12:56:07Z andrea $ +# $Id: PKGBUILD 129373 2011-06-27 05:53:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-krdc' 'kdenetwork-krfb') pkgver=4.6.90 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -19,12 +19,12 @@ groups=('kde' 'kdenetwork') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' - 'telepathy-qt4' 'libktorrent' 'libmms') + 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer') source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") sha1sums=('0aa2f1ae9d13f9bd9dd4f57b6707f2edbfce1f40') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ @@ -70,7 +70,7 @@ package_kdenetwork-kget() { package_kdenetwork-kopete() { pkgdesc='Instant Messenger' depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' - 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu') + 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu' 'mediastreamer') url="http://kde.org/applications/internet/kopete/" install='kdenetwork.install' cd $srcdir/build/kopete diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index 621a30245..15cac233f 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -6,10 +6,11 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.39 -pkgver=${_basekernel}.1 +pkgver=${_basekernel}.2 pkgrel=1 makedepends=('xmlto' 'docbook-xsl') -_patchname="patch-${pkgver}-${pkgrel}-LIBRE" +#_patchname="patch-${pkgver}-${pkgrel}-LIBRE" +_patchname="patch-2.6.39.1-1-LIBRE" arch=(i686 x86_64) license=('GPL2') url="http://linux-libre.fsfla.org/" @@ -239,7 +240,8 @@ find $pkgdir -type d -exec chmod 755 {} \; # remove a file already in kernel26 package rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } -md5sums=('923210b0c4190733bf314e48f588c112' + +md5sums=('4ddca7df15f92537b1914ab115cb4f8b' '252cbddfd9a8bb97181c087fdd5e2377' 'd5c6c675662d98011513f6cbc81d66db' '00e8553b44dac65fc093db60a1cde842' diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD index f3be8bdc7..549c084f0 100644 --- a/multilib-testing/binutils-multilib/PKGBUILD +++ b/multilib-testing/binutils-multilib/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 48900 2011-06-07 12:25:49Z heftig $ +# $Id: PKGBUILD 50278 2011-06-27 16:01:59Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils-multilib -pkgver=2.21 -pkgrel=9 -_date=20110605 +pkgver=2.21.1 +pkgrel=1 +_date=20110627 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" arch=('x86_64') url="http://www.gnu.org/software/binutils/" @@ -20,7 +20,7 @@ makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-mult options=('!libtool' '!distcc' '!ccache') install=binutils.install source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2) -md5sums=('a2e7784d5d66c1d692a0a1fa248ea66c') +md5sums=('2face559e80d649ba148e42bb2d1fb0f') build() { cd ${srcdir} @@ -32,7 +32,7 @@ build() { --enable-shared \ --enable-64-bit-bfd --enable-multilib - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. + # check the host environment and makes sure all the necessary tools are available make configure-host make tooldir=${pkgdir}/usr diff --git a/staging/apr-util/PKGBUILD b/staging/apr-util/PKGBUILD new file mode 100644 index 000000000..5cdab4d99 --- /dev/null +++ b/staging/apr-util/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 129453 2011-06-28 01:17:42Z stephane $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=apr-util +pkgver=1.3.12 +pkgrel=2 +pkgdesc="The Apache Portable Runtime" +arch=('i686' 'x86_64') +url="http://apr.apache.org/" +depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc') +options=('!libtool') +license=('APACHE') +source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2") +md5sums=('0f671b037ca62751a8a7005578085560') + +build() { + cd "${srcdir}/apr-util-${pkgver}" + ./configure --prefix=/usr --with-apr=/usr \ + --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \ + --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap + make +} + +package() { + cd "${srcdir}/apr-util-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/evolution-data-server/PKGBUILD b/staging/evolution-data-server/PKGBUILD new file mode 100644 index 000000000..d7303a1eb --- /dev/null +++ b/staging/evolution-data-server/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 129456 2011-06-28 01:27:57Z stephane $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evolution-data-server +pkgver=3.0.2.1 +pkgrel=2 +pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" +arch=('i686' 'x86_64') +depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') +makedepends=('intltool' 'gperf' 'gobject-introspection') +options=('!libtool') +url="http://www.gnome.org" +license=('GPL') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --with-openldap=yes \ + --libexecdir=/usr/lib/evolution-data-server \ + --with-krb5=/usr --with-libdb=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/mod_perl/PKGBUILD b/staging/mod_perl/PKGBUILD new file mode 100644 index 000000000..91af58005 --- /dev/null +++ b/staging/mod_perl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 129459 2011-06-28 01:36:46Z stephane $ +# Maintainer: Firmicus <francois.archlinux.org> +# Contributor: Tom K <tomk@runbox.com> + +pkgname=mod_perl +pkgver=2.0.5 +pkgrel=5 +pkgdesc="Apache module that embeds the Perl interpreter within the server" +url="http://search.cpan.org/dist/${pkgname}/" +depends=('perl' 'apache' 'db' 'apr-util') +license=('APACHE') +arch=('i686' 'x86_64') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/${pkgname}-${pkgver}.tar.gz) +md5sums=('03d01d135a122bd8cebd0cd5b185d674') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} +} diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD index bcfd44008..790948675 100644 --- a/testing/binutils/PKGBUILD +++ b/testing/binutils/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 126772 2011-06-07 07:37:01Z allan $ +# $Id: PKGBUILD 129398 2011-06-27 11:06:48Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils -pkgver=2.21 -pkgrel=9 -_date=20110605 +pkgver=2.21.1 +pkgrel=1 +_date=20110627 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils/" license=('GPL') groups=('base') depends=('glibc>=2.14' 'zlib') -makedepends=('dejagnu') +checkdepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('a2e7784d5d66c1d692a0a1fa248ea66c') +md5sums=('2face559e80d649ba148e42bb2d1fb0f') mksource() { mkdir ${pkgname}-${_date} @@ -40,7 +40,7 @@ build() { --enable-plugins --enable-threads \ --enable-shared $CONFIGFLAG - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. + # check the host environment and makes sure all the necessary tools are available make configure-host make tooldir=${pkgdir}/usr diff --git a/testing/git/PKGBUILD b/testing/git/PKGBUILD index 713c5dd11..e4ae40280 100644 --- a/testing/git/PKGBUILD +++ b/testing/git/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 126224 2011-06-02 19:12:58Z dan $ +# $Id: PKGBUILD 129435 2011-06-27 17:14:23Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.5.4 +pkgver=1.7.6 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) url="http://git-scm.com/" license=('GPL2') -depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.12.2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0') makedepends=('python2' 'emacs') optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' @@ -47,7 +47,7 @@ package() { INSTALLDIRS=vendor DESTDIR="$pkgdir" install # bash completion - mkdir -p $pkgdir/etc/bash_completion.d/ + mkdir -p "$pkgdir"/etc/bash_completion.d/ install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git # more contrib stuff cp -a ./contrib $pkgdir/usr/share/git/ @@ -75,11 +75,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('4985b774db84d3bbcc2b8d90952552a3' - '7a74ef1c64395a07301359a8707c828a' +md5sums=('9e0a438eb71e89eedb61f89470ed32a0' + 'a017935cf9e90d9f056b6547c318fd15' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('fed9a6c7d07b063cfba9e3eb40fbd0d8120785225289fcf2fb56bee18dffd5ee' - '87d612195426fedfe4ee5274d9903e8f85aa16c410b4a3ba41610c23ed9211d7' +sha256sums=('778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082' + 'a0ffd7e16997262ef741db5e2dd8eabf44b6767cf1a213753c7d8a268b4553ad' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/testing/perl-xml-parser/PKGBUILD b/testing/perl-xml-parser/PKGBUILD index 46ffa0923..021aa1b05 100644 --- a/testing/perl-xml-parser/PKGBUILD +++ b/testing/perl-xml-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124562 2011-05-22 23:45:41Z andrea $ +# $Id: PKGBUILD 129383 2011-06-27 06:10:42Z andrea $ # Maintainer: # Contributor: firmicus <francois@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,8 +6,8 @@ pkgname=perl-xml-parser _realname=XML-Parser -pkgver=2.40 -pkgrel=3 +pkgver=2.41 +pkgrel=1 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') @@ -16,8 +16,8 @@ depends=('perl' 'expat') replaces=('perlxml') provides=("perlxml=${pkgver}") options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/${_realname}-${pkgver}.tar.gz") -md5sums=('c66e9adba003d0667cc40115ccd837a5') +source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/${_realname}-${pkgver}.tar.gz") +md5sums=('c320d2ffa459e6cdc6f9f59c1185855e') build() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD new file mode 100644 index 000000000..765b76685 --- /dev/null +++ b/testing/readline/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 129370 2011-06-27 05:49:47Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=readline +_basever=6.2 +_patchlevel=001 #prepare for some patches +pkgver=$_basever.$_patchlevel +pkgrel=2 +pkgdesc="GNU readline library" +arch=('i686' 'x86_64') +url="http://tiswww.case.edu/php/chet/readline/rltop.html" +license=('GPL') +depends=('glibc' 'ncurses') +backup=('etc/inputrc') +options=('!emptydirs') +install=readline.install +source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz + inputrc) +if [ $_patchlevel -gt 00 ]; then + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p)) + done +fi +md5sums=('67948acb2ca081f23359d0256e9a271c' + '58d54966c1191db45973cb3191ac621a' + '83287d52a482f790dfb30ec0a8746669') + +build() { + cd ${srcdir}/${pkgname}-$_basever + for p in ../readline${_basever//./}-*; do + [ -e "$p" ] || continue + msg "applying patch ${p}" + patch -Np0 -i ${p} + done + + # Remove RPATH from shared objects (FS#14366) + sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf + + # build with -fPIC for x86_64 (FS#15634) + [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" + + ./configure --prefix=/usr --libdir=/lib + make SHLIB_LIBS=-lncurses +} + +package() { + cd ${srcdir}/${pkgname}-$_basever + make DESTDIR=${pkgdir} install + + install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc + + # FHS recommends only shared libs in /lib + install -dm755 $pkgdir/usr/lib + mv $pkgdir/lib/*.a $pkgdir/usr/lib + + # to make the linker find the shared lib and fix compile issues + cd ${pkgdir}/usr/lib + ln -sv /lib/libreadline.so . + ln -sv /lib/libhistory.so . +} diff --git a/testing/readline/inputrc b/testing/readline/inputrc new file mode 100644 index 000000000..fd13a673b --- /dev/null +++ b/testing/readline/inputrc @@ -0,0 +1,36 @@ +# do not bell on tab-completion +#set bell-style none + +set meta-flag on +set input-meta on +set convert-meta off +set output-meta on + +$if mode=emacs + +# for linux console and RH/Debian xterm +"\e[1~": beginning-of-line +"\e[4~": end-of-line +"\e[5~": beginning-of-history +"\e[6~": end-of-history +"\e[7~": beginning-of-line +"\e[3~": delete-char +"\e[2~": quoted-insert +"\e[5C": forward-word +"\e[5D": backward-word +"\e\e[C": forward-word +"\e\e[D": backward-word +"\e[1;5C": forward-word +"\e[1;5D": backward-word + +# for rxvt +"\e[8~": end-of-line + +# for non RH/Debian xterm, can't hurt for RH/DEbian xterm +"\eOH": beginning-of-line +"\eOF": end-of-line + +# for freebsd console +"\e[H": beginning-of-line +"\e[F": end-of-line +$endif diff --git a/testing/readline/readline.install b/testing/readline/readline.install new file mode 100644 index 000000000..06b646f23 --- /dev/null +++ b/testing/readline/readline.install @@ -0,0 +1,17 @@ +infodir=usr/share/info +filelist=(history.info readline.info rluserman.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + |