diff options
83 files changed, 1954 insertions, 302 deletions
diff --git a/community-testing/calibre/PKGBUILD b/community-testing/calibre/PKGBUILD new file mode 100644 index 000000000..11d9b8ab4 --- /dev/null +++ b/community-testing/calibre/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 55412 2011-09-12 05:34:02Z ebelanger $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Petrov Roman <nwhisper@gmail.com> +# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> + +pkgname=calibre +pkgver=0.8.18 +pkgrel=2 +pkgdesc="Ebook management application" +arch=('i686' 'x86_64') +url="http://calibre-ebook.com/" +license=('GPL3') +depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' + 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' + 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' + 'python-imaging' 'desktop-file-utils' 'shared-mime-info' + 'python-dnspython' 'unrar' 'python2-pyqt' 'icu') +makedepends=('python2-pycountry') +optdepends=('ipython: to use calibre-debug') +install=calibre.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + desktop_integration.patch) +md5sums=('6347327567c92ce7ebf82b308e1f6610' + '253ce4fe5d01f8ff76b63cd3825755ea') + +build() { + cd "${srcdir}/${pkgname}" + + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy + sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ + $(find . -regex ".*.py\|.*.recipe") + + python2 setup.py build + python2 setup.py resources + python2 setup.py translations +} + +package() { + cd "${srcdir}/${pkgname}" + + patch -Np1 -i "${srcdir}/desktop_integration.patch" + + # More on desktop integration (e.g. enforce arch defaults) + sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ + -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ + -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ + -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py + + # Fix the environment module location + sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + + install -d "${pkgdir}/usr/lib/python2.7/site-packages" + python2 setup.py install --root="${pkgdir}" --prefix=/usr \ + --staging-bindir="${pkgdir}/usr/bin" \ + --staging-libdir="${pkgdir}/usr/lib" \ + --staging-sharedir="${pkgdir}/usr/share" + + find "${pkgdir}" -type d -empty -delete + + # Decompress the man pages so makepkg will do it for us. + for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do + bzip2 -d "${decom}" + done +} diff --git a/community-testing/calibre/calibre.install b/community-testing/calibre/calibre.install new file mode 100644 index 000000000..6210bd0ab --- /dev/null +++ b/community-testing/calibre/calibre.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-testing/calibre/desktop_integration.patch b/community-testing/calibre/desktop_integration.patch new file mode 100644 index 000000000..4dbf53757 --- /dev/null +++ b/community-testing/calibre/desktop_integration.patch @@ -0,0 +1,68 @@ +--- a/src/calibre/linux.py 2011-06-17 19:56:05.000000000 +0200 ++++ b/src/calibre/linux.py 2011-06-18 00:07:46.000000000 +0200 +@@ -339,51 +339,39 @@ + + with TemporaryDirectory() as tdir: + with CurrentDir(tdir): +- render_img('mimetypes/lrf.png', 'calibre-lrf.png') +- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) +- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrs', +- '128')) +- render_img('lt.png', 'calibre-gui.png') +- check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True) +- self.icon_resources.append(('apps', 'calibre-gui', '128')) +- render_img('viewer.png', 'calibre-viewer.png') +- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '128')) ++ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') ++ os.mkdir(dir) ++ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) ++ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) ++ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) + + mimetypes = set([]) + for x in all_input_formats(): + mt = guess_type('dummy.'+x)[0] +- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: ++ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: + mimetypes.add(mt) + + def write_mimetypes(f): + f.write('MimeType=%s;\n'%';'.join(mimetypes)) + +- f = open('calibre-lrfviewer.desktop', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../applications') ++ os.mkdir(dir) ++ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') + f.write(VIEWER) + f.close() +- f = open('calibre-ebook-viewer.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') + f.write(EVIEWER) + write_mimetypes(f) + f.close() +- f = open('calibre-gui.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') + f.write(GUI) + write_mimetypes(f) + f.close() +- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', +- 'calibre-ebook-viewer.desktop') +- for x in des: +- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] +- check_call(' '.join(cmd), shell=True) +- self.menu_resources.append(x) +- check_call(['xdg-desktop-menu', 'forceupdate']) +- f = open('calibre-mimetypes', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') ++ os.makedirs(dir) ++ f = open(os.path.join(dir, 'calibre.xml'), 'wb') + f.write(MIME) + f.close() +- self.mime_resources.append('calibre-mimetypes') +- check_call('xdg-mime install ./calibre-mimetypes', shell=True) + except Exception: + if self.opts.fatal_errors: + raise diff --git a/community-testing/cuneiform/PKGBUILD b/community-testing/cuneiform/PKGBUILD new file mode 100644 index 000000000..510f73bce --- /dev/null +++ b/community-testing/cuneiform/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 55414 2011-09-12 05:34:06Z ebelanger $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Maxim Vuets <maxim.vuets@gmail.com> + +pkgname=cuneiform +pkgver=1.1.0 +_dpkgver=1.1 +pkgrel=2 +pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." +arch=('i686' 'x86_64') +url="https://launchpad.net/cuneiform-linux" +license=('BSD') +depends=('imagemagick') +makedepends=('cmake') +source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2) +md5sums=('09fd160cdfc512f26442a7e91246598d') + +_SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" + +build() { + cd "${_SRC_ROOT}" + sed -i 's#lib64#lib#' install_files.cmake + mkdir builddir + cd builddir + + cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "${_SRC_ROOT}"/builddir + make DESTDIR="${pkgdir}" install + + install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ + "${pkgdir}/usr/share/licenses/cuneiform/license.txt" +} diff --git a/community-testing/mongodb/PKGBUILD b/community-testing/mongodb/PKGBUILD new file mode 100644 index 000000000..22c2e27d1 --- /dev/null +++ b/community-testing/mongodb/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Mathias Stearn <mathias@10gen.com> +# Contributor: Alec Thomas + +pkgname=mongodb +pkgver=2.0.0 +pkgrel=1 +pkgdesc='A high-performance, open source, schema-free document-oriented database.' +arch=('i686' 'x86_64') +url='http://www.mongodb.org' +license=('AGPL3') +depends=('boost-libs') +makedepends=('scons' 'boost') +optdepends=('libpcap: needed for mongosniff') +backup=('etc/mongodb.conf') +install="mongodb.install" +source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" + 'mongodb.rc' + 'mongodb.conf') +md5sums=('52763985c13e06d85bc125c7d3eb03d9' + '9c67e00f4626ad761a8f7d4e037a54d7' + '4839fe1d638187ca3226e8267b947318') + +build() { + export SCONSFLAGS="$MAKEFLAGS" + + cd mongodb-src-r${pkgver} + + scons \ + all \ + --full +} + +package() { + cd mongodb-src-r${pkgver} + + scons \ + install \ + --full \ + --prefix=${pkgdir}/usr + + install -D -m755 ${srcdir}/mongodb.rc \ + ${pkgdir}/etc/rc.d/mongodb + install -D -m644 ${srcdir}/mongodb.conf \ + ${pkgdir}/etc/mongodb.conf + install -d -m700 ${pkgdir}/var/lib/mongodb + install -d -m755 ${pkgdir}/var/log/mongodb + + if [ -d ${pkgdir}/usr/lib64 ]; then + mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib + fi +} diff --git a/community-testing/mongodb/mongodb.conf b/community-testing/mongodb/mongodb.conf new file mode 100644 index 000000000..c5272b7f2 --- /dev/null +++ b/community-testing/mongodb/mongodb.conf @@ -0,0 +1,8 @@ +# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details +# Run mongod --help to see a list of options + +bind_ip = 127.0.0.1 +quiet = true +dbpath = /var/lib/mongodb +logpath = /var/log/mongodb/mongod.log +logappend = true diff --git a/community-testing/mongodb/mongodb.install b/community-testing/mongodb/mongodb.install new file mode 100755 index 000000000..3922c12ef --- /dev/null +++ b/community-testing/mongodb/mongodb.install @@ -0,0 +1,32 @@ +# vim: syntax=sh + +post_install() { + useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb + chown -R mongodb:daemon /var/lib/mongodb + chown -R mongodb:daemon /var/log/mongodb + + if [ "$(arch)" != "x86_64" ] + then + echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.' + echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations' + fi +} + +post_upgrade() { + chown -R mongodb:daemon /var/lib/mongodb + chown -R mongodb:daemon /var/log/mongodb + + if [ "$(vercmp $2 1.8.2-3)" -lt 0 ] + then + # have to fix my fudge up in 1.8.2-2 and 1.8.2-3 + # added july 5th, 2011 + usermod -s /bin/bash mongodb >& /dev/null + echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb' + echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb' + echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log' + fi +} + +pre_remove() { + userdel mongodb +} diff --git a/community-testing/mongodb/mongodb.rc b/community-testing/mongodb/mongodb.rc new file mode 100755 index 000000000..30f2bbf79 --- /dev/null +++ b/community-testing/mongodb/mongodb.rc @@ -0,0 +1,39 @@ +#!/bin/bash +# vim: syntax=sh + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof /usr/bin/mongod) +case "$1" in + start) + stat_busy "Starting mongodb" + [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon mongodb + stat_done + fi + ;; + stop) + stat_busy "Stopping mongodb" + [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon mongodb + while [ ! -z "$(pidof /usr/bin/mongod)" ]; do + sleep 1; + done + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD new file mode 100644 index 000000000..f53df1e79 --- /dev/null +++ b/community-testing/performous/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 55416 2011-09-12 05:34:15Z ebelanger $ +# Maintainer : Laurent Carlier <lordheavym@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=performous +pkgver=0.6.1 +pkgrel=8 +pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' +arch=('i686' 'x86_64') +url="http://performous.org/" +license=('GPL') +depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \ + 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') +makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.47') +optdepends=('performous-freesongs: free songs for performous') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2) +md5sums=('451a759de77984b5a699e91107fe52e2') + +build() { + cd ${srcdir}/Performous-${pkgver}-Source + + mkdir -p build + cd build + + # fix config loading with libxml++ + export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} + # fix to built against boost 1.46, upstream (git) now support v3 + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr .. + + make +} + +package() { + cd ${srcdir}/Performous-${pkgver}-Source/build + + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/rss-glx/PKGBUILD b/community-testing/rss-glx/PKGBUILD new file mode 100644 index 000000000..61fb35930 --- /dev/null +++ b/community-testing/rss-glx/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 55418 2011-09-12 05:34:23Z ebelanger $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> +# Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> + +pkgname=rss-glx +pkgver=0.9.1 +pkgrel=7 +pkgdesc="The Really Slick Screensavers port to GLX" +arch=('i686' 'x86_64') +url="http://rss-glx.sourceforge.net/" +license=('GPL') +depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick') +optdepends=('xscreensaver: xscreensaver integration') +install=rss-glx.install +options=('!libtool') +source=(http://downloads.sourceforge.net/rss-glx/${pkgname}_${pkgver}.tar.bz2 + rss-glx-desktops.tar.bz2) +md5sums=('a772bd143cd8d141edf4d9eff9860ab3' + '4211215c9a4918b0dff30a7000647dd9') + +build() { + cd ${srcdir}/${pkgname}_${pkgver} + + [ "$CARCH" = "x86_64" ] && (sed -i -e 's|@LIBS@|@LIBS@ -fopenmp|g' src/Makefile.in) + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --program-transform-name='s/plasma/plasma_rss/' \ + --with-configdir=/usr/share/xscreensaver/config \ + --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers \ + --enable-shared=yes --enable-static=no + make CFLAGS="$CFLAGS -I/usr/include/ImageMagick" +} + +package() { + cd ${srcdir}/${pkgname}_${pkgver} + make DESTDIR=${pkgdir} install + + # FS#18300 + install -d ${pkgdir}/usr/lib/xscreensaver/ + list=$(ls ${pkgdir}/usr/bin --ignore rss-glx_install.pl) + for i in $list; do + ln -s "/usr/bin/$i" "$pkgdir/usr/lib/xscreensaver/" + done + + install -d ${pkgdir}/usr/share/applications/screensavers + install -m644 ${srcdir}/${pkgname}-desktops/*.desktop ${pkgdir}/usr/share/applications/screensavers +} diff --git a/community-testing/rss-glx/rss-glx-desktops.tar.bz2 b/community-testing/rss-glx/rss-glx-desktops.tar.bz2 Binary files differnew file mode 100644 index 000000000..940fd5277 --- /dev/null +++ b/community-testing/rss-glx/rss-glx-desktops.tar.bz2 diff --git a/community-testing/rss-glx/rss-glx.install b/community-testing/rss-glx/rss-glx.install new file mode 100644 index 000000000..758642618 --- /dev/null +++ b/community-testing/rss-glx/rss-glx.install @@ -0,0 +1,12 @@ +post_install() { + cat << 'EOM' + --> If you want to integrate the RSS screen savers with xscreensaver + --> for your user, then install the xscreensaver package and launch + --> the command "rss-glx_install.pl" +EOM + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/community/driftnet/PKGBUILD b/community/driftnet/PKGBUILD index d7fb5fce2..7a128014d 100644 --- a/community/driftnet/PKGBUILD +++ b/community/driftnet/PKGBUILD @@ -1,17 +1,25 @@ -# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# $Id: PKGBUILD 55457 2011-09-13 00:28:52Z ebelanger $ +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + pkgname=driftnet pkgver=0.1.6 -pkgrel=4 +pkgrel=5 pkgdesc="Listens to network traffic and picks out images from TCP streams it observes." +arch=('i686' 'x86_64') url=('http://www.ex-parrot.com/~chris/driftnet/') license=('GPL') -arch=('i686' 'x86_64') depends=('libjpeg' 'libpcap' 'gtk' 'giflib') makedepends=('imake') -source=(http://www.ex-parrot.com/~chris/driftnet/$pkgname-$pkgver.tar.gz) +source=(http://www.ex-parrot.com/~chris/driftnet/${pkgname}-${pkgver}.tar.gz) +md5sums=('8e11d77770452f97bb3c23f510489815') + build() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=$pkgdir LDFLAGS="" || return 1 - install -D -m755 $pkgname "$pkgdir/usr/bin/$pkgname" + cd "${srcdir}/${pkgname}-${pkgver}" + make LDFLAGS="" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -D -m755 driftnet "${pkgdir}/usr/bin/driftnet" } -md5sums=('8e11d77770452f97bb3c23f510489815') diff --git a/community/glpng/PKGBUILD b/community/glpng/PKGBUILD index 83ae13afe..0c57c67ae 100644 --- a/community/glpng/PKGBUILD +++ b/community/glpng/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: $ +# $Id: PKGBUILD 55485 2011-09-13 02:26:22Z ebelanger $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=glpng pkgver=1.45 -pkgrel=3 +pkgrel=4 pkgdesc="Toolkit for loading PNG images as OpenGL textures" arch=('i686' 'x86_64') url="http://www.fifi.org/doc/libglpng-dev/glpng.html" license=('custom') -depends=('libpng' 'zlib') +depends=('libpng' 'libgl') makedepends=('mesa') source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz Makefile @@ -22,13 +22,16 @@ md5sums=('9e0daad8e39fbf3179c73c0d3f74f104' 'cd066652a6e5dbd7c1fc303b8e03417a') build() { - cd $srcdir/libglpng-1.45.orig - patch -Np1 -i $srcdir/libglpng-1.45-debian.patch - patch -Np1 -i $srcdir/libpng14.patch + cd "$srcdir/libglpng-1.45.orig" + patch -Np1 -i "$srcdir/libglpng-1.45-debian.patch" + patch -Np1 -i "$srcdir/libpng14.patch" + cp "$srcdir/Makefile" . + make libglpng.so.1.45 +} - make -f $srcdir/Makefile libglpng.so.1.45 - make -f $srcdir/Makefile DESTDIR=$pkgdir/usr install - - install -Dm644 $srcdir/license \ - $pkgdir/usr/share/licenses/glpng/license +package() { + cd "$srcdir/libglpng-1.45.orig" + make DESTDIR="$pkgdir/usr" install + install -Dm644 "$srcdir/license" \ + "$pkgdir/usr/share/licenses/glpng/license" } diff --git a/community/gtk-rezlooks-engine/PKGBUILD b/community/gtk-rezlooks-engine/PKGBUILD index a6c4264ff..66edded76 100644 --- a/community/gtk-rezlooks-engine/PKGBUILD +++ b/community/gtk-rezlooks-engine/PKGBUILD @@ -1,21 +1,29 @@ -# Maintainer: Javier "Phrodo_00" Aravena <phrodo.00@gmail.com> +# $Id: PKGBUILD 55455 2011-09-13 00:08:05Z ebelanger $ +# Contributor: Javier "Phrodo_00" Aravena <phrodo.00@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gtk-rezlooks-engine pkgver=0.6 -pkgrel=9 +pkgrel=10 pkgdesc="Clean looking gtk theme engine based on the cairo-enabled CVS clearlooks engine code." -url="http://www.gnome-look.org/content/show.php?content=39179" arch=('i686' 'x86_64') -depends=('gtk2' 'cairo') -options=('!libtool') +url="http://www.gnome-look.org/content/show.php?content=39179" license=('GPL') +depends=('gtk2') +options=('!libtool') source=(http://gnome-look.org/CONTENT/content-files/39179-rezlooks-$pkgver.tar.gz) md5sums=('87b768eb372dd5065f9e36bf10245ac7') build() { - cd $startdir/src/rezlooks-$pkgver - ./configure --prefix=/usr --enable-animation - make || return 1 - make DESTDIR=$startdir/pkg install - mkdir -p $startdir/pkg/usr/share/themes + cd "${srcdir}/rezlooks-${pkgver}" + + ./configure --prefix=/usr --enable-animation + make +} + +package() { + cd "${srcdir}/rezlooks-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/themes" } diff --git a/community/kcheckers/PKGBUILD b/community/kcheckers/PKGBUILD index 12e554a8d..b99753db4 100755 --- a/community/kcheckers/PKGBUILD +++ b/community/kcheckers/PKGBUILD @@ -1,33 +1,27 @@ -# $Id: PKGBUILD 8492 2010-01-20 09:33:27Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> +# $Id: PKGBUILD 55424 2011-09-12 07:36:46Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=kcheckers pkgver=0.8.1 -pkgrel=6 +pkgrel=7 pkgdesc="Qt4-based checkers boardgame" arch=('i686' 'x86_64') url="http://qcheckers.sourceforge.net/" license=('GPL') depends=('qt') -source=(http://downloads.sourceforge.net/qcheckers/${pkgname}-${pkgver}.tar.gz - 'kcheckers.desktop') +source=(http://downloads.sourceforge.net/qcheckers/${pkgname}-${pkgver}.tar.gz kcheckers.desktop) md5sums=('793736a007cd92122dfd91bcfd14ab69' '8b8682edd870c2692f9c7d538263e0f5') build() { - cd $srcdir/$pkgname-$pkgver - - # Fix the prefix - sed -i 's#/usr/local#/usr#' common.h - - qmake kcheckers.pro || return 1 - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|/usr/local|/usr|' common.h + qmake kcheckers.pro + make +} - install -d $pkgdir/usr/bin - install -m755 kcheckers $pkgdir/usr/bin || return 1 - install -d ${pkgdir}/usr/share/kcheckers - cp -R i18n icons themes $pkgdir/usr/share/kcheckers || return 1 - chmod 644 $pkgdir/usr/share/kcheckers/i18n/{kcheckers_fr.ts,kcheckers_ru.ts} - install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}/usr" install + install -Dm644 "${srcdir}/kcheckers.desktop" "${pkgdir}/usr/share/applications/kcheckers.desktop" } diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 77d2e1977..ce58445d5 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54467 2011-08-18 15:07:35Z bluewind $ +# $Id: PKGBUILD 55439 2011-09-12 19:23:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,17 +6,17 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.12 -pkgrel=2 +pkgver=0.9.14 +pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') url="http://www.gnu.org/software/libmicrohttpd/" license=('LGPL') options=('!libtool') -depends=('gnutls') +depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('35b000cd7d201ace2b071d53a02b2c0d') +md5sums=('9bc69bb2898e4b27dd3dd7e4b8ac7098') build() { cd ${pkgname}-${pkgver} diff --git a/community/libopenraw/PKGBUILD b/community/libopenraw/PKGBUILD index 0294a5a1d..7d73f78ac 100644 --- a/community/libopenraw/PKGBUILD +++ b/community/libopenraw/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 9156 2010-01-23 23:10:28Z ttopper $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> +# $Id: PKGBUILD 55459 2011-09-13 00:37:08Z ebelanger $ +# Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libopenraw pkgver=0.0.8 -pkgrel=3 -pkgdesc="libopenraw is an ongoing project to provide a free software implementation for camera RAW files decoding" +pkgrel=4 +pkgdesc="A software implementation for camera RAW files decoding" +arch=('i686' 'x86_64') url="http://libopenraw.freedesktop.org" license=('LGPL') -arch=('i686' 'x86_64') depends=('gtk2') -makedepends=('boost' 'libjpeg>=7') +makedepends=('boost' 'libjpeg') options=('!libtool') -source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.gz) +source=(http://libopenraw.freedesktop.org/download/${pkgname}-${pkgver}.tar.gz) md5sums=('fc26f146586a4b601326130bce6ffd88') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index e0ef8b0d8..379436ce2 100644 --- a/community/mc/PKGBUILD +++ b/community/mc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 52675 2011-07-27 13:42:43Z schuay $ +# $Id: PKGBUILD 55445 2011-09-12 20:10:14Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=mc -pkgver=4.7.5.3 +pkgver=4.7.5.4 pkgrel=1 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64') @@ -30,8 +30,8 @@ conflicts=('mc-utf8') replaces=('mc-utf8') options=('!emptydirs' '!makeflags') source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('6a67e139e0032d8a871455a80d490941') -sha1sums=('1f24ee96048e370419bf017f49b76ea3341bc545') +md5sums=('1e53e27fb3bed21c9042689d5777b5aa') +sha1sums=('5deefd15a13782605fa92c0beb635c0664b913cf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/mms_client/PKGBUILD b/community/mms_client/PKGBUILD index 8cdb4f89b..fee06add1 100644 --- a/community/mms_client/PKGBUILD +++ b/community/mms_client/PKGBUILD @@ -1,28 +1,31 @@ +# $Id: PKGBUILD 55469 2011-09-13 01:01:58Z ebelanger $ # Contributor: William Rea <sillywilly@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=mms_client pkgver=0.0.3 -pkgrel=4 +pkgrel=5 pkgdesc="mms protocol download utility" arch=('i686' 'x86_64') url="http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/" license=('GPL') +depends=('glibc') source=(http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/mms_client-0.0.3.tar.gz mmsclient-0.0.3-fbsd.patch \ mmsclient-0.0.3-r1.patch) -md5sums=('c91171a0bbbfb94290d362e907432787' '8b1f4c95b4b13abd91d2c7c4ba51ea23'\ +md5sums=('c91171a0bbbfb94290d362e907432787' + '8b1f4c95b4b13abd91d2c7c4ba51ea23' 'b85485058a26b3a0881639bc02de71cb') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i ../mmsclient-0.0.3-fbsd.patch patch -p1 -i ../mmsclient-0.0.3-r1.patch ./configure --prefix=/usr - make || return 1 + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make prefix=${pkgdir}/usr install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/mpgtx/PKGBUILD b/community/mpgtx/PKGBUILD index e54ebb65c..42c9a8080 100644 --- a/community/mpgtx/PKGBUILD +++ b/community/mpgtx/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 5259 2009-11-07 12:46:05Z ibiru $ +# $Id: PKGBUILD 55451 2011-09-12 23:46:30Z ebelanger $ # Contributor: Peter Baldwin <bald_pete@hotmail.com> + pkgname=mpgtx pkgver=1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="A command line MPEG audio/video/system toolkit" arch=('i686' 'x86_64') url="http://mpgtx.sourceforge.net" -license=("GPL") -depends=() +license=('GPL') +depends=('gcc-libs') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('d628060aa04ad3b40a175bf35f5167cf') build() { - cd $startdir/src/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 - make PREFIX=$startdir/pkg/usr install - mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make PREFIX="$pkgdir/usr" manprefix="${pkgdir}/usr/share" install } diff --git a/community/rlog/PKGBUILD b/community/rlog/PKGBUILD index 5479d9d03..48bf0832c 100644 --- a/community/rlog/PKGBUILD +++ b/community/rlog/PKGBUILD @@ -1,25 +1,30 @@ +# $Id: PKGBUILD 55453 2011-09-12 23:51:53Z ebelanger $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Sven Kauber <celeon@gmail.com> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=rlog pkgver=1.4 -pkgrel=3 +pkgrel=4 pkgdesc="A flexible message logging facility for C++ programs and libraries" arch=('i686' 'x86_64') -url="http://arg0.net/wiki/rlog" +url="http://www.arg0.net/rlog" license=('LGPL') depends=('gcc-libs') options=('!libtool') -source=(http://rlog.googlecode.com/files/$pkgname-$pkgver.tar.gz \ - $pkgname-section.patch) +source=(http://rlog.googlecode.com/files/${pkgname}-${pkgver}.tar.gz \ + ${pkgname}-section.patch) md5sums=('c29f74e0f50d66b20312d049b683ff82' '69644989e07ceb5c265dfc0c6f770810') -build() -{ - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/$pkgname-section.patch || return 1 - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir/ install +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/${pkgname}-section.patch" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install } diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index dd879bd65..219ef52ed 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49619 2011-06-18 17:40:00Z schiv $ +# $Id: PKGBUILD 55432 2011-09-12 10:32:31Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: sickhate <sickhate@tux-linux.net> @@ -7,7 +7,7 @@ # bring in pyalsa, csound, mma pkgname=solfege -pkgver=3.20.0 +pkgver=3.20.1 pkgrel=1 pkgdesc="Music education and ear training software" arch=('i686' 'x86_64') @@ -15,16 +15,17 @@ url="http://www.solfege.org/" license=('GPL3') depends=('pygtk' 'libgtkhtml') makedepends=('ghostscript' 'gnome-doc-utils' 'librsvg' 'libxslt' - 'lilypond' 'swig' 'texinfo' 'txt2man' 'pkg-config') + 'swig' 'texinfo' 'txt2man' 'pkg-config') 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' + #'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") -md5sums=('3deb355d57f009201f2c5486b93c5950') +md5sums=('41e04601afe758dc9e44c08d82193855') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/solfege/solfege.install b/community/solfege/solfege.install new file mode 100644 index 000000000..bf8d22af6 --- /dev/null +++ b/community/solfege/solfege.install @@ -0,0 +1,4 @@ +post_upgrade() { + echo " lilypond support has been removed" + echo " see http://code.google.com/p/solfege/issues/detail?id=242" +} diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 96798a34d..cb61420ae 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132788 2011-07-26 07:38:52Z andrea $ +# $Id: PKGBUILD 137927 2011-09-12 16:08:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64') url='http://pim.kde.org/akonadi' @@ -12,10 +12,16 @@ license=('LGPL') depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('16bc40e022d06f287f18c71faaeb2e42') +source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2" + 'fix-slow-kde-logout.patch') +md5sums=('16bc40e022d06f287f18c71faaeb2e42' + 'cdf0c3bd5741303e4f98ea435c39f09d') build() { + # Already fixed upstream + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fix-slow-kde-logout.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/akonadi/fix-slow-kde-logout.patch b/extra/akonadi/fix-slow-kde-logout.patch new file mode 100644 index 000000000..49228ef8b --- /dev/null +++ b/extra/akonadi/fix-slow-kde-logout.patch @@ -0,0 +1,64 @@ +commit c8e45b10c32679bf070af5b7ad9a22b91eb9a02c +Author: Sergio Martins <iamsergio@gmail.com> +Date: Mon Sep 12 13:48:33 2011 +0100 + + Fix crash on agent_launcher exit. + + Don't unload plugins here. They will be unloaded on application exit, + so it's redundant. + + Seems they are being unloaded too early, before QThreadStorage + cleanup occurs: + + ==18802== Invalid read of size 8 + ==18802== at 0x53178AE: QThreadStorage<QFontCache*>::deleteData(void*) (in + /data/installation/qt/qt-4.7/lib/libQtGui.so.4.7.1) + ==18802== by 0x5E8F8CF: QThreadStorageData::set(void*) + (qthreadstorage.cpp:165) + ==18802== by 0x5317940: void + qThreadStorage_setLocalData<QFontCache>(QThreadStorageData&, QFontCache**) + (qthreadstorage.h:92) + ==18802== by 0x53165BA: + QThreadStorage<QFontCache*>::setLocalData(QFontCache*) (qthreadstorage.h:148) + ==18802== by 0x531407A: QFontCache::cleanup() (qfont.cpp:2632) + ==18802== by 0x5406536: QFont::cleanup() (qfont_x11.cpp:182) + ==18802== by 0x5104E35: qt_cleanup() (qapplication_x11.cpp:2647) + ==18802== by 0x50603B2: QApplication::~QApplication() + (qapplication.cpp:1172) + ==18802== by 0x41B1F6: main (agentlauncher.cpp:28) + ==18802== Address 0x11a090b0 is not stack'd, malloc'd or (recently) free'd + + CCBUG: 261788 + +diff --git a/agentserver/agentpluginloader.cpp b/agentserver/agentpluginloader.cpp +index 2d62d3b..456a124 100644 +--- a/agentserver/agentpluginloader.cpp ++++ b/agentserver/agentpluginloader.cpp +@@ -25,13 +25,8 @@ using namespace Akonadi; + + AgentPluginLoader::~AgentPluginLoader() + { +- QHash<QString, QPluginLoader*>::iterator it = m_pluginLoaders.begin(); +- while ( it != m_pluginLoaders.end() ) { +- it.value()->unload(); +- ++it; +- } +- + qDeleteAll( m_pluginLoaders ); ++ m_pluginLoaders.clear(); + } + + QPluginLoader *AgentPluginLoader::load( const QString &pluginName ) +diff --git a/agentserver/agentpluginloader.h b/agentserver/agentpluginloader.h +index 77f5de9..c8c815f 100644 +--- a/agentserver/agentpluginloader.h ++++ b/agentserver/agentpluginloader.h +@@ -26,7 +26,7 @@ class AgentPluginLoader + { + public: + /** +- Unloads and deletes all instantiated QPluginLoaders. ++ Deletes all instantiated QPluginLoaders. + */ + ~AgentPluginLoader(); + diff --git a/extra/bc/PKGBUILD b/extra/bc/PKGBUILD index 7c7337580..96ab3239b 100644 --- a/extra/bc/PKGBUILD +++ b/extra/bc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 58245 2009-11-06 14:34:42Z eric $ +# $Id: PKGBUILD 137896 2011-09-12 10:03:30Z pierre $ # Maintainer: dorphell <dorphell@archlinux.org> pkgname=bc pkgver=1.06 -pkgrel=7 +pkgrel=8 pkgdesc="An arbitrary precision calculator language" arch=('i686' 'x86_64') url="http://www.gnu.org/software/bc/" @@ -12,20 +12,25 @@ depends=('readline') replaces=('bc-readline') conflicts=('bc-readline') install=bc.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz - build-fix.patch bc-1.06-info-dir-entry.patch) -md5sums=('d44b5dddebd8a7a7309aea6c36fda117' 'fc7ecbd9e55ef04c6d3a495692626116'\ +source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'build-fix.patch' 'bc-1.06-info-dir-entry.patch') +md5sums=('d44b5dddebd8a7a7309aea6c36fda117' + 'fc7ecbd9e55ef04c6d3a495692626116' 'b6fe9869830aca0d34badf810fe0cfb3') -sha1sums=('c8f258a7355b40a485007c40865480349c157292' '3af67c59e2232b9329ff0c1cf49d1a8a1cf87cd7'\ - 'c15c2a301ba80cf4d3c03a6e164f4e57fa86e4a2') build() { - CFLAGS="$CFLAGS -O3" + export CFLAGS="${CFLAGS/-O?/-O3}" + cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/build-fix.patch" || return 1 - patch -p1 -i "${srcdir}/bc-1.06-info-dir-entry.patch" || return 1 + patch -p1 -i "${srcdir}/build-fix.patch" + patch -p1 -i "${srcdir}/bc-1.06-info-dir-entry.patch" + ./configure --prefix=/usr --mandir=/usr/share/man \ - --infodir=/usr/share/info --with-readline || return 1 - make LEX="flex -I" || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --infodir=/usr/share/info --with-readline + make LEX="flex -I" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/cdrdao/PKGBUILD b/extra/cdrdao/PKGBUILD index 4474dce28..3ef570fbe 100644 --- a/extra/cdrdao/PKGBUILD +++ b/extra/cdrdao/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 102363 2010-12-07 13:51:12Z jgc $ +# $Id: PKGBUILD 137917 2011-09-12 12:45:56Z pierre $ # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,15 +6,15 @@ pkgbase=('cdrdao') pkgname=('cdrdao' 'gcdmaster') pkgver=1.2.3 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') license=('GPL') url="http://cdrdao.sourceforge.net/" makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - cdrdao-1.2.3-autoconf-update.patch - cdrdao-1.2.3-k3b.patch - cdrdao-1.2.3-stat.patch) +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'cdrdao-1.2.3-autoconf-update.patch' + 'cdrdao-1.2.3-k3b.patch' + 'cdrdao-1.2.3-stat.patch') md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c' '8e53dfc174f7c0882194caa05e68b85e' '696f6ca01e1eeb9b6a5be88e535d9398' @@ -22,16 +22,16 @@ md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c' build() { cd "${srcdir}/${pkgbase}-${pkgver}" - + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch" patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch" - patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch" - + patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch" + ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --with-xdao --with-lame \ - --with-ogg-support --with-mp3-support + --mandir=/usr/share/man \ + --sysconfdir=/etc \ + --with-xdao --with-lame \ + --with-ogg-support --with-mp3-support make } @@ -54,6 +54,6 @@ package_gcdmaster() { cd "${srcdir}/${pkgbase}-${pkgver}" make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/" - rmdir "${pkgdir}/etc" + mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/" + rmdir "${pkgdir}/etc" } diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD index e9922cee3..d0437cfc7 100644 --- a/extra/di/PKGBUILD +++ b/extra/di/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 107485 2011-01-26 04:42:16Z eric $ +# $Id: PKGBUILD 137944 2011-09-12 21:48:44Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=di -pkgver=4.27 +pkgver=4.28 pkgrel=1 pkgdesc="A disk information utility, displaying everything (and more) that your df command does" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ license=('ZLIB') depends=('glibc') options=('!makeflags') source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz) -md5sums=('b1a7ee87b83d72c273558a5ec815bfc3') -sha1sums=('a079258f2a6d1861c0a42761864d3113b384da97') +md5sums=('8f56121562ac3ca05b48c0827ec0d48d') +sha1sums=('b65c7fa10d8d319107a26036daaa95803b3ecb1e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/glhack/PKGBUILD b/extra/glhack/PKGBUILD index 27ef966e4..5c073c3b0 100644 --- a/extra/glhack/PKGBUILD +++ b/extra/glhack/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 63897 2010-01-19 01:01:11Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor : Markus Meissner <markus@meissna.de> +# $Id: PKGBUILD 137858 2011-09-12 05:04:42Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glhack pkgver=1.2 -pkgrel=4 +pkgrel=5 pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D" arch=('i686' 'x86_64') url="http://glhack.sourceforge.net/" license=('custom') -depends=('sdl' 'libpng' 'mesa') +depends=('sdl' 'libpng' 'libgl') +makedepends=('mesa') options=('!makeflags') install=glhack.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) @@ -19,16 +19,20 @@ sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae') build(){ cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|/usr/lib/games|/usr/share|' include/config.h || return 1 - sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h || return 1 - sed -i -e 's|PREFIX = /usr|PREFIX = $(DESTDIR)/usr|' Makefile || return 1 - sed -i -e 's|VARDIR = /var/lib/games/glhack|VARDIR = $(DESTDIR)/var/games/glhack|' Makefile || return 1 - sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile || return 1 - sed -i -e 's|GAMEDIR = $(PREFIX)/lib/games/$(GAME)|GAMEDIR = $(PREFIX)/share/$(GAME)|' Makefile || return 1 + sed -i 's|/usr/lib/games|/usr/share|' include/config.h + sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h + sed -i -e 's|PREFIX = /usr|PREFIX = $(DESTDIR)/usr|' Makefile + sed -i -e 's|VARDIR = /var/lib/games/glhack|VARDIR = $(DESTDIR)/var/games/glhack|' Makefile + sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile + sed -i -e 's|GAMEDIR = $(PREFIX)/lib/games/$(GAME)|GAMEDIR = $(PREFIX)/share/$(GAME)|' Makefile - make || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" install -d "${pkgdir}"/usr/share/man/man{5,6} - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install install -D -m644 dat/license "${pkgdir}/usr/share/licenses/${pkgname}/license" # Renaming man pages which conflicts with nethack diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD index 4895b5942..30fc520a8 100644 --- a/extra/gtk/PKGBUILD +++ b/extra/gtk/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 62736 2010-01-11 15:31:11Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 137905 2011-09-12 10:53:48Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gtk pkgver=1.2.10 -pkgrel=10 +pkgrel=11 pkgdesc="The GTK+ toolkit" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -13,9 +12,10 @@ depends=('libxi' 'glib' 'sh') makedepends=('libxt') options=('!libtool') install=gtk.install -source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz aclocal-fixes.patch) -md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' 'c59d4906602d99a7468f7334b6fc3b4e') -sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' 'b034e33efb85d27f3f3fb082c404e3b6ea79259f') +source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz" + 'aclocal-fixes.patch') +md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' + 'c59d4906602d99a7468f7334b6fc3b4e') build() { cd "${srcdir}/gtk+-${pkgver}" @@ -24,10 +24,15 @@ build() { ln -s /usr/share/libtool/config/config.guess config.guess ln -s /usr/share/libtool/config/config.sub config.sub fi - patch -Np0 -i "${srcdir}/aclocal-fixes.patch" || return 1 + patch -Np0 -i "${srcdir}/aclocal-fixes.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-xinput=xfree || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --with-xinput=xfree + make +} + +package() { + cd "${srcdir}/gtk+-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gtk/gtk.install b/extra/gtk/gtk.install index 3c48904fd..8758bebc3 100644 --- a/extra/gtk/gtk.install +++ b/extra/gtk/gtk.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(gdk.info.gz gtk.info.gz) post_install() { diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 5c9c178a4..3a20803c5 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 137365 2011-09-07 17:16:37Z andrea $ +# $Id: PKGBUILD 137928 2011-09-12 16:11:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt pkgver=4.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdebase-runtime' 'qimageblitz' 'qscintilla') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') +depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') +makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") sha1sums=('7f6074c552a3e9a72ebbbc1683786d7cb479871a') diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 03ce95ca9..ec77e5271 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137354 2011-09-07 17:12:53Z andrea $ +# $Id: PKGBUILD 137929 2011-09-12 16:31:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs pkgver=4.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -19,20 +19,25 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch') + 'kde-applications-menu.patch' 'archlinux-menu.patch' + 'fix-kdirwatch-with-linux3.patch') sha1sums=('661cc56f199b7250bd825cc0e85ff442b85171e2' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67') + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + '54e6cbd7a8c4f9df947f18692512ca618c824c43') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} # avoid file conflict with gnome-menu - patch -p1 -i $srcdir/kde-applications-menu.patch + patch -p1 -i "${srcdir}"/kde-applications-menu.patch # add Archlinux menu entry - patch -p1 -i $srcdir/archlinux-menu.patch + patch -p1 -i "${srcdir}"/archlinux-menu.patch - cd ${srcdir} + # Already fixed upstream + patch -p1 -i "${srcdir}"/fix-kdirwatch-with-linux3.patch + + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -48,11 +53,11 @@ build() { } package() { - cd $srcdir/build - make DESTDIR=$pkgdir install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install # cert bundle seems to be hardcoded # link it to the one from ca-certificates - rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt + rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt + ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt } diff --git a/extra/kdelibs/fix-kdirwatch-with-linux3.patch b/extra/kdelibs/fix-kdirwatch-with-linux3.patch new file mode 100644 index 000000000..6685d9cc4 --- /dev/null +++ b/extra/kdelibs/fix-kdirwatch-with-linux3.patch @@ -0,0 +1,56 @@ +From: Alex Fiestas <afiestas@kde.org> +Date: Fri, 09 Sep 2011 16:54:23 +0000 +Subject: Fix KDirWatch when using Kernel 3.0 +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=7df5a79fb9f09e4a4a80cd541cc478b5fa6df00f +--- +Fix KDirWatch when using Kernel 3.0 + +To know INotify is available in the kernel we are checking for a +kernel newer than 2.6.14, that's all allright but the problem is +that the Kernel version format has changed and now we can't be sure +that it is going to be formed by 3 numbers. +Basically we where checking for: + +%d.%d.%d and now it can be %d.%d as it is with 3.0 + +This patch what does is check if the kernel is 2.6, if it is then +it proceed with the version checking. + +CCMAIL: dfaure@kde.org +--- + + +--- a/kdecore/io/kdirwatch.cpp ++++ b/kdecore/io/kdirwatch.cpp +@@ -210,16 +210,24 @@ KDirWatchPrivate::KDirWatchPrivate() + { + struct utsname uts; + int major, minor, patch; +- if (uname(&uts) < 0) +- supports_inotify = false; // *shrug* +- else if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) +- supports_inotify = false; // *shrug* +- else if( major * 1000000 + minor * 1000 + patch < 2006014 ) { // <2.6.14 +- kDebug(7001) << "Can't use INotify, Linux kernel too old"; ++ if (uname(&uts) < 0) { + supports_inotify = false; ++ kDebug(7001) << "Unable to get uname"; ++ } else if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) { ++ supports_inotify = false; ++ kDebug(7001) << "The version is malformed: " << uts.release; ++ } else if(major == 2 && minor == 6) { // If it is 2.6 check further... ++ if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) { ++ supports_inotify = false; ++ kDebug() << "Detected 2.6 kernel but can't know more: " << uts.release; ++ } else if (major * 1000000 + minor * 1000 + patch < 2006014 ){ ++ supports_inotify = false; ++ kDebug(7001) << "Can't use INotify, Linux kernel too old " << uts.release; ++ } + } + } + ++ kDebug() << "INotify available: " << supports_inotify; + if ( supports_inotify ) { + availableMethods << "INotify"; + fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); + diff --git a/extra/libcddb/PKGBUILD b/extra/libcddb/PKGBUILD index 1c9ae521e..51b3b7d02 100644 --- a/extra/libcddb/PKGBUILD +++ b/extra/libcddb/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 78167 2010-04-20 00:31:41Z dgriffiths $ +# $Id: PKGBUILD 137919 2011-09-12 12:54:52Z pierre $ # Maintainer: Hugo Doria <hugo@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libcddb pkgver=1.3.2 -pkgrel=2 -pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)." +pkgrel=3 arch=('i686' 'x86_64') +pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)." +url="http://sourceforge.net/projects/libcddb/" license=('LGPL') options=('!libtool') depends=('glibc') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -url="http://sourceforge.net/projects/libcddb/" +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('8bb4a6f542197e8e9648ae597cd6bc8a') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/libdc1394/PKGBUILD b/extra/libdc1394/PKGBUILD index 226839e11..aaba1b8d3 100644 --- a/extra/libdc1394/PKGBUILD +++ b/extra/libdc1394/PKGBUILD @@ -1,20 +1,32 @@ -# $Id: PKGBUILD 119241 2011-04-11 13:01:37Z jgc $ +# $Id: PKGBUILD 137888 2011-09-12 08:33:12Z andrea $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdc1394 pkgver=2.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="High level programming interface to control IEEE 1394 based cameras" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('LGPL') url="http://sourceforge.net/projects/libdc1394/" -depends=('libraw1394>=2.0.5' 'libusb') -options=(!libtool !emptydirs) -source=(http://downloads.sourceforge.net/sourceforge/libdc1394/${pkgname}-${pkgver}.tar.gz) -md5sums=('d8b2cbfae1b329fdeaa638da80427334') +depends=('libraw1394>=2.0.7' 'libusb') +options=('!libtool' '!emptydirs') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'rename-usb_init.patch' + 'videodev-compile-fix.patch') +md5sums=('d8b2cbfae1b329fdeaa638da80427334' + 'bc7a4146b4d2d688305d0d42c4111941' + '9dd11c96241b14073c3a7dd7e270fb7a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # FS#25652 + patch -p2 -i "${srcdir}"/rename-usb_init.patch + # Fix build when linux/video.h exists + patch -p2 -i "${srcdir}"/videodev-compile-fix.patch + + + autoreconf -i ./configure --prefix=/usr make } diff --git a/extra/libdc1394/rename-usb_init.patch b/extra/libdc1394/rename-usb_init.patch new file mode 100644 index 000000000..44e1a5de3 --- /dev/null +++ b/extra/libdc1394/rename-usb_init.patch @@ -0,0 +1,53 @@ +From 13b85d2d23548682b617ddc1196f5560a27998bd Mon Sep 17 00:00:00 2001 +From: Damien Douxchamps <ddsf@douxchamps.net> +Date: Sun, 21 Aug 2011 16:03:22 +0900 +Subject: [PATCH] fix usb_init function name conflict + +--- + libdc1394/dc1394/control.c | 2 +- + libdc1394/dc1394/internal.h | 2 +- + libdc1394/dc1394/usb/control.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c +index c62e0e2..f250f6a 100644 +--- a/libdc1394/dc1394/control.c ++++ b/libdc1394/dc1394/control.c +@@ -1955,7 +1955,7 @@ dc1394_new (void) + windows_init (d); + #endif + #ifdef HAVE_LIBUSB +- usb_init (d); ++ dc1394_usb_init (d); + #endif + + int i; +diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h +index b4d295a..c59e5d3 100644 +--- a/libdc1394/dc1394/internal.h ++++ b/libdc1394/dc1394/internal.h +@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d); + void linux_init(dc1394_t *d); + void macosx_init(dc1394_t *d); + void windows_init(dc1394_t *d); +-void usb_init(dc1394_t *d); ++void dc1394_usb_init(dc1394_t *d); + + void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch, + const char * name); +diff --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c +index 6509452..19a21a6 100644 +--- a/libdc1394/dc1394/usb/control.c ++++ b/libdc1394/dc1394/usb/control.c +@@ -378,7 +378,7 @@ usb_dispatch = { + }; + + void +-usb_init(dc1394_t * d) ++dc1394_usb_init(dc1394_t * d) + { + register_platform (d, &usb_dispatch, "usb"); + } +-- +1.7.4.1 + diff --git a/extra/libdc1394/videodev-compile-fix.patch b/extra/libdc1394/videodev-compile-fix.patch new file mode 100644 index 000000000..8f234b152 --- /dev/null +++ b/extra/libdc1394/videodev-compile-fix.patch @@ -0,0 +1,41 @@ +From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001 +From: David Moore <david.moore@gmail.com> +Date: Sun, 27 Mar 2011 22:48:15 -0700 +Subject: [PATCH] Conditionally compile dc1394_vloopback only when linux/videodev.h exists + +--- + libdc1394/configure.in | 3 +++ + libdc1394/examples/Makefile.am | 2 ++ + 2 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/libdc1394/configure.in b/libdc1394/configure.in +index 69babab..bdddc9b 100644 +--- a/libdc1394/configure.in ++++ b/libdc1394/configure.in +@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue) + AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue) + AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x") + ++AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true]) ++AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue) ++ + AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true]) + + AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue) +diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am +index fcebf18..035612e 100644 +--- a/libdc1394/examples/Makefile.am ++++ b/libdc1394/examples/Makefile.am +@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \ + B = dc1394_reset_bus + + if HAVE_LINUX ++if HAVE_VIDEODEV + B += dc1394_vloopback ++endif + if HAVE_XV + A += dc1394_multiview + endif +-- +1.7.4.1 + diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD index 660771863..913603045 100644 --- a/extra/libmng/PKGBUILD +++ b/extra/libmng/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 63248 2010-01-16 20:44:09Z jgc $ -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 137860 2011-09-12 05:28:13Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + pkgname=libmng pkgver=1.0.10 -pkgrel=3 +pkgrel=4 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files" arch=('i686' 'x86_64') url="http://www.libmng.com/" license=('custom') -depends=('zlib' 'libjpeg>=8') -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('a464ae7d679781beebdf7440d144b7bd') +depends=('zlib' 'libjpeg') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('eaf1476a3bb29f6190bca660e6abef16') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" ln -s makefiles/configure.in . ln -s makefiles/Makefile.am . autoreconf --force --install ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD index 9182dd229..79601b0be 100644 --- a/extra/libmp4v2/PKGBUILD +++ b/extra/libmp4v2/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 71330 2010-03-06 18:41:25Z andrea $ +# $Id: PKGBUILD 137907 2011-09-12 11:57:06Z pierre $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libmp4v2 pkgver=1.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="MPEG-4 library" arch=('i686' 'x86_64') license=('MPL') url="http://code.google.com/p/mp4v2/" +depends=('gcc-libs') options=('!libtool') -source=(http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2) +source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2") md5sums=('986701929ef15b03155ac4fb16444797') build() { cd ${srcdir}/mp4v2-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make } package() { cd ${srcdir}/mp4v2-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - make DESTDIR=${pkgdir} install-man || return 1 -}
\ No newline at end of file + make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} install-man +} diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD index 4b26007aa..89cdaecb7 100644 --- a/extra/libtheora/PKGBUILD +++ b/extra/libtheora/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57637 2009-11-01 07:48:03Z eric $ +# $Id: PKGBUILD 137894 2011-09-12 09:56:42Z pierre $ # Maintainer: Tom Killian <tom@archlinux.org> # Committer: dorphell <dorphell@archlinux.org> pkgname=libtheora pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="An open video codec developed by the Xiph.org" arch=('i686' 'x86_64') url="http://www.xiph.org" @@ -12,16 +12,20 @@ license=('BSD') depends=('libogg') makedepends=('libvorbis') options=('!libtool') -source=(http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2) +source=("http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2") md5sums=('292ab65cedd5021d6b7ddd117e07cd8e') sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262') build() { cd "${srcdir}/libtheora-${pkgver}" - ./configure --prefix=/usr --enable-shared --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd "${srcdir}/libtheora-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD index 9b30c5bf9..6a6274b99 100644 --- a/extra/lua/PKGBUILD +++ b/extra/lua/PKGBUILD @@ -1,32 +1,41 @@ -# $Id: PKGBUILD 86292 2010-07-28 06:43:46Z juergen $ +# $Id: PKGBUILD 137921 2011-09-12 13:07:25Z pierre $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=lua pkgver=5.1.4 -pkgrel=6 +pkgrel=7 pkgdesc="A powerful light-weight programming language designed for extending applications." arch=('i686' 'x86_64') -url="http://www.lua.org/" -depends=('readline' 'ncurses') +url="http://www.lua.org/" +depends=('readline') license=('MIT') -options=('!makeflags') -source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz http://www.lua.org/ftp/patch-lua-5.1.4-2 lua-arch.patch lua-5.1-cflags.diff) -md5sums=('d0870f2de55d59c1c8419f36e8fac150' '1239310e0c4a581c7831e596f95cc6cd'\ - '6c5953f63904bf20a0183cdab05b80de' '249582bf1fd861ccf492d2c35a9fe732') +options=('!makeflags' '!emptydirs') +source=("http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz" + 'http://www.lua.org/ftp/patch-lua-5.1.4-2' + 'lua-arch.patch' + 'lua-5.1-cflags.diff') +md5sums=('d0870f2de55d59c1c8419f36e8fac150' + '1239310e0c4a581c7831e596f95cc6cd' + '6c5953f63904bf20a0183cdab05b80de' + '249582bf1fd861ccf492d2c35a9fe732') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i "${srcdir}/lua-arch.patch" patch -i ${srcdir}/patch-lua-5.1.4-2 -d src + [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff + [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" + make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ + INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ + linux } package() { cd "${srcdir}/${pkgname}-${pkgver}" - [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff - [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ - linux install || return 1 + make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ + INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ + install install -D -m 644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT" diff --git a/extra/mt-st/PKGBUILD b/extra/mt-st/PKGBUILD index 17ef58f94..a0963606f 100644 --- a/extra/mt-st/PKGBUILD +++ b/extra/mt-st/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 53023 2009-09-25 05:09:23Z paul $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 137900 2011-09-12 10:12:39Z allan $ +# Maintainer: +# Contributer: dorphell <dorphell@archlinux.org> + pkgname=mt-st pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Linux SCSI tape driver aware magnetic tape control" -arch=(i686 x86_64) -url="ftp://ftp.ibiblio.org/pub/linux/system/backup/" -depends=('glibc') arch=('i686' 'x86_64') +url="ftp://ftp.ibiblio.org/pub/linux/system/backup/" license=('GPL2') +depends=('glibc') source=(ftp://ftp.ibiblio.org/pub/linux/system/backup/$pkgname-$pkgver.tar.gz) md5sums=('fdd5f5ec673c9f630a102ceff7612774') build() { - cd $startdir/src/$pkgname-$pkgver || return 1 - - make || return 1 + cd $srcdir/$pkgname-$pkgver + make +} - mkdir -p $startdir/pkg/{sbin,bin,usr/share/man/man1,usr/share/man/man8} || return 1 - make SBINDIR=$startdir/pkg/sbin BINDIR=$startdir/pkg/bin \ - MANDIR=$startdir/pkg/usr/share/man install || return 1 +package() { + cd $srcdir/$pkgname-$pkgver + install -dm755 $pkgdir/{sbin,bin,usr/share/man/man1,usr/share/man/man8} + make SBINDIR=$pkgdir/sbin BINDIR=$pkgdir/bin \ + MANDIR=$pkgdir/usr/share/man install } diff --git a/extra/mtx/PKGBUILD b/extra/mtx/PKGBUILD index 7451c78db..4b014ac72 100644 --- a/extra/mtx/PKGBUILD +++ b/extra/mtx/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 53028 2009-09-25 05:20:59Z paul $ -# Maintainer: dorphell <dorphell@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 137902 2011-09-12 10:18:06Z allan $ +# Maintainer: +# Contributer: Judd Vinet <jvinet@zeroflux.org> + pkgname=mtx pkgver=1.3.12 -pkgrel=1 +pkgrel=2 pkgdesc="Send robot commands to tape changer" arch=('i686' 'x86_64') url="http://mtx.opensource-sw.net/" license=('GPL2') depends=('glibc') source=(http://downloads.sourceforge.net/mtx/${pkgname}-${pkgver}.tar.gz) +md5sums=('ce8f0e44671fb0c7d9ec30bb0bfa8b5c') build() { - cd $startdir/src/${pkgname}-${pkgver} || return 1 + cd $srcdir/${pkgname}-${pkgver} sed -i 's/static const unsigned char scsi_command_size/const unsigned char scsi_command_size/' \ - sg_err.c || return 1 - ./configure --prefix='/usr' --datadir='/usr/share' || return 1 - make || return 1 - mkdir $startdir/pkg/usr || return 1 - make prefix=$startdir/pkg/usr install || return 1 + sg_err.c + ./configure --prefix='/usr' --datadir='/usr/share' + make +} + +package() { + cd $srcdir/${pkgname}-${pkgver} + make prefix=$pkgdir/usr install } -md5sums=('ce8f0e44671fb0c7d9ec30bb0bfa8b5c') diff --git a/extra/ogle/PKGBUILD b/extra/ogle/PKGBUILD index 9d9b19c50..240daa30b 100644 --- a/extra/ogle/PKGBUILD +++ b/extra/ogle/PKGBUILD @@ -1,39 +1,44 @@ -# $Id: PKGBUILD 63949 2010-01-19 05:22:55Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# $Id: PKGBUILD 137878 2011-09-12 06:26:48Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=ogle pkgver=0.9.2 -pkgrel=12 +pkgrel=13 pkgdesc="A simple DVD player for Linux" arch=('i686' 'x86_64') url="http://www.dtek.chalmers.se/groups/dvd/" license=('GPL') -depends=('libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv' - 'alsa-lib' 'a52dec' 'libsm' 'libxxf86vm') +depends=('sh' 'libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv' + 'alsa-lib' 'a52dec' 'libxxf86vm') options=('!libtool') -source=(http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz - xvideofix.patch - gcc34alsafix.patch - gcc4.patch - dvdread-4.1.3.patch) +# http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz +source=(ftp://ftp.archlinux.org/other/ogle/${pkgname}-${pkgver}.tar.gz \ + xvideofix.patch gcc34alsafix.patch gcc4.patch dvdread-4.1.3.patch \ + ogle-vuln-scripts-makefile.patch) md5sums=('a76a9892bdb807a4bcf859d15a91f0f9' '57f1cf36eed82c56f24e9c0fc25ce2b3' '4ebc822b252fade6b53c5ceb5be45bf5' 'd08cff87c5ec41a7eebc0d2384835688' - '597906c64ff7f5185de8430fdae3107d') + '597906c64ff7f5185de8430fdae3107d' + 'd052b01f293c61d399fdd0ac2abb1cf4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/dvdread-4.1.3.patch" || return 1 - patch -Np1 -i ../xvideofix.patch || return 1 - patch -Np1 -i ../gcc34alsafix.patch || return 1 - patch -Np1 -i ../gcc4.patch || return 1 + patch -p0 -i "${srcdir}/dvdread-4.1.3.patch" + patch -p1 -i "${srcdir}/xvideofix.patch" + patch -p1 -i "${srcdir}/gcc34alsafix.patch" + patch -p1 -i "${srcdir}/gcc4.patch" + patch -p0 -i "${srcdir}/ogle-vuln-scripts-makefile.patch" + # fix alsa detection - stolen from their cvs - sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure || return 1 - sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c || return 1 - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x || return 1 - make || return 1 + sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure + sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" export LIBRARY_PATH="${pkgdir}/usr/lib/ogle" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/extra/ogle/ogle-vuln-scripts-makefile.patch b/extra/ogle/ogle-vuln-scripts-makefile.patch new file mode 100644 index 000000000..f25964378 --- /dev/null +++ b/extra/ogle/ogle-vuln-scripts-makefile.patch @@ -0,0 +1,36 @@ +This patch inhibits the installation of debug scripts vulnerable to a symlink +attack, see bug 245921 for reference. + +--- scripts/Makefile.in.orig 2009-04-04 18:13:33.000000000 +0200 ++++ scripts/Makefile.in 2009-04-04 18:15:46.000000000 +0200 +@@ -133,10 +133,10 @@ + subdir = scripts + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_CLEAN_FILES = ogle +-SCRIPTS = $(bin_SCRIPTS) $(dist_pkglib_SCRIPTS) ++SCRIPTS = $(bin_SCRIPTS) + + DIST_SOURCES = +-DIST_COMMON = $(dist_pkglib_SCRIPTS) Makefile.am Makefile.in ogle.in ++DIST_COMMON = Makefile.am Makefile.in ogle.in + all: all-am + + .SUFFIXES: +@@ -279,7 +279,7 @@ + + install-data-am: + +-install-exec-am: install-binSCRIPTS install-dist_pkglibSCRIPTS ++install-exec-am: install-binSCRIPTS + + install-info: install-info-am + +@@ -295,7 +295,7 @@ + + mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +-uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkglibSCRIPTS \ ++uninstall-am: uninstall-binSCRIPTS \ + uninstall-info-am + + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD index c91d5675d..c15be07c8 100644 --- a/extra/python-urwid/PKGBUILD +++ b/extra/python-urwid/PKGBUILD @@ -4,15 +4,15 @@ # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> pkgname=python-urwid -pkgver=0.9.9.1 -pkgrel=2 +pkgver=0.9.9.2 +pkgrel=1 pkgdesc="Urwid is a curses-based user interface library." license=('GPL') arch=('i686' 'x86_64') depends=('python2') url="http://excess.org/urwid/" source=(http://excess.org/urwid/urwid-$pkgver.tar.gz) -md5sums=('4722cdf898f711dcae1121aa80920152') +md5sums=('e58b86a983fe5474a07749501748b728') build() { cd $startdir/src/urwid-$pkgver diff --git a/extra/sdl_net/PKGBUILD b/extra/sdl_net/PKGBUILD index b26327678..2e6f3862f 100644 --- a/extra/sdl_net/PKGBUILD +++ b/extra/sdl_net/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 51822 2009-09-12 07:01:31Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 137890 2011-09-12 09:39:20Z allan $ +# Maintainer: # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_net pkgver=1.2.7 -pkgrel=3 +pkgrel=4 pkgdesc="A small sample cross-platform networking library" arch=('i686' 'x86_64') url="http://www.libsdl.org/projects/SDL_net/" @@ -18,6 +18,10 @@ md5sums=('6bd4662d1423810f3140d4da21b6d912') build() { cd ${srcdir}/SDL_net-${pkgver} ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/SDL_net-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/taglib-extras/PKGBUILD b/extra/taglib-extras/PKGBUILD index 3becb51f9..23080ec64 100644 --- a/extra/taglib-extras/PKGBUILD +++ b/extra/taglib-extras/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52970 2009-09-23 20:36:32Z giovanni $ +# $Id: PKGBUILD 137892 2011-09-12 09:45:56Z allan $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=taglib-extras pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Additional taglib plugins for KDE" -arch=("i686" "x86_64") +arch=('i686' 'x86_64') url="http://developer.kde.org/~wheeler/taglib.html" license=('LGPL') depends=('taglib>=1.6') @@ -14,12 +14,15 @@ source=(http://www.kollide.net/~jefferai/${pkgname}-${pkgver}.tar.gz) md5sums=('e973ca609b18e2c03c147ff9fd9e6eb8') build() { - cd $srcdir - mkdir build - cd build + mkdir $srcdir/build + cd $srcdir/build cmake ../$pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON || return 1 - make || return 1 + -DCMAKE_SKIP_RPATH=ON + make +} + +package() { + cd $srcdir/build make DESTDIR=$pkgdir install } diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD index 4f958385b..3d3a5b31b 100644 --- a/extra/xaos/PKGBUILD +++ b/extra/xaos/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 67322 2010-02-06 10:00:38Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# $Id: PKGBUILD 137880 2011-09-12 06:35:34Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xaos pkgver=3.5 -pkgrel=3 +pkgrel=4 pkgdesc="A fast portable real-time interactive fractal zoomer" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/xaos/" @@ -18,7 +17,11 @@ sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-gsl --with-aa-driver || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --with-gsl --with-aa-driver + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/xaos/xaos.install b/extra/xaos/xaos.install index 1de05a018..afee50a72 100644 --- a/extra/xaos/xaos.install +++ b/extra/xaos/xaos.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(xaos.info.gz) post_install() { diff --git a/gnome-unstable/clutter/PKGBUILD b/gnome-unstable/clutter/PKGBUILD index 3a731bd4b..c42e1e44c 100644 --- a/gnome-unstable/clutter/PKGBUILD +++ b/gnome-unstable/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137068 2011-09-05 20:55:27Z ibiru $ +# $Id: PKGBUILD 137931 2011-09-12 16:48:56Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.7.14 +pkgver=1.7.90 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('LGPL') depends=('cogl>=1.7.6' 'mesa' 'json-glib' 'atk' 'libxi') makedepends=('gobject-introspection' 'mesa') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a2ad6f09df6dc6cf4c495446053fc0b48e9fc1d9b4d1a63a0a0003a3a92bcae1') +sha256sums=('36b98d400ce9397e66e7b4f6f424a7185dadba0350651ae20964f494ec40b190') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/paprefs/PKGBUILD b/gnome-unstable/paprefs/PKGBUILD new file mode 100644 index 000000000..566f2dbda --- /dev/null +++ b/gnome-unstable/paprefs/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 137942 2011-09-12 21:08:26Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=paprefs +pkgver=0.9.9 +pkgrel=8 +pkgdesc="A simple GTK-based configuration dialog for PulseAudio" +arch=(i686 x86_64) +url="http://0pointer.de/lennart/projects/paprefs" +license=(GPL) +depends=(gconfmm gnome-icon-theme libglademm libsigc++ + 'pulseaudio>=0.99' 'pulseaudio<1.0') +makedepends=(intltool) +source=(http://0pointer.de/lennart/projects/paprefs/$pkgname-$pkgver.tar.gz + paprefs.desktop) +md5sums=('0592ccb28c8f601a8fe3607b64e9f5bc' '20dc978f0bd4a0bf925a4eaf80a2b8f8') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-lynx + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/paprefs.desktop" \ + "$pkgdir/usr/share/applications/paprefs.desktop" +} diff --git a/gnome-unstable/paprefs/paprefs.desktop b/gnome-unstable/paprefs/paprefs.desktop new file mode 100644 index 000000000..d51635533 --- /dev/null +++ b/gnome-unstable/paprefs/paprefs.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=PulseAudio Preferences +Name[de]=PulseAudio-Einstellungen +GenericName=Sound Server Preferences +GenericName[de]=Audio-Dienst-Einstellungen +Comment=View and modify the configuration of the local sound server +Comment[de]=Anzeigen und Ändern der Konfiguration des lokalen Audio-Dienstes +Exec=paprefs +Icon=preferences-desktop +StartupNotify=true +Type=Application +Categories=Settings; diff --git a/gnome-unstable/totem/PKGBUILD b/gnome-unstable/totem/PKGBUILD index 215979e22..09c5e1d97 100644 --- a/gnome-unstable/totem/PKGBUILD +++ b/gnome-unstable/totem/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137060 2011-09-05 18:52:32Z heftig $ +# $Id: PKGBUILD 137933 2011-09-12 17:11:00Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.1.4 +pkgver=3.1.91 pkgrel=1 pkgdesc="A GNOME3 integrated movie player based on Gstreamer." url="http://www.gnome.org" @@ -13,11 +13,11 @@ depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plpars 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst' 'clutter-gtk' 'mx') -makedepends=('intltool' 'gtk-doc' 'python2-gobject2' 'nautilus' 'libgdata' 'xulrunner' 'lirc-utils' +makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner' 'lirc-utils' 'libepc' 'bluez' 'vala' 'grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('46b9c1cf136de90ed649ca6ff636a63aa452c9724e137e983ba4e3250fa35749') +sha256sums=('7a1d7f63c3a97ce1f074801c5164b2dc553bf69e582180b52432dd0c67186d11') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/multilib/lib32-gtk/PKGBUILD b/multilib/lib32-gtk/PKGBUILD index bc1f236a4..3ae2ae7ff 100644 --- a/multilib/lib32-gtk/PKGBUILD +++ b/multilib/lib32-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 29612 2010-10-17 13:00:45Z pschmitz $ +# $Id: PKGBUILD 55430 2011-09-12 10:13:10Z pschmitz $ _pkgbasename=gtk pkgname=lib32-$_pkgbasename pkgver=1.2.10 -pkgrel=11 +pkgrel=12 pkgdesc="The GTK+ toolkit (32-bit)" arch=('x86_64') url="http://www.gtk.org/" diff --git a/testing/dvdauthor/PKGBUILD b/testing/dvdauthor/PKGBUILD new file mode 100644 index 000000000..92c590709 --- /dev/null +++ b/testing/dvdauthor/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 137862 2011-09-12 05:31:16Z eric $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Travis Willard <travisw@wmpub.ca> +# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> +# Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de> + +pkgname=dvdauthor +pkgver=0.7.0 +pkgrel=2 +pkgdesc="DVD authoring tools" +arch=('i686' 'x86_64') +url="http://dvdauthor.sourceforge.net/" +license=('GPL') +depends=('libdvdread' 'imagemagick' 'libxml2' 'libpng' 'fribidi') +options=('!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('33a447fb98ab3293ac40f869eedc17ff') + +build() { + cd "${srcdir}/${pkgname}" + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/imagemagick/PKGBUILD b/testing/imagemagick/PKGBUILD new file mode 100644 index 000000000..fa7a555ef --- /dev/null +++ b/testing/imagemagick/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 137864 2011-09-12 05:31:18Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=imagemagick +pkgname=('imagemagick' 'imagemagick-doc') +pkgver=6.7.2.5 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.imagemagick.org/" +license=('custom') +depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo') +makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') +source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ + perlmagick.rpath.patch) +md5sums=('ce0294e6bc7ca3ece03a432518143a29' + 'ff9974decbfe9846f8e347239d87e4eb') +sha1sums=('0af2f0fb913f390b0b25bc4e57b344b0d54c3560' + '23405f80904b1de94ebd7bd6fe2a332471b8c283') + +build() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + + sed '/AC_PATH_XTRA/d' -i configure.ac + autoreconf + patch -Np0 -i ../perlmagick.rpath.patch + + LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \ + ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ + --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ + --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" \ + --without-gvc --without-djvu --without-autotrace --without-webp \ + --without-jbig --without-fpx --without-dps --without-fftw --without-lqr + make +} + +package_imagemagick() { + pkgdesc="An image viewing/manipulation program" + optdepends=('ghostscript: for Ghostscript support' + 'openexr: for OpenEXR support' + 'libwmf: for WMF support' + 'librsvg: for SVG support' + 'libxml2: for XML support' + 'jasper: for JPEG-2000 support' + 'libpng: for PNG support') + backup=('etc/ImageMagick/coder.xml' + 'etc/ImageMagick/colors.xml' + 'etc/ImageMagick/delegates.xml' + 'etc/ImageMagick/log.xml' + 'etc/ImageMagick/magic.xml' + 'etc/ImageMagick/mime.xml' + 'etc/ImageMagick/policy.xml' + 'etc/ImageMagick/sRGB.icm' + 'etc/ImageMagick/thresholds.xml' + 'etc/ImageMagick/type.xml' + 'etc/ImageMagick/type-dejavu.xml' + 'etc/ImageMagick/type-ghostscript.xml' + 'etc/ImageMagick/type-windows.xml') + options=('!makeflags' '!docs' 'libtool') + + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make DESTDIR="${pkgdir}" install + chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" + +#Cleaning + find "${pkgdir}" -name '*.bs' -delete + rm -f "${pkgdir}"/usr/lib/*.la +} + +package_imagemagick-doc() { + pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" + depends=() + options=('!makeflags') + + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make DESTDIR="${pkgdir}" install-data-html + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" +} diff --git a/testing/imagemagick/perlmagick.rpath.patch b/testing/imagemagick/perlmagick.rpath.patch new file mode 100644 index 000000000..958c0f2ee --- /dev/null +++ b/testing/imagemagick/perlmagick.rpath.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 ++++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 +@@ -10067,6 +10067,7 @@ + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) ++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install diff --git a/testing/inkscape/PKGBUILD b/testing/inkscape/PKGBUILD new file mode 100644 index 000000000..fa56d8d80 --- /dev/null +++ b/testing/inkscape/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 137866 2011-09-12 05:31:21Z eric $ +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=inkscape +pkgver=0.48.2 +pkgrel=2 +pkgdesc='Vector graphics editor using the SVG file format' +url='http://inkscape.sourceforge.net/' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +makedepends=('boost' 'pkg-config' 'intltool') +depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2' + 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') +optdepends=('pstoedit: latex formulas' + 'texlive-core: latex formulas' + 'python2-numpy: some extensions' + 'python-lxml: some extensions and filters' + 'uniconvertor: reading/writing to some proprietary formats') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py + sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py + sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp + sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py + sed -i 's|"python"|"python2"|g' src/main.cpp + + ./configure --prefix=/usr \ + --with-python \ + --with-perl \ + --without-gnome-vfs \ + --with-xft \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/testing/inkscape/install b/testing/inkscape/install new file mode 100644 index 000000000..6e803bf1d --- /dev/null +++ b/testing/inkscape/install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} diff --git a/testing/make/PKGBUILD b/testing/make/PKGBUILD new file mode 100644 index 000000000..36afda4cd --- /dev/null +++ b/testing/make/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 137949 2011-09-13 03:04:32Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=make +pkgver=3.82 +pkgrel=4 +pkgdesc="GNU make utility to maintain groups of programs" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/make" +license=('GPL3') +groups=('base-devel') +depends=('glibc' 'sh') +install=$pkgname.install +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + bug30612.patch + bug30723.patch + make-3.82-sort-blank.patch + make-3.82-makeflags.patch) +md5sums=('1a11100f3c63fcf5753818e59d63088f' + 'c8f496b22191f9fb9420ab14c1a19a47' + '662e6450e19a5acdaa5c9fcb8ad78dea' + '7d01a99f389d8f08dec93ed479071ee4' + 'bc12ad4d0c6e6c0e72d9fb61054f446b') + + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # http://savannah.gnu.org/bugs/?30612 + patch -Np1 -i $srcdir/bug30612.patch + + # http://savannah.gnu.org/bugs/?30723 + patch -Np1 -i $srcdir/bug30723.patch + + # https://bugs.archlinux.org/task/22733 (fix from Fedora) + patch -Np1 -i $srcdir/make-3.82-sort-blank.patch + + # https://savannah.gnu.org/support/index.php?107487 + # https://savannah.gnu.org/bugs/?33873 + patch -Np0 -i $srcdir/make-3.82-makeflags.patch + + ./configure --prefix=/usr + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/make/bug30612.patch b/testing/make/bug30612.patch new file mode 100644 index 000000000..fb843bcd9 --- /dev/null +++ b/testing/make/bug30612.patch @@ -0,0 +1,66 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 +@@ -1,3 +1,4 @@ ++ + /* Argument parsing and main program of GNU Make. + Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, + 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, +@@ -1138,7 +1139,7 @@ + a macro and some compilers (MSVC) don't like conditionals in macros. */ + { + const char *features = "target-specific order-only second-expansion" +- " else-if shortest-stem undefine" ++ " else-if shortest-stem undefine oneshell" + #ifndef NO_ARCHIVES + " archives" + #endif +diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c +--- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 ++++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 +@@ -3028,7 +3028,7 @@ + { + /* This looks like the first element in an open archive group. + A valid group MUST have ')' as the last character. */ +- const char *e = p + nlen; ++ const char *e = p; + do + { + e = next_token (e); +@@ -3084,19 +3084,19 @@ + Go to the next item in the string. */ + if (flags & PARSEFS_NOGLOB) + { +- NEWELT (concat (2, prefix, tp)); ++ NEWELT (concat (2, prefix, tmpbuf)); + continue; + } + + /* If we get here we know we're doing glob expansion. + TP is a string in tmpbuf. NLEN is no longer used. + We may need to do more work: after this NAME will be set. */ +- name = tp; ++ name = tmpbuf; + + /* Expand tilde if applicable. */ +- if (tp[0] == '~') ++ if (tmpbuf[0] == '~') + { +- tildep = tilde_expand (tp); ++ tildep = tilde_expand (tmpbuf); + if (tildep != 0) + name = tildep; + } +@@ -3152,7 +3152,11 @@ + else + { + /* We got a chain of items. Attach them. */ +- (*newp)->next = found; ++ if (*newp) ++ (*newp)->next = found; ++ else ++ *newp = found; ++ + + /* Find and set the new end. Massage names if necessary. */ + while (1) diff --git a/testing/make/bug30723.patch b/testing/make/bug30723.patch new file mode 100644 index 000000000..84e7ebe7a --- /dev/null +++ b/testing/make/bug30723.patch @@ -0,0 +1,12 @@ +diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c +--- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 ++++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 +@@ -2093,7 +2093,7 @@ + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); +- putenv (p); ++ putenv (allocated_variable_expand (p)); + } + + if (ISDB (DB_BASIC)) diff --git a/testing/make/make-3.82-makeflags.patch b/testing/make/make-3.82-makeflags.patch new file mode 100644 index 000000000..3cba3c402 --- /dev/null +++ b/testing/make/make-3.82-makeflags.patch @@ -0,0 +1,36 @@ +Index: main.c +=================================================================== +RCS file: /sources/make/make/main.c,v +retrieving revision 1.246 +diff -u -r1.246 main.c +--- main.c 29 Aug 2010 23:05:27 -0000 1.246 ++++ main.c 27 Jul 2011 22:03:12 -0000 +@@ -2091,10 +2095,16 @@ + + /* Reset makeflags in case they were changed. */ + { ++ if (master_job_slots) ++ { ++ assert (job_slots == default_job_slots); ++ job_slots = master_job_slots; ++ } + const char *pv = define_makeflags (1, 1); + char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); + sprintf (p, "MAKEFLAGS=%s", pv); + putenv (allocated_variable_expand (p)); ++ job_slots = default_job_slots; + } + + if (ISDB (DB_BASIC)) +@@ -2825,9 +2852,11 @@ + && (*(unsigned int *) cs->value_ptr == + *(unsigned int *) cs->noarg_value)) + ADD_FLAG ("", 0); /* Optional value omitted; see below. */ ++#if 0 + else if (cs->c == 'j') + /* Special case for `-j'. */ + ADD_FLAG ("1", 1); ++#endif + else + { + char *buf = alloca (30); diff --git a/testing/make/make-3.82-sort-blank.patch b/testing/make/make-3.82-sort-blank.patch new file mode 100644 index 000000000..2e73f5b7c --- /dev/null +++ b/testing/make/make-3.82-sort-blank.patch @@ -0,0 +1,17 @@ +diff -urp make-3.82/function.c make-3.82-pm/function.c +--- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 ++++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200 +@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c + { + char c = *(t++); + +- if (! isspace ((unsigned char)c)) ++ if (! isblank ((unsigned char)c)) + continue; + + ++wordi; + +- while (isspace ((unsigned char)*t)) ++ while (isblank ((unsigned char)*t)) + ++t; + } diff --git a/testing/make/make.install b/testing/make/make.install new file mode 100644 index 000000000..6cf8b0dc4 --- /dev/null +++ b/testing/make/make.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(make.info make.info-1 make.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/obex-data-server/PKGBUILD b/testing/obex-data-server/PKGBUILD new file mode 100644 index 000000000..83bbebe27 --- /dev/null +++ b/testing/obex-data-server/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 137868 2011-09-12 05:31:23Z eric $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> +# Contributor: Roman Kyrylych <roman@archlinux.org> +# Contributor: Keerthi <keerthi.linux@gmail.com> + +pkgname=obex-data-server +pkgver=0.4.6 +pkgrel=2 +pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" +arch=('i686' 'x86_64') +url="http://wiki.muiline.com/obex-data-server" +license=('GPL') +depends=('dbus-glib' 'openobex' 'imagemagick') +source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz") +md5sums=('961ca5db6fe9c97024e133cc6203cc4d') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/psiconv/PKGBUILD b/testing/psiconv/PKGBUILD new file mode 100644 index 000000000..e144caea3 --- /dev/null +++ b/testing/psiconv/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 137870 2011-09-12 05:31:25Z eric $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=psiconv +pkgver=0.9.8 +pkgrel=8 +pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" +arch=('i686' 'x86_64') +url="http://software.frodo.looijaard.name/psiconv/" +license=('GPL') +depends=('imagemagick') +makedepends=('bc') +backup=('etc/psiconv/psiconv.conf') +options=('!libtool') +source=(http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz) +md5sums=('8d7548e3c6b9cd408544736133728acd') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/pstoedit/PKGBUILD b/testing/pstoedit/PKGBUILD new file mode 100644 index 000000000..d1d411976 --- /dev/null +++ b/testing/pstoedit/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 137872 2011-09-12 05:31:26Z eric $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: damir <damir@archlinux.org> +# Contributor: Tobias Powalowski <t.powa@gmx.de> + +pkgname=pstoedit +pkgver=3.60 +pkgrel=2 +pkgdesc="Translates PostScript and PDF graphics into other vector formats" +arch=('i686' 'x86_64') +url="http://www.pstoedit.net/" +license=('GPL') +depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick') +makedepends=('ghostscript') +options=('!libtool' '!makeflags') +source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz" + 'pstoedit-3.50-parallel.patch' 'pstoedit-3.50-plugin-close.patch') +sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2' + '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a' + '54bbe019de66eb4cb8525371462595d21fbd074e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's/-pedantic//' configure + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/pstoedit/pstoedit-3.50-parallel.patch b/testing/pstoedit/pstoedit-3.50-parallel.patch new file mode 100644 index 000000000..4f1f73b04 --- /dev/null +++ b/testing/pstoedit/pstoedit-3.50-parallel.patch @@ -0,0 +1,47 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index d6178df..66f377b 100755 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES= \ + $(sample_drivers_src) + libp2edrvstd_la_LIBADD=-L. libpstoedit.la + libp2edrvstd_la_LDFLAGS=-no-undefined -module ++libp2edrvstd_la_DEPENDENCIES = libpstoedit.la + + #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp + #libp2edrvplugins_la_LIBADD= +@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module + libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp + libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la + libp2edrvlplot_la_LDFLAGS=-no-undefined -module ++libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la + + libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp + libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la + libp2edrvswf_la_LDFLAGS=-no-undefined -module ++libp2edrvswf_la_DEPENDENCIES = libpstoedit.la + + # note the __ stand for ++ - automake treats all no alphanums chars as _ + libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp + libp2edrvmagick___la_LIBADD=-L. libpstoedit.la + libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS} -module ++libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la + # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long + + if USE_EMFBYSOURCE +@@ -113,6 +117,7 @@ else + libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp + libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module + endif ++libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la + + libpstoedit_la_SOURCES = \ + dynload.cpp dynload.h \ +@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined + + pstoedit_SOURCES = cmdmain.cpp + pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS} ++pstoedit_DEPENDENCIES = libpstoedit.la + + pkginclude_HEADERS = \ + pstoedit.h \ diff --git a/testing/pstoedit/pstoedit-3.50-plugin-close.patch b/testing/pstoedit/pstoedit-3.50-plugin-close.patch new file mode 100644 index 000000000..6787d6aef --- /dev/null +++ b/testing/pstoedit/pstoedit-3.50-plugin-close.patch @@ -0,0 +1,14 @@ +http://bugzilla.redhat.com/507035 + +diff --git a/src/dynload.cpp b/src/dynload.cpp +index c0db355..7c073ef 100644 +--- a/src/dynload.cpp ++++ b/src/dynload.cpp +@@ -147,7 +147,6 @@ void DynLoader::close() + + DynLoader::~DynLoader() + { +- close(); + libname=0; + } + diff --git a/testing/transcode/PKGBUILD b/testing/transcode/PKGBUILD new file mode 100644 index 000000000..47ad04c18 --- /dev/null +++ b/testing/transcode/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 137874 2011-09-12 05:31:29Z eric $ +# Maintainer: +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: roberto <roberto@archlinux.org> + +pkgname=transcode +_sripver=0.3-4 +pkgver=1.1.5 +pkgrel=6 +pkgdesc="A video/DVD ripper and encoder for the terminal/console" +arch=('i686' 'x86_64') +url="http://tcforge.berlios.de/" +license=('GPL') +depends=('imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' + 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') +makedepends=('nasm') +options=('!libtool' '!makeflags') +source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2 + http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz + transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch) +md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' + 'c0bd49a88f667c68c4430ad25bbed510' + 'af4056b7530a6f147594f676849e7c7b' + 'c299cfc6c4be6a5512d1a129f04e5450') +sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' + 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' + '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' + '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 < ../transcode-1.1.5-jpeg-7.patch + patch -p1 < ../transcode-1.1.5-mpa.patch + + # building from here + ./configure --prefix=/usr \ + --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \ + --enable-lame --enable-ogg --enable-vorbis --enable-theora \ + --enable-libdv --enable-libxml2 --enable-v4l \ + --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \ + --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \ + --enable-xvid --enable-x264 --enable-alsa \ + --enable-libmpeg2 --enable-libmpeg2convert \ + --with-libxml2-prefix=/usr \ + --with-mjpegtools-prefix=/usr \ + --with-imagemagick-prefix=/usr \ + --with-libdv-includes=/usr \ + --with-libpostproc-includes=/usr/include/libpostproc \ + --with-ogg-prefix=/usr \ + --with-lame-libs=/usr \ + --with-lzo-libs=/usr/lib \ + --with-libavcodec-prefix=/usr \ + --with-libavcodec-includes=/usr/include \ + --with-libavcodec-libs=/usr/lib + + make + ############################################################################## + # this imports the latest subtitleripper sources and replaces the internal + mkdir contrib + mv "${srcdir}/subtitleripper" contrib/subrip + # removes dependency on libppm, make it dependend on netpbm just failed, argh... + cd contrib/subrip + sed -e 's|^\(.*lppm.*\)$|#\1|' \ + -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ + -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ + -i Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + cd contrib/subrip + install -m 755 pgm2txt "${pkgdir}/usr/bin/" + install -m 755 srttool "${pkgdir}/usr/bin/" + install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" + install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/" + install -m 755 vobsub2pgm "${pkgdir}/usr/bin/" +} diff --git a/testing/transcode/transcode-1.1.5-jpeg-7.patch b/testing/transcode/transcode-1.1.5-jpeg-7.patch new file mode 100644 index 000000000..288932a61 --- /dev/null +++ b/testing/transcode/transcode-1.1.5-jpeg-7.patch @@ -0,0 +1,16 @@ +http://bugs.gentoo.org/show_bug.cgi?id=294488 + +Patch by: Salah Coronya + +Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore. + +--- export/export_jpg.c ++++ export/export_jpg.c +@@ -91,6 +91,7 @@ + + jpeg_set_quality(&encinfo, quality, TRUE); + encinfo.raw_data_in = TRUE; ++ encinfo.do_fancy_downsampling = FALSE; + encinfo.in_color_space = JCS_YCbCr; + + encinfo.comp_info[0].h_samp_factor = 2; diff --git a/testing/transcode/transcode-1.1.5-mpa.patch b/testing/transcode/transcode-1.1.5-mpa.patch new file mode 100644 index 000000000..e7fb0fc1c --- /dev/null +++ b/testing/transcode/transcode-1.1.5-mpa.patch @@ -0,0 +1,10 @@ +--- transcode-1.1.5-old/export/aud_aux.c 2010-07-04 12:44:31.867550180 -0500 ++++ transcode-1.1.5/export/aud_aux.c 2010-07-04 13:41:01.253292529 -0500 +@@ -347,6 +347,7 @@ + //-- set parameters (bitrate, channels and sample-rate) -- + //-------------------------------------------------------- + memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all ++ mpa_ctx.codec_type = CODEC_TYPE_AUDIO; + mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest. + mpa_ctx.channels = vob->dm_chan; // channels + mpa_ctx.sample_rate = vob->a_rate; diff --git a/testing/xine-lib/PKGBUILD b/testing/xine-lib/PKGBUILD new file mode 100644 index 000000000..21da5910d --- /dev/null +++ b/testing/xine-lib/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 137876 2011-09-12 05:31:30Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=xine-lib +pkgver=1.1.19 +pkgrel=5 +pkgdesc="A multimedia playback engine" +arch=('i686' 'x86_64') +url="http://www.xine-project.org" +license=('LGPL' 'GPL') +depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') +makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' + 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib') +optdepends=('imagemagick: for using the imagemagick plugin' \ + 'smbclient: for using the smb plugin' \ + 'jack: for using the jack plugin' \ + 'vcdimager: for using the vcd plugin' \ + 'gdk-pixbuf2: for using the gdk-pixbuf plugin' \ + 'mesa: for using the opengl plugin' \ + 'libpulse: for using the pulseaudio plugin' \ + 'speex: for using the speex plugin' \ + 'v4l-utils: for using the v4l plugin' \ + 'wavpack: for using the wavpack plugin' \ + 'faad2: for using the faad plugin' \ + 'libmng: for using the mng plugin' \ + 'aalib: for using the aalib plugin') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2 + xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch) +md5sums=('a410a0f0617e1d6309f0cbe907f73f8a' + '9776df4eb54d2f1f68d8268adbc3b5c2' + '8662fb124870b1dd7effe4ff5e2a2e3d') +sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0' + '121a8358d7919b2e51067412373f52848290338a' + '920bf27e6e3523dfe4cc9c802ff713e9688a3f34') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch + patch -p0 < ../xine-lib-1.1.19-xvmc.patch + sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \ + configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h + + libtoolize --force --copy + aclocal -I m4 + autoconf + automake --add-missing + + ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch new file mode 100644 index 000000000..4b6ba9e35 --- /dev/null +++ b/testing/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch @@ -0,0 +1,13 @@ +--- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100 ++++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100 +@@ -161,10 +161,6 @@ + ;; + + esac +- if test x"$archopt_val" != x; then +- CFLAGS="$sarchopt=$archopt_val $CFLAGS" +- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS" +- fi + fi + else + dnl we have the Intel compiler diff --git a/testing/xine-lib/xine-lib-1.1.19-xvmc.patch b/testing/xine-lib/xine-lib-1.1.19-xvmc.patch new file mode 100644 index 000000000..bef8b0bac --- /dev/null +++ b/testing/xine-lib/xine-lib-1.1.19-xvmc.patch @@ -0,0 +1,17 @@ +Quoting ChangeLog of X11's videoproto package: +vldXvMC.h: stop uselessly including XvMClib.h + +--- src/video_out/xxmc.h ++++ src/video_out/xxmc.h +@@ -77,10 +77,10 @@ + #include <X11/extensions/XShm.h> + #include <X11/extensions/Xv.h> + #include <X11/extensions/Xvlib.h> ++#include <X11/extensions/XvMClib.h> + #ifdef HAVE_VLDXVMC + #include <X11/extensions/vldXvMC.h> + #else +- #include <X11/extensions/XvMClib.h> + #include <X11/extensions/XvMC.h> + #endif + diff --git a/testing/ypbind-mt/PKGBUILD b/testing/ypbind-mt/PKGBUILD new file mode 100644 index 000000000..e433f4cf3 --- /dev/null +++ b/testing/ypbind-mt/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 137945 2011-09-12 22:18:20Z tomegun $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=ypbind-mt +pkgver=1.33 +pkgrel=3 +pkgdesc='Linux NIS daemon' +url='http://www.linux-nis.org/nis/ypbind-mt/' +license=('GPL2') +arch=('i686' 'x86_64') +makedepends=('networkmanager') +depends=('rpcbind' 'openslp' 'dbus-glib') +optdepends=('yp-tools: to set a domain name') +backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname') +source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" + 'nisdomainname.conf' + 'ypbind.conf' + 'ypbind') +sha1sums=('49f578d15aa5d4f4130a2e96cd9c0e519263fc88' + 'eb00aecc0679e25a36b007e797f4468b40cb3e8e' + '07dee386d001fb9e9e6b76dda8af5b2092e5a4a2' + '112fc2aedfe3f761325b69647b7938bc1be5bfcd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --enable-dbus-nm \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf + install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind + install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind + install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname + install -d -m755 "${pkgdir}"/var/yp/binding +} diff --git a/testing/ypbind-mt/nisdomainname.conf b/testing/ypbind-mt/nisdomainname.conf new file mode 100644 index 000000000..bbbbf8fc7 --- /dev/null +++ b/testing/ypbind-mt/nisdomainname.conf @@ -0,0 +1,4 @@ +# +# NIS domain to be set in /etc/rc.d/ypbind +# +NISDOMAINNAME="" diff --git a/testing/ypbind-mt/ypbind b/testing/ypbind-mt/ypbind new file mode 100755 index 000000000..6a5ef11e3 --- /dev/null +++ b/testing/ypbind-mt/ypbind @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +. /etc/conf.d/ypbind +. /etc/conf.d/nisdomainname + +name=ypbind +PID=$(pidof -o %PPID /usr/sbin/ypbind) + +case "$1" in +start) + stat_busy "Starting $name daemon" + [[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null + [[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && kill $PID &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 1 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart}" + exit 1 + ;; +esac diff --git a/testing/ypbind-mt/ypbind.conf b/testing/ypbind-mt/ypbind.conf new file mode 100644 index 000000000..fd0ebd491 --- /dev/null +++ b/testing/ypbind-mt/ypbind.conf @@ -0,0 +1,4 @@ +# +# Parameters to be passed to ypbind +# +YPBIND_ARGS="" |