diff options
80 files changed, 1653 insertions, 295 deletions
diff --git a/community-staging/dsniff/PKGBUILD b/community-staging/dsniff/PKGBUILD new file mode 100644 index 000000000..f7428aa09 --- /dev/null +++ b/community-staging/dsniff/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 49679 2011-06-19 07:23:27Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: ViNS <gladiator@fastwebnet.it> + +pkgname=dsniff +pkgver=2.4b1 +pkgrel=20 +pkgdesc="Collection of tools for network auditing and penetration testing" +url="http://www.monkey.org/~dugsong/dsniff/" +arch=('i686' 'x86_64') +license=('BSD') +depends=('libpcap' 'openssl' 'libxmu' 'glib2' 'libnet' 'libnids') +source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz" + "http://ftp.de.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_2.4b1+debian-18.diff.gz") +md5sums=('2f761fa3475682a7512b0b43568ee7d6' + 'fbc9f62f9ab2f98f24f53ad497c1ce5d') + +build() { + cd $srcdir/$pkgname-2.4 + patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff + for i in *.dpatch; do + patch -N < "$i" + done + + LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir"/$pkgname-2.4 + make prefix="$pkgdir"/usr install + install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE + + install -d "$pkgdir"/usr/share + mv "$pkgdir"/usr/man "$pkgdir"/usr/share/ +} diff --git a/community-staging/xemacs/PKGBUILD b/community-staging/xemacs/PKGBUILD new file mode 100644 index 000000000..8e7d3fe69 --- /dev/null +++ b/community-staging/xemacs/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 49690 2011-06-19 10:01:11Z ebelanger $ +# Maintainer: juergen <juergen@archlinux.org> +# Contributor : Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=xemacs +pkgver=21.5.31 +pkgrel=2 +pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs" +arch=('i686' 'x86_64') +url="http://www.xemacs.org/" +license=('GPL') +depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib') +optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface' + 'xorg-fonts-100dpi: X bitmap fonts needed for the interface') +makedepends=('xbitmaps') +install=xemacs.install +source=(http://ftp.xemacs.org/pub/xemacs/beta/$pkgname-$pkgver.tar.gz + xemacs.desktop + xemacs-21.5.29-optimization-bug.patch) +md5sums=('0185fe905d0b8d8d094d9b60cf262d4a' + 'a4d3d5c0aa2c7ce7bec491f809ca3694' + 'eb061b10ea3bbe1026df5326ae1618e3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + +# Fix problem caused by improper optimization with GCC>=4.1.2 on i686 +# (and possibly other arches). See +# http://tracker.xemacs.org/XEmacs/its/issue354 +# for the upstream bug report. + patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch + + ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \ + --without-postgresql --with-athena=xaw \ + --enable-database=berkdb --without-ldap \ + --enable-menubars=lucid --enable-scrollbars=lucid \ + --enable-widgets=athena --enable-dialogs=athena \ + --enable-external-widget \ + --with-jpeg --with-png --with-tiff \ + --with-ncurses --with-pop --with-xfs --disable-sound \ + --infodir=/usr/share/info \ + --with-mule \ + --mandir=/usr/share/man/man1 + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" infodir="${pkgdir}/usr/share/info" install gzip-el + + rm "${pkgdir}"/usr/bin/{b2m,ctags,etags} + rm "${pkgdir}"/usr/share/man/man1/{ctags.1,etags.1} + + # fix FS#7927 + install -d -m755 "${pkgdir}/usr/share/pixmaps" + install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + ln -sf /usr/share/xemacs-${pkgver%.*}-b${pkgver##*.}/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/xemacs-icon.xpm" + + # correct permissions + chown -R root:root "${pkgdir}" + + rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info} +} +# vim: ts=2 sw=2 et ft=sh diff --git a/community-staging/xemacs/xemacs-21.5.29-optimization-bug.patch b/community-staging/xemacs/xemacs-21.5.29-optimization-bug.patch new file mode 100644 index 000000000..32a1a02c2 --- /dev/null +++ b/community-staging/xemacs/xemacs-21.5.29-optimization-bug.patch @@ -0,0 +1,14 @@ +Work around a GCC optimization bug as described in +http://tracker.xemacs.org/XEmacs/its/issue354 + +--- src/dumper.c.~1~ 2008-01-26 09:54:11.000000000 +0100 ++++ src/dumper.c 2008-05-03 10:17:03.000000000 +0200 +@@ -2584,7 +2584,7 @@ + #endif /* !WIN32_NATIVE */ + + +-static int ++int + pdump_file_try (Wexttext *exe_path) + { + Wexttext *w = exe_path + wext_strlen (exe_path); diff --git a/community-staging/xemacs/xemacs.desktop b/community-staging/xemacs/xemacs.desktop new file mode 100644 index 000000000..257c56947 --- /dev/null +++ b/community-staging/xemacs/xemacs.desktop @@ -0,0 +1,34 @@ +[Desktop Entry] +Name=XEmacs Text Editor +Name[bg]=редактор XEmacs +Name[ca]=Editor XEmacs +Name[cs]=Editor XEmacs +Name[da]=XEmacs tekstredigerer +Name[de]=XEmacs Texteditor +Name[eo]=La redaktilo XEmakso +Name[es]=Emacs para X +Name[et]=Emacs X'i kasutajaliidesega +Name[fi]=XEmacs editori +Name[fr]=Éditeur XEmacs +Name[hu]=XEmacs szövegszerkesztő +Name[is]=XEmacs-ritill +Name[it]=Emacs per X +Name[ja]=XEmacs テキスト・エディター +Name[mk]=Софистицираниот XEmacs уредувач +Name[no]=XEmacs-tekstredigerer +Name[pt]=Editor XEmacs +Name[ro]=Editorul XEmacs +Name[ru]=Редактор XEmacs +Name[sk]=Editor XEmacs +Name[sl]=Urejevalnik XEmacs +Name[uk]=Редактор XEmacs +GenericName=Text Editor +Comment=Edit text +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=xemacs %f +Icon=/usr/share/pixmaps/xemacs-icon.xpm +Type=Application +Terminal=false +Categories=Development;TextEditor; +Encoding=UTF-8 +StartupWMClass=Emacs diff --git a/community-staging/xemacs/xemacs.install b/community-staging/xemacs/xemacs.install new file mode 100644 index 000000000..a04ee187f --- /dev/null +++ b/community-staging/xemacs/xemacs.install @@ -0,0 +1,35 @@ +infodir=usr/share/info +filelist=(beta.info.gz custom.info.gz + emodules.info.gz external-widget.info.gz + internals.info-1.gz internals.info-2.gz + internals.info-3.gz internals.info-4.gz + internals.info-5.gz internals.info.gz + lispref.info-1.gz lispref.info-10.gz + lispref.info-2.gz lispref.info-3.gz + lispref.info-4.gz lispref.info-5.gz + lispref.info-6.gz lispref.info-7.gz + lispref.info-8.gz lispref.info-9.gz + lispref.info.gz new-users-guide.info.gz + term.info.gz termcap.info.gz + xemacs-faq.info-1.gz xemacs-faq.info-2.gz + xemacs-faq.info.gz xemacs.info-1.gz + xemacs.info-2.gz xemacs.info-3.gz + xemacs.info-4.gz xemacs.info.gz) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done + update-desktop-database -q +} diff --git a/community-testing/libquicktime/PKGBUILD b/community-testing/libquicktime/PKGBUILD new file mode 100644 index 000000000..5fe871b79 --- /dev/null +++ b/community-testing/libquicktime/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 49623 2011-06-18 18:04:57Z ibiru $ +# Maintainer: Mateusz Herych <heniekk@gmail.com> + +pkgname=libquicktime +pkgver=1.2.2 +pkgrel=3 +pkgdesc="A library for reading and writing quicktime files." +arch=('i686' 'x86_64') +license=('GPL') +url="http://libquicktime.sourceforge.net/" +depends=('gtk2' 'ffmpeg' 'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2' 'faac') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --enable-gpl \ + --with-ffmpeg \ + --with-x264 \ + --without-doxygen + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + diff --git a/community/ascii/PKGBUILD b/community/ascii/PKGBUILD index d98c31f7b..243e6aafe 100644 --- a/community/ascii/PKGBUILD +++ b/community/ascii/PKGBUILD @@ -1,26 +1,32 @@ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> +# Contributor: Grigorios Bouzakis <grbzks@xsmail.com> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=ascii -pkgver=3.8 +pkgver=3.11 pkgrel=1 +pkgdesc="Utility for conversion between various byte representations and the ASCII character table" arch=('i686' 'x86_64') -pkgdesc="Report character aliases and codes" -url="http://www.catb.org/~esr/ascii/" -depends=('glibc') -license=('GPL2') -source=("http://www.catb.org/~esr/ascii/$pkgname-$pkgver.tar.gz") -md5sums=('8fb7540bf2a7a8e1fa0086708ed9b881') +url="http://www.catb.org/~esr/ascii" +license=('BSD') +source=("http://www.catb.org/~esr/ascii/ascii-${pkgver}.tar.gz") +md5sums=('ba8a9392f8aa8c6b7a52923fba870579') build() { - cd $srcdir/"$pkgname"-"$pkgver" + cd ascii-${pkgver} - make ascii ascii.1 + make } package() { - cd $srcdir/"$pkgname"-"$pkgver" - install -D -m 755 ascii "$pkgdir"/usr/bin/ascii - install -D -m 644 ascii.1 "$pkgdir"/usr/share/man/man1/ascii.1 -} + cd ascii-${pkgver} + + install -D ascii \ + ${pkgdir}/usr/bin/ascii + install -D -m644 ascii.1 \ + ${pkgdir}/usr/share/man/man1/ascii.1 + + install -D -m644 COPYING \ + ${pkgdir}/usr/share/licenses/ascii/LICENSE +} diff --git a/community/eiciel/PKGBUILD b/community/eiciel/PKGBUILD index 6ed083a7f..057c3fe28 100644 --- a/community/eiciel/PKGBUILD +++ b/community/eiciel/PKGBUILD @@ -1,35 +1,27 @@ -# $Id: PKGBUILD 33518 2010-11-25 04:43:14Z foutrelis $ +# $Id: PKGBUILD 49658 2011-06-18 21:23:03Z ebelanger $ # Contributor: Roman Kyrylych <roman@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=eiciel -pkgver=0.9.8 -pkgrel=2 +pkgver=0.9.8.1 +pkgrel=1 pkgdesc="GNOME file ACL editor" arch=('i686' 'x86_64') url="http://rofi.roger-ferrer.org/eiciel/" license=('GPL') -depends=('acl' 'gtkmm' 'nautilus' 'desktop-file-utils' 'gnome-vfs' 'libgnome' - 'libgnomeui') +depends=('acl' 'gtkmm3' 'nautilus' 'desktop-file-utils' 'gnome-vfs') options=('!libtool') install=eiciel.install source=(http://rofi.roger-ferrer.org/eiciel/download/${pkgname}-${pkgver}.tar.bz2) -md5sums=('5e515a6f92cff0824a8a93f38c553c0b') +md5sums=('2c9c459f0604ce03ec49bb425cc42681') build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-scrollkeeper - + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/eiciel/eiciel.install b/community/eiciel/eiciel.install index a203bc01d..80312d4a6 100644 --- a/community/eiciel/eiciel.install +++ b/community/eiciel/eiciel.install @@ -2,15 +2,10 @@ post_install() { update-desktop-database -q } -pre_upgrade() { - pre_remove $1 -} - post_upgrade() { - post_install $1 + update-desktop-database -q } post_remove() { update-desktop-database -q } - diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index dd4b57014..c4b934aad 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 27614 2010-09-26 06:47:20Z ebelanger $ +# $Id: PKGBUILD 49560 2011-06-18 07:28:14Z andrea $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=electricsheep @@ -12,7 +12,7 @@ depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade') makedepends=('xscreensaver') optdepends=('xscreensaver: to use electricsheep with xscreensaver') changelog=ChangeLog -source=(ftp://ftp.archlinux.org/other/electricsheep/${pkgname}-${pkgver}.tar.bz2) +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('9c66691538941593ca9442e087b183d1') sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32') diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD index 469adf4b8..a3250ded2 100755 --- a/community/emesene/PKGBUILD +++ b/community/emesene/PKGBUILD @@ -1,9 +1,10 @@ +# $Id: PKGBUILD 49565 2011-06-18 07:30:46Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Claudio Riva <firetux83@gmail.com> pkgname=emesene pkgver=2.11.5 -pkgrel=1 +pkgrel=2 pkgdesc="A pygtk MSN Messenger client" url="http://www.emesene.org/" license=('custom:PSF' 'GPL' 'LGPL2.1') @@ -20,12 +21,12 @@ optdepends=('gnome-python-extras: spell-check plugin' 'pywebkitgtk: for alternative conversation window' 'xmpppy: for gtalk and facebook chat support' 'pyqt: alternative qt4 interface (emesene -e main:qt4_main') -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" \ - 'emesene.run') +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'emesene.run') install=emesene.install options=('!libtool') sha1sums=('54e5fe81e99ddf5909b50c1c4f938480ed43f691' - '2d72b485875803d4675d1e1b36c90778e4475651') + 'fee7a7731b32f6fe0b5ade1abc06115bcef92c41') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -55,4 +56,3 @@ package() { # create executable install -Dm755 ${srcdir}/emesene.run ${pkgdir}/usr/bin/emesene } - diff --git a/community/emesene/emesene.run b/community/emesene/emesene.run index 3b0aacdf9..eca282589 100644 --- a/community/emesene/emesene.run +++ b/community/emesene/emesene.run @@ -1,3 +1,2 @@ #!/bin/bash -python2 /usr/share/emesene/emesene.py $@ - +python2 /usr/share/emesene/emesene.py "$@" diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 02cc11ffd..35d8e14dd 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 47971 2011-05-26 16:56:27Z ibiru $ +# $Id: PKGBUILD 49674 2011-06-19 07:22:21Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Contributor: Hugo Doria <hugo@archlinux.org> #Contributor: Sergej Chodarev <sergejx@centrum.sk> #Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=1 pkgdesc="Set of plugins for gedit" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ depends=('gedit' 'dbus-python') makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=gedit-plugins.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.bz2) -sha256sums=('d574accc1238fb45759c7b088154f934cdd1ef8f7dcb42420db02ee73a46af4b') +source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.xz) +sha256sums=('e1e16790300f7f51a1f2e6871e7b0604d9e242e507533697b529380d25a24879') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/iat/PKGBUILD b/community/iat/PKGBUILD index 4c5b876dd..1a965d77b 100644 --- a/community/iat/PKGBUILD +++ b/community/iat/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 4868 2009-11-01 21:39:07Z ibiru $ -# Maintainer: Biru Ionut <ionut@archlinux.ro> +# $Id: PKGBUILD 49702 2011-06-19 11:29:43Z andrea $ +# Maintainer: +# Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Jeff Mickey <jeff@archlinux.org> pkgname=iat pkgver=0.1.7 -pkgrel=2 +pkgrel=3 pkgdesc="Detects many formats of cd-rom image files (BIN,MDF,PDI,CDI,NRG,B5I) and converts them to ISO-9660" arch=('i686' 'x86_64') url="http://iat.berlios.de/" license=('GPL') depends=('glibc') -makedepends=() -source=(http://download.berlios.de/iat/$pkgname-$pkgver.tar.bz2) +source=("http://download.berlios.de/${pkgname}/$pkgname-$pkgver.tar.bz2") +md5sums=('5e1ffd82000ea4c80ffb2d63ae55120c') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --includedir=/usr/include/$pkgname - make || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('5e1ffd82000ea4c80ffb2d63ae55120c') diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD index 17405e25b..21e96f09d 100644 --- a/community/luasocket/PKGBUILD +++ b/community/luasocket/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 41828 2011-03-09 12:08:16Z spupykin $ +# $Id: PKGBUILD 49637 2011-06-18 20:20:18Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Anders Bergh <anders1@gmail.com> pkgname=luasocket pkgver=2.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Luasocket is the most comprehensive networking support library for the Lua language." arch=('i686' 'x86_64') url="http://www.cs.princeton.edu/~diego/professional/luasocket/" license=('MIT') depends=(lua) source=(http://luaforge.net/frs/download.php/2664/luasocket-$pkgver.tar.gz - lua-license.html::http://www.lua.org/copyright.html luasocket-arch.patch luasocket-unixsocket.patch) md5sums=('41445b138deb7bcfe97bff957503da8e' - '54af76b72c22a75aa468cb688017e78e' '3270f42ff374f230c6450f49132f8625' '8d116bb70bd7a2fa15cbe949d4cfc35e') @@ -25,5 +23,5 @@ build() { patch -p1 < $srcdir/luasocket-unixsocket.patch make make DESTDIR="$pkgdir" install - install -D -m0644 $srcdir/lua-license.html $pkgdir/usr/share/licenses/$pkgname/lua-license.html + install -D -m0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/mediastreamer/PKGBUILD b/community/mediastreamer/PKGBUILD new file mode 100644 index 000000000..3eed51d6d --- /dev/null +++ b/community/mediastreamer/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 49670 2011-06-19 06:56:40Z andrea $ +# Maintainer: 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/community/mediastreamer/disable-v4l1.patch b/community/mediastreamer/disable-v4l1.patch new file mode 100644 index 000000000..9f6cb84d4 --- /dev/null +++ b/community/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/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD index 06a9eacd0..9bf37940b 100644 --- a/community/ngspice/PKGBUILD +++ b/community/ngspice/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 39270 2011-02-07 23:09:46Z bisson $ -# Maintainer: Abhishek Dasgupta <abhidg@gmail.com> +# $Id: PKGBUILD 49542 2011-06-18 04:13:44Z kkeen $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: Jason Taylor <jftaylor21@gmail.com> pkgname=ngspice -pkgver=22 +pkgver=23 pkgrel=1 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.' url='http://ngspice.sourceforge.net' @@ -11,7 +12,7 @@ license=('BSD') arch=('i686' 'x86_64') depends=('libxaw' 'libedit') source=("http://downloads.sourceforge.net/$pkgname/$pkgver/ngspice-$pkgver.tar.gz") -sha1sums=('abb232613fb4859f17bcdefeef869e702bd3f0dc') +sha1sums=('65fa23d1168cb3af7651b990344f763c77bf6132') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD new file mode 100644 index 000000000..c878b3563 --- /dev/null +++ b/community/pcsxr/PKGBUILD @@ -0,0 +1,28 @@ +## Maintainer: schuay <jakob.gruber@gmail.com> +## Contributor: quantax -- contact via Arch Linux forum or AUR +## Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=pcsxr +pkgver=1.9.92 +pkgrel=3 +pkgdesc='A Sony PlayStation emulator based on the PCSX-df Project' +arch=('i686' 'x86_64') +url='http://pcsxr.codeplex.com/' +license=('GPL') +depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'mesa') +conflicts=('pcsx-df') +_pkgurl="http://download.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=$pkgname&DownloadId=140521&FileTime=129254829621800000&Build=$(wget -qO - http://www.codeplex.com/ | sed -nr 's/^[[:space:]]*Version [[:digit:]]{4}\.([[:digit:]]{1,2}\.){2}([[:digit:]]+)[[:space:]]*$/\2/p' | tail -n 1)" +source=($pkgname-$pkgver.tar.bz2::$_pkgurl) +md5sums=('28411aed0b4424f97227d94bdefaec83') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-libcdio --enable-opengl + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 0fc9a2d88..961c6bc99 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=qbittorrent -pkgver=2.8.1 +pkgver=2.8.2 pkgrel=1 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('python2: needed for search' install='qbittorrent.install' source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz" 'python2.patch') -md5sums=('4fb4490117a0909f1f0989b4b797b41a' +md5sums=('58008b6b0233c7997067a61cf07af50d' 'db0d79fee8ce3470ad3741d36b02a94c') build() { diff --git a/community/qgis/PKGBUILD b/community/qgis/PKGBUILD index ed384fa0f..377c9e6e6 100644 --- a/community/qgis/PKGBUILD +++ b/community/qgis/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 46475 2011-05-07 18:42:52Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=qgis -pkgver=1.6.0 -pkgrel=6 +pkgver=1.7.0 +pkgrel=1 pkgdesc='A Geographic Information System (GIS) that supports vector, raster & database formats' url='http://qgis.org/' license=('GPL') arch=('i686' 'x86_64') # update to http://www.qgis.org/wiki/Building_QGIS_from_Source#Overview depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'qt' 'python2' 'python2-qt' 'giflib' 'xerces-c' 'cfitsio' 'qwt' 'gdal') -makedepends=('grass' 'gsl' 'postgis' 'netcdf' 'cmake' 'fcgi' 'python2-sip') +makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip' 'txt2tags') optdepends=('postgis: postgis support and SPIT plugin' 'fcgi: qgis mapserver' 'python2-sip: python-support' 'grass: grass plugin' 'gsl: georeferencer ') options=('!makeflags') -source=("http://qgis.org/downloads/${pkgname}-${pkgver}.tar.bz2" +source=("http://qgis.org/downloads/qgis-${pkgver}.tar.bz2" 'qgis.desktop' 'ticket_3378.diff') -md5sums=('9ea8a784d970f5009b0e6271820248f6' +md5sums=('d8506990f52563d39c7b916f500f282f' '8ab66039f2aba519b92f52272ec3c13e' '402f3d39a344367fd55bdaa324deb797') @@ -30,16 +29,16 @@ build() { # Fix insecure RPATH is weird, but just works ;) # echo "os.system(\"sed -i '/^LFLAGS/s|-Wl,-rpath,.\+ ||g' gui/Makefile core/Makefile\")" >> python/configure.py.in - cd ${pkgname}-${pkgver} + #cd qgis-${pkgver} # fix compilation error https://trac.osgeo.org/qgis/ticket/3378 - patch -Np3 -i ${srcdir}/ticket_3378.diff - cd ${srcdir} + #patch -Np3 -i ${srcdir}/ticket_3378.diff + #cd ${srcdir} rm -rf build mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../qgis-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -55,6 +54,6 @@ package() { make DESTDIR=${pkgdir} install # install some freedesktop.org compatibility - install -D -m644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -D -m644 ${srcdir}/qgis.desktop \ + ${pkgdir}/usr/share/applications/qgis.desktop } diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index af0593ccc..dd879bd65 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,10 +1,13 @@ -# $Id: PKGBUILD 48966 2011-06-08 20:39:27Z schiv $ +# $Id: PKGBUILD 49619 2011-06-18 17:40:00Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: sickhate <sickhate@tux-linux.net> +# TODO: +# bring in pyalsa, csound, mma + pkgname=solfege -pkgver=3.18.8 +pkgver=3.20.0 pkgrel=1 pkgdesc="Music education and ear training software" arch=('i686' 'x86_64') @@ -13,22 +16,24 @@ license=('GPL3') depends=('pygtk' 'libgtkhtml') makedepends=('ghostscript' 'gnome-doc-utils' 'librsvg' 'libxslt' 'lilypond' 'swig' 'texinfo' 'txt2man' 'pkg-config') -optdepends=('timidity++: Software MIDI support') +optdepends=('timidity++: or any MIDI player & MIDI-WAV converter' + 'mpg123: or any MP3 player' + 'lame: or any WAV-MP3 converter' + 'vorbis-tools: or any OGG player & WAV-OGG converter' + 'lilypond: for generating print-outs & score sheets' + 'texlive-bin: use LaTeX to replace HTML reports with DVI') changelog=$pkgname.changelog -install=$pkgname.install -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'solfege.desktop') -md5sums=('5e166de37f223b79e78c656661828e5d' - '22b89dcfd9e7c98ab238942139b8a970') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('3deb355d57f009201f2c5486b93c5950') build() { cd "$srcdir/$pkgname-$pkgver" - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done + # python2 fix for entire build + export PYTHON=/usr/bin/python2 + + # python2 fix for rogue Makefile + sed -i 's/shell python/shell python2/g' help/Makefile ./configure --prefix=/usr \ --sysconfdir=/etc @@ -38,10 +43,13 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + # python2 fix for runtime + for i in $(find "$pkgdir" -name '*.py'); do + sed -i 's:^#!.*bin/python$:#!/usr/bin/python2:' "$i" + sed -i 's:^#!.*bin/env python$:#!/usr/bin/env python2:' "$i" + done - install -Dm644 ../$pkgname.desktop \ - "$pkgdir/usr/share/applications/$pkgname.desktop" + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/solfege/solfege.changelog b/community/solfege/solfege.changelog index a2c6f173b..b42401c9c 100644 --- a/community/solfege/solfege.changelog +++ b/community/solfege/solfege.changelog @@ -1,3 +1,14 @@ +2011-06-17 Ray Rashif <schiv@archlinux.org> + + * 3.20.0-1: + Upstream release + Added some optional dependencies + Removed install file; + timidity is now the default synthesizer + users should be able to figure stuff out + Removed desktop file; + already included in upstream tarball + 2010-10-02 Ray Rashif <schiv@archlinux.org> * Version bump: 3.17.0 diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 5a7415639..11f396d2e 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="An open-source, single-player, role-playing roguelike game of exploration and treasure-hunting" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('custom') install=('stone-soup.install') source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.bz2" "${pkgname}.desktop") -md5sums=('cac7ae05da835bd87ace3b4de3822eb9' +md5sums=('7ddeb1ff048401e55af0d1c11038f937' '98be780cddb2a0915bbab15ad93644f1') build() { diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD index f14eae4e0..69ebd635d 100644 --- a/community/xmlrpc-c/PKGBUILD +++ b/community/xmlrpc-c/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: $ +# $Id: PKGBUILD 49552 2011-06-18 07:22:08Z andrea $ +# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Vitaliy Berdinskikh <skipper13@root.ua> -# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com> pkgname=xmlrpc-c pkgver=1858 @@ -13,7 +13,7 @@ license=('custom:xmlrpc-c') depends=('curl' 'libxml2' 'gcc-libs' 'zlib') makedepends=('libtool') options=('!makeflags' '!libtool') -source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2") +source=("ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('2bd41d1827ebd12ca8f0b9ef0b015228') build() { @@ -27,10 +27,14 @@ build() { --disable-libwww-client \ --disable-wininet-client - make CFLAGS_PERSONAL="${CFLAGS}" || return 1 + make CFLAGS_PERSONAL="${CFLAGS}" +} + +package() { + cd $srcdir/$pkgname make DESTDIR=$pkgdir install - install -m 644 -D doc/COPYING $pkgdir/usr/share/licenses/${pkgname}/COPYING + install -m 644 -D doc/COPYING $pkgdir/usr/share/licenses/${pkgname}/LICENSE mv $pkgdir/usr/man $pkgdir/usr/share/man } # vim:set ts=2 sw=2 et: diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index 428c837e3..a455e705b 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,7 +3,7 @@ pkgname='cronie' pkgver=1.4.7 -pkgrel=8 +pkgrel=9 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -19,7 +19,7 @@ source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.t sha1sums=('c6644ba0e58bcb14e0bb3f925e3e8cc3f0d47a7f' '0f279b8fb820340267d578dc85511c980715f91e' '4059bc4ccb75f08b0d4970940799e5d9722b339f' - '6d8aef6880935b3dcc3e28481111d036544eeae5' + '5eff7fb31f6bc0a924243ff046704726cf20c221' 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') backup=('etc/crontab' diff --git a/core/cronie/pam.d b/core/cronie/pam.d index 094051b5e..9a254ebc0 100644 --- a/core/cronie/pam.d +++ b/core/cronie/pam.d @@ -1,7 +1,10 @@ +auth required pam_unix.so +auth required pam_env.so + account required pam_access.so -account required pam_time.so account required pam_unix.so +account required pam_time.so +session required pam_loginuid.so session required pam_limits.so -session required pam_env.so session required pam_unix.so diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD index 57bc2bddd..d33875673 100644 --- a/extra/asymptote/PKGBUILD +++ b/extra/asymptote/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 110553 2011-02-19 22:20:32Z remy $ +# $Id: PKGBUILD 127783 2011-06-18 10:36:42Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: Firmicus <francois.archlinux.org> # Contributor: bender02 at gmx dot com pkgname=asymptote -pkgver=2.08 +pkgver=2.11 pkgrel=1 pkgdesc="A vector graphics language (like metapost)" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('python2: for the xasy GUI' 'tix: for the xasy GUI') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) install=texlive.install -sha1sums=(6b81336727458f7fdcc3db972f1e63b3bfc1a93b) +sha1sums=('fde16f05bddb9e86a4dd05f25369f35c771fb84b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,6 +28,12 @@ build() { --with-context=/usr/share/texmf/tex/context make all } + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check-all +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install-all diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD index 2fb8e57f5..67502ca6c 100644 --- a/extra/cln/PKGBUILD +++ b/extra/cln/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108622 2011-02-02 01:45:45Z eric $ +# $Id: PKGBUILD 127750 2011-06-18 05:06:20Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=cln -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="Class library for numbers" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ makedepends=('texlive-core') options=('!libtool') install=cln.install source=(ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ede584cb1cafa66d56f42a3cf420469d') -sha1sums=('351506da9bd7b0b3cefd3a5424823797fb589acc') +md5sums=('d897cce94d9c34d106575ed4ec865d71') +sha1sums=('c30dca80e75f45e2107f233075e6d0339ea884b0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/cln/cln.install b/extra/cln/cln.install index 7706dea0c..35df785e0 100644 --- a/extra/cln/cln.install +++ b/extra/cln/cln.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(cln.info.gz) post_install() { diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD index 755dc23a1..d6cc0b4f7 100644 --- a/extra/festival/PKGBUILD +++ b/extra/festival/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102549 2010-12-08 06:43:53Z schiv $ +# $Id: PKGBUILD 127865 2011-06-19 00:11:13Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Simo Leone <neotuli@gmail.com> @@ -6,7 +6,7 @@ pkgname=festival pkgver=2.1 _suffix=release -pkgrel=1 +pkgrel=2 pkgdesc="A general multi-lingual speech synthesis system" arch=('i686' 'x86_64') url="http://www.cstr.ed.ac.uk/projects/festival/" @@ -30,17 +30,17 @@ md5sums=('c93eb3e389ed171ab9abd46afe8897a8' build() { # Build Speech Tools first - cd $srcdir/speech_tools - patch -Np1 -i $srcdir/speechconfig.patch + cd "$srcdir/speech_tools" + patch -Np1 -i "$srcdir/speechconfig.patch" ./configure --prefix=/usr --sysconfdir=/etc make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" # Build Festival itself - cd $srcdir/festival - patch -Np1 -i $srcdir/festconfig.patch + cd "$srcdir/festival" + patch -Np1 -i "$srcdir/festconfig.patch" - # Aviod make failure on making scripts and docs + # Avoid make failure on making scripts and docs sed -i "s#examples bin doc#examples#" Makefile ./configure --prefix=/usr --sysconfdir=/etc @@ -49,62 +49,72 @@ build() { package() { # Install Speech Tools first - cd $srcdir/speech_tools - install -dm755 $pkgdir/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}} + cd "$srcdir/speech_tools" + install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}} #binaries #move binaries over wrappers (FS#7864) - for i in `grep -l 'EST shared script' bin/*`; do + for i in $(grep -l 'EST shared script' bin/*); do cp -f main/$(basename $i) bin; done - install -m755 -t $pkgdir/usr/bin bin/[a-z]* - rm -f $pkgdir/usr/bin/{est_gdb,est_examples,est_program} + install -m755 -t "$pkgdir"/usr/bin bin/[a-z]* + rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program} #libraries - install -m755 -t $pkgdir/usr/lib lib/lib*.so.* - ln -sf libestbase.so.${pkgver}.1 $pkgdir/usr/lib/libestbase.so - ln -sf libeststring.so.1.2 $pkgdir/usr/lib/libeststring.so - install -m644 -t $pkgdir/usr/lib lib/lib*.a + install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.* + ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so + ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so + install -m644 -t "$pkgdir"/usr/lib lib/lib*.a #headers for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do - install -m644 -t ${pkgdir}/usr/include/speech_tools/$dir include/$dir/*.h + install -m644 -t "${pkgdir}"/usr/include/speech_tools/$dir include/$dir/*.h done # Install Festival itself - cd $srcdir/festival + cd "$srcdir"/festival #binaries - install -m755 src/main/festival $pkgdir/usr/bin/ - install -m755 src/main/festival_client $pkgdir/usr/bin/ - install -m755 examples/text2wave $pkgdir/usr/bin - install -m755 examples/saytime $pkgdir/usr/bin/ + install -m755 src/main/festival "$pkgdir"/usr/bin/ + install -m755 src/main/festival_client "$pkgdir"/usr/bin/ + install -m755 examples/benchmark "$pkgdir"/usr/bin/ + install -m755 examples/dumpfeats "$pkgdir"/usr/bin/ + install -m755 examples/durmeanstd "$pkgdir"/usr/bin/ + install -m755 examples/latest "$pkgdir"/usr/bin/ + install -m755 examples/make_utts "$pkgdir"/usr/bin/ + install -m755 examples/powmeanstd "$pkgdir"/usr/bin/ + install -m755 examples/run-festival-script "$pkgdir"/usr/bin/ + install -m755 examples/saytime "$pkgdir"/usr/bin/ + install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/ + install -m755 examples/text2pos "$pkgdir"/usr/bin/ + install -m755 examples/text2wave "$pkgdir"/usr/bin #libraries - install -m644 src/lib/libFestival.a $pkgdir/usr/lib/ + install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/ #headers - install -dm755 $pkgdir/usr/include/festival - install -m644 -t $pkgdir/usr/include/festival src/include/*.h + install -dm755 "$pkgdir"/usr/include/festival + install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h - mkdir -p $pkgdir/usr/share/festival - #install -m644 -t $pkgdir/usr/share/festival lib/*.scm + mkdir -p "$pkgdir"/usr/share/festival + #install -m644 -t "$pkgdir"/usr/share/festival lib/*.scm #need to clean up but requires knowing which files are actually needed... - cp -aR lib/* $pkgdir/usr/share/festival - rm -f $(find $pkgdir/usr/share/festival -name Makefile) + cp -aR lib/* "$pkgdir"/usr/share/festival + rm -f $(find "$pkgdir"/usr/share/festival -name Makefile) + rm -f $(find "$pkgdir"/usr/bin -name Makefile) #create voices directory - install -dm755 $pkgdir/usr/share/festival/voices + install -dm755 "$pkgdir"/usr/share/festival/voices #licenses - install -D -m644 $srcdir/festival/COPYING \ - $pkgdir/usr/share/licenses/$pkgname/LICENSE - install -D -m644 $srcdir/speech_tools/README \ - $pkgdir/usr/share/licenses/$pkgname/LICENSE.other + install -D -m644 "$srcdir"/festival/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + install -D -m644 "$srcdir"/speech_tools/README \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other ################################################################# # Ok now some general cleanups - for i in `find $pkgdir/usr/include/ -type f`; do + for i in $(find "$pkgdir"/usr/include/ -type f); do sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \ -e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \ -e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \ diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD index ce6175f96..8f4b2c5c9 100644 --- a/extra/garcon/PKGBUILD +++ b/extra/garcon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119882 2011-04-16 11:21:52Z andyrtr $ +# $Id: PKGBUILD 127908 2011-06-19 16:23:50Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> pkgname=garcon -pkgver=0.1.7 +pkgver=0.1.8 pkgrel=1 pkgdesc="implementation of the freedesktop.org menu specification" arch=('i686' 'x86_64') @@ -14,9 +14,9 @@ depends=('glib2') # 'perl') makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools>=4.7.4') conflicts=('garcon-git') replaces=('libxfce4menu') -options=('!libtool') +options=('!libtool' '!makeflags') source=(http://archive.xfce.org/src/libs/garcon/0.1/garcon-${pkgver}.tar.bz2) -md5sums=('8990668e4f2fecffe124f613b6e1e01f') +md5sums=('18fbf523ed2865dfaccdfb40b4b20b05') build() { cd ${srcdir}/garcon-${pkgver} diff --git a/extra/gnome-utils/PKGBUILD b/extra/gnome-utils/PKGBUILD index fdfbac8c8..cbdd24beb 100644 --- a/extra/gnome-utils/PKGBUILD +++ b/extra/gnome-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120619 2011-04-25 18:27:58Z ibiru $ +# $Id: PKGBUILD 127840 2011-06-18 19:20:15Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-utils pkgver=3.0.1 -pkgrel=1 -pkgdesc="Common utilities for GNOME" +pkgrel=2 +pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files" arch=(i686 x86_64) license=('GPL') depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils') diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index afa3bd5e9..637a65faa 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 125742 2011-05-29 04:00:08Z eric $ +# $Id: PKGBUILD 127860 2011-06-18 22:47:58Z foutrelis $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash pkgver=2.4.6 -pkgrel=1 +pkgrel=2 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64') url="http://www.gnucash.org" @@ -14,7 +14,6 @@ depends=('gtkhtml' 'slib' 'goffice' 'guile' 'libofx' 'desktop-file-utils') makedepends=('intltool') optdepends=('evince: for print preview' - 'gnucash-docs: (AUR) for user documentation' 'perl-finance-quote: for stock information lookups' 'perl-date-manip: for stock information lookups') options=('!libtool' '!makeflags') diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index de3a8f515..3e906aab8 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127545 2011-06-16 09:44:48Z ibiru $ +# $Id: PKGBUILD 127882 2011-06-19 07:39:12Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') pkgver=2.24.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' @@ -12,13 +12,16 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool' '!docs') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz - xid-collision-debug.patch) + xid-collision-debug.patch + gdk_Make_background_changes_queue_a_repaint.patch) sha256sums=('d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' + '3573af25e8db2fb490b264f80cb9e617ee1a36e767e36e7bb1d830c0b715db93') build() { cd "${srcdir}/gtk+-${pkgver}" patch -Np1 -i "${srcdir}/xid-collision-debug.patch" + patch -NRp1 -i "${srcdir}/gdk_Make_background_changes_queue_a_repaint.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch b/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch new file mode 100644 index 000000000..40aa187e6 --- /dev/null +++ b/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch @@ -0,0 +1,55 @@ +From 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Thu, 09 Jun 2011 04:29:45 +0000 +Subject: gdk: Make background changes queue a repaint + +For client-side windows, we need to queue a repaint when the background +changes. For native windows, the windowing system does take care of it, +but client-side windows are our own, so we gotta do it manually. + +https://bugzilla.gnome.org/show_bug.cgi?id=652102 +--- +diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c +index f058570..10d83ab 100644 +--- a/gdk/gdkwindow.c ++++ b/gdk/gdkwindow.c +@@ -8004,11 +8004,15 @@ gdk_window_set_background (GdkWindow *window, + } + + if (!GDK_WINDOW_DESTROYED (window) && +- gdk_window_has_impl (private) && + !private->input_only) + { +- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); +- impl_iface->set_background (window, &private->bg_color); ++ if (gdk_window_has_impl (private)) ++ { ++ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); ++ impl_iface->set_background (window, &private->bg_color); ++ } ++ else ++ gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL); + } + } + +@@ -8077,11 +8081,15 @@ gdk_window_set_back_pixmap (GdkWindow *window, + private->bg_pixmap = GDK_NO_BG; + + if (!GDK_WINDOW_DESTROYED (window) && +- gdk_window_has_impl (private) && + !private->input_only) + { +- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); +- impl_iface->set_back_pixmap (window, private->bg_pixmap); ++ if (gdk_window_has_impl (private)) ++ { ++ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); ++ impl_iface->set_back_pixmap (window, private->bg_pixmap); ++ } ++ else ++ gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL); + } + } + +-- +cgit v0.9 diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 5d5fa30e4..e77f17db2 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121220 2011-04-29 15:00:49Z andyrtr $ +# $Id: PKGBUILD 127768 2011-06-18 10:02:24Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.2.3 +pkgver=4.3.0 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('autoconf') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('4957f40d55e1bc6985e11244364b8938') +md5sums=('3c6ff88f8c6e93ff90d8e3b054f3b086') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libmodplug/PKGBUILD b/extra/libmodplug/PKGBUILD index ba117d07d..25f14d567 100644 --- a/extra/libmodplug/PKGBUILD +++ b/extra/libmodplug/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 81170 2010-05-26 23:12:54Z ibiru $ +# $Id: PKGBUILD 127934 2011-06-20 02:16:14Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> pkgname=libmodplug -pkgver=0.8.8.1 +pkgver=0.8.8.2 pkgrel=1 pkgdesc="A MOD playing library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://modplug-xmms.sourceforge.net/" license=('custom') depends=('gcc-libs') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/modplug-xmms/libmodplug-${pkgver}.tar.gz) -md5sums=('f7fa53a60c650024ff51cca88341776b') +md5sums=('e1fceac4c3bc26ebe96f619b46d26ff7') build() { - cd ${srcdir}/libmodplug-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "${srcdir}/libmodplug-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/libmodplug-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD index 6058cb7ee..c2b414cf8 100644 --- a/extra/libofx/PKGBUILD +++ b/extra/libofx/PKGBUILD @@ -1,29 +1,35 @@ -# $Id: PKGBUILD,v 1.9 2009/02/06 16:41:19 abhidg Exp $ +# $Id: PKGBUILD 127929 2011-06-20 00:18:32Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgbase=libofx pkgname=('libofx' 'libofx-doc') -pkgver=0.9.2 +pkgver=0.9.4 pkgrel=1 pkgdesc="API for the OFX banking standard" arch=('i686' 'x86_64') url="http://libofx.sourceforge.net" license=('GPL') -depends=('opensp' 'curl' 'gcc-libs') +depends=('opensp' 'curl' 'libxml++') +checkdepends=('gnupg') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('cb72fce95e0d59bef78ba0601fbc91f3') -sha1sums=('f11e873a50f5bd16749a7c0700acbf5d565bc859') +md5sums=('f2419bf8d01c0cff74efe7084e0a26c5') +sha1sums=('7370245c011ac4ea9313ba24a88c70e0eb9c317b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" ./configure --prefix=/usr make } +check() { + cd "$srcdir/$pkgbase-$pkgver" + make check +} + package_libofx() { options=('!libtool' '!docs') - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir" install } @@ -31,8 +37,7 @@ package_libofx-doc() { pkgdesc="Documention of the OFX banking standard API" depends=() - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir" install-docDATA - cd doc - make DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install } diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 9f5a1c34a..d7636998a 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127264 2011-06-12 08:13:43Z ronald $ +# $Id: PKGBUILD 127855 2011-06-18 21:42:16Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro pkgver=4.0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64') url="http://www.getmiro.com" @@ -13,7 +13,7 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' - 'gstreamer0.10-ffmpeg' 'ffmpeg') + 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen') makedepends=('pkg-config') install=miro.install source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz) diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 6b609da9d..873c8ad07 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,33 +1,38 @@ -# $Id: PKGBUILD 124985 2011-05-25 16:04:09Z ibiru $ +# $Id: PKGBUILD 127788 2011-06-18 10:58:55Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: 03/08/04 <lefungus@altern.org> pkgname=mkvtoolnix pkgver=4.8.0 -pkgrel=2 -pkgdesc="Set of tools to create, edit and inspect Matroska files" +pkgrel=3 +pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" arch=('i686' 'x86_64') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" -depends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils') +depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis') makedepends=('boost' 'ruby') -install=mkvtoolnix.install source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") md5sums=('47a730706f3da2bcf4ba62bba3a8f260') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # Disable automagic curl dep used for online update checking + sed -i -e '/curl/d' configure.in + export CURL_CFLAGS="" CURL_LIBS="" + export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=2" export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + autoreconf + ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib - ./drake + --with-boost-libdir=/usr/lib \ + --disable-gui + rake } package () { cd "${srcdir}/${pkgname}-${pkgver}" - ./drake DESTDIR="${pkgdir}" install + rake DESTDIR="${pkgdir}" install } diff --git a/extra/rox/PKGBUILD b/extra/rox/PKGBUILD index 34b72f227..799ad8d43 100644 --- a/extra/rox/PKGBUILD +++ b/extra/rox/PKGBUILD @@ -1,51 +1,46 @@ -# $Id: PKGBUILD 46891 2009-07-20 23:09:07Z giovanni $ +# $Id: PKGBUILD 127760 2011-06-18 07:02:05Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=rox -_appname=${pkgname}-filer pkgver=2.10 -pkgrel=1 -pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels." -arch=(i686 x86_64) +pkgrel=2 +pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels" +arch=('i686' 'x86_64') license=('GPL2') url="http://roscidus.com/desktop/" -depends=('libxml2' 'gtk2' 'shared-mime-info' 'bash' 'libsm' 'libglade') +depends=('sh' 'libsm' 'libglade') makedepends=('librsvg' 'python') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${_appname}-${pkgver}.tar.bz2 \ - ${pkgname}.desktop ${pkgname}.svg) +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/rox-filer-${pkgver}.tar.bz2 \ + rox.desktop rox.svg rox.sh right-click.diff) md5sums=('28e8494c9af783258ff86c830f8f0062' '80e7a90e9d58375b25494fbdc01a05bd' - '658c8648b51e215558e13e6afb2b5c76') + '658c8648b51e215558e13e6afb2b5c76' + '31578a90b241f0a8d09c9f8587608d00' + '2b2105a33070ac09a6352c29a5a17e4e') build() { - cd ${startdir}/src/${_appname}-${pkgver}/Choices - mkdir -p ${startdir}/pkg/usr/share/Choices - cp -rp MIME-types ${startdir}/pkg/usr/share/Choices/ - # manually copy the manpages first - cd ../ - install -Dm 0644 rox.1 ${startdir}/pkg/usr/share/man/man1/rox.1 - cd ${startdir}/pkg/usr/share/man/man1 - ln -sf rox.1 ROX-Filer.1 - # this compiles and installs rox - cd ${startdir}/src/${_appname}-${pkgver}/ROX-Filer + cd "${srcdir}/rox-filer-${pkgver}/ROX-Filer" + patch -p2 -i "${srcdir}/right-click.diff" ./AppRun --compile - cd .. - cp -rp ROX-Filer ${startdir}/pkg/usr/share/ - rm -fr ${startdir}/pkg/usr/share/ROX-Filer/{src,build} - # create a shellscript which is known in the PATH - mkdir -p ${startdir}/pkg/usr/bin - echo "#!/bin/sh" > "${startdir}/pkg/usr/bin/rox" - echo "exec /usr/share/ROX-Filer/AppRun \"\$@\"" >> "${startdir}/pkg/usr/bin/rox" - chmod a+x ${startdir}/pkg/usr/bin/rox - # install some freedesktop.org compatibility - install -D -m644 ${startdir}/src/${pkgname}.desktop \ - ${startdir}/pkg/usr/share/applications/${pkgname}.desktop - install -D -m644 ${startdir}/src/${pkgname}.svg \ - ${startdir}/pkg/usr/share/pixmaps/${pkgname}.svg - # finally we render a png as fallback for not svg aware menu applications - # Attention: always make sure you check the dimensions of the source-svg, - # you can read the dimensions via inkscapes export funktion - rsvg -w 48 -h 38 -f png ${startdir}/src/${pkgname}.svg \ - ${startdir}/pkg/usr/share/pixmaps/${pkgname}.png +# finally we render a png as fallback for svg unaware menu applications +# Attention: always make sure you check the dimensions of the source-svg, +# you can read the dimensions via inkscape's export function + rsvg-convert -w 48 -h 38 -f png -o "${srcdir}/rox.png" "${srcdir}/rox.svg" +} + +package() { + cd "${srcdir}/rox-filer-${pkgver}" + install -d "${pkgdir}/usr/share/Choices/MIME-types" + install -m755 Choices/MIME-types/* "${pkgdir}/usr/share/Choices/MIME-types/" + cp -rp ROX-Filer "${pkgdir}/usr/share/" + rm -fr "${pkgdir}"/usr/share/ROX-Filer/{src,build} + + install -D -m755 "${srcdir}/rox.sh" "${pkgdir}/usr/bin/rox" + install -D -m644 rox.1 "${pkgdir}/usr/share/man/man1/rox.1" + ln -sf rox.1 "${pkgdir}/usr/share/man/man1/ROX-Filer.1" + + install -D -m644 "${srcdir}/rox.desktop" "${pkgdir}/usr/share/applications/rox.desktop" + install -D -m644 "${srcdir}/rox.svg" "${pkgdir}/usr/share/pixmaps/rox.svg" + install -D -m644 "${srcdir}/rox.png" "${pkgdir}/usr/share/pixmaps/rox.png" } diff --git a/extra/rox/right-click.diff b/extra/rox/right-click.diff new file mode 100644 index 000000000..e8ad67907 --- /dev/null +++ b/extra/rox/right-click.diff @@ -0,0 +1,32 @@ +From c2232d5075342347a8ff814ced5ce8b9e1cf64b9 Mon Sep 17 00:00:00 2001 +From: Thomas Leonard <talex5@gmail.com> +Date: Wed, 7 Apr 2010 15:44:57 +0100 +Subject: [PATCH] Bugfix: unselect item when menu is closed + +We used to listen for "unmap_event", but this is no longer emitted in recent +versions of GTK. Switched to using "selection-done" instead. + +Closes #2925212 (reported by Barry Kauler). +--- + ROX-Filer/src/menu.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c +index 611918d..bf4bae3 100644 +--- a/ROX-Filer/src/menu.c ++++ b/ROX-Filer/src/menu.c +@@ -322,9 +322,9 @@ gboolean ensure_filer_menu(void) + GET_SSMENU_ITEM(item, "filer", "Window", "New Window"); + filer_new_window = GTK_BIN(item)->child; + +- g_signal_connect(filer_menu, "unmap_event", ++ g_signal_connect(filer_menu, "selection-done", + G_CALLBACK(menu_closed), NULL); +- g_signal_connect(filer_file_menu, "unmap_event", ++ g_signal_connect(filer_file_menu, "selection-done", + G_CALLBACK(menu_closed), NULL); + + g_signal_connect(filer_keys, "accel_changed", +-- +1.6.5.GIT + diff --git a/extra/rox/rox.sh b/extra/rox/rox.sh new file mode 100644 index 000000000..f2dc449d0 --- /dev/null +++ b/extra/rox/rox.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/share/ROX-Filer/AppRun "$@" diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index 2a14af3df..765a40e98 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 125547 2011-05-26 16:47:44Z ibiru $ +# $Id: PKGBUILD 127845 2011-06-18 19:41:13Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') pkgver=3.0.1 -pkgrel=2 -url="http://www.hadess.net/totem.php3" +pkgrel=3 +url="http://www.gnome.org" arch=('i686' 'x86_64') license=('GPL2' 'custom') makedepends=('intltool' 'gnome-doc-utils' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libpeas' 'pygobject' 'pygobject-devel' 'nautilus' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'libgdata' 'xulrunner' 'lirc-utils' 'libepc' 'bluez' 'vala') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2 + fix_crash.patch) +sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a' + '65125a0b8a1fd7f8840b2b7528de3bc553689e224a9aa3fd2c459918ab6f1f1c') build() { cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -Np1 -i "${srcdir}/fix_crash.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/totem \ --localstatedir=/var --disable-static \ diff --git a/extra/totem/fix_crash.patch b/extra/totem/fix_crash.patch new file mode 100644 index 000000000..08409696c --- /dev/null +++ b/extra/totem/fix_crash.patch @@ -0,0 +1,30 @@ +From cee6399c1de27e5ccae35975aaae4fd7cfa40c2c Mon Sep 17 00:00:00 2001 +From: Marcel van den Hof <marcelvdh@gmail.com> +Date: Sun, 29 May 2011 23:45:36 +0100 +Subject: [PATCH] Fix segfault in Bemused plugin + +If bluetoothd is not running sdp_connect() returns a null value which +will cause the plugin to segfault. + +This patch adds a check for a possible null value from sdp_connect(). +--- + src/plugins/bemused/totem-bemused.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/plugins/bemused/totem-bemused.c b/src/plugins/bemused/totem-bemused.c +index 584b4d3..c51a0ee 100644 +--- a/src/plugins/bemused/totem-bemused.c ++++ b/src/plugins/bemused/totem-bemused.c +@@ -655,7 +655,8 @@ sdp_svc_add_spp(u_int8_t port, + + /* Connect to the local SDP server, register the service record */ + session = sdp_connect (BDADDR_ANY, BDADDR_LOCAL, 0); +- sdp_record_register (session, &record, 0); ++ if (session != NULL) ++ sdp_record_register (session, &record, 0); + + /* Cleanup */ + sdp_data_free (channel); +-- +1.7.5.2 + diff --git a/extra/xfce-utils/PKGBUILD b/extra/xfce-utils/PKGBUILD index 621755ab8..abf733525 100644 --- a/extra/xfce-utils/PKGBUILD +++ b/extra/xfce-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108283 2011-01-30 17:27:33Z andyrtr $ +# $Id: PKGBUILD 127773 2011-06-18 10:07:36Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce-utils -pkgver=4.8.1 +pkgver=4.8.2 pkgrel=1 pkgdesc="Utilities for Xfce" arch=(i686 x86_64) @@ -19,7 +19,7 @@ optdepends=('perl: for migration scripts' options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('e39866365a45f7a1e7284b93eb4f92f0') +md5sums=('7f48198f4bee3edf7869064c2922c609') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xfce4-panel/PKGBUILD b/extra/xfce4-panel/PKGBUILD index d35984253..3e942a3c1 100644 --- a/extra/xfce4-panel/PKGBUILD +++ b/extra/xfce4-panel/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 118498 2011-04-07 16:18:14Z andyrtr $ +# $Id: PKGBUILD 127913 2011-06-19 20:00:47Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-panel -pkgver=4.8.3 +pkgver=4.8.4 pkgrel=1 pkgdesc="Panel for the Xfce desktop environment" arch=('i686' 'x86_64') license=('GPL2') url="http://www.xfce.org/" groups=('xfce4') -depends=('exo>=0.6.0' 'garcon>=0.1.5' 'libxfce4ui>=4.8.0' 'libwnck' 'libsm' 'hicolor-icon-theme') +depends=('exo>=0.6.0' 'garcon>=0.1.5' 'libxfce4ui>=4.8.0' 'libwnck' 'libsm' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('intltool' 'gtk-doc') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('31d7c15fb93f4a771fc26cf13d4dc010') +md5sums=('44f06660226723fdd8de3ad59d648546') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xfce4-panel/xfce4-panel.install b/extra/xfce4-panel/xfce4-panel.install index 21b79d2d4..bce670aff 100644 --- a/extra/xfce4-panel/xfce4-panel.install +++ b/extra/xfce4-panel/xfce4-panel.install @@ -1,11 +1,12 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD index 0f80af66a..027b192d2 100644 --- a/extra/zsh/PKGBUILD +++ b/extra/zsh/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 126178 2011-06-02 11:13:57Z pierre $ +# $Id: PKGBUILD 127893 2011-06-19 11:12:41Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zsh pkgver=4.3.12 -pkgrel=1 +pkgrel=2 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' arch=('i686' 'x86_64') url='http://www.zsh.org/' license=('custom') depends=('pcre' 'libcap' 'gdbm') install=zsh.install -source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811') +source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'modules.patch') +md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811' + 'b367c1398b60242f7044a93a837227f9') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # upstream patch to fix handling of compressed kernel modules + patch -p1 -i ${srcdir}/modules.patch # FS#16360 sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ Doc/zsh.texi \ diff --git a/extra/zsh/modules.patch b/extra/zsh/modules.patch new file mode 100644 index 000000000..315d40b98 --- /dev/null +++ b/extra/zsh/modules.patch @@ -0,0 +1,11 @@ +--- a/Completion/Linux/Command/_modutils ++++ b/Completion/Linux/Command/_modutils +@@ -107,7 +107,7 @@ case "$state" in + ! _retrieve_cache modules-$kver; + then + # 2011-01-02 gi1242: Do we need .o files? Or is .ko enough? +- modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko)(.:t:r) ) ++ modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz)(.:t:r:r) ) + _store_cache modules-$kver modules + fi + diff --git a/kde-unstable/calligra/PKGBUILD b/kde-unstable/calligra/PKGBUILD index 8cf52c69f..985eb44db 100644 --- a/kde-unstable/calligra/PKGBUILD +++ b/kde-unstable/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125856 2011-05-30 15:35:59Z andrea $ +# $Id: PKGBUILD 127250 2011-06-11 13:55:04Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -29,17 +29,17 @@ pkgname=('calligra-filters' 'calligra-thesaurus-doc' 'calligra-braindump' 'calligra-flow') -pkgver=2.3.71 -pkgrel=2 +pkgver=2.3.72 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org' license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('kdelibs' 'kdepimlibs' 'eigen' 'lcms2' 'postgresql-libs' 'freetds' - 'kdegraphics-okular' 'libgsf' 'libwpd' 'libwpg' 'pstoedit' 'glew' - 'gsl' 'cmake' 'automoc4' 'boost') +makedepends=('kdelibs' 'kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular' + 'libgsf' 'libwpd' 'libwpg' 'pstoedit' 'glew' 'gsl' 'cmake' 'automoc4' + 'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl') groups=('calligra') source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('f280add8d1d57cc701dc105fc92d2504') +md5sums=('3825e9b2d2fd2f161d4bb7242203e697') build() { cd "${srcdir}" @@ -48,7 +48,8 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_mobile=OFF make } @@ -229,7 +230,7 @@ package_calligra-kplato() { package_calligra-stage() { pkgdesc="Write presentation documents" depends=('calligra-libs' 'calligra-templates') - optdepends=('koffice-filters: import/export filters') + optdepends=('calligra-filters: import/export filters') conflicts=('koffice-kpresenter') replaces=('koffice-kpresenter') install=calligra-stage.install @@ -252,7 +253,7 @@ package_calligra-krita() { pkgdesc="Edit and paint images" depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'glew' 'qimageblitz' 'poppler-qt' 'openexr' 'opengtl') - optdepends=('koffice-filters: import/export filters') + optdepends=('calligra-filters: import/export filters') conflicts=('koffice-krita') replaces=('koffice-krita') install=calligra-krita.install @@ -264,7 +265,7 @@ package_calligra-krita() { package_calligra-tables() { pkgdesc="Write spreadsheet documents" depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'gsl') - optdepends=('koffice-filters: import/export filters') + optdepends=('calligra-filters: import/export filters') conflicts=('koffice-kspread') replaces=('koffice-kspread') install=calligra-tables.install @@ -287,7 +288,7 @@ package_calligra-words() { pkgdesc="Word Processor" depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'calligra-pics' 'calligra-kounavail') - optdepends=('koffice-filters: import/export filters') + optdepends=('calligra-filters: import/export filters') conflicts=('koffice-kword') replaces=('koffice-kword') install=calligra-words.install diff --git a/multilib/lib32-gtk2/PKGBUILD b/multilib/lib32-gtk2/PKGBUILD index ae67618c0..da890b247 100644 --- a/multilib/lib32-gtk2/PKGBUILD +++ b/multilib/lib32-gtk2/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 45659 2011-04-26 16:47:39Z svenstaro $ +# $Id: PKGBUILD 49586 2011-06-18 08:35:08Z bluewind $ # Maintainer: Ionut Biru <ibiru@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> _pkgbasename=gtk2 pkgname=lib32-$_pkgbasename -pkgver=2.24.4 +pkgver=2.24.5 pkgrel=1 pkgdesc="The GTK+ Toolkit (v2) (32-bit)" arch=('x86_64') url="http://www.gtk.org/" install=gtk2.install -depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','heimdal>=1.3.2','gnutls>=2.8.6','gdk-pixbuf2>=2.22.1'} +depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','gnutls>=2.8.6','gdk-pixbuf2>=2.22.1'} lib32-lib{'cups>=1.4.4',xcursor,'xrandr>=1.3','xi>=1.3',xinerama,xcomposite,xdamage} $_pkgbasename) makedepends=('pkgconfig' 'gcc-multilib') options=('!libtool' '!docs') license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.bz2 +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz xid-collision-debug.patch gtk-modules-32.patch) -sha256sums=('7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5' +sha256sums=('d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0') diff --git a/multilib/lib32-keyutils/PKGBUILD b/multilib/lib32-keyutils/PKGBUILD new file mode 100644 index 000000000..347bbe56a --- /dev/null +++ b/multilib/lib32-keyutils/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +_pkgbasename=keyutils +pkgname=lib32-$_pkgbasename +pkgver=1.4 +pkgrel=1 +pkgdesc="Linux Key Management Utilities (32-bit)" +arch=(x86_64) +url="http://www.kernel.org" +license=('GPL2' 'LGPL2.1') +depends=(lib32-glibc $_pkgbasename) +makedepends=(gcc-multilib) +source=(http://people.redhat.com/~dhowells/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2) + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile + sed -i -e 's/^\(USR\)\?LIBDIR\s*:=.*$/\1LIBDIR=\/usr\/lib32/' Makefile + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "$srcdir/$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install + + rm -rf "${pkgdir}"/{usr/{include,share,bin,sbin},etc,{s,}bin} +} +md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b') diff --git a/multilib/lib32-krb5/PKGBUILD b/multilib/lib32-krb5/PKGBUILD new file mode 100644 index 000000000..32debcbae --- /dev/null +++ b/multilib/lib32-krb5/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 122855 2011-05-06 19:36:38Z stephane $ +# Maintainer: Florian Pritz <flo@xinu.at> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> + +_pkgbasename=krb5 +pkgname=lib32-$_pkgbasename +pkgver=1.9.1 +pkgrel=1 +pkgdesc="The Kerberos network authentication system (32-bit)" +arch=('x86_64') +url="http://web.mit.edu/kerberos/" +license=('custom') +depends=('lib32-e2fsprogs' 'lib32-libldap' lib32-keyutils $_pkgbasename) +makedepends=('perl' gcc-multilib) +provides=('lib32-heimdal') +replaces=('lib32-heimdal') +conflicts=('lib32-heimdal') +source=(http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.9/${_pkgbasename}-${pkgver}-signed.tar) +sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066') +options=('!emptydirs') + +build() { + tar zxvf ${_pkgbasename}-${pkgver}.tar.gz + cd "${srcdir}/${_pkgbasename}-${pkgver}/src" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" + export CPPFLAGS+=" -I/usr/include/et" + ./configure --prefix=/usr \ + --sysconfdir=/etc/krb5 \ + --mandir=/usr/share/man \ + --localstatedir=/var/lia \ + --libdir=/usr/lib32 \ + --enable-shared \ + --with-system-et \ + --with-system-ss \ + --disable-rpath \ + --without-tcl \ + --enable-dns-for-realm \ + --with-ldap + + make +} + +check() { + # We can't do this in the build directory. + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make -C src check +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}/src" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/multilib/lib32-libao/PKGBUILD b/multilib/lib32-libao/PKGBUILD index cbd158971..dc91bedeb 100644 --- a/multilib/lib32-libao/PKGBUILD +++ b/multilib/lib32-libao/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 49586 2011-06-18 08:35:08Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> diff --git a/multilib/lib32-libcups/PKGBUILD b/multilib/lib32-libcups/PKGBUILD index bb32ba425..f3ec15e39 100644 --- a/multilib/lib32-libcups/PKGBUILD +++ b/multilib/lib32-libcups/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 32274 2010-11-13 00:50:15Z heftig $ +# $Id: PKGBUILD 49583 2011-06-18 08:21:51Z bluewind $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> _pkgbasename=libcups pkgname=lib32-$_pkgbasename pkgver=1.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="The CUPS Printing System - client libraries (32-bit)" arch=('x86_64') license=('GPL') url="http://www.cups.org/" -depends=(lib32-glibc $_pkgbasename) +depends=(lib32-krb5 lib32-libtiff lib32-libpng $_pkgbasename) makedepends=(gcc-multilib) source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2) md5sums=('50729f6fc46ba54223e0eaf5009f3419') diff --git a/multilib/zsnes/PKGBUILD b/multilib/zsnes/PKGBUILD index 1a4fd6c3e..193f3fd09 100644 --- a/multilib/zsnes/PKGBUILD +++ b/multilib/zsnes/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49410 2011-06-15 15:59:06Z bluewind $ +# $Id: PKGBUILD 49603 2011-06-18 09:28:51Z bluewind $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Frank Tetzel <frank.tetzel@mailbox.tu-dresden.de> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -6,17 +6,17 @@ pkgname=zsnes pkgver=1.51 -pkgrel=8 +pkgrel=9 pkgdesc="Super Nintendo emulator" url="http://www.zsnes.com/" arch=('i686' 'x86_64') license=('GPL') if [[ $CARCH == "x86_64" ]]; then - depends=('gcc-libs-multilib' 'lib32-sdl' 'lib32-libpng>=1.4.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa' 'lib32-libao') + depends=('gcc-libs-multilib' 'lib32-sdl' 'lib32-libpng>=1.4.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa') makedepends=('nasm' 'gcc-multilib') else - depends=('gcc-libs' 'sdl' 'libpng>=1.4.0' 'libgl' 'ncurses' 'mesa' 'libao') + depends=('gcc-libs' 'sdl' 'libpng>=1.4.0' 'libgl' 'ncurses' 'mesa') makedepends=('nasm' 'gcc') fi @@ -41,7 +41,6 @@ fi ./autogen.sh --prefix=/usr \ x_libraries=/usr/lib \ force_arch=i686 \ - --enable-libao \ --enable-release make diff --git a/staging/bogofilter/PKGBUILD b/staging/bogofilter/PKGBUILD new file mode 100644 index 000000000..860895cf9 --- /dev/null +++ b/staging/bogofilter/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 127873 2011-06-19 06:22:51Z eric $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Low Kian Seong <fastmail_low@speedymail.org> + +pkgname=bogofilter +pkgver=1.2.2 +pkgrel=3 +pkgdesc="A fast Bayesian spam filtering tool" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://bogofilter.sourceforge.net" +depends=('db' 'perl' 'gsl') +backup=('etc/bogofilter/bogofilter.cf') +source=(http://sourceforge.net/projects/${pkgname}/files/${pkgname}-current/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('4bcabdf8c5e7efefcb508eda7e80eebc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc/bogofilter \ + --localstatedir=/var \ + --enable-transactions + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf" + + install -dm755 "${pkgdir}/usr/share/${pkgname}/contrib" + install -m644 contrib/* "${pkgdir}/usr/share/${pkgname}/contrib/" +} diff --git a/staging/openldap/PKGBUILD b/staging/openldap/PKGBUILD new file mode 100644 index 000000000..44029b398 --- /dev/null +++ b/staging/openldap/PKGBUILD @@ -0,0 +1,107 @@ +# $Id: PKGBUILD 127879 2011-06-19 07:32:04Z andrea $ +# Maintainer: +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=openldap +pkgver=2.4.24 +pkgrel=2 +pkgdesc="LDAP Server" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.openldap.org/" +backup=('etc/openldap/slapd.conf' 'etc/default/slapd' 'etc/conf.d/slapd') +depends=("libldap>=${pkgver}" 'tcp_wrappers' 'libfetch' 'util-linux-ng') +provides=('openldap-clients') +replaces=('openldap-clients') +source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgname}-${pkgver}.tgz" + 'slapd' + 'slapd.default') +md5sums=('116fe1e23a7b67686d5e62274367e6c0' + '832354417c495f29affd2c772808959d' + '6be69f6b7e522cb64cce8703da81ed32') +options=('emptydirs') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + export LIBS=-ldb + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --libexecdir=/usr/sbin \ + --sysconfdir=/etc \ + --localstatedir=/var/lib/openldap \ + --enable-bdb \ + --enable-crypt \ + --enable-dynamic \ + --with-threads \ + --enable-wrappers \ + --enable-spasswd \ + --with-cyrus-sasl + + find . -name 'Makefile' -exec \ + sed -e 's|$(LDAP_LIBDIR)/liblber/liblber.la|/usr/lib/liblber-2.4.so.2|g' \ + -e 's|$(LDAP_LIBDIR)/libldap/libldap.la|/usr/lib/libldap-2.4.so.2|g' \ + -e 's|$(LDAP_LIBDIR)/libldap_r/libldap_r.la|/usr/lib/libldap_r-2.4.so.2|g' \ + -i {} \; + + cd include + make + + cd ../libraries + for dir in liblutil librewrite liblunicode; do + pushd ${dir} + make depend + make + popd + done + + cd ../servers + make depend + make + + cd ../clients + make depend + make + + cd ../doc/man + for dir in man{1,5,8}; do + pushd ${dir} + make + popd + done +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + + cd servers + make DESTDIR="${pkgdir}" install + + cd ../clients + make DESTDIR="${pkgdir}" install + + cd ../doc/man + for dir in man{1,5,8}; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + + cd ../.. + + install -dm700 "${pkgdir}"/etc/openldap/slapd.d + install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd + install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd + install -dm700 "${pkgdir}"/var/lib/openldap + + # get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + # hack to fix screwed up dirs + sed -e 's|^pidfile[[:space:]].*$|pidfile /var/run/slapd.pid|g' \ + -e 's|^argsfile[[:space:]].*$|argsfile /var/run/slapd.args|g' \ + -i "${pkgdir}"/etc/openldap/slapd.conf + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE +} diff --git a/staging/openldap/slapd b/staging/openldap/slapd new file mode 100755 index 000000000..392075027 --- /dev/null +++ b/staging/openldap/slapd @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd + +PID=`pidof -o %PPID /usr/sbin/slapd` +case "$1" in + start) + stat_busy "Starting OpenLDAP" + if [ -z "$PID" ]; then + if [ -z "$SLAPD_SERVICES" ]; then + /usr/sbin/slapd $SLAPD_OPTIONS + else + /usr/sbin/slapd -h "$SLAPD_SERVICES" $SLAPD_OPTIONS + fi + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + add_daemon slapd + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping OpenLDAP" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/slapd.pid + rm -f /var/run/slapd.args + rm_daemon slapd + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/openldap/slapd.default b/staging/openldap/slapd.default new file mode 100644 index 000000000..72ae2a6a7 --- /dev/null +++ b/staging/openldap/slapd.default @@ -0,0 +1,6 @@ +# slapd normally serves ldap only on all TCP-ports 389. slapd can also +# service requests on TCP-port 636 (ldaps) and requests via unix +# sockets. +# Example usage: +#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///" +SLAPD_OPTIONS="" diff --git a/staging/pam/PKGBUILD b/staging/pam/PKGBUILD new file mode 100644 index 000000000..5a4f10780 --- /dev/null +++ b/staging/pam/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 127852 2011-06-18 20:12:05Z stephane $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=pam +pkgver=1.1.3 +pkgrel=2 +pkgdesc="PAM (Pluggable Authentication Modules) library" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.kernel.org/pub/linux/libs/pam/" +depends=('glibc' 'db' 'cracklib') +makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') +backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment) +source=(http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 + ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2 + other) +options=('!libtool' '!emptydirs') +md5sums=('6db7fcb5db6253350e3a4648ceac40e7' + 'e2788389a6c59224110a45fcff30e02b' + '6e6c8719e5989d976a14610f340bd33a') + +build() { + cd $srcdir/Linux-PAM-$pkgver + ./configure --sysconfdir=/etc DESTDIR=$pkgdir --libdir=/lib + make +} + +package() { + cd $srcdir/Linux-PAM-$pkgver + make INSTALL=/bin/install DESTDIR=$pkgdir install + install -D -m644 ../other $pkgdir/etc/pam.d/other + # build pam_unix2 module + # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2 + cd $srcdir/pam_unix2-2.6 + ./configure + make + make DESTDIR=$pkgdir install + # add the realtime permissions for audio users + sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf + cat >>$pkgdir/etc/security/limits.conf <<_EOT +* - rtprio 0 +* - nice 0 +@audio - rtprio 65 +@audio - nice -10 +@audio - memlock 40000 +_EOT + # fix some missing symlinks from old pam for compatibility + cd $pkgdir/lib/security + ln -s pam_unix.so pam_unix_acct.so + ln -s pam_unix.so pam_unix_auth.so + ln -s pam_unix.so pam_unix_passwd.so + ln -s pam_unix.so pam_unix_session.so + # set unix_chkpwd uid + chmod +s $pkgdir/sbin/unix_chkpwd +} diff --git a/staging/pam/other b/staging/pam/other new file mode 100644 index 000000000..08498b423 --- /dev/null +++ b/staging/pam/other @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so diff --git a/staging/pam/pam.install b/staging/pam/pam.install new file mode 100644 index 000000000..9d4588084 --- /dev/null +++ b/staging/pam/pam.install @@ -0,0 +1,12 @@ +# arg 1: the new package version +post_install() { + # need to run this immediately -- pacman only runs it at the end of + # all package installs + /sbin/ldconfig -r . +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} diff --git a/staging/postfix/PKGBUILD b/staging/postfix/PKGBUILD new file mode 100644 index 000000000..7ae08c572 --- /dev/null +++ b/staging/postfix/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 127765 2011-06-18 08:12:47Z bisson $ +# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Maintainer: Paul Mattal <paul@archlinux.org> + +pkgname=postfix +pkgver=2.8.3 +pkgrel=4 +pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' +url='http://www.postfix.org/' +arch=('i686' 'x86_64') +license=('custom') +depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db') +backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ + 'aliases.patch' \ + 'rc.d') +sha1sums=('2604066f158f5327449960afd6334b996dc01799' + '5fc3de6c7df1e5851a0a379e825148868808318b' + '40c6be2eb55e6437a402f43775cdb3d22ea87a66') + +provides=('smtp-server' 'smtp-forwarder') +replaces=('postfix-mysql' 'postfix-pgsql') +conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make makefiles DEBUG='' CCARGS=' \ + -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ + -DHAS_LDAP \ + -DUSE_TLS \ + -DHAS_MYSQL -I/usr/include/mysql \ + -DHAS_PGSQL -I/usr/include/postgresql \ + -DHAS_SQLITE \ + ' AUXLIBS=' \ + -lsasl2 \ + -lldap -llber \ + -lssl -lcrypto \ + -lmysqlclient -lz -lm \ + -lpq \ + -lsqlite3 -lpthread \ + ' OPT="${CFLAGS} ${LDFLAGS}" + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sh postfix-install -non-interactive \ + install_root="${pkgdir}" \ + daemon_directory="/usr/lib/${pkgname}" \ + sample_directory="/etc/${pkgname}/sample" \ + manpage_directory="/usr/share/man" + + install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + cd "${pkgdir}" + patch -p0 < "${srcdir}"/aliases.patch +} diff --git a/staging/postfix/aliases.patch b/staging/postfix/aliases.patch new file mode 100644 index 000000000..6767870b7 --- /dev/null +++ b/staging/postfix/aliases.patch @@ -0,0 +1,18 @@ +--- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100 ++++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100 +@@ -382,6 +382,7 @@ + #alias_maps = hash:/etc/aliases + #alias_maps = hash:/etc/aliases, nis:mail.aliases + #alias_maps = netinfo:/aliases ++alias_maps = hash:/etc/postfix/aliases + + # The alias_database parameter specifies the alias database(s) that + # are built with "newaliases" or "sendmail -bi". This is a separate +@@ -392,6 +393,7 @@ + #alias_database = dbm:/etc/mail/aliases + #alias_database = hash:/etc/aliases + #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases ++alias_database = $alias_maps + + # ADDRESS EXTENSIONS (e.g., user+foo) + # diff --git a/staging/postfix/install b/staging/postfix/install new file mode 100644 index 000000000..f5d81a565 --- /dev/null +++ b/staging/postfix/install @@ -0,0 +1,35 @@ +post_install() { + getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null + getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null + getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null + + cd var/spool/postfix + chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved + chgrp postdrop public maildrop + cd ../../../usr/sbin + chgrp postdrop postqueue postdrop + chmod g+s postqueue postdrop + cd ../.. + chown postfix var/lib/postfix + + newaliases +} + +post_upgrade() { + post_install + + if [ `vercmp $2 2.8` = -1 ]; then cat <<EOF + +==> You must now execute "/etc/rc.d/postfix reload" (or restart). +==> This is needed because the queue manager to delivery agent +==> protocol has changed. + +EOF + fi +} + +pre_remove() { + getent passwd postfix &>/dev/null && userdel postfix >/dev/null + getent group postfix &>/dev/null && groupdel postfix >/dev/null + getent group postdrop &>/dev/null && groupdel postdrop >/dev/null +} diff --git a/staging/postfix/rc.d b/staging/postfix/rc.d new file mode 100755 index 000000000..fa314bb84 --- /dev/null +++ b/staging/postfix/rc.d @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=postfix + +case "$1" in +start) + stat_busy "Starting $name daemon" + /usr/sbin/postfix start &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + /usr/sbin/postfix stop &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +reload) + stat_busy "Reloading $name daemon" + /usr/sbin/postfix reload &>/dev/null \ + && { stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 1 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart|reload}" + ;; +esac +exit 0 diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD new file mode 100644 index 000000000..9fd24d47b --- /dev/null +++ b/testing/avidemux/PKGBUILD @@ -0,0 +1,121 @@ +# $Id: PKGBUILD 127810 2011-06-18 16:08:40Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=avidemux +pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') +pkgver=2.5.5 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'esound' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz + avidemux-2.5.4-x264-build115.patch) +md5sums=('33bbe210c6826cea1987ed18a41d57a7' + '24a18b53a58b678b9e87d30566985751') + +build() { + cd "${srcdir}/${pkgbase}_${pkgver}" + + patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch" + + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + make + +# plugin build expects libraries to be already installed; we fake a prefix +# in build/ by symlinking all libraries to build/lib/ + mkdir -p lib + cd lib + find ../avidemux -name '*.so*' | xargs ln -sft . + cd ../../plugins + mkdir build + cd build + cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR=${srcdir}/avidemux_${pkgver} \ + -D AVIDEMUX_CORECONFIG_DIR=${srcdir}/avidemux_${pkgver}/build/config \ + -D AVIDEMUX_INSTALL_PREFIX=${srcdir}/avidemux_${pkgver}/build \ + -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. + make +} + +package_avidemux-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split)" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faac: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'esound: for the corresponding audio device plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin') + provides=('avidemux') + conflicts=('avidemux') + replaces=('avidemux') + + cd "${srcdir}/${pkgbase}_${pkgver}/build" + make DESTDIR="${pkgdir}" install + + cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" + make DESTDIR="${pkgdir}" install + rm -r "${pkgdir}"/usr/share/avidemux + rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} + rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so + rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so + + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" + ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" + + install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" + depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" + + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" +} + +package_avidemux-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils') + install=avidemux.install + + cd "${srcdir}/${pkgbase}_${pkgver}" + install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} + install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter + + install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" + install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" + install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" + + install -d "${pkgdir}/usr/share/avidemux/i18n" + install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" +} diff --git a/testing/avidemux/avidemux-2.5.4-x264-build115.patch b/testing/avidemux/avidemux-2.5.4-x264-build115.patch new file mode 100644 index 000000000..c627667ec --- /dev/null +++ b/testing/avidemux/avidemux-2.5.4-x264-build115.patch @@ -0,0 +1,45 @@ +diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 +@@ -488,8 +488,10 @@ + printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
+ printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
+ printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
++#elif X264_BUILD > 114
++ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
+ #endif
+ printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
+ #if X264_BUILD > 88
+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 +@@ -417,7 +417,7 @@ + _param.b_cabac = cabac;
+ }
+
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ unsigned int x264Options::getOpenGopMode(void)
+ {
+ return _param.i_open_gop;
+@@ -428,6 +428,17 @@ + if (openGopMode < 3)
+ _param.i_open_gop = openGopMode;
+ }
++#elif X264_BUILD > 114
++unsigned int x264Options::getOpenGopMode(void)
++{
++ return _param.b_open_gop;
++}
++
++void x264Options::setOpenGopMode(unsigned int openGopMode)
++{
++ if (openGopMode < 3)
++ _param.b_open_gop = openGopMode;
++}
+ #endif
+
+ unsigned int x264Options::getInterlaced(void)
diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/testing/avidemux/avidemux.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD index 3c31ac43a..33810d391 100644 --- a/testing/glibc/PKGBUILD +++ b/testing/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127202 2011-06-11 08:46:22Z allan $ +# $Id: PKGBUILD 127755 2011-06-18 06:06:01Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,8 +6,8 @@ pkgname=glibc pkgver=2.14 -pkgrel=2 -_glibcdate=20110605 +pkgrel=3 +_glibcdate=20110617 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -27,11 +27,13 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch glibc-2.14-libdl-crash.patch - glibc-2.14-revert-4462fad3.patch + glibc-2.14-fix-resolver-crash-typo.patch + glibc-2.14-reexport-rpc-interface.patch + glibc-2.14-reinstall-nis-rpc-headers.patch nscd locale.gen.txt locale-gen) -md5sums=('a96742599fc8a99e52b9e344f39a1000' +md5sums=('e441d745609d93c907b72548ba646dad' '4dadb9203b69a3210d53514bb46f41c3' '0c5540efc51c0b93996c51b57a8540ae' '40cd342e21f71f5e49e32622b25acc52' @@ -39,16 +41,18 @@ md5sums=('a96742599fc8a99e52b9e344f39a1000' 'b042647ea7d6f22ad319e12e796bd13e' '7d0154b7e17ea218c9fa953599d24cc4' 'cea62cc6b903d222c5f26e05a3c0e0e6' - '46e56492cccb1c9172ed3a235cf43c6c' + '73bfaafe25b93f357cf6a3b5eeb70e1b' + 'c5de2a946215d647c8af5432ec4b0da0' + '55febbb72139ac7b65757df085024b83' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') + mksource() { git clone git://sourceware.org/git/glibc.git pushd glibc - git checkout -b glibc-2.14-arch origin/master - # git checkout -b glibc-2.14-arch origin/release/2.14/master + git checkout -b glibc-2.14-arch origin/release/2.14/master popd tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* } @@ -81,9 +85,14 @@ build() { # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - # revert fix for http://sourceware.org/bugzilla/show_bug.cgi?id=12684 - # as it causes crashes (FS#24615) - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 (FS#24615) + patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch + + # re-export RPC interface until libtirpc is ready as a replacement + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -123,7 +132,7 @@ package() { cd ${srcdir}/glibc-build make install_root=${pkgdir} install - rm ${pkgdir}/etc/ld.so.{cache,conf} + rm -f ${pkgdir}/etc/ld.so.{cache,conf} install -dm755 ${pkgdir}/etc/rc.d install -dm755 ${pkgdir}/usr/sbin diff --git a/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch b/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch new file mode 100644 index 000000000..b5d86c7d2 --- /dev/null +++ b/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch @@ -0,0 +1,22 @@ +diff --git a/resolv/res_send.c b/resolv/res_send.c +index 97142b7..a001c1e 100644 +--- a/resolv/res_send.c ++++ b/resolv/res_send.c +@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch new file mode 100644 index 000000000..e2beea881 --- /dev/null +++ b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch @@ -0,0 +1,26 @@ +diff --git a/include/libc-symbols.h b/include/libc-symbols.h +index 67e1ca2..5e7cca5 100644 +--- a/include/libc-symbols.h ++++ b/include/libc-symbols.h +@@ -635,7 +635,7 @@ for linking") + # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) + # define libc_hidden_def(name) hidden_def (name) + # define libc_hidden_weak(name) hidden_weak (name) +-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) ++# define libc_hidden_nolink(name, version) hidden_def (name) + # define libc_hidden_ver(local, name) hidden_ver (local, name) + # define libc_hidden_data_def(name) hidden_data_def (name) + # define libc_hidden_data_weak(name) hidden_data_weak (name) +diff --git a/sunrpc/Makefile b/sunrpc/Makefile +index 5134ce9..40c73d1 100644 +--- a/sunrpc/Makefile ++++ b/sunrpc/Makefile +@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ + des_crypt.h) + headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ + $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h +-headers = rpc/netdb.h ++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) + install-others = $(inst_sysconfdir)/rpc + generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ + $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch new file mode 100644 index 000000000..eb0fd822d --- /dev/null +++ b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch @@ -0,0 +1,28 @@ +From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Tue, 17 May 2011 17:42:30 +0200 +Subject: [PATCH] Reinstall NIS RPC headers + +--- + nis/Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nis/Makefile b/nis/Makefile +index b5c9609..d2934d9 100644 +--- a/nis/Makefile ++++ b/nis/Makefile +@@ -23,9 +23,9 @@ subdir := nis + + aux := nis_hash + ++headers := $(wildcard rpcsvc/*.[hx]) + distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ +- nisplus-parser.h nis_xdr.h nss \ +- $(wildcard rpcsvc/*.[hx]) ++ nisplus-parser.h nis_xdr.h nss + + # These are the databases available for the nis (and perhaps later nisplus) + # service. This must be a superset of the services in nss. +-- +1.7.5.4 + diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD new file mode 100644 index 000000000..9f1074038 --- /dev/null +++ b/testing/gstreamer0.10-ugly/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 127813 2011-06-18 16:10:52Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gstreamer0.10-ugly +pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') +pkgver=0.10.18 +pkgrel=2 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +url="http://gstreamer.freedesktop.org/" +options=(!libtool) +source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2) +md5sums=('04a7009a4efea2844075949c111f5e4d') + +build() { + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ + --with-package-origin="http://www.archlinux.org/" + make + sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile +} + +package_gstreamer0.10-ugly() { + pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" + depends=('gstreamer0.10-base>=0.10.34') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gstreamer0.10-ugly-plugins() { + pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" + depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') + groups=('gstreamer0.10-plugins') + replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make -C ext DESTDIR="${pkgdir}" install +} diff --git a/testing/perl-compress-bzip2/PKGBUILD b/testing/perl-compress-bzip2/PKGBUILD index ad5f788ac..fc142e677 100644 --- a/testing/perl-compress-bzip2/PKGBUILD +++ b/testing/perl-compress-bzip2/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 124543 2011-05-22 21:27:46Z angvp $ +# $Id: PKGBUILD 127799 2011-06-18 15:54:27Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 pkgver=2.09 -pkgrel=2 +pkgrel=3 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64) license=(GPL2) depends=(perl bzip2) -url='http://search.cpan.org/dist/$_realname' +url="http://search.cpan.org/dist/$_realname" options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz") md5sums=('1699fde3e86f2a036f135ae606d456bf') diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD index ebdb9de61..95361e280 100644 --- a/testing/vlc/PKGBUILD +++ b/testing/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127402 2011-06-14 18:18:58Z stephane $ +# $Id: PKGBUILD 127816 2011-06-18 16:12:17Z ibiru $ # 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=3 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD new file mode 100644 index 000000000..90508716e --- /dev/null +++ b/testing/x264/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 127804 2011-06-18 16:05:03Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: damir <damir@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgname=x264 +pkgver=20110617 +pkgrel=1 +pkgdesc="free library for encoding H264/AVC video streams" +arch=('i686' 'x86_64') +url="http://www.videolan.org/developers/x264.html" +license=('GPL') +depends=('glibc') +makedepends=('yasm') +source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) +md5sums=('928717aa2f0c7ca91e589d6b60e688f1') + +build() { + cd "$srcdir/$pkgname-snapshot-$pkgver-2245" + + ./configure --enable-shared + + make + make DESTDIR="$pkgdir" \ + bindir=/usr/bin \ + libdir=/usr/lib \ + includedir=/usr/include \ + install +} + +# vim:set ts=2 sw=2 et: |