diff options
587 files changed, 21047 insertions, 2288 deletions
diff --git a/community-staging/cegui/PKGBUILD b/community-staging/cegui/PKGBUILD new file mode 100644 index 000000000..f84520018 --- /dev/null +++ b/community-staging/cegui/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 55638 2011-09-17 00:22:53Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com>, +# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> + +pkgname=cegui +pkgver=0.7.5 +pkgrel=5 +pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" +arch=('i686' 'x86_64') +url="http://crayzedsgui.sourceforge.net" +#options=('!libtool') +license=("MIT") +depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') +makedepends=('python2' 'doxygen') +source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) +md5sums=('38c79d1fdfaaa10f481c99a2ac479516') + +build() { + cd $srcdir/CEGUI-${pkgver} + + sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-xerces-c \ + --enable-null-renderer + + make +} + +package() { + cd $srcdir/CEGUI-${pkgver} + + make DESTDIR=${pkgdir} install + + #build docs + cd doc/doxygen && doxygen + cd .. && make DESTDIR=${pkgdir} install-html + + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} + diff --git a/community-staging/cuneiform/PKGBUILD b/community-staging/cuneiform/PKGBUILD new file mode 100644 index 000000000..ebe5b67a0 --- /dev/null +++ b/community-staging/cuneiform/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 55404 2011-09-12 04:01:02Z allan $ +# 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-staging/gource/PKGBUILD b/community-staging/gource/PKGBUILD new file mode 100644 index 000000000..5dcece8c7 --- /dev/null +++ b/community-staging/gource/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 55655 2011-09-17 02:40:36Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> +# Contributor: Olivier Ramonat <olivier at ramonat dot fr> +pkgname=gource +pkgver=0.35 +pkgrel=2 +pkgdesc="software version control visualization" +license=(GPL3) +arch=(i686 x86_64) +url=http://code.google.com/p/gource/ +depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew') +source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('6d4f776d314da3ae5d309cb580b83a9f') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR=$pkgdir install +} +# vim: ts=2:sw=2 et: diff --git a/community-staging/lightspark/PKGBUILD b/community-staging/lightspark/PKGBUILD new file mode 100644 index 000000000..35ef4dd99 --- /dev/null +++ b/community-staging/lightspark/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=lightspark +pkgver=0.5.0 +pkgrel=2 +pkgdesc='An alternative Flash Player for Linux.' +arch=('i686' 'x86_64') +url='http://lightspark.sourceforge.net' +license=('LGPL3') +conflicts=('lightspark-git') +depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2') +makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig') +optdepends=('gnash-gtk: fallback support') +install="lightspark.install" +source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver:0:5}/+download/lightspark-${pkgver}.tar.gz") +md5sums=('7d42c8e92c3c3b318076393a7e9508fb') + +build() { + rm -rf build + mkdir build + cd build + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCOMPILE_PLUGIN=1 \ + -DCMAKE_BUILD_TYPE=Release \ + -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ + ../lightspark-${pkgver} + + make +} + +package() { + cd build + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/lightspark/lightspark.install b/community-staging/lightspark/lightspark.install new file mode 100644 index 000000000..75e2b7b55 --- /dev/null +++ b/community-staging/lightspark/lightspark.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 $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-staging/root/PKGBUILD b/community-staging/root/PKGBUILD new file mode 100644 index 000000000..2b246efc2 --- /dev/null +++ b/community-staging/root/PKGBUILD @@ -0,0 +1,87 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Sebastian Voecking <voeck@web.de> + +pkgname=root +pkgver=5.30.01 +pkgrel=2 +pkgdesc='C++ data analysis framework and interpreter from CERN.' +arch=('i686' 'x86_64') +url='http://root.cern.ch' +license=('LGPL2.1') +depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' + 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran') +makedepends=('fftw') +install='root.install' +source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" + 'root.sh' + 'rootd' + 'root.desktop' + 'root.xml') +md5sums=('be7443a1b243c51b3c1ec435a5a9453e' + '0e883ad44f99da9bc7c23bc102800b62' + 'efd06bfa230cc2194b38e0c8939e72af' + 'ac61b17395d75a2705fefa2ef841a6bf' + 'e2cf69b204192b5889ceb5b4dedc66f7') + +build() { + cd root + + if [ ${CARCH} == 'i686' ]; then + TARGET=linux; + else + TARGET=linuxx8664gcc; + fi + + # python2 switch + find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \; + sed \ + -e 's/python 2/python2 2/g' \ + -i configure + sed \ + -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \ + -i cint/reflex/python/genreflex/Makefile.am + sed \ + -e 's/python /python2 /' \ + -i config/genreflex.in config/genreflex-rootcint.in + + ./configure \ + ${TARGET} \ + --prefix=/usr \ + --disable-builtin-ftgl \ + --disable-builtin-freetype \ + --disable-builtin-glew \ + --disable-builtin-pcre \ + --disable-builtin-zlib \ + --disable-builtin-lzma \ + --enable-gdml \ + --enable-gsl-shared \ + --enable-minuit2 \ + --enable-soversion \ + --enable-roofit \ + --enable-python \ + --with-python-incdir=/usr/include/python2.7 \ + --with-python-libdir=/usr/lib \ + --enable-explicitlink + + # move from aur + #--disable-builtin-afterimage \ + + make +} + +package() { + cd root + + make DESTDIR=${pkgdir} install + + install -D ${srcdir}/root.sh \ + ${pkgdir}/etc/profile.d/root.sh + install -D ${srcdir}/rootd \ + ${pkgdir}/etc/rc.d/rootd + install -D -m644 ${srcdir}/root.desktop \ + ${pkgdir}/usr/share/applications/root.desktop + install -D -m644 ${srcdir}/root.xml \ + ${pkgdir}/usr/share/mime/packages/root.xml + + rm -rf ${pkgdir}/etc/root/daemons +} diff --git a/community-staging/root/root.desktop b/community-staging/root/root.desktop new file mode 100644 index 000000000..ca382111c --- /dev/null +++ b/community-staging/root/root.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Exec=root +Terminal=true +Name=ROOT +Name[de]=ROOT +Comment=An object-oriented data analysis framework +Comment[de]=Ein objektorientiertes Framework zur Datenanalyse +StartupNotify=true +MimeType=application/x-root;text/x-c++src +Categories=Science;Development;Application; diff --git a/community-staging/root/root.install b/community-staging/root/root.install new file mode 100644 index 000000000..457af7314 --- /dev/null +++ b/community-staging/root/root.install @@ -0,0 +1,17 @@ +post_install() { + if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then + echo "/usr/lib/root" >> etc/ld.so.conf + sbin/ldconfig -r . + fi + + update-desktop-database >/dev/null + + update-mime-database /usr/share/mime >/dev/null +} + +pre_remove() { + cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot + mv /tmp/.pacroot etc/ld.so.conf + chmod 644 etc/ld.so.conf + sbin/ldconfig -r . +} diff --git a/community-staging/root/root.sh b/community-staging/root/root.sh new file mode 100644 index 000000000..685e6036b --- /dev/null +++ b/community-staging/root/root.sh @@ -0,0 +1,5 @@ +if [ $PYTHONPATH ]; then + export PYTHONPATH=$PYTHONPATH:/usr/lib/root; +else + export PYTHONPATH=/usr/lib/root; +fi diff --git a/community-staging/root/root.xml b/community-staging/root/root.xml new file mode 100644 index 000000000..af8dd69c5 --- /dev/null +++ b/community-staging/root/root.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/x-root"> + <comment>ROOT file</comment> + <comment xml:lang="de">ROOT-Datei</comment> + <glob pattern="*.root"/> + <magic priority="80"> + <match value="root" type="string" offset="0:64"/> + </magic> + </mime-type> +</mime-info> diff --git a/community-staging/root/rootd b/community-staging/root/rootd new file mode 100755 index 000000000..fb2c3388c --- /dev/null +++ b/community-staging/root/rootd @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/rootd` +case "$1" in + start) + stat_busy "Starting ROOT file server daemon" + [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + PID=`pidof -o %PPID /usr/sbin/rootd` + echo $PID >/var/run/rootd.pid + add_daemon rootd + stat_done + fi + ;; + stop) + stat_busy "Stopping ROOT file server daemon" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon rootd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/ruby-glib2/PKGBUILD b/community-staging/ruby-glib2/PKGBUILD new file mode 100644 index 000000000..bcb4b284a --- /dev/null +++ b/community-staging/ruby-glib2/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 55742 2011-09-18 19:59:34Z bfanella $ +# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> +# Contributor: kritoke <kritoke@nospam.gmail.com> + +pkgname=ruby-glib2 +pkgver=1.0.2 +pkgrel=1 +pkgdesc="Ruby bindings for glib2." +arch=('i686' 'x86_64') +url="http://ruby-gnome2.sourceforge.jp" +license=('LGPL') +depends=('ruby') +makedepends=('ruby-pkgconfig') +source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) +md5sums=('231a8a8995c10faacc2fc43d450b6295') + +build() { + cd "$srcdir/ruby-gtk2-$pkgver" + ruby extconf.rb glib2 --topdir=$pkgdir + make +} +package() { + cd "$srcdir/ruby-gtk2-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/sfml/PKGBUILD b/community-staging/sfml/PKGBUILD new file mode 100644 index 000000000..8c7fe1d6a --- /dev/null +++ b/community-staging/sfml/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 55642 2011-09-17 00:27:24Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Ondrej Martinak <omartinak@gmail.com> + +pkgname=sfml + +_git=true + +if [[ "${_git}" = "true" ]]; then + pkgver=1.99.git20110917 +fi + +pkgrel=1 +pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' +arch=('i686' 'x86_64') +url='http://www.sfml-dev.org/' +license=('zlib') +depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') +makedepends=('git' 'mesa' 'cmake' 'doxygen') +install=sfml.install + +_gitroot='https://github.com/LaurentGomila/SFML.git' +_gitname='SFML' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + cd $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ + -DBUILD_DOC=true \ + -DBUILD_EXAMPLES=true + make + make doc +} + +package() { + cd "$srcdir/$_gitname-build/build" + make DESTDIR="$pkgdir/" install + + install -Dm644 ../license.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + diff --git a/community-staging/sfml/sfml.install b/community-staging/sfml/sfml.install new file mode 100644 index 000000000..75f760be6 --- /dev/null +++ b/community-staging/sfml/sfml.install @@ -0,0 +1,3 @@ +post_install() { + echo "To view the SFML samples, go to /usr/share/SFML/examples/ and run them individually" +} diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD new file mode 100644 index 000000000..8b223fccc --- /dev/null +++ b/community-staging/spring/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 55657 2011-09-17 02:44:18Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=spring +pkgver=0.82.7.1 +pkgrel=7 +pkgdesc='A free 3D real-time-strategy (RTS) game engine' +arch=('i686' 'x86_64') +url="http://springrts.com/" +license=('GPL') +depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') +makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2') +optdepends=('python2: python-based bots' + 'java-runtime: java-based bots') +source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma + gcc46.patch + awk-java.patch) +md5sums=('378cf0b18a5dd5b840964e5945778503' + 'e9586b611db1ed04fe4f0c5982fda7d2' + 'cd94edf21e49ff6ff7d256442ed9aa3c') + +build() { + bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma + + cd spring_$pkgver + + sed -i '1i\ + #include <list>' rts/lib/lobby/Connection.h + patch -Np1 < $srcdir/gcc46.patch + patch -Np1 < $srcdir/awk-java.patch + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDATADIR=share/spring + make +} + +package() { + cd spring_$pkgver + + make DESTDIR=$pkgdir install + + install -d $pkgdir/etc/spring + echo '$HOME/.spring' > $pkgdir/etc/spring/datadir +} + +# vim sw=2:ts=2 et: diff --git a/community-staging/spring/awk-java.patch b/community-staging/spring/awk-java.patch new file mode 100644 index 000000000..36c932924 --- /dev/null +++ b/community-staging/spring/awk-java.patch @@ -0,0 +1,48 @@ +diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk +--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:29:16.623158278 +0200 ++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:33:00.872921328 +0200 +@@ -341,7 +341,7 @@ + } + + # beginn of struct S*Command +-/^\struct S.*Command( \{)?/ { ++/^struct S.*Command( \{)?/ { + + isInsideCmdStruct = 1; + ind_cmdMember = 0; +diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk +--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:29:16.623158278 +0200 ++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:32:51.009745026 +0200 +@@ -473,7 +473,7 @@ + } + + # beginn of struct S*Event +-/^\struct S.*Event( \{)?/ { ++/^struct S.*Event( \{)?/ { + + isInsideEvtStruct = 1; + ind_evtMember = 0; +diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk +--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:29:16.626491558 +0200 ++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:30:25.695391913 +0200 +@@ -387,7 +387,7 @@ + } + + # beginn of struct S*Command +-/^\struct S.*Command( \{)?/ { ++/^struct S.*Command( \{)?/ { + + isInsideCmdStruct = 1; + ind_cmdMember = 0; +diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk +--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:29:16.626491558 +0200 ++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:30:13.942245701 +0200 +@@ -366,7 +366,7 @@ + } + + # beginn of struct S*Event +-/^\struct S.*Event( \{)?/ { ++/^struct S.*Event( \{)?/ { + + isInsideEvtStruct = 1; + ind_evtMember = 0; diff --git a/community-staging/spring/gcc46.patch b/community-staging/spring/gcc46.patch new file mode 100644 index 000000000..4f6865cac --- /dev/null +++ b/community-staging/spring/gcc46.patch @@ -0,0 +1,67 @@ +From: Jan Dittberner <jandd@debian.org> +Subject: Patch for FTBFS with g++ 4.6.0 +Bug-Debian: http://bugs.debian.org/625097 +Bug: http://springrts.com/mantis/view.php?id=2415 +--- a/AI/Skirmish/E323AI/AAStar.h ++++ b/AI/Skirmish/E323AI/AAStar.h +@@ -4,6 +4,7 @@ + #include <queue> + #include <vector> + #include <list> ++#include <cstddef> // for NULL + + class AAStar { + public: +--- a/rts/Rendering/ShadowHandler.cpp ++++ b/rts/Rendering/ShadowHandler.cpp +@@ -318,6 +318,11 @@ + xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1)))); + ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1)))); + ++ shadowParams.x = xmid; ++ shadowParams.y = ymid; ++ shadowParams.z = p17; ++ shadowParams.w = p18; ++ + shadowMatrix[ 0] = cross1.x / maxLengthX; + shadowMatrix[ 4] = cross1.y / maxLengthX; + shadowMatrix[ 8] = cross1.z / maxLengthX; +--- a/rts/Rendering/ShadowHandler.h ++++ b/rts/Rendering/ShadowHandler.h +@@ -38,7 +38,7 @@ + CMatrix44f shadowMatrix; + void CalcMinMaxView(void); + +- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); } ++ const float4& GetShadowParams() const { return shadowParams; } + + enum ShadowGenProgram { + SHADOWGEN_PROGRAM_MODEL = 0, +@@ -76,6 +76,7 @@ + //! to write the (FBO) depth-buffer texture + std::vector<Shader::IProgramObject*> shadowGenProgs; + ++ float4 shadowParams; + float x1, x2, y1, y2; + float xmid, ymid; + float p17, p18; +--- a/rts/Rendering/GLContext.cpp ++++ b/rts/Rendering/GLContext.cpp +@@ -9,6 +9,7 @@ + #include "GLContext.h" + + #include <list> ++#include <cstddef> // for NULL + + + using namespace std; +--- a/rts/System/MemPool.h ++++ b/rts/System/MemPool.h +@@ -4,6 +4,7 @@ + #define _MEM_POOL_H_ + + #include <new> ++#include <cstddef> // for NULL + + const size_t MAX_MEM_SIZE=200; + diff --git a/community-staging/supertux/PKGBUILD b/community-staging/supertux/PKGBUILD new file mode 100644 index 000000000..60606f57c --- /dev/null +++ b/community-staging/supertux/PKGBUILD @@ -0,0 +1,31 @@ +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Eric Belanger <belanger@astro.umontreal.ca> +# Contributor: vande198 +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=supertux +pkgver=0.3.3 +pkgrel=4 +pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" +arch=('i686' 'x86_64') +url="http://super-tux.sourceforge.net/" +license=('GPL') +depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew') +makedepends=('cmake' 'boost') +source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2) +md5sums=('f3f803e629ee51a9de0b366a036e393d') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp + sed -i '/types\.h/d' src/addon/addon_manager.cpp + cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/supertux/compile.patch b/community-staging/supertux/compile.patch new file mode 100644 index 000000000..05376fe91 --- /dev/null +++ b/community-staging/supertux/compile.patch @@ -0,0 +1,67 @@ +diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp +--- supertux-0.3.1.orig/src/console.hpp 2008-01-03 21:59:27.000000000 +0100 ++++ supertux-0.3.1/src/console.hpp 2008-08-23 11:57:47.000000000 +0200 +@@ -27,6 +27,8 @@ + #include <sstream> + #include <iostream> + #include <squirrel.h> ++#include <memory> ++#include <cstdlib> + + class Console; + class ConsoleStreamBuffer; +diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp +--- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 21:59:26.000000000 +0100 ++++ supertux-0.3.1/src/lisp/lexer.cpp 2008-08-23 13:45:58.000000000 +0200 +@@ -21,6 +21,7 @@ + #include <sstream> + #include <stdexcept> + #include <iostream> ++#include <cstring> + + #include "lexer.hpp" + +diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp +--- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 21:59:26.000000000 +0100 ++++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2008-08-23 13:29:34.000000000 +0200 +@@ -21,6 +21,7 @@ + #define SUPERTUX_SPRITE_MANAGER_H + + #include <map> ++#include <string> + + class SpriteData; + class Sprite; +diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp +--- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 21:59:27.000000000 +0100 ++++ supertux-0.3.1/src/textscroller.hpp 2008-08-23 13:34:35.000000000 +0200 +@@ -24,6 +24,7 @@ + #include <vector> + #include <string> + #include <map> ++#include <memory> + + #include "screen.hpp" + #include "math/vector.hpp" +diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp +--- supertux-0.3.1.orig/src/title.cpp 2008-01-03 21:59:28.000000000 +0100 ++++ supertux-0.3.1/src/title.cpp 2008-08-23 12:05:19.000000000 +0200 +@@ -32,6 +32,7 @@ + #include <SDL.h> + #include <SDL_image.h> + #include <physfs.h> ++#include <algorithm> + + #include "title.hpp" + #include "mainloop.hpp" +diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp +--- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 21:59:22.000000000 +0100 ++++ supertux-0.3.1/src/video/sdl_texture.hpp 2008-08-23 13:37:14.000000000 +0200 +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <SDL.h> ++#include <algorithm> + + #include "texture.hpp" + #include "color.hpp" diff --git a/community-staging/supertux/gcc44.patch b/community-staging/supertux/gcc44.patch new file mode 100644 index 000000000..b58d9c29d --- /dev/null +++ b/community-staging/supertux/gcc44.patch @@ -0,0 +1,90 @@ +diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp +--- supertux-0.3.1.orig/src/console.hpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/console.hpp 2009-05-17 19:43:26.914307646 +0000 +@@ -27,6 +27,8 @@ + #include <sstream> + #include <iostream> + #include <squirrel.h> ++#include <memory> ++#include <cstdlib> + + class Console; + class ConsoleStreamBuffer; +diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp +--- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/lisp/lexer.cpp 2009-05-17 19:43:27.037705317 +0000 +@@ -21,6 +21,7 @@ + #include <sstream> + #include <stdexcept> + #include <iostream> ++#include <cstring> + + #include "lexer.hpp" + +diff -ruN supertux-0.3.1.orig/src/lisp/lisp.cpp supertux-0.3.1/src/lisp/lisp.cpp +--- supertux-0.3.1.orig/src/lisp/lisp.cpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/lisp/lisp.cpp 2009-05-17 19:44:29.305165638 +0000 +@@ -18,7 +18,7 @@ + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + #include <config.h> +- ++#include <cstdio> + #include "lisp.hpp" + + namespace lisp +diff -ruN supertux-0.3.1.orig/src/random_generator.cpp supertux-0.3.1/src/random_generator.cpp +--- supertux-0.3.1.orig/src/random_generator.cpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/random_generator.cpp 2009-05-17 19:44:05.851002254 +0000 +@@ -39,6 +39,7 @@ + #include <stdexcept> + #include <time.h> + #include <cassert> ++#include <cstdio> + #include "random_generator.hpp" + + RandomGenerator systemRandom; // global random number generator +diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp +--- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2009-05-17 19:43:27.037705317 +0000 +@@ -21,6 +21,7 @@ + #define SUPERTUX_SPRITE_MANAGER_H + + #include <map> ++#include <string> + + class SpriteData; + class Sprite; +diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp +--- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/textscroller.hpp 2009-05-17 19:43:27.037705317 +0000 +@@ -24,6 +24,7 @@ + #include <vector> + #include <string> + #include <map> ++#include <memory> + + #include "screen.hpp" + #include "math/vector.hpp" +diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp +--- supertux-0.3.1.orig/src/title.cpp 2008-01-03 20:59:28.000000000 +0000 ++++ supertux-0.3.1/src/title.cpp 2009-05-17 19:43:27.041000359 +0000 +@@ -32,6 +32,7 @@ + #include <SDL.h> + #include <SDL_image.h> + #include <physfs.h> ++#include <algorithm> + + #include "title.hpp" + #include "mainloop.hpp" +diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp +--- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 20:59:22.000000000 +0000 ++++ supertux-0.3.1/src/video/sdl_texture.hpp 2009-05-17 19:43:27.041000359 +0000 +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <SDL.h> ++#include <algorithm> + + #include "texture.hpp" + #include "color.hpp" diff --git a/community-staging/vdrift/PKGBUILD b/community-staging/vdrift/PKGBUILD new file mode 100644 index 000000000..6680cde46 --- /dev/null +++ b/community-staging/vdrift/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 55651 2011-09-17 02:02:33Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Lone_Wolf lonewolf@xs4all.nl + +pkgname=vdrift +pkgver=2011.09.01 +pkgrel=2 +pkgdesc="An open source driving simulation made with drift racing in mind" +arch=('i686' 'x86_64') +url="http://vdrift.net/" +license=('GPL') +depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') +makedepends=('scons' 'boost' 'asio') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-src-${pkgver//./-}.tar.bz2 + $pkgname.desktop) +md5sums=('a4099acacca3d4f0799b012cd168f1c0' + '8bb429f37bcb4aed5e7ab1d80c5a4f93') + +build() { + cd "$srcdir"/$pkgname-src-${pkgver//./-} + + # select arch + if [ `uname -m` = "x86_64" ]; then + _sconsarch="a64" + else + _sconsarch="686" + fi + + sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp + sed -i '/types.h/d' src/http.h + + # build and install + scons \ + "destdir"="$pkgdir" \ + "arch"=$_sconsarch \ + "release"=1 \ + "force_feedback"=1 \ + "prefix"=/usr \ + "datadir"=share/$pkgname/ +} + +package() { + cd "$srcdir"/$pkgname-src-${pkgver//./-} + + scons install + + # install .desktop file + install -Dm644 ../$pkgname.desktop \ + "$pkgdir"/usr/share/applications/$pkgname.desktop +} +# vim: sw=2:ts=2 et: diff --git a/community-staging/vdrift/vdrift.desktop b/community-staging/vdrift/vdrift.desktop new file mode 100644 index 000000000..7078f0d9c --- /dev/null +++ b/community-staging/vdrift/vdrift.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=VDrift +Version=2009-06-15 +GenericName=Racing Simulation +Comment=An open source driving simulation made with drift racing in mind +Exec=vdrift +Icon=vdrift.png +Terminal=false +Categories=Game;Simulation; diff --git a/community-staging/widelands/PKGBUILD b/community-staging/widelands/PKGBUILD new file mode 100644 index 000000000..b78b88be3 --- /dev/null +++ b/community-staging/widelands/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 55647 2011-09-17 01:09:02Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <rabyte*gmail> + +pkgname=widelands +pkgver=16 +_realver=build16 +pkgrel=3 +pkgdesc="A realtime strategy game with emphasis on economy and transport" +arch=('i686' 'x86_64') +url="http://widelands.org/" +license=('GPL') +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') +makedepends=('cmake' 'boost') +source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 + $pkgname.desktop + $pkgname.png + $pkgname.sh) +md5sums=('3d8c28e145b73c64d8ed1625319d25a2' + '15820bf099fd6f16251fe70a75c534bb' + '3dfda7e9ca76ca00dd98d745d0ceb328' + '7cae50aba5ed0cd2cfeea79124637b46') + +build() { + cd $srcdir/$pkgname-$_realver-src + + mkdir -p build/compile && cd build/compile + + cmake ../.. -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_DATADIR=share/$pkgname \ + -DWL_INSTALL_BINDIR=bin + make +} + +package() { + cd $srcdir/$pkgname-$_realver-src/build/compile + + make DESTDIR="$pkgdir" install + + # Install bin, icon and desktop file + #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname + #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname + install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png + install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +} diff --git a/community-staging/widelands/widelands-build15-gcc-4.5-patch b/community-staging/widelands/widelands-build15-gcc-4.5-patch new file mode 100644 index 000000000..6ba313358 --- /dev/null +++ b/community-staging/widelands/widelands-build15-gcc-4.5-patch @@ -0,0 +1,51 @@ +diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc +--- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 ++++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 +@@ -113,7 +113,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Map::button_clicked, *this, 4, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -142,7 +142,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name + ()); + break; + } +diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc +--- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 ++++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 +@@ -272,7 +272,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Random_Map::button_clicked, *this, 8, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -343,7 +343,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + break; + case 9: + break; +@@ -476,7 +476,7 @@ + (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) + ++m_currentworld; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + button_clicked(-1); // Update other values in UI as well + diff --git a/community-staging/widelands/widelands.desktop b/community-staging/widelands/widelands.desktop new file mode 100644 index 000000000..9715d816c --- /dev/null +++ b/community-staging/widelands/widelands.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Widelands +GenericName=Widelands +Comment=Realtime strategy game +Icon=widelands +Exec=widelands +Type=Application +Categories=Game;StrategyGame; diff --git a/community-staging/widelands/widelands.png b/community-staging/widelands/widelands.png Binary files differnew file mode 100644 index 000000000..c329cf667 --- /dev/null +++ b/community-staging/widelands/widelands.png diff --git a/community-staging/widelands/widelands.sh b/community-staging/widelands/widelands.sh new file mode 100644 index 000000000..0b21a1694 --- /dev/null +++ b/community-staging/widelands/widelands.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /usr/share/widelands +./widelands $* 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/cegui/PKGBUILD b/community-testing/cegui/PKGBUILD new file mode 100644 index 000000000..3ed27b997 --- /dev/null +++ b/community-testing/cegui/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 55685 2011-09-17 21:14:32Z stephane $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com>, +# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> + +pkgname=cegui +pkgver=0.7.5 +pkgrel=5 +pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" +arch=('i686' 'x86_64') +url="http://crayzedsgui.sourceforge.net" +#options=('!libtool') +license=("MIT") +depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') +makedepends=('python2' 'doxygen') +source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) +md5sums=('38c79d1fdfaaa10f481c99a2ac479516') + +build() { + cd $srcdir/CEGUI-${pkgver} + + sed -i '1i#include <cstddef>' cegui/include/CEGUIString.h + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-xerces-c \ + --enable-null-renderer + + make +} + +package() { + cd $srcdir/CEGUI-${pkgver} + + make DESTDIR=${pkgdir} install + + #build docs + cd doc/doxygen && doxygen + cd .. && make DESTDIR=${pkgdir} install-html + + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} + diff --git a/community-testing/clementine/PKGBUILD b/community-testing/clementine/PKGBUILD new file mode 100644 index 000000000..ca15e9f1f --- /dev/null +++ b/community-testing/clementine/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 55687 2011-09-17 21:14:43Z stephane $ +#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > +#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> + +pkgname=clementine +pkgver=0.7.1 +pkgrel=7 +pkgdesc="A music player and library organizer" +url="http://www.clementine-player.org/" +license=('GPL') +arch=('i686' 'x86_64') +depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice') +makedepends=('cmake' 'boost') +optdepends=('gstreamer0.10-base-plugins: for more open formats' + 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' + 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' + 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') +source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz + clementine-0.7.1-fix-devicekit.patch) +sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142' + 'd595e2746949363680e0d64fe2fb97b524c8d27c') +install=clementine.install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ../clementine-0.7.1-fix-devicekit.patch + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0 -DENABLE_GIO=OFF + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch b/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch new file mode 100644 index 000000000..797a2c864 --- /dev/null +++ b/community-testing/clementine/clementine-0.7.1-fix-devicekit.patch @@ -0,0 +1,11 @@ +diff -Naur clementine-0.7.1.ori/src/config.h.in clementine-0.7.1/src/config.h.in +--- clementine-0.7.1.ori/src/config.h.in 2011-03-29 12:16:15.000000000 -0700 ++++ clementine-0.7.1/src/config.h.in 2011-05-09 16:00:26.505080057 -0700 +@@ -29,6 +29,7 @@ + #cmakedefine HAVE_STATIC_SQLITE + + #cmakedefine HAVE_DBUS ++#cmakedefine HAVE_DEVICEKIT + #cmakedefine HAVE_GIO + #cmakedefine HAVE_IMOBILEDEVICE + #cmakedefine HAVE_LIBARCHIVE diff --git a/community-testing/clementine/clementine.install b/community-testing/clementine/clementine.install new file mode 100644 index 000000000..2f0338d8a --- /dev/null +++ b/community-testing/clementine/clementine.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} 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/freewrl/PKGBUILD b/community-testing/freewrl/PKGBUILD new file mode 100644 index 000000000..0d384e8dc --- /dev/null +++ b/community-testing/freewrl/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 55689 2011-09-17 21:14:49Z stephane $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=freewrl +pkgver=1.22.10 +pkgrel=7 +pkgdesc="VRML viewer" +arch=('i686' 'x86_64') +url="http://freewrl.sourceforge.net/" +license=('GPL') +depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' + 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js') +makedepends=('java-environment') +options=(!libtool) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + build-fix.patch) +md5sums=('07fd8f193d14799ffb95a59a4887fc88' + '52e4b6aacebcaf18cbec8975e0eb7fd8') + +build() { + . /etc/profile.d/openjdk6.sh + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/build-fix.patch + export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" + export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185" + ./configure \ + --prefix=/usr --with-fontsdir=/usr/share/fonts/TTF --enable-libeai \ + --enable-libcurl --with-expat=/usr --with-target=x11 --disable-plugin \ + --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js \ + --disable-seamonkey-js + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/community-testing/freewrl/build-fix.patch b/community-testing/freewrl/build-fix.patch new file mode 100644 index 000000000..c0de71d07 --- /dev/null +++ b/community-testing/freewrl/build-fix.patch @@ -0,0 +1,1201 @@ +diff -wbBur freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c +--- freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c 2010-08-19 06:20:36.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c 2011-07-04 01:19:07.000000000 +0400 +@@ -54,7 +54,7 @@ + #include "ColladaParser.h" + + #if HAVE_EXPAT_H +-# include <expat.h> ++# include </usr/include/expat.h> + #endif + + #define PROTOINSTANCE_MAX_LEVELS 10 +diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldGet.c freewrl-1.22.10.my/src/lib/world_script/fieldGet.c +--- freewrl-1.22.10/src/lib/world_script/fieldGet.c 2010-10-13 23:45:26.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/fieldGet.c 2011-07-04 20:21:21.000000000 +0400 +@@ -412,7 +412,7 @@ + /* create a new SFFloat object */ + + fp = (float *)fp_in; +- newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp)); ++ newjsval = JS_NewJSVal(cx,(double)*fp); + fp_in = offsetPointer_deref(float *,fp_in,elementlen); + + /* put this object into the MF class */ +@@ -449,7 +449,7 @@ + /* create a new SFTime object */ + + fp = (float *)fp_in; +- newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp)); ++ newjsval = JS_NewJSVal(cx,(double)*fp); + fp_in = offsetPointer_deref(float *,fp_in,elementlen); + + /* put this object into the MF class */ +diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldSet.c freewrl-1.22.10.my/src/lib/world_script/fieldSet.c +--- freewrl-1.22.10/src/lib/world_script/fieldSet.c 2010-09-22 00:00:25.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/fieldSet.c 2011-07-04 20:03:53.000000000 +0400 +@@ -748,7 +748,7 @@ + + #ifdef SETFIELDVERBOSE + strval = JS_ValueToString(scriptContext, JSglobal_return_val); +- strp = JS_GetStringBytes(strval); ++ strp = JS_EncodeString(scriptContext, strval); + printf ("start of setField_javascriptEventOut, to %ld:%d = %p, fieldtype %d string %s\n",(long)tn, tptr, memptr, fieldType, strp); + #endif + +@@ -813,7 +813,7 @@ + case FIELDTYPE_SFImage: { + /* the string should be saved as an SFImage */ + strval = JS_ValueToString(scriptContext, JSglobal_return_val); +- strp = JS_GetStringBytes(strval); ++ strp = JS_EncodeString(scriptContext, strval); + + Parser_scanStringValueToMem(tn, tptr, FIELDTYPE_SFImage, strp, FALSE); + break; +@@ -824,7 +824,7 @@ + uintptr_t *newptr; + + strval = JS_ValueToString(scriptContext, JSglobal_return_val); +- strp = JS_GetStringBytes(strval); ++ strp = JS_EncodeString(scriptContext, strval); + + /* copy the string over, delete the old one, if need be */ + /* printf ("fieldSet SFString, tn %d tptr %d offset from struct %d\n", +@@ -844,7 +844,7 @@ + struct X3D_Node *mynode; + + strval = JS_ValueToString(scriptContext, JSglobal_return_val); +- strp = JS_GetStringBytes(strval); ++ strp = JS_EncodeString(scriptContext, strval); + + /* we will have at least one node here, in an ascii string */ + while ((*strp > '\0') && (*strp <= ' ')) strp ++; +@@ -1227,7 +1227,7 @@ + JSString *_tmpStr; + + _tmpStr = JS_ValueToString(cx, mainElement); +- strp = JS_GetStringBytes(_tmpStr); ++ strp = JS_EncodeString(scriptContext, _tmpStr); + printf ("sub element %d is \"%s\" \n",i,strp); + + if (JSVAL_IS_OBJECT(mainElement)) printf ("sub element %d is an OBJECT\n",i); +@@ -1329,7 +1329,7 @@ + JSString *strval; + + strval = JS_ValueToString(cx, mainElement); +- strp = JS_GetStringBytes(strval); ++ strp = JS_EncodeString(cx, strval); + + #ifdef SETFIELDVERBOSE + printf ("getJSMultiNumType, got string %s\n",strp); +@@ -1441,7 +1441,7 @@ + return; + } + strval = JS_ValueToString(cx, _v); +- valStr = JS_GetStringBytes(strval); ++ valStr = JS_EncodeString(cx, strval); + + /* printf ("new string %d is %s\n",i,valStr); */ + +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsUtils.c freewrl-1.22.10.my/src/lib/world_script/jsUtils.c +--- freewrl-1.22.10/src/lib/world_script/jsUtils.c 2010-06-03 23:38:37.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsUtils.c 2011-07-04 20:21:44.000000000 +0400 +@@ -134,7 +134,7 @@ + nf = OBJECT_TO_JSVAL(me); + + #ifdef JSVRMLCLASSESVERBOSE +- printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf))); ++ printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf))); + #endif + + if (!setSFNodeField (cx, par, pf, &nf)) { +@@ -197,7 +197,7 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, *newval); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + oldS = (struct Uni_String *) *((uintptr_t *)Data); + +@@ -305,12 +305,12 @@ + + case FIELDTYPE_SFFloat: { + memcpy ((void *) &fl, Data, datalen); +- *newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)fl)); ++ *newval = JS_NewJSVal(cx,(double)fl); + break; + } + case FIELDTYPE_SFTime: { + memcpy ((void *) &dl, Data, datalen); +- *newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,dl)); ++ *newval = JS_NewJSVal(cx,dl); + break; + } + case FIELDTYPE_SFBool: +@@ -824,7 +824,7 @@ + struct X3D_Node *node; + + _idStr = JS_ValueToString(context, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(context, _idStr); + + #ifdef JSVRMLCLASSESVERBOSE + printf ("\ngetSFNodeField called on name %s object %u\n",_id_c, obj); +@@ -912,7 +912,7 @@ + + /* get the id field... */ + +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + + #ifdef JSVRMLCLASSESVERBOSE + printf ("\nsetSFNodeField called on name %s object %u, jsval %u\n",_id_c, obj, *vp); +@@ -1131,10 +1131,10 @@ + char *_id_c = "(no value in string)"; + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + /* printf ("hmmm...js_SetPropertyCheck called on string \"%s\" object %u, jsval %u\n",_id_c, obj, *vp); */ + } else if (JSVAL_IS_DOUBLE(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyCheck called on double %s object %u, jsval %u\n",_id_c, obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1192,7 +1192,7 @@ + /* get the id field... */ + + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + printf ("\n...js_GetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1211,7 +1211,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1229,7 +1229,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug1 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1247,7 +1247,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); + printf ("...js_SetPropertyDebug2 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1265,7 +1265,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug3 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1283,7 +1283,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug4 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1301,7 +1301,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug5 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1319,7 +1319,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug6 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1337,7 +1337,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug7 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1355,7 +1355,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug8 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +@@ -1373,7 +1373,7 @@ + + /* get the id field... */ + if (JSVAL_IS_STRING(id)) { +- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); ++ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); + printf ("\n...js_SetPropertyDebug9 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); + } else if (JSVAL_IS_INT(id)) { + num = JSVAL_TO_INT(id); +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c +--- freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c 2010-08-02 23:55:57.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c 2011-07-04 20:06:25.000000000 +0400 +@@ -336,7 +336,7 @@ + return JS_FALSE; + } + _str = JS_ValueToString(context, argv[0]); +- _costr = JS_GetStringBytes(_str); ++ _costr = JS_EncodeString(context, _str); + + /* sanitize string, for the EAI_RW call (see EAI_RW code) */ + tptr = _costr; +@@ -385,10 +385,10 @@ + return JS_FALSE; + } + _str[0] = JS_ValueToString(context, argv[0]); +- _costr[0] = JS_GetStringBytes(_str[0]); ++ _costr[0] = JS_EncodeString(context, _str[0]); + + _str[1] = JS_ValueToString(context, argv[1]); +- _costr[1] = JS_GetStringBytes(_str[1]); ++ _costr[1] = JS_EncodeString(context, _str[1]); + + /* we use the EAI code for this - so reformat this for the EAI format */ + { +@@ -575,7 +575,7 @@ + /* third parameter should be a string */ + if (JSVAL_IS_STRING(argv[2])) { + _str[1] = JSVAL_TO_STRING(argv[2]); +- fieldStr = JS_GetStringBytes(_str[1]); ++ fieldStr = JS_EncodeString(context, _str[1]); + #ifdef JSVERBOSE + printf ("field string is :%s:\n",fieldStr); + #endif +@@ -590,7 +590,7 @@ + + /* get the URL listing as a string */ + _str[0] = JS_ValueToString(context, argv[0]); +- _costr0 = JS_GetStringBytes(_str[0]); ++ _costr0 = JS_EncodeString(context, _str[0]); + + + #ifdef JSVERBOSE +@@ -690,7 +690,7 @@ + for (count=0; count < argc; count++) { + if (JSVAL_IS_STRING(argv[count])) { + _str = JSVAL_TO_STRING(argv[count]); +- _id_c = JS_GetStringBytes(_str); ++ _id_c = JS_EncodeString(context, _str); + #if defined(AQUA) || defined(_MSC_VER) + BrowserPrintConsoleMessage(_id_c); /* statusbar hud */ + consMsgCount = 0; /* reset the "Maximum" count */ +@@ -850,7 +850,7 @@ + + /* parameter should be a string */ + if (JSVAL_IS_STRING(argv[0])) { +- target = JS_GetStringBytes( JSVAL_TO_STRING(argv[0])); ++ target = JS_EncodeString(context, JSVAL_TO_STRING(argv[0])); + #ifdef JSVERBOSE + printf ("field string is %s\n",target); + #endif +@@ -930,7 +930,7 @@ + + /* parameters should be a string */ + if (JSVAL_IS_STRING(argv[0])) { +- targetDevice = JS_GetStringBytes( JSVAL_TO_STRING(argv[0])); ++ targetDevice = JS_EncodeString(cx, JSVAL_TO_STRING(argv[0])); + #ifdef JSVERBOSE + printf ("field string is %s\n",targetDevice); + #endif +@@ -939,7 +939,7 @@ + return -1; + } + if (JSVAL_IS_STRING(argv[1])) { +- targetController = JS_GetStringBytes( JSVAL_TO_STRING(argv[1])); ++ targetController = JS_EncodeString(cx, JSVAL_TO_STRING(argv[1])); + #ifdef JSVERBOSE + printf ("field string is %s\n",targetController); + #endif +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c +--- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c 2010-09-22 23:40:48.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c 2011-07-04 20:08:03.000000000 +0400 +@@ -935,7 +935,7 @@ + printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd); + return JS_FALSE; + } +- val = DOUBLE_TO_JSVAL(dp); ++ val = DOUBLE_TO_JSVAL(*dp); + + } + } +@@ -1108,7 +1108,7 @@ + + printf ("HAVE STRING HERE!\n"); + _str = JS_ValueToString(cx, id); +- asciiStr = JS_GetStringBytes(_str); ++ asciiStr = JS_EncodeString(context, _str); + printf ("we have as a parameter :%s:\n",asciiStr); + #endif + +@@ -1185,7 +1185,7 @@ + if (_tmpStr==NULL) { + _tmp_valStr = "NULL"; + } else { +- _tmp_valStr = JS_GetStringBytes(_tmpStr); ++ _tmp_valStr = JS_EncodeString(cx, _tmpStr); + } + } + +@@ -1281,7 +1281,7 @@ + #endif + + str = JS_ValueToString(cx, id); +- p = JS_GetStringBytes(str); ++ p = JS_EncodeString(cx, str); + #ifdef JSVRMLCLASSESVERBOSE + printf("\tid string %s\n ",p); + #endif +@@ -1368,12 +1368,12 @@ + char * _c; + printf ("doMFSetProperty, for object %u, vp %u\n", obj,*vp); + _str = JS_ValueToString(cx, id); +- _c = JS_GetStringBytes(_str); ++ _c = JS_EncodeString(cx, _str); + printf ("id is %s\n",_c); + + _sstr = JS_ValueToString(cx, *vp); + printf ("looking up value for %d %x object %p\n",*vp,*vp,obj); +- _cc = JS_GetStringBytes(_sstr); ++ _cc = JS_EncodeString(cx, _sstr); + printf("\tdoMFSetProperty:%d: obj = %p, id = %s, vp = %s\n",type, + obj, _c, _cc); + if (JSVAL_IS_OBJECT(*vp)) { printf ("doMFSet, vp is an OBJECT\n"); } +@@ -1397,7 +1397,7 @@ + + if (!JS_ValueToInt32(cx, *vp, &i)) { + _sstr = JS_ValueToString(cx, *vp); +- _cc = JS_GetStringBytes(_sstr); ++ _cc = JS_EncodeString(cx, _sstr); + printf ("can not convert %s to an integer in doMFAddProperty for type %d\n",_cc,type); + return JS_FALSE; + } +@@ -1408,7 +1408,7 @@ + #ifdef JSVRMLCLASSESVERBOSE + printf ("doMFSetProperty - ensure that this is a DOUBLE "); + _sstr = JS_ValueToString(cx, *vp); +- _cc = JS_GetStringBytes(_sstr); ++ _cc = JS_EncodeString(cx, _sstr); + printf ("value is %s \n",_cc); + #endif + +@@ -1420,7 +1420,7 @@ + printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + + } + } +@@ -1511,7 +1511,7 @@ + nf = OBJECT_TO_JSVAL(me); + + #ifdef JSVRMLCLASSESVERBOSE +- printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf))); ++ printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf))); + #endif + + if (!setSFNodeField (cx, par, pf, &nf)) { +@@ -1535,7 +1535,7 @@ + unsigned int i, j = 0; + + _str = JS_ValueToString(cx, *vp); +- _buff = JS_GetStringBytes(_str); ++ _buff = JS_EncodeString(cx, _str); + _buff_len = strlen(_buff) + 1; + + #ifdef JSVRMLCLASSESVERBOSE +@@ -1719,14 +1719,14 @@ + size_t len = 0; + + _idStr = JS_ValueToString(context, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(context, _idStr); + + /* "register" this ECMA value for routing changed flag stuff */ + setInECMATable(context, _id_c); + + if (JSVAL_IS_STRING(*vp)) { + _vpStr = JS_ValueToString(context, *vp); +- _vp_c = JS_GetStringBytes(_vpStr); ++ _vp_c = JS_EncodeString(context, _vpStr); + + len = strlen(_vp_c); + +@@ -1752,7 +1752,7 @@ + } else { + #ifdef JSVRMLCLASSESVERBOSE + _vpStr = JS_ValueToString(context, *vp); +- _vp_c = JS_GetStringBytes(_vpStr); ++ _vp_c = JS_EncodeString(cx, _vpStr); + printf("setECMANative: obj = %p, id = \"%s\", vp = %s\n", + obj, _id_c, _vp_c); + #endif +@@ -1770,9 +1770,9 @@ + JSString *_idStr, *_vpStr; + char *_id_c, *_vp_c; + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + _vpStr = JS_ValueToString(cx, *vp); +- _vp_c = JS_GetStringBytes(_vpStr); ++ _vp_c = JS_EncodeString(cx, _vpStr); + printf("getAssignProperty: obj = %p, id = \"%s\", vp = %s\n", + obj, _id_c, _vp_c); + printf ("what is vp? \n"); +@@ -1803,7 +1803,7 @@ + + if (JSVAL_IS_STRING(id)) { + _str = JSVAL_TO_STRING(id); +- _id_c = JS_GetStringBytes(_str); ++ _id_c = JS_EncodeString(cx, _str); + if (!JS_ConvertValue(cx, *vp, JSTYPE_OBJECT, &newVal)) { + printf( "JS_ConvertValue failed in setAssignProperty.\n"); + return JS_FALSE; +@@ -1834,9 +1834,9 @@ + if (JSVAL_IS_DOUBLE(id)) printf ("id is an DOUBLE\n"); + if (JSVAL_IS_INT(id)) printf ("id is an INT\n"); + +- printf ("id is %s\n",JS_GetStringBytes(JS_ValueToString(cx,id))); +- printf ("initVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,initVal))); +- printf ("newVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,newVal))); ++ printf ("id is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,id))); ++ printf ("initVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,initVal))); ++ printf ("newVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,newVal))); + + #endif + +@@ -1859,7 +1859,7 @@ + } else { + #ifdef JSVRMLCLASSESVERBOSE + _str = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_str); ++ _id_c = JS_EncodeString(cx, _str); + printf("setAssignProperty: obj = %p, id = \"%s\"\n", + obj, _id_c); + #endif +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h +--- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h 2010-10-13 23:45:26.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h 2011-07-04 20:24:53.000000000 +0400 +@@ -30,6 +30,21 @@ + #ifndef __FREEWRL_JS_VRML_CLASSES_H__ + #define __FREEWRL_JS_VRML_CLASSES_H__ + ++static inline jsval JS_NewJSVal(JSContext *cx, jsdouble d) ++{ ++ jsval ret; ++ JS_NewNumberValue(cx, d, &ret); ++ return ret; ++} ++ ++static inline jsdouble * JS_NewDouble(JSContext *cx, jsdouble d) ++{ ++ static jsdouble ret; ++ jsval rv; ++ JS_NewNumberValue(cx, d, &rv); ++ ret = JSVAL_TO_DOUBLE(rv); ++ return &ret; ++} + + #ifndef UNUSED + #define UNUSED(v) ((void) v) +@@ -80,14 +95,14 @@ + + + #define SET_JS_TICKTIME_FALSE(possibleRetVal) { jsval zimbo; \ +- zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime)); \ ++ zimbo = JS_NewJSVal(cx, TickTime); \ + if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) { \ + printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \ + return possibleRetVal; \ + }} + + #define SET_JS_TICKTIME() { jsval zimbo; \ +- zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime)); \ ++ zimbo = JS_NewJSVal(cx, TickTime); \ + if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) { \ + printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \ + return FALSE; \ +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c +--- freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c 2010-09-22 23:40:48.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c 2011-07-04 20:08:44.000000000 +0400 +@@ -596,7 +596,7 @@ + return; + } + +- val = DOUBLE_TO_JSVAL(dp); ++ val = DOUBLE_TO_JSVAL(*dp); + + if (!JS_SetElement(cx, obj, (jsint) i, &val)) { + printf( "JS_DefineElement failed for arg %u in VrmlMatrixSetTransform.\n", i); +@@ -1212,7 +1212,7 @@ + /* + if (JSVAL_IS_STRING(id)==TRUE) { + printf(" is a common string :%s:\n", +- JS_GetStringBytes(JS_ValueToString(cx, id))); ++ JS_EncodeString(cx, JS_ValueToString(cx, id))); + } + if (JSVAL_IS_OBJECT(id)==TRUE) { + printf (" parameter is an object\n"); +@@ -1231,7 +1231,7 @@ + _index = JSVAL_TO_INT(id); + + if (_index >= _length) { +- *vp = DOUBLE_TO_JSVAL(&zerojsdouble); ++ *vp = DOUBLE_TO_JSVAL(zerojsdouble); + if (!JS_DefineElement(cx, obj, (jsint) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) { + printf( "JS_DefineElement failed in VrmlMatrixGetProperty.\n"); + return JS_FALSE; +@@ -1331,7 +1331,7 @@ + printf("MFStringAddProperty: vp = %p\n", obj); + if (JSVAL_IS_STRING(*vp)==TRUE) { + printf(" is a common string :%s:\n", +- JS_GetStringBytes(JS_ValueToString(cx, *vp))); ++ JS_EncodeString(cx, JS_ValueToString(cx, *vp))); + } + if (JSVAL_IS_OBJECT(*vp)==TRUE) { + printf (" parameter is an object\n"); +@@ -1345,7 +1345,7 @@ + printf("MFStringAddProperty: id = %p\n", obj); + if (JSVAL_IS_STRING(id)==TRUE) { + printf(" is a common string :%s:\n", +- JS_GetStringBytes(JS_ValueToString(cx, id))); ++ JS_EncodeString(cx, JS_ValueToString(cx, id))); + } + if (JSVAL_IS_OBJECT(id)==TRUE) { + printf (" parameter is an object\n"); +@@ -1494,7 +1494,7 @@ + if (JSVAL_IS_STRING(argv[i])==TRUE) { + printf (" Common String, is"); + _str = JS_ValueToString(cx, argv[i]); +- printf (JS_GetStringBytes(_str)); ++ printf (JS_EncodeString(cx, _str)); + printf (".."); + + } +diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c +--- freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c 2010-09-25 00:22:05.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c 2011-07-04 20:09:01.000000000 +0400 +@@ -161,7 +161,7 @@ + printf( "JS_NewDouble failed for %f in SFColorGetHSV.\n", xp[i]); + return JS_FALSE; + } +- _v = DOUBLE_TO_JSVAL(dp); ++ _v = DOUBLE_TO_JSVAL(*dp); + JS_SetElement(cx, result, (jsint)i, &_v); + } + +@@ -336,7 +336,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -346,7 +346,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -356,7 +356,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } +@@ -387,13 +387,13 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val); + break; + + } +@@ -422,18 +422,18 @@ + *rval = OBJECT_TO_JSVAL(_arrayObj); + + /* construct new double before conversion? */ +- _v = DOUBLE_TO_JSVAL(&hue); ++ _v = DOUBLE_TO_JSVAL(hue); + if (!JS_SetElement(cx, _arrayObj, 0, &_v)) { + printf( "JS_SetElement failed for hue in SFColorRGBAGetHSV.\n"); + return JS_FALSE; + } +- _v = DOUBLE_TO_JSVAL(&saturation); ++ _v = DOUBLE_TO_JSVAL(saturation); + if (!JS_SetElement(cx, _arrayObj, 1, &_v)) { + printf( "JS_SetElement failed for saturation in SFColorRGBAGetHSV.\n"); + return JS_FALSE; + } + +- _v = DOUBLE_TO_JSVAL(&value); ++ _v = DOUBLE_TO_JSVAL(value); + if (!JS_SetElement(cx, _arrayObj, 2, &_v)) { + printf( "JS_SetElement failed for value in SFColorRGBAGetHSV.\n"); + return JS_FALSE; +@@ -601,7 +601,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -611,7 +611,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -621,7 +621,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 3: + d = (ptr->v).c[3]; +@@ -631,7 +631,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } +@@ -662,16 +662,16 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val); + break; + case 3: +- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(_val); ++ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(_val); + break; + + } +@@ -983,7 +983,7 @@ + } else if (argc == 1) { + /* is this a string, or a number indicating a node? */ + myStr = JS_ValueToString(cx, argv[0]); +- cString = JS_GetStringBytes(myStr); ++ cString = JS_EncodeString(cx, myStr); + #ifdef JSVRMLCLASSESVERBOSE + printf ("SFNodeConstr, argc =1l string %s\n",cString); + #endif +@@ -1067,13 +1067,13 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, argv[0]); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + /* printf ("first string :%s:\n",_id_c); */ + + cString = STRDUP(_id_c); + + _idStr = JS_ValueToString(cx, argv[1]); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + /* printf ("second string :%s:\n",_id_c); */ + + if (sscanf (_id_c,"%p",&newHandle) != 1) { +@@ -1190,7 +1190,7 @@ + jsval rval; + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + #ifdef JSVRMLCLASSESVERBOSE + printf ("start of SFNodeGetProperty... id is %s\n",_id_c); +@@ -1264,10 +1264,10 @@ + + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + _valStr = JS_ValueToString(cx, *vp); +- _val_c = JS_GetStringBytes(_valStr); ++ _val_c = JS_EncodeString(cx, _valStr); + + #ifdef JSVRMLCLASSESVERBOSE + printf("SFNodeSetProperty: obj = %p, id = %s, vp = %s\n", +@@ -1904,7 +1904,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -1914,7 +1914,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -1924,7 +1924,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 3: + d = (ptr->v).c[3]; +@@ -1934,7 +1934,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } +@@ -1969,16 +1969,16 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 3: +- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); + break; + } + } +@@ -2051,7 +2051,7 @@ + * it get created in javascript? */ + if (param_isString) { + _str = JS_ValueToString(cx, *argv); +- charString = JS_GetStringBytes(_str); ++ charString = JS_EncodeString(cx, _str); + + if (sscanf(charString, "%lf %lf", + &(pars[0]), &(pars[1])) != 2) { +@@ -2143,7 +2143,7 @@ + printf( "JS_NewDouble failed for %f in SFVec2f.\n",d); + return JS_FALSE; + } +- *rval = DOUBLE_TO_JSVAL(dp); ++ *rval = DOUBLE_TO_JSVAL(*dp); + } + + #ifdef JSVRMLCLASSESVERBOSE +@@ -2332,7 +2332,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -2342,7 +2342,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } +@@ -2373,13 +2373,13 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); + break; + } + } +@@ -2458,7 +2458,7 @@ + * it get created in javascript? */ + if (param_isString) { + _str = JS_ValueToString(cx, *argv); +- charString = JS_GetStringBytes(_str); ++ charString = JS_EncodeString(cx, _str); + + if (sscanf(charString, "%lf %lf %lf", + &(pars[0]), &(pars[1]), &(pars[2])) != 3) { +@@ -2580,7 +2580,7 @@ + printf( "JS_NewDouble failed for %f in SFVec3f.\n",d); + return JS_FALSE; + } +- *rval = DOUBLE_TO_JSVAL(dp); ++ *rval = DOUBLE_TO_JSVAL(*dp); + } + #ifdef JSVRMLCLASSESVERBOSE + if (retSFVec3f){ +@@ -2792,9 +2792,9 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + _idStr = JS_ValueToString(cx, *vp); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + #endif + +@@ -2813,7 +2813,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -2823,7 +2823,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -2833,7 +2833,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } else { +@@ -2869,13 +2869,13 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); + break; + } + } +@@ -2949,7 +2949,7 @@ + * it get created in javascript? */ + if (param_isString) { + _str = JS_ValueToString(cx, *argv); +- charString = JS_GetStringBytes(_str); ++ charString = JS_EncodeString(cx, _str); + + if (sscanf(charString, "%lf %lf %lf", + &(pars[0]), &(pars[1]), &(pars[2])) != 3) { +@@ -3071,7 +3071,7 @@ + printf( "JS_NewDouble failed for %f in SFVec3d.\n",d); + return JS_FALSE; + } +- *rval = DOUBLE_TO_JSVAL(dp); ++ *rval = DOUBLE_TO_JSVAL(*dp); + } + #ifdef JSVRMLCLASSESVERBOSE + if (retSFVec3d){ +@@ -3282,9 +3282,9 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + _idStr = JS_ValueToString(cx, *vp); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + #endif + +@@ -3303,7 +3303,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -3313,7 +3313,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -3323,7 +3323,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } else { +@@ -3359,13 +3359,13 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = JSVAL_TO_DOUBLE(myv); + break; + } + } +@@ -3513,9 +3513,9 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + _idStr = JS_ValueToString(cx, *vp); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + #endif + +@@ -3534,7 +3534,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -3544,7 +3544,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -3554,7 +3554,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 3: + d = (ptr->v).c[3]; +@@ -3564,7 +3564,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } else { +@@ -3600,16 +3600,16 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 3: +- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); + break; + } + } +@@ -3758,9 +3758,9 @@ + char *_id_c; + + _idStr = JS_ValueToString(cx, id); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + _idStr = JS_ValueToString(cx, *vp); +- _id_c = JS_GetStringBytes(_idStr); ++ _id_c = JS_EncodeString(cx, _idStr); + + #endif + +@@ -3779,7 +3779,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 1: + d = (ptr->v).c[1]; +@@ -3789,7 +3789,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 2: + d = (ptr->v).c[2]; +@@ -3799,7 +3799,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + case 3: + d = (ptr->v).c[3]; +@@ -3809,7 +3809,7 @@ + d); + return JS_FALSE; + } +- *vp = DOUBLE_TO_JSVAL(dp); ++ *vp = DOUBLE_TO_JSVAL(*dp); + break; + } + } else { +@@ -3845,16 +3845,16 @@ + if (JSVAL_IS_INT(id)) { + switch (JSVAL_TO_INT(id)) { + case 0: +- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 1: +- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 2: +- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); + break; + case 3: +- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); ++ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); + break; + } + } +diff -wbBur freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c +--- freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c 2010-09-22 20:54:59.000000000 +0400 ++++ freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c 2011-07-04 01:19:07.000000000 +0400 +@@ -54,7 +54,7 @@ + #include "X3DProtoScript.h" + + #if HAVE_EXPAT_H +-# include <expat.h> ++# include </usr/include/expat.h> + #endif + //#define X3DPARSERVERBOSE 1 + diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD new file mode 100644 index 000000000..d2ed1c4fa --- /dev/null +++ b/community-testing/gambas3/PKGBUILD @@ -0,0 +1,1083 @@ +# $Id: PKGBUILD 55693 2011-09-17 21:15:06Z stephane $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> + +pkgbase=gambas3 +pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' + 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' + 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' + 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' + 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' + 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' + 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' + 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' + 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' + 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') +pkgver=2.99.3 +pkgrel=2 +pkgdesc="A free development environment based on a Basic interpreter." +arch=('i686' 'x86_64') +url="http://gambas.sourceforge.net/" +license=('GPL') +groups=('gambas3') +makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' + 'zlib' 'mesa' 'libgl' 'glew>=1.7.0' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' + 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' + 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') +options=('!emptydirs' '!makeflags') +source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" + 'gambas3-script.install' 'gambas3-runtime.install') +md5sums=('e576fa9e72863dab0196250cb35f2a9b' + 'b284be39d147ec799f1116a6abc068b4' + 'b5cc403990f31b8ea1c5cf37366d3d29') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + + ./reconf-all + ./configure --prefix=/usr -C + + make bindir=${pkgdir}/usr/bin +} + +package_gambas3-runtime() { + depends=('libffi' 'xdg-utils') + pkgdesc="Gambas3 runtime environment" + install=gambas3-runtime.install + + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc + make DESTDIR="${pkgdir}" install + + cd ../gbx + make DESTDIR="${pkgdir}" install + cd ../lib/debug + make DESTDIR="${pkgdir}" install + cd ../eval + make DESTDIR="${pkgdir}" install + cd ../draw + make DESTDIR="${pkgdir}" install + install -D -m644 ../gb.component \ + ${pkgdir}/usr/lib/gambas3 + + cd ${srcdir}/${pkgbase}-${pkgver}/main + ln -s gbx3 ${pkgdir}/usr/bin/gbr3 + gbc/gbi3 -r ${pkgdir}/usr gb + rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la} + + ## needed for postinst with xdg-utils + install -d -m755 ${pkgdir}/usr/share/gambas3/mime + install -D -m644 mime/* \ + ${pkgdir}/usr/share/gambas3/mime/ + install -d -m755 ${pkgdir}/usr/share/gambas3/icons + install -D -m644 mime/application-x-gambas3.png \ + ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png + + cd gbc + make DESTDIR="${pkgdir}" uninstall +} + +package_gambas3-devel() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 development environment" + + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc + make DESTDIR="${pkgdir}" install +} + +package_gambas3-ide() { + depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' + 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' + 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') + pkgdesc="Gambas3 Integrated Development Environment" + + cd ${srcdir}/${pkgbase}-${pkgver} + make XDG_UTILS='' DESTDIR="${pkgdir}" install + +#!! with the ide !! + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ + ${pkgdir}/usr/share/applications/gambas3.desktop + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ + ${pkgdir}/usr/share/pixmaps/gambas3.png + + rm -r ${pkgdir}/usr/bin/gb* + rm -r ${pkgdir}/usr/lib + rm -r ${pkgdir}/usr/share/gambas3 +} + +package_gambas3-script() { + depends=('gambas3-devel') + pkgdesc="Gambas3 scripter and server programs support" + install=gambas3-script.install + + cd ${srcdir}/${pkgbase}-${pkgver} + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## needed for postinst with xdg-utils + cd ${srcdir}/${pkgbase}-${pkgver}/app/mime + install -d -m755 ${pkgdir}/usr/share/gambas3/mime + install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/ + install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/ + ## + + rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}} + rm -r ${pkgdir}/usr/lib + rm -r ${pkgdir}/usr/share/gambas3/[c-i]* +} + +package_gambas3-examples() { + depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' + 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' + 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' + 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' + 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' + 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' + 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' + 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') + pkgdesc="Gambas3 examples" + + cd ${srcdir}/${pkgbase}-${pkgver} + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + rm -r ${pkgdir}/usr/{bin,lib} + rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} +} + +package_gambas3-gb-cairo() { + depends=('gambas3-runtime' 'cairo') + pkgdesc="Gambas3 cairo component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-chart() { + depends=('gambas3-gb-form') + pkgdesc="Gambas3 chart component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* + ## +} + +package_gambas3-gb-compress() { + depends=('gambas3-runtime' 'bzip2' 'zlib') + pkgdesc="Gambas3 compression support component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 + make DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]* + ## +} + +package_gambas3-gb-crypt() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 MD5/DES crypting component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*} + ## +} + +package_gambas3-gb-db-form() { + depends=('gambas3-gb-db' 'gambas3-gb-form') + pkgdesc="Gambas3 database form component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*} + ## +} + +package_gambas3-gb-db-mysql() { + depends=('gambas3-gb-db' 'libmysqlclient') + pkgdesc="Gambas3 MySQL database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-odbc() { + depends=('gambas3-gb-db' 'unixodbc') + pkgdesc="Gambas3 ODBC database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-postgresql() { + depends=('gambas3-gb-db' 'postgresql-libs') + pkgdesc="Gambas3 PostgreSQL database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-sqlite2() { + depends=('gambas3-gb-db' 'sqlite2') + pkgdesc="Gambas3 Sqlite2 database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-db-sqlite3() { + depends=('gambas3-gb-db' 'sqlite3') + pkgdesc="Gambas3 Sqlite3 database access component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-desktop() { + depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') + pkgdesc="Gambas3 desktop component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop + make DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-dbus() { + depends=('gambas3-runtime' 'dbus-core') + pkgdesc="Gambas3 DBUS component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-eval-highlight() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 expression evaluator highlight component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]* + ## +} + +package_gambas3-gb-form() { + depends=('gambas3-gb-gui') + pkgdesc="Gambas3 form component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} + ## +} + +package_gambas3-gb-form-dialog() { + depends=('gambas3-gb-form') + pkgdesc="Gambas3 form dialog component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} + ## +} + +package_gambas3-gb-form-mdi() { + depends=('gambas3-gb-form') + pkgdesc="Gambas3 form MDI component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} + ## +} + +package_gambas3-gb-form-stock() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 default stock icons component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} + ## +} + +package_gambas3-gb-gtk() { + depends=('gambas3-gb-image' 'gtk2' 'librsvg') + pkgdesc="Gambas3 graphical GTK+ toolkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-gui() { + depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') + pkgdesc="Gambas3 automatic gui toolkit chooser" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*} + ## +} + +package_gambas3-gb-image() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 image component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*} + ## +} + +package_gambas3-gb-image-effect() { + depends=('gambas3-gb-image') + pkgdesc="Gambas3 image effect component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*} + ## +} + +package_gambas3-gb-image-imlib() { + depends=('gambas3-gb-image' 'imlib2') + pkgdesc="Gambas3 imlib component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-image-io() { + depends=('gambas3-gb-image' 'gdk-pixbuf2') + pkgdesc="Gambas3 input/output component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-net() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 network component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-net-curl() { + depends=('gambas3-gb-net' 'curl') + pkgdesc="Gambas3 curl component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-net-smtp() { + depends=('gambas3-runtime' 'glib2') + pkgdesc="Gambas3 SMTP component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-opengl() { + depends=('gambas3-runtime' 'libgl' 'glew') + pkgdesc="Gambas3 OpenGL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-opengl-glu() { + depends=('gambas3-gb-opengl') + pkgdesc="Gambas3 GL Utility component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-opengl-glsl() { + depends=('gambas3-gb-opengl') + pkgdesc="Gambas3 GLSL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-option() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 getopt component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*} + ## +} + +package_gambas3-gb-pcre() { + depends=('gambas3-runtime' 'pcre') + pkgdesc="Gambas3 PCRE component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-pdf() { + depends=('gambas3-runtime' 'poppler') + pkgdesc="Gambas3 PDF component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4() { + depends=('gambas3-gb-image' 'qt') + pkgdesc="Gambas3 Qt4 toolkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4-ext() { + depends=('gambas3-gb-qt4') + pkgdesc="Gambas3 Qt4 toolkit extended component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4-opengl() { + depends=('gambas3-gb-qt4' 'libgl') + pkgdesc="Gambas3 Qt4 toolkit OpenGL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-qt4-webkit() { + depends=('gambas3-gb-qt4') + pkgdesc="Gambas3 Qt4 toolkit webkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-report() { + depends=('gambas3-gb-form' 'gambas3-gb-image-io') + pkgdesc="Gambas3 report component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} + ## +} + +package_gambas3-gb-sdl() { + depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') + pkgdesc="Gambas3 SDL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-sdl-sound() { + depends=('gambas3-runtime' 'sdl_mixer') + pkgdesc="Gambas3 SDL sound component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-settings() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 setting component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} + ## +} + +package_gambas3-gb-signal() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 signal component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## cleanup the workaround + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*} + rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*} + ## +} + +package_gambas3-gb-v4l() { + depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') + pkgdesc="Gambas3 video4linux component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-vb() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 VB transitional component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + ## Workaround for splitting + rm -r ${pkgdir}/usr/bin + rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]* + ## +} + +package_gambas3-gb-xml() { + depends=('gambas3-runtime' 'libxml2') + pkgdesc="Gambas3 XML component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-xml-rpc() { + depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') + pkgdesc="Gambas3 XML-RPC component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*} + rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*} + ## +} + +package_gambas3-gb-xml-xslt() { + depends=('gambas3-gb-xml' 'libxslt') + pkgdesc="Gambas3 XML-XSLT component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + ## +} + +package_gambas3-gb-web() { + depends=('gambas3-runtime') + pkgdesc="Gambas3 CGI component" + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/comp + make DESTDIR="${pkgdir}" install + + ## Workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* + rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* + ## +} diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install new file mode 100644 index 000000000..6c8201a6a --- /dev/null +++ b/community-testing/gambas3/gambas3-runtime.install @@ -0,0 +1,10 @@ +post_install() { + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3 + xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml +} + +pre_remove() { + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3 + xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml +} diff --git a/community-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install new file mode 100644 index 000000000..77c1aa52f --- /dev/null +++ b/community-testing/gambas3/gambas3-script.install @@ -0,0 +1,15 @@ +post_install() { + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage + xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml + xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml +} + +pre_remove() { + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage + xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml + xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml +} diff --git a/community-testing/gource/PKGBUILD b/community-testing/gource/PKGBUILD new file mode 100644 index 000000000..304da9581 --- /dev/null +++ b/community-testing/gource/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 55695 2011-09-17 21:15:10Z stephane $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> +# Contributor: Olivier Ramonat <olivier at ramonat dot fr> +pkgname=gource +pkgver=0.35 +pkgrel=2 +pkgdesc="software version control visualization" +license=(GPL3) +arch=(i686 x86_64) +url=http://code.google.com/p/gource/ +depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew') +source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('6d4f776d314da3ae5d309cb580b83a9f') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR=$pkgdir install +} +# vim: ts=2:sw=2 et: diff --git a/community-testing/lightspark/PKGBUILD b/community-testing/lightspark/PKGBUILD new file mode 100644 index 000000000..35ef4dd99 --- /dev/null +++ b/community-testing/lightspark/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=lightspark +pkgver=0.5.0 +pkgrel=2 +pkgdesc='An alternative Flash Player for Linux.' +arch=('i686' 'x86_64') +url='http://lightspark.sourceforge.net' +license=('LGPL3') +conflicts=('lightspark-git') +depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2') +makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig') +optdepends=('gnash-gtk: fallback support') +install="lightspark.install" +source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver:0:5}/+download/lightspark-${pkgver}.tar.gz") +md5sums=('7d42c8e92c3c3b318076393a7e9508fb') + +build() { + rm -rf build + mkdir build + cd build + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCOMPILE_PLUGIN=1 \ + -DCMAKE_BUILD_TYPE=Release \ + -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ + ../lightspark-${pkgver} + + make +} + +package() { + cd build + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/lightspark/lightspark.install b/community-testing/lightspark/lightspark.install new file mode 100644 index 000000000..75e2b7b55 --- /dev/null +++ b/community-testing/lightspark/lightspark.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 $1 +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-testing/luxrays/PKGBUILD b/community-testing/luxrays/PKGBUILD new file mode 100644 index 000000000..3c7e3497d --- /dev/null +++ b/community-testing/luxrays/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 55699 2011-09-17 21:15:20Z stephane $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +pkgname=luxrays +pkgver=0.8 +_pkgver=ed424ec77571 +pkgrel=5 +epoch=0 +pkgdesc="Accelerate the ray intersection process by using GPUs" +arch=('i686' 'x86_64') +url="http://www.luxrender.net/" +license=('GPL') +depends=('freeimage' 'freeglut' 'glew' 'libcl') +makedepends=('cmake' 'boost' 'opencl-headers') +source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) +md5sums=('2ac9c588675c5971c57f473ef10ac67d') + +build() { + cd "$srcdir/luxrender-$pkgname-$_pkgver" + + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DLUXRAYS_DISABLE_OPENCL=OFF \ + . + make +} + +package() { + cd "$srcdir/luxrender-$pkgname-$_pkgver" + + install -d -m755 "$pkgdir"/usr/{bin,include,lib} + install -m755 bin/* "$pkgdir"/usr/bin + install -m644 lib/* "$pkgdir"/usr/lib + cp -a include/luxrays "$pkgdir"/usr/include +} + +# vim:set ts=2 sw=2 et: 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..519bdd30c --- /dev/null +++ b/community-testing/performous/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 55701 2011-09-17 21:15:24Z stephane $ +# Maintainer : Laurent Carlier <lordheavym@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=performous +pkgver=0.6.1 +pkgrel=9 +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>=1.7.0' '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/root/PKGBUILD b/community-testing/root/PKGBUILD new file mode 100644 index 000000000..2b246efc2 --- /dev/null +++ b/community-testing/root/PKGBUILD @@ -0,0 +1,87 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Sebastian Voecking <voeck@web.de> + +pkgname=root +pkgver=5.30.01 +pkgrel=2 +pkgdesc='C++ data analysis framework and interpreter from CERN.' +arch=('i686' 'x86_64') +url='http://root.cern.ch' +license=('LGPL2.1') +depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' + 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran') +makedepends=('fftw') +install='root.install' +source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" + 'root.sh' + 'rootd' + 'root.desktop' + 'root.xml') +md5sums=('be7443a1b243c51b3c1ec435a5a9453e' + '0e883ad44f99da9bc7c23bc102800b62' + 'efd06bfa230cc2194b38e0c8939e72af' + 'ac61b17395d75a2705fefa2ef841a6bf' + 'e2cf69b204192b5889ceb5b4dedc66f7') + +build() { + cd root + + if [ ${CARCH} == 'i686' ]; then + TARGET=linux; + else + TARGET=linuxx8664gcc; + fi + + # python2 switch + find . -type f -exec sed -i -e 's/python -O/python2 -O/g' -e 's/python -c/python2 -c/g' {} \; + sed \ + -e 's/python 2/python2 2/g' \ + -i configure + sed \ + -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \ + -i cint/reflex/python/genreflex/Makefile.am + sed \ + -e 's/python /python2 /' \ + -i config/genreflex.in config/genreflex-rootcint.in + + ./configure \ + ${TARGET} \ + --prefix=/usr \ + --disable-builtin-ftgl \ + --disable-builtin-freetype \ + --disable-builtin-glew \ + --disable-builtin-pcre \ + --disable-builtin-zlib \ + --disable-builtin-lzma \ + --enable-gdml \ + --enable-gsl-shared \ + --enable-minuit2 \ + --enable-soversion \ + --enable-roofit \ + --enable-python \ + --with-python-incdir=/usr/include/python2.7 \ + --with-python-libdir=/usr/lib \ + --enable-explicitlink + + # move from aur + #--disable-builtin-afterimage \ + + make +} + +package() { + cd root + + make DESTDIR=${pkgdir} install + + install -D ${srcdir}/root.sh \ + ${pkgdir}/etc/profile.d/root.sh + install -D ${srcdir}/rootd \ + ${pkgdir}/etc/rc.d/rootd + install -D -m644 ${srcdir}/root.desktop \ + ${pkgdir}/usr/share/applications/root.desktop + install -D -m644 ${srcdir}/root.xml \ + ${pkgdir}/usr/share/mime/packages/root.xml + + rm -rf ${pkgdir}/etc/root/daemons +} diff --git a/community-testing/root/root.desktop b/community-testing/root/root.desktop new file mode 100644 index 000000000..ca382111c --- /dev/null +++ b/community-testing/root/root.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Exec=root +Terminal=true +Name=ROOT +Name[de]=ROOT +Comment=An object-oriented data analysis framework +Comment[de]=Ein objektorientiertes Framework zur Datenanalyse +StartupNotify=true +MimeType=application/x-root;text/x-c++src +Categories=Science;Development;Application; diff --git a/community-testing/root/root.install b/community-testing/root/root.install new file mode 100644 index 000000000..457af7314 --- /dev/null +++ b/community-testing/root/root.install @@ -0,0 +1,17 @@ +post_install() { + if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then + echo "/usr/lib/root" >> etc/ld.so.conf + sbin/ldconfig -r . + fi + + update-desktop-database >/dev/null + + update-mime-database /usr/share/mime >/dev/null +} + +pre_remove() { + cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot + mv /tmp/.pacroot etc/ld.so.conf + chmod 644 etc/ld.so.conf + sbin/ldconfig -r . +} diff --git a/community-testing/root/root.sh b/community-testing/root/root.sh new file mode 100644 index 000000000..685e6036b --- /dev/null +++ b/community-testing/root/root.sh @@ -0,0 +1,5 @@ +if [ $PYTHONPATH ]; then + export PYTHONPATH=$PYTHONPATH:/usr/lib/root; +else + export PYTHONPATH=/usr/lib/root; +fi diff --git a/community-testing/root/root.xml b/community-testing/root/root.xml new file mode 100644 index 000000000..af8dd69c5 --- /dev/null +++ b/community-testing/root/root.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> + <mime-type type="application/x-root"> + <comment>ROOT file</comment> + <comment xml:lang="de">ROOT-Datei</comment> + <glob pattern="*.root"/> + <magic priority="80"> + <match value="root" type="string" offset="0:64"/> + </magic> + </mime-type> +</mime-info> diff --git a/community-testing/root/rootd b/community-testing/root/rootd new file mode 100755 index 000000000..fb2c3388c --- /dev/null +++ b/community-testing/root/rootd @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/rootd` +case "$1" in + start) + stat_busy "Starting ROOT file server daemon" + [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + PID=`pidof -o %PPID /usr/sbin/rootd` + echo $PID >/var/run/rootd.pid + add_daemon rootd + stat_done + fi + ;; + stop) + stat_busy "Stopping ROOT file server daemon" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon rootd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/rss-glx/PKGBUILD b/community-testing/rss-glx/PKGBUILD new file mode 100644 index 000000000..a9bf5635a --- /dev/null +++ b/community-testing/rss-glx/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 55705 2011-09-17 21:15:47Z stephane $ +# 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=8 +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-testing/sfml/PKGBUILD b/community-testing/sfml/PKGBUILD new file mode 100644 index 000000000..20a5bd87c --- /dev/null +++ b/community-testing/sfml/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 55707 2011-09-17 21:15:53Z stephane $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Ondrej Martinak <omartinak@gmail.com> + +pkgname=sfml + +_git=true + +if [[ "${_git}" = "true" ]]; then + pkgver=1.99.git20110917 +fi + +pkgrel=1 +pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' +arch=('i686' 'x86_64') +url='http://www.sfml-dev.org/' +license=('zlib') +depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') +makedepends=('git' 'mesa' 'cmake' 'doxygen') +install=sfml.install + +_gitroot='https://github.com/LaurentGomila/SFML.git' +_gitname='SFML' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + cd $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ + -DBUILD_DOC=true \ + -DBUILD_EXAMPLES=true + make + make doc +} + +package() { + cd "$srcdir/$_gitname-build/build" + make DESTDIR="$pkgdir/" install + + install -Dm644 ../license.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + diff --git a/community-testing/sfml/sfml.install b/community-testing/sfml/sfml.install new file mode 100644 index 000000000..75f760be6 --- /dev/null +++ b/community-testing/sfml/sfml.install @@ -0,0 +1,3 @@ +post_install() { + echo "To view the SFML samples, go to /usr/share/SFML/examples/ and run them individually" +} diff --git a/community-testing/spring/PKGBUILD b/community-testing/spring/PKGBUILD new file mode 100644 index 000000000..807894d01 --- /dev/null +++ b/community-testing/spring/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 55709 2011-09-17 21:16:01Z stephane $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=spring +pkgver=0.82.7.1 +pkgrel=7 +pkgdesc='A free 3D real-time-strategy (RTS) game engine' +arch=('i686' 'x86_64') +url="http://springrts.com/" +license=('GPL') +depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') +makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2') +optdepends=('python2: python-based bots' + 'java-runtime: java-based bots') +source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma + gcc46.patch + awk-java.patch) +md5sums=('378cf0b18a5dd5b840964e5945778503' + 'e9586b611db1ed04fe4f0c5982fda7d2' + 'cd94edf21e49ff6ff7d256442ed9aa3c') + +build() { + bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma + + cd spring_$pkgver + + sed -i '1i\ + #include <list>' rts/lib/lobby/Connection.h + patch -Np1 < $srcdir/gcc46.patch + patch -Np1 < $srcdir/awk-java.patch + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDATADIR=share/spring + make +} + +package() { + cd spring_$pkgver + + make DESTDIR=$pkgdir install + + install -d $pkgdir/etc/spring + echo '$HOME/.spring' > $pkgdir/etc/spring/datadir +} + +# vim sw=2:ts=2 et: diff --git a/community-testing/spring/awk-java.patch b/community-testing/spring/awk-java.patch new file mode 100644 index 000000000..36c932924 --- /dev/null +++ b/community-testing/spring/awk-java.patch @@ -0,0 +1,48 @@ +diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk +--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:29:16.623158278 +0200 ++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:33:00.872921328 +0200 +@@ -341,7 +341,7 @@ + } + + # beginn of struct S*Command +-/^\struct S.*Command( \{)?/ { ++/^struct S.*Command( \{)?/ { + + isInsideCmdStruct = 1; + ind_cmdMember = 0; +diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk +--- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:29:16.623158278 +0200 ++++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:32:51.009745026 +0200 +@@ -473,7 +473,7 @@ + } + + # beginn of struct S*Event +-/^\struct S.*Event( \{)?/ { ++/^struct S.*Event( \{)?/ { + + isInsideEvtStruct = 1; + ind_evtMember = 0; +diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk +--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:29:16.626491558 +0200 ++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:30:25.695391913 +0200 +@@ -387,7 +387,7 @@ + } + + # beginn of struct S*Command +-/^\struct S.*Command( \{)?/ { ++/^struct S.*Command( \{)?/ { + + isInsideCmdStruct = 1; + ind_cmdMember = 0; +diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk +--- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:29:16.626491558 +0200 ++++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:30:13.942245701 +0200 +@@ -366,7 +366,7 @@ + } + + # beginn of struct S*Event +-/^\struct S.*Event( \{)?/ { ++/^struct S.*Event( \{)?/ { + + isInsideEvtStruct = 1; + ind_evtMember = 0; diff --git a/community-testing/spring/gcc46.patch b/community-testing/spring/gcc46.patch new file mode 100644 index 000000000..4f6865cac --- /dev/null +++ b/community-testing/spring/gcc46.patch @@ -0,0 +1,67 @@ +From: Jan Dittberner <jandd@debian.org> +Subject: Patch for FTBFS with g++ 4.6.0 +Bug-Debian: http://bugs.debian.org/625097 +Bug: http://springrts.com/mantis/view.php?id=2415 +--- a/AI/Skirmish/E323AI/AAStar.h ++++ b/AI/Skirmish/E323AI/AAStar.h +@@ -4,6 +4,7 @@ + #include <queue> + #include <vector> + #include <list> ++#include <cstddef> // for NULL + + class AAStar { + public: +--- a/rts/Rendering/ShadowHandler.cpp ++++ b/rts/Rendering/ShadowHandler.cpp +@@ -318,6 +318,11 @@ + xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1)))); + ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1)))); + ++ shadowParams.x = xmid; ++ shadowParams.y = ymid; ++ shadowParams.z = p17; ++ shadowParams.w = p18; ++ + shadowMatrix[ 0] = cross1.x / maxLengthX; + shadowMatrix[ 4] = cross1.y / maxLengthX; + shadowMatrix[ 8] = cross1.z / maxLengthX; +--- a/rts/Rendering/ShadowHandler.h ++++ b/rts/Rendering/ShadowHandler.h +@@ -38,7 +38,7 @@ + CMatrix44f shadowMatrix; + void CalcMinMaxView(void); + +- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); } ++ const float4& GetShadowParams() const { return shadowParams; } + + enum ShadowGenProgram { + SHADOWGEN_PROGRAM_MODEL = 0, +@@ -76,6 +76,7 @@ + //! to write the (FBO) depth-buffer texture + std::vector<Shader::IProgramObject*> shadowGenProgs; + ++ float4 shadowParams; + float x1, x2, y1, y2; + float xmid, ymid; + float p17, p18; +--- a/rts/Rendering/GLContext.cpp ++++ b/rts/Rendering/GLContext.cpp +@@ -9,6 +9,7 @@ + #include "GLContext.h" + + #include <list> ++#include <cstddef> // for NULL + + + using namespace std; +--- a/rts/System/MemPool.h ++++ b/rts/System/MemPool.h +@@ -4,6 +4,7 @@ + #define _MEM_POOL_H_ + + #include <new> ++#include <cstddef> // for NULL + + const size_t MAX_MEM_SIZE=200; + diff --git a/community-testing/supertux/PKGBUILD b/community-testing/supertux/PKGBUILD new file mode 100644 index 000000000..60606f57c --- /dev/null +++ b/community-testing/supertux/PKGBUILD @@ -0,0 +1,31 @@ +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# Contributor: Eric Belanger <belanger@astro.umontreal.ca> +# Contributor: vande198 +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=supertux +pkgver=0.3.3 +pkgrel=4 +pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" +arch=('i686' 'x86_64') +url="http://super-tux.sourceforge.net/" +license=('GPL') +depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew') +makedepends=('cmake' 'boost') +source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2) +md5sums=('f3f803e629ee51a9de0b366a036e393d') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp + sed -i '/types\.h/d' src/addon/addon_manager.cpp + cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/supertux/compile.patch b/community-testing/supertux/compile.patch new file mode 100644 index 000000000..05376fe91 --- /dev/null +++ b/community-testing/supertux/compile.patch @@ -0,0 +1,67 @@ +diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp +--- supertux-0.3.1.orig/src/console.hpp 2008-01-03 21:59:27.000000000 +0100 ++++ supertux-0.3.1/src/console.hpp 2008-08-23 11:57:47.000000000 +0200 +@@ -27,6 +27,8 @@ + #include <sstream> + #include <iostream> + #include <squirrel.h> ++#include <memory> ++#include <cstdlib> + + class Console; + class ConsoleStreamBuffer; +diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp +--- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 21:59:26.000000000 +0100 ++++ supertux-0.3.1/src/lisp/lexer.cpp 2008-08-23 13:45:58.000000000 +0200 +@@ -21,6 +21,7 @@ + #include <sstream> + #include <stdexcept> + #include <iostream> ++#include <cstring> + + #include "lexer.hpp" + +diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp +--- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 21:59:26.000000000 +0100 ++++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2008-08-23 13:29:34.000000000 +0200 +@@ -21,6 +21,7 @@ + #define SUPERTUX_SPRITE_MANAGER_H + + #include <map> ++#include <string> + + class SpriteData; + class Sprite; +diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp +--- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 21:59:27.000000000 +0100 ++++ supertux-0.3.1/src/textscroller.hpp 2008-08-23 13:34:35.000000000 +0200 +@@ -24,6 +24,7 @@ + #include <vector> + #include <string> + #include <map> ++#include <memory> + + #include "screen.hpp" + #include "math/vector.hpp" +diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp +--- supertux-0.3.1.orig/src/title.cpp 2008-01-03 21:59:28.000000000 +0100 ++++ supertux-0.3.1/src/title.cpp 2008-08-23 12:05:19.000000000 +0200 +@@ -32,6 +32,7 @@ + #include <SDL.h> + #include <SDL_image.h> + #include <physfs.h> ++#include <algorithm> + + #include "title.hpp" + #include "mainloop.hpp" +diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp +--- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 21:59:22.000000000 +0100 ++++ supertux-0.3.1/src/video/sdl_texture.hpp 2008-08-23 13:37:14.000000000 +0200 +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <SDL.h> ++#include <algorithm> + + #include "texture.hpp" + #include "color.hpp" diff --git a/community-testing/supertux/gcc44.patch b/community-testing/supertux/gcc44.patch new file mode 100644 index 000000000..b58d9c29d --- /dev/null +++ b/community-testing/supertux/gcc44.patch @@ -0,0 +1,90 @@ +diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp +--- supertux-0.3.1.orig/src/console.hpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/console.hpp 2009-05-17 19:43:26.914307646 +0000 +@@ -27,6 +27,8 @@ + #include <sstream> + #include <iostream> + #include <squirrel.h> ++#include <memory> ++#include <cstdlib> + + class Console; + class ConsoleStreamBuffer; +diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp +--- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/lisp/lexer.cpp 2009-05-17 19:43:27.037705317 +0000 +@@ -21,6 +21,7 @@ + #include <sstream> + #include <stdexcept> + #include <iostream> ++#include <cstring> + + #include "lexer.hpp" + +diff -ruN supertux-0.3.1.orig/src/lisp/lisp.cpp supertux-0.3.1/src/lisp/lisp.cpp +--- supertux-0.3.1.orig/src/lisp/lisp.cpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/lisp/lisp.cpp 2009-05-17 19:44:29.305165638 +0000 +@@ -18,7 +18,7 @@ + // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + #include <config.h> +- ++#include <cstdio> + #include "lisp.hpp" + + namespace lisp +diff -ruN supertux-0.3.1.orig/src/random_generator.cpp supertux-0.3.1/src/random_generator.cpp +--- supertux-0.3.1.orig/src/random_generator.cpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/random_generator.cpp 2009-05-17 19:44:05.851002254 +0000 +@@ -39,6 +39,7 @@ + #include <stdexcept> + #include <time.h> + #include <cassert> ++#include <cstdio> + #include "random_generator.hpp" + + RandomGenerator systemRandom; // global random number generator +diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp +--- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 20:59:26.000000000 +0000 ++++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2009-05-17 19:43:27.037705317 +0000 +@@ -21,6 +21,7 @@ + #define SUPERTUX_SPRITE_MANAGER_H + + #include <map> ++#include <string> + + class SpriteData; + class Sprite; +diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp +--- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 20:59:27.000000000 +0000 ++++ supertux-0.3.1/src/textscroller.hpp 2009-05-17 19:43:27.037705317 +0000 +@@ -24,6 +24,7 @@ + #include <vector> + #include <string> + #include <map> ++#include <memory> + + #include "screen.hpp" + #include "math/vector.hpp" +diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp +--- supertux-0.3.1.orig/src/title.cpp 2008-01-03 20:59:28.000000000 +0000 ++++ supertux-0.3.1/src/title.cpp 2009-05-17 19:43:27.041000359 +0000 +@@ -32,6 +32,7 @@ + #include <SDL.h> + #include <SDL_image.h> + #include <physfs.h> ++#include <algorithm> + + #include "title.hpp" + #include "mainloop.hpp" +diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp +--- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 20:59:22.000000000 +0000 ++++ supertux-0.3.1/src/video/sdl_texture.hpp 2009-05-17 19:43:27.041000359 +0000 +@@ -23,6 +23,7 @@ + #include <config.h> + + #include <SDL.h> ++#include <algorithm> + + #include "texture.hpp" + #include "color.hpp" diff --git a/community-testing/vdrift/PKGBUILD b/community-testing/vdrift/PKGBUILD new file mode 100644 index 000000000..e6950ad00 --- /dev/null +++ b/community-testing/vdrift/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 55771 2011-09-20 02:23:49Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Lone_Wolf lonewolf@xs4all.nl + +pkgname=vdrift +pkgver=2011.09.01 +pkgrel=3 +pkgdesc="An open source driving simulation made with drift racing in mind" +arch=('i686' 'x86_64') +url="http://vdrift.net/" +license=('GPL') +depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') +makedepends=('scons' 'boost' 'asio') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-src-${pkgver//./-}.tar.bz2 + $pkgname.desktop) +md5sums=('a4099acacca3d4f0799b012cd168f1c0' + '8bb429f37bcb4aed5e7ab1d80c5a4f93') + +build() { + cd "$srcdir"/$pkgname-src-${pkgver//./-} + + # select arch + if [ `uname -m` = "x86_64" ]; then + _sconsarch="a64" + else + _sconsarch="686" + fi + + sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp + sed -i '/types.h/d' src/http.h + + # build and install + scons \ + "destdir"="$pkgdir" \ + "arch"=$_sconsarch \ + "release"=1 \ + "force_feedback"=1 \ + "prefix"=/usr \ + "datadir"=share/$pkgname/ +} + +package() { + cd "$srcdir"/$pkgname-src-${pkgver//./-} + + scons install + + # install .desktop file + install -Dm644 ../$pkgname.desktop \ + "$pkgdir"/usr/share/applications/$pkgname.desktop +} +# vim: sw=2:ts=2 et: diff --git a/community-testing/vdrift/vdrift.desktop b/community-testing/vdrift/vdrift.desktop new file mode 100644 index 000000000..7078f0d9c --- /dev/null +++ b/community-testing/vdrift/vdrift.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=VDrift +Version=2009-06-15 +GenericName=Racing Simulation +Comment=An open source driving simulation made with drift racing in mind +Exec=vdrift +Icon=vdrift.png +Terminal=false +Categories=Game;Simulation; diff --git a/community-testing/widelands/PKGBUILD b/community-testing/widelands/PKGBUILD new file mode 100644 index 000000000..2b491261f --- /dev/null +++ b/community-testing/widelands/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 55715 2011-09-17 21:16:31Z stephane $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <rabyte*gmail> + +pkgname=widelands +pkgver=16 +_realver=build16 +pkgrel=3 +pkgdesc="A realtime strategy game with emphasis on economy and transport" +arch=('i686' 'x86_64') +url="http://widelands.org/" +license=('GPL') +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') +makedepends=('cmake' 'boost') +source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 + $pkgname.desktop + $pkgname.png + $pkgname.sh) +md5sums=('3d8c28e145b73c64d8ed1625319d25a2' + '15820bf099fd6f16251fe70a75c534bb' + '3dfda7e9ca76ca00dd98d745d0ceb328' + '7cae50aba5ed0cd2cfeea79124637b46') + +build() { + cd $srcdir/$pkgname-$_realver-src + + mkdir -p build/compile && cd build/compile + + cmake ../.. -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_PREFIX=/usr \ + -DWL_INSTALL_DATADIR=share/$pkgname \ + -DWL_INSTALL_BINDIR=bin + make +} + +package() { + cd $srcdir/$pkgname-$_realver-src/build/compile + + make DESTDIR="$pkgdir" install + + # Install bin, icon and desktop file + #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname + #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname + install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png + install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop +} diff --git a/community-testing/widelands/widelands-build15-gcc-4.5-patch b/community-testing/widelands/widelands-build15-gcc-4.5-patch new file mode 100644 index 000000000..6ba313358 --- /dev/null +++ b/community-testing/widelands/widelands-build15-gcc-4.5-patch @@ -0,0 +1,51 @@ +diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc +--- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 ++++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 +@@ -113,7 +113,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Map::button_clicked, *this, 4, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -142,7 +142,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name + ()); + break; + } +diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc +--- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 ++++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 +@@ -272,7 +272,7 @@ + posx, posy, width, height, + g_gr->get_picture(PicMod_UI, "pics/but1.png"), + &Main_Menu_New_Random_Map::button_clicked, *this, 8, +- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + posy += height + spacing + spacing + spacing; + +@@ -343,7 +343,7 @@ + if (m_currentworld == m_worlds.size()) + m_currentworld = 0; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + break; + case 9: + break; +@@ -476,7 +476,7 @@ + (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) + ++m_currentworld; + m_world->set_title +- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); ++ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); + + button_clicked(-1); // Update other values in UI as well + diff --git a/community-testing/widelands/widelands.desktop b/community-testing/widelands/widelands.desktop new file mode 100644 index 000000000..9715d816c --- /dev/null +++ b/community-testing/widelands/widelands.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Widelands +GenericName=Widelands +Comment=Realtime strategy game +Icon=widelands +Exec=widelands +Type=Application +Categories=Game;StrategyGame; diff --git a/community-testing/widelands/widelands.png b/community-testing/widelands/widelands.png Binary files differnew file mode 100644 index 000000000..c329cf667 --- /dev/null +++ b/community-testing/widelands/widelands.png diff --git a/community-testing/widelands/widelands.sh b/community-testing/widelands/widelands.sh new file mode 100644 index 000000000..0b21a1694 --- /dev/null +++ b/community-testing/widelands/widelands.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /usr/share/widelands +./widelands $* diff --git a/community/agg/PKGBUILD b/community/agg/PKGBUILD index df748cc8a..4ac0172da 100644 --- a/community/agg/PKGBUILD +++ b/community/agg/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 49798 2009-08-16 14:04:06Z jgc $ -# Maintainer: +# $Id: PKGBUILD 55569 2011-09-14 10:30:07Z andrea $ +# Maintainer: Jonathan Conder <jonno dot conder at gmail dot com> pkgname=agg pkgver=2.5 -pkgrel=3 +pkgrel=4 pkgdesc="A High Quality Rendering Engine for C++" arch=('i686' 'x86_64' 'mips64el') url="http://www.antigrain.com/" license=('GPL') -depends=('gcc-libs>=4.4.1' 'sdl>=1.2.13' 'freetype2>=2.3.9') -makedepends=('automake') +depends=('gcc-libs' 'sdl' 'freetype2') provides=('antigrain') replaces=('antigrain') options=('!libtool' '!makeflags') -source=(http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz +source=("http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz" agg-2.4-depends.patch agg-2.5-pkgconfig.patch) md5sums=('0229a488bc47be10a2fee6cf0b2febd6' @@ -22,10 +21,14 @@ md5sums=('0229a488bc47be10a2fee6cf0b2febd6' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" || return 1 - patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" || return 1 - sh ./autogen.sh || return 1 - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "${srcdir}/agg-2.4-depends.patch" + patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch" + sh ./autogen.sh + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/antiword/PKGBUILD b/community/antiword/PKGBUILD index 7344465f6..260633c73 100644 --- a/community/antiword/PKGBUILD +++ b/community/antiword/PKGBUILD @@ -1,26 +1,34 @@ -# Maintainer : Aaron, phrakture, Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 55537 2011-09-14 08:02:10Z andrea $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org> # Contributor: Gustav Munkby <grddev@gmx.net> pkgname=antiword pkgver=0.37 -pkgrel=2 -pkgdesc="Antiword is a free MS Word reader for Linux and RISC OS" +pkgrel=3 +pkgdesc="A free MS Word reader for Linux and RISC OS" arch=('i686' 'x86_64' 'mips64el') url="http://www.winfield.demon.nl/" -license="GPL" -depends=('glibc') +license=('GPL') +depends=('bash') install=antiword.install -source=(http://www.winfield.demon.nl/linux/$pkgname-$pkgver.tar.gz \ - antiword-helper) -md5sums=('f868e2a269edcbc06bf77e89a55898d1' '01a988376cfd4bb268120ab597c9abe3') +source=("http://www.winfield.demon.nl/linux/$pkgname-$pkgver.tar.gz" + 'antiword-helper') +md5sums=('f868e2a269edcbc06bf77e89a55898d1' + '01a988376cfd4bb268120ab597c9abe3') -build() -{ - cd $srcdir/$pkgname-$pkgver - sed -i "s|CFLAGS =.*|CFLAGS = $CFLAGS -DNDEBUG|g; \ - s|GLOBAL_INSTALL_DIR =.*|GLOBAL_INSTALL_DIR = /usr/bin|g" \ - Makefile.Linux - make DESTDIR=$pkgdir global_install +build(){ + cd "${srcdir}"/$pkgname-$pkgver + + sed -i "s|GLOBAL_INSTALL_DIR =.*|GLOBAL_INSTALL_DIR = /usr/bin|g" \ + Makefile.Linux + + make OPT="${CFLAGS} -DNDEBUG" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" global_install install -m755 $srcdir/antiword-helper $pkgdir/usr/bin/ install -Dm644 Docs/antiword.1 $pkgdir/usr/share/man/man1/antiword.1 } diff --git a/community/antiword/antiword.install b/community/antiword/antiword.install index 58aaccde7..010579522 100644 --- a/community/antiword/antiword.install +++ b/community/antiword/antiword.install @@ -1,5 +1,4 @@ -post_install() -{ +post_install() { cat << EOF NOTES On Antiword Integration: @@ -15,12 +14,3 @@ NOTES On Antiword Integration: * To enable drag-and-drop support in KDE, use the kantiword script EOF } - -post_upgrade() -{ - post_install $1 -} - -op=$1 -shift -$op $* diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD index 4fc1ab793..1cec8981d 100644 --- a/community/apcupsd/PKGBUILD +++ b/community/apcupsd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 53371 2011-08-03 09:47:21Z spupykin $ +# $Id: PKGBUILD 55548 2011-09-14 08:57:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Todd Musall <tmusall@comcast.net> pkgname=apcupsd -pkgver=3.14.9 -pkgrel=2 -pkgdesc="Apcupsd can be used for power mangement and controlling most of APC's UPS models on Unix and Windows machines." -arch=(i686 x86_64 'mips64el') +pkgver=3.14.10 +pkgrel=1 +pkgdesc="power mangement and controlling most of APC's UPS models" +arch=(i686 x86_64 mips64el) url="http://www.apcupsd.org" license=('GPL') depends=('gcc-libs') @@ -18,7 +18,7 @@ backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf etc/apcupsd/multimon.conf) source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz apcupsd) -md5sums=('aa5e2c2954a81c2f07e0a356e38fe853' +md5sums=('5928822d855c5cf7ac29655e3e0b8c23' '8bc674da24188c69b0ad5d7fe7510f73') build() { diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD index cb913e222..17aaa438b 100644 --- a/community/aqbanking/PKGBUILD +++ b/community/aqbanking/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 54691 2011-08-23 10:03:09Z spupykin $ +# $Id: PKGBUILD 55342 2011-09-10 08:52:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Moore <davidm@sjsoft.com> pkgname=aqbanking -pkgver=5.0.14 +pkgver=5.0.15 +_dnrel=86 pkgrel=1 pkgdesc="A library for online banking and financial applications" arch=(i686 x86_64 'mips64el') @@ -12,8 +13,8 @@ url="http://www.aquamaniac.de/aqbanking" license=('GPL') depends=('gwenhywfar' 'ktoblzcheck' 'libofx') options=('!makeflags' '!libtool') -source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=85&file=01&dummy=aqbanking-$pkgver.tar.gz") -md5sums=('c489bc8a8621d77653f09cae1ceb06e8') +source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz") +md5sums=('d7619785e50c2b9ca44b4ae8aa27aebc') build() { cd $srcdir/aqbanking-$pkgver diff --git a/community/box2d/PKGBUILD b/community/box2d/PKGBUILD index 6821566bf..68813a14f 100644 --- a/community/box2d/PKGBUILD +++ b/community/box2d/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 31825 2010-11-06 13:26:28Z svenstaro $ +# $Id: PKGBUILD 55402 2011-09-12 02:48:21Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=box2d -pkgver=2.1.2 -pkgrel=3 +pkgver=2.2.0 +pkgrel=1 pkgdesc="2D rigid body simulation library for games" url="http://www.box2d.org/" license=('zlib') @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') makedepends=('cmake') optdepends=() source=(http://box2d.googlecode.com/files/Box2D_v${pkgver}.zip) -md5sums=('59d142cd8d4d73e8832c7b67591f590c') +md5sums=('220f1d604444d00844cc91933c07ecd8') build() { cd ${srcdir}/Box2D_v${pkgver}/Box2D/ diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD index ec00c2965..48f49d067 100644 --- a/community/bullet/PKGBUILD +++ b/community/bullet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45481 2011-04-22 06:49:32Z svenstaro $ +# $Id: PKGBUILD 55766 2011-09-19 23:58:08Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgbase=bullet pkgname=('bullet' 'bullet-docs') -pkgver=2.78 +pkgver=2.79 pkgrel=1 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('i686' 'x86_64' 'mips64el') @@ -12,9 +12,9 @@ url="http://www.bulletphysics.com/Bullet/" license=('custom:zlib') depends=('freeglut') makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu') -source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r2387.tgz \ +source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2440.tgz \ ${pkgbase}.pc) -md5sums=('3611456232f1c01dea8094213382d0b3' +md5sums=('29d6f43964d8494f0366cd69e4883dd1' 'd1da06deba3b08b884d2212f6838905c') build() { diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index cbb1cc642..6fd6943e1 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55242 2011-09-07 09:24:20Z spupykin $ +# $Id: PKGBUILD 55611 2011-09-15 22:10:36Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox pkgver=1.19.2 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64" 'mips64el') url="http://busybox.net" @@ -26,5 +26,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -Dm755 busybox $pkgdir/bin/busybox + install -Dm4755 busybox $pkgdir/bin/busybox } diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD index e90b708d0..7deb25387 100644 --- a/community/calcurse/PKGBUILD +++ b/community/calcurse/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 53403 2011-08-03 11:06:10Z lfleischer $ +# $Id: PKGBUILD 55277 2011-09-08 13:31:41Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: wain <wain.at.gmx.net> pkgname=calcurse -pkgver=2.9.1 -pkgrel=2 +pkgver=2.9.2 +pkgrel=1 pkgdesc='A text-based personal organizer.' arch=('i686' 'x86_64' 'mips64el') url='http://calcurse.org/' license=('BSD') depends=('ncurses') -makedepends=('asciidoc') source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('3a1af304a55a87169c425099b4886dc2') +md5sums=('5cb7d9c9edddc551fc62c9c5733591c5') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --enable-docs --without-asciidoc --prefix=/usr --mandir=/usr/share/man make } diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index a697b9b03..70b8796d6 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55124 2011-09-02 23:27:00Z giovanni $ +# $Id: PKGBUILD 55681 2011-09-17 19:15:18Z giovanni $ # 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.17 +pkgver=0.8.19 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') @@ -18,9 +18,9 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 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=('dbd9acc24367d099725dfc4461298738' +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'desktop_integration.patch') +md5sums=('156c1fb275b774ce971f4ef820b9885d' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD index 077474085..0e5498b2c 100644 --- a/community/cherokee/PKGBUILD +++ b/community/cherokee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54590 2011-08-20 19:35:48Z foutrelis $ +# $Id: PKGBUILD 55615 2011-09-16 00:44:29Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Link Dupont <link@subpop.net> pkgname=cherokee -pkgver=1.2.98 -pkgrel=1 +pkgver=1.2.99 +pkgrel=3 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64' 'mips64el') url="http://www.cherokee-project.com/" @@ -24,14 +24,19 @@ backup=('etc/cherokee/cherokee.conf' options=('!libtool') source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz cherokee.rc - cherokee.logrotate) -md5sums=('21b01e7d45c0e82ecc0c4257a9c27feb' + cherokee.logrotate + fix-ctk-path-handler-match.patch) +md5sums=('c83115c3eebb29e6f2b4cc6fe699affe' 'a2d2b69c6220fab57cda4f531b680f9f' - '8d69341bd4002bffd69c6e82ff6c905f') + '8d69341bd4002bffd69c6e82ff6c905f' + 'e9475edd26ee24d035783e5999244857') build() { cd "$srcdir/$pkgname-$pkgver" + # Fix path matching bug in CTK apps (e.g. market) + patch -Np1 -i "$srcdir/fix-ctk-path-handler-match.patch" + # Use subdirectory for logs sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre @@ -63,9 +68,11 @@ package() { chown -R http:http "$pkgdir/var/lib/$pkgname/graphs" # Use Python 2 - sed -i 's/env python$/\02/' \ + sed -i 's/env python$/&2/' \ "$pkgdir/usr/share/cherokee/admin/"{server,upgrade_config}.py \ "$pkgdir/usr/bin/"{CTK-run,cherokee-{admin-launcher,tweak}} + sed -i -r "s/['\"]python/&2/g" \ + "$pkgdir/usr/share/cherokee/admin/wizards/django.py" # Compile Python scripts python2 -m compileall "$pkgdir" diff --git a/community/cherokee/fix-ctk-path-handler-match.patch b/community/cherokee/fix-ctk-path-handler-match.patch new file mode 100644 index 000000000..abd20c5ef --- /dev/null +++ b/community/cherokee/fix-ctk-path-handler-match.patch @@ -0,0 +1,16 @@ +diff -upr cherokee-1.2.99.orig/admin/CTK/CTK/Server.py cherokee-1.2.99/admin/CTK/CTK/Server.py +--- cherokee-1.2.99.orig/admin/CTK/CTK/Server.py 2011-06-06 14:17:35.000000000 +0300 ++++ cherokee-1.2.99/admin/CTK/CTK/Server.py 2011-09-16 03:31:06.000000000 +0300 +@@ -121,8 +121,11 @@ class ServerHandler (pyscgi.SCGIHandler) + my_thread.scgi_conn = self + my_thread.request_url = url + ++ # Drop the query string before matching against the handlers ++ path = url.split('?', 1)[0] ++ + for published in server._web_paths: +- if re.match (published._regex, url): ++ if re.match (published._regex, path): + # POST + if published._method == 'POST': + post = self._process_post() diff --git a/community/chrpath/PKGBUILD b/community/chrpath/PKGBUILD index 65b6a3c86..e61a20cd5 100644 --- a/community/chrpath/PKGBUILD +++ b/community/chrpath/PKGBUILD @@ -1,20 +1,24 @@ +# $Id: PKGBUILD 55552 2011-09-14 09:27:16Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> -pkgname=chrpath -pkgver=0.13 -pkgrel=2 +pkgname=chrpath pkgver=0.13 +pkgrel=3 pkgdesc="Change or delete the rpath or runpath in ELF files" arch=('i686' 'x86_64' 'mips64el') -url="http://packages.debian.org/chrpath" +url="http://directory.fsf.org/project/chrpath/" license=('GPL2') depends=('glibc') -source=(http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz) +source=("http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('b73072a8fbba277558c50364b65bb407') build() { - cd $srcdir/$pkgname-$pkgver - + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$pkgdir docdir=/usr/share/doc/chrpath install + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" docdir=/usr/share/doc/chrpath install } diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index f98fa3be3..c40ddb0ca 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 50806 2011-07-01 15:04:30Z stephane $ +# $Id: PKGBUILD 55608 2011-09-15 21:38:48Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck -pkgver=1.49 +pkgver=1.50 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64' 'mips64el') @@ -9,7 +9,7 @@ url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') depends=('pcre') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d04c1b207aca59f845aac57de3b08f44168d5aa9') +sha1sums=('39ad14cb4cb9caa45fd3365203c5f54981ee2870') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD index 60581c497..606685173 100644 --- a/community/cuneiform/PKGBUILD +++ b/community/cuneiform/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 45314 2011-04-19 21:30:46Z spupykin $ +# $Id: PKGBUILD 55513 2011-09-13 21:33: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=1 +pkgrel=2 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/cuneiform-linux" license=('BSD') -depends=(imagemagick) -makedepends=(cmake) +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() { - _SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" cd "${_SRC_ROOT}" sed -i 's#lib64#lib#' install_files.cmake mkdir builddir @@ -24,9 +25,12 @@ build() { cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr .. make +} + +package() { + cd "${_SRC_ROOT}"/builddir make DESTDIR="${pkgdir}" install - mkdir -p "${pkgdir}/usr/share/licenses/cuneiform" - cp "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ - "${pkgdir}/usr/share/licenses/cuneiform" + install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \ + "${pkgdir}/usr/share/licenses/cuneiform/license.txt" } diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD index 1421c25ee..6b22e2a8a 100644 --- a/community/dillo/PKGBUILD +++ b/community/dillo/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 52646 2011-07-26 17:04:09Z spupykin $ +# $Id: PKGBUILD 55292 2011-09-09 09:39:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=dillo -pkgver=2.2.1 +pkgver=3.0 pkgrel=1 pkgdesc="A small, fast graphical web browser built on FLTK" arch=(i686 x86_64 'mips64el') url="http://www.dillo.org" license=('GPL') -depends=('fltk2' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' +depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' 'libxi' 'libxinerama') backup=(etc/dillo/{dillorc,dpidrc}) -source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2 - libpng14.patch) -md5sums=('8875d0188b9281fa2dd683220dcf58a8' - '5336bd3a3b4698c5250ce59e4f2ff91a') +source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2) +md5sums=('448f44a923222270cb0c84e55adc1be1') build() { cd "$srcdir/$pkgname-$pkgver" -# patch -Np1 -i "$srcdir/libpng14.patch" ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \ --enable-ssl make diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD index 96d46670c..f05d6d694 100644 --- a/community/dmenu/PKGBUILD +++ b/community/dmenu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52072 2011-07-19 21:43:36Z spupykin $ +# $Id: PKGBUILD 55762 2011-09-19 13:35:20Z ttopper $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=dmenu -pkgver=4.4 +pkgver=4.4.1 pkgrel=1 pkgdesc="A generic menu for X" url="http://tools.suckless.org/dmenu/" @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('MIT') depends=('sh' 'libxinerama') source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") -md5sums=('ae1902fc37716f739836fddce6123ebc') +md5sums=('d18aaa9ac3265f92ec34a0df0cb6ebd4') build(){ cd $srcdir/$pkgname-$pkgver diff --git a/community/driftnet/PKGBUILD b/community/driftnet/PKGBUILD index 20403de77..ab64be823 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' 'mips64el') url=('http://www.ex-parrot.com/~chris/driftnet/') license=('GPL') -arch=('i686' 'x86_64' 'mips64el') 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/dvdstyler/PKGBUILD b/community/dvdstyler/PKGBUILD index 7cd8d6095..fe017a95c 100644 --- a/community/dvdstyler/PKGBUILD +++ b/community/dvdstyler/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 45103 2011-04-16 14:58:57Z ebelanger $ +# $Id: PKGBUILD 55752 2011-09-19 04:58:47Z ebelanger $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=dvdstyler -pkgver=1.8.3 +pkgver=1.8.4.3 pkgrel=1 pkgdesc="Cross-platform DVD authoring application" arch=('i686' 'x86_64' 'mips64el') url="http://www.dvdstyler.de/" license=('GPL') -depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'gettext' 'libexif' 'wxgtk' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui') +depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'libexif' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui') makedepends=('zip' 'xmlto' 'docbook-xsl') optdepends=('dvdisaster: ECC support') options=('!makeflags') -source=("http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2") -md5sums=('69a6d0a920e780bbcf65e94041e58429') +source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2 dvdstyler-ffmpeg.patch) +md5sums=('418de47c4e09a89a633b905af2a7d4fb' + '4f053158965b2be3ae26506470aeda58') build() { cd "${srcdir}/DVDStyler-${pkgver}" + patch -p1 -i "${srcdir}/dvdstyler-ffmpeg.patch" + sed -i 's/rmdir "$$t"//' docs/Makefile.in ./configure --prefix=/usr make } diff --git a/community/dvdstyler/dvdstyler-ffmpeg.patch b/community/dvdstyler/dvdstyler-ffmpeg.patch new file mode 100644 index 000000000..f2f56f6ff --- /dev/null +++ b/community/dvdstyler/dvdstyler-ffmpeg.patch @@ -0,0 +1,1915 @@ +diff -Naur DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.cpp DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.cpp +--- DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.cpp 2011-05-15 09:23:34.000000000 -0400 ++++ DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.cpp 2011-09-18 18:13:03.000000000 -0400 +@@ -3,7 +3,7 @@ + // Purpose: FFMPEG Media Transcoder + // Author: Alex Thuering + // Created: 26.04.2008 +-// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.33 2011/05/15 13:23:34 ntalex Exp $ ++// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.34 2011/07/24 07:58:21 ntalex Exp $ + // Copyright: (c) Alex Thuering + // Licence: GPL + ///////////////////////////////////////////////////////////////////////////// +@@ -17,21 +17,16 @@ + #include <math.h> + #include <errno.h> + extern "C" { +-#ifdef HAVE_FFMPEG_AVUTIL_H +-#include <opt.h> +-#include <swscale.h> +-#include <avutil.h> +-#include <fifo.h> +-#include <avfilter.h> +-#include <avfiltergraph.h> +-#else +-#include <libavcodec/opt.h> +-#include <libswscale/swscale.h> ++#include <libavutil/opt.h> + #include <libavutil/avutil.h> + #include <libavutil/fifo.h> ++#include <libavutil/dict.h> ++#include <libavutil/pixdesc.h> ++#include <libswscale/swscale.h> ++#include <libavfilter/avcodec.h> + #include <libavfilter/avfilter.h> + #include <libavfilter/avfiltergraph.h> +-#endif ++#include <libavfilter/vsink_buffer.h> + } + + #define AUDIO_BUF_SIZE 50000 +@@ -48,101 +43,19 @@ + #define INT64_MAX INT64_C(9223372036854775807) + #endif + +-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 45, 0) +-#define av_guess_format guess_format +-#endif +- +-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0) +-#define AVMediaType CodecType +-#define AVMEDIA_TYPE_UNKNOWN CODEC_TYPE_UNKNOWN +-#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO +-#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO +-#define AVMEDIA_TYPE_DATA CODEC_TYPE_DATA +-#define AVMEDIA_TYPE_SUBTITLE CODEC_TYPE_SUBTITLE +-#define AVMEDIA_TYPE_ATTACHMENT CODEC_TYPE_ATTACHMENT +-#define AVMEDIA_TYPE_NB CODEC_TYPE_NB ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0) ++#define AVIO_FLAG_WRITE AVIO_WRONLY + #endif + + //////////////////////////// AVAudioConvert ///////////////////////////////// +- +-struct AVAudioConvert { +- int in_channels, out_channels; +- int fmt_pair; +-}; +- +-AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels, +- enum AVSampleFormat in_fmt, int in_channels, +- const float *matrix, int flags) { +- AVAudioConvert *ctx; +- if (in_channels != out_channels) +- return NULL; +- ctx = (AVAudioConvert*) av_malloc(sizeof(AVAudioConvert)); +- if (!ctx) +- return NULL; +- ctx->in_channels = in_channels; +- ctx->out_channels = out_channels; +- ctx->fmt_pair = out_fmt + AV_SAMPLE_FMT_NB * in_fmt; +- return ctx; +-} +- +-void av_audio_convert_free(AVAudioConvert *ctx) { +- av_free(ctx); +-} +- +-int av_audio_convert(AVAudioConvert *ctx, +- void * const out[6], const int out_stride[6], +- const void * const in[6], const int in_stride[6], int len) { +- int ch; +- +- //FIXME optimize common cases +- +- for (ch = 0; ch < ctx->out_channels; ch++) { +- const int is = in_stride[ch]; +- const int os = out_stride[ch]; +- const uint8_t *pi = (const uint8_t *) in[ch]; +- uint8_t *po = (uint8_t *) out[ch]; +- uint8_t *end = po + os * len; +- if (!out[ch]) +- continue; +- +-#define CONV(ofmt, otype, ifmt, expr)\ +-if(ctx->fmt_pair == ofmt + AV_SAMPLE_FMT_NB*ifmt){\ +- do{\ +- *(otype*)po = expr; pi += is; po += os;\ +- }while(po < end);\ +-} +- +-//FIXME put things below under ifdefs so we do not waste space for cases no codec will need +-//FIXME rounding ? +- +- CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_U8 , *(const uint8_t*)pi) +- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<8) +- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<24) +- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7))) +- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7))) +- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S16, (*(const int16_t*)pi>>8) + 0x80) +- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi) +- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi<<16) +- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15))) +- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15))) +- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S32, (*(const int32_t*)pi>>24) + 0x80) +- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi>>16) +- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi) +- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1U<<31))) +- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1U<<31))) +- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_FLT, av_clip_uint8( lrintf(*(const float*)pi * (1<<7)) + 0x80)) +- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_FLT, av_clip_int16( lrintf(*(const float*)pi * (1<<15)))) +- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_FLT, av_clipl_int32(llrintf(*(const float*)pi * (1U<<31)))) +- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_FLT, *(const float*)pi) +- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_FLT, *(const float*)pi) +- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_DBL, av_clip_uint8( lrint(*(const double*)pi * (1<<7)) + 0x80)) +- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_DBL, av_clip_int16( lrint(*(const double*)pi * (1<<15)))) +- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_DBL, av_clipl_int32(llrint(*(const double*)pi * (1U<<31)))) +- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_DBL, *(const double*)pi) +- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_DBL, *(const double*)pi) +- else return -1; +- } +- return 0; ++// audioconvert.h ++extern "C" { ++struct AVAudioConvert; ++AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels, enum AVSampleFormat in_fmt, ++ int in_channels, const float *matrix, int flags); ++void av_audio_convert_free(AVAudioConvert *ctx); ++int av_audio_convert(AVAudioConvert *ctx, void * const out[6], const int out_stride[6], const void * const in[6], ++ const int in_stride[6], int len); + } + + //////////////////////////// AVOutputStream ///////////////////////////////// +@@ -161,6 +74,8 @@ + struct AVInputStream *sync_ist; /* input stream to sync against */ + int64_t sync_opts; /* output frame counter, could be changed to some true timestamp *///FIXME look at frame_number + AVBitStreamFilterContext *bitstream_filters; ++ AVCodec *enc; ++ + /* video only */ + int video_resample; + AVFrame resample_frame; /* temporary frame for image resampling */ +@@ -168,17 +83,19 @@ + int resample_height; + int resample_width; + int resample_pix_fmt; ++ AVRational frame_rate; + + float frame_aspect_ratio; ++ + /* forced key frames */ +-// int64_t *forced_kf_pts; +-// int forced_kf_count; +-// int forced_kf_index; ++ int64_t *forced_kf_pts; ++ int forced_kf_count; ++ int forced_kf_index; + + /* audio only */ + int audio_resample; + ReSampleContext *resample; /* for audio resampling */ +- int resample_sample_fmt; ++ AVSampleFormat resample_sample_fmt; + int resample_channels; + int resample_sample_rate; + int reformat_pair; +@@ -216,94 +133,22 @@ + } AVInputStream; + + typedef struct AVInputFile { ++ AVFormatContext *ctx; + int eof_reached; /* true if eof reached */ + int ist_index; /* index of first stream in ist_table */ + int buffer_size; /* current total buffer size */ +- int nb_streams; /* nb streams we are aware of */ + } AVInputFile; + +-//#include <libavfilter/vsrc_buffer.h> +-extern "C" { +- int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, +- AVRational pixel_aspect, int width, int height, enum PixelFormat pix_fmt, const char *sws_param); +-} +- +-//#include "cmdutils.h" +-typedef struct { +- enum PixelFormat pix_fmt; +-} FFSinkContext; +- +-int ffsink_init(AVFilterContext *ctx, const char *args, void *opaque) ++static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost) + { +- FFSinkContext *priv = (FFSinkContext*) ctx->priv; +- +- if (!opaque) +- return AVERROR(EINVAL); +- *priv = *(FFSinkContext *)opaque; +- +- return 0; +-} +- +-void null_end_frame(AVFilterLink *inlink) { } +- +-int ffsink_query_formats(AVFilterContext *ctx) { +- FFSinkContext *priv = (FFSinkContext*) ctx->priv; +- int pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE }; +- +- avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); +- return 0; +-} +- +-int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, AVFilterBufferRef **picref_ptr, AVRational *tb) { +- int ret; +- AVFilterBufferRef *picref; +- +- if ((ret = avfilter_request_frame(ctx->inputs[0])) < 0) +- return ret; +- if (!(picref = ctx->inputs[0]->cur_buf)) +- return AVERROR(ENOENT); +- *picref_ptr = picref; +- ctx->inputs[0]->cur_buf = NULL; +- *tb = ctx->inputs[0]->time_base; +- +- memcpy(frame->data, picref->data, sizeof(frame->data)); +- memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize)); +- frame->interlaced_frame = picref->video->interlaced; +- frame->top_field_first = picref->video->top_field_first; +- +- return 1; +-} +- +-AVFilter ffsink; +-AVFilterPad fInputs[2]; +-AVFilterPad fOutputs[1]; +- +-int configure_filters(AVInputStream *ist, AVOutputStream *ost) { + AVFilterContext *last_filter, *filter; + /** filter graph containing all filters including input & output */ + AVCodecContext *codec = ost->st->codec; + AVCodecContext *icodec = ist->st->codec; +- FFSinkContext ffsink_ctx; +- ffsink_ctx.pix_fmt = codec->pix_fmt; ++ enum PixelFormat pix_fmts[] = { codec->pix_fmt, PIX_FMT_NONE }; + AVRational sample_aspect_ratio; + char args[255]; + int ret; +- +- ffsink.name = "ffsink"; +- ffsink.priv_size = sizeof(FFSinkContext); +- ffsink.init = ffsink_init; +- ffsink.query_formats = ffsink_query_formats; +- +- fInputs[0].name = "default"; +- fInputs[0].type = AVMEDIA_TYPE_VIDEO; +- fInputs[0].end_frame = null_end_frame; +- fInputs[0].min_perms = AV_PERM_READ; +- fInputs[1].name = NULL; +- ffsink.inputs = fInputs; +- fOutputs[0].name = NULL; +- ffsink.outputs = fOutputs; +- +- int sws_flags = SWS_BICUBIC; + + ost->graph = avfilter_graph_alloc(); + +@@ -320,8 +165,8 @@ + "src", args, NULL, ost->graph); + if (ret < 0) + return ret; +- ret = avfilter_graph_create_filter(&ost->output_video_filter, &ffsink, +- "out", NULL, &ffsink_ctx, ost->graph); ++ ret = avfilter_graph_create_filter(&ost->output_video_filter, avfilter_get_by_name("buffersink"), ++ "out", NULL, pix_fmts, ost->graph); + if (ret < 0) + return ret; + last_filter = ost->input_video_filter; +@@ -330,7 +175,7 @@ + snprintf(args, 255, "%d:%d:flags=0x%X", + codec->width, + codec->height, +- sws_flags); ++ ost->sws_flags); + if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"), + NULL, args, NULL, ost->graph)) < 0) + return ret; +@@ -339,12 +184,12 @@ + last_filter = filter; + } + +- snprintf(args, sizeof(args), "flags=0x%X", sws_flags); ++ snprintf(args, sizeof(args), "flags=0x%X", ost->sws_flags); + ost->graph->scale_sws_opts = av_strdup(args); + + if (ost->avfilter) { +- AVFilterInOut* outputs = (AVFilterInOut*) av_malloc(sizeof(AVFilterInOut)); +- AVFilterInOut* inputs = (AVFilterInOut*) av_malloc(sizeof(AVFilterInOut)); ++ AVFilterInOut *outputs = avfilter_inout_alloc(); ++ AVFilterInOut *inputs = avfilter_inout_alloc(); + + outputs->name = av_strdup("in"); + outputs->filter_ctx = last_filter; +@@ -356,7 +201,7 @@ + inputs->pad_idx = 0; + inputs->next = NULL; + +- if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0) ++ if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0) + return ret; + av_freep(&ost->avfilter); + } else { +@@ -370,8 +215,10 @@ + codec->width = ost->output_video_filter->inputs[0]->w; + codec->height = ost->output_video_filter->inputs[0]->h; + codec->sample_aspect_ratio = ost->st->sample_aspect_ratio = ++ ost->frame_aspect_ratio ? // overriden by the -aspect cli option ++ av_d2q(ost->frame_aspect_ratio*codec->height/codec->width, 255) : + ost->output_video_filter->inputs[0]->sample_aspect_ratio; +- ++ + return 0; + } + +@@ -412,12 +259,11 @@ + } + + wxFfmpegMediaTranscoder::wxFfmpegMediaTranscoder(int threadCount) { +- nb_input_files = 0; + input_files_ts_scale[0] = NULL; + nb_input_files_ts_scale[0] = 0; +- output_codecs = NULL; ++ input_codecs = NULL; ++ nb_input_codecs = 0; + nb_output_files = 0; +- nb_output_codecs = 0; + stream_maps = NULL; + nb_stream_maps = 0; + nb_meta_data_maps = 0; +@@ -429,7 +275,6 @@ + frame_width = 0; + frame_height = 0; + frame_aspect_ratio = 0; +- frame_aspect_ratio_override = 0; + frame_pix_fmt = PIX_FMT_NONE; + frame_bits_per_raw_sample = 0; + audio_sample_fmt = SAMPLE_FMT_NONE; +@@ -476,12 +321,12 @@ + do_psnr = 0; + do_pass = 0; + pass_logfilename_prefix = "ffmpeg2pass"; +- video_sync_method= -1; +- audio_sync_method= 0; +- audio_drift_threshold= 0.1; +- copy_ts= 0; +- opt_shortest = 0; // +- video_global_header = 0; ++ video_sync_method = -1; ++ audio_sync_method = 0; ++ audio_drift_threshold = 0.1; ++ copy_ts = 0; ++ copy_tb = 0; ++ opt_shortest = 0; + vstats_filename = NULL; + vstats_file = NULL; + opt_programid = 0; +@@ -519,6 +364,11 @@ + audio_bitstream_filters = NULL; + subtitle_bitstream_filters = NULL; + ++ input_streams = NULL; ++ nb_input_streams = 0; ++ input_files = NULL; ++ nb_input_files = 0; ++ + av_log_set_callback(&av_log_wxLog_callback); + } + +@@ -531,20 +381,39 @@ + avfilter_register_all(); + } + ++// similar to ff_dynarray_add() and av_fast_realloc() ++void* grow_array(void *array, int elem_size, int *size, int new_size) { ++ if (new_size >= INT_MAX / elem_size) { ++ wxLogError(wxT("Array too big.")); ++ return NULL; ++ } ++ if (*size < new_size) { ++ uint8_t* tmp = (uint8_t*) av_realloc(array, new_size*elem_size); ++ if (!tmp) { ++ wxLogError(wxT("Could not alloc buffer.")); ++ return NULL; ++ } ++ memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size); ++ *size = new_size; ++ return tmp; ++ } ++ return array; ++} ++ + bool wxFfmpegMediaTranscoder::AddInputFile(const wxString& fileName, bool disableVideo, bool disableAudio, + bool disableSubtitle) { + AVFormatContext *ic; + int err, i, ret, rfps, rfps_base; + int64_t timestamp; +- ++ + /* get default parameters from command line */ + ic = avformat_alloc_context(); + if (!ic) { + PrintError(fileName, AVERROR(ENOMEM)); + return false; + } +- ic->flags |= AVFMT_FLAG_NONBLOCK; +- ++ ic->flags |= AVFMT_FLAG_NONBLOCK | AVFMT_FLAG_PRIV_OPT; ++ + // open the input file with generic libav function + err = av_open_input_file(&ic, (const char*) fileName.mb_str(), NULL, 0, NULL); + if (err < 0) { +@@ -606,39 +475,38 @@ + for (i=0; i<(int)ic->nb_streams; i++) { + AVStream *st = ic->streams[i]; + AVCodecContext *dec = st->codec; ++ AVInputStream *ist; ++ + dec->thread_count = thread_count; ++ input_codecs = (AVCodec**) grow_array(input_codecs, sizeof(*input_codecs), &nb_input_codecs, nb_input_codecs + 1); ++ ++ input_streams = (AVInputStream*) grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1); ++ ist = &input_streams[nb_input_streams - 1]; ++ ist->st = st; ++ ist->file_index = nb_input_files; ++ ist->discard = 1; ++ + switch (dec->codec_type) { + case AVMEDIA_TYPE_AUDIO: ++ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id); + channel_layout = dec->channel_layout; +- audio_channels = dec->channels; +- audio_sample_rate = dec->sample_rate; + audio_sample_fmt = dec->sample_fmt; + if (disableAudio) + st->discard = AVDISCARD_ALL; +- /* Note that av_find_stream_info can add more streams, and we +- * currently have no chance of setting up lowres decoding +- * early enough for them. */ +- if (dec->lowres) +- audio_sample_rate >>= dec->lowres; + break; + case AVMEDIA_TYPE_VIDEO: +- frame_height = dec->height; +- frame_width = dec->width; ++ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id); + if(st->sample_aspect_ratio.num) + frame_aspect_ratio=av_q2d(st->sample_aspect_ratio); + else + frame_aspect_ratio=av_q2d(dec->sample_aspect_ratio); + frame_aspect_ratio *= (float) dec->width / dec->height; +- frame_aspect_ratio_override = 0; +- frame_pix_fmt = dec->pix_fmt; + rfps = st->r_frame_rate.num; + rfps_base = st->r_frame_rate.den; +- if(dec->lowres) { ++ if (dec->lowres) { + dec->flags |= CODEC_FLAG_EMU_EDGE; +- frame_height >>= dec->lowres; +- frame_width >>= dec->lowres; +- dec->height = frame_height; +- dec->width = frame_width; ++ dec->height >>= dec->lowres; ++ dec->width >>= dec->lowres; + } + if (me_threshold) + dec->debug |= FF_DEBUG_MV; +@@ -650,9 +518,6 @@ + i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num, + (float)rfps / rfps_base, rfps, rfps_base); + } +- /* update the current frame rate to match the stream frame rate */ +- frame_rate.num = rfps; +- frame_rate.den = rfps_base; + + if (disableVideo) + st->discard = AVDISCARD_ALL; +@@ -660,6 +525,7 @@ + case AVMEDIA_TYPE_DATA: + break; + case AVMEDIA_TYPE_SUBTITLE: ++ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id); + if (disableSubtitle) + st->discard = AVDISCARD_ALL; + break; +@@ -672,17 +538,26 @@ + } + } + +- input_files[nb_input_files] = ic; + input_files_ts_offset[nb_input_files] = input_ts_offset - (copy_ts ? 0 : timestamp); + /* dump the file content */ + if (verbose >= 0) + av_dump_format(ic, nb_input_files, (const char*)fileName.mb_str(), 0); + +- nb_input_files++; ++ input_files = (AVInputFile*) grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1); ++ input_files[nb_input_files - 1].ctx = ic; ++ input_files[nb_input_files - 1].ist_index = nb_input_streams - ic->nb_streams; ++ + input_files_ts_scale[nb_input_files] = NULL; + nb_input_files_ts_scale[nb_input_files] = 0; +- ++ ++ top_field_first = -1; + video_channel = 0; ++ frame_rate = (AVRational){0, 0}; ++ frame_pix_fmt = PIX_FMT_NONE; ++ frame_height = 0; ++ frame_width = 0; ++ audio_sample_rate = 0; ++ audio_channels = 0; + return true; + } + +@@ -742,27 +617,27 @@ + + oc->timestamp = recording_timestamp; + +- av_metadata_copy(&oc->metadata, metadata, 0); +- av_metadata_free(&metadata); +- ++ av_dict_copy(&oc->metadata, metadata, 0); ++ av_dict_free(&metadata); ++ + output_files[nb_output_files++] = oc; + + /* check filename in case of an image number is expected */ + if (oc->oformat->flags & AVFMT_NEEDNUMBER) { + if (!av_filename_number_test(oc->filename)) { +- PrintError(fileName, AVERROR_NUMEXPECTED); ++ PrintError(fileName, AVERROR(EINVAL)); + return false; + } + } + + /* test if it already exists to avoid loosing precious files */ +- if (url_exist((const char*) fileName.mb_str())) { ++ if (avio_check((const char*) fileName.mb_str(), 0) == 0) { + wxLogError(wxT("File '%s' already exists"), fileName.c_str()); + return false; + } + + /* open the file */ +- int err = avio_open(&oc->pb, (const char*) fileName.mb_str(), URL_WRONLY); ++ int err = avio_open(&oc->pb, (const char*) fileName.mb_str(), AVIO_FLAG_WRITE); + if (err < 0) { + PrintError(fileName, err); + return false; +@@ -777,39 +652,24 @@ + oc->preload= (int)(mux_preload*AV_TIME_BASE); + oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE); + oc->loop_output = loop_output; +- oc->flags |= AVFMT_FLAG_NONBLOCK; +- ++ ++ frame_rate = (AVRational){0, 0}; ++ frame_width = 0; ++ frame_height = 0; ++ audio_sample_rate = 0; ++ audio_channels = 0; ++ + return true; + } + + void wxFfmpegMediaTranscoder::PrintError(const wxString& msg, int err) { +- switch (err) { +- case AVERROR_NUMEXPECTED: +- wxLogError(wxT("%s: Incorrect image filename syntax.\n" +- "Use '%%d' to specify the image number:\n" +- " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" +- " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'."), msg.c_str()); +- break; +- case AVERROR_INVALIDDATA: +- wxLogError(wxT("%s: Error while parsing header"), msg.c_str()); +- break; +- case AVERROR_NOFMT: +- wxLogError(wxT("%s: Unknown format"), msg.c_str()); +- break; +- case AVERROR(EIO): +- wxLogError(wxT("%s: I/O error occured\n" +- "Usually that means that input file is truncated and/or corrupted."), msg.c_str()); +- break; +- case AVERROR(ENOMEM): +- wxLogError(wxT("%s: memory allocation error occured"), msg.c_str()); +- break; +- case AVERROR(ENOENT): +- wxLogError(wxT("%s: no such file or directory"), msg.c_str()); +- break; +- default: +- wxLogError(wxT("%s: Error while opening file"), msg.c_str()); +- break; +- } ++ char errbuf[128]; ++ const char *errbuf_ptr = errbuf; ++ ++ if (av_strerror(err, errbuf, sizeof(errbuf)) < 0) ++ errbuf_ptr = strerror(AVUNERROR(err)); ++ wxString errorStr(errbuf_ptr, wxConvUTF8); ++ wxLogError(msg + wxT(": ") + errorStr); + } + + void choose_pixel_fmt(AVStream *st, AVCodec *codec) { +@@ -819,12 +679,15 @@ + if(*p == st->codec->pix_fmt) + break; + } +- if(*p == -1 +- && !( st->codec->codec_id==CODEC_ID_MJPEG +- && st->codec->strict_std_compliance <= FF_COMPLIANCE_INOFFICIAL +- && ( st->codec->pix_fmt == PIX_FMT_YUV420P +- || st->codec->pix_fmt == PIX_FMT_YUV422P))) ++ if (*p == -1) { ++ if(st->codec->pix_fmt != PIX_FMT_NONE) ++ av_log(NULL, AV_LOG_WARNING, ++ "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n", ++ av_pix_fmt_descriptors[st->codec->pix_fmt].name, ++ codec->name, ++ av_pix_fmt_descriptors[codec->pix_fmts[0]].name); + st->codec->pix_fmt = codec->pix_fmts[0]; ++ } + } + } + +@@ -835,30 +698,20 @@ + if(*p == st->codec->sample_fmt) + break; + } +- if (*p == -1) ++ if (*p == -1) { ++ if ((codec->capabilities & CODEC_CAP_LOSSLESS) ++ && av_get_sample_fmt_name(st->codec->sample_fmt) > av_get_sample_fmt_name(codec->sample_fmts[0])) ++ av_log(NULL, AV_LOG_ERROR, "Convertion will not be lossless'\n"); ++ av_log(NULL, AV_LOG_WARNING, ++ "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n", ++ av_get_sample_fmt_name(st->codec->sample_fmt), ++ codec->name, ++ av_get_sample_fmt_name(codec->sample_fmts[0])); + st->codec->sample_fmt = codec->sample_fmts[0]; ++ } + } + } + +-// similar to ff_dynarray_add() and av_fast_realloc() +-void* grow_array(void *array, int elem_size, int *size, int new_size) { +- if (new_size >= INT_MAX / elem_size) { +- wxLogError(wxT("Array too big.")); +- return NULL; +- } +- if (*size < new_size) { +- uint8_t* tmp = (uint8_t*) av_realloc(array, new_size*elem_size); +- if (!tmp) { +- wxLogError(wxT("Could not alloc buffer.")); +- return NULL; +- } +- memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size); +- *size = new_size; +- return tmp; +- } +- return array; +-} +- + void choose_sample_rate(AVStream *st, AVCodec *codec) { + if (codec && codec->supported_samplerates){ + const int *p= codec->supported_samplerates; +@@ -893,6 +746,8 @@ + } + ost->file_index = fileIdx; + ost->index = idx; ++ ++ ost->sws_flags = SWS_BICUBIC; + return ost; + } + +@@ -913,8 +768,6 @@ + if (!ost) + return false; + +- output_codecs = (AVCodec**) +- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1); + if (videoFormat != vfCOPY) { + wxSize frameSize = GetFrameSize(videoFormat); + frame_width = frameSize.GetWidth(); +@@ -929,21 +782,13 @@ + frame_rate.den = 1001; + } + codec = avcodec_find_encoder(codecId); +- output_codecs[nb_output_codecs-1] = codec; ++ ost->enc = codec; + + char* vfilters = NULL; + if (m_videoFilters.length()) { + vfilters = (char*) av_realloc(vfilters, m_videoFilters.length() + 1); + snprintf(vfilters, m_videoFilters.length() + 1, "%s", (const char*) m_videoFilters.mb_str()); + } +- if (frame_aspect_ratio_override) { +- int i = vfilters ? strlen(vfilters) : 0; +- vfilters = (char*) av_realloc(vfilters, i + 100); +- snprintf(vfilters + i, 100, "%csetdar=%f", i ? ',' : ' ', frame_aspect_ratio); +- frame_aspect_ratio = 0; +- frame_aspect_ratio_override = 0; +- } +- + ost->avfilter = vfilters; + } + +@@ -954,17 +799,14 @@ + st->codec->thread_count = thread_count; + + video_enc = st->codec; +- ++ + if (video_codec_tag) + video_enc->codec_tag= video_codec_tag; +- +- if ((video_global_header&1) || (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))) { ++ ++ if (oc->oformat->flags & AVFMT_GLOBALHEADER) { + video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; + } +- if (video_global_header&2) { +- video_enc->flags2 |= CODEC_FLAG2_LOCAL_HEADER; +- } +- ++ + if (videoFormat == vfCOPY) { + st->stream_copy = 1; + video_enc->codec_type = AVMEDIA_TYPE_VIDEO; +@@ -974,8 +816,6 @@ + const char *p; + int i; + +- AVRational fps= frame_rate.num ? frame_rate : (AVRational) {25,1}; +- + av_set_int(video_enc, "gop", isNTSC(videoFormat) ? 15 : 12); + av_set_int(video_enc, "b", bitrate * 1000); + av_set_int(video_enc, "maxrate", vbr ? 9000000 : bitrate * 1000); +@@ -985,20 +825,16 @@ + av_set_int(video_enc, "packetsize", 2048); + av_set_int(video_enc, "muxrate", 10080000); + ++ if (frame_rate.num) ++ ost->frame_rate = frame_rate; + video_enc->codec_id = codecId; + +- if (codec && codec->supported_framerates && !force_fps) +- fps = codec->supported_framerates[av_find_nearest_q_idx(fps, codec->supported_framerates)]; +- video_enc->time_base.den = fps.num; +- video_enc->time_base.num = fps.den; + video_enc->width = frame_width; + video_enc->height = frame_height; + video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255); + video_enc->pix_fmt = frame_pix_fmt; + st->sample_aspect_ratio = video_enc->sample_aspect_ratio; +- +- choose_pixel_fmt(st, codec); +- ++ + if (intra_only) + video_enc->gop_size = 0; + if (video_qscale || same_quality) { +@@ -1059,7 +895,7 @@ + // parse_forced_key_frames(forced_key_frames, ost, video_enc); + } + if (video_language) { +- av_metadata_set2(&st->metadata, "language", video_language, 0); ++ av_dict_set(&st->metadata, "language", video_language, 0); + av_freep(&video_language); + } + +@@ -1084,12 +920,10 @@ + if (!ost) + return false; + +- output_codecs = (AVCodec**) +- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1); + if (audioFormat != afNONE && audioFormat != afCOPY) { + codecId = audioFormat == afMP2 ? CODEC_ID_MP2 : CODEC_ID_AC3; + codec = avcodec_find_encoder(codecId); +- output_codecs[nb_output_codecs-1] = codec; ++ ost->enc = codec; + } + + audio_sample_rate = 48000; +@@ -1110,8 +944,6 @@ + } + if (audioFormat == afCOPY) { + st->stream_copy = 1; +- audio_enc->channels = audio_channels; +- audio_enc->sample_rate = audio_sample_rate; + } else { + av_set_int(audio_enc, "ab", bitrate*1000); + codec = avcodec_find_encoder(codecId); +@@ -1122,19 +954,16 @@ + st->quality = FF_QP2LAMBDA * audio_qscale; + audio_enc->global_quality = (int) st->quality; + } +- audio_enc->channels = audio_channels; ++ if (audio_channels) ++ audio_enc->channels = audio_channels; + audio_enc->sample_fmt = audio_sample_fmt; +- audio_enc->sample_rate = audio_sample_rate; ++ if (audio_sample_rate) ++ audio_enc->sample_rate = audio_sample_rate; + audio_enc->channel_layout = channel_layout; +- if (av_get_channel_layout_nb_channels(channel_layout) != audio_channels) +- audio_enc->channel_layout = 0; + choose_sample_fmt(st, codec); +- choose_sample_rate(st, codec); + } +- audio_enc->sample_rate = audio_sample_rate; +- audio_enc->time_base= (AVRational) {1, audio_sample_rate}; + if (audio_language) { +- av_metadata_set2(&st->metadata, "language", audio_language, 0); ++ av_dict_set(&st->metadata, "language", audio_language, 0); + av_freep(&audio_language); + } + +@@ -1158,11 +987,10 @@ + return false; + subtitle_enc = st->codec; + +- output_codecs = (AVCodec**) +- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1); + if (subtitleFormat != sfNONE) { + codecId = CODEC_ID_DVD_SUBTITLE; +- codec = output_codecs[nb_output_codecs-1] = avcodec_find_encoder(codecId); ++ codec = avcodec_find_encoder(codecId); ++ ost->enc = codec; + } + avcodec_get_context_defaults3(st->codec, codec); + +@@ -1181,7 +1009,7 @@ + } + + if (subtitle_language) { +- av_metadata_set2(&st->metadata, "language", subtitle_language, 0); ++ av_dict_set(&st->metadata, "language", subtitle_language, 0); + av_freep(&subtitle_language); + } + +@@ -1233,7 +1061,7 @@ + } + + int wxFfmpegMediaTranscoder::CopyChapters(int infile, int outfile) { +- AVFormatContext *is = input_files[infile]; ++ AVFormatContext *is = input_files[infile].ctx; + AVFormatContext *os = output_files[outfile]; + + for (unsigned int i = 0; i < is->nb_chapters; i++) { +@@ -1259,7 +1087,7 @@ + out_ch->end = FFMIN(rt, in_ch->end - ts_off); + + if (metadata_chapters_autocopy) +- av_metadata_copy(&out_ch->metadata, in_ch->metadata, 0); ++ av_dict_copy(&out_ch->metadata, in_ch->metadata, 0); + + os->nb_chapters++; + os->chapters = (AVChapter**) av_realloc(os->chapters, sizeof(AVChapter)*os->nb_chapters); +@@ -1272,11 +1100,11 @@ + + /** Starts transcoding. */ + bool wxFfmpegMediaTranscoder::Run(bool& canceled) { +- int ret = 0, i, j, k, n, nb_istreams = 0, nb_ostreams = 0, step; ++ int ret = 0, i, j, k, n, nb_ostreams = 0, step; + AVFormatContext *is, *os; + AVCodecContext *codec, *icodec; + AVOutputStream *ost, **ost_table= NULL; +- AVInputStream *ist, **ist_table= NULL; ++ AVInputStream *ist = NULL; + wxString error; + int want_sdp = 1; + int bit_buffer_size = 1024*256; +@@ -1289,46 +1117,10 @@ + if (canceled) + return false; + +- AVInputFile* file_table = (AVInputFile*) av_mallocz(nb_input_files*sizeof(AVInputFile)); +- if (!file_table) +- goto fail; +- +- /* input stream init */ +- j = 0; +- for (i=0; i<nb_input_files; i++) { +- is = input_files[i]; +- file_table[i].ist_index = j; +- file_table[i].nb_streams = is->nb_streams; +- j += is->nb_streams;; +- } +- nb_istreams = j; +- +- ist_table = (AVInputStream**) av_mallocz(nb_istreams * sizeof(AVInputStream *)); +- if (!ist_table) +- goto fail; +- +- for (i=0; i<nb_istreams; i++) { +- ist = (AVInputStream*) av_mallocz(sizeof(AVInputStream)); +- if (!ist) +- goto fail; +- ist_table[i] = ist; +- } +- j = 0; +- for (i=0; i<nb_input_files; i++) { +- is = input_files[i]; +- for (k=0; k<(int)is->nb_streams; k++) { +- ist = ist_table[j++]; +- ist->st = is->streams[k]; +- ist->file_index = i; +- ist->index = k; +- ist->discard = 1; /* the stream is discarded by default (changed later) */ +- +- if (rate_emu) { +- ist->start = av_gettime(); +- } +- } +- } +- ++ if (rate_emu) ++ for (i = 0; i < nb_input_streams; i++) ++ input_streams[i].start = av_gettime(); ++ + /* output stream init */ + nb_ostreams = 0; + for (i=0; i<nb_output_files; i++) { +@@ -1350,15 +1142,15 @@ + int fi = stream_maps[i].file_index; + int si = stream_maps[i].stream_index; + +- if (fi < 0 || fi > nb_input_files - 1 || +- si < 0 || si > file_table[fi].nb_streams - 1) { ++ if (fi < 0 || fi > (int) nb_input_files - 1 || ++ si < 0 || si > (int) input_files[fi].ctx->nb_streams - 1) { + wxLogError(wxT("Could not find input stream #%d.%d"), fi, si); + return false; + } + fi = stream_maps[i].sync_file_index; + si = stream_maps[i].sync_stream_index; + if (fi < 0 || fi> nb_input_files - 1 || +- si < 0 || si> file_table[fi].nb_streams - 1) { ++ si < 0 || si > (int) input_files[fi].ctx->nb_streams - 1) { + wxLogError(wxT("Could not find sync stream #%d.%d"), fi, si); + return false; + } +@@ -1379,11 +1171,11 @@ + for(j=0; j<AVMEDIA_TYPE_NB; j++) + nb_frame_threshold[j] += step; + +- for(j=0; j<nb_istreams; j++) { ++ for(j=0; j<nb_input_streams; j++) { + int skip=0; +- ist = ist_table[j]; ++ ist = &input_streams[j]; + if(opt_programid){ +- AVFormatContext *f= input_files[ ist->file_index ]; ++ AVFormatContext *f= input_files[ist->file_index].ctx; + skip=1; + for (unsigned int pi=0; pi<f->nb_programs; pi++) { + AVProgram *p= f->programs[pi]; +@@ -1411,11 +1203,11 @@ + ost = ost_table[n] = output_streams_for_file[k][i]; + ost->st = os->streams[i]; + if (nb_stream_maps > 0) { +- ost->source_index = file_table[stream_maps[n].file_index].ist_index + ++ ost->source_index = input_files[stream_maps[n].file_index].ist_index + + stream_maps[n].stream_index; + + /* Sanity check that the stream types match */ +- if (ist_table[ost->source_index]->st->codec->codec_type ++ if (input_streams[ost->source_index].st->codec->codec_type + != ost->st->codec->codec_type) { + wxLogError(wxT("Codec type mismatch for mapping #%d.%d -> #%d.%d"), + stream_maps[n].file_index, stream_maps[n].stream_index, +@@ -1426,12 +1218,12 @@ + } else { + /* get corresponding input stream index : we select the first one with the right type */ + found = 0; +- for(j=0;j<nb_istreams;j++) { ++ for (j=0; j < nb_input_streams; j++) { + int skip=0; +- ist = ist_table[j]; ++ ist = &input_streams[j]; + if(opt_programid){ + unsigned int pi,si; +- AVFormatContext *f= input_files[ ist->file_index ]; ++ AVFormatContext *f = input_files[ist->file_index].ctx; + skip=1; + for(pi=0; pi<f->nb_programs; pi++){ + AVProgram *p= f->programs[pi]; +@@ -1453,8 +1245,8 @@ + if (!found) { + if(! opt_programid) { + /* try again and reuse existing stream */ +- for(j=0;j<nb_istreams;j++) { +- ist = ist_table[j]; ++ for (j = 0; j < nb_input_streams; j++) { ++ ist = &input_streams[j]; + if ( ist->st->codec->codec_type == ost->st->codec->codec_type + && ist->st->discard != AVDISCARD_ALL) { + ost->source_index = j; +@@ -1471,10 +1263,10 @@ + } + } + } +- ist = ist_table[ost->source_index]; ++ ist = &input_streams[ost->source_index]; + ist->discard = 0; + ost->sync_ist = (nb_stream_maps > 0) ? +- ist_table[file_table[stream_maps[n].sync_file_index].ist_index + ++ &input_streams[input_files[stream_maps[n].sync_file_index].ist_index + + stream_maps[n].sync_stream_index] : ist; + } + } +@@ -1483,13 +1275,13 @@ + for (i=0; i<nb_ostreams; i++) { + ost = ost_table[i]; + os = output_files[ost->file_index]; +- ist = ist_table[ost->source_index]; ++ ist = &input_streams[ost->source_index]; + + codec = ost->st->codec; + icodec = ist->st->codec; + + if (metadata_streams_autocopy) +- av_metadata_copy(&ost->st->metadata, ist->st->metadata, AV_METADATA_DONT_OVERWRITE); ++ av_dict_copy(&ost->st->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE); + + ost->st->disposition = ist->st->disposition; + codec->bits_per_raw_sample= icodec->bits_per_raw_sample; +@@ -1520,11 +1312,13 @@ + goto fail; + memcpy(codec->extradata, icodec->extradata, icodec->extradata_size); + codec->extradata_size= icodec->extradata_size; +- if(av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000){ +- codec->time_base = icodec->time_base; +- codec->time_base.num *= icodec->ticks_per_frame; +- } else +- codec->time_base = ist->st->time_base; ++ if(!copy_tb && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/500){ ++ codec->time_base = icodec->time_base; ++ codec->time_base.num *= icodec->ticks_per_frame; ++ av_reduce(&codec->time_base.num, &codec->time_base.den, ++ codec->time_base.num, codec->time_base.den, INT_MAX); ++ } else ++ codec->time_base = ist->st->time_base; + switch (codec->codec_type) { + case AVMEDIA_TYPE_AUDIO: + if(audio_volume != 256) { +@@ -1566,12 +1360,25 @@ + return false; + } + } else { ++ if (!ost->enc) ++ ost->enc = avcodec_find_encoder(ost->st->codec->codec_id); + switch (codec->codec_type) { + case AVMEDIA_TYPE_AUDIO: + ost->fifo= av_fifo_alloc(1024); + if(!ost->fifo) + goto fail; + ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE); ++ if (!codec->sample_rate) { ++ codec->sample_rate = icodec->sample_rate; ++ if (icodec->lowres) ++ codec->sample_rate >>= icodec->lowres; ++ } ++ choose_sample_rate(ost->st, ost->enc); ++ codec->time_base = (AVRational){1, codec->sample_rate}; ++ if (!codec->channels) ++ codec->channels = icodec->channels; ++ if (av_get_channel_layout_nb_channels(codec->channel_layout) != codec->channels) ++ codec->channel_layout = 0; + ost->audio_resample = codec->sample_rate != icodec->sample_rate || audio_sync_method > 1; + icodec->request_channels = codec->channels; + ist->decoding_needed = 1; +@@ -1581,6 +1388,9 @@ + ost->resample_channels = icodec->channels; + break; + case AVMEDIA_TYPE_VIDEO: ++ if (codec->pix_fmt == PIX_FMT_NONE) ++ codec->pix_fmt = icodec->pix_fmt; ++ choose_pixel_fmt(ost->st, ost->enc); + if (ost->st->codec->pix_fmt == PIX_FMT_NONE) { + wxLogError(wxT("Video pixel format is unknown, stream cannot be encoded")); + return false; +@@ -1590,13 +1400,30 @@ + if (ost->video_resample) { + codec->bits_per_raw_sample= frame_bits_per_raw_sample; + } ++ if (!codec->width || !codec->height) { ++ codec->width = icodec->width; ++ codec->height = icodec->height; ++ } + ost->resample_height = icodec->height; + ost->resample_width = icodec->width; + ost->resample_pix_fmt= icodec->pix_fmt; + ost->encoding_needed = 1; + ist->decoding_needed = 1; ++ ++ if (!ost->frame_rate.num) ++ ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25,1}; ++ if (ost->enc && ost->enc->supported_framerates && !force_fps) { ++ int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates); ++ ost->frame_rate = ost->enc->supported_framerates[idx]; ++ } ++ codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num}; ++ if( av_q2d(codec->time_base) < 0.001 && video_sync_method ++ && (video_sync_method==1 || (video_sync_method<0 && !(os->oformat->flags & AVFMT_VARIABLE_FPS)))){ ++ av_log(os, AV_LOG_WARNING, "Frame rate very high for a muxer not effciciently supporting it.\n" ++ "Please consider specifiying a lower framerate, a different muxer or -vsync 2\n"); ++ } + +- if (configure_filters(ist, ost)) { ++ if (configure_video_filters(ist, ost)) { + wxLogError(wxT("Error opening filters!")); + return false; + } +@@ -1653,10 +1480,8 @@ + for (i=0; i<nb_ostreams; i++) { + ost = ost_table[i]; + if (ost->encoding_needed) { +- AVCodec *codec = i < nb_output_codecs ? output_codecs[i] : NULL; +- AVCodecContext *dec = ist_table[ost->source_index]->st->codec; +- if (!codec) +- codec = avcodec_find_encoder(ost->st->codec->codec_id); ++ AVCodec *codec = ost->enc; ++ AVCodecContext *dec = input_streams[ost->source_index].st->codec; + if (!codec) { + error = wxString::Format(wxT("Encoder (codec id %d) not found for output stream #%d.%d"), + ost->st->codec->codec_id, ost->file_index, ost->index); +@@ -1683,18 +1508,18 @@ + } + + /* open each decoder */ +- for (i=0; i<nb_istreams; i++) { +- ist = ist_table[i]; ++ for (i = 0; i < nb_input_streams; i++) { ++ ist = &input_streams[i]; + if (ist->decoding_needed) { + AVCodec *codec = avcodec_find_decoder(ist->st->codec->codec_id); + if (!codec) { + wxLogError(wxT("Decoder (codec id %d) not found for input stream #%d.%d"), +- ist->st->codec->codec_id, ist->file_index, ist->index); ++ ist->st->codec->codec_id, ist->file_index, ist->st->index); + return false; + } + if (avcodec_open(ist->st->codec, codec) < 0) { + wxLogError(wxT("Error while opening decoder for input stream #%d.%d"), +- ist->file_index, ist->index); ++ ist->file_index, ist->st->index); + return false; + } + //if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) +@@ -1703,20 +1528,68 @@ + } + + /* init pts */ +- for (i=0; i<nb_istreams; i++) { ++ for (i = 0; i < nb_input_streams; i++) { + AVStream *st; +- ist = ist_table[i]; ++ ist = &input_streams[i]; + st= ist->st; + ist->pts = st->avg_frame_rate.num ? - st->codec->has_b_frames*AV_TIME_BASE / av_q2d(st->avg_frame_rate) : 0; + ist->next_pts = AV_NOPTS_VALUE; + ist->is_start = 1; + } ++ ++ /* set meta data information from input file if required */ ++ for (i=0;i<nb_meta_data_maps;i++) { ++ AVFormatContext *files[2]; ++ AVDictionary **meta[2]; ++ int j; ++ ++#define METADATA_CHECK_INDEX(index, nb_elems, desc)\ ++ if ((index) < 0 || (index) >= (int) (nb_elems)) {\ ++ error = wxString::Format(wxT("Invalid %s index %d while processing metadata maps."), (desc), (index));\ ++ ret = AVERROR(EINVAL);\ ++ goto dump_format;\ ++ } ++ ++ int out_file_index = meta_data_maps[i][0].file; ++ int in_file_index = meta_data_maps[i][1].file; ++ if (in_file_index < 0 || out_file_index < 0) ++ continue; ++ METADATA_CHECK_INDEX(out_file_index, nb_output_files, "output file") ++ METADATA_CHECK_INDEX(in_file_index, nb_input_files, "input file") ++ ++ files[0] = output_files[out_file_index]; ++ files[1] = input_files[in_file_index].ctx; ++ ++ for (j = 0; j < 2; j++) { ++ AVMetaDataMap *map = &meta_data_maps[i][j]; + ++ switch (map->type) { ++ case 'g': ++ meta[j] = &files[j]->metadata; ++ break; ++ case 's': ++ METADATA_CHECK_INDEX(map->index, files[j]->nb_streams, "stream") ++ meta[j] = &files[j]->streams[map->index]->metadata; ++ break; ++ case 'c': ++ METADATA_CHECK_INDEX(map->index, files[j]->nb_chapters, "chapter") ++ meta[j] = &files[j]->chapters[map->index]->metadata; ++ break; ++ case 'p': ++ METADATA_CHECK_INDEX(map->index, files[j]->nb_programs, "program") ++ meta[j] = &files[j]->programs[map->index]->metadata; ++ break; ++ } ++ } ++ ++ av_dict_copy(meta[0], *meta[1], AV_DICT_DONT_OVERWRITE); ++ } ++ + /* copy global metadata by default */ + if (metadata_global_autocopy) { + + for (i = 0; i < nb_output_files; i++) +- av_metadata_copy(&output_files[i]->metadata, input_files[0]->metadata, AV_METADATA_DONT_OVERWRITE); ++ av_dict_copy(&output_files[i]->metadata, input_files[0].ctx->metadata, AV_DICT_DONT_OVERWRITE); + } + + /* copy chapters according to chapter maps */ +@@ -1742,7 +1615,7 @@ + /* copy chapters from the first input file that has them*/ + if (!nb_chapter_maps) + for (i = 0; i < nb_input_files; i++) { +- if (!input_files[i]->nb_chapters) ++ if (!input_files[i].ctx->nb_chapters) + continue; + + for (j = 0; j < nb_output_files; j++) +@@ -1776,10 +1649,10 @@ + for(i=0;i<nb_ostreams;i++) { + ost = ost_table[i]; + wxString msg = wxString::Format(wxT(" Stream #%d.%d -> #%d.%d"), +- ist_table[ost->source_index]->file_index, ist_table[ost->source_index]->index, ++ input_streams[ost->source_index].file_index, input_streams[ost->source_index].st->index, + ost->file_index, ost->index); +- if (ost->sync_ist != ist_table[ost->source_index]) +- msg += wxString::Format(wxT(" [sync #%d.%d]"), ost->sync_ist->file_index, ost->sync_ist->index); ++ if (ost->sync_ist != &input_streams[ost->source_index]) ++ msg += wxString::Format(wxT(" [sync #%d.%d]"), ost->sync_ist->file_index, ost->sync_ist->st->index); + wxLogMessage(msg); + } + } +@@ -1815,12 +1688,12 @@ + double ipts, opts; + ost = ost_table[i]; + os = output_files[ost->file_index]; +- ist = ist_table[ost->source_index]; ++ ist = &input_streams[ost->source_index]; + if (ist->is_past_recording_time || no_packet[ist->file_index]) + continue; + opts = ost->st->pts.val * av_q2d(ost->st->time_base); + ipts = (double)ist->pts; +- if (!file_table[ist->file_index].eof_reached) { ++ if (!input_files[ist->file_index].eof_reached) { + if (ipts < ipts_min) { + ipts_min = ipts; + if (input_sync) +@@ -1853,7 +1726,7 @@ + break; + + /* read a frame from it and output it in the fifo */ +- is = input_files[file_index]; ++ is = input_files[file_index].ctx; + ret= av_read_frame(is, &pkt); + if(ret == AVERROR(EAGAIN)){ + no_packet[file_index]=1; +@@ -1861,7 +1734,7 @@ + continue; + } + if (ret < 0) { +- file_table[file_index].eof_reached = 1; ++ input_files[file_index].eof_reached = 1; + if (opt_shortest) + break; + else +@@ -1876,11 +1749,11 @@ + // } + + /* the following test is needed in case new streams appear +- dynamically in stream : we ignore them */ +- if (pkt.stream_index >= file_table[file_index].nb_streams) ++ dynamically in stream : we ignore them */ ++ if (pkt.stream_index >= (int) input_files[file_index].ctx->nb_streams) + goto discard_packet; +- ist_index = file_table[file_index].ist_index + pkt.stream_index; +- ist = ist_table[ist_index]; ++ ist_index = input_files[file_index].ist_index + pkt.stream_index; ++ ist = &input_streams[ist_index]; + if (ist->discard) + goto discard_packet; + +@@ -1926,7 +1799,7 @@ + //wxLogMessage(wxT("read #%d.%d size=%d"), ist->file_index, ist->index, pkt.size); + if (!OutputPacket(ist, ist_index, ost_table, nb_ostreams, &pkt, bit_buffer_size, bit_buffer)) { + if (verbose >= 0) +- wxLogMessage(wxT("Error while decoding stream #%d.%d"), ist->file_index, ist->index); ++ wxLogMessage(wxT("Error while decoding stream #%d.%d"), ist->file_index, ist->st->index); + if (exit_on_error) + return false; + av_free_packet(&pkt); +@@ -1941,8 +1814,8 @@ + } + + /* at the end of stream, we must flush the decoder buffers */ +- for (i=0; i<nb_istreams; i++) { +- ist = ist_table[i]; ++ for (i = 0; i < nb_input_streams; i++) { ++ ist = &input_streams[i]; + if (ist->decoding_needed) + OutputPacket(ist, i, ost_table, nb_ostreams, NULL, bit_buffer_size, bit_buffer); + } +@@ -1967,8 +1840,8 @@ + } + + /* close each decoder */ +- for (i=0; i<nb_istreams; i++) { +- ist = ist_table[i]; ++ for (i = 0; i < nb_input_streams; i++) { ++ ist = &input_streams[i]; + if (ist->decoding_needed) { + avcodec_close(ist->st->codec); + } +@@ -1978,15 +1851,7 @@ + ret = 0; + fail: + av_freep(&bit_buffer); +- av_free(file_table); + +- if (ist_table) { +- for (i=0; i<nb_istreams; i++) { +- ist = ist_table[i]; +- av_free(ist); +- } +- av_free(ist_table); +- } + if (ost_table) { + for (i=0; i<nb_ostreams; i++) { + ost = ost_table[i]; +@@ -2000,7 +1865,7 @@ + av_fifo_free(ost->fifo); /* works even if fifo is not initialized but set to zero */ + av_freep(&ost->st->codec->subtitle_header); + av_free(ost->resample_frame.data[0]); +-// av_free(ost->forced_kf_pts); ++ av_free(ost->forced_kf_pts); + if (ost->video_resample) + sws_freeContext(ost->img_resample_ctx); + if (ost->resample) +@@ -2029,15 +1894,15 @@ + AVFormatContext *os; + AVOutputStream *ost; + int ret, i; +- int got_picture; ++ int got_output; + AVFrame picture; +- void *buffer_to_free; ++ void *buffer_to_free = NULL; + unsigned int samples_size = 0; + AVSubtitle subtitle, *subtitle_to_free; + int frame_available; + + AVPacket avpkt; +- int bps = av_get_bits_per_sample_fmt(ist->st->codec->sample_fmt)>>3; ++ int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt); + + if(ist->next_pts == (int64_t) AV_NOPTS_VALUE) + ist->next_pts= ist->pts; +@@ -2056,7 +1921,7 @@ + ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); + + //while we have more to decode or while the decoder did output something on EOF +- while (avpkt.size > 0 || (!pkt && ist->next_pts != ist->pts)) { ++ while (avpkt.size > 0 || (!pkt && got_output)) { + uint8_t *data_buf, *decoded_data_buf; + int data_size, decoded_data_size; + handle_eof: +@@ -2090,9 +1955,10 @@ + avpkt.data += ret; + avpkt.size -= ret; + data_size = ret; ++ got_output = decoded_data_size > 0; + // Some bug in mpeg audio decoder gives + // decoded_data_size < 0, it seems they are overflows +- if (decoded_data_size <= 0) { ++ if (!got_output) { + // no audio frame + continue; + } +@@ -2106,11 +1972,11 @@ + // XXX: allocate picture correctly + avcodec_get_frame_defaults(&picture); + +- ret = avcodec_decode_video2(ist->st->codec, &picture, &got_picture, &avpkt); ++ ret = avcodec_decode_video2(ist->st->codec, &picture, &got_output, &avpkt); + ist->st->quality= picture.quality; + if (ret < 0) + goto fail_decode; +- if (!got_picture) { ++ if (!got_output) { + // no picture yet + goto discard_packet; + } +@@ -2121,12 +1987,14 @@ + / ist->st->codec->time_base.den; + } + avpkt.size = 0; ++ buffer_to_free = NULL; ++ pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free); + break; + case AVMEDIA_TYPE_SUBTITLE: +- ret = avcodec_decode_subtitle2(ist->st->codec, &subtitle, &got_picture, &avpkt); ++ ret = avcodec_decode_subtitle2(ist->st->codec, &subtitle, &got_output, &avpkt); + if (ret < 0) + goto fail_decode; +- if (!got_picture) { ++ if (!got_output) { + goto discard_packet; + } + subtitle_to_free = &subtitle; +@@ -2157,26 +2025,19 @@ + avpkt.size = 0; + } + +- buffer_to_free = NULL; +- if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { +- pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free); +- } +- +- if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO){ +- for(i=0;i<nb_ostreams;i++) { +- ost = ost_table[i]; +- if (ost->input_video_filter && ost->source_index == ist_index) { +- AVRational sar; +- if (ist->st->sample_aspect_ratio.num) sar = ist->st->sample_aspect_ratio; +- else sar = ist->st->codec->sample_aspect_ratio; +- // add it to be filtered +- av_vsrc_buffer_add_frame2(ost->input_video_filter, &picture, +- ist->pts, +- sar, ist->st->codec->width, ist->st->codec->height, +- ist->st->codec->pix_fmt, "0:0"); +- } +- } +- } ++ if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) ++ if (start_time == 0 || ist->pts >= start_time) { ++ for(i=0;i<nb_ostreams;i++) { ++ ost = ost_table[i]; ++ if (ost->input_video_filter && ost->source_index == ist_index) { ++ if (!picture.sample_aspect_ratio.num) ++ picture.sample_aspect_ratio = ist->st->sample_aspect_ratio; ++ picture.pts = ist->pts; ++ ++ av_vsrc_buffer_add_frame(ost->input_video_filter, &picture, AV_VSRC_BUF_FLAG_OVERWRITE); ++ } ++ } ++ } + + // preprocess audio (volume) + if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { +@@ -2209,14 +2070,18 @@ + + ost = ost_table[i]; + if (ost->source_index == ist_index) { +- frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || +- !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]); +- while (frame_available) { +- AVRational ist_pts_tb; +- if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter) +- get_filtered_video_frame(ost->output_video_filter, &picture, &ost->picref, &ist_pts_tb); +- if (ost->picref) +- ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); ++ frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || ++ !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]); ++ while (frame_available) { ++ if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter) { ++ AVRational ist_pts_tb = ost->output_video_filter->inputs[0]->time_base; ++ if (av_vsink_buffer_get_video_buffer_ref(ost->output_video_filter, &ost->picref, 0) < 0) ++ goto cont; ++ if (ost->picref) { ++ avfilter_fill_frame_from_video_buffer_ref(&picture, ost->picref); ++ ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); ++ } ++ } + os = output_files[ost->file_index]; + + // set the input output pts pairs +@@ -2232,7 +2097,7 @@ + break; + case AVMEDIA_TYPE_VIDEO: + if (ost->picref->video) +- ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect; ++ ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio; + if (!DoVideoOut(os, ost, ist, &picture, &frame_size, bit_buffer_size, bit_buffer)) + return false; + // if (vstats_filename && frame_size) +@@ -2249,6 +2114,7 @@ + } + } else { + AVFrame avframe; //FIXME/XXX remove this ++ AVPicture pict; + AVPacket opkt; + int64_t ost_tb_start_time= av_rescale_q(start_time, AV_TIME_BASE_Q, ost->st->time_base); + +@@ -2298,6 +2164,14 @@ + opkt.size = data_size; + } + ++ if (os->oformat->flags & AVFMT_RAWPICTURE) { ++ /* store AVPicture in AVPacket, as expected by the output format */ ++ avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, ost->st->codec->width, ost->st->codec->height); ++ opkt.data = (uint8_t *)&pict; ++ opkt.size = sizeof(AVPicture); ++ opkt.flags |= AV_PKT_FLAG_KEY; ++ } ++ + if (!WriteFrame(os, &opkt, ost->st->codec, ost->bitstream_filters)) + return false; + +@@ -2308,8 +2182,7 @@ + cont: + frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && + ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]); +- if(ost->picref) +- avfilter_unref_buffer(ost->picref); ++ avfilter_unref_buffer(ost->picref); + } + } + } +@@ -2348,7 +2221,7 @@ + ret = 0; + // encode any samples remaining in fifo + if (fifo_bytes > 0) { +- int osize = av_get_bits_per_sample_fmt(enc->sample_fmt) >> 3; ++ int osize = av_get_bytes_per_sample(enc->sample_fmt); + int fs_tmp = enc->frame_size; + av_fifo_generic_read(ost->fifo, audio_buf, fifo_bytes, NULL); + if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) { +@@ -2447,11 +2320,11 @@ + int64_t audio_out_size, audio_buf_size; + int64_t allocated_for_size= size; + +- int size_out, frame_bytes, ret; ++ int size_out, frame_bytes, ret, resample_changed; + AVCodecContext *enc= ost->st->codec; + AVCodecContext *dec= ist->st->codec; +- int osize= av_get_bits_per_sample_fmt(enc->sample_fmt)/8; +- int isize= av_get_bits_per_sample_fmt(dec->sample_fmt)/8; ++ int osize= av_get_bytes_per_sample(enc->sample_fmt); ++ int isize= av_get_bytes_per_sample(dec->sample_fmt); + const int coded_bps = av_get_bits_per_sample(enc->codec->id); + + need_realloc: +@@ -2481,18 +2354,42 @@ + if (enc->channels != dec->channels) + ost->audio_resample = 1; + +- if (ost->audio_resample && !ost->resample) { +- if (dec->sample_fmt != SAMPLE_FMT_S16) +- wxLogWarning(wxT("Warning, using s16 intermediate sample format for resampling")); +- ost->resample = av_audio_resample_init(enc->channels, dec->channels, +- enc->sample_rate, dec->sample_rate, +- enc->sample_fmt, dec->sample_fmt, +- 16, 10, 0, 0.8); +- if (!ost->resample) { +- wxLogError(wxT("Can not resample %d channels @ %d Hz to %d channels @ %d Hz"), +- dec->channels, dec->sample_rate, +- enc->channels, enc->sample_rate); +- return false; ++ resample_changed = ost->resample_sample_fmt != dec->sample_fmt || ++ ost->resample_channels != dec->channels || ++ ost->resample_sample_rate != dec->sample_rate; ++ ++ if ((ost->audio_resample && !ost->resample) || resample_changed) { ++ if (resample_changed) { ++ av_log(NULL, AV_LOG_INFO, "Input stream #%d.%d frame changed from rate:%d fmt:%s ch:%d to rate:%d fmt:%s ch:%d\n", ++ ist->file_index, ist->st->index, ++ ost->resample_sample_rate, av_get_sample_fmt_name(ost->resample_sample_fmt), ost->resample_channels, ++ dec->sample_rate, av_get_sample_fmt_name(dec->sample_fmt), dec->channels); ++ ost->resample_sample_fmt = dec->sample_fmt; ++ ost->resample_channels = dec->channels; ++ ost->resample_sample_rate = dec->sample_rate; ++ if (ost->resample) ++ audio_resample_close(ost->resample); ++ } ++ /* if audio_sync_method is >1 the resampler is needed for audio drift compensation */ ++ if (audio_sync_method <= 1 && ++ ost->resample_sample_fmt == enc->sample_fmt && ++ ost->resample_channels == enc->channels && ++ ost->resample_sample_rate == enc->sample_rate) { ++ ost->resample = NULL; ++ ost->audio_resample = 0; ++ } else { ++ if (dec->sample_fmt != SAMPLE_FMT_S16) ++ wxLogWarning(wxT("Warning, using s16 intermediate sample format for resampling")); ++ ost->resample = av_audio_resample_init(enc->channels, dec->channels, ++ enc->sample_rate, dec->sample_rate, ++ enc->sample_fmt, dec->sample_fmt, ++ 16, 10, 0, 0.8); ++ if (!ost->resample) { ++ wxLogError(wxT("Can not resample %d channels @ %d Hz to %d channels @ %d Hz"), ++ dec->channels, dec->sample_rate, ++ enc->channels, enc->sample_rate); ++ return false; ++ } + } + } + +@@ -2619,7 +2516,7 @@ + pkt.size= ret; + if(enc->coded_frame && enc->coded_frame->pts != (int64_t) AV_NOPTS_VALUE) + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + if (!WriteFrame(s, &pkt, ost->st->codec, ost->bitstream_filters)) + return false; + +@@ -2704,7 +2601,7 @@ + bool wxFfmpegMediaTranscoder::DoVideoOut(AVFormatContext *s, AVOutputStream *ost, + AVInputStream *ist, AVFrame *in_picture, int *frame_size, + int bit_buffer_size, uint8_t* bit_buffer) { +- int nb_frames, i, ret, av_unused resample_changed; ++ int nb_frames, i, ret; + AVFrame *final_picture, *formatted_picture; + AVCodecContext *enc, *dec; + double sync_ipts; +@@ -2787,15 +2684,13 @@ + // handles sameq here. This is not correct because it may not be a global option + big_picture.quality = same_quality ? (int) ist->st->quality : (int) ost->st->quality; + if (!me_threshold) +- big_picture.pict_type = 0; +-// big_picture.pts = AV_NOPTS_VALUE; ++ big_picture.pict_type = (AVPictureType) 0; + big_picture.pts= ost->sync_opts; +-// big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den); +-// if (ost->forced_kf_index < ost->forced_kf_count && +-// big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) { +-// big_picture.pict_type = AV_PICTURE_TYPE_I; +-// ost->forced_kf_index++; +-// } ++ if (ost->forced_kf_index < ost->forced_kf_count && ++ big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) { ++ big_picture.pict_type = AV_PICTURE_TYPE_I; ++ ost->forced_kf_index++; ++ } + ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, &big_picture); + if (ret < 0) { + wxLogError(wxT("Video encoding failed")); +@@ -2806,17 +2701,12 @@ + pkt.size= ret; + if(enc->coded_frame->pts != (int64_t) AV_NOPTS_VALUE) + pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); +- //av_log(NULL, AV_LOG_DEBUG, "encoder -> %"PRId64"/%"PRId64"\n", +- //pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1, +- //pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1); +- ++ + if(enc->coded_frame->key_frame) + pkt.flags |= AV_PKT_FLAG_KEY; + WriteFrame(s, &pkt, ost->st->codec, ost->bitstream_filters); + *frame_size = ret; + video_size += ret; +- //wxLogError(wxT("Frame: %3d size: %5d type: %d"), +- // enc->frame_number-1, ret, enc->pict_type); + // if two pass, output log + if (ost->logfile && enc->stats_out) { + fprintf(ost->logfile, "%s", enc->stats_out); +@@ -2896,7 +2786,8 @@ + int64_t total_size; + AVCodecContext *enc; + int frame_number, vid, i; +- double bitrate, ti1, pts; ++ double bitrate; ++ int64_t pts = INT64_MAX; + static int64_t last_time = -1; + static int qp_histogram[52]; + +@@ -2920,11 +2811,13 @@ + total_size= avio_tell(oc->pb); + + wxString msg; +- ti1 = 1e10; + vid = 0; + for (i=0; i<nb_ostreams; i++) { ++ float q = -1; + ost = ost_table[i]; + enc = ost->st->codec; ++ if (!ost->st->stream_copy && enc->coded_frame) ++ q = enc->coded_frame->quality/(float)FF_QP2LAMBDA; + if (vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) { + msg += wxString::Format(wxT("q=%2.1f "), + !ost->st->stream_copy ? enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1); +@@ -2940,7 +2833,7 @@ + msg += wxString::Format(wxT("L")); + if (qp_hist) { + int j; +- int qp = (int) rint(enc->coded_frame->quality/(float)FF_QP2LAMBDA); ++ int qp = lrintf(q); + if (qp>=0 && qp < (int) (FF_ARRAY_ELEMS(qp_histogram))) + qp_histogram[qp]++; + for (j=0; j<32; j++) +@@ -2971,18 +2864,22 @@ + vid = 1; + } + // compute min output value +- pts = (double)ost->st->pts.val * av_q2d(ost->st->time_base); +- if ((pts < ti1) && (pts > 0)) +- ti1 = pts; ++ pts = FFMIN(pts, av_rescale_q(ost->st->pts.val, ost->st->time_base, AV_TIME_BASE_Q)); + } +- if (ti1 < 0.01) +- ti1 = 0.01; + + if (verbose || is_last_report) { +- bitrate = (double)(total_size * 8) / ti1 / 1000.0; ++ int hours, mins, secs, us; ++ secs = pts / AV_TIME_BASE; ++ us = pts % AV_TIME_BASE; ++ mins = secs / 60; ++ secs %= 60; ++ hours = mins / 60; ++ mins %= 60; ++ ++ bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0; + +- msg += wxString::Format(wxT("size=%8.0fkB time=%0.2f bitrate=%6.1fkbits/s"), +- (double)total_size / 1024, ti1, bitrate); ++ msg += wxString::Format(wxT("size=%8.0fkB time=%02d:%02d:%02d.%02d bitrate=%6.1fkbits/s"), ++ (double) total_size / 1024, hours, mins, secs, (100 * us) / AV_TIME_BASE, bitrate); + + if (nb_frames_dup || nb_frames_drop) + msg += wxString::Format(wxT(" dup=%d drop=%d"), nb_frames_dup, nb_frames_drop); +@@ -3013,10 +2910,9 @@ + } + nb_output_files = 0; + for (int i=0; i<nb_input_files; i++) { +- av_close_input_file(input_files[i]); ++ av_close_input_file(input_files[i].ctx); + av_free(input_files_ts_scale[i]); + } +- nb_input_files = 0; + + av_freep(&intra_matrix); + av_freep(&inter_matrix); +@@ -3025,11 +2921,14 @@ + fclose(vstats_file); + av_freep(&vstats_filename); + +- av_freep(&output_codecs); +- nb_output_codecs = 0; + av_freep(&stream_maps); + nb_stream_maps = 0; + ++ av_freep(&input_streams); ++ nb_input_streams = 0; ++ av_freep(&input_files); ++ nb_input_files = 0; ++ + av_freep(&video_standard); + av_freep(&audio_buf); + av_freep(&audio_out); +diff -Naur DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.h DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.h +--- DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.h 2011-05-15 09:23:34.000000000 -0400 ++++ DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.h 2011-09-18 18:13:29.000000000 -0400 +@@ -3,7 +3,7 @@ + // Purpose: FFMPEG Media Transcoder + // Author: Alex Thuering + // Created: 26.04.2008 +-// RCS-ID: $Id: mediatrc_ffmpeg.h,v 1.19 2011/05/15 13:23:34 ntalex Exp $ ++// RCS-ID: $Id: mediatrc_ffmpeg.h,v 1.20 2011/07/24 07:58:21 ntalex Exp $ + // Copyright: (c) Alex Thuering + // Licence: GPL + ///////////////////////////////////////////////////////////////////////////// +@@ -20,13 +20,8 @@ + extern "C" { + #define __STDC_CONSTANT_MACROS + #define __STDC_LIMIT_MACROS +-#ifdef HAVE_FFMPEG_AVUTIL_H +-#include <avformat.h> +-#include <swscale.h> +-#else + #include <libavformat/avformat.h> + #include <libswscale/swscale.h> +-#endif + } + + // select an input stream for an output stream +@@ -39,8 +34,9 @@ + + // select an input file for an output file + typedef struct AVMetaDataMap { +- int out_file; +- int in_file; ++ int file; //< file index ++ char type; //< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram ++ int index; //< stream/chapter/program number + } AVMetaDataMap; + + typedef struct AVChapterMap { +@@ -50,6 +46,8 @@ + + struct AVInputStream; + struct AVOutputStream; ++struct AVDictionary; ++struct AVInputFile; + + #define MAX_FILES 50 + #define MAX_STREAMS_ 20 +@@ -108,21 +106,20 @@ + void PrintReport(AVFormatContext **output_files, AVOutputStream **ost_table, + int nb_ostreams, int is_last_report); + int CopyChapters(int infile, int outfile); +- AVFormatContext *input_files[MAX_FILES]; +- int nb_input_files; + int64_t input_files_ts_offset[MAX_FILES]; + double* input_files_ts_scale[MAX_FILES]; + int nb_input_files_ts_scale[MAX_FILES]; ++ ++ AVCodec **input_codecs; ++ int nb_input_codecs; + + AVFormatContext* output_files[MAX_FILES]; +- AVCodec** output_codecs; + int nb_output_files; +- int nb_output_codecs; + + AVStreamMap* stream_maps; + int nb_stream_maps; + +- AVMetaDataMap meta_data_maps[MAX_FILES]; ++ AVMetaDataMap (*meta_data_maps)[2]; + int nb_meta_data_maps; + int metadata_global_autocopy; + int metadata_streams_autocopy; +@@ -134,7 +131,6 @@ + int frame_width; + int frame_height; + float frame_aspect_ratio; +- int frame_aspect_ratio_override; + PixelFormat frame_pix_fmt; + int frame_bits_per_raw_sample; + SampleFormat audio_sample_fmt; +@@ -163,10 +159,10 @@ + int audio_channels; + unsigned int audio_codec_tag; + char *audio_language; +- ++ + char *subtitle_language; + unsigned int subtitle_codec_tag; +- ++ + float mux_preload; + float mux_max_delay; + +@@ -174,7 +170,7 @@ + int64_t start_time; + int64_t recording_timestamp; + int64_t input_ts_offset; +- AVMetadata* metadata; ++ AVDictionary *metadata; + int do_psnr; + int do_pass; + const char *pass_logfilename_prefix; +@@ -182,8 +178,8 @@ + int audio_sync_method; + float audio_drift_threshold; + int copy_ts; +- int opt_shortest; // +- int video_global_header; ++ int copy_tb; ++ int opt_shortest; + char *vstats_filename; + FILE *vstats_file; + int opt_programid; +@@ -222,6 +218,12 @@ + AVBitStreamFilterContext *video_bitstream_filters; + AVBitStreamFilterContext *audio_bitstream_filters; + AVBitStreamFilterContext *subtitle_bitstream_filters; ++ ++ AVInputStream *input_streams; ++ int nb_input_streams; ++ AVInputFile *input_files; ++ int nb_input_files; ++ + AVOutputStream** output_streams_for_file[MAX_FILES]; + int nb_output_streams_for_file[MAX_FILES]; + }; diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD index cf8bfe705..5fab60f2a 100755 --- a/community/emesene/PKGBUILD +++ b/community/emesene/PKGBUILD @@ -1,23 +1,21 @@ -# $Id: PKGBUILD 53195 2011-07-31 21:48:19Z rvanharen $ +# $Id: PKGBUILD 55723 2011-09-18 07:15:35Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Claudio Riva <firetux83@gmail.com> pkgname=emesene pkgver=2.11.7 -pkgrel=1 +pkgrel=2 pkgdesc="A pygtk MSN Messenger client" url="http://www.emesene.org/" license=('custom:PSF' 'GPL' 'LGPL2.1') arch=('i686' 'x86_64' 'mips64el') # libmimic is hardcoded, so no 'any' package -#depends=('python2' 'pygtk' 'hicolor-icon-theme' 'xdg-utils') depends=('python2' 'pygtk' 'python-dnspython' 'pylint' 'python-notify' 'openssl' \ -'papyon' 'python-imaging' 'dbus-python' 'xdg-utils' 'hicolor-icon-theme') +'papyon' 'python-imaging' 'dbus-python' 'xdg-utils' 'hicolor-icon-theme' \ +'gstreamer0.10-python' 'gstreamer0.10-good') makedepends=('python2-distribute') optdepends=('gnome-python-extras: spell-check plugin' 'gtkspell: spell-check plugin' - 'aspell: spell-check plugin (also need aspell dictionary)' - 'gstreamer0.10-python: webcam support' - 'gstreamer0.10-good-plugins: webcam support' + 'farsight2: webcam support' 'pywebkitgtk: for alternative conversation window' 'xmpppy: for gtalk and facebook chat support' 'pyqt: alternative qt4 interface (emesene -e main:qt4_main') diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index 8c85b1c70..c629faea3 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=fb-client -pkgver=0.8.1 +pkgver=0.9 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') @@ -9,7 +9,7 @@ license=('GPL3') depends=('curl') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz) -md5sums=('be2ecf1ffd02048d48a54083320e0445') +md5sums=('51d65d794e9bad66e06e252f90ce92fb') build() { cd "$srcdir/fb-$pkgver" diff --git a/community/fdm/PKGBUILD b/community/fdm/PKGBUILD index 92003baa9..bf8c6bad6 100644 --- a/community/fdm/PKGBUILD +++ b/community/fdm/PKGBUILD @@ -1,39 +1,33 @@ -# $Id: PKGBUILD 14180 2010-04-01 23:59:34Z andrea $ -# Maintainer: +# $Id: PKGBUILD 55396 2011-09-11 20:59:09Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Grigorios Bouzakis <grbzks@gmail.com> pkgname=fdm pkgver=1.6 -pkgrel=2 -pkgdesc="A program to fetch and deliver mail" -arch=('i686' 'x86_64' 'mips64el') -url="http://fdm.sourceforge.net" +pkgrel=3 +pkgdesc='Program to fetch and deliver mail' +url='http://fdm.sourceforge.net/' license=('BSD') -depends=('openssl' 'tdb') +arch=('i686' 'x86_64' 'mips64el') options=('!makeflags') -source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" - 'GNUmakefile.patch' - 'LICENSE') -md5sums=('b2b9bfe95217b290142bde1621eb9a37' - '52955d31121a6365914a0d063be5b32b' - 'b0043d5c7160e5f797048d0d584ef4fa') +depends=('openssl' 'tdb' 'zlib') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'GNUmakefile.patch') +sha1sums=('fb8042f2355062848ff142c9604069b6657e6a82' + '0bddf0b0403ccee62190355f43fae84932c37436') build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i $srcdir/GNUmakefile.patch || return 1 - - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../GNUmakefile.patch + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -D -m 644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install -# Examples - mkdir -p "$pkgdir/usr/share/doc/$pkgname/examples" - mv "$srcdir/$pkgname-$pkgver/examples" "$pkgdir/usr/share/doc/$pkgname/" + install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}" + sed '3,17p;d' fdm.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + mv examples "${pkgdir}/usr/share/doc/${pkgname}" } diff --git a/community/fftw2/PKGBUILD b/community/fftw2/PKGBUILD index c56fa49b5..2980711e9 100644 --- a/community/fftw2/PKGBUILD +++ b/community/fftw2/PKGBUILD @@ -1,34 +1,52 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 55583 2011-09-14 11:20:19Z andrea $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: damir <damir@archlinux.org> pkgname=fftw2 pkgver=2.1.5 -pkgrel=4 -pkgdesc="FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. This is package is offering backwards compatibility version 2.x.y. of fftw." -arch=(i686 x86_64 'mips64el') +pkgrel=5 +pkgdesc="A C subroutine library for computing the discrete Fourier transform (DFT)" +arch=('i686' 'x86_64' 'mips64el') url="http://www.fftw.org/" license=('GPL2') depends=('glibc') -options=(!libtool) -source=(http://www.fftw.org/fftw-${pkgver}.tar.gz) +makedepends=('gcc-fortran') +options=('!libtool') +source=("http://www.fftw.org/fftw-${pkgver}.tar.gz") md5sums=('8d16a84f3ca02a785ef9eb36249ba433') build() { - cd ${startdir}/src/fftw-${pkgver} - # build + install double precision + cd "${srcdir}" + + cp -r fftw-${pkgver} fftw-${pkgver}-double + + # build single precision + cd fftw-${pkgver} ./configure F77=gfortran --prefix=/usr \ - --enable-type-prefix --enable-shared \ - --enable-threads - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + --enable-float \ + --enable-type-prefix \ + --enable-shared \ + --enable-threads \ + --infodir=/usr/share/info + make + cd ../ - make clean - - # build + install single precision + # build double precision + cd fftw-${pkgver}-double ./configure F77=gfortran --prefix=/usr \ - --enable-float --enable-type-prefix --enable-shared \ - --enable-threads - make || return 1 - #make prefix=$startdir/pkg/usr install || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + --enable-type-prefix \ + --enable-shared \ + --enable-threads \ + --infodir=/usr/share/info + make +} + +package() { + # install single precision + cd "${srcdir}"/fftw-${pkgver} + make DESTDIR="${pkgdir}" install + + # install double precision + cd "${srcdir}"/fftw-${pkgver}-double + make DESTDIR="${pkgdir}" install } diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD index 7bb30a8f8..c8380c111 100644 --- a/community/flumotion/PKGBUILD +++ b/community/flumotion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47404 2011-05-22 20:37:23Z tdziedzic $ +# $Id: PKGBUILD 55283 2011-09-08 19:32:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: William Rea <sillywilly@gmail.com> pkgname=flumotion -pkgver=0.8.1 +pkgver=0.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A streaming media server" @@ -17,7 +17,7 @@ depends=('gtk2' 'pygtk' 'gstreamer0.10-python' 'kiwi' 'gstreamer0.10-good-plugin 'gstreamer0.10-base-plugins' 'python2-pyopenssl' 'twisted' 'gnome-vfs') makedepends=('perlxml') source=(http://www.flumotion.net/src/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('8970bb126a1720ae3f0b2d02924e5700') +md5sums=('b2fa7c2e7ce8e2a5415f9096bfce783b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index fb328837a..1864ac9ee 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=fotoxx pkgver=11.09 -pkgrel=1 +pkgrel=2 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/fotoxx" arch=('i686' 'x86_64' 'mips64el') @@ -9,7 +9,7 @@ license=('GPL3') depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils') optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('dd851af4ce6e9d900fbf0afd65270ae8') +md5sums=('7001aec08a6291abf1c7c480b79cc38f') install=fotoxx.install build() { diff --git a/community/glpng/PKGBUILD b/community/glpng/PKGBUILD index a9b9ebc97..d1fe5160f 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' 'mips64el') 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/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD index f006adc7d..ab098bb45 100644 --- a/community/gmerlin-avdecoder/PKGBUILD +++ b/community/gmerlin-avdecoder/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43369 2011-03-25 11:34:14Z mherych $ +# $Id: PKGBUILD 55358 2011-09-10 10:55:52Z pschmitz $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin-avdecoder pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Media decoding library" arch=('i686' 'x86_64' 'mips64el') url="http://gmerlin.sourceforge.net/avdec_frame.html" @@ -17,6 +17,10 @@ build() { cd "$srcdir/$pkgname-$pkgver" rm -f cpuinfo.sh ./configure --prefix=/usr --without-doxygen - make || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/community/gnucap/PKGBUILD b/community/gnucap/PKGBUILD index 622cf5e2d..7c92073d1 100644 --- a/community/gnucap/PKGBUILD +++ b/community/gnucap/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 6388 2009-12-09 17:45:13Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 55492 2011-09-13 05:23:39Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jared Casper <jaredcasper@gmail.com> # Contributor: Georgij Kondratjev <smpuj@bk.ru> pkgname=gnucap pkgver=20091207 _pkgver=2009-12-07 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Circuit Analysis Package" arch=('i686' 'x86_64' 'mips64el') url="http://gnucap.org/" license=('GPL') depends=('gcc-libs' 'readline') source=(http://gnucap.org/devel/$pkgname-$_pkgver.tar.gz) -md5sums=('30701d110a3e642c5826358c64d2fb1b') +sha1sums=('a64be626b3e971437d677f14bc72eda0df6e7e3a') build() { cd "$srcdir/$pkgname-$_pkgver" ./configure --prefix=/usr - make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$_pkgver" + + make make DESTDIR="$pkgdir" install } diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index c85dccd6c..af507e693 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Christian Himpel <chressie at gmail dot com> pkgname=go -pkgver=r59 +pkgver=r60 pkgrel=1 epoch=1 pkgdesc='Google Go compiler and tools (release version)' @@ -83,6 +83,10 @@ package() { install -Dm644 src/Make.* $pkgdir/usr/lib/go/src + # remove object files from target src dir + find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete + find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete + # Headers for C modules install -Dm644 src/pkg/runtime/runtime.h $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h install -Dm644 src/pkg/runtime/cgocall.h $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index 0165c0769..d5c09a1f6 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -5,18 +5,20 @@ pkgname=gpac pkgver=0.4.5 -pkgrel=7 +pkgrel=8 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64' 'mips64el') url="http://gpac.sourceforge.net" -depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'js' 'libmad' \ +depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'libmad' 'faad2' 'xvidcore' 'ffmpeg' 'freeglut') +# 'js' license=('LGPL') options=('!makeflags') # Multiple build jobs aren't handled correctly source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - libpng14-infopp-null.patch) + libpng14-infopp-null.patch openjpeg14.patch) md5sums=('755e8c438a48ebdb13525dd491f5b0d1' - '14d6483c9eb84434aea68596f243e0ca') + '14d6483c9eb84434aea68596f243e0ca' + '1605fc11bd49b9c8220820bb38912021') build() { cd ${srcdir}/${pkgname} @@ -29,13 +31,14 @@ build() { #FS#14506 sed -i 's#lib64#lib#g' configure patch -Np1 -i ${srcdir}/libpng14-infopp-null.patch + patch -Np1 -i ${srcdir}/openjpeg14.patch # Was getting "symbol lookup error: /usr/lib/gpac/gm_x11_out.so: undefined # symbol: XvQueryExtension" with our LDFLAGS :\ - unset LDFLAGS + export LDFLAGS=${LDFLAGS/,--as-needed/} ./configure --prefix=/usr --mandir=/usr/share/man --use-js=no - make + make } package() { diff --git a/community/gpac/openjpeg14.patch b/community/gpac/openjpeg14.patch new file mode 100644 index 000000000..68a625eeb --- /dev/null +++ b/community/gpac/openjpeg14.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/show_bug.cgi?id=361359 + +Index: gpac/modules/img_in/jp2_dec.c +=================================================================== +--- gpac.orig/modules/img_in/jp2_dec.c ++++ gpac/modules/img_in/jp2_dec.c +@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe + return GF_OK; + } + ++char opj_version_buffer[500]; ++ + static const char *JP2_GetCodecName(GF_BaseDecoder *dec) + { ++#ifndef OPENJPEG_VERSION ++ snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version()); ++ return opj_version_buffer; ++#else + return "OpenJPEG "OPENJPEG_VERSION ; ++#endif + } + + diff --git a/community/gsynaptics/PKGBUILD b/community/gsynaptics/PKGBUILD index 72836f89c..78919e90e 100644 --- a/community/gsynaptics/PKGBUILD +++ b/community/gsynaptics/PKGBUILD @@ -1,32 +1,36 @@ -# $Id: PKGBUILD 248 2009-07-21 09:55:45Z spupykin $ +# $Id: PKGBUILD 55543 2011-09-14 08:26:19Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=gsynaptics pkgver=0.9.16 -pkgrel=1 +pkgrel=2 pkgdesc="A settings tool for Synaptics touchpad driver" -arch=(i686 x86_64 'mips64el') -url="http://gsynaptics.sourceforge.jp" -license=("GPL") +arch=('i686' 'x86_64' 'mips64el') +url="http://gsynaptics.sourceforge.jp/" +license=('GPL') depends=('libgnomeui' 'synaptics') makedepends=('intltool' 'gettext' 'gnome-doc-utils') install=$pkgname.install -source=(http://globalbase.dl.sourceforge.jp/gsynaptics/38463/gsynaptics-$pkgver.tar.gz \ - do-not-set-zero.dpatch \ - dot-fixes.dpatch \ - build-filename.dpatch) +source=("http://sourceforge.jp/frs/redir.php?m=iij&f=/${pkgname}/38463/${pkgname}-${pkgver}.tar.gz" + do-not-set-zero.dpatch + dot-fixes.dpatch + build-filename.dpatch) md5sums=('571828ddca2f1d9d6ea47e072db1959d' 'd6308d93fd4d04c686ba24422ed99905' '4c35d5d0803296233d50146963a0bcbc' - '11011a651f143103614fb69dd5aa77a1') + 'd227a70304bef3cc0272b37c5e322463') build() { - cd $startdir/src/gsynaptics-$pkgver - patch -p1 <$srcdir/dot-fixes.dpatch - patch -p1 <$srcdir/do-not-set-zero.dpatch - patch -p1 <$srcdir/build-filename.dpatch + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/dot-fixes.dpatch + patch -p1 -i "${srcdir}"/do-not-set-zero.dpatch + patch -p1 -i "${srcdir}"/build-filename.dpatch ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/community/gsynaptics/build-filename.dpatch b/community/gsynaptics/build-filename.dpatch index c48689533..404e6fab7 100644 --- a/community/gsynaptics/build-filename.dpatch +++ b/community/gsynaptics/build-filename.dpatch @@ -13,7 +13,7 @@ diff -urNad gsynaptics-0.9.14~/src/main.c gsynaptics-0.9.14/src/main.c gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1); -- path = g_build_filename (DATADIR "/pixmaps", "touchpad.png"); +- path = g_build_filename (DATADIR "/pixmaps", "touchpad.png", NULL); + path = g_build_filename (DATADIR, "pixmaps", "touchpad.png", NULL); if (path) { diff --git a/community/gsynaptics/gsynaptics.install b/community/gsynaptics/gsynaptics.install index a0f279ee6..5b505b7b3 100644 --- a/community/gsynaptics/gsynaptics.install +++ b/community/gsynaptics/gsynaptics.install @@ -10,7 +10,3 @@ cat << EOF >>> EOF } - -op=$1 -shift -$op $* diff --git a/community/gtk-rezlooks-engine/PKGBUILD b/community/gtk-rezlooks-engine/PKGBUILD index 5e64774d9..7cc9ab312 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' 'mips64el') -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/hacburn/PKGBUILD b/community/hacburn/PKGBUILD index 7bd74bea7..42d7a1eb0 100644 --- a/community/hacburn/PKGBUILD +++ b/community/hacburn/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 7841 2010-01-11 23:20:21Z dgriffiths $ +# $Id: PKGBUILD 55602 2011-09-14 23:25:07Z dreisner $ # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org pkgname=hacburn pkgver=0.3.5 -pkgrel=3.1 +pkgrel=4 pkgdesc="HacBurn is a script written in perl to aid in writing CDs. It is a graphical interface (using gtk+) to cdrtools, mpg321 and ogg123." arch=('i686' 'x86_64' 'mips64el') url="http://hacburn.sourceforge.net/" license=('GPL') -depends=('gtk2-perl' 'glib-perl' 'cdrtools' 'mpg321' 'vorbis-tools' 'gtk2' 'xorg-server' 'perl' 'cddb_get' 'lame') +depends=('gtk2-perl' 'glib-perl' 'cdrkit' 'mpg321' 'vorbis-tools' 'gtk2' 'xorg-server' 'perl' 'cddb_get' 'lame') conflicts=('hacburn-cvs') source=(http://downloads.sourceforge.net/sourceforge/hacburn/HacBurn-$pkgver.tar.bz2) md5sums=('1e4b3e4b49de58259a446b7752f59f22') diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD new file mode 100644 index 000000000..2ee9c0cb4 --- /dev/null +++ b/community/haskell-bytestring-show/PKGBUILD @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-bytestring-show +pkgver=0.3.5 +pkgrel=1 +pkgdesc="Efficient conversion of values into readable byte strings." +url="http://code.haskell.org/~dolio/" +license=("BSD3") +arch=('i686' 'x86_64') +makedepends=() +depends=("ghc=7.0.3" + "haskell-array=0.3.0.2" + "haskell-binary=0.5.0.2" + "haskell-bytestring=0.9.1.10" + "haskell-containers=0.4.0.0") +options=('strip') +install="${pkgname}.install" +source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") +md5sums=('934edba94aeceef6e9fc1b174d4f94ea') + +build() { + cd ${srcdir}/bytestring-show-${pkgver} + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/bytestring-show-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/bytestring-show + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-bytestring-show/haskell-bytestring-show.install b/community/haskell-bytestring-show/haskell-bytestring-show.install new file mode 100644 index 000000000..335fc37cd --- /dev/null +++ b/community/haskell-bytestring-show/haskell-bytestring-show.install @@ -0,0 +1,24 @@ +pkgname=haskell-bytestring-show +HS_DIR=usr/share/haskell/${pkgname} + +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index c1c3d89c2..05f16c13a 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 36219 2010-12-28 10:43:33Z spupykin $ +# $Id: PKGBUILD 55746 2011-09-18 23:20:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars -pkgver=0.9.15 -pkgrel=1 +pkgver=0.9.16 +pkgrel=2 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" @@ -11,23 +11,28 @@ license=('GPL' 'custom') depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua') makedepends=('fpc' 'cmake' 'ghc' 'haskell-utf8-string' 'haskell-dataenc' 'haskell-network' - 'haskell-hslogger') + 'haskell-hslogger' 'haskell-bytestring-show' 'haskell-deepseq') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png) -md5sums=('a7d5e9082d3377dba573b7fee4bc833d' +md5sums=('04f28f454e370a101cbf0d82c6d39bce' '48c66a3204d4fa0a69e9aa46f7c31e0c' 'eeb14d50df39063549ac5eca9dbc65d1') build() { cd $srcdir/$pkgname-src-$pkgver +# sed -i 's|.*misc/liblua.*||' CMakeLists.txt cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATA_INSTALL_DIR=/usr/share \ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ -DQT_MOC_EXECUTABLE=/usr/bin/moc \ - -DWITH_SERVER=1 + -DWITH_SERVER=1 . make +} + +package() { + cd $srcdir/$pkgname-src-$pkgver make DESTDIR=$pkgdir install install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png diff --git a/community/httptunnel/PKGBUILD b/community/httptunnel/PKGBUILD index 2bc4b6049..1d923e6de 100644 --- a/community/httptunnel/PKGBUILD +++ b/community/httptunnel/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 31032 2009-03-24 04:10:30Z eric $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 55529 2011-09-14 07:38:23Z andrea $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=httptunnel pkgver=3.3 -pkgrel=2 -pkgdesc="httptunnel creates a bidirectional virtual data connection tunnelled in HTTP requests" -arch=(i686 x86_64 'mips64el') +pkgrel=3 +pkgdesc="Creates a bidirectional virtual data connection tunnelled in HTTP requests" +arch=('i686' 'x86_64' 'mips64el') url="http://www.nocrew.org/software/httptunnel" license=('GPL2') depends=('glibc') -source=(http://www.nocrew.org/software/httptunnel/$pkgname-$pkgver.tar.gz) +source=("http://www.nocrew.org/software/${pkgname}/$pkgname-$pkgver.tar.gz") md5sums=('493cc0f5f21e9955db27ee9cd9a976d5') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + cd "${srcdir}"/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install } diff --git a/community/id3lib-rcc/PKGBUILD b/community/id3lib-rcc/PKGBUILD index c29530594..c31ea657a 100644 --- a/community/id3lib-rcc/PKGBUILD +++ b/community/id3lib-rcc/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 2097 2009-09-08 15:34:53Z spupykin $ +# $Id: PKGBUILD 55559 2011-09-14 10:08:38Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=id3lib-rcc pkgver=3.8.3 -pkgrel=6 +pkgrel=7 pkgdesc="id3lib with librcc patch" arch=('i686' 'x86_64' 'mips64el') url="http://id3lib.sourceforge.net/" license=('GPL') -depends=(libxml2 db librcc zlib) -makedepends=(patch) -provides=(id3lib) -conflicts=(id3lib) +depends=('libxml2' 'librcc' 'gcc-libs') +provides=('id3lib') +conflicts=('id3lib') options=('!libtool') -source=(http://downloads.sourceforge.net/id3lib/id3lib-$pkgver.tar.gz \ - http://downloads.sourceforge.net/rusxmms/id3lib-csa2.tar.bz2 \ +source=(http://downloads.sourceforge.net/id3lib/id3lib-$pkgver.tar.gz + http://downloads.sourceforge.net/rusxmms/id3lib-csa2.tar.bz2 arch.patch id3lib-gcc4.patch) md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' @@ -24,16 +22,22 @@ md5sums=('19f27ddd2dda4b2d26a559a4f0f402a7' '94191cf1fe6f5fd391d95a6de81a48b9') build() { - cd $startdir/src/id3lib-$pkgver + cd "${srcdir}"/id3lib-$pkgver - patch -Np1 <../id3lib/id3lib-ds-rcc.patch - patch -Np1 <$srcdir/id3lib-gcc4.patch - (cd src && patch -Np0 <../../arch.patch) + patch -Np1 -i "${srcdir}"/id3lib/id3lib-ds-rcc.patch + patch -Np1 -i "${srcdir}"/id3lib-gcc4.patch + cd src + patch -Np0 -i "${srcdir}"/arch.patch + cd .. sed -i 's#iomanip.h##' configure sed -i 's|size_t size_t, size_t \*size_t|size_t s1, size_t *s2|' src/rccpatch.h - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr - make LDFLAGS=-lrcc || return 1 - make DESTDIR=$startdir/pkg install + ./configure --prefix=/usr + make LDFLAGS=-lrcc +} + +package() { + cd "${srcdir}"/id3lib-$pkgver + make DESTDIR="${pkgdir}" install } diff --git a/community/iksemel/PKGBUILD b/community/iksemel/PKGBUILD index 8df14e265..eab6eb7bf 100644 --- a/community/iksemel/PKGBUILD +++ b/community/iksemel/PKGBUILD @@ -1,26 +1,31 @@ -# $Id: PKGBUILD 1020 2009-08-11 22:19:38Z mherych $ -# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# $Id: PKGBUILD 55571 2011-09-14 10:35:20Z andrea $ # Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributos: Guillermo Vaya driadan@willinux.net +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: Guillermo Vaya driadan@willinux.net pkgname=iksemel pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="XML parser library for Jabber applications in ANSI C" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/iksemel/" license=('LGPL') -depends=('gnutls') -source=(http://iksemel.googlecode.com/files/iksemel-$pkgver.tar.gz) +depends=('glibc') +install=iksemel.install +source=("http://iksemel.googlecode.com/files/${pkgname}-$pkgver.tar.gz") md5sums=('532e77181694f87ad5eb59435d11c1ca') options=('!libtool') build() { - cd $startdir/src/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr \ --infodir=/usr/share/info - make || return 1 - make DESTDIR=$startdir/pkg install - mv $pkgdir/usr/share/info/$pkgname $pkgdir/usr/share/info/$pkgname.info - rm -rf $pkgdir/usr/share/info/dir + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install + mv "${pkgdir}"/usr/share/info/$pkgname "${pkgdir}"/usr/share/info/$pkgname.info + rm -rf "${pkgdir}"/usr/share/info/dir } diff --git a/community/iksemel/iksemel.install b/community/iksemel/iksemel.install new file mode 100644 index 000000000..1cd1dbf31 --- /dev/null +++ b/community/iksemel/iksemel.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(iksemel.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $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 $infodir/dir 2> /dev/null + done +} diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD index 732a4eee7..1479b6c64 100644 --- a/community/incron/PKGBUILD +++ b/community/incron/PKGBUILD @@ -1,36 +1,40 @@ -# $Id: PKGBUILD 1515 2009-08-24 21:08:19Z spupykin $ +# $Id: PKGBUILD 55563 2011-09-14 10:20:14Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: scj <scj(at)archlinux(dot)us> + pkgname=incron pkgver=0.5.9 -pkgrel=1 +pkgrel=2 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods" arch=('i686' 'x86_64' 'mips64el') url="http://incron.aiken.cz/" -license=("GPL") -depends=('gcc-libs') +license=('GPL') +depends=('gcc-libs' 'bash') install=incron.install -source=(http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz \ - incron.init) -options=(emptydirs) +source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz" + 'incron.init') +options=('emptydirs') md5sums=('a285b9e14af7bf9f9524fe051a06255f' '648e1ca1a4b1e624401d9d71aa3756b3') build() { - cd $startdir/src/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - install -D -m 755 $startdir/incron.init $startdir/pkg/etc/rc.d/incrond - mkdir -p $startdir/pkg/usr/share/man $startdir/pkg/usr/bin $startdir/pkg/usr/sbin + install -D -m 755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond + install -d "${pkgdir}"/usr/share/man "${pkgdir}"/usr/{s,}bin sed -i '1,1i#include <stdio.h>' icd-main.cpp inotify-cxx.cpp usertable.cpp appargs.cpp sed -i 's|strchr(s,|(char*)strchr(s,|' incroncfg.cpp - make || return 1 + make +} - make PREFIX=$startdir/pkg/usr \ - MANPATH=$startdir/pkg/usr/share/man \ - USERDATADIR=$startdir/pkg/var/spool/incron \ - CFGDIR=$startdir/pkg/etc \ - SYSDATADIR=$startdir/pkg/etc/incron.d install +package() { + cd "${srcdir}"/$pkgname-$pkgver + make PREFIX="${pkgdir}"/usr \ + MANPATH="${pkgdir}"/usr/share/man \ + USERDATADIR="${pkgdir}"/var/spool/incron \ + CFGDIR="${pkgdir}"/etc \ + SYSDATADIR="${pkgdir}"/etc/incron.d install } diff --git a/community/incron/incron.install b/community/incron/incron.install index 3c4535b00..de4de3742 100644 --- a/community/incron/incron.install +++ b/community/incron/incron.install @@ -12,4 +12,3 @@ pre_remove() { usr/sbin/userdel incron >& /dev/null usr/sbin/groupdel incron >& /dev/null } - diff --git a/community/kcheckers/PKGBUILD b/community/kcheckers/PKGBUILD index e09a0644b..d0cd583ab 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' 'mips64el') 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/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 82d4d5977..27b2c395c 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 52254 2011-07-22 15:49:20Z spupykin $ +# $Id: PKGBUILD 55304 2011-09-09 16:08:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive pkgver=0.8svn20110722 -pkgrel=1 +pkgrel=2 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdenlive.org/" license=('GPL') -depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz') +depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' + 'libqzeitgeist') makedepends=('automoc4' 'cmake' 'gettext') install=kdenlive.install +options=('docs') #source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") source=("http://arch.p5n.pp.ru/~sergej/dl/kdenlive-${pkgver}.tar.bz2") md5sums=('390fcbce02274ee99b2a6d6a234bef0c') diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index 2d5839fda..298d6fff9 100644 --- a/community/kid3/PKGBUILD +++ b/community/kid3/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 40017 2011-02-19 14:10:28Z jlichtblau $ +# $Id: PKGBUILD 55325 2011-09-09 23:42:21Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgname=kid3 -pkgver=1.6 +pkgver=2.0 pkgrel=1 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://kid3.sourceforge.net/" license=('GPL') -depends=('id3lib' 'kdelibs' 'tunepimp') +depends=('id3lib' 'kdebase-runtime' 'kdelibs' 'tunepimp') makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl') options=('!makeflags') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('974208d5545a9a2bb192dc1a3cfaa64f2269d4f7001d150255ce3f3a3f6723c2') +sha256sums=('bdf4ff4f929d7ad6d5b0a6b2661e76ac83216ae94d84a7886f68011c3b7110cd') build() { cd ${srcdir} diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog index d3f588ba6..0d001bcb8 100644 --- a/community/kid3/kid3.changelog +++ b/community/kid3/kid3.changelog @@ -1,3 +1,6 @@ +2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kid3 2.0-1 + 2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kid3 1.6 diff --git a/community/kid3/kid3.install b/community/kid3/kid3.install index 1c0de2e4f..8ec315e7c 100644 --- a/community/kid3/kid3.install +++ b/community/kid3/kid3.install @@ -1,11 +1,12 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() { - post_install + post_install $1 } post_remove() { - post_install + post_install $1 } diff --git a/community/libconfig/PKGBUILD b/community/libconfig/PKGBUILD index 4f7be541c..aff83cb5a 100644 --- a/community/libconfig/PKGBUILD +++ b/community/libconfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 43902 2011-03-31 09:30:15Z spupykin $ +# $Id: PKGBUILD 55398 2011-09-11 21:17:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Roman Kyrylych <roman@archlinux.org> # Contributor: scippio <scippio@seznam.cz> pkgname=libconfig -pkgver=1.4.7 +pkgver=1.4.8 pkgrel=1 pkgdesc="C/C++ Configuration File Library" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('gcc-libs' 'texinfo') install=libconfig.install options=('!libtool' '!emptydirs' 'zipman') source=(http://www.hyperrealm.com/libconfig/$pkgname-$pkgver.tar.gz) -md5sums=('d57da7a91aadbfd53afedb5c1bade5f4') +md5sums=('36788da452e9fcfc8efb7661ef5d31ef') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index 8d35c0328..aee5da701 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 49787 2011-06-21 05:02:34Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 55487 2011-09-13 04:57:50Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached -pkgver=0.50 +pkgver=0.52 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glibc') makedepends=('perl') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('c8627014a37cd821cf93317b8de6f9f8') +sha1sums=('5219e261c84b8960676add5968a913a12caccd4a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 3bff14887..733993d0f 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' 'mips64el') 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/libnfnetlink/PKGBUILD b/community/libnfnetlink/PKGBUILD index 8764a93e1..1d984263b 100644 --- a/community/libnfnetlink/PKGBUILD +++ b/community/libnfnetlink/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 191 2009-07-20 09:12:55Z spupykin $ +# $Id: PKGBUILD 55539 2011-09-14 08:04:26Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> -# Maintainer: Filip Wojciechowski, filip at loka dot pl +# Contributor: Filip Wojciechowski, filip at loka dot pl + pkgname=libnfnetlink pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="low-level library for netfilter related kernel/userspace communication" -depends=(glibc) +arch=('i686' 'x86_64' 'mips64el') url="http://www.netfilter.org/projects/libnfnetlink/index.html" license=('GPL') -arch=('i686' 'x86_64' 'mips64el') +depends=('glibc') options=('!libtool') -source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) +source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") md5sums=('016fdec8389242615024c529acc1adb8') build() { - cd $startdir/src/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install } diff --git a/community/libopenraw/PKGBUILD b/community/libopenraw/PKGBUILD index 049c854d8..d57b1c719 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' 'mips64el') url="http://libopenraw.freedesktop.org" license=('LGPL') -arch=('i686' 'x86_64' 'mips64el') 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/libraw/PKGBUILD b/community/libraw/PKGBUILD index 9c63d6ad9..007389ad9 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52082 2011-07-20 03:04:09Z bfanella $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 55740 2011-09-18 19:52:04Z bfanella $ +# Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> +# Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=libraw _pkgbasename=LibRaw -pkgver=0.13.7 +pkgver=0.13.8 pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ license=('CDDL' 'LGPL' 'custom') depends=('lcms') options=('!makeflags') source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('5c189e16d61f423162da57333b7c8873') +md5sums=('62cd5fee94915add0c43a97ec6909bbb') build() { cd ${srcdir}/${_pkgbasename}-${pkgver} diff --git a/community/librep/PKGBUILD b/community/librep/PKGBUILD index 27c649644..676a6097f 100644 --- a/community/librep/PKGBUILD +++ b/community/librep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46413 2011-05-07 10:04:19Z shusmann $ +# $Id: PKGBUILD 55390 2011-09-11 18:27:38Z shusmann $ # Maintainer: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=librep -pkgver=0.92.0 +pkgver=0.92.1b pkgrel=1 pkgdesc="A Lisp system for UNIX" license=('GPL2') @@ -13,7 +13,7 @@ depends=('gmp' 'gdbm' 'libffi') install=${pkgname}.install options=('!emptydirs' '!libtool') source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('70f7b641cf3628443fea77a1191d9eb93a86d700') +sha1sums=('f75e1197646bbf1594fc4765802aab0bffe1bb02') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 359665564..53ab97d68 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54469 2011-08-18 15:07:52Z bluewind $ +# $Id: PKGBUILD 55591 2011-09-14 14:47:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.4 -pkgrel=2 +pkgrel=3 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -16,18 +16,13 @@ depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' makedepends=('pkgconfig' 'lvm2') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' - 'kernel26-ovz24: for openvz guests' 'kvm' - 'lxc' 'openbsd-netcat: for remote management over ssh' 'qemu' - 'user-mode-linux' - 'virtualbox_bin' - 'virtualbox-ose' - 'xen' 'radvd') options=('emptydirs' '!libtool') backup=('etc/conf.d/libvirtd' + 'etc/conf.d/libvirtd-guests' 'etc/libvirt/libvirtd.conf' 'etc/libvirt/qemu.conf' 'etc/sasl2/libvirt.conf') @@ -35,12 +30,16 @@ install="libvirt.install" source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.rc.d libvirtd.conf.d + libvirtd-guests.rc.d + libvirtd-guests.conf.d openbsd-netcat-default.patch unixperms.patch yajl-2.x.patch) md5sums=('86b411b11bd23d4af20611699f372af7' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' + '6f36bf189ef0e5847038787d13535420' + 'bc2971dacdbac967fc3474e50affc345' 'ee7052f3929d5d918236c646a59edebf' 'db95aecdf2ccf3693fef5821cdcb7eba' '5745bb8d0b254abb7a3528c66e03b0f9') @@ -74,8 +73,14 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd + + install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests + install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests + rm -rf $pkgdir/var/run } diff --git a/community/libvirt/libvirtd-guests.conf.d b/community/libvirt/libvirtd-guests.conf.d new file mode 100644 index 000000000..02a933715 --- /dev/null +++ b/community/libvirt/libvirtd-guests.conf.d @@ -0,0 +1,11 @@ +LIBVIRTD_STOP_ACTION=suspend + +#LIBVIRTD_URI="-c qemu+ssh://user@host/system" +LIBVIRTD_URI="" + +#LIBVIRTD_BYPASS_CACHE="--bypass-cache" +LIBVIRTD_BYPASS_CACHE="" + +LIBVIRTD_START_DELAY=0 + +LIBVIRTD_SHUTDOWN_TIMEOUT=3 diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d new file mode 100755 index 000000000..a97a8d9d1 --- /dev/null +++ b/community/libvirt/libvirtd-guests.rc.d @@ -0,0 +1,107 @@ +#!/bin/sh + +. /etc/conf.d/libvirtd-guests +. /etc/rc.conf +. /etc/rc.d/functions + +LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list" + +# get guest state by name +libvirt_get_guest_state() +{ + virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}' +} + +# list IDs of running guests +libvirt_list() +{ + virsh $LIBVIRTD_URI list | awk 'NR > 2 {print $2}' +} + +# suspend guest by name +libvirt_suspend() +{ + virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null + timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT + while [ "$timeout" -gt 0 ]; do + sleep 1 + timeout=$((timeout - 1)) + state=`libvirt_get_guest_state "$1"` + [ "x$state" == "xshut" ] && return 0 + done + return 1 +} + +# shutdown guest by name +libvirt_shutdown() +{ + virsh $LIBVIRTD_URI shutdown "$1" >/dev/null + timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT + while [ "$timeout" -gt 0 ]; do + sleep 1 + timeout=$((timeout - 1)) + state=`libvirt_get_guest_state "$1"` + [ "x$state" != "xshut" ] && return 0 + done + return 1 +} + +# start guest by name +libvirt_start() +{ + virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null +} + +# stop all guests +libvirt_stop_all() +{ + mkdir -p `dirname $LIBVIRTD_LISTFILE` + echo -n >$LIBVIRTD_LISTFILE + for i in `libvirt_list`; do + if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then + stat_busy "Suspending libvirtd/$i guest" + libvirt_suspend "$i" + else + stat_busy "Shutting libvirtd/$i guest down" + libvirt_shutdown "$i" + fi + [ $? -eq 0 ] && stat_done || stat_fail + echo $i >>$LIBVIRTD_LISTFILE + done +} + +# start all guests +libvirt_start_all() +{ + if [ -f $LIBVIRTD_LISTFILE ]; then + for i in `cat $LIBVIRTD_LISTFILE`; do + stat_busy "Starting/resuming libvirtd/$i guest" + libvirt_start "$i" + [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail + done + fi + rm -f $LIBVIRTD_LISTFILE +} + +# main +LC_ALL=C +LANG=C +case "$1" in + start) + libvirt_start_all + add_daemon libvirtd-guests + ;; + stop) + libvirt_stop_all + rm_daemon libvirtd-guests + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/community/libx86/PKGBUILD b/community/libx86/PKGBUILD index e47638dc9..99cd709f4 100644 --- a/community/libx86/PKGBUILD +++ b/community/libx86/PKGBUILD @@ -1,36 +1,41 @@ -# $Id: PKGBUILD 46956 2011-05-13 20:41:19Z andrea $ +# $Id: PKGBUILD 55525 2011-09-14 07:30:42Z andrea $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: tardo <tardo@nagi-fanboi.net> -# Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Thayer Williams <thayer@archlinux.org> pkgname=libx86 pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Provides an lrmi interface that works on x86, am64 and alpha" arch=('i686' 'x86_64' 'mips64el') url="http://www.codon.org.uk/~mjg59/libx86/" license=('custom') depends=('glibc') -source=(http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-$pkgver.tar.gz - libx86-ifmask.patch) +source=("http://www.codon.org.uk/~mjg59/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz" + 'libx86-ifmask.patch') md5sums=('41bee1f8e22b82d82b5f7d7ba51abc2a' '573897186eb8670d8d97c64ea7614001') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver # lrmi.c patch courtesy of Gentoo - patch -Np0 -i $srcdir/libx86-ifmask.patch || return 1 + patch -Np0 -i "${srcdir}"/libx86-ifmask.patch # compensate for x86_64 if [ "$CARCH" = "x86_64" ]; then - make BACKEND=x86emu || return 1 - else - make || return 1 + make BACKEND=x86emu + else + make fi +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 - chmod 644 $pkgdir/usr/lib/libx86.a || return 1 + make DESTDIR="${pkgdir}" install + chmod 644 "${pkgdir}"/usr/lib/libx86.a - install -D -m 644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT || return 1 + install -D -m 644 COPYRIGHT "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/listen/PKGBUILD b/community/listen/PKGBUILD index 5bb3f4313..ddfb63650 100644 --- a/community/listen/PKGBUILD +++ b/community/listen/PKGBUILD @@ -1,27 +1,29 @@ +# $Id: PKGBUILD 55644 2011-09-17 00:51:14Z ebelanger $ # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Hugo Doria <hugodoria@gmail.com> pkgname=listen pkgver=0.6.5 -pkgrel=7 +pkgrel=8 pkgdesc="Music player and management for GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://www.listen-project.org/" license=('GPL2') -depends=('python2-egg' 'python2-libgnome' 'mutagen' +depends=('python2-egg' 'python2-libgnome' 'mutagen' 'desktop-file-utils' 'gnome-icon-theme' 'gstreamer0.10-python' 'notification-daemon' 'pyxdg' - 'pywebkitgtk' 'pyinotify' 'gstreamer0.10-good-plugins' 'dbus-python') -makedepends=('gettext' 'pkgconfig' 'intltool' 'docbook2x' 'docbook-xml') + 'pywebkitgtk' 'python2-pyinotify' 'gstreamer0.10-good-plugins' 'dbus-python') +makedepends=('intltool' 'docbook2x' 'docbook-xml') optdepends=('python-musicbrainz2: musicbrainz & cd support' 'libgpod: iPod support' 'python-daap: DAAP support' 'tunepimp: tagging support') +install=listen.install source=("http://download.listen-project.org/0.6/${pkgname}-${pkgver}.tar.gz") md5sums=('76cd9ad2fc9c600dbdf4808c15aeccf1') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" chmod +x mmkeys/setup.py @@ -33,14 +35,15 @@ build() { -e 's/PYTHON = python$/\02/' \ Makefile sed -i 's/env python$/env python2/' mmkeys/setup.py + sed -i 's|/usr/bin/python|/usr/bin/python2|' src/listen make CHECK_DEPENDS=0 PREFIX=/usr } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} PREFIX=/usr install + make DESTDIR="${pkgdir}" PREFIX=/usr install } # vim:set ts=2 sw=2 et: diff --git a/community/listen/listen.install b/community/listen/listen.install new file mode 100644 index 000000000..5e5cfef4d --- /dev/null +++ b/community/listen/listen.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q +} diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD index ecbd70f5c..a1d5c6cc7 100644 --- a/community/mashup/PKGBUILD +++ b/community/mashup/PKGBUILD @@ -2,16 +2,16 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mashup -pkgver=3.0 +pkgver=3.1 pkgrel=1 pkgdesc="Adjusting images on a sheet of paper for printing" -url="http://kornelix.squarespace.com/printoxx" +url="http://kornelix.squarespace.com/$pkgname" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') depends=('gtk2') replaces=('printoxx') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('feb7f5557fce1a00c377d2c6b8a9e2fc') +md5sums=('f6a5afb0a5d410934cbbf4303b3b8a9b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index 12f6cda00..d7801d8d3 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' 'mips64el') @@ -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 afa7b309b..0dbf23cc8 100644 --- a/community/mms_client/PKGBUILD +++ b/community/mms_client/PKGBUILD @@ -1,28 +1,32 @@ +# $Id: PKGBUILD 55506 2011-09-13 21:16:22Z 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' 'mips64el') url="http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/" license=('GPL') -source=(http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/mms_client-0.0.3.tar.gz +depends=('glibc') +#source=(http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/mms_client-0.0.3.tar.gz +source=(http://web.archive.org/web/20071011022352/http://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/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index ecedf0b6e..0a3b38e91 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -3,37 +3,29 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=1.8.3 +pkgver=2.0.0 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' license=('AGPL3') -depends=('boost-libs' 'js' 'pcre') +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' - 'mongodb-1.8.0-spidermonkey-1.8.5-support.patch' - 'add-js185-support-to-SConstruct.diff') -md5sums=('662e7ad6ff9f8e4d16c72c038b4a0c60' - '85eaa28e349fdc6250f883624e624cca' - '4839fe1d638187ca3226e8267b947318' - '2e6409732fba887c9cfe81257b5260ad' - 'ca7e62be31389d951bfd8848b1675c1b') + 'mongodb.conf') +md5sums=('52763985c13e06d85bc125c7d3eb03d9' + '9c67e00f4626ad761a8f7d4e037a54d7' + '4839fe1d638187ca3226e8267b947318') build() { export SCONSFLAGS="$MAKEFLAGS" cd mongodb-src-r${pkgver} - # js185 support https://jira.mongodb.org/browse/SERVER-2887 - patch -Np1 -i ${srcdir}/mongodb-1.8.0-spidermonkey-1.8.5-support.patch - patch -Np0 -i ${srcdir}/add-js185-support-to-SConstruct.diff - scons \ all \ --full diff --git a/community/mongodb/mongodb.rc b/community/mongodb/mongodb.rc index 517258f63..30f2bbf79 100755 --- a/community/mongodb/mongodb.rc +++ b/community/mongodb/mongodb.rc @@ -4,7 +4,7 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof /usr/bin/mongod` +PID=$(pidof /usr/bin/mongod) case "$1" in start) stat_busy "Starting mongodb" @@ -18,7 +18,7 @@ case "$1" in ;; stop) stat_busy "Stopping mongodb" - [ ! -z "$PID" ] && kill $PID &> /dev/null + [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null if [ $? -gt 0 ]; then stat_fail else diff --git a/community/mpgtx/PKGBUILD b/community/mpgtx/PKGBUILD index a6226a4f4..594af5428 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' 'mips64el') 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/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index 7edbf65a6..80660733e 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,10 +1,12 @@ -# $Id: PKGBUILD 9274 2010-01-24 22:45:51Z foutrelis $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> +# $Id: PKGBUILD 55362 2011-09-10 10:56:06Z pschmitz $ +# Maintainer: +# Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> + pkgname=mtpaint pkgver=3.31 -pkgrel=4 +pkgrel=5 pkgdesc="A simple GTK2 painting program designed for creating icons and pixel based artwork." arch=('i686' 'x86_64' 'mips64el') url="http://mtpaint.sourceforge.net" @@ -16,10 +18,15 @@ md5sums=('fbe34eb25f96b6092403115f1f6ab387' 'f84245ae1e26bd734740306b09024bb8') build() { - cd "$srcdir/$pkgname-$pkgver" + cd ${srcdir}/${pkgname}-${pkgver} + + patch -Np1 -i ${srcdir}/libpng14.patch + ./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "$srcdir/libpng14.patch" || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff - make || return 1 - make DESTDIR=$pkgdir install + make DESTDIR=${pkgdir} install } diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index c53c16c38..35ef9ac83 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,10 +1,11 @@ +# $Id: PKGBUILD 55364 2011-09-10 10:56:13Z pschmitz $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Pierre-Paul Paquin <pierrepaulpaquin@gmail.com> # Contributor: xduugu (.desktop and install files) pkgname=mupdf -pkgver=0.8.165 +pkgver=0.9 pkgrel=1 pkgdesc="lightweight PDF viewer and toolkit written in portable C" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +14,7 @@ license=('GPL3') depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext') install=mupdf.install source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz") -md5sums=('a95813737924e60d87a944d52b6a5120') +md5sums=('76640ee16a797a27fe49cc0eaa87ce3a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/musescore/PKGBUILD b/community/musescore/PKGBUILD index f95a54c2b..6c79bed54 100644 --- a/community/musescore/PKGBUILD +++ b/community/musescore/PKGBUILD @@ -4,13 +4,13 @@ pkgname=musescore pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A music score editor written in Qt4" arch=('i686' 'x86_64' 'mips64el') url="http://www.musescore.org/en/" license=('GPL') -depends=('qt>=4.5.0' 'libsndfile') -makedepends=('cmake' 'doxygen' 'qtscriptgenerator') +depends=('qt>=4.5.0' 'libsndfile' 'qtscriptgenerator') +makedepends=('cmake' 'doxygen') optdepends=('portaudio' 'jack') source=(http://sourceforge.net/projects/mscore/files/mscore/MuseScore-1.1/mscore-1.1.tar.bz2 'paths.patch') md5sums=('68b43af92093a16f7f074c0eb560a867' diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index a988c0679..569f92702 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.4.11 +pkgver=0.4.12 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ depends=('python2') checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') source=("http://nodejs.org/dist/node-v${pkgver}.tar.gz") -sha256sums=('e009522d52c4a844c46e51c63b852899d1b7e6d949d1a139cdc16b4f6c4ab63f') +sha256sums=('c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4') build() { cd node-v${pkgver} diff --git a/community/notion/ChangleLog b/community/notion/ChangleLog new file mode 100644 index 000000000..2107408db --- /dev/null +++ b/community/notion/ChangleLog @@ -0,0 +1,5 @@ +2011-09-14 Sergej Pupykin <pupykin.s+arch@gmail.com> + + * 20110914-1 : + Add contrib/ to /usr/share/notion/contrib + Add mod_*.lua to /etc/notion/ diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index 0bc1fcd14..304d14760 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,93 +1,92 @@ -# $Id: PKGBUILD 54702 2011-08-23 11:42:16Z spupykin $ +# $Id: PKGBUILD 55596 2011-09-14 16:51:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20110823 +pkgver=20110914 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" arch=('i686' 'x86_64') license=('custom:LGPL') depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm') -makedepends=('git' 'pkgconfig' +optdepends=('libxinerama' 'libxrandr') +makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr' 'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra') -conflicts=('ion3') provides=('libtu' 'libextl') - -_gitroot="git://notion.git.sourceforge.net/gitroot/notion/notion" -_gitname="notion" -_gitroot2="git://notion.git.sourceforge.net/gitroot/notion/libtu" -_gitname2="libtu" -_gitroot3="git://notion.git.sourceforge.net/gitroot/notion/libextl" -_gitname3="libextl" -_gitroot4="git://notion.git.sourceforge.net/gitroot/notion/notion-doc" -_gitname4="notion-doc" - -source=(doc-build-fix.patch) -md5sums=('68b348427d0531d2679a8a8d97d51c7d') +changelog=ChangleLog +_gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion" + "git://notion.git.sourceforge.net/gitroot/notion/libtu" + "git://notion.git.sourceforge.net/gitroot/notion/libextl" + "git://notion.git.sourceforge.net/gitroot/notion/notion-doc" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" + "git://notion.git.sourceforge.net/gitroot/notion/contrib") build() { - cd ${srcdir} + cd ${srcdir} + # git clone + for _gitroot in ${_gitroots[@]}; do msg "Connecting to the git repository..." + _gitname=`basename ${_gitroot}` if [ -d ${srcdir}/${_gitname} ]; then - cd ${_gitname} + pushd ${srcdir}/${_gitname} git pull origin + popd else git clone --depth 1 ${_gitroot} - cd ${_gitname} - fi - - if [ -d ${srcdir}/${_gitname}/${_gitname2} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot2} - echo fi + msg "GIT checkout done or server timeout" + done - if [ -d ${srcdir}/${_gitname}/${_gitname3} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot3} - echo - fi + # copy to notion-build + rm -rf ${srcdir}/notion-build + cp -r ${srcdir}/notion ${srcdir}/notion-build + for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + cp -r ${srcdir}/$i ${srcdir}/notion-build/ + done - if [ -d ${srcdir}/${_gitname}/${_gitname4} ]; then - echo - git pull origin - else - git clone --depth 1 ${_gitroot4} - echo - fi + # build notion + cd ${srcdir}/notion-build + msg "Starting make..." + sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ + -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ + -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ + -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ + -i system.mk + make INCLUDES=-I${srcdir}/notion-build - msg "GIT checkout done or server timeout" + # doc workaround + for i in ioncore mod_tiling mod_query de mod_menu mod_dock mod_sp mod_statusbar; do + (cd $i && make _exports_doc) + done - rm -rf ${srcdir}/${_gitname}-build - cp -r ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build + # build doc and modules + for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + (cd $i && make -j1 TOPDIR=.. all) + done +} - cd ${srcdir}/${_gitname}-build +package() { + cd ${srcdir}/notion-build - msg "Starting make..." + # notion + make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install - sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ - -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ - -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ - -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ - -i system.mk + # modules + for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do + (cd $i && make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install) + done + cp ${srcdir}/mod_xinerama/*.lua $pkgdir/etc/notion/ + cp ${srcdir}/mod_xkbevents/*.lua $pkgdir/etc/notion/ - make INCLUDES=-I${srcdir}/${_gitname}-build - (cd notion-doc && patch -p1 <$srcdir/doc-build-fix.patch) - (cd notion-doc && make -j1 TOPDIR=.. all) -} + # contrib + mkdir -p $pkgdir/usr/share/notion/contrib + cp -a ${srcdir}/contrib/* $pkgdir/usr/share/notion/contrib -package() { - cd ${srcdir}/${_gitname}-build - make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install - (cd notion-doc && make PREFIX=${pkgdir}/usr TOPDIR=.. install) - mkdir -p ${pkgdir}/usr/share/licenses/notion - cp LICENSE ${pkgdir}/usr/share/licenses/notion + # license + install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/notion/LICENSE } diff --git a/community/ogle-gui/PKGBUILD b/community/ogle-gui/PKGBUILD index 19db618a8..a5ead3a9b 100644 --- a/community/ogle-gui/PKGBUILD +++ b/community/ogle-gui/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 8473 2010-01-20 08:14:50Z ebelanger $ -# Maintainer: Eric Belanger <belanger@astro.umontreal.ca> +# $Id: PKGBUILD 55509 2011-09-13 21:28:22Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gamebox.net> pkgname=ogle-gui pkgver=0.9.2 -pkgrel=4 +pkgrel=5 pkgdesc="A gtk2 gui for ogle" arch=('i686' 'x86_64' 'mips64el') url="http://www.dtek.chalmers.se/groups/dvd/" -license=("GPL") +license=('GPL') depends=('ogle' 'libglade') -source=(http://www.dtek.chalmers.se/groups/dvd/dist/ogle_gui-${pkgver}.tar.gz) +#source=(http://www.dtek.chalmers.se/groups/dvd/dist/ogle_gui-${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/community/ogle-gui/ogle_gui-${pkgver}.tar.gz) md5sums=('e685aa3046f9da13532ede9300f2f794') sha1sums=('0d73ec30852b9cd2a9714b5088f6ab6deecf097d') build() { cd "${srcdir}/ogle_gui-${pkgver}" - ./configure --prefix=/usr --enable-gtk2 || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --enable-gtk2 + make +} + +package() { + cd "${srcdir}/ogle_gui-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD index eb3cea57b..7d7a812ff 100644 --- a/community/parcellite/PKGBUILD +++ b/community/parcellite/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55246 2011-09-07 10:47:21Z spupykin $ +# $Id: PKGBUILD 55624 2011-09-16 13:23:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=parcellite -pkgver=1.0.2rc4 +pkgver=1.0.2rc5 pkgrel=1 pkgdesc="Lightweight GTK+ clipboard manager" arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,13 @@ depends=('gtk2') makedepends=('intltool') source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz history_menu_crash_patch) -md5sums=('cb139cea35ff7d278cdcce09516f31e9' +md5sums=('e7c818b93c7303daadf6093c6ebe79f9' '8fd6e07fa907865ca4db7b3e13441ce6') build() { cd "$srcdir/parcellite-$pkgver" (cd src && patch -p0 <$srcdir/history_menu_crash_patch) + make distclean ./configure --prefix=/usr --sysconfdir=/etc make make DESTDIR="$pkgdir" install diff --git a/community/pcb/PKGBUILD b/community/pcb/PKGBUILD index 7f2d7ceee..abfc1551b 100644 --- a/community/pcb/PKGBUILD +++ b/community/pcb/PKGBUILD @@ -2,18 +2,18 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=pcb -pkgver=20100929 -pkgrel=2 +pkgver=20110918 +pkgrel=1 pkgdesc="An interactive printed circuit board editor for the X11 window system." url="http://pcb.gpleda.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('tcl' 'gtk2' 'gd' 'perlxml' 'hicolor-icon-theme' 'shared-mime-info') +depends=('tcl' 'gtkglext' 'gd' 'perlxml' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('tk: for the graphical QFP footprint builder') install=$pkgname.install changelog=Changelog source=(http://downloads.sourceforge.net/pcb/$pkgname-$pkgver.tar.gz) -md5sums=('4c71f5d1c40ad65539957748b88eb863') +md5sums=('54bbc997eeb22b85cf21fed54cb8e181') build() { cd $srcdir/$pkgname-$pkgver/ diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index d60a87c93..450fdcbaf 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54922 2011-08-28 11:38:33Z giovanni $ +# $Id: PKGBUILD 55381 2011-09-10 23:32:12Z dreisner $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite pkgver=1.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64' 'mips64el') url="https://alioth.debian.org/projects/pcsclite/" @@ -15,7 +15,7 @@ options=('!libtool' '!docs') source=(https://alioth.debian.org/frs/download.php/3598/pcsc-lite-${pkgver}.tar.bz2 pcscd) md5sums=('1caf0b8ca2ecbf82fe3b035b3fff22dd' - '80d90388e4d2a551cb7aefe3bd5147bd') + 'c97b6bce695222efb0f003d8e8369010') build() { cd "${srcdir}/pcsc-lite-${pkgver}" diff --git a/community/pcsclite/pcscd b/community/pcsclite/pcscd index 93f869fd2..1dc5e0166 100644 --- a/community/pcsclite/pcscd +++ b/community/pcsclite/pcscd @@ -6,7 +6,7 @@ DAEMON=/usr/sbin/pcscd NAME=pcscd DESC="PC/SC smart card daemon" -PID_FILE=/var/run/pcscd/pcscd.pid +PID_FILE=/run/pcscd/pcscd.pid PCSCD_OPTIONS= case "$1" in diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 43af6f3ec..ee1122d1a 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52468 2011-07-25 20:19:33Z lcarlier $ +# $Id: PKGBUILD 55515 2011-09-13 21:33:10Z ebelanger $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=7 +pkgrel=8 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index 080489267..2ebc948b7 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.0.14 +_dcpkgver=2.0.15 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.2.3 -pkgrel=3 +pkgver=0.2.4 +pkgrel=2 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.0" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" @@ -19,9 +19,9 @@ makedepends=() conflicts=('dovecot-sieve' 'pigeonhole-hg') source=("http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-$pkgname-$pkgver.tar.gz" "dovecot.conf") -md5sums=('336cbb2073b48119d968fad7de89817a' - '564b771c339f69a477c06babf53e11c2') options=('!libtool') +md5sums=('11d396b901db774799d07db6e4dd805b' + '564b771c339f69a477c06babf53e11c2') build() { cd "$srcdir/dovecot-2.0-$pkgname-$pkgver" diff --git a/community/pinfo/PKGBUILD b/community/pinfo/PKGBUILD index aa17ed562..aa82fe665 100644 --- a/community/pinfo/PKGBUILD +++ b/community/pinfo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 38757 2011-01-31 16:57:31Z spupykin $ +# $Id: PKGBUILD 55275 2011-09-08 12:47:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=pinfo pkgver=0.6.10 -pkgrel=1 +pkgrel=2 pkgdesc="A hypertext info file viewer" arch=('i686' 'x86_64' 'mips64el') url="http://pinfo.alioth.debian.org/" @@ -17,6 +17,7 @@ build() { cd $srcdir/$pkgname-$pkgver unset LDFLAGS [ -x configure ] || ./autogen.sh + sed -i 's|nogroup|nobody|' src/pinforc.in src/utils.c [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --enable-cursor \ --mandir=/usr/share/man --infodir=/usr/share/info make diff --git a/community/pkgtools/PKGBUILD b/community/pkgtools/PKGBUILD index 2bcf2056b..facae0d8e 100644 --- a/community/pkgtools/PKGBUILD +++ b/community/pkgtools/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=pkgtools pkgver=23 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of scripts for Arch Linux packages" arch=('i686' 'x86_64' 'mips64el') url="http://bbs.archlinux.org/viewtopic.php?pid=384196" @@ -22,7 +22,15 @@ build() { cd "$srcdir/Daenyth-$pkgname"-* make +} + +package() { + cd "$srcdir/Daenyth-$pkgname"-* + make DESTDIR="$pkgdir" install + + # fix infinite loop in autotools configure scripts + sed -i '/export -f command_not_found_handle/d' "$pkgdir/usr/share/pkgtools/pkgfile-hook.bash" } # vim:set ts=2 sw=2 et: diff --git a/community/portaudio_cpp/PKGBUILD b/community/portaudio_cpp/PKGBUILD index 664450a04..00ed1b3ac 100644 --- a/community/portaudio_cpp/PKGBUILD +++ b/community/portaudio_cpp/PKGBUILD @@ -1,28 +1,26 @@ -# Based on 'portaudio' package - Eric Belanger <belanger@astro.umontreal.ca> +# $Id: PKGBUILD 55337 2011-09-10 02:09:27Z ebelanger $ # Maintainer: Bob Finch <w9ya@qrparci.net> pkgname=portaudio_cpp -pkgver=19_20071207 -pkgrel=2 +pkgver=19_20110326 +pkgrel=1 pkgdesc="PortAudio c++ bindings" +arch=('i686' 'x86_64' 'mips64el') url="http://www.portaudio.com/" -source=(http://www.portaudio.com/archives/pa_stable_v$pkgver.tar.gz) -depends=('portaudio=19_20071207' 'gcc-libs') license=('custom') -arch=('i686' 'x86_64' 'mips64el') +depends=("portaudio=${pkgver}" 'gcc-libs') options=('!libtool') -md5sums=('d2943e4469834b25afe62cc51adc025f') +source=(http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz) +md5sums=('8f266ce03638419ef46e4efcb0fabde6') build() { - cd $srcdir/portaudio - ./configure --prefix=/usr - make || return 1 - - install -D -m644 LICENSE.txt\ - $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt - - cd $srcdir/portaudio/bindings/cpp - ./configure --prefix=/usr - make || return 1 + cd "$srcdir/portaudio" + ./configure --prefix=/usr --enable-cxx + make +} + +package() { + cd "$srcdir/portaudio/bindings/cpp" make DESTDIR=$pkgdir install + install -D -m644 ../../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" } diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index f629d08b7..f1e47b9bf 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54544 2011-08-20 07:24:22Z ttopper $ +# $Id: PKGBUILD 55279 2011-09-08 15:03:04Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha -pkgver=0.98.0 +pkgver=0.99.0 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('b648a9fc7881709711097e394a7e854595709772') +sha1sums=('0791335c29121e6288962f4a7fbe074e4db73c9d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pragha/pragha.install b/community/pragha/pragha.install index 7db352036..ff5a644bd 100755 --- a/community/pragha/pragha.install +++ b/community/pragha/pragha.install @@ -1,8 +1,10 @@ post_install() { gtk-update-icon-cache -q -f -t usr/share/icons/hicolor + update-desktop-database -q } post_remove() { gtk-update-icon-cache -q -f -t usr/share/icons/hicolor + update-desktop-database -q } diff --git a/community/preload/PKGBUILD b/community/preload/PKGBUILD index 80427f35f..847ec0cc1 100644 --- a/community/preload/PKGBUILD +++ b/community/preload/PKGBUILD @@ -1,38 +1,47 @@ +# $Id: PKGBUILD 55344 2011-09-10 09:19:46Z andrea $ +# Maintainer: # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=preload pkgver=0.6.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Makes applications run faster by prefetching binaries and shared objects" url="http://sourceforge.net/projects/preload" license=('GPL2') +depends=('glib2' 'bash') makedepends=('help2man' 'pkgconfig') -depends=('glib2') backup=('etc/preload.conf') options=('!makeflags') install=$pkgname.install -source=(http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz \ +source=("http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz" rc.preload) md5sums=('10786287b55afd3a2b433b4f898809f4' 'bde0dd7867c77e7c4d10b481b5cddcd3') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --localstatedir=/var - make || return 1 - make DESTDIR=$startdir/pkg install + cd "${srcdir}"/$pkgname-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install - install -D -m755 ../rc.preload $startdir/pkg/etc/rc.d/preload - rm -rf $startdir/pkg/etc/rc.d/init.d + install -D -m755 "${srcdir}"/rc.preload "${pkgdir}"/etc/rc.d/preload + rm -rf "${pkgdir}"/etc/rc.d/init.d - rm -rf $startdir/pkg/var/lib/preload/preload.state - rm -rf $startdir/pkg/var/log/preload.log + rm -rf "${pkgdir}"/var/lib/preload/preload.state + rm -rf "${pkgdir}"/var/log/preload.log - mkdir $startdir/pkg/etc/conf.d - mv $startdir/pkg/etc/sysconfig/* $startdir/pkg/etc/conf.d - rm -rf $startdir/pkg/etc/sysconfig + install -d "${pkgdir}"/etc/conf.d + mv "${pkgdir}"/etc/sysconfig/* "${pkgdir}"/etc/conf.d + rm -rf "${pkgdir}"/etc/sysconfig - sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' $startdir/pkg/etc/preload.conf + sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' "${pkgdir}"/etc/preload.conf } diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD index 4c1015bb1..475c68b6a 100644 --- a/community/python-bsddb/PKGBUILD +++ b/community/python-bsddb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50695 2011-06-29 15:25:25Z stephane $ +# $Id: PKGBUILD 55744 2011-09-18 22:24:47Z stephane $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> @@ -6,48 +6,35 @@ pkgbase=python-bsddb pkgname=('python2-bsddb' 'python-bsddb') -_hgrel=600 -pkgver=5.1.2.${_hgrel} +pkgver=5.2.0 pkgrel=1 pkgdesc="Python interface for BerkeleyDB" license=('MIT') arch=('i686' 'x86_64' 'mips64el') url="http://www.jcea.es/programacion/pybsddb.htm" -makedepends=('python2-distribute' 'python-distribute' 'mercurial') -source=("ftp://ftp.archlinux.org/other/community/${pkgbase}/${pkgbase}-${pkgver}.src.tar.xz" - 'LICENSE') -sha1sums=('50e7b4c9c11b06c6d871dd93af1cc228687a0227' - 'ef4e4caf618781104dbf5824279ed39d127b4713') - -# source PKGBUILD && mksource -mksource() { - _hgroot="http://hg.jcea.es/pybsddb/" - _hgrepo=pybsddb - [ -d "${_hgrepo}" ] && hg pull -u -r ${_hgrel} || hg clone ${_hgroot} -r ${_hgrel} - - _dirname=${pkgbase}-${pkgver} - mv ${_hgrepo} ${_dirname} - tar -cJvf ${_dirname}.src.tar.xz ${_dirname} - rm -fr ${_dirname} -} +makedepends=('python2-distribute' 'python-distribute') +source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz + LICENSE) +sha1sums=('4395c125807fc8c4bac4d367f4556e623605c7a8' + 'ef4e4caf618781104dbf5824279ed39d127b4713') build () { cd "${srcdir}" - cp -r ${pkgbase}-${pkgver}{,-python2} + cp -r bsddb3-${pkgver}{,-python2} # Build python 3 module - cd ${pkgbase}-${pkgver} + cd bsddb3-${pkgver} python setup.py --berkeley-db=/usr build # Build python 2 module - cd ../${pkgbase}-${pkgver}-python2 + cd ../bsddb3-${pkgver}-python2 python2 setup.py --berkeley-db=/usr build } package_python2-bsddb() { depends=('db' 'python2>=2.7') - cd "${srcdir}/${pkgbase}-${pkgver}-python2" + cd "${srcdir}/bsddb3-${pkgver}-python2" python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE @@ -55,7 +42,7 @@ package_python2-bsddb() { package_python-bsddb() { depends=('db' 'python>=3.2') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/bsddb3-${pkgver}" python setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 484e4dfe9..39299f5a9 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=qbittorrent -pkgver=2.8.4 -pkgrel=1 +pkgver=2.8.5 +pkgrel=2 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64' 'mips64el') url="http://www.qbittorrent.org/" @@ -14,10 +14,8 @@ makedepends=('boost' 'geoip') optdepends=('python2: needed for search' 'geoip: improves peer country resolution') install='qbittorrent.install' -source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz" - 'python2.patch') -md5sums=('85bbc6fe250bf86e734e9891e7c06d6f' - 'db0d79fee8ce3470ad3741d36b02a94c') +source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz") +md5sums=('5f081231537d53e4295483eb9a8f94b1') build() { cd qbittorrent-${pkgver} @@ -27,8 +25,6 @@ build() { -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find ./ -name '*.py') - patch -Np1 -i ${srcdir}/python2.patch - ./configure \ --prefix=/usr diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index f7a00244f..e78990bea 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52050 2011-07-19 20:29:33Z jlichtblau $ +# $Id: PKGBUILD 55314 2011-09-09 20:35:12Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('37c241d84e2525c9daa73d05c7101912031944a8ef7f399acdf5f731da8f443d' +sha256sums=('d3b676f6a9f14e18eadc2c18de743a666b70b9ba28f2b6772c9484e277e03be8' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index e7031e937..4e71ad105 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.3-1 + 2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.2.2-1 diff --git a/community/qscintilla-qt3/PKGBUILD b/community/qscintilla-qt3/PKGBUILD index bd987caa4..8de84ddb2 100644 --- a/community/qscintilla-qt3/PKGBUILD +++ b/community/qscintilla-qt3/PKGBUILD @@ -1,38 +1,37 @@ -# $Id$ -# Maintainer: +# $Id: PKGBUILD 55531 2011-09-14 07:43:04Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: red_over_blue,Ben <ben@benmazer.net>,Kritoke <kritoke@gamebox.net> pkgname=qscintilla-qt3 pkgver=1.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="A port to Qt3 of Neil Hodgson's Scintilla C++ editor class" arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro/" license=('GPL2') depends=('qt3') -source=(http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla1/QScintilla-1.71-gpl-$pkgver.tar.gz) +source=("http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla1/QScintilla-1.71-gpl-$pkgver.tar.gz") md5sums=('dfa047b45d4f09ae8d4a8a431ba88a5a') build() { . /etc/profile.d/qt3.sh - cd $srcdir/QScintilla-1.71-gpl-$pkgver + cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver cd qt - echo [STARTING sed on qscintilla.pro] sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/opt/qt/lib%g" qscintilla.pro /opt/qt/bin/qmake qscintilla.pro make } package() { - cd $srcdir/QScintilla-1.71-gpl-$pkgver + cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver/qt # installind includes for i in qextscintilla*.h; do - install -m 644 -D $i $pkgdir/opt/qt/include/$i + install -m 644 -D $i "${pkgdir}"/opt/qt/include/$i done - + #for i in qscintilla*.qm #do - #install -m 644 -D $i $startdir/pkg/opt/qt/translations/$i + #install -m 644 -D $i "${pkgdir}"/opt/qt/translations/$i #done } diff --git a/community/rep-gtk/PKGBUILD b/community/rep-gtk/PKGBUILD index a409d44e0..06a833404 100644 --- a/community/rep-gtk/PKGBUILD +++ b/community/rep-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 46416 2011-05-07 10:06:27Z shusmann $ +# $Id: PKGBUILD 55391 2011-09-11 18:32:16Z shusmann $ # Maintainer: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=rep-gtk -pkgver=0.90.6 +pkgver=0.90.7 pkgrel=1 pkgdesc="Binding of the GTK and GDK libraries for the librep Lisp environment" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://sawfish.wikia.com/wiki/Rep-GTK" license=('GPL') depends=('librep' 'gtk2') source=(http://download.tuxfamily.org/librep/rep-gtk/${pkgname}-${pkgver}.tar.xz) -sha1sums=('15222f11a91f5190cf3fad22af20932ea6851788') +sha1sums=('30736e88533e176f88677723f12095be983e1926') options=('!libtool') build() { diff --git a/community/rlog/PKGBUILD b/community/rlog/PKGBUILD index d9fa865d7..1ba965fe5 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' 'mips64el') -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/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index 0f3c6905f..1e737b27c 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54833 2011-08-26 19:35:19Z ttopper $ +# $Id: PKGBUILD 55606 2011-09-15 14:20:05Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=roxterm -pkgver=2.0.1 -pkgrel=2 +pkgver=2.1.3 +pkgrel=1 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64' 'mips64el') url="http://roxterm.sourceforge.net/" @@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'dbus' 'dbus-core' 'glib2') makedepends=('docbook-xsl' 'xmlto' 'po4a') install=roxterm.install source=(http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.gz) -md5sums=('114d571d42b2ddd7a777b26339a07573') -sha1sums=('0ba8b6501a81a9527671f13be5111c6434cd4f0b') +sha1sums=('7ebfefd1196ded78185a549fb7cc4662aa661dec') +md5sums=('73b394916f798f1829dcae316f2b5ba3') build() { diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index eefd27b01..d452c5880 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48037 2011-05-27 16:21:40Z spupykin $ +# $Id: PKGBUILD 55517 2011-09-13 21:33:18Z 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=6 +pkgrel=7 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64' 'mips64el') url="http://rss-glx.sourceforge.net/" @@ -31,6 +31,10 @@ build() { --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 diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index a25e4958f..bd6440b14 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54481 2011-08-18 15:08:38Z bluewind $ +# $Id: PKGBUILD 55273 2011-09-08 12:30:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=5.8.4 -pkgrel=2 +pkgver=5.8.5 +pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('a2c2a65ac84d9a895c52a754aff61986' +md5sums=('a73cb577cb4bc5b9c8f0d217eb054ad2' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') diff --git a/community/sawfish/PKGBUILD b/community/sawfish/PKGBUILD index 06b1ec331..984ce840f 100644 --- a/community/sawfish/PKGBUILD +++ b/community/sawfish/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54530 2011-08-19 20:28:11Z shusmann $ +# $Id: PKGBUILD 55392 2011-09-11 18:41:44Z shusmann $ # Maintainer: stefan-husmann@t-online.de # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=sawfish -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.2 +pkgrel=1 pkgdesc="An extensible window manager using a Lisp-based scripting language" arch=('i686' 'x86_64' 'mips64el') url="http://sawfish.wikia.com/wiki/Main_Page" @@ -12,7 +12,7 @@ license=('GPL') depends=('libsm' 'rep-gtk' 'hicolor-icon-theme') install=${pkgname}.install source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('f93549382a438c1e7044624403876b345edae4b6') +sha1sums=('d4716516fb0020bb728291c6defa1f421a33e5dc') options=('!libtool') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD index 4bf658df1..b67252caf 100644 --- a/community/scponly/PKGBUILD +++ b/community/scponly/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46261 2011-05-04 11:37:35Z spupykin $ +# $Id: PKGBUILD 55546 2011-09-14 08:50:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> @@ -6,8 +6,8 @@ pkgname=scponly pkgver=4.8 pkgrel=7 pkgdesc="A limited shell for ssh/scp" -arch=(i686 x86_64 'mips64el') -url="http://www.sublimation.org/scponly/" +arch=(i686 x86_64 mips64el' +url="http://sublimation.org/scponly/" depends=('glibc') license=('custom') options=(docs) diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 0f197879b..33df62a70 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54767 2011-08-24 14:13:47Z spupykin $ +# $Id: PKGBUILD 55302 2011-09-09 14:03:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.11.0 -pkgrel=3 +pkgver=0.11.1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" @@ -15,7 +15,7 @@ depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libr makedepends=('intltool' 'vala') install=shotwell.install source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2") -md5sums=('f0e942b639d899a91c3cf343f6f553bb') +md5sums=('e2c388bfce992b5437281c4fc29357d9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/shotwell/shotwell.install b/community/shotwell/shotwell.install index 9e61524c4..bab8ecd29 100644 --- a/community/shotwell/shotwell.install +++ b/community/shotwell/shotwell.install @@ -2,23 +2,14 @@ pkgname=shotwell post_install() { gtk-update-icon-cache -fq -t usr/share/icons/hicolor - usr/sbin/gconfpkg --install ${pkgname} update-desktop-database -q glib-compile-schemas usr/share/glib-2.0/schemas } -pre_upgrade() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - post_upgrade() { post_install $1 } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - post_remove() { update-desktop-database -q gtk-update-icon-cache -fq -t usr/share/icons/hicolor diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index 991dde055..f8411b613 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' 'mips64el') @@ -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/community/splint/PKGBUILD b/community/splint/PKGBUILD index 07415eccc..bc31421a9 100644 --- a/community/splint/PKGBUILD +++ b/community/splint/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 2039 2009-09-07 16:30:22Z spupykin $ +# $Id: PKGBUILD 55573 2011-09-14 10:41:16Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=splint pkgver=3.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for statically checking C programs for security vulnerabilities and coding mistakes" arch=('i686' 'x86_64' 'mips64el') -url="http://www.splint.org" +url="http://www.splint.org/" license=('GPL') depends=('glibc') -source=(http://www.splint.org/downloads/splint-$pkgver.src.tgz \ - splint.sh) +source=("http://www.splint.org/downloads/${pkgname}-${pkgver}.src.tgz" + 'splint.sh') md5sums=('25f47d70bd9c8bdddf6b03de5949c4fd' '0efb6341b384dc44590989fe3678c96c') +options=('!makeflags') build() { - cd $startdir/src/splint-$pkgver - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd "${srcdir}"/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install - install -D -m755 ../splint.sh $startdir/pkg/etc/profile.d/splint.sh + install -D -m755 "${srcdir}"/splint.sh "${pkgdir}"/etc/profile.d/splint.sh } diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index 0e103a0a6..7e7177ef7 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54945 2011-08-28 16:40:38Z svenstaro $ +# $Id: PKGBUILD 55636 2011-09-17 00:06:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.137 +pkgver=0.139 pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake') source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 springlobby.desktop springlobby.png) -md5sums=('28aeeab2eb63bd43b81a9e64c166341a' +md5sums=('48c572117338277068c67ec1ff7d514f' '45f8b59d033931d02e734fe3bd7777dd' '1f388187539aeb0358b51995e26ed890') @@ -23,11 +23,9 @@ build() { cd $srcdir/${pkgname}-$pkgver export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - cp $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak - sed -e 's|/usr/bin/awk|/bin/awk|g' $srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk.bak>$srcdir/${pkgname}-$pkgver/tools/test-susynclib.awk sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt - #sed -i '/curl\/types.h/d' $srcdir/$pkgname-$pkgver/src/utils/downloader.cpp + cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DOPTION_SOUND=false diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index 659c21b0e..405321d03 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,27 +1,39 @@ -# $Id: PKGBUILD 43444 2011-03-26 08:45:23Z spupykin $ +# $Id: PKGBUILD 55676 2011-09-17 17:07:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=sshguard pkgver=1.5 -pkgrel=1 +pkgrel=3 pkgdesc="brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" arch=('i686' 'x86_64' 'mips64el') #url="http://sourceforge.net/projects/sshguard/" url="http://www.sshguard.net/" license=('GPL') -depends=('glibc') +depends=('iptables') options=(zipman) install=sshguard.install source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.bz2" - sshguard.rc) + sshguard.rc + sshguard.conf.d) md5sums=('11b9f47f9051e25bdfe84a365c961ec1' - '87977af93930c3867edffe3b2018f56e') + '07bffbbfbf452d09cda10a1bab8cc03b' + '1dc6604975d3cd51321a8ad7cd53947c') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --with-firewall=iptables make +} + +check() { + cd $srcdir/$pkgname-$pkgver + strings src/sshguard | grep -E "^`which iptables`[[:space:]]" >/dev/null +} + +package() { + cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr install - install -D -m0755 $srcdir/sshguard.rc $pkgdir/etc/rc.d/sshguard + install -Dm0755 $srcdir/sshguard.rc $pkgdir/etc/rc.d/sshguard + install -Dm0644 $srcdir/sshguard.conf.d $pkgdir/etc/conf.d/sshguard } diff --git a/community/sshguard/sshguard.conf.d b/community/sshguard/sshguard.conf.d new file mode 100644 index 000000000..8fa351a19 --- /dev/null +++ b/community/sshguard/sshguard.conf.d @@ -0,0 +1,4 @@ +# +# Arguments to be passed to sshguard +# +SSHGUARD_ARGS="" diff --git a/community/sshguard/sshguard.rc b/community/sshguard/sshguard.rc index 4b8dee06f..dbd95c9ea 100755 --- a/community/sshguard/sshguard.rc +++ b/community/sshguard/sshguard.rc @@ -2,11 +2,12 @@ . /etc/rc.conf . /etc/rc.d/functions +[ -f /etc/conf.d/sshguard ] && . /etc/conf.d/sshguard case "$1" in start) stat_busy "Starting SSHGuard" - tail -n0 -F /var/log/auth.log | /usr/sbin/sshguard -b /var/db/sshguard/blacklist.db &> /dev/null & + /usr/sbin/sshguard -l /var/log/auth.log -b /var/db/sshguard/blacklist.db ${SSHGUARD_ARGS} &> /dev/null & add_daemon sshguard stat_done ;; diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index e74719207..6429387c5 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55167 2011-09-04 16:26:15Z dreisner $ +# $Id: PKGBUILD 55577 2011-09-14 10:56:19Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel -pkgver=4.42 +pkgver=4.43 pkgrel=1 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'Makefile.patch' 'stunnel.rc.d') -md5sums=('f64a7426166d397dd826deef33bb6aa0' - '011dc68c245c465d120e8bfad10cc891' +md5sums=('84174925a0f2632cc5cd52b3503cf07b' + 'bc1280f59a117f01bb037d9376f9baf6' 'f15398497e10e080c2406d2fc541660c' 'cb647c71ff4cb1e035b6e515d5f13ebf') diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD index 4965d42f0..4e165bf32 100644 --- a/community/tinyproxy/PKGBUILD +++ b/community/tinyproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44216 2011-04-04 13:31:34Z lfleischer $ +# $Id: PKGBUILD 55575 2011-09-14 10:47:03Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=tinyproxy -pkgver=1.8.2 -pkgrel=3 +pkgver=1.8.3 +pkgrel=1 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.' arch=('i686' 'x86_64' 'mips64el') url='https://banu.com/tinyproxy/' @@ -13,7 +13,7 @@ makedepends=('asciidoc') backup=('etc/tinyproxy/tinyproxy.conf') source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2" 'tinyproxy') -md5sums=('edc8502193cfed4974d6a770da173755' +md5sums=('292ac51da8ad6ae883d4ebf56908400d' '464b5d60b1c9cbae26367fe2337c2d77') build() { diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index f068e253e..db54b5e5c 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55094 2011-09-02 11:01:01Z lfleischer $ +# $Id: PKGBUILD 55579 2011-09-14 11:12:14Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.32 +pkgver=0.2.2.33 pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz" 'torrc' 'tor' 'tor.conf.d') -md5sums=('6d70db8da9513453d520168e017a272c' +md5sums=('ea99aba49694bb982d2fccc57a70d58e' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa') diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD index dd3b2ef41..37711e75d 100644 --- a/community/tracker/PKGBUILD +++ b/community/tracker/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54423 2011-08-18 09:42:45Z spupykin $ +# $Id: PKGBUILD 55298 2011-09-09 09:43:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=tracker -pkgver=0.10.22 -pkgrel=2 +pkgver=0.10.26 +pkgrel=1 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/tracker/" @@ -26,7 +26,7 @@ provides=('libtracker') install=tracker.install source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2 tracker-0.10-gnome3-nautilus-extension.patch) -md5sums=('1248742586be5c95871ea59718457657' +md5sums=('3a9e9f8f07b0020c9276571e99cfdb66' '316f1647afe178a87400a476ef1b62a0') build() { diff --git a/community/vbetool/PKGBUILD b/community/vbetool/PKGBUILD index 1cef494b5..d39993d3b 100644 --- a/community/vbetool/PKGBUILD +++ b/community/vbetool/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 46960 2011-05-13 20:41:32Z andrea $ +# $Id: PKGBUILD 55527 2011-09-14 07:33:04Z andrea $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Christian Storm <Christian.Storm@gmx.DE> # Contributor: James Rayner <james@archlinux.org> -# Maintainer: Thayer Williams <thayer@archlinux.org> +# Contributor: Thayer Williams <thayer@archlinux.org> pkgname=vbetool pkgver=1.1 -pkgrel=1 -pkgdesc="vbetool uses lrmi in order to run code from the video BIOS" +pkgrel=2 +pkgdesc="Uses lrmi in order to run code from the video BIOS" url="http://www.srcf.ucam.org/~mjg59/vbetool/" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('zlib' 'libx86') makedepends=('pciutils') -source=(http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${pkgver}.tar.gz) +source=("http://www.codon.org.uk/~mjg59/${pkgname}/download/${pkgname}-${pkgver}.tar.gz") md5sums=('ffb03b118867a02296d7449019ad8846') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver if [ "${CARCH}" = "x86_64" ]; then - ./configure --prefix=/usr --without-x86emu || return 1 + ./configure --prefix=/usr --without-x86emu else - ./configure --prefix=/usr || return 1 + ./configure --prefix=/usr fi - make LIBS=-lpci || return 1 - make DESTDIR=$pkgdir install || return 1 + make LIBS=-lpci } +package() { + cd "${srcdir}"/$pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/community/vnstat/PKGBUILD b/community/vnstat/PKGBUILD index cd044da6a..341ff0199 100644 --- a/community/vnstat/PKGBUILD +++ b/community/vnstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48601 2011-06-03 09:15:53Z ttopper $ +# $Id: PKGBUILD 55756 2011-09-19 06:41:29Z ttopper $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=vnstat pkgver=1.11 -pkgrel=1 +pkgrel=2 pkgdesc="A console-based network traffic monitor" arch=('i686' 'x86_64' 'mips64el') url="http://humdi.net/vnstat/" @@ -13,7 +13,6 @@ depends=('bash') makedepends=('gd') optdepends=('gd: image output') backup=(etc/vnstat.conf) -install=vnstat.install source=(http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz http://humdi.net/vnstat/init.d/arch/vnstat) md5sums=('a5a113f9176cd61fb954f2ba297f5fdb' diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index e84d52c7b..371bf4a83 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -8,15 +8,18 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64' 'mips64el') url='http://www.vtk.org' license=('BSD') -depends=('libpng' 'libtiff' 'freetype2' 'python2' 'java-runtime' 'tk' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') -optdepends=('gnuplot: plotting tools' +depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql') +makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk') +optdepends=('python2: python bindings' + 'java-runtime: java bindings' + 'tk: tcl bindings' + 'gnuplot: plotting tools' 'graphviz: drawing tools') -makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa') source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" 'fixkernelversioncheck.diff') @@ -28,15 +31,9 @@ build() { cd VTK # fix compilation error: http://vtk.org/Bug/view.php?id=12568 - # remove next bunp + # remove next pkgver bump patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff - # fix for libpng 1.4 - remove next time version bump - for _FILE in `grep -Rl "png_set_gray_1_2_4_to_8" *` - do - sed -i 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ${_FILE} - done - cd ${srcdir} rm -rf build @@ -80,8 +77,6 @@ build() { -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ ${srcdir}/VTK - # j1 is used because of a bug in building with multiple threads - #make -j1 make } diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD new file mode 100644 index 000000000..29c749205 --- /dev/null +++ b/community/wine/PKGBUILD @@ -0,0 +1,143 @@ +# $Id: PKGBUILD 55318 2011-09-09 21:53:02Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Eduardo Romero <eduardo@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=wine +pkgver=1.3.28 +pkgrel=1 + +_pkgbasever=${pkgver/rc/-rc} + +source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) +md5sums=('70574d609161cec8523804cd9364bcd2') + +pkgdesc="A compatibility layer for running Windows programs" +url="http://www.winehq.com" +arch=(i686 x86_64) +license=(LGPL) +install=wine.install + +depends=( + fontconfig lib32-fontconfig + mesa lib32-mesa + libxcursor lib32-libxcursor + libxrandr lib32-libxrandr + libxdamage lib32-libxdamage + libxxf86dga lib32-libxxf86dga + libxi lib32-libxi + alsa-lib lib32-alsa-lib + desktop-file-utils +) + +makedepends=(autoconf ncurses bison perl fontforge flex prelink + 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' + giflib lib32-giflib + libxpm lib32-libxpm + libpng lib32-libpng + libxinerama lib32-libxinerama + libxcomposite lib32-libxcomposite + libxmu lib32-libxmu + libxxf86vm lib32-libxxf86vm + libxml2 lib32-libxml2 + libxslt lib32-libxslt + libldap lib32-libldap + lcms lib32-lcms + mpg123 lib32-mpg123 + openal lib32-openal + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +optdepends=( + giflib lib32-giflib + libpng lib32-libpng + libldap lib32-libldap + lcms lib32-lcms + libxml2 lib32-libxml2 + mpg123 lib32-mpg123 + openal lib32-openal + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +if [[ $CARCH == i686 ]]; then + # Strip lib32 etc. on i686 + depends=(${depends[@]/*32-*/}) + makedepends=(${makedepends[@]/*32-*/}) + makedepends=(${makedepends[@]/*-multilib*/}) + optdepends=(${optdepends[@]/*32-*/}) +else + provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") + conflicts=('bin32-wine' 'wine-wow64') + replaces=('bin32-wine') +fi + +build() { + cd "$srcdir" + + # Allow ccache to work + mv $pkgname-$_pkgbasever $pkgname + + # Get rid of old build dirs + rm -rf $pkgname-{32,64}-build + mkdir $pkgname-32-build + + if [[ $CARCH == x86_64 ]]; then + msg2 "Building Wine-64..." + + mkdir $pkgname-64-build + cd "$srcdir/$pkgname-64-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --with-x \ + --enable-win64 + + make + + _wine32opts=( + --libdir=/usr/lib32 + --with-wine64="$srcdir/$pkgname-64-build" + ) + + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + + msg2 "Building Wine-32..." + cd "$srcdir/$pkgname-32-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-x \ + "${_wine32opts[@]}" + + make +} + +package() { + msg2 "Packaging Wine-32..." + cd "$srcdir/$pkgname-32-build" + + if [[ $CARCH == i686 ]]; then + make prefix="$pkgdir/usr" install + else + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib32" \ + dlldir="$pkgdir/usr/lib32/wine" install + + msg2 "Packaging Wine-64..." + cd "$srcdir/$pkgname-64-build" + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib" \ + dlldir="$pkgdir/usr/lib/wine" install + fi +} + +# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install new file mode 100644 index 000000000..f71262186 --- /dev/null +++ b/community/wine/wine.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." + echo "If you are on x86_64, the default WINEARCH will be win64." + echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." + echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." + echo "See the Arch wiki on wine for more information." +} + +post_remove() { + update-desktop-database -q +} diff --git a/community/wmname/PKGBUILD b/community/wmname/PKGBUILD index cdffdbcf8..0d72d64c7 100644 --- a/community/wmname/PKGBUILD +++ b/community/wmname/PKGBUILD @@ -1,21 +1,25 @@ -# Contributer: Vincent Kriek <vincent@vincentkriek.nl> +# $Id: PKGBUILD 55541 2011-09-14 08:07:38Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Vincent Kriek <vincent@vincentkriek.nl> pkgname=wmname pkgver=0.1 -pkgrel=1 -pkgdesc="A utility to set the name of your window manager" +pkgrel=2 +pkgdesc="An utility to set the name of your window manager" url="http://www.suckless.org/programs/wmname.html" license=('custom') -depends=(libx11) +depends=('libx11') arch=('i686' 'x86_64' 'mips64el') -source=('http://code.suckless.org/dl/tools/wmname-0.1.tar.gz') +source=("http://dl.suckless.org/tools/wmname-$pkgver.tar.gz") md5sums=('6903d299f84d335e529fbd2c1d6e49fe') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver + make +} - ./configure --prefix=/usr - make || return 1 - make PREFIX=$startdir/pkg/usr install || return 1 - install -Dm0644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +package() { + cd "${srcdir}"/$pkgname-$pkgver + make PREFIX="${pkgdir}"/usr install + install -Dm0644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/wxsvg/PKGBUILD b/community/wxsvg/PKGBUILD index e39fadf3d..aa9d379e1 100644 --- a/community/wxsvg/PKGBUILD +++ b/community/wxsvg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43527 2011-03-27 08:14:30Z ebelanger $ +# $Id: PKGBUILD 55754 2011-09-19 05:09:05Z ebelanger $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=wxsvg -pkgver=1.0.8 +pkgver=1.1.2 pkgrel=1 pkgdesc="C++ library to create, manipulate and render SVG files" arch=('i686' 'x86_64' 'mips64el') @@ -11,28 +11,17 @@ url="http://wxsvg.sourceforge.net/" license=('custom:wxWindows') depends=('wxgtk' 'libart-lgpl' 'ffmpeg') options=('!libtool') -source=("http://downloads.sourceforge.net/project/wxsvg/wxsvg/${pkgver}/wxsvg-${pkgver}-1.tar.bz2") -md5sums=('81b1b4e9f86b74850d56df6cc3a44faa') +source=("http://downloads.sourceforge.net/project/wxsvg/wxsvg/${pkgver}/wxsvg-${pkgver}.tar.bz2") +md5sums=('d88b0a68334df157fa560413681c3264') build() { - cd "${srcdir}/${pkgname}-${pkgver}-1" - - #sed -i 's|avformat.h|libavformat/avformat.h|' src/mediadec_ffmpeg.cpp - #sed -i 's|swscale.h|libswscale/swscale.h|' src/mediadec_ffmpeg.cpp - - ./autogen.sh - - ./configure \ - --prefix=/usr - + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}-1" - + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - install -D -m644 COPYING \ - "${pkgdir}/usr/share/licenses/wxsvg/COPYING" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/wxsvg/COPYING" } diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index 1de99d190..a9a182228 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53311 2011-08-02 18:29:53Z spupykin $ +# $Id: PKGBUILD 55400 2011-09-11 21:18:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=xlockmore -pkgver=5.33 -pkgrel=2 +pkgver=5.34 +pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64 'mips64el') license=('BSD') @@ -13,7 +13,7 @@ url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 \ LICENSE) -md5sums=('8ae31d03f836e768cd888198c5f1a5f8' +md5sums=('ed464197e8684a243e56aab7919a52d8' 'a64afab4283f53972a6702c2e59850d7') build() { diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD index d31cf1774..989a23021 100644 --- a/community/xnee/PKGBUILD +++ b/community/xnee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44669 2011-04-10 20:26:28Z jlichtblau $ +# $Id: PKGBUILD 55315 2011-09-09 20:38:51Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=xnee -pkgver=3.09 +pkgver=3.10 pkgrel=1 pkgdesc="A program to record, distribute, and replay X (X11) protocol data" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('texinfo') options=('!libtool' '!emptydirs') changelog=$pkgname.changelog source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('1145add697e4932007396bc093336689efa934dd92e701f0aaefe388990e2720') +sha256sums=('6260e02f4938d18a548e6a6716ae48e34f1bf33c7a832d5eda35d4191fb86b56') build() { cd ${srcdir}/$pkgname-$pkgver @@ -28,4 +28,3 @@ package() { make DESTDIR=${pkgdir} install } - diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog index a096a22e8..f3e20ccfe 100644 --- a/community/xnee/xnee.changelog +++ b/community/xnee/xnee.changelog @@ -1,3 +1,6 @@ +2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * xnee 3.10-1 + 2011-04-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * xnee 3.09-1 diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD index 8d265fed4..f7cef2249 100644 --- a/community/xosd/PKGBUILD +++ b/community/xosd/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 41448 2009-06-04 02:08:19Z eric $ -# Maintainer: damir <damir@archlinux.org> +# $Id: PKGBUILD 55535 2011-09-14 07:50:30Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=xosd pkgver=2.2.14 -pkgrel=3 -pkgdesc="XOSD displays text on your screen. On-Screen-Display-libs for some tools." +pkgrel=4 +pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools" arch=("i686" "x86_64" 'mips64el') license=('GPL2') url="http://www.ignavus.net/software.html" -depends=('libxt' 'libxinerama') +depends=('libxt' 'libxinerama' 'sh') makedepends=('xmms' 'bmp' 'gdk-pixbuf') optdepends=('gdk-pixbuf: for using the bmp or xmms plugin') -options=(!libtool) -#source=("http://www.ignavus.net/xosd-$pkgver.tar.bz2") -source=("http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_$pkgver.orig.tar.gz") +options=('!libtool') +source=("http://downloads.sourceforge.net/libxosd/${pkgname}-${pkgver}.tar.gz") md5sums=('4b349fe930e4eee2f504d6c02673e24d') build() { - cd "$srcdir/xosd-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 - sed -i 's/AC_DEFUN(AM_PATH_LIBXOSD,/AC_DEFUN([AM_PATH_LIBXOSD],/' \ - "$pkgdir/usr/share/aclocal/libxosd.m4" || return 1 + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --mandir=/usr/share/man + make } - +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + sed -i 's/AC_DEFUN(AM_PATH_LIBXOSD,/AC_DEFUN([AM_PATH_LIBXOSD],/' \ + "$pkgdir/usr/share/aclocal/libxosd.m4" +} diff --git a/community/xxkb/PKGBUILD b/community/xxkb/PKGBUILD index b8c3239be..ee9bd7c19 100644 --- a/community/xxkb/PKGBUILD +++ b/community/xxkb/PKGBUILD @@ -1,40 +1,42 @@ -# $Id: PKGBUILD 1001 2009-08-11 09:14:06Z spupykin $ +# $Id: PKGBUILD 55567 2011-09-14 10:23:32Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xxkb pkgver=1.11 -pkgrel=3 +pkgrel=4 pkgdesc="keyboard layout switcher/indicator" -arch=(i686 x86_64 'mips64el') -url="http://sf.net/projects/xxkb/" -license=(PerlArtistic) -depends=(libxpm) -makedepends=(patch imake) -source=(http://downloads.sourceforge.net/xxkb/xxkb-$pkgver-src.tar.gz - XXkb \ - en22.xpm \ - ru22.xpm) +arch=('i686' 'x86_64' 'mips64el') +url="http://sourceforge.net/projects/xxkb/" +license=('PerlArtistic') +depends=('libxpm') +makedepends=('imake') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver-src.tar.gz" + XXkb + en22.xpm + ru22.xpm) md5sums=('c2e5c7f3285033f0e26b358ef95a7c89' 'f181b7a017d3d2524ecf10638317d341' '649c6d378fe12853d457b768bd273dc5' 'f1692f0be5fc697b3b792d0098bdb42f') build() { - cd $srcdir/xxkb + cd "${srcdir}"/${pkgname} xmkmf - make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm' || return 1 + make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm' +} +package() { + cd "${srcdir}"/${pkgname} install -d $pkgdir/usr/bin install -d $pkgdir/usr/share/$pkgname install -d $pkgdir/usr/man/man1 install -d $pkgdir/usr/share/X11/app-defaults - install -m 0755 xxkb $pkgdir/usr/bin && \ - install -m 0644 ../XXkb $pkgdir/usr/share/X11/app-defaults/XXkb && \ - install -m 0644 pixmaps/*.xpm $pkgdir/usr/share/$pkgname && \ - install -m 0644 $pkgname.man $pkgdir/usr/man/man1/$pkgname.1 && \ - install -m 0644 ../*.xpm $pkgdir/usr/share/$pkgname/ || return 1 + install -m 0755 xxkb $pkgdir/usr/bin + install -m 0644 ../XXkb $pkgdir/usr/share/X11/app-defaults/XXkb + install -m 0644 pixmaps/*.xpm $pkgdir/usr/share/$pkgname + install -m 0644 $pkgname.man $pkgdir/usr/man/man1/$pkgname.1 + install -m 0644 ../*.xpm $pkgdir/usr/share/$pkgname/ mv $pkgdir/usr/man $pkgdir/usr/share/ } diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index 64523d90d..96bb69c72 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,27 +1,25 @@ -# $Id: PKGBUILD 47765 2011-05-25 13:51:21Z tdziedzic $ +# $Id: PKGBUILD 55376 2011-09-10 20:15:39Z dreisner $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc -pkgver=0.098 -pkgrel=3 +pkgver=0.200 +pkgrel=1 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' license=('GPL2') arch=('i686' 'x86_64' 'mips64el') - depends=('c-ares' 'gcc-libs' 'openssl') makedepends=('swig' 'tcl' 'python' 'perl' 'cyrus-sasl') optdepends=('tcl: modtcl module' 'python: modpython module' 'perl: modperl module' 'cyrus-sasl: saslauth module') - source=("http://znc.in/releases/znc-${pkgver}.tar.gz") -md5sums=('5667b4acb1f01309d6eded77abac700c') +md5sums=('da5b690bc31b007474a77aae70c9c049') build() { - cd znc-${pkgver} + cd "znc-$pkgver" ./configure --prefix=/usr \ --enable-sasl \ @@ -34,7 +32,7 @@ build() { } package() { - cd znc-${pkgver} + cd "znc-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 614a30346..6d605164a 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127042 2011-06-10 00:56:53Z bisson $ +# $Id: PKGBUILD 137787 2011-09-11 01:35:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.12 -pkgrel=3 +pkgver=8.13 +pkgrel=2 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -19,7 +19,7 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz coreutils-uname.patch coreutils-pam.patch su.pam) -md5sums=('0f7d43c2d2e24314b43a6c6267e25b90' +md5sums=('8e1675c6c336ff55557c698706a63d6c' 'c4fcca138b6abf6d443d48a6f0cd8833' 'aad79a2aa6d566c375d7bdd1b0767278' 'fa85e5cce5d723275b14365ba71a8aad') @@ -34,7 +34,7 @@ build() { patch -Np1 -i ${srcdir}/coreutils-uname.patch autoreconf -v - ./configure --prefix=/usr \ + ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \ --enable-install-program=su \ --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD new file mode 100644 index 000000000..72cb1194c --- /dev/null +++ b/core/curl/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 138015 2011-09-14 11:16:01Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=curl +pkgver=7.22.0 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') +options=('!libtool') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + curlbuild.h) +md5sums=('e8c36126d21c893f085aca233906b5cc' + '1b061c348b63ea3e90c3f2c3af6a08d6' + '751bd433ede935c8fae727377625a8ae') + + +case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unsupported architecture: %s" "$CARCH" + exit 1 + ;; +esac + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --with-random=/dev/urandom \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --enable-ipv6 \ + --disable-ldaps \ + --disable-ldap \ + --enable-manual \ + --enable-versioned-symbols \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ + --without-libidn \ + --enable-threaded-resolver + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} diff --git a/core/curl/curlbuild.h b/core/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/core/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index a982f8124..1cacf025b 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134479 2011-08-04 09:59:01Z allan $ +# $Id: PKGBUILD 138220 2011-09-19 05:03:19Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file -pkgver=5.08 +pkgver=5.09 pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('6a2a263c20278f01fe3bb0f720b27d4e') +md5sums=('6fd7cd6c4281e68fe9ec6644ce0fac6f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 98392aef7..f89aa03cc 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135924 2011-08-20 07:14:27Z allan $ +# $Id: PKGBUILD 137789 2011-09-11 01:47:05Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,10 +6,10 @@ pkgname=glibc pkgver=2.14 -pkgrel=5 +pkgrel=6 pkgver=2.13 #holdver pkgrel=5.1 #holdver -_glibcdate=20110617 +_glibcdate=20110908 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -17,7 +17,8 @@ license=('GPL' 'LGPL') groups=('base') depends=('linux-api-headers>=3.0' 'tzdata') makedepends=('gcc>=4.6') -backup=(etc/locale.gen +backup=(etc/gai.conf + etc/locale.gen etc/nscd.conf) options=('!strip') install=glibc.install @@ -28,23 +29,24 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch + glibc-2.13-dlclose-search-reset.patch glibc-2.14-libdl-crash.patch - #glibc-2.14-fix-resolver-crash-typo.patch - glibc-2.14-revert-4462fad3.patch + glibc-2.14-avoid-assertion-on-empty-dns-answer.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch nscd locale.gen.txt locale-gen) -md5sums=('e441d745609d93c907b72548ba646dad' +md5sums=('069069eb9100cc7affd7ad884cb3c3e9' '4dadb9203b69a3210d53514bb46f41c3' '0c5540efc51c0b93996c51b57a8540ae' '40cd342e21f71f5e49e32622b25acc52' 'a3ac6f318d680347bb6e2805d42b73b2' 'b042647ea7d6f22ad319e12e796bd13e' '7d0154b7e17ea218c9fa953599d24cc4' + '22d09c58718fb3d1d31c3a6c14ca6886' 'cea62cc6b903d222c5f26e05a3c0e0e6' - '46e56492cccb1c9172ed3a235cf43c6c' + '13728807283f111e5d9d38cf38e0a461' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' 'b587ee3a70c9b3713099295609afde49' @@ -84,15 +86,17 @@ build() { # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + # https://bugzilla.redhat.com/show_bug.cgi?id=593675 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - # This fixes the main segfault but not the assert fail (FS#24615) - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 - #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch - # resort to reverting the bad commit completely for the moment - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch + # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch # re-export RPC interface until libtirpc is ready as a replacement # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) diff --git a/core/glibc/glibc-2.13-dlclose-search-reset.patch b/core/glibc/glibc-2.13-dlclose-search-reset.patch new file mode 100644 index 000000000..3ad8b418a --- /dev/null +++ b/core/glibc/glibc-2.13-dlclose-search-reset.patch @@ -0,0 +1,196 @@ +From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Wed, 26 May 2010 18:28:59 +0200 +Subject: [PATCH] Fix scope handling during dl_close + +--- + ChangeLog | 12 ++++++++++++ + elf/Makefile | 10 +++++++++- + elf/dl-close.c | 7 +++++++ + elf/unload8.c | 33 +++++++++++++++++++++++++++++++++ + elf/unload8mod1.c | 7 +++++++ + elf/unload8mod1x.c | 1 + + elf/unload8mod2.c | 7 +++++++ + elf/unload8mod3.c | 27 +++++++++++++++++++++++++++ + 8 files changed, 103 insertions(+), 1 deletions(-) + create mode 100644 elf/unload8.c + create mode 100644 elf/unload8mod1.c + create mode 100644 elf/unload8mod1x.c + create mode 100644 elf/unload8mod2.c + create mode 100644 elf/unload8mod3.c + +diff --git a/elf/Makefile b/elf/Makefile +index 59e835f..65b6deb 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -89,6 +89,7 @@ distribute := rtld-Rules \ + unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ + unload6mod1.c unload6mod2.c unload6mod3.c \ + unload7mod1.c unload7mod2.c \ ++ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \ + tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ + tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ + tst-auditmod4a.c tst-auditmod4b.c \ +@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ + tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ + tst-dlmodcount tst-dlopenrpath tst-deep1 \ + tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ +- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ ++ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ + tst-audit1 tst-audit2 \ + tst-stackguard1 tst-addr1 tst-thrlock \ + tst-unique1 tst-unique2 +@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ + unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ + unload6mod1 unload6mod2 unload6mod3 \ + unload7mod1 unload7mod2 \ ++ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \ + order2mod1 order2mod2 order2mod3 order2mod4 \ + tst-unique1mod1 tst-unique1mod2 \ + tst-unique2mod1 tst-unique2mod2 +@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl) + $(objpfx)unload6mod3.so: $(libdl) + $(objpfx)unload7mod1.so: $(libdl) + $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so ++$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so ++$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so ++$(objpfx)unload8mod3.so: $(libdl) + $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so + $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so + $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so +@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl) + $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so + unload7-ENV = MALLOC_PERTURB_=85 + ++$(objpfx)unload8: $(libdl) ++$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so ++ + ifdef libdl + $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a + $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 700e765..f47d5f8 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) + + imap->l_scope_max = new_size; + } ++ else if (new_list != NULL) ++ { ++ /* We didn't change the scope array, so reset the search ++ list. */ ++ imap->l_searchlist.r_list = NULL; ++ imap->l_searchlist.r_nlist = 0; ++ } + + /* The loader is gone, so mark the object as not having one. + Note: l_idx != IDX_STILL_USED -> object will be removed. */ +diff --git a/elf/unload8.c b/elf/unload8.c +new file mode 100644 +index 0000000..f984a38 +--- /dev/null ++++ b/elf/unload8.c +@@ -0,0 +1,33 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++ ++int ++main (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod1.so failed"); ++ return 1; ++ } ++ ++ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY); ++ if (h2 == NULL) ++ { ++ puts ("dlopen unload8mod1x.so failed"); ++ return 1; ++ } ++ dlclose (h2); ++ ++ int (*mod1) (void) = dlsym (h, "mod1"); ++ if (mod1 == NULL) ++ { ++ puts ("dlsym failed"); ++ return 1; ++ } ++ ++ mod1 (); ++ dlclose (h); ++ ++ return 0; ++} +diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c +new file mode 100644 +index 0000000..fe7e81c +--- /dev/null ++++ b/elf/unload8mod1.c +@@ -0,0 +1,7 @@ ++extern void mod2 (void); ++ ++void ++mod1 (void) ++{ ++ mod2 (); ++} +diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c +new file mode 100644 +index 0000000..835b634 +--- /dev/null ++++ b/elf/unload8mod1x.c +@@ -0,0 +1 @@ ++int mod1x; +diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c +new file mode 100644 +index 0000000..2fd8b67 +--- /dev/null ++++ b/elf/unload8mod2.c +@@ -0,0 +1,7 @@ ++extern void mod3 (void); ++ ++void ++mod2 (void) ++{ ++ mod3 (); ++} +diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c +new file mode 100644 +index 0000000..d49e22b +--- /dev/null ++++ b/elf/unload8mod3.c +@@ -0,0 +1,27 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++void ++mod3_fini2 (void) ++{ ++} ++ ++void ++mod3_fini (void) ++{ ++ mod3_fini2 (); ++} ++ ++void ++mod3 (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod2.so failed"); ++ exit (1); ++ } ++ ++ atexit (mod3_fini); ++} +-- +1.7.3.4 + diff --git a/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch new file mode 100644 index 000000000..ef91116e5 --- /dev/null +++ b/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch @@ -0,0 +1,26 @@ +From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Thu, 1 Sep 2011 10:46:14 +0200 +Subject: [PATCH] Avoid assertion failure when first DNS answer was empty + +--- + ChangeLog | 4 ++++ + resolv/res_query.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/resolv/res_query.c b/resolv/res_query.c +index 2f7cfaa..2ded9fb 100644 +--- a/resolv/res_query.c ++++ b/resolv/res_query.c +@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, + && *resplen2 > (int) sizeof (HEADER)) + { + /* Special case of partial answer. */ +- assert (hp != hp2); ++ assert (n == 0 || hp != hp2); + hp = hp2; + } + else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) +-- +1.7.3.4 + diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD index 87c152292..94b597eda 100644 --- a/core/gzip/PKGBUILD +++ b/core/gzip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100035 2010-11-20 01:15:49Z stephane $ +# $Id: PKGBUILD 137785 2011-09-11 01:35:04Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gzip pkgver=1.4 -pkgrel=2 +pkgrel=3 pkgdesc="GNU compression utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gzip/" @@ -27,6 +27,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -35,5 +40,4 @@ package() { install -dm755 ${pkgdir}/bin mv ${pkgdir}/usr/bin/{gunzip,gzip,uncompress,zcat} ${pkgdir}/bin/ cd $pkgdir/bin - ln -sf ${pkgname} compress } diff --git a/core/gzip/gzip.install b/core/gzip/gzip.install index 636f91011..24c8b8fb9 100644 --- a/core/gzip/gzip.install +++ b/core/gzip/gzip.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(gzip.info) post_install() { diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index de5f4cbe3..d1243e382 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 133073 2011-07-27 15:33:16Z dan $ +# $Id: PKGBUILD 137571 2011-09-09 20:06:23Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.12 -pkgrel=2 +pkgver=1.4.12.1 +pkgrel=1 pkgdesc="A Linux kernel packet control tool" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -24,7 +24,7 @@ source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar empty-raw.rules empty-security.rules) backup=(etc/conf.d/iptables) -sha1sums=('6c3f6eceadf5dab570d757d74a7194ef75be3ee3' +sha1sums=('86022c3b5129ad7105f5087ec1349e99cc5a9728' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -35,7 +35,6 @@ sha1sums=('6c3f6eceadf5dab570d757d74a7194ef75be3ee3' '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e') - build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -43,6 +42,9 @@ build() { sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in + # FS#25358: libxt_statistic.so undefined symbol: lround + export LDFLAGS="-lm" + ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD index dd181956c..29edac2e7 100644 --- a/core/libnl/PKGBUILD +++ b/core/libnl/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 77938 2010-04-19 05:37:53Z allan $ +# $Id: PKGBUILD 137795 2011-09-11 08:35:21Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libnl pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Library for applications dealing with netlink sockets" arch=('i686' 'x86_64' 'mips64el') url="http://www.infradead.org/~tgr/libnl/" license=('GPL') depends=('glibc') -source=(ftp://ftp.archlinux.org/other/libnl/${pkgname}-${pkgver}.tar.gz - fix-compilation.patch) +source=("http://www.infradead.org/~tgr/libnl/files/${pkgname}-${pkgver}.tar.gz" + 'fix-compilation.patch') md5sums=('ae970ccd9144e132b68664f98e7ceeb1' 'e1f5e82c8aa1b3ad025c7b588178de1e') build() { cd ${srcdir}/libnl-${pkgver} - patch -Np1 -i ${srcdir}/fix-compilation.patch || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 + patch -Np1 -i ${srcdir}/fix-compilation.patch + ./configure --prefix=/usr + make } package() { cd ${srcdir}/libnl-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD new file mode 100644 index 000000000..3fcc6eccd --- /dev/null +++ b/core/libssh2/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 138017 2011-09-14 11:16:24Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: ice-man <icemanf@gmail.com> + +pkgname=libssh2 +pkgver=1.3.0 +pkgrel=1 +pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" +url="http://www.libssh2.org/" +arch=('i686' 'x86_64') +license=('BSD') +depends=('openssl') +makedepends=('zlib') +options=('!libtool') +source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) +md5sums=('6425331899ccf1015f1ed79448cb4709' + '6ddcc9f2b37941f8291d7494ee8f89b7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index 079de12ca..f0ff53324 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,36 +1,49 @@ -# $Id: PKGBUILD 129474 2011-06-28 04:34:20Z allan $ +# $Id: PKGBUILD 137791 2011-09-11 02:39:11Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # NOTE: requires rebuilt with each new gcc version -pkgname=libtool +pkgname=('libtool' 'libltdl') pkgver=2.4 -pkgrel=4 +pkgrel=5 pkgrel=3 # holdver pkgdesc="A generic library support script" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libtool" license=('GPL') -depends=('sh' 'tar' 'gcc=4.6.1') -groups=('base-devel') options=('!libtool') -install=libtool.install source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz) md5sums=('4e6144439d95d7332dc50ace6dd24c55') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgbase}-${pkgver} make check } -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install +package_libtool() { + depends=('sh' "libltdl=$pkgver" 'gcc=4.6.1') + groups=('base-devel') + install=libtool.install + + cd ${srcdir}/${pkgbase}-${pkgver} + + make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ + install-data-local + rm -rf ${pkgdir}/usr/share/libtool/libltdl/ +} + +package_libltdl() { + pkgdesc="A system independent dlopen wrapper for GNU libtool" + + cd ${srcdir}/${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \ + install-ltdlincludeHEADERS install-data-local + rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config} } diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD index 3da9085d7..4106f80fa 100644 --- a/core/make/PKGBUILD +++ b/core/make/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129849 2011-06-29 04:28:30Z allan $ +# $Id: PKGBUILD 138005 2011-09-14 05:05:13Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=make pkgver=3.82 -pkgrel=3 +pkgrel=4 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/make" @@ -15,11 +15,13 @@ 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-sort-blank.patch + make-3.82-makeflags.patch) md5sums=('1a11100f3c63fcf5753818e59d63088f' 'c8f496b22191f9fb9420ab14c1a19a47' '662e6450e19a5acdaa5c9fcb8ad78dea' - '7d01a99f389d8f08dec93ed479071ee4') + '7d01a99f389d8f08dec93ed479071ee4' + 'bc12ad4d0c6e6c0e72d9fb61054f446b') build() { @@ -34,6 +36,10 @@ build() { # 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 } diff --git a/core/make/make-3.82-makeflags.patch b/core/make/make-3.82-makeflags.patch new file mode 100644 index 000000000..3cba3c402 --- /dev/null +++ b/core/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/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 6bd73e08b..d793695f0 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134363 2011-08-03 06:56:40Z tpowa $ +# $Id: PKGBUILD 138138 2011-09-17 10:36:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -17,6 +17,7 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm.conf mdadm_install mdadm_hook + mdadm_udev_install disable-werror.patch linux-3.0.patch) install=mdadm.install @@ -24,8 +25,9 @@ replaces=('raidtools') md5sums=('12ee2fbf3beddb60601fb7a4c4905651' '6df172c8f77b280018cf87eb3d313f29' '00cbed931db4f15b6ce49e3e7d433966' - '4bb000166fb13e82ceaa2422fdfaac7e' - '36f7cc564ed3267888d90208e0eb7adc' + '9b01e96b6c3c218fb61628c9281fe688' + 'c8c0713f5c7da51822ee6f3911473a1c' + 'cd258e1bf430c02a25f40b4329df9f57' '4ad87b74a4bc9a34621280abe0e0c3e4' 'c499b3edbf2c400c8a1984e18c7ce7fa') @@ -33,16 +35,21 @@ build() { cd $srcdir/$pkgname-$pkgver patch -Np0 -i ../disable-werror.patch patch -Np1 -i ../linux-3.0.patch - make CXiFLAGS="$CFLAGS" + make CXFLAGS="$CFLAGS" + # build static mdassemble for Arch's initramfs + make MDASSEMBLE_AUTO=1 mdassemble + } package() { cd $srcdir/$pkgname-$pkgver make INSTALL=/bin/install DESTDIR=$pkgdir install + install -D -m755 mdassemble $pkgdir/sbin/mdassemble install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm + install -D -m644 ../mdadm_udev_install $pkgdir/lib/initcpio/install/mdadm_udev # symlink for backward compatibility ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid } diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook index 1d217a5a8..7b2dc1ad1 100755 --- a/core/mdadm/mdadm_hook +++ b/core/mdadm/mdadm_hook @@ -39,4 +39,6 @@ run_hook () esac done fi + # assemble everything + [ -e $mdconfig ] && /sbin/mdassemble } diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install index f351cb292..b53258676 100644 --- a/core/mdadm/mdadm_install +++ b/core/mdadm/mdadm_install @@ -11,8 +11,7 @@ build() echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi - add_binary "/sbin/mdadm" - add_file "/lib/udev/rules.d/64-md-raid.rules" + add_binary "/sbin/mdassemble" } help () diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install new file mode 100644 index 000000000..9fc161624 --- /dev/null +++ b/core/mdadm/mdadm_udev_install @@ -0,0 +1,23 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " + BINARIES="" + FILES="" + SCRIPT="" + # check if a custom mdadm.conf exists + if grep -q ^ARRAY /etc/mdadm.conf; then + echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." + add_file "/etc/mdadm.conf" + fi + add_binary "/sbin/mdadm" + add_file "/lib/udev/rules.d/64-md-raid.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads raid arrays with udev. +HELPEOF +} diff --git a/core/mkinitcpio-nfs-utils/PKGBUILD b/core/mkinitcpio-nfs-utils/PKGBUILD index 7ab7e68fa..69b494888 100644 --- a/core/mkinitcpio-nfs-utils/PKGBUILD +++ b/core/mkinitcpio-nfs-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68748 2010-02-14 10:45:02Z thomas $ +# $Id: PKGBUILD 138224 2011-09-19 12:04:53Z pierre $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-nfs-utils pkgver=0.2 -pkgrel=1 +pkgrel=2 pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/" @@ -14,7 +14,7 @@ sha256sums=('3f2839f21a420cd732d34e58f84534acdb7fc29f69381dbba3f00e3424201cd3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make || return 1 + make } package() { diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD index 037967a9b..caf26a1c5 100644 --- a/core/sysvinit/PKGBUILD +++ b/core/sysvinit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92996 2010-10-02 19:26:38Z eric $ +# $Id: PKGBUILD 137779 2011-09-10 22:03:10Z tomegun $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=sysvinit pkgver=2.88 -pkgrel=2 +pkgrel=3 pkgdesc="Linux System V Init" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/sysvinit" @@ -24,4 +24,9 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}dsf" make ROOT="${pkgdir}" install + + # mountpoint is now provided by util-linux instead + cd "${pkgdir}" + rm bin/mountpoint + rm usr/share/man/man1/mountpoint.1 } diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 6bb6c2676..6265ddb53 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,42 +1,56 @@ -# $Id: PKGBUILD 135595 2011-08-16 14:10:53Z tomegun $ +# $Id: PKGBUILD 137777 2011-09-10 22:03:07Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux -pkgver=2.19.1 -pkgrel=3 +pkgver=2.20 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64' 'mips64el') groups=('base') -depends=('bash' 'ncurses>=5.7' 'zlib' 'filesystem') +depends=('filesystem') replaces=('linux32' 'util-linux-ng') conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') provides=('linux32' "util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2 - mount-segfault-2.19.1.patch - two-component-linux.patch) +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2 + agetty-typo.patch + write-freopen.patch + dmesg-non-printk.patch + dmesg-space.patch) optdepends=('perl: for chkdupexe support') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # add support for linux 3.0, which is needed mkswap - patch -Np1 -i ../two-component-linux.patch - # fix https://bugs.archlinux.org/task/24261 - patch -Np1 -i ../mount-segfault-2.19.1.patch + + # patches from master + for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch; do + patch -Np1 -i "${srcdir}/${patch}" + done + # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c - ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-partx + sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h + + ./configure --enable-arch\ + --enable-write\ + --enable-raw\ + --disable-wall\ + --enable-partx + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + install -dm755 "${pkgdir}/var/lib/hwclock" + make DESTDIR="${pkgdir}" install } -md5sums=('3eab06f05163dfa65479c44e5231932c' - '3247b52f0e4b8044f23f2f7218e2fdea' - '6eb23edb484adf7192e107d1c6d94bd3') +md5sums=('4dcacdbdafa116635e52b977d9d0e879' + '13838c6dd8df686e0f01ad0f236d2690' + '465817ff8f7c08411c8011ee91b50318' + 'f3ca75a1a22a2a739c5c22d92dc07ab0' + 'd9768f0b42d36d72c02ac7797b922ba1') diff --git a/core/util-linux/agetty-typo.patch b/core/util-linux/agetty-typo.patch new file mode 100644 index 000000000..a333d6280 --- /dev/null +++ b/core/util-linux/agetty-typo.patch @@ -0,0 +1,27 @@ +From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 7 Sep 2011 07:37:03 +0200 +Subject: [PATCH] agetty: double equals sign typo in opentty() + +Reported-by: Francesco Cosoleto <cosoleto@gmail.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + term-utils/agetty.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/term-utils/agetty.c b/term-utils/agetty.c +index 733be38..35bb389 100644 +--- a/term-utils/agetty.c ++++ b/term-utils/agetty.c +@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op) + * In case of a virtual console the ioctl TIOCMGET fails and + * the error number will be set to EINVAL. + */ +- if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) { ++ if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) { + op->flags |= F_VCONSOLE; + if (!op->term) + op->term = DEFAULT_VCTERM; +-- +1.7.6.1 + diff --git a/core/util-linux/dmesg-non-printk.patch b/core/util-linux/dmesg-non-printk.patch new file mode 100644 index 000000000..ea2354420 --- /dev/null +++ b/core/util-linux/dmesg-non-printk.patch @@ -0,0 +1,69 @@ +From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 31 Aug 2011 12:28:39 +0200 +Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels + + * dmesg(1) incorrectly assumes that lines like "<6>\n" + are broken. + + * it's more robust to assume the end of the record is "\n<" + + * print \n for empty lines + +Reported-by: "Gabor Z. Papp" <gzp@papp.hu> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/dmesg.c | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c +index 6090f4e..8e7bb4b 100644 +--- a/sys-utils/dmesg.c ++++ b/sys-utils/dmesg.c +@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + + if (!begin) + begin = p; +- if (*p == '\n') +- end = p; + if (i + 1 == rec->next_size) { + end = p + 1; + i++; +- } ++ } else if (*p == '\n' && *(p + 1) == '<') ++ end = p; ++ + if (begin && !*begin) + begin = NULL; /* zero(s) at the end of the buffer? */ + if (!begin || !end) +@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + } + } + +- if (end <= begin) +- return -1; /* error */ +- + if (*begin == '[' && (*(begin + 1) == ' ' || + isdigit(*(begin + 1)))) { + if (ctl->delta || ctl->ctime) { +@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size, + } + + while (get_next_record(ctl, &rec) == 0) { +- if (!rec.mesg_size) +- continue; + + if (!accept_record(ctl, &rec)) + continue; + ++ if (!rec.mesg_size) { ++ putchar('\n'); ++ continue; ++ } ++ + if (ctl->decode && rec.level >= 0 && rec.facility >= 0) + printf("%-6s:%-6s: ", facility_names[rec.facility].name, + level_names[rec.level].name); +-- +1.7.6.1 + diff --git a/core/util-linux/dmesg-space.patch b/core/util-linux/dmesg-space.patch new file mode 100644 index 000000000..2038888cc --- /dev/null +++ b/core/util-linux/dmesg-space.patch @@ -0,0 +1,31 @@ +From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Fri, 2 Sep 2011 14:42:04 +0200 +Subject: [PATCH] dmesg: remove extra space only after time stamp + +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/dmesg.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c +index 8e7bb4b..b3713a0 100644 +--- a/sys-utils/dmesg.c ++++ b/sys-utils/dmesg.c +@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + break; + } + } ++ if (begin < end && *begin == ' ') ++ begin++; + } + +- if (begin < end && *begin == ' ') +- begin++; +- + rec->mesg = begin; + rec->mesg_size = end - begin; + +-- +1.7.6.1 + diff --git a/core/util-linux/write-freopen.patch b/core/util-linux/write-freopen.patch new file mode 100644 index 000000000..a2014a107 --- /dev/null +++ b/core/util-linux/write-freopen.patch @@ -0,0 +1,27 @@ +From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Tue, 6 Sep 2011 03:18:46 +0200 +Subject: [PATCH] write: fix path for freopen() + +Reported-by: xinglp <xinglp@gmail.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + term-utils/write.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/term-utils/write.c b/term-utils/write.c +index a825f62..a70eb7b 100644 +--- a/term-utils/write.c ++++ b/term-utils/write.c +@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid) + + if (strlen(tty) + 6 > sizeof(path)) + errx(EXIT_FAILURE, _("tty path %s too long"), tty); +- printf(path, "/dev/%s", tty); ++ snprintf(path, sizeof(path), "/dev/%s", tty); + if ((freopen(path, "w", stdout)) == NULL) + err(EXIT_FAILURE, "%s", path); + +-- +1.7.6.1 + diff --git a/core/wget/PKGBUILD b/core/wget/PKGBUILD index 3b91a1234..168ab9bda 100644 --- a/core/wget/PKGBUILD +++ b/core/wget/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136829 2011-09-01 21:49:29Z allan $ +# $Id: PKGBUILD 138218 2011-09-19 05:03:16Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=wget -pkgver=1.13.3 +pkgver=1.13.4 pkgrel=1 pkgdesc="A network utility to retrieve files from the Web" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('ca-certificates: HTTPS downloads') backup=('etc/wgetrc') install=wget.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('540cbd50909885fe11bd7bc4f75268d1') +md5sums=('7f518b3a71e9efd330e9a0c3714f8463') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/aiksaurus/PKGBUILD b/extra/aiksaurus/PKGBUILD index 24fc074f9..7363dc4a6 100644 --- a/extra/aiksaurus/PKGBUILD +++ b/extra/aiksaurus/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 45575 2009-07-12 17:51:06Z ronald $ +# $Id: PKGBUILD 137720 2011-09-10 13:53:53Z pierre $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=aiksaurus pkgver=1.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="A cross-platform, open-source thesaurus" url="http://aiksaurus.sourceforge.net/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') options=('!libtool') depends=('gtk2') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - 'aiksaurus-gcc44.patch') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'aiksaurus-gcc44.patch') md5sums=('3eae03b7c49843ccc9262e52846ea6b4' '7f94749172116b1529fc21b718ee7636') @@ -20,9 +20,13 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} # gcc44 build patch - patch -Np0 -i ${srcdir}/aiksaurus-gcc44.patch || return 1 + patch -Np0 -i ${srcdir}/aiksaurus-gcc44.patch ./configure --prefix=/usr --with-gtk - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 473a7cef4..86b95bfc5 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 138066 2011-09-15 20:23:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi -pkgver=1.6.0 -pkgrel=2 +pkgver=1.6.1 +pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org/akonadi' @@ -13,7 +13,7 @@ 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') +md5sums=('8a78b2f9438ffc36d0f37d55839fb444') build() { cd "${srcdir}" 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/apache/PKGBUILD b/extra/apache/PKGBUILD index d98c73c2d..37d1a4a27 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136658 2011-08-31 11:29:58Z pierre $ +# $Id: PKGBUILD 138021 2011-09-14 11:59:52Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache -pkgver=2.2.20 +pkgver=2.2.21 pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64' 'mips64el') @@ -35,7 +35,7 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 httpd.logrotate httpd arch.layout) -md5sums=('1ac251431c8c4285f6b085c1d156bb56' +md5sums=('1696ae62cd879ab1d4dd9ff021a470f2' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' '0930d2d0612eb0a53a0d00aea7e8687f' diff --git a/extra/apricots/PKGBUILD b/extra/apricots/PKGBUILD index e0832363a..409e7f7e2 100644 --- a/extra/apricots/PKGBUILD +++ b/extra/apricots/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 27259 2009-02-18 02:43:34Z eric $ +# $Id: PKGBUILD 137632 2011-09-10 08:59:53Z pierre $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=apricots pkgver=0.2.6 -pkgrel=3 +pkgrel=4 pkgdesc="A simple 2D flying/bombing game similar to basic side scrollers" arch=("i686" "x86_64" 'mips64el') license=('GPL') url="http://www.fishies.org.uk/apricots.html" -depends=('gcc-libs' 'openal>=1.6.372' 'sdl' 'freealut>=1.1.0') -source=("http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz" \ - "apricots-0.2.6-freealut.patch") -md5sums=('910828d717e46d8cbd9c24f702d09fbc' '5f9f74082dfe162ab3ba51f6ec628f99') +depends=('gcc-libs' 'openal' 'sdl' 'freealut') +source=("http://www.fishies.org.uk/$pkgname-$pkgver.tar.gz" + "apricots-0.2.6-freealut.patch") +md5sums=('910828d717e46d8cbd9c24f702d09fbc' + '5f9f74082dfe162ab3ba51f6ec628f99') build() { cd $srcdir/$pkgname-$pkgver - patch -Np0 -i $startdir/src/apricots-0.2.6-freealut.patch || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 - make prefix=$pkgdir/usr install || return 1 + patch -p0 -i $srcdir/apricots-0.2.6-freealut.patch + ./configure --prefix=/usr + make LIBTOOL='/usr/bin/libtool' +} + +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr install } diff --git a/extra/aspell-de/PKGBUILD b/extra/aspell-de/PKGBUILD index a9f4b05c7..7346d3070 100644 --- a/extra/aspell-de/PKGBUILD +++ b/extra/aspell-de/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 116607 2011-03-24 12:52:36Z andrea $ +# $Id: PKGBUILD 137818 2011-09-11 20:26:33Z pierre $ # Maintainer: # Contributor: Simo Leone <simo@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=aspell-de -pkgver=20100727 -pkgrel=3 +pkgver=20110609 +pkgrel=1 pkgdesc="German dictionary for aspell" arch=('i686' 'x86_64' 'mips64el') url="http://j3e.de/ispell/igerman98/index.html" license=('GPL2') depends=('aspell') -source=(http://j3e.de/ispell/igerman98/dict/igerman98-${pkgver}.tar.bz2) -md5sums=('53a66eccaf15fa92d4e5085e7938ee69') -sha1sums=('7cfde06b3086b03b9d400998a7254598a5b72564') +source=("http://j3e.de/ispell/igerman98/dict/igerman98-${pkgver}.tar.bz2") +md5sums=('6e7ea765b6188c08d470111e221cc91a') build() { cd "${srcdir}/igerman98-${pkgver}" diff --git a/extra/at/PKGBUILD b/extra/at/PKGBUILD index 12689eb01..58c74feb5 100644 --- a/extra/at/PKGBUILD +++ b/extra/at/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 67220 2010-02-04 22:36:24Z giovanni $ +# $Id: PKGBUILD 138170 2011-09-18 03:48:48Z eric $ # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Todd Musall <tmusall@comcast.net> pkgname=at -pkgver=3.1.12 +pkgver=3.1.13 pkgrel=1 -pkgdesc="AT and batch delayed command scheduling utility and daemon." +pkgdesc="AT and batch delayed command scheduling utility and daemon" arch=('i686' 'x86_64' 'mips64el') -url="http://www.debian.org" +url="http://packages.qa.debian.org/a/at.html" license=('GPL') depends=('pam') makedepends=('ssmtp') backup=('etc/at.deny') source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz atd) -md5sums=('1e67991776148fb319fd77a2e599a765' +md5sums=('1da61af6c29e323abaaf13ee1a8dad79' '35574e34829e7df07a3269d4ab646a29') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ --mandir=/usr/share/man \ --with-jobdir=/var/spool/atd \ - --with-atspool=/var/spool/atd || return 1 - make || return 1 - make IROOT="${pkgdir}" docdir=/usr/share/doc install || return 1 - install -D -m755 ${srcdir}/atd "${pkgdir}/etc/rc.d/atd" || return 1 + --with-atspool=/var/spool/atd + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make IROOT="${pkgdir}" docdir=/usr/share/doc install + install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd" } diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 4082c750e..0df8b5229 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 136227 2011-08-25 02:57:58Z bisson $ +# $Id: PKGBUILD 138257 2011-09-19 16:24:40Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' arch=('i686' 'x86_64' 'mips64el') url='http://audacious-media-player.org/' license=('GPL3') -depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins') -optdepends=('unzip: zipped skins support' - 'hicolor-icon-theme: for icons' - 'gtk-update-icon-cache: for icons' - 'desktop-file-utils: desktop integration') +depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' + 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') +optdepends=('unzip: zipped skins support') source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") -sha1sums=('68799076acafb151668285e8d9498048633d7b60') +sha1sums=('713cc7ee277ca548ea143b4ec3bd40bcacdb327f') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/audacious/install b/extra/audacious/install index 4a3873e96..b6ce5bc02 100644 --- a/extra/audacious/install +++ b/extra/audacious/install @@ -1,6 +1,6 @@ post_install() { - type update-desktop-database &>/dev/null && update-desktop-database -q - type gtk-update-icon-cache &>/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor true } diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD index bb4fd7db1..fa335c045 100644 --- a/extra/autogen/PKGBUILD +++ b/extra/autogen/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 54699 2009-10-11 18:34:42Z jgc $ +# $Id: PKGBUILD 137955 2011-09-13 05:19:48Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soufly.nl> # Contributor: Tor Krill pkgname=autogen -pkgver=5.9.9 +pkgver=5.12 pkgrel=1 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://autogen.sourceforge.net/" license=('GPL3') -depends=('guile>=1.8.6' 'libxml2>=2.7.3' 'libtool>=2.2.6a') -options=('!libtool' '!makeflags') +depends=('guile' 'libxml2') +options=('!libtool') install=autogen.install -source=(http://downloads.sourceforge.net/autogen/${pkgname}-${pkgver}.tar.bz2) -md5sums=('da6c6185473d8b2d7c83e583f4213018') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('126e56be629cda747390e8ba9be71e4b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index 587b7abff..6745d25f4 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 124622 2011-05-23 14:30:18Z ibiru $ +# $Id: PKGBUILD 138285 2011-09-19 20:41:10Z ibiru $ # Contributor: György Balló <ballogy@freestart.hu> pkgname=banshee -pkgver=2.0.1 -pkgrel=2 +pkgver=2.2.0 +pkgrel=1 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://banshee.fm/" license=('MIT') -depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp') +depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins notify-sharp-svn dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gtk-sharp-beans 'gudev-sharp' 'gkeyfile-sharp' gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info) makedepends=('intltool' 'gnome-doc-utils') optdepends=('gstreamer0.10-good-plugins: Extra media codecs' 'gstreamer0.10-ugly-plugins: Extra media codecs' @@ -17,20 +17,23 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs' 'brasero: CD burning') options=('!libtool') install=$pkgname.install -source=(http://download.banshee.fm/$pkgname/stable/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('83d77447936eed84eba2123b341b62ea') +source=(http://download.gnome.org/sources/$pkgname/2.2/$pkgname-$pkgver.tar.xz + banshee-recent-gpod.patch) +sha256sums=('85026f270777be15b778a8bf676d2c6e1a0d3d9758145515809bf209f7ab1815' +'018eeb00d1b4e625d13f1184863e499be5b5dde050a7513e012d5898125073d9') build() { export MONO_SHARED_DIR="$srcdir/.wabi" mkdir -p "$MONO_SHARED_DIR" cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/banshee-recent-gpod.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-docs \ --disable-static \ --disable-scrollkeeper \ - --disable-ipod --disable-hal \ + --disable-schemas-install \ --with-vendor-build-id=ArchLinux make } diff --git a/extra/banshee/banshee-recent-gpod.patch b/extra/banshee/banshee-recent-gpod.patch new file mode 100644 index 000000000..afb3a0fd1 --- /dev/null +++ b/extra/banshee/banshee-recent-gpod.patch @@ -0,0 +1,24 @@ +From d4cd959c4a48ffc9da8fe0983bd31c4647669bf4 Mon Sep 17 00:00:00 2001 +From: William Witt <william@witt-family.net> +Date: Sat, 30 Jul 2011 21:54:41 -0500 +Subject: [PATCH] - Changed typecast on FileSize to uint in AppleDeviceTrackInfo to comply with libgpod-sharp + +--- + .../AppleDeviceTrackInfo.cs | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs +index 178266d..b8549f7 100644 +--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs ++++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs +@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice + track.CDs = DiscCount; + track.CDNumber = DiscNumber; + track.TrackLength = (int) Duration.TotalMilliseconds; +- track.Size = (int)FileSize; ++ track.Size = (uint)FileSize; + track.Grouping = Grouping; + try { + track.TimePlayed = LastPlayed; +-- +1.7.3.4 diff --git a/extra/bc/PKGBUILD b/extra/bc/PKGBUILD index 9ee8962c7..7723696ae 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' 'mips64el') 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/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD index ba8bd73c1..478c142dc 100644 --- a/extra/bigloo/PKGBUILD +++ b/extra/bigloo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110532 2011-02-19 18:50:57Z ibiru $ +# $Id: PKGBUILD 138164 2011-09-17 22:07:10Z andrea $ # Maintainer: Jürgen Hötzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: Kevin Piche <kevin@archlinux.org> @@ -6,13 +6,13 @@ pkgname=bigloo _pkgver=3.6a pkgver=${_pkgver/-/_} -pkgrel=2 +pkgrel=3 pkgdesc="Fast scheme compiler" arch=('i686' 'x86_64' 'mips64el') url="http://www-sop.inria.fr/mimosa/fp/Bigloo/" license=('GPL' 'LGPL') depends=('openssl' 'sqlite3') -makedepends=('jdk' 'emacs') +makedepends=('java-environment' 'emacs' 'zip') optdepends=('emacs') options=('!makeflags') install=bigloo.install @@ -29,7 +29,7 @@ build() { --infodir=/usr/share/info \ --docdir=/usr/share/doc/bigloo \ --dotnet=no \ - --javaprefix=/opt/java/bin + --jvm=yes make build compile-bee } diff --git a/extra/bigloo/bigloo.install b/extra/bigloo/bigloo.install index fd7a64edb..dd0d70421 100644 --- a/extra/bigloo/bigloo.install +++ b/extra/bigloo/bigloo.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(bigloo.info bdb.info) post_install() { diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 22ed2d921..4f63eeece 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136183 2011-08-23 19:33:20Z bisson $ +# $Id: PKGBUILD 138192 2011-09-18 13:23:24Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,12 +7,12 @@ pkgname=bitlbee pkgver=3.0.3 -pkgrel=3 +pkgrel=4 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64' 'mips64el') url='http://www.bitlbee.org/' license=('GPL') -depends=('gnutls' 'glib2' 'libotr') +depends=('openssl' 'glib2' 'libotr') optdepends=('xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' @@ -32,7 +32,7 @@ build() { --pidfile=/var/run/bitlbee/bitlbee.pid \ --ipcsocket=/var/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/lib/systemd/system \ - --ssl=gnutls \ + --ssl=openssl \ --strip=0 \ --otr=1 \ --ssl=gnutls diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index abb806310..913e1f593 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135566 2011-08-15 21:13:25Z eric $ +# $Id: PKGBUILD 137652 2011-09-10 10:56:27Z pierre $ # Contributor: John Sowiak <john@archlinux.org> # Maintainer: tobias <tobias@archlinux.org> @@ -13,7 +13,7 @@ _svn=false pkgname=blender pkgver=2.59 -pkgrel=1 +pkgrel=2 epoch=2 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index c02f14561..909e4cadd 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 132780 2011-07-26 07:20:57Z andrea $ +# $Id: PKGBUILD 137972 2011-09-13 10:41:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=bluedevil -pkgver=1.1.1 +pkgver=1.2 pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b3764fb8ead502e2d410b0c0fc86ac6c') +md5sums=('09ed36095367dd51ab8c23e0705cf411') build(){ cd "${srcdir}" diff --git a/extra/bmp-musepack/PKGBUILD b/extra/bmp-musepack/PKGBUILD index 8aea2500c..0cde321fb 100644 --- a/extra/bmp-musepack/PKGBUILD +++ b/extra/bmp-musepack/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 30184 2009-03-17 03:27:59Z eric $ +# $Id: PKGBUILD 137709 2011-09-10 13:05:29Z pierre $ # Maintainer: damir <damir@archlinux.org> # Contributor: Nikos Kouremenos <nk@ebox.gr> pkgname=bmp-musepack pkgver=1.2 -pkgrel=3 +pkgrel=4 pkgdesc="A BMP plugin for playing sounds in Musepack (MPC) format" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://musepack.net/" license=('BSD') -depends=('bmp' 'libmpcdec>=1.2.5' 'taglib') +depends=('bmp' 'libmpcdec' 'taglib') groups=('bmp-plugins' 'bmp-io-plugins') options=('!libtool') -source=(http://files.musepack.net/linux/plugins/${pkgname}-${pkgver}.tar.bz2) +source=("http://files.musepack.net/linux/plugins/${pkgname}-${pkgver}.tar.bz2") md5sums=('5fe0c9d341ca37d05c780a478f829a5f') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/bmp-wma/PKGBUILD b/extra/bmp-wma/PKGBUILD index e8d082961..55449d66f 100644 --- a/extra/bmp-wma/PKGBUILD +++ b/extra/bmp-wma/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 49817 2009-08-16 16:08:10Z jgc $ +# $Id: PKGBUILD 137730 2011-09-10 14:26:41Z pierre $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Ewoud Nuyts <ewoud.nuyts@gmail.com> pkgname=bmp-wma pkgver=0.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="WMA plugin for Beep Media Player" url="http://bmp-plugins.berlios.de/novelian/project.php?p=bmp-wma" license=('GPL') arch=('x86_64' 'i686' 'mips64el') depends=('bmp') groups=('bmp-plugins' 'bmp-io-plugins') -options=(!libtool !emptydirs) -source=(http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz - bmp-wma-gcc4.patch) +options=('!libtool' '!emptydirs') +source=("http://download.berlios.de/bmp-plugins/${pkgname}-${pkgver}.tar.gz" + 'bmp-wma-gcc4.patch') md5sums=('8dcf3fcdb10e8e2e386f70745812412b' '730eba8f41e989dd8b56c18bcc826cc4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch" || return 1 + patch -Np0 -i "${srcdir}/bmp-wma-gcc4.patch" if [ "${CARCH}" = "x86_64" ]; then export CFLAGS="${CFLAGS} -fPIC" fi - ./configure --prefix=/usr --disable-static || return 1 + ./configure --prefix=/usr --disable-static echo '#define HAVE_LRINTF 1' >> config.h - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD index bf9f545b4..7d7f338c5 100644 --- a/extra/bzr/PKGBUILD +++ b/extra/bzr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136739 2011-08-31 19:42:25Z eric $ +# $Id: PKGBUILD 138003 2011-09-14 02:50:25Z eric $ # Maintainer : # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=bzr -pkgver=2.4.0 +pkgver=2.4.1 pkgrel=1 pkgdesc="A decentralized revision control system (bazaar)" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('python2') optdepends=('python-paramiko: for sftp support') source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") -md5sums=('087c65e4b79f454b9e733c21607bdd56') +md5sums=('61068bfc1f0c9fb8a4b92bca204e0df8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/capi4k-utils/PKGBUILD b/extra/capi4k-utils/PKGBUILD index a7ee7ff40..c76578120 100644 --- a/extra/capi4k-utils/PKGBUILD +++ b/extra/capi4k-utils/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 39034 2009-05-11 08:28:48Z tpowa $ +# $Id: PKGBUILD 137697 2011-09-10 12:45:15Z pierre $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=capi4k-utils pkgver=050718 -pkgrel=7 +pkgrel=8 pkgdesc="capi utils for isdn cards" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="ftp://ftp.in-berlin.de/pub/capi4linux/" makedepends=('ppp') depends=('glibc' 'bash') -backup=(etc/capi.conf) -source=(ftp://ftp.in-berlin.de/pub/capi4linux/capi4k-utils-2005-07-18.tar.gz - ppp-2.4.4.patch - config - capi.conf - capiinit.rc - capi-compile.patch) -options=(!libtool) +backup=('etc/capi.conf') +source=('ftp://ftp.in-berlin.de/pub/capi4linux/capi4k-utils-2005-07-18.tar.gz' + 'ppp-2.4.4.patch' + 'config' + 'capi.conf' + 'capiinit.rc' + 'capi-compile.patch') +options=('!libtool') md5sums=('c745759b6b3d64e19763727176648cdf' 'c5416b8b1b76a82c4bcaad76140369e1' '146aa9e06588511c447d7e81dafec86a' @@ -27,24 +27,28 @@ md5sums=('c745759b6b3d64e19763727176648cdf' build() { cd $srcdir/$pkgname - patch -Np1 -i ../ppp-2.4.4.patch || return 1 + patch -Np1 -i ../ppp-2.4.4.patch # fix compiling with gcc 4.2 - patch -Np1 -i ../capi-compile.patch || return 1 + patch -Np1 -i ../capi-compile.patch cp ../config .config # fix pppd plugin - sed -i -e 's/2.3.11 2.4.0 2.4.1 2.4.1b1 2.4.1b2 2.4.2b3 2.4.2 2.4.3/2.4.4/g' $startdir/src/$pkgname/pppdcapiplugin/Makefile + sed -i -e 's/2.3.11 2.4.0 2.4.1 2.4.1b1 2.4.1b2 2.4.2b3 2.4.2 2.4.3/2.4.4/g' $srcdir/$pkgname/pppdcapiplugin/Makefile # patch all Makefile.* and Rules.make to use our CFLAGS sed -i -e "s:^\(CFLAGS.*\)-O2:\1${CFLAGS}:g" */Makefile.* */Rules.make # Arch64 fix from Gentoo # patch capi20/Makefile.* to use -fPIC for shared library - [ "$CARCH" = "x86_64" ] && (sed -i -e "s:^\(CFLAGS.*\):\1 -fPIC:g" capi20/Makefile.* || return 1) + [ "$CARCH" = "x86_64" ] && (sed -i -e "s:^\(CFLAGS.*\):\1 -fPIC:g" capi20/Makefile.*) cd capi20 aclocal libtoolize --copy --force cd $srcdir/$pkgname - make subconfig || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make subconfig + make +} + +package() { + cd $srcdir/$pkgname + make DESTDIR=$pkgdir install install -m755 -D $srcdir/capiinit.rc $pkgdir/etc/rc.d/capiinit install -m644 $srcdir/capi.conf $pkgdir/etc cd $pkgdir/usr/lib diff --git a/extra/capseo/PKGBUILD b/extra/capseo/PKGBUILD index d94f8210f..a185964b4 100644 --- a/extra/capseo/PKGBUILD +++ b/extra/capseo/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 49837 2009-08-16 16:56:46Z jgc $ +# $Id: PKGBUILD 137732 2011-09-10 14:29:41Z pierre $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=capseo pkgver=0.3 -pkgrel=1 +pkgrel=2 +epoch=1 pkgdesc="Capseo video codec" arch=('i686' 'x86_64' 'mips64el') url="http://dev.gentoo.org/~trapni/capseo/" license=('GPL2') depends=('libgl' 'gcc-libs') -options=('force' '!libtool') +options=('!libtool') makedepends=('pkgconfig' 'mesa' 'libogg') -source=(ftp://ftp.archlinux.org/other/capseo/${pkgname}-${pkgver}.tar.gz) +source=("ftp://ftp.archlinux.org/other/capseo/${pkgname}-${pkgver}.tar.gz") md5sums=('bd869e8c9b1081e90a44567092ea8c5e') build() { - # start building cd "${srcdir}" - ./autogen.sh || return 1 - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./autogen.sh + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/cdrdao/PKGBUILD b/extra/cdrdao/PKGBUILD index 756193f4e..289b3825c 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' 'mips64el') 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/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD index 452897490..115645330 100644 --- a/extra/chkrootkit/PKGBUILD +++ b/extra/chkrootkit/PKGBUILD @@ -1,24 +1,31 @@ -# $Id: PKGBUILD 52041 2009-09-14 15:18:27Z giovanni $ -# Maintainer: Hugo Doria <hugo@archlinux.org> -# Contributor: Gregor Ibic <gregor.ibic@intelicom.si> +# $Id: PKGBUILD 137609 2011-09-10 03:51:07Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=chkrootkit pkgver=0.49 -pkgrel=1 -pkgdesc="Locally checks for signs of a rootkit." +pkgrel=2 +pkgdesc="Locally checks for signs of a rootkit" arch=('i686' 'x86_64' 'mips64el') url="http://www.chkrootkit.org" -depends=('bash') +depends=('sh' 'net-tools') license=('BSD') source=(ftp://ftp.pangeia.com.br/pub/seg/pac/${pkgname}.tar.gz fix-tools-path.patch) -md5sums=('304d840d52840689e0ab0af56d6d3a18' '6a2f3038114b8b14e1ad74e30fe44eee') +md5sums=('304d840d52840689e0ab0af56d6d3a18' + '6a2f3038114b8b14e1ad74e30fe44eee') +sha1sums=('cec1a3c482b95b20d3a946b07fffb23290abc4a6' + 'f192cda177ec1920ce3313ed983ac44ee571ca6c') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p0 < ${srcdir}/fix-tools-path.patch - chown root:root * - make sense || return 1 - find ${srcdir}/${pkgname}-${pkgver} -perm /u+x -type f \ - -execdir install -D -m755 "{}" ${pkgdir}/usr/bin/"{}" ";" - install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/LICENSE.txt + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i "${srcdir}/fix-tools-path.patch" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit chkrootkit.orig \ + chkutmp chkwtmp ifpromisc strings-static ; do + install -D -m755 $i "${pkgdir}/usr/bin/$i" + done + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/cmatrix/PKGBUILD b/extra/cmatrix/PKGBUILD index aa8fd9543..40e62d1fb 100644 --- a/extra/cmatrix/PKGBUILD +++ b/extra/cmatrix/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 53887 2009-10-03 18:54:48Z eric $ -# Contributor: john +# $Id: PKGBUILD 137613 2011-09-10 04:45:43Z eric $ +# Maintainer: pkgname=cmatrix pkgver=1.2a -pkgrel=5 +pkgrel=6 pkgdesc="Let you see the matrix code in your console" arch=('i686' 'x86_64' 'mips64el') url="http://www.asty.org/cmatrix/" license=('GPL') depends=('ncurses' 'fontconfig') -install=$pkgname.install +install=cmatrix.install source=(http://www.asty.org/cmatrix/dist/$pkgname-$pkgver.tar.gz) md5sums=('ebfb5733104a258173a9ccf2669968a1') sha1sums=('ca078c10322a47e327f07a44c9a42b52eab5ad93') build() { cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 - - install -Dm644 mtx.pcf "$pkgdir/usr/share/fonts/misc/mtx.pcf" || return 1 - install -Dm644 matrix.fnt "$pkgdir/usr/share/kbd/consolefonts/matrix.fnt" || return 1 - install -m644 matrix.psf.gz "$pkgdir/usr/share/kbd/consolefonts" || return 1 + install -Dm644 mtx.pcf "$pkgdir/usr/share/fonts/misc/mtx.pcf" + install -Dm644 matrix.fnt "$pkgdir/usr/share/kbd/consolefonts/matrix.fnt" + install -Dm644 matrix.psf.gz "$pkgdir/usr/share/kbd/consolefonts/matrix.psf.gz" } diff --git a/extra/cmt/PKGBUILD b/extra/cmt/PKGBUILD index 4e0bcd62c..fd45d6bad 100644 --- a/extra/cmt/PKGBUILD +++ b/extra/cmt/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 49841 2009-08-16 18:10:08Z jgc $ +# $Id: PKGBUILD 137734 2011-09-10 14:32:08Z pierre $ #Maintainer: Damir Perisa <damir.perisa@bluewin.ch> #Contributor: Robert Emil Berge <robert@rebi.no> pkgname=cmt pkgver=1.16 -pkgrel=2 +pkgrel=3 pkgdesc="CMT for LADSPA" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.ladspa.org" depends=('ladspa' 'gcc-libs') groups=('ladspa-plugins') -source=(http://www.ladspa.org/download/${pkgname}_src_${pkgver}.tgz) +source=("http://www.ladspa.org/download/${pkgname}_src_${pkgver}.tgz") md5sums=('15a875e5aaf79c209c223babfb41cb1c') build() { cd "${srcdir}/${pkgname}/src" sed -e "/^CFLAGS/ s/-O3/${CFLAGS}/" \ -e 's|-Werror||g' \ - -i makefile || return 1 - make || return 1 + -i makefile + make +} + +package() { + cd "${srcdir}/${pkgname}/src" install -m755 -d "${pkgdir}/usr/lib/ladspa" - install -m755 ../plugins/cmt.so "${pkgdir}/usr/lib/ladspa/" || return 1 + install -m755 ../plugins/cmt.so "${pkgdir}/usr/lib/ladspa/" } diff --git a/extra/compface/PKGBUILD b/extra/compface/PKGBUILD index ed8935133..46ccc1d26 100644 --- a/extra/compface/PKGBUILD +++ b/extra/compface/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 32263 2009-03-29 22:19:00Z eric $ +# $Id: PKGBUILD 137677 2011-09-10 11:50:26Z pierre $ # Maintainer: simo <simo@archlinux.org> # Contributor: Manolis Tzanidakis -# pkgname=compface pkgver=1.5.2 -pkgrel=2 +pkgrel=3 pkgdesc="Utils & libs to convert from/to X-Face format." -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://ftp.xemacs.org/pub/xemacs/aux/" license=('custom') depends=('glibc') -source=($url/$pkgname-$pkgver.tar.gz LICENSE) -md5sums=('62f4f79c0861ad292ba3cf77b4c48319' '27a0d5a4d695e68b4d3eebe17db77189') +source=("$url/$pkgname-$pkgver.tar.gz" 'LICENSE') +md5sums=('62f4f79c0861ad292ba3cf77b4c48319' + '27a0d5a4d695e68b4d3eebe17db77189') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr || return 1 - make || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make BINDIR=$pkgdir/usr/bin LIBDIR=$pkgdir/usr/lib MANDIR=$pkgdir/usr/share/man \ - INCLUDEDIR=$pkgdir/usr/include install || return 1 + INCLUDEDIR=$pkgdir/usr/include install install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/dasher/PKGBUILD b/extra/dasher/PKGBUILD index cd566c124..e6da6487b 100644 --- a/extra/dasher/PKGBUILD +++ b/extra/dasher/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 54725 2009-10-11 18:48:49Z jgc $ +# $Id: PKGBUILD 137741 2011-09-10 14:49:04Z pierre $ # Maintainer: damir <damir@archlinux.org> pkgname=dasher pkgver=4.10.1 -pkgrel=2 +pkgrel=3 pkgdesc="Information-efficient text-entry interface, driven by natural continuous pointing gestures" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('at-spi>=1.27.91' 'libgnomeui>=2.24.1' 'gnome-speech>=0.4.25' 'gconf>=2.26.2-3' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils>=0.17.3') +depends=('at-spi' 'libgnomeui' 'gnome-speech' 'gconf' 'hicolor-icon-theme') +makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome-extra') -options=(!emptydirs) +options=('!emptydirs') install=dasher.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.10/${pkgname}-${pkgver}.tar.bz2) +source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/4.10/${pkgname}-${pkgver}.tar.bz2") md5sums=('83e556690ac54c4bb8c49c050510259e') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ - --disable-scrollkeeper --enable-speech || return 1 - make || return 1 - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + --disable-scrollkeeper --enable-speech + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain dasher ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain dasher ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } diff --git a/extra/dcfldd/PKGBUILD b/extra/dcfldd/PKGBUILD index 11b0b4067..cd547aba4 100644 --- a/extra/dcfldd/PKGBUILD +++ b/extra/dcfldd/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 47983 2009-07-30 02:30:21Z eric $ +# $Id: PKGBUILD 137724 2011-09-10 14:16:18Z pierre $ # Contributor: Paul Mattal <pjmattal@elys.com> # Maintainer: Paul Mattal <pjmattal@elys.com> + pkgname=dcfldd pkgver=1.3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="DCFL (DoD Computer Forensics Lab) dd replacement with hashing" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://dcfldd.sourceforge.net/" license=('GPL') -depends=(glibc) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver%.*}-${pkgver##*.}.tar.gz) +depends=('glibc') +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver%.*}-${pkgver##*.}.tar.gz") md5sums=('952026c872f11b53ce0ec6681a3eef0a') sha1sums=('fb1c55f107a6af5ef8703a44d33476e508815913') build() { - cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}" || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}" + make DESTDIR="$pkgdir" install } diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD index 260d5f405..563254a52 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' 'mips64el') @@ -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/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD index 9cf3855ea..0c0b8720d 100644 --- a/extra/diffstat/PKGBUILD +++ b/extra/diffstat/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 108700 2011-02-02 16:57:59Z giovanni $ +# $Id: PKGBUILD 137783 2011-09-10 22:56:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de> pkgname=diffstat pkgver=1.54 -pkgrel=1 +pkgrel=2 pkgdesc="Display a histogram of diff changes" arch=('i686' 'x86_64' 'mips64el') url="http://invisible-island.net/diffstat" depends=('glibc') -license=('GPL') +license=('MIT') source=("ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz") md5sums=('af08bef2eb37050ceb0c4fddedb2ee36') @@ -18,10 +18,12 @@ build () { ./configure --prefix=/usr \ --mandir=/usr/share/man - make || return 1 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir}/ install || return 1 + + make DESTDIR=${pkgdir}/ install + install -Dm644 package/debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index e40f2c6c3..08c429b38 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134112 2011-08-01 17:31:36Z andrea $ +# $Id: PKGBUILD 138026 2011-09-14 18:37:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam -pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libmediawiki') -pkgver=2.0.0 -pkgrel=2 +pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') +pkgver=2.1.1 +pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7b1ab69fc2fb36a45dc3ca38b01d42d8') +md5sums=('8cd3f5f2141bbb54ba2fd80371582c2c') build() { cd "${srcdir}" @@ -61,6 +61,14 @@ package_libkgeomap() { make DESTDIR="${pkgdir}" install } +package_libkvkontakte() { + pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network" + depends=('kdelibs') + + cd "${srcdir}"/build/extra/libkvkontakte + make DESTDIR="${pkgdir}" install +} + package_libmediawiki() { pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org" depends=('kdelibs') @@ -72,7 +80,7 @@ package_libmediawiki() { package_kipi-plugins() { pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' - 'opencv' 'qjson') + 'opencv' 'qjson' 'libkvkontakte') optdepends=('libkgeomap' 'libmediawiki' 'libgpod' diff --git a/extra/dmapi/PKGBUILD b/extra/dmapi/PKGBUILD index fc8cb486b..c7b6e6683 100644 --- a/extra/dmapi/PKGBUILD +++ b/extra/dmapi/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 47579 2009-07-24 05:47:49Z tpowa $ +# $Id: PKGBUILD 137722 2011-09-10 14:14:07Z pierre $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> + pkgname=dmapi pkgver=2.2.10 -pkgrel=2 +pkgrel=3 pkgdesc="Data migration API" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://oss.sgi.com/projects/xfs/" license=('GPL') depends=('glibc') @@ -13,16 +14,23 @@ provides=('xfsdmapi') conflicts=('xfsdmapi') replaces=('xfsdmapi') options=('!libtool') -source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz) +source=("ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz") md5sums=('c6e4ace10c446bbb92576e5dd19aec24') build() { - cd $startdir/src/dmapi-$pkgver + cd $srcdir/dmapi-$pkgver [ "$CARCH" = "x86_64" ] && export CFLAGS="$CLFAGS -fPIC" + export INSTALL_USER=root + export INSTALL_GROUP=root + export DEBUG=-DNDEBUG autoconf - ./configure --prefix=$pkgdir/usr - make || return 1 - make prefix=$pkgdir/usr/ install install-dev || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/dmapi-$pkgver + make DIST_ROOT=$pkgdir install install-dev # the static lib install -D -m644 libdm/.libs/libdm.a $pkgdir/usr/lib/libdm.a # and the header file, please diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 388d61455..8e78bb04c 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 136349 2011-08-27 02:25:00Z dreisner $ +# $Id: PKGBUILD 137814 2011-09-11 16:06:30Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq pkgver=2.58 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('glibc' 'bash' 'dbus-core') makedepends=('libcap>=2.16') -backup=('etc/dnsmasq.conf') -install= -source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" - 'rc.dnsmasq') +install=$pkgname.install +backup=('etc/dnsmasq.conf' + 'etc/conf.d/dnsmasq') +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" + 'dnsmasq.confd' + 'rc.dnsmasq' + 'dnsmasq.service') md5sums=('14c5c81debb324adc261db971730f4c6' - 'e956eee1ec24212a3254d2b168187495') + '66479e99123faeab83ebaed709ef95b5' + '818c122ea4d81868a75afad109411170' + 'f329d86f8ba1cd85f9b6ee59e0ce3791') build() { cd "$srcdir/$pkgname-$pkgver" @@ -35,9 +40,11 @@ package() { install -dm755 "$pkgdir"/var/{db,lib/misc} install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq + install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq" + install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf - install -Dm644 "contrib/systemd/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service + install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/lib/systemd/system/dnsmasq.service } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/dnsmasq/dnsmasq.confd b/extra/dnsmasq/dnsmasq.confd new file mode 100644 index 000000000..933b92850 --- /dev/null +++ b/extra/dnsmasq/dnsmasq.confd @@ -0,0 +1,9 @@ +# +# runtime config for dnsmasq +# + +# if unset, dnsmasq will run as nobody. +DNSMASQ_USER=dnsmasq + +# other runtime options. treated as an array. +DNSMASQ_OPTS=() diff --git a/extra/dnsmasq/dnsmasq.install b/extra/dnsmasq/dnsmasq.install new file mode 100644 index 000000000..c2edb7db5 --- /dev/null +++ b/extra/dnsmasq/dnsmasq.install @@ -0,0 +1,21 @@ +#!/bin/sh + +add_dnsmasq_user() { + if ! getent passwd dnsmasq >/dev/null; then + useradd -r -d / -c 'dnsmasq daemon' -s /sbin/nologin dnsmasq + fi +} + +post_install() { + add_dnsmasq_user +} + +post_upgrade() { + add_dnsmasq_user +} + +post_remove() { + if getent passwd dnsmasq >/dev/null; then + userdel dnsmasq + fi +} diff --git a/extra/dnsmasq/dnsmasq.service b/extra/dnsmasq/dnsmasq.service new file mode 100644 index 000000000..b09cb24b9 --- /dev/null +++ b/extra/dnsmasq/dnsmasq.service @@ -0,0 +1,13 @@ +[Unit] +Description=A lightweight DHCP and caching DNS server + +[Service] +Type=dbus +BusName=uk.org.thekelleys.dnsmasq +ExecStartPre=/usr/sbin/dnsmasq --test +ExecStart=/usr/sbin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target +Alias=dbus-uk.org.thekelleys.dnsmasq diff --git a/extra/dnsmasq/rc.dnsmasq b/extra/dnsmasq/rc.dnsmasq index 167607294..2ded33695 100755 --- a/extra/dnsmasq/rc.dnsmasq +++ b/extra/dnsmasq/rc.dnsmasq @@ -2,35 +2,52 @@ . /etc/rc.conf . /etc/rc.d/functions +. /etc/conf.d/dnsmasq -PID=`pidof -o %PPID /usr/sbin/dnsmasq` -case "$1" in +pidfile=/run/dnsmasq.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case $1 in start) stat_busy "Starting DNS/DHCP daemon" - [ -z "$PID" ] && /usr/sbin/dnsmasq - if [ $? -gt 0 ] ; then - stat_fail + if [[ -z $PID ]] && /usr/sbin/dnsmasq --test && + /usr/sbin/dnsmasq "--user=${DNSMASQ_USER:-nobody}" \ + "--pid-file=$pidfile" \ + "${DNSMASQ_OPTS[@]}"; then + add_daemon dnsmasq + stat_done else - add_daemon dnsmasq # create the 'state' dir - stat_done + stat_fail fi ;; stop) stat_busy "Stopping DNS/DHCP daemon" - [ "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dnsmasq # remove the 'state' dir + if [[ $PID ]] && kill "$PID" &> /dev/null; then + # dnsmasq doesn't clean up after itself + rm -f "$pidfile" + rm_daemon dnsmasq stat_done + else + stat_fail fi ;; restart) $0 stop - sleep 5 + sleep 1 $0 start ;; + checkconfig) + # diagnostics will be printed, with zero/non-zero exit + /usr/sbin/dnsmasq --test + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 <start|stop|restart|checkconfig>" esac -exit 0 + diff --git a/extra/docker/PKGBUILD b/extra/docker/PKGBUILD index 2df7e6013..6f1529084 100644 --- a/extra/docker/PKGBUILD +++ b/extra/docker/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 36979 2009-04-29 06:44:04Z eric $ +# $Id: PKGBUILD 137718 2011-09-10 13:25:58Z pierre $ # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=docker pkgver=1.5 -pkgrel=4 +pkgrel=5 pkgdesc="Docker is a docking application (WindowMaker dock app) which acts as a system tray for KDE and GNOME2." -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://icculus.org/openbox/2/docker/" license=('GPL') depends=('glibc' 'glib2' 'libx11') -source=(http://icculus.org/openbox/2/$pkgname/$pkgname-$pkgver.tar.gz) +source=("http://icculus.org/openbox/2/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('349320bebd43babb8b43e11c7aae0293') build() { cd $srcdir/$pkgname-$pkgver - install -d $pkgdir/usr/bin || return 1 - make || return 1 - make PREFIX=$pkgdir/usr install || return 1 + install -d $pkgdir/usr/bin + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make PREFIX=$pkgdir/usr install } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 7658f0311..8108bf6b4 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136453 2011-08-29 14:56:34Z andyrtr $ +# $Id: PKGBUILD 138194 2011-09-18 13:49:40Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.0.14 +pkgver=2.0.15 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ backup=(etc/dovecot/dovecot.conf etc/ssl/dovecot-openssl.cnf) install=$pkgname.install source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh) -md5sums=('92a10a6ca341921db9e35c6753e8de0b' +md5sums=('16a08dfd24422d482440a8b03d6f7f6c' '587159e84e2da6f83d70b3c706ba87cc') build() { diff --git a/extra/dvd+rw-tools/PKGBUILD b/extra/dvd+rw-tools/PKGBUILD index 189753a6b..297eaa67f 100644 --- a/extra/dvd+rw-tools/PKGBUILD +++ b/extra/dvd+rw-tools/PKGBUILD @@ -1,29 +1,43 @@ -# $Id: PKGBUILD 49778 2009-08-15 15:54:31Z jgc $ +# $Id: PKGBUILD 137803 2011-09-11 11:04:53Z pierre $ # Maintainer: damir <damir@archlinux.org> pkgname=dvd+rw-tools pkgver=7.1 -pkgrel=2 +pkgrel=4 pkgdesc="dvd burning tools" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://fy.chalmers.se/~appro/linux/DVD+RW" depends=('cdrkit' 'gcc-libs') -source=(http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${pkgver}.tar.gz - buildpatch-7.0-3-20080108-karolina.patch) +source=("http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${pkgver}.tar.gz" + 'dvd+rw-tools-7.0-dvddl.patch' + 'dvd+rw-tools-7.0-glibc2.6.90.patch' + 'dvd+rw-tools-7.0-wctomb.patch' + 'dvd+rw-tools-7.0-wexit.patch') md5sums=('8acb3c885c87f6838704a0025e435871' - '54b4dc52f5380216d4d9fc2dd2086d31') + '65d30aa98ff314f256d0a1afb9e3edf6' + '1be5401035ca850edb7e522f22aead4b' + '3ba1af063b30f942e1cd2004044702d3' + 'b2c66b6c6243b207fbe4f6ae34fa6cba') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # fix build, thank you Karolina - patch -Np1 -i "${srcdir}/buildpatch-7.0-3-20080108-karolina.patch" + cd "${srcdir}/${pkgname}-${pkgver}" + # patches from Gentoo/Fedora + # see https://bugs.gentoo.org/257360, https://bugzilla.redhat.com/show_bug.cgi?id=426068 + # and https://bugzilla.redhat.com/show_bug.cgi?id=243036 + patch -p0 -i "${srcdir}/dvd+rw-tools-7.0-dvddl.patch" + patch -p1 -i "${srcdir}/dvd+rw-tools-7.0-glibc2.6.90.patch" + patch -p0 -i "${srcdir}/dvd+rw-tools-7.0-wctomb.patch" + patch -p1 -i "${srcdir}/dvd+rw-tools-7.0-wexit.patch" - make || return 1 + make +} +package() { + cd "${srcdir}/${pkgname}-${pkgver}" install -m755 -d "${pkgdir}/usr/bin" install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m755 growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control "${pkgdir}/usr/bin/" || return 1 - install -m644 growisofs.1 ${pkgdir}/usr/share/man/man1/growisofs.1 || return 1 + install -m755 growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control "${pkgdir}/usr/bin/" + install -m644 growisofs.1 ${pkgdir}/usr/share/man/man1/growisofs.1 } diff --git a/extra/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch b/extra/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch new file mode 100644 index 000000000..c1c6fb333 --- /dev/null +++ b/extra/dvd+rw-tools/dvd+rw-tools-7.0-dvddl.patch @@ -0,0 +1,13 @@ +--- ./growisofs_mmc.cpp.joe 2006-04-27 20:45:00.788446635 +0200 ++++ ./growisofs_mmc.cpp 2006-04-27 20:46:01.666824300 +0200 +@@ -1412,9 +1412,7 @@ + blocks += 15, blocks &= ~15; + + if (blocks <= split) +- fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n" +- " use single layer media for this recording\n"), +- exit (FATAL_START(EMEDIUMTYPE)); ++ fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n"); + + blocks /= 16; + blocks += 1; diff --git a/extra/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch b/extra/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch new file mode 100644 index 000000000..49742d3c4 --- /dev/null +++ b/extra/dvd+rw-tools/dvd+rw-tools-7.0-glibc2.6.90.patch @@ -0,0 +1,11 @@ +diff -up dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 dvd+rw-tools-7.0/transport.hxx +--- dvd+rw-tools-7.0/transport.hxx.glibc2.6.90 2007-08-15 12:56:17.000000000 +0200 ++++ dvd+rw-tools-7.0/transport.hxx 2007-08-15 12:56:42.000000000 +0200 +@@ -11,6 +11,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <string.h> ++#include <limits.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> diff --git a/extra/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch b/extra/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch new file mode 100644 index 000000000..56bd72575 --- /dev/null +++ b/extra/dvd+rw-tools/dvd+rw-tools-7.0-wctomb.patch @@ -0,0 +1,11 @@ +--- transport.hxx~ 2008-03-25 21:24:47.000000000 -0400 ++++ transport.hxx 2008-03-25 21:25:36.000000000 -0400 +@@ -116,7 +116,7 @@ + extern "C" char *plusminus_locale() + { static class __plusminus { + private: +- char str[4]; ++ char str[MB_LEN_MAX]; + public: + __plusminus() { setlocale(LC_CTYPE,ENV_LOCALE); + int l = wctomb(str,(wchar_t)(unsigned char)'±'); diff --git a/extra/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch b/extra/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch new file mode 100644 index 000000000..e7910cbdd --- /dev/null +++ b/extra/dvd+rw-tools/dvd+rw-tools-7.0-wexit.patch @@ -0,0 +1,11 @@ +--- dvd+rw-tools-7.0/dvd+rw-format.cpp.wexit 2007-06-21 12:42:30.000000000 +0200 ++++ dvd+rw-tools-7.0/dvd+rw-format.cpp 2007-06-21 12:44:13.000000000 +0200 +@@ -245,7 +245,7 @@ int main (int argc, char *argv[]) + alarm(1); + while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ; + if (WEXITSTATUS(i) == 0) fprintf (stderr,"\n"); +- exit (0); ++ exit (WEXITSTATUS(i)); + } + #endif + diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD index 8907f0e9f..2b4196bc2 100644 --- a/extra/dvdauthor/PKGBUILD +++ b/extra/dvdauthor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104015 2010-12-25 22:35:13Z giovanni $ +# $Id: PKGBUILD 137985 2011-09-13 21:30:02Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> @@ -6,7 +6,7 @@ pkgname=dvdauthor pkgver=0.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64' 'mips64el') url="http://dvdauthor.sourceforge.net/" @@ -19,7 +19,11 @@ md5sums=('33a447fb98ab3293ac40f869eedc17ff') build() { cd "${srcdir}/${pkgname}" ./configure --prefix=/usr \ - --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/dvdrtools/PKGBUILD b/extra/dvdrtools/PKGBUILD index 0d8594e47..138c94157 100644 --- a/extra/dvdrtools/PKGBUILD +++ b/extra/dvdrtools/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 46392 2009-07-17 19:24:22Z giovanni $ +# $Id: PKGBUILD 137611 2011-09-10 04:22:54Z eric $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> + pkgname=dvdrtools pkgver=0.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/dvdrtools/" license=('GPL') -depends=('glibc' 'file') +depends=('file' 'bash') makedepends=('transcode') optdepends=('transcode: video/DVD ripper and encoder for the terminal/console') conflicts=('cdrkit') @@ -17,8 +18,12 @@ source=(ftp://ftp.archlinux.org/other/dvdrtools/$pkgname-$pkgver.tar.gz) md5sums=('5707b7e877b853e258cd738938833006') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 3deab745a..180860595 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135954 2011-08-21 02:30:32Z eric $ +# $Id: PKGBUILD 137977 2011-09-13 15:26:07Z juergen $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs @@ -8,12 +8,12 @@ _minorver=a # upstream uses "23.3a", which is a bit silly and interpreted as alpha. pkgver=$_majorver.$_minorver _realver=$_majorver$_minorver -pkgrel=2 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils') +depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib') install=emacs.install source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop) md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' @@ -22,7 +22,7 @@ md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' build() { cd "$srcdir"/$pkgname-$_majorver ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --without-sound --with-x-toolkit=gtk --with-xft + --localstatedir=/var --with-x-toolkit=gtk --with-xft make } diff --git a/extra/fcgi/PKGBUILD b/extra/fcgi/PKGBUILD index 2614f5a09..a093e0fb1 100644 --- a/extra/fcgi/PKGBUILD +++ b/extra/fcgi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 87808 2010-08-18 10:56:40Z jgc $ +# $Id: PKGBUILD 137828 2011-09-11 21:00:11Z pierre $ # Maintainer: tobias <tobias@justdreams.de> # Modified by: eliott <eliott@cactuswax.net> # Original by Benjamin Andresen, klapmuetz [at] gmail [dot] com pkgname=fcgi pkgver=2.4.0 -pkgrel=6 +pkgrel=7 depends=('gcc-libs') pkgdesc="FASTCgi(fcgi) islanguage independent, high performant extension to CGI" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('custom') options=('!libtool' '!makeflags') url="http://www.fastcgi.com" -source=(http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz - gcc44-fix-include.patch) +source=("http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz" + 'gcc44-fix-include.patch') md5sums=('d15060a813b91383a9f3c66faf84867e' 'a8028462163755f3ce457a5c641f237b') @@ -26,6 +26,10 @@ build() { automake --foreign ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -Dm644 LICENSE.TERMS "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index 3e4dc590b..8dc63b5c9 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 136943 2011-09-03 10:34:07Z andrea $ +# $Id: PKGBUILD 137540 2011-09-09 07:00:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.1.0 +pkgver=4.1.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu') source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('d6aa9ce3344582ba92e850940c20dd28bf98e264') +sha1sums=('465ede4722d2bb0c7fcf2d1a5206c9ce922902a4') build() { cd "${srcdir}" diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index af1b87c8f..8835c69ac 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137062 2011-09-05 19:40:28Z bisson $ +# $Id: PKGBUILD 137830 2011-09-11 21:00:49Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=1.16 +pkgver=1.16.1 pkgrel=1 pkgdesc='Fast, lightweight image viewer which uses imlib2' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('4793cecb7986335c096bb3c8adf0c364c36d8a34') +sha1sums=('f016043826cf30d33675fceba24d9753206d947a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD index 20e894daa..4ec82f8d7 100644 --- a/extra/festival/PKGBUILD +++ b/extra/festival/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127865 2011-06-19 00:11:13Z eric $ +# $Id: PKGBUILD 137968 2011-09-13 09:17:12Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Simo Leone <neotuli@gmail.com> @@ -6,7 +6,7 @@ pkgname=festival pkgver=2.1 _suffix=release -pkgrel=2 +pkgrel=3 pkgdesc="A general multi-lingual speech synthesis system" arch=('i686' 'x86_64' 'mips64el') url="http://www.cstr.ed.ac.uk/projects/festival/" @@ -15,123 +15,119 @@ depends=('perl') options=('!makeflags') source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-${_suffix}.tar.gz" "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-${_suffix}.tar.gz" - "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz" - "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz" - "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz" - 'speechconfig.patch' - 'festconfig.patch' - 'config.guess' - 'config.sub') + "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz" + "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz" + "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz" + 'speechconfig.patch' + 'festconfig.patch' + 'festival-shared-build.patch') md5sums=('c93eb3e389ed171ab9abd46afe8897a8' '6920ddc75b042910a3bcfee3ab106938' '6a2ee4fed7c3ebedf197a3b8524ccb87' '84af32a914d996f57bc4cb36fe8cdc97' 'aa80f9250065b318325f16fdad3a4484' - '550abd77dc20e444673d6ecf87a60fe9' + 'c30ae990baca40c9c2b1d5cd27502139' '348cc033430aee7989463198818ae74c' - 'fad4f4cc5caad203dee58165a1412b80' - '7905ae2a747db79964eb9a1693a15c2b') + '46132b1cd86a982007312def49ab176a') build() { - # Install updated config.guess and config.sub - cp "$srcdir/config.guess" "$srcdir/config.sub" "$srcdir/festival" - cp "$srcdir/config.guess" "$srcdir/config.sub" "$srcdir/speech_tools" + cd "$srcdir" + patch -Np0 -i "$srcdir/festival-shared-build.patch" - # Build Speech Tools first - cd "$srcdir/speech_tools" - patch -Np1 -i "$srcdir/speechconfig.patch" + # Build Speech Tools first + cd "$srcdir/speech_tools" + patch -Np1 -i "$srcdir/speechconfig.patch" + ./configure --prefix=/usr --sysconfdir=/etc + make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" - ./configure --prefix=/usr --sysconfdir=/etc - make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" + # Build Festival itself + cd "$srcdir/festival" + patch -Np1 -i "$srcdir/festconfig.patch" - # Build Festival itself - cd "$srcdir/festival" - patch -Np1 -i "$srcdir/festconfig.patch" + # Avoid make failure on making scripts and docs + sed -i "s#examples bin doc#examples#" Makefile - # Avoid make failure on making scripts and docs - sed -i "s#examples bin doc#examples#" Makefile - - ./configure --prefix=/usr --sysconfdir=/etc - make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" + ./configure --prefix=/usr --sysconfdir=/etc + make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" } package() { - # Install Speech Tools first - cd "$srcdir/speech_tools" - install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}} - - #binaries - #move binaries over wrappers (FS#7864) - for i in $(grep -l 'EST shared script' bin/*); do - cp -f main/$(basename $i) bin; - done - install -m755 -t "$pkgdir"/usr/bin bin/[a-z]* - rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program} - - #libraries - install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.* - ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so - ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so - install -m644 -t "$pkgdir"/usr/lib lib/lib*.a - - #headers - for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do - install -m644 -t "${pkgdir}"/usr/include/speech_tools/$dir include/$dir/*.h - done - - # Install Festival itself - cd "$srcdir"/festival - - #binaries - install -m755 src/main/festival "$pkgdir"/usr/bin/ - install -m755 src/main/festival_client "$pkgdir"/usr/bin/ - install -m755 examples/benchmark "$pkgdir"/usr/bin/ - install -m755 examples/dumpfeats "$pkgdir"/usr/bin/ - install -m755 examples/durmeanstd "$pkgdir"/usr/bin/ - install -m755 examples/latest "$pkgdir"/usr/bin/ - install -m755 examples/make_utts "$pkgdir"/usr/bin/ - install -m755 examples/powmeanstd "$pkgdir"/usr/bin/ - install -m755 examples/run-festival-script "$pkgdir"/usr/bin/ - install -m755 examples/saytime "$pkgdir"/usr/bin/ - install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/ - install -m755 examples/text2pos "$pkgdir"/usr/bin/ - install -m755 examples/text2wave "$pkgdir"/usr/bin - - #libraries - install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/ - - #headers - install -dm755 "$pkgdir"/usr/include/festival - install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h - - mkdir -p "$pkgdir"/usr/share/festival - #install -m644 -t "$pkgdir"/usr/share/festival lib/*.scm - #need to clean up but requires knowing which files are actually needed... - cp -aR lib/* "$pkgdir"/usr/share/festival - rm -f $(find "$pkgdir"/usr/share/festival -name Makefile) - rm -f $(find "$pkgdir"/usr/bin -name Makefile) - - #create voices directory - install -dm755 "$pkgdir"/usr/share/festival/voices - - #licenses - install -D -m644 "$srcdir"/festival/COPYING \ - "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - install -D -m644 "$srcdir"/speech_tools/README \ - "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other - - ################################################################# - # Ok now some general cleanups - for i in $(find "$pkgdir"/usr/include/ -type f); do - sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \ - -e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \ - -e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \ - -e 's,"ling_class/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/ling_class/\",speech_tools/ling_class/,g' -e 's,"ling_class,ling_class,g'\ - -e 's,"rxp/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/rxp/\",speech_tools/rxp/,g' -e 's,"rxp,rxp,g' \ - -e 's,"sigpr/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/sigpr/\",speech_tools/sigpr/,g' -e 's,"sigpr,sigpr,g' \ - -e 's,"unix/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/unix/\",speech_tools/unix/,g' -e 's,\.h\">,.h\>,g' -e 's,"unix,unix,g' \ - -e 's,"festival\.h",\<festival/festival.h\>,g' \ - -e 's,"ModuleDescription\.h",\<festival/ModuleDescription.h\>,g' \ - -e 's,"Phone\.h",\<festival/Phone.h\>,g' $i - done + # Install Speech Tools first + cd "$srcdir/speech_tools" + install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}} + + #binaries + #move binaries over wrappers (FS#7864) + for i in $(grep -l 'EST shared script' bin/*); do + cp -f main/$(basename $i) bin; + done + install -m755 -t "$pkgdir"/usr/bin bin/[a-z]* + rm -f "$pkgdir"/usr/bin/{est_gdb,est_examples,est_program} + + #libraries + install -m755 -t "$pkgdir"/usr/lib lib/lib*.so.* + ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so + ln -sf libestools.so.${pkgver}.1 "$pkgdir"/usr/lib/libestools.so + ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so + install -m644 -t "$pkgdir"/usr/lib lib/lib*.a + + #headers + for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do + install -m644 -t "${pkgdir}"/usr/include/speech_tools/$dir include/$dir/*.h + done + + # Install Festival itself + cd "$srcdir"/festival + + #binaries + install -m755 src/main/festival "$pkgdir"/usr/bin/ + install -m755 src/main/festival_client "$pkgdir"/usr/bin/ + install -m755 examples/benchmark "$pkgdir"/usr/bin/ + install -m755 examples/dumpfeats "$pkgdir"/usr/bin/ + install -m755 examples/durmeanstd "$pkgdir"/usr/bin/ + install -m755 examples/latest "$pkgdir"/usr/bin/ + install -m755 examples/make_utts "$pkgdir"/usr/bin/ + install -m755 examples/powmeanstd "$pkgdir"/usr/bin/ + install -m755 examples/run-festival-script "$pkgdir"/usr/bin/ + install -m755 examples/saytime "$pkgdir"/usr/bin/ + install -m755 examples/scfg_parse_text "$pkgdir"/usr/bin/ + install -m755 examples/text2pos "$pkgdir"/usr/bin/ + install -m755 examples/text2wave "$pkgdir"/usr/bin + + #libraries + install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/ + install -m755 src/lib/libFestival.so.* "$pkgdir"/usr/lib/ + ln -sf libFestival.so.2.1.0 "$pkgdir"/usr/lib/libFestival.so + + #headers + install -dm755 "$pkgdir"/usr/include/festival + install -m644 -t "$pkgdir"/usr/include/festival src/include/*.h + + mkdir -p "$pkgdir"/usr/share/festival + cp -aR lib/* "$pkgdir"/usr/share/festival + rm -f $(find "$pkgdir"/usr/share/festival -name Makefile) + rm -f $(find "$pkgdir"/usr/bin -name Makefile) + + #create voices directory + install -dm755 "$pkgdir"/usr/share/festival/voices + + #licenses + install -D -m644 "$srcdir"/festival/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + install -D -m644 "$srcdir"/speech_tools/README \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other + + # Ok now some general cleanups + for i in $(find "$pkgdir"/usr/include/ -type f); do + sed -i -e 's,"EST.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \ + -e 's,"siod.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/\",speech_tools/,g' \ + -e 's,"instantiate/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/instantiate/\",speech_tools/instantiate/,g' -e 's,"instantiate,instantiate,g' \ + -e 's,"ling_class/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/ling_class/\",speech_tools/ling_class/,g' -e 's,"ling_class,ling_class,g' \ + -e 's,"rxp/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/rxp/\",speech_tools/rxp/,g' -e 's,"rxp,rxp,g' \ + -e 's,"sigpr/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/sigpr/\",speech_tools/sigpr/,g' -e 's,"sigpr,sigpr,g' \ + -e 's,"unix/.*\.h",\<speech_tools/&\>,g' -e 's,speech_tools/unix/\",speech_tools/unix/,g' -e 's,\.h\">,.h\>,g' -e 's,"unix,unix,g' \ + -e 's,"festival\.h",\<festival/festival.h\>,g' \ + -e 's,"ModuleDescription\.h",\<festival/ModuleDescription.h\>,g' \ + -e 's,"Phone\.h",\<festival/Phone.h\>,g' $i + done } diff --git a/extra/festival/festival-shared-build.patch b/extra/festival/festival-shared-build.patch new file mode 100644 index 000000000..edfa38b17 --- /dev/null +++ b/extra/festival/festival-shared-build.patch @@ -0,0 +1,72 @@ +--- speech_tools/config/rules/defaults.mak.orig 2007-03-16 12:39:12.000000000 -0400 ++++ speech_tools/config/rules/defaults.mak 2007-03-16 12:39:19.000000000 -0400 +@@ -69,15 +69,21 @@ + MADE_FROM_ABOVE:=$(N) + endif + ++ifneq ($(SHARED),0) ++ LIBTYPE=so ++else ++ LIBTYPE=a ++endif ++ + ifndef PROJECT_LIBDEPS +- PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).a) ++ PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE)) + endif + ifndef PROJECT_LIBS + PROJECT_LIBS = $(foreach l,$(PROJECT_LIBRARIES),-L$(PROJECT_LIBRARY_DIR_$(l)) -l$(l)) + endif + + ifndef REQUIRED_LIBDEPS +- REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).a) ++ REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE)) + endif + ifndef REQUIRED_LIBS + REQUIRED_LIBS = $(foreach l,$(REQUIRED_LIBRARIES),-L$(REQUIRED_LIBRARY_DIR_$(l)) -l$(l)) +--- festival/config/project.mak.orig 2007-03-16 13:01:40.000000000 -0400 ++++ festival/config/project.mak 2007-03-16 13:02:24.000000000 -0400 +@@ -84,6 +84,8 @@ + PROJECT_LIBRARY_DIR_Festival = $(TOP)/src/lib + PROJECT_DEFAULT_LIBRARY = Festival + ++PROJECT_LIBRARY_VERSION_Festival = $(PROJECT_VERSION).0 ++ + # Libraries used from other projects + + REQUIRED_LIBRARIES = estools estbase eststring +diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak +--- speech_tools/config/compilers/gcc_defaults.mak.bettersoname 2010-12-06 10:25:35.000000000 +0100 ++++ speech_tools/config/compilers/gcc_defaults.mak 2010-12-06 10:27:51.000000000 +0100 +@@ -78,7 +78,7 @@ SHARED_CXXFLAGS = -fPIC + SHARED_LINKFLAGS = + + ifndef GCC_MAKE_SHARED_LIB +- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX ++ MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -Wl,-soname,YYY + else + MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) + endif +diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak +--- speech_tools/config/rules/library.mak.bettersoname 2001-04-04 13:55:32.000000000 +0200 ++++ speech_tools/config/rules/library.mak 2010-12-06 10:25:35.000000000 +0100 +@@ -103,14 +103,14 @@ endif + ########################################################################### + + lib%.so : lib%.a +- @echo Make Shared Library $* ++ @echo Make Shared Library $(*F) + @if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi + @(cd shared_space ; $(AR) x ../$< ) +- @echo Link Shared Library $* +- if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ +- $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs ++ @echo Link Shared Library $(*F) ++ if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\ ++ $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs + @$(RM) -f shared_space/*.o $@ +- @ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@ ++ @ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@ + + ########################################################################### + ## ## diff --git a/extra/festival/speechconfig.patch b/extra/festival/speechconfig.patch index f77b614e9..76756b1ae 100644 --- a/extra/festival/speechconfig.patch +++ b/extra/festival/speechconfig.patch @@ -44,7 +44,7 @@ diff -aur speech_tools.old//config/config.in speech_tools/config/config.in #DEBUG=1 # PROFILE=gprof -#SHARED=2 -+SHARED=1 ++SHARED=2 ## Directory specific selections which override the above diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index e35123cad..699416e8f 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132398 2011-07-24 09:00:59Z ibiru $ +# $Id: PKGBUILD 138105 2011-09-16 14:11:53Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20110724 +pkgver=20110916 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -13,9 +13,9 @@ license=('GPL') depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump') makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz +source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz) ffmpeg-loongson.patch) -md5sums=('b6815ae13a17ab57449269bc2156546e' +md5sums=('d065a16866c9bcf4d06c5452b2fbdc56' '081d03278559a351322157a441fabcf5') build() { diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD new file mode 100644 index 000000000..a1e52baf9 --- /dev/null +++ b/extra/foobillard++/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 138073 2011-09-16 03:35:31Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=foobillard++ +pkgver=3.4beta +pkgrel=1 +pkgdesc="An OpenGL billiard game" +arch=('i686' 'x86_64') +url="http://foobillardplus.sourceforge.net/" +license=('GPL2') +depends=('bzip2' 'freetype2' 'libpng' 'mesa' 'sdl_net') +replaces=('foobillard') +source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz) +md5sums=('130418a45ba84b4132f9b27712feb919') +sha1sums=('d8723568e460ee62cb913b0c8d7c9a9f557395ee') + +build() { + cd "${srcdir}/foobillardplus-${pkgver}" + sed -i 's|$prefix/foobillardplus|$prefix|' configure + sed -i 's|$prefix/data|$prefix/share/foobillardplus|' configure + sed -i 's|"/data"|"/share/foobillardplus"|' src/language.c + sed -i 's|/opt/foobillardplus/bin/||' foobillardplus.desktop + sed -i 's|/opt/foobillardplus/||' foobillardplus.desktop + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/foobillardplus-${pkgver}" + install -Dm755 src/foobillardplus "${pkgdir}/usr/bin/foobillardplus" + install -d "${pkgdir}/usr/share/foobillardplus" + cp -R data/* "${pkgdir}/usr/share/foobillardplus" + install -Dm644 foobillardplus.desktop "${pkgdir}/usr/share/applications/foobillardplus.desktop" + install -Dm644 foobillardplus.png "${pkgdir}/usr/share/pixmaps/foobillardplus.png" + install -Dm644 foobillardplus.xbm "${pkgdir}/usr/share/pixmaps/foobillardplus.xbm" + find "${pkgdir}" -depth -type d -name .svn -exec rm -rf {} \; +} diff --git a/extra/freealut/PKGBUILD b/extra/freealut/PKGBUILD index bb18e4729..01c3b1a78 100644 --- a/extra/freealut/PKGBUILD +++ b/extra/freealut/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 27261 2009-02-18 02:47:12Z eric $ -# Maintainer: Dorphell -# Maintainer: Travis Willard <travisw@wmpub.ca> +# $Id: PKGBUILD 137589 2011-09-09 23:35:10Z allan $ +# Maintainer: # Contributor: Arkamririon <Arkamririon@gmx.net> pkgname=freealut pkgver=1.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="OpenAL Utility Toolkit (ALUT)" arch=('i686' 'x86_64' 'mips64el') url="http://www.openal.org" license=("LGPL") -depends=('openal>=1.6.372') +depends=('openal') +options=('!libtool') source=(http://connect.creativelabs.com/openal/Downloads/ALUT/$pkgname-$pkgver.tar.gz) md5sums=('e089b28a0267faabdb6c079ee173664a') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - find $startdir/pkg -name '*.la' -exec rm {} \; } diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD index 851c1b87b..360dcb568 100644 --- a/extra/freetds/PKGBUILD +++ b/extra/freetds/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Aaron Malone <aaron@munge.net> pkgname=freetds -pkgver=0.82 -pkgrel=5 +pkgver=0.91 +pkgrel=1 pkgdesc='Library for accessing Sybase and MS SQL Server databases' url='http://www.freetds.org' arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ backup=('etc/freetds/freetds.conf' 'etc/freetds/locales.conf' 'etc/freetds/pool.conf') source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgver}.tar.gz") -md5sums=('3df6b2e83fd420e90f1becbd1162990a') +md5sums=('b14db5823980a32f0643d1a84d3ec3ad') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/fribidi/PKGBUILD b/extra/fribidi/PKGBUILD index 8629540fd..e1c1d636b 100644 --- a/extra/fribidi/PKGBUILD +++ b/extra/fribidi/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 68037 2010-02-10 15:07:38Z giovanni $ +# $Id: PKGBUILD 137683 2011-09-10 12:05:16Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Nezmer <Nezmer@gmail.com> pkgname=fribidi pkgver=0.19.2 -pkgrel=1 +pkgrel=2 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://fribidi.org" depends=('glibc') options=('!libtool') -source=(http://fribidi.org/download/${pkgname}-${pkgver}.tar.gz) +source=("http://fribidi.org/download/${pkgname}-${pkgver}.tar.gz") md5sums=('626db17d2d99b43615ad9d12500f568a') 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/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD index f8990035f..59cdd6952 100644 --- a/extra/garcon/PKGBUILD +++ b/extra/garcon/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 127908 2011-06-19 16:23:50Z andyrtr $ +# $Id: PKGBUILD 138123 2011-09-17 02:21:25Z allan $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> pkgname=garcon -pkgver=0.1.8 +pkgver=0.1.9 pkgrel=1 pkgdesc="implementation of the freedesktop.org menu specification" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://wiki.xfce.org/dev/garcon" groups=('xfce4') -depends=('glib2') # 'perl') +depends=('glib2' 'libxfce4util') # 'perl') makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools>=4.7.4') -conflicts=('garcon-git') replaces=('libxfce4menu') options=('!libtool' '!makeflags') source=(http://archive.xfce.org/src/libs/garcon/0.1/garcon-${pkgver}.tar.bz2) -md5sums=('18fbf523ed2865dfaccdfb40b4b20b05') +md5sums=('a3ca1e54ad731c98f688900f6398fc20') build() { cd ${srcdir}/garcon-${pkgver} diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD index b3d717672..101641945 100644 --- a/extra/gd/PKGBUILD +++ b/extra/gd/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 64438 2010-01-20 12:11:26Z ibiru $ +# $Id: PKGBUILD 137764 2011-09-10 16:29:02Z pierre $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=gd pkgver=2.0.36RC1 -pkgrel=3 +pkgrel=4 pkgdesc="Library for the dynamic creation of images by programmers" arch=('i686' 'x86_64' 'mips64el') url="http://www.libgd.org/" license=('custom') -depends=('perl' 'libpng>=1.4.0' 'fontconfig' 'libjpeg>=8') +depends=('perl' 'libpng' 'fontconfig' 'libjpeg') options=('!libtool') -source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2 libpng14.patch) +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'libpng14.patch') md5sums=('e876979ca3130623a4e7866d9579171a' '7921556f4960e8d66cf4fb67ea7101b5') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/libpng14.patch || return 1 + patch -Np1 -i ${srcdir}/libpng14.patch + ./configure --prefix=/usr --without-xpm + make +} - ./configure --prefix=/usr --without-xpm || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/gecko-sharp-2.0/PKGBUILD b/extra/gecko-sharp-2.0/PKGBUILD index df7857cf9..87cc99e47 100644 --- a/extra/gecko-sharp-2.0/PKGBUILD +++ b/extra/gecko-sharp-2.0/PKGBUILD @@ -1,31 +1,34 @@ -# $Id: PKGBUILD 44373 2009-07-01 20:54:06Z jgc $ +# $Id: PKGBUILD 137770 2011-09-10 17:09:41Z pierre $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=gecko-sharp-2.0 pkgver=0.13 -pkgrel=3 +pkgrel=4 pkgdesc="C# bindings for gtkmozembed" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'MPL') url="http://www.mono-project.com/" -depends=('xulrunner>=1.9.1' 'gtk-sharp-2>=2.12.1') +depends=('xulrunner' 'gtk-sharp-2') makedepends=('monodoc' 'pkgconfig') -source=(http://go-mono.com/sources/gecko-sharp-2.0/gecko-sharp-2.0-${pkgver}.tar.bz2 - gecko-sharp-2.0-0.12-xulrunner.patch) +source=("http://go-mono.com/sources/gecko-sharp-2.0/gecko-sharp-2.0-${pkgver}.tar.bz2" + 'gecko-sharp-2.0-0.12-xulrunner.patch') md5sums=('f88eaa06e71f8d8fa34cf59a3e034a6b' - '4f2c07c3fb0c1a94adaa4e4c8d57608b') + '4f2c07c3fb0c1a94adaa4e4c8d57608b') build() { # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR="${startdir}/src/weird" + export MONO_SHARED_DIR="${srcdir}/weird" mkdir -p "${MONO_SHARED_DIR}" - # build cd ${srcdir}/gecko-sharp-2.0-${pkgver} - patch -Np1 -i ${srcdir}/gecko-sharp-2.0-0.12-xulrunner.patch || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 - make GACUTIL="/usr/bin/gacutil /root ${startdir}/pkg/usr/lib" \ - DESTDIR=${pkgdir} install || return 1 + patch -Np1 -i ${srcdir}/gecko-sharp-2.0-0.12-xulrunner.patch + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/gecko-sharp-2.0-${pkgver} + make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \ + DESTDIR=${pkgdir} install } diff --git a/extra/giblib/PKGBUILD b/extra/giblib/PKGBUILD index cf3c2396c..2d938de2e 100644 --- a/extra/giblib/PKGBUILD +++ b/extra/giblib/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 68041 2010-02-10 15:14:45Z giovanni $ +# $Id: PKGBUILD 137679 2011-09-10 11:58:36Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=giblib pkgver=1.2.4 -pkgrel=4 +pkgrel=5 pkgdesc="A library that feh uses as a wrapper to imlib2" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/giblib/" license=('MIT') depends=('imlib2' 'libxext' 'freetype2') options=('!libtool') -source=(ftp://ftp.archlinux.org/other/giblib/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ff61760ef73421c5f02d2f6c8d3ac913') +source=("http://linuxbrit.co.uk/downloads/${pkgname}-${pkgver}.tar.gz") +md5sums=('c810ef5389baf24882a1caca2954385e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" docsdir=/usr/share/doc/giblib install || return 1 + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" docsdir=/usr/share/doc/giblib install # Install custom license - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/gimp-gap/PKGBUILD b/extra/gimp-gap/PKGBUILD index 237e7c908..41f576c52 100644 --- a/extra/gimp-gap/PKGBUILD +++ b/extra/gimp-gap/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 64731 2010-01-22 02:05:13Z eric $ +# $Id: PKGBUILD 138172 2011-09-18 06:56:19Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gimp-gap pkgver=2.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="A Plug-In collection to edit and create animations for the Gimp" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gimp.org/downloads/" -depends=('gimp>=2.6.0' 'xvidcore' 'bash' 'libjpeg') +depends=('gimp' 'xvidcore' 'bash' 'libjpeg') makedepends=('intltool') options=('!makeflags') source=(ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/$pkgname-$pkgver.tar.bz2) @@ -17,13 +17,12 @@ md5sums=('249ed829de8b78675c0fe4ef4212089f') build() { cd "$srcdir/$pkgname-$pkgver" - #Arch64 fix - if [ "$CARCH" = "x86_64" ]; then - ./configure --prefix=/usr CFLAGS="$CFLAGS -fPIC" || return 1 - else - ./configure --prefix=/usr || return 1 - fi + [ "$CARCH" = "x86_64" ] && CFLAGS+="-fPIC" + ./configure --prefix=/usr + make +} - make || return 1 - make DESTDIR="$pkgdir" install || return 1 +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD index 56daf1721..154ffc963 100644 --- a/extra/glade/PKGBUILD +++ b/extra/glade/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 118419 2011-04-06 17:54:27Z ibiru $ +# $Id: PKGBUILD 138085 2011-09-16 07:41:36Z ibiru $ # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=glade @@ -8,7 +8,7 @@ pkgdesc="User interface builder for GTK+ and GNOME." arch=(i686 x86_64 mips64el) license=('GPL' 'LGPL') depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'pygobject-devel') +makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'pygobject2-devel') optdepends=('python2: Python widgets support') options=('!libtool') url="http://glade.gnome.org/" diff --git a/extra/glhack/PKGBUILD b/extra/glhack/PKGBUILD index 35d3fa667..914d30c34 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' 'mips64el') 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/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index dbc40bd10..e1ce1ac59 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135780 2011-08-18 15:04:08Z andyrtr $ +# $Id: PKGBUILD 138109 2011-09-16 18:27:00Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking pkgver=2.28.7 -pkgrel=4 +pkgrel=5 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -12,13 +12,16 @@ makedepends=('intltool') options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2 - glib-networking-2.29.9-port-gnutls3-API.patch) + glib-networking-2.29.9-port-gnutls3-API.patch + fix_G_TLS_ERROR_EOF_handling.patch) sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c' - '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee') + '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee' + '286d64a121cb987866b51af70f55d47bafc5bf60e813aa1412dce51e426cc553') build() { cd "$srcdir/$pkgname-$pkgver" patch -Np0 -i "$srcdir/glib-networking-2.29.9-port-gnutls3-API.patch" + patch -Np1 -i "$srcdir/fix_G_TLS_ERROR_EOF_handling.patch" ./configure \ --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/glib-networking --disable-static diff --git a/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch b/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch new file mode 100644 index 000000000..c26f422aa --- /dev/null +++ b/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch @@ -0,0 +1,73 @@ +From 9e2aaacafb45d51cff57dc033f4b5ad5bc1a1762 Mon Sep 17 00:00:00 2001 +From: Dan Winship <danw@gnome.org> +Date: Fri, 16 Sep 2011 15:29:29 +0000 +Subject: gnutls: fix G_TLS_ERROR_EOF handling with gnutls 3.0 + +gnutls 3.0 has a new error code for "peer closed connection without +sending a Close packet", so add some #ifdefs to do the right thing +with either 2.x or 3.x. + +https://bugzilla.gnome.org/show_bug.cgi?id=659233 +--- +diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c +index c1ede79..0f792bb 100644 +--- a/tls/gnutls/gtlsconnection-gnutls.c ++++ b/tls/gnutls/gtlsconnection-gnutls.c +@@ -132,7 +132,10 @@ struct _GTlsConnectionGnutlsPrivate + + GError *error; + GCancellable *cancellable; +- gboolean blocking, eof; ++ gboolean blocking; ++#ifndef GNUTLS_E_PREMATURE_TERMINATION ++ gboolean eof; ++#endif + GIOCondition internal_direction; + }; + +@@ -548,19 +551,22 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, + gnutls->priv->need_handshake = TRUE; + return status; + } +- else if (status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH) ++ else if ( ++#ifdef GNUTLS_E_PREMATURE_TERMINATION ++ status == GNUTLS_E_PREMATURE_TERMINATION ++#else ++ status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && gnutls->priv->eof ++#endif ++ ) + { +- if (gnutls->priv->eof) ++ if (gnutls->priv->require_close_notify) + { +- if (gnutls->priv->require_close_notify) +- { +- g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, +- _("TLS connection closed unexpectedly")); +- return status; +- } +- else +- return 0; ++ g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, ++ _("TLS connection closed unexpectedly")); ++ return status; + } ++ else ++ return 0; + } + + return status; +@@ -795,8 +801,10 @@ g_tls_connection_gnutls_pull_func (gnutls_transport_ptr_t transport_data, + + if (ret < 0) + set_gnutls_error (gnutls, G_IO_IN); ++#ifndef GNUTLS_E_PREMATURE_TERMINATION + else if (ret == 0) + gnutls->priv->eof = TRUE; ++#endif + + return ret; + } +-- +cgit v0.9.0.2 diff --git a/extra/gmetadom/PKGBUILD b/extra/gmetadom/PKGBUILD index 4dd38268a..34618a3ed 100644 --- a/extra/gmetadom/PKGBUILD +++ b/extra/gmetadom/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 37443 2009-05-01 20:50:35Z giovanni $ +# $Id: PKGBUILD 137758 2011-09-10 15:29:12Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -12,17 +12,20 @@ license=('LGPL') depends=('gdome2') makedepends=('pkgconfig' 'ocaml') options=('!libtool' '!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - gmetadom-0.2.6-gcc43.patch) +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gmetadom-0.2.6-gcc43.patch') md5sums=('7bfb5d9c6f20ffa5e790b63d1f8cb481' 'ea0271007f8650733029327823353d0d') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/gmetadom-0.2.6-gcc43.patch || return 1 - ./configure --prefix=/usr --disable-static - # Don't make tests, they need a static library. - sed -ri 's/^SUBDIRS = (.+) test$/SUBDIRS = \1/' src/gdome_cpp_smart/Makefile - make || return 1 + patch -Np1 -i ${srcdir}/gmetadom-0.2.6-gcc43.patch + export LDFLAGS=${LDFLAGS/,--as-needed} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir}/ install } diff --git a/extra/gnome-speech/PKGBUILD b/extra/gnome-speech/PKGBUILD index f92d8ff2d..ce1124fef 100644 --- a/extra/gnome-speech/PKGBUILD +++ b/extra/gnome-speech/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 30819 2009-03-22 00:34:44Z jgc $ +# $Id: PKGBUILD 137673 2011-09-10 11:43:42Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-speech pkgver=0.4.25 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Text-to-Speech" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://www.gnome.org" -depends=('libbonobo>=2.24.1') +depends=('libbonobo') makedepends=('intltool' 'pkgconfig' 'espeak' 'java-access-bridge' 'openjdk6') optdepends=('espeak: Text to speech engine' - 'festival: Text to speech engine' - 'java-access-bridge: Speech support for java') + 'festival: Text to speech engine' + 'java-access-bridge: Speech support for java') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2) +source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2") md5sums=('89cbc23fc131c33396c0346085759f63') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gnome-vfsmm/PKGBUILD b/extra/gnome-vfsmm/PKGBUILD index 74f2ec8ef..1816b9be4 100644 --- a/extra/gnome-vfsmm/PKGBUILD +++ b/extra/gnome-vfsmm/PKGBUILD @@ -1,24 +1,28 @@ -#$Id: PKGBUILD 33797 2009-04-04 20:05:13Z jgc $ +#$Id: PKGBUILD 137756 2011-09-10 15:24:38Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnome-vfsmm pkgver=2.26.0 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ wrapper for gnome-vfs." -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -depends=('gnome-vfs>=2.24.1' 'glibmm>=2.20.0') +depends=('gnome-vfs' 'glibmm') makedepends=('pkgconfig' 'doxygen') options=('!libtool') url="http://gtkmm.sourceforge.net/" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2) +source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2") md5sums=('d27d34b6a8722c557366729071c1baab') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gnu-netcat/PKGBUILD b/extra/gnu-netcat/PKGBUILD index 520c06703..c4f500162 100644 --- a/extra/gnu-netcat/PKGBUILD +++ b/extra/gnu-netcat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54891 2009-10-11 20:04:37Z giovanni $ +# $Id: PKGBUILD 137726 2011-09-10 14:19:00Z pierre $ # Maintainer: Tom K <tomk@runbox.com> pkgname=gnu-netcat pkgver=0.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="GNU rewrite of netcat, the network piping application" depends=('glibc' 'texinfo') arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,16 @@ license=('GPL') replaces=('netcat') provides=('netcat') install=gnu-netcat.install -source=(http://downloads.sourceforge.net/sourceforge/netcat/netcat-$pkgver.tar.bz2) +source=("http://downloads.sourceforge.net/sourceforge/netcat/netcat-$pkgver.tar.bz2") md5sums=('0a29eff1736ddb5effd0b1ec1f6fe0ef') build() { cd "${srcdir}/netcat-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + make +} + +package() { + cd "${srcdir}/netcat-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gnuchess/PKGBUILD b/extra/gnuchess/PKGBUILD index 5e6a71091..d98c53d73 100644 --- a/extra/gnuchess/PKGBUILD +++ b/extra/gnuchess/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122210 2011-05-03 05:16:02Z allan $ +# $Id: PKGBUILD 137508 2011-09-08 07:31:10Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuchess -pkgver=6.0.0 +pkgver=6.0.1 pkgrel=1 pkgdesc="Lets most modern computers play a full game of chess" url="http://www.gnu.org/software/chess/chess.html" @@ -11,12 +11,12 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('glibc' 'ncurses' 'readline') source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz) -md5sums=('1a7a46188dab76f4339d22ff47c31515') +md5sums=('041888218f73886f146fa7fbf92190de') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make + make } package() { diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index b63352fe2..a9e73f9c9 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136760 2011-09-01 10:56:36Z andyrtr $ +# $Id: PKGBUILD 138216 2011-09-19 03:13:19Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -10,10 +10,11 @@ license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2' 'p11-kit') [ "$CARCH" = "mips64el" ] || makedepends=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) -md5sums=('1f8c3b74b2c6faa9b08f84a422f93863') +md5sums=('7b45b99cb6d314c452f8c0f1c7a736dd') +sha1sums=('0e6c325ae12cf1a4bd7d25125b8d58d51472fc14') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -21,7 +22,6 @@ build() { --with-zlib \ --disable-static \ --disable-guile \ - --without-p11-kit \ --disable-valgrind-tests # breaks make check. errors have been reported upstream make } diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index 01a330d3e..95ba86fed 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 129374 2011-06-27 05:53:20Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 137816 2011-09-11 20:07:54Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk -pkgver=0.7.2 -pkgrel=1 +pkgver=0.8.0 +pkgrel=2 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64' 'mips64el') url="http://www.rodsbooks.com/gdisk/" @@ -15,7 +15,7 @@ provides=("gdisk=$pkgver") conflicts=('gdisk') replaces=('gdisk') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('31deeb7acb5104d56ba2ddeafd907513') +md5sums=('f38e33a9bc644ec1dee50fdc3dfe4d69') build() { cd "$srcdir/$pkgname-$pkgver" @@ -26,10 +26,10 @@ build() { package () { cd "$srcdir/$pkgname-$pkgver" - install -d "$pkgdir"/{sbin,usr/share/{man/man8,gdisk}} - install -t "$pkgdir/sbin" gdisk sgdisk fixparts - install -m644 -t "$pkgdir/usr/share/man/man8" {gdisk,sgdisk}.8 - install -m644 -t "$pkgdir/usr/share/gdisk" README NEWS + install -d "$pkgdir"/{sbin,usr/share/{doc/gdisk,man/man8}} + install -t "$pkgdir/sbin" {,c,s}gdisk fixparts + install -m644 -t "$pkgdir/usr/share/man/man8" {{,c,s}gdisk,fixparts}.8 + install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS } # vim:set ts=2 sw=2 et: diff --git a/extra/gqview/PKGBUILD b/extra/gqview/PKGBUILD index 44ab204b6..d79f3ac79 100644 --- a/extra/gqview/PKGBUILD +++ b/extra/gqview/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 68535 2010-02-13 03:58:08Z dgriffiths $ +# $Id: PKGBUILD 138174 2011-09-18 07:14:08Z eric $ # Maintainer: dorphell <dorphell@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> + pkgname=gqview pkgver=2.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="An image browser and viewer" arch=('i686' 'x86_64' 'mips64el') url="http://gqview.sourceforge.net/" license=('GPL') -depends=('gtk2') +depends=('gtk2' 'desktop-file-utils') +install=gqview.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('7196deab04db94cec2167637cddc02f9') build() { - cd ${srcdir}/${pkgname}-${pkgver} - CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gqview/gqview.install b/extra/gqview/gqview.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/extra/gqview/gqview.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index d43977d94..24954127d 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,39 +1,30 @@ -# $Id: PKGBUILD 51199 2009-09-05 20:11:42Z andyrtr $ +# $Id: PKGBUILD 137743 2011-09-10 14:59:36Z pierre $ # Maintainer: AndyRTR <andyrtr@archlinux.org> -# build twice that pango-graphite can pickup the new libgraphite dependency - take care when .so names happen! - pkgbase=graphite pkgname=('libgraphite' 'pango-graphite') pkgver=2.3.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://graphite.sil.org/" makedepends=('pango' 'gcc-libs') options=('!libtool' '!emptydirs') -source=(http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz) +source=("http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz") md5sums=('d35724900f6a4105550293686688bbb3') build() { cd "${srcdir}/silgraphite-${pkgver}" - pushd engine - ./configure --prefix=/usr --disable-static - make || return 1 - popd - - pushd wrappers/pangographite ./configure --prefix=/usr --disable-static - make || return 1 - popd + make } package_libgraphite() { - pkgdesc="SILGraphite - a \"smart font\" rendering engine - the libs and headers" - license=('custom_SIL Dual license') - depends=('gcc-libs') + pkgdesc='SILGraphite - a "smart font" rendering engine - the libs and headers' + license=('custom_SIL Dual license') + depends=('gcc-libs') cd "${srcdir}/silgraphite-${pkgver}"/engine - make DESTDIR="$pkgdir/" install || return 1 + make DESTDIR="$pkgdir/" install # licenses mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname} @@ -41,11 +32,11 @@ package_libgraphite() { } package_pango-graphite() { - pkgdesc="SILGraphite support for pango" - license=('LGPL') - depends=('pango' 'libgraphite') - install=pango-graphite.install + pkgdesc="SILGraphite support for pango" + license=('LGPL') + depends=('pango' 'libgraphite') + install=pango-graphite.install cd "${srcdir}/silgraphite-${pkgver}"/wrappers/pangographite - make DESTDIR="$pkgdir/" install || return 1 -}
\ No newline at end of file + make DESTDIR="$pkgdir/" install +} diff --git a/extra/grip/PKGBUILD b/extra/grip/PKGBUILD index 02ad244fb..d12cfc08c 100644 --- a/extra/grip/PKGBUILD +++ b/extra/grip/PKGBUILD @@ -1,22 +1,30 @@ -# $Id: PKGBUILD 57044 2009-10-31 11:06:52Z allan $ +# $Id: PKGBUILD 137616 2011-09-10 05:34:08Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Todd Musall <tmusall@comcast.net> pkgname=grip pkgver=3.3.1 -pkgrel=8 +pkgrel=9 pkgdesc="A cd-player and ripper for the Gnome desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://nostatic.org/grip/" depends=('vte' 'curl' 'libgnomeui' 'id3lib' 'cdparanoia') -install=grip.install -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('4b4233999b9f2bc85c711092553ea9aa') +optdepends=('yelp: to display the help and notices') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \ + grip-3.3.1-invalid-genre-size.patch) +md5sums=('4b4233999b9f2bc85c711092553ea9aa' + '046448be7d1580e86a2211cd8661d855') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/grip-3.3.1-invalid-genre-size.patch" + sed -i '/[.] conftest[.]id3/s: c: ./c:' configure ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 - make DESTDIR=${pkgdir} install + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/grip/grip-3.3.1-invalid-genre-size.patch b/extra/grip/grip-3.3.1-invalid-genre-size.patch new file mode 100644 index 000000000..c826fc6e2 --- /dev/null +++ b/extra/grip/grip-3.3.1-invalid-genre-size.patch @@ -0,0 +1,30 @@ +http://bugs.gentoo.org/285105 + +--- grip-3.3.1/src/id3.c ++++ grip-3.3.1/src/id3.c +@@ -252,8 +252,8 @@ + + if ( frames[ i ] ) { + char *c_data = NULL; +- char gen[ 5 ] = "( )"; +- char trk[ 4 ] = " "; ++ char gen[ 6 ] = "( )"; /* max unsigned char: 255 */ ++ char trk[ 3 ] = " "; /* max CDDA tracks: 99 */ + + switch( frameids[ i ] ) { + case ID3FID_TITLE: +@@ -278,12 +278,12 @@ + + case ID3FID_CONTENTTYPE: + c_data = gen; +- sprintf( gen, "(%d)", genre ); /* XXX */ ++ snprintf( gen, 6, "(%d)", genre ); + break; + + case ID3FID_TRACKNUM: + c_data = trk; +- sprintf( trk, "%d", tracknum ); /* XXX */ ++ snprintf( trk, 3, "%d", tracknum ); + break; + + default: diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index a9c4b83ea..0b322c6ba 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135784 2011-08-18 15:04:13Z andyrtr $ +# $Id: PKGBUILD 138088 2011-09-16 07:43:49Z ibiru $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> @@ -13,7 +13,7 @@ url="http://live.gnome.org/gtk-vnc" license=('LGPL') depends=('gtk3') optdepends=('gtk2: GTK2 widget') -makedepends=('intltool' 'pygtk' 'pygobject-devel' 'gtk-doc' 'gtk2') +makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377') diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD index ec2a3bf00..27566f053 100644 --- a/extra/gtk-xfce-engine/PKGBUILD +++ b/extra/gtk-xfce-engine/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 112937 2011-03-07 19:48:01Z andyrtr $ +# $Id: PKGBUILD 138198 2011-09-18 14:40:18Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=gtk-xfce-engine -pkgver=2.8.1 +pkgver=2.9.0 pkgrel=1 pkgdesc="A port of Xfce engine to GTK+-2.0" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,9 @@ groups=('xfce4') depends=("gtk2>=2.14.7") makedepends=('pkgconfig') options=('!libtool') -source=(http://archive.xfce.org/src/xfce/$pkgname/2.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8a6527b61b0554cda11d06f66a567314') +source=(http://archive.xfce.org/src/xfce/$pkgname/2.9/${pkgname}-${pkgver}.tar.bz2) +md5sums=('e2bc76ab5093ff8472e728e6d6ad5da2') +sha1sums=('ce0ef1220c98dddabaf7917f8d98579dd65f5009') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD index 393e13697..a2310f25f 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' 'mips64el') 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/gtkglextmm/PKGBUILD b/extra/gtkglextmm/PKGBUILD index e29ba745b..c9da3eff1 100644 --- a/extra/gtkglextmm/PKGBUILD +++ b/extra/gtkglextmm/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 134258 2011-08-02 17:37:45Z jgc $ +# $Id: PKGBUILD 137781 2011-09-10 22:38:55Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Bastien Bouclet <bastien.bouclet@gmail.com> +# Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=gtkglextmm pkgver=1.2.0 -pkgrel=6 +pkgrel=7 pkgdesc="Cpp C++ bindings for gtkglext" arch=('i686' 'x86_64' 'mips64el') url="http://gtkglext.sourceforge.net/" @@ -12,8 +13,8 @@ depends=('gtkmm' 'gtkglext') makedepends=('pkgconfig') options=('!libtool') license=('GPL') -source=(http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2 - gdkspanfunc.patch) +source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2" + 'gdkspanfunc.patch') md5sums=('27c05f4d45c5fd07b6fb0f044add3056' 'd7c8ea33c748a6857ee629c16b2d9bff') @@ -23,8 +24,12 @@ build() { # FS#24706 patch -Np1 -i "${srcdir}/gdkspanfunc.patch" + # automake 1.8 fix + sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4 + ./configure --prefix=/usr \ - --disable-gtkglext-test --disable-static + --disable-gtkglext-test \ + --disable-static make } diff --git a/extra/gtkmathview/PKGBUILD b/extra/gtkmathview/PKGBUILD index 6c41553a3..dc75031e1 100644 --- a/extra/gtkmathview/PKGBUILD +++ b/extra/gtkmathview/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 42290 2009-06-12 15:51:28Z giovanni $ +# $Id: PKGBUILD 137761 2011-09-10 15:35:20Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gtkmathview pkgver=0.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="C++ rendering engine for MathML documents" arch=('i686' 'x86_64' 'mips64el') url="http://helm.cs.unibo.it/mml-widget/" license=('GPL') -depends=('popt' 'gtk2' 't1lib' 'gmetadom>=0.2.6') +depends=('popt' 'gtk2' 't1lib' 'gmetadom') options=('!libtool') -source=(http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz - gtkmathview-0.8.0-gcc44.patch - gtkmathview-0.8.0-cond-t1.patch) +source=("http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz" + 'gtkmathview-0.8.0-gcc44.patch' + 'gtkmathview-0.8.0-cond-t1.patch') md5sums=('b53564e553728d4b69f7d366dfeb5299' '9fd261db865336c89ebf0f3545af9bc4' 'a79a27e00908e75712bc9453b669fe61') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc44.patch || return 1 - patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch || return 1 + patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc44.patch + patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch ./configure --prefix=/usr \ --sysconfdir=/etc - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir}/ install } diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD index 8badfd5a5..4d80f1568 100644 --- a/extra/i8kutils/PKGBUILD +++ b/extra/i8kutils/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 135896 2011-08-20 04:45:48Z eric $ +# $Id: PKGBUILD 138168 2011-09-18 03:14:27Z eric $ # Maintainer: Thayer Williams <thayer@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=i8kutils pkgver=1.33 -pkgrel=1 +pkgrel=2 pkgdesc="Dell Inspiron/Latitude kernel driver and utilities" +arch=('i686' 'x86_64' 'mips64el') url="http://people.debian.org/~dz/i8k/" license=('GPL2') -arch=('i686' 'x86_64' 'mips64el') depends=('glibc') source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}_${pkgver}.tar.gz) md5sums=('1ab077b301dbb0f4be8ef52eb3b97628') build() { - cd $srcdir/$pkgname-$pkgver - make || return 1 + cd "$srcdir/$pkgname-$pkgver" + make +} - # no configure script, and Makefile has /usr hardcoded - install -D -m755 i8kctl $pkgdir/usr/bin/i8kctl || return 1 - install -D -m755 i8kbuttons $pkgdir/usr/bin/i8kbuttons || return 1 - install -D -m755 i8kbuttons $pkgdir/usr/bin/i8kbuttons || return 1 - install -D -m644 i8kbuttons.1 $pkgdir/usr/share/man/man1/i8kbuttons.1 || return 1 - install -D -m644 i8kctl.1 $pkgdir/usr/share/man/man1/i8kctl.1 || return 1 - ln -fs ./i8kctl $pkgdir/usr/bin/i8kfan || return 1 +package() { + cd "$srcdir/$pkgname-$pkgver" + install -D -m755 i8kctl "$pkgdir/usr/bin/i8kctl" + install -D -m755 i8kbuttons "$pkgdir/usr/bin/i8kbuttons" + install -D -m644 i8kbuttons.1 "$pkgdir/usr/share/man/man1/i8kbuttons.1" + install -D -m644 i8kctl.1 "$pkgdir/usr/share/man/man1/i8kctl.1" + ln -fs ./i8kctl "$pkgdir/usr/bin/i8kfan" } -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/id3/PKGBUILD b/extra/id3/PKGBUILD index 37015ed0a..12929c8ce 100644 --- a/extra/id3/PKGBUILD +++ b/extra/id3/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 42386 2009-06-13 14:30:24Z giovanni $ +# $Id: PKGBUILD 137772 2011-09-10 18:35:00Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=id3 pkgver=0.78 -pkgrel=2 +pkgrel=3 pkgdesc="Utility to edit id3v1 and id3v2 tags" arch=('i686' 'x86_64' 'mips64el') -license=('custom') +url="http://freshmeat.net/projects/id3" +license=('BSD') depends=('gcc-libs') -source=(http://home.wanadoo.nl/squell/files/${pkgname}-${pkgver}.tar.gz +options=('!makeflags') +source=(http://linux-bsd-unix.strefa.pl/${pkgname}-${pkgver}.tar.gz id3-0.78-gcc44.patch) -url="http://home.wanadoo.nl/squell/id3.html" md5sums=('bbc2a5d8022006330e6bb51034fafb43' '51370be8d2624efee3683efab608a7f1') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/id3-0.78-gcc44.patch || return 1 - make || return 1 - make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/id3-0.78-gcc44.patch + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man" install #install license - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index bb986e0fb..58f37c8a3 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 136461 2011-08-29 20:24:07Z eric $ +# $Id: PKGBUILD 137987 2011-09-13 21:30:06Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.2.1 +pkgver=6.7.2.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" license=('custom') -depends=('libtool' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo') +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=('efa11515407ef0a22535d5f429668bcb' +md5sums=('ce0294e6bc7ca3ece03a432518143a29' 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('9e82c6926db62aa5dc547a029b49a593f5d4a991' +sha1sums=('0af2f0fb913f390b0b25bc4e57b344b0d54c3560' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 9b58b3974..e702eb448 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 130934 2011-07-09 05:54:52Z bisson $ +# $Id: PKGBUILD 137989 2011-09-13 21:30:09Z 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=1 +pkgrel=2 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ optdepends=('pstoedit: latex formulas' 'python-lxml: some extensions and filters' 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3') install=install diff --git a/extra/java-access-bridge/PKGBUILD b/extra/java-access-bridge/PKGBUILD index 93e50f06d..1899c87de 100644 --- a/extra/java-access-bridge/PKGBUILD +++ b/extra/java-access-bridge/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 49735 2009-08-15 14:19:33Z jgc $ +# $Id: PKGBUILD 137749 2011-09-10 15:06:48Z pierre $ # Maitnainer: Jan de Groot <jgc@archlinux.org> pkgname=java-access-bridge pkgver=1.26.2 -pkgrel=1 +pkgrel=2 pkgdesc="Java bindings for the GNOME accessibility framework" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="http://www.gnome.org" -depends=('java-runtime' 'gtk2>=2.16.5' 'at-spi>=1.26.0' 'libbonobo>=2.24.1') +depends=('java-runtime' 'gtk2' 'at-spi' 'libbonobo') makedepends=('intltool' 'pkgconfig' 'openjdk6' 'xorg-utils') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.26/${pkgname}-${pkgver}.tar.bz2) +source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.26/${pkgname}-${pkgver}.tar.bz2") sha1sums=('5f08bba19531954cec82df1bcdb89df67ee890a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 6947ad8e6..0bcb9ba59 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137381 2011-09-07 17:19:26Z andrea $ +# $Id: PKGBUILD 137806 2011-09-11 11:17:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.7.1 -pkgrel=2 +pkgrel=6 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -17,7 +17,8 @@ groups=('kde') depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate' 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python' + 'networkmanager') optdepends=('kde-wallpapers: officials KDE wallapers') replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') @@ -29,7 +30,8 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch') + 'fixpath.patch' 'terminate-server.patch' + 'important-performance-bugfix.patch') sha1sums=('c7867d2f788086078abbcff53a035a6131232539' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' @@ -37,7 +39,8 @@ sha1sums=('c7867d2f788086078abbcff53a035a6131232539' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + '4fa046db21e3203771fd29bc0e1c32918862b894') build() { cd ${srcdir}/${_pkgname}-${pkgver} @@ -45,6 +48,9 @@ build() { patch -p0 -i ${srcdir}/fixpath.patch patch -p0 -i ${srcdir}/terminate-server.patch + # Already fixed upstream + patch -p1 -i "${srcdir}"/important-performance-bugfix.patch + cd ${srcdir} mkdir build cd build @@ -55,7 +61,6 @@ build() { -DWITH_Xmms=OFF \ -DWITH_Googlegadgets=OFF \ -DWITH_libgps=OFF \ - -DWITH_NetworkManager=OFF \ -DKWIN_MOBILE_EFFECTS=OFF \ -DWITH_OpenGLES=OFF \ -DKWIN_BUILD_WITH_OPENGLES=OFF diff --git a/extra/kdebase-workspace/important-performance-bugfix.patch b/extra/kdebase-workspace/important-performance-bugfix.patch new file mode 100644 index 000000000..a34c77e5c --- /dev/null +++ b/extra/kdebase-workspace/important-performance-bugfix.patch @@ -0,0 +1,91 @@ +commit e142a1a142cbc8b87f021223e6abc947f456a7f9 +Author: Thomas Lübking <thomas.luebking@gmail.com> +Date: Thu Sep 8 22:20:35 2011 +0200 + + replace non-const QVector::operator[] accesses with const ::at() to avoid maaany deep vecor copies + +diff --git a/kwin/effects.cpp b/kwin/effects.cpp +index e0c76cb..f5863fc0 100644 +--- a/kwin/effects.cpp ++++ b/kwin/effects.cpp +@@ -200,7 +200,7 @@ void EffectsHandlerImpl::reconfigure() + void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time) + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->prePaintScreen(data, time); ++ loaded_effects.at(current_paint_screen++).second->prePaintScreen(data, time); + --current_paint_screen; + } + // no special final code +@@ -209,7 +209,7 @@ void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time) + void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& data) + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->paintScreen(mask, region, data); ++ loaded_effects.at(current_paint_screen++).second->paintScreen(mask, region, data); + --current_paint_screen; + } else + scene->finalPaintScreen(mask, region, data); +@@ -218,7 +218,7 @@ void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& + void EffectsHandlerImpl::postPaintScreen() + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->postPaintScreen(); ++ loaded_effects.at(current_paint_screen++).second->postPaintScreen(); + --current_paint_screen; + } + // no special final code +@@ -227,7 +227,7 @@ void EffectsHandlerImpl::postPaintScreen() + void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->prePaintWindow(w, data, time); ++ loaded_effects.at(current_paint_window++).second->prePaintWindow(w, data, time); + --current_paint_window; + } + // no special final code +@@ -236,7 +236,7 @@ void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& dat + void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->paintWindow(w, mask, region, data); ++ loaded_effects.at(current_paint_window++).second->paintWindow(w, mask, region, data); + --current_paint_window; + } else + scene->finalPaintWindow(static_cast<EffectWindowImpl*>(w), mask, region, data); +@@ -245,7 +245,7 @@ void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, + void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, double opacity, double frameOpacity) + { + if (current_paint_effectframe < loaded_effects.size()) { +- loaded_effects[current_paint_effectframe++].second->paintEffectFrame(frame, region, opacity, frameOpacity); ++ loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame(frame, region, opacity, frameOpacity); + --current_paint_effectframe; + } else { + const EffectFrameImpl* frameImpl = static_cast<const EffectFrameImpl*>(frame); +@@ -256,7 +256,7 @@ void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, do + void EffectsHandlerImpl::postPaintWindow(EffectWindow* w) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->postPaintWindow(w); ++ loaded_effects.at(current_paint_window++).second->postPaintWindow(w); + --current_paint_window; + } + // no special final code +@@ -273,7 +273,7 @@ bool EffectsHandlerImpl::provides(Effect::Feature ef) + void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) + { + if (current_draw_window < loaded_effects.size()) { +- loaded_effects[current_draw_window++].second->drawWindow(w, mask, region, data); ++ loaded_effects.at(current_draw_window++).second->drawWindow(w, mask, region, data); + --current_draw_window; + } else + scene->finalDrawWindow(static_cast<EffectWindowImpl*>(w), mask, region, data); +@@ -282,7 +282,7 @@ void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, W + void EffectsHandlerImpl::buildQuads(EffectWindow* w, WindowQuadList& quadList) + { + if (current_build_quads < loaded_effects.size()) { +- loaded_effects[current_build_quads++].second->buildQuads(w, quadList); ++ loaded_effects.at(current_build_quads++).second->buildQuads(w, quadList); + --current_build_quads; + } + } diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index a528b4c83..fab593505 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' 'mips64el') 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 8d1009a17..c38edaa7a 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' 'mips64el') url='http://www.kde.org' @@ -19,17 +19,22 @@ 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') + 'kde-applications-menu.patch' + 'fix-kdirwatch-with-linux3.patch') sha1sums=('661cc56f199b7250bd825cc0e85ff442b85171e2' - '86ee8c8660f19de8141ac99cd6943964d97a1ed7') + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + '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 - cd ${srcdir} + # Already fixed upstream + patch -p1 -i "${srcdir}"/fix-kdirwatch-with-linux3.patch + + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -45,11 +50,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/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index be18d5672..987383b99 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=git20110907 -_commit=d119e72811b25d167ee646d831b0aa4bb48f2a15 +pkgver=git20110911 +_commit=6028b72a14f7fa714e6b4b101d51a4fb4bda3168 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('54c37656f4795cef3cf69254758db094') +md5sums=('8c8d92af3409be5a4faac21b25d0b5d0') build() { cd "${srcdir}" diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index 59ce7b6de..dfa38f908 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 133446 2011-07-28 00:46:22Z andrea $ +# $Id: PKGBUILD 137656 2011-09-10 10:56:33Z pierre $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,7 +37,7 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/ladspa/PKGBUILD b/extra/ladspa/PKGBUILD index 9bb52997f..e7009dfdf 100644 --- a/extra/ladspa/PKGBUILD +++ b/extra/ladspa/PKGBUILD @@ -1,25 +1,32 @@ -# $Id: PKGBUILD 18544 2008-11-06 23:58:14Z jgc $ +# $Id: PKGBUILD 137623 2011-09-10 08:28:05Z pierre $ # Maintainer: damir <damir@archlinux.org> pkgname=ladspa pkgver=1.13 -pkgrel=2 +pkgrel=3 pkgdesc="Linux Audio Developer's Simple Plugin API (LADSPA)" arch=("i686" "x86_64" 'mips64el') license=('LGPL') url="http://www.ladspa.org/" -depends=('gcc-libs>=4.3') -source=(http://www.ladspa.org/download/${pkgname}_sdk_${pkgver}.tgz - hardcode-path.patch) +depends=('gcc-libs') +source=("http://www.ladspa.org/download/${pkgname}_sdk_${pkgver}.tgz" + 'hardcode-path.patch') md5sums=('671be3e1021d0722cadc7fb27054628e' '27743258232d828575d66940e6de2858') build() { cd "${srcdir}/${pkgname}_sdk/src" - patch -Np1 -i "${srcdir}/hardcode-path.patch" || return 1 - sed -i -e 's/mkdirhier/mkdir -p/' makefile || return 1 - make targets || return 1 + patch -Np1 -i "${srcdir}/hardcode-path.patch" + sed \ + -e 's/mkdirhier/mkdir -p/' \ + -e "s#-O3#${CFLAGS} ${LDFLAGS/,--as-needed/}#" \ + -i makefile + make targets +} + +package() { + cd "${srcdir}/${pkgname}_sdk/src" make INSTALL_PLUGINS_DIR="${pkgdir}/usr/lib/ladspa/" \ INSTALL_INCLUDE_DIR="${pkgdir}/usr/include/" \ - INSTALL_BINARY_DIR="${pkgdir}/usr/bin/" install || return 1 + INSTALL_BINARY_DIR="${pkgdir}/usr/bin/" install } diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD index 0b4defe8d..5b2380e0c 100644 --- a/extra/lesstif/PKGBUILD +++ b/extra/lesstif/PKGBUILD @@ -1,42 +1,57 @@ -# $Id: PKGBUILD 62257 2010-01-05 21:48:01Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 137646 2011-09-10 10:03:09Z andrea $ +# Maintainer: +# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=lesstif pkgver=0.95.2 -pkgrel=2 +pkgrel=3 pkgdesc="LGPL'd re-implementation of Motif" arch=('i686' 'x86_64' 'mips64el') url="http://www.lesstif.org/" license=('LGPL' 'MIT') depends=('freetype2' 'libxt' 'libxp') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - LICENSE 040_fedora_XxxxProperty-64bit.diff) -md5sums=('754187dbac09fcf5d18296437e72a32f' 'b1f320192a9154f72d83e9d3d5a25a2f'\ +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE' '040_fedora_XxxxProperty-64bit.diff') +md5sums=('754187dbac09fcf5d18296437e72a32f' + 'b1f320192a9154f72d83e9d3d5a25a2f' '30e2c0babc84696af089d55cb9cb2908') -sha1sums=('b894e544d529a235a6a665d48ca94a465f44a4e5' '5d7f38555417cb617d7d5b7e41a93af8430dc638'\ - '85412aba25058110db8da99da4a2c5ab44330467') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../040_fedora_XxxxProperty-64bit.diff || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man --docdir=/usr/share/doc \ - --enable-production --enable-nonstandard-conversions --enable-editres \ - --with-xdnd --enable-build-21 --disable-debug --enable-static || return 1 - -# fix linkage against already installed version - perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool || return 1 - - make || return 1 - -# fix linkage against already installed version - for f in `find . -name \*.la -type f` ; do - perl -pi -e 's/^(relink_command=.*)/# $1/' $f || return 1 - done - - make -C lib/Mrm-2.1 || return 1 - make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install || return 1 - make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif DESTDIR="${pkgdir}" install || return 1 - install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/040_fedora_XxxxProperty-64bit.diff + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --docdir=/usr/share/doc \ + --enable-production \ + --enable-nonstandard-conversions \ + --enable-editres \ + --with-xdnd \ + --enable-build-21 \ + --disable-debug \ + --enable-static + + # fix linkage against already installed version + perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool + + make + + # fix linkage against already installed version + for f in `find . -name \*.la -type f` ; do + perl -pi -e 's/^(relink_command=.*)/# $1/' $f + done + + make -C lib/Mrm-2.1 +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + + make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install + make appdir=/usr/share/X11/app-defaults rootdir=/usr/share/LessTif \ + DESTDIR=${pkgdir} install + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index ed8773c8a..c9f882744 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135786 2011-08-18 15:04:15Z andyrtr $ +# $Id: PKGBUILD 138121 2011-09-17 02:03:36Z allan $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.3.1 -pkgrel=2 +pkgver=4.3.2 +pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -14,7 +14,7 @@ makedepends=('autoconf') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ea45acfb47b5590d4675c50dc0c6e13c') +md5sums=('18f5c5b351cfad0a0ab069592effd664') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libavc1394/PKGBUILD b/extra/libavc1394/PKGBUILD index e63169cef..af377fd49 100644 --- a/extra/libavc1394/PKGBUILD +++ b/extra/libavc1394/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 37800 2009-05-03 21:23:26Z jgc $ +# $Id: PKGBUILD 137687 2011-09-10 12:13:56Z pierre $ # Maintainer: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=libavc1394 -pkgver=0.5.3 -pkgrel=3 +pkgver=0.5.4 +pkgrel=1 pkgdesc="A library to control A/V devices using the 1394ta AV/C commands." arch=("i686" "x86_64" 'mips64el') url="http://sourceforge.net/projects/libavc1394/" license=('LGPL') -depends=('libraw1394>=2.0.2') +depends=('libraw1394') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/libavc1394/${pkgname}-${pkgver}.tar.gz) -md5sums=('09e30b1fb5ae455b6d8407e457a711a3') +source=("http://downloads.sourceforge.net/sourceforge/libavc1394/${pkgname}-${pkgver}.tar.gz") +md5sums=('caf0db059d8b8d35d6f08e6c0e1c7dfe') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libcddb/PKGBUILD b/extra/libcddb/PKGBUILD index 6adf8d6d7..f368ad6c8 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' 'mips64el') +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/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD index 49f455610..051d67b70 100644 --- a/extra/libcroco/PKGBUILD +++ b/extra/libcroco/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 26935 2009-02-14 19:49:35Z jgc $ +# $Id: PKGBUILD 137630 2011-09-10 08:40:20Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=libcroco pkgver=0.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME CSS2 parsing and manipulation toolkit" arch=('x86_64' 'i686' 'mips64el') -depends=('glib2>=2.18.4' 'libxml2>=2.7.3') +depends=('glib2' 'libxml2') makedepends=('intltool' 'pkgconfig') license=('LGPL') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) +source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2") url="http://www.gnome.org" md5sums=('1429c597aa4b75fc610ab3a542c99209') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libdc1394/PKGBUILD b/extra/libdc1394/PKGBUILD index ffda48ac9..674c62bc5 100644 --- a/extra/libdc1394/PKGBUILD +++ b/extra/libdc1394/PKGBUILD @@ -1,24 +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=2 pkgdesc="High level programming interface to control IEEE 1394 based cameras" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') 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 - fix-videodev.h.patch) +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' - '8bbf233bf11295649cfd61a9ac3eba1b') + 'bc7a4146b4d2d688305d0d42c4111941' + '9dd11c96241b14073c3a7dd7e270fb7a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np2 -i $srcdir/fix-videodev.h.patch - autoreconf -s -i + + # 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/libdca/PKGBUILD b/extra/libdca/PKGBUILD index 65431bb80..d642da853 100644 --- a/extra/libdca/PKGBUILD +++ b/extra/libdca/PKGBUILD @@ -1,26 +1,33 @@ -# $Id: PKGBUILD 49760 2009-08-15 15:07:38Z jgc $ +# $Id: PKGBUILD 137736 2011-09-10 14:39:31Z pierre $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libdca pkgver=0.0.5 -pkgrel=2 +pkgrel=3 pkgdesc="Free library for decoding DTS Coherent Acoustics streams" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.videolan.org/developers/libdca.html" -source=(http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) +depends=('sh') provides=('libdts') replaces=('libdts') options=('!libtool' '!emptydirs') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") md5sums=('dab6b2795c66a82a6fcd4f8343343021') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/share/man/man1"/{extract_dts,dtsdec}.1 - ln -s dcadec.1.gz "${pkgdir}/usr/share/man/man1/dtsdec.1.gz" || return 1 - ln -s extract_dca.1.gz "${pkgdir}/usr/share/man/man1/extract_dts.1.gz" || return 1 + ln -s dcadec.1.gz "${pkgdir}/usr/share/man/man1/dtsdec.1.gz" + ln -s extract_dca.1.gz "${pkgdir}/usr/share/man/man1/extract_dts.1.gz" + # remove dangling symlink + rm "${pkgdir}/usr/lib/libdts.a" } diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD index cae3de39b..f20543a4d 100644 --- a/extra/libgee/PKGBUILD +++ b/extra/libgee/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 108155 2011-01-30 12:17:51Z ibiru $ +# $Id: PKGBUILD 138009 2011-09-14 09:17:28Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libgee -pkgver=0.6.1 +pkgver=0.6.2.1 pkgrel=1 pkgdesc="GObject collection library" url="http://live.gnome.org/Libgee" license=('LGPL2.1') arch=('i686' 'x86_64' 'mips64el') -depends=('glib2>=2.26') +depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e6220f321b53f7732e0b45db7b8f29088cf4892e798b9b9a02bed16938030121') +source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/${pkgname}-${pkgver}.tar.xz) +sha256sums=('478f7daebe8369ad72bf83431d953db772af6865ff3aa21bf75bf6730f561389') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/libglademm/PKGBUILD b/extra/libglademm/PKGBUILD index bd0e71143..11b55abe6 100644 --- a/extra/libglademm/PKGBUILD +++ b/extra/libglademm/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 13345 2008-09-26 21:07:05Z jgc $ +# $Id: PKGBUILD 137593 2011-09-10 00:04:11Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> + pkgname=libglademm pkgver=2.6.7 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ wrapper for libglade." -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') +url="http://gtkmm.sourceforge.net/" license=('LGPL') depends=('libglade>=2.6.3' 'gtkmm>=2.14.1') makedepends=('pkgconfig') options=('!libtool') -url="http://gtkmm.sourceforge.net/" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.6/${pkgname}-${pkgver}.tar.bz2) md5sums=('f9ca5b67f6c551ea98790ab5f21c19d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libgnomecanvasmm/PKGBUILD b/extra/libgnomecanvasmm/PKGBUILD index 7141ca4ad..abc32dd66 100644 --- a/extra/libgnomecanvasmm/PKGBUILD +++ b/extra/libgnomecanvasmm/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 33795 2009-04-04 20:02:36Z jgc $ +# $Id: PKGBUILD 137754 2011-09-10 15:22:05Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=libgnomecanvasmm pkgver=2.26.0 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ wrapper for libgnomecanvas." -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -depends=('gtkmm>=2.16.0' 'libgnomecanvas>=2.26.0') +depends=('gtkmm' 'libgnomecanvas') makedepends=('pkgconfig') options=('!libtool') url="http://gtkmm.sourceforge.net/" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2) +source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2") md5sums=('a148c99311d46397de6e4a31736771ab') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD index 95f2500a8..e9bbd1e75 100644 --- a/extra/libgpod/PKGBUILD +++ b/extra/libgpod/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135794 2011-08-18 15:04:25Z andyrtr $ +# $Id: PKGBUILD 138079 2011-09-16 07:31:23Z ibiru $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> @@ -9,7 +9,7 @@ pkgdesc="A shared library to access the contents of an iPod" arch=(i686 x86_64 'mips64el') license=('LGPL') depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') -makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2') +makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2') optdepends=('gtk-sharp-2: Mono bindings') url="http://www.gtkpod.org/libgpod/" source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD index 9f1dc49d5..8e022137d 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' 'mips64el') 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 dd806ff96..997a491f5 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' 'mips64el') 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/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD index 4e464e66f..d9d149aff 100644 --- a/extra/libmygpo-qt/PKGBUILD +++ b/extra/libmygpo-qt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 124554 2011-05-22 22:58:16Z andrea $ +# $Id: PKGBUILD 137565 2011-09-09 17:36:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libmygpo-qt -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="A C++/Qt client library for gpodder.net" arch=('i686' 'x86_64' 'mips64el') @@ -11,13 +11,13 @@ license=('LGPL2.1') depends=('qjson') makedepends=('cmake') source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz") -md5sums=('0ed91cc9483f4634e8709a0ea95baeba') +md5sums=('9c840d6a7dc96055c6eb5a7d36d02a7c') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}.${pkgver} \ + cmake ../${pkgname} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/libnice/PKGBUILD b/extra/libnice/PKGBUILD index 97e10f729..b0abc4d66 100644 --- a/extra/libnice/PKGBUILD +++ b/extra/libnice/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: William DÃaz <wdiaz@archlinux.us> pkgname=libnice -pkgver=0.1.0 +pkgver=0.1.1 pkgrel=1 pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)" arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +12,9 @@ license=('LGPL') depends=('gstreamer0.10') options=('!libtool') source=(http://nice.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('c077e2aa74c9afb4b4e157efc8a6ad9d') +md5sums=('0906c3523eb78cb3caad170cc75af4b0') build() { -# export CFLAGS="$CFLAGS -fno-strict-aliasing" - cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index cc6d9e2dc..dee391f52 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 137295 2011-09-06 22:08:52Z heftig $ +# $Id: PKGBUILD 138210 2011-09-18 16:29:47Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg pkgver=2.34.1 -pkgrel=1 +pkgrel=2 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" arch=(i686 x86_64 'mips64el') license=('LGPL') depends=('gdk-pixbuf2' 'pango' 'libcroco') -makedepends=('intltool') +makedepends=('intltool' 'gtk2') +optdepends=('gtk2: for rsvg-view support') options=('!libtool' '!emptydirs') url="http://librsvg.sourceforge.net/" install=librsvg.install @@ -20,7 +21,7 @@ build() { sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in ./configure --prefix=/usr --libexecdir=/usr/lib/${pkgname} \ --with-croco --disable-static \ - --with-svgz --disable-gtk-theme + --with-svgz make } diff --git a/extra/libshout/PKGBUILD b/extra/libshout/PKGBUILD index 6f992e7c4..decc80456 100644 --- a/extra/libshout/PKGBUILD +++ b/extra/libshout/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 37197 2009-05-01 03:19:30Z eric $ +# $Id: PKGBUILD 137685 2011-09-10 12:10:13Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor: Jason Chu <jchu@xentac.net> pkgname=libshout pkgver=2.2.2 -pkgrel=3 +pkgrel=4 +epoch=1 pkgdesc="Library for accessing a shoutcast/icecast server" arch=('i686' 'x86_64' 'mips64el') depends=('libvorbis' 'libtheora' 'speex') url="http://www.icecast.org/" -options=('!libtool' 'force') +options=('!libtool' '!emptydirs') license=('LGPL') -source=(http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('4f75fc9901c724b712c371c9a1e782d3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 - make LDFLAGS+=-lspeex || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make LDFLAGS+=-lspeex +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libsigsegv/PKGBUILD b/extra/libsigsegv/PKGBUILD index c77e0568d..030de8269 100644 --- a/extra/libsigsegv/PKGBUILD +++ b/extra/libsigsegv/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 31137 2009-03-24 15:49:35Z ronald $ +# $Id: PKGBUILD 137667 2011-09-10 11:21:14Z pierre $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Johannes Weiner <hannes@saeurebad.de> pkgname=libsigsegv pkgver=2.6 -pkgrel=1 +pkgrel=2 arch=('x86_64' 'i686' 'mips64el') pkgdesc="Page fault detection library" url="http://libsigsegv.sourceforge.net/" license=('GPL2') depends=('glibc') options=('!libtool') -source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('7e24993730649d13c6eabc28bd24de35') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --enable-shared - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD index 041f16b89..4da9183cd 100644 --- a/extra/libssh/PKGBUILD +++ b/extra/libssh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135676 2011-08-17 07:52:28Z andrea $ +# $Id: PKGBUILD 138141 2011-09-17 12:41:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: ice-man <icemanf@gmail.com> # Contributor: sergeantspoon <sergeantspoon@archlinux.us> pkgname=libssh -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="Library for accessing ssh client services through C libraries" url="http://www.libssh.org/" @@ -12,8 +12,8 @@ license=('LGPL') arch=('i686' 'x86_64' 'mips64el') depends=('openssl') makedepends=('cmake' 'doxygen') -source=("http://www.libssh.org/files/0.5/${pkgname}-${pkgver}.tar.gz") -md5sums=('0cd8bc9336398e23a76f4e25c1412eb4') +source=("https://red.libssh.org/attachments/download/27/${pkgname}-${pkgver}.tar.gz") +md5sums=('38b67c48af7a9204660a3e08f97ceba6') build() { cd "${srcdir}" diff --git a/extra/libstdc++5/PKGBUILD b/extra/libstdc++5/PKGBUILD index 652fe58fd..461240c0e 100644 --- a/extra/libstdc++5/PKGBUILD +++ b/extra/libstdc++5/PKGBUILD @@ -1,38 +1,49 @@ -# $Id: PKGBUILD 35574 2009-04-14 04:10:12Z eric $ +# $Id: PKGBUILD 137600 2011-09-10 01:24:58Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libstdc++5 pkgver=3.3.6 -pkgrel=3 +pkgrel=4 pkgdesc="GNU Standard C++ library version 3" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://gcc.gnu.org" license=('GPL' 'LGPL') depends=('gcc-libs') makedepends=('binutils' 'gcc') options=('!libtool' '!makeflags') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 gcc-3.4.3-no_multilib_amd64.patch) -md5sums=(18c52e6fb8966b7700665dca289d077f 6b3d00b8d079805be1b895f7f6ce47a0 \ - 088e0807e677010cafe4e590e8711be1) +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 + 'gcc-3.4.3-no_multilib_amd64.patch') +md5sums=('18c52e6fb8966b7700665dca289d077f' + '6b3d00b8d079805be1b895f7f6ce47a0' + '088e0807e677010cafe4e590e8711be1') build(){ - export CFLAGS=$(echo $CFLAGS | sed 's|-mtune=generic||') - export CXXFLAGS=$(echo $CXXFLAGS | sed 's|-mtune=generic||') + export CFLAGS="-march=${CARCH/_/-} -O2 -pipe" + export CXXFLAGS="-march=${CARCH/_/-} -O2 -pipe" + cd ${srcdir}/gcc-${pkgver} if [ "$CARCH" = "x86_64" ]; then - patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch || return 1 + patch -Np0 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch fi + + # fix build issue with recent gcc + sed -i "s#O_CREAT#O_CREAT, 0666#" gcc/collect2.c # No fixincludes sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + mkdir ../gcc-build cd ../gcc-build ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \ --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \ --disable-multilib --libdir=/usr/lib - make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || return 1 - make DESTDIR=${pkgdir} install-target-libstdc++-v3 || return 1 + make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" +} + +package() { + cd ${srcdir}/gcc-build + make DESTDIR=${pkgdir} install-target-libstdc++-v3 # Remove includefiles and libs provided by gcc rm -rf ${pkgdir}/usr/{include,share/locale} diff --git a/extra/libstroke/PKGBUILD b/extra/libstroke/PKGBUILD index ad67c9fe8..c81b0a90f 100644 --- a/extra/libstroke/PKGBUILD +++ b/extra/libstroke/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123180 2011-05-09 03:18:04Z eric $ +# $Id: PKGBUILD 137618 2011-09-10 07:13:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libstroke pkgver=0.5.1 -pkgrel=4 +pkgrel=5 pkgdesc="A stroke (mouse gesture) translation library" arch=('i686' 'x86_64' 'mips64el') url="http://etla.net/libstroke/" @@ -11,18 +11,23 @@ license=('GPL2') depends=('glibc') makedepends=('libx11' 'gtk') options=('!libtool') -source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz libgstroke-Makefile.am.patch libstroke-Makefile.am.patch) +source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz \ + libgstroke-Makefile.am.patch libstroke-Makefile.am.patch \ + libstroke-0.5.1-m4_syntax.patch) md5sums=('51b9a4e309ac15cfcab96191eed03cb2' '60bbaf355355c3c66c8015b0f7feca85' - '96413a77e1d39d1a3223e8eb6be8ef01') + '96413a77e1d39d1a3223e8eb6be8ef01' + '93c47eef46a0cc4011a246485c5a6620') sha1sums=('48bd2b98faa8681ccd97eda7a09442845dbf1b7b' 'a0c3bd9e894650475ba3049b0ef3d7f9580c203d' - 'ee5a3635c31dba00b070a942c512cc0d53056188') + 'ee5a3635c31dba00b070a942c512cc0d53056188' + 'c9240937776b0572e3927e1c56d78309413c5209') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 < ../libgstroke-Makefile.am.patch patch -p1 < ../libstroke-Makefile.am.patch + patch -p1 < ../libstroke-0.5.1-m4_syntax.patch libtoolize --force --copy aclocal diff --git a/extra/libstroke/libstroke-0.5.1-m4_syntax.patch b/extra/libstroke/libstroke-0.5.1-m4_syntax.patch new file mode 100644 index 000000000..70bb720ee --- /dev/null +++ b/extra/libstroke/libstroke-0.5.1-m4_syntax.patch @@ -0,0 +1,58 @@ +--- libstroke-0.5.1/libstroke.m4 {cset 02bc4a5e-e9e6-4055-a406-5007a0ac3e55} ++++ libstroke-0.5.1/libstroke.m4 {local clone} +@@ -26,7 +26,7 @@ + dnl if different from name + dnl description (optional) used to construct help string + dnl +-AC_DEFUN(smr_ARG_WITHLIB, [ ++AC_DEFUN([smr_ARG_WITHLIB], [ + + ifelse($2, , smr_lib=[$1], smr_lib=[$2]) + +@@ -74,7 +74,7 @@ + dnl extra-flags (optional) flags required when compiling the + dnl header, typically more includes; for ex. X_CFLAGS + dnl +-AC_DEFUN(smr_ARG_WITHINCLUDES, [ ++AC_DEFUN([smr_ARG_WITHINCLUDES], [ + + AC_ARG_WITH([$1]-includes, + [ --with-$1-includes=DIR set directory for $1 headers], +@@ -116,7 +116,7 @@ + dnl x-libs (optional) extra libraries, if needed to link with lib + dnl x-flags (optional) extra flags, if needed to include header files + dnl +-AC_DEFUN(smr_CHECK_LIB, ++AC_DEFUN([smr_CHECK_LIB], + [ + ifelse($2, , smr_lib=[$1], smr_lib=[$2]) + ifelse($5, , , smr_header=[$5]) +--- libstroke-0.5.1/libgstroke.m4 2011-09-10 02:59:55.000000000 -0400 ++++ libstroke-0.5.1/libgstroke.m4 2011-09-10 03:01:14.000000000 -0400 +@@ -26,7 +26,7 @@ + dnl if different from name + dnl description (optional) used to construct help string + dnl +-AC_DEFUN(smr_ARG_WITHLIB, [ ++AC_DEFUN([smr_ARG_WITHLIB], [ + + ifelse($2, , smr_lib=[$1], smr_lib=[$2]) + +@@ -74,7 +74,7 @@ + dnl extra-flags (optional) flags required when compiling the + dnl header, typically more includes; for ex. X_CFLAGS + dnl +-AC_DEFUN(smr_ARG_WITHINCLUDES, [ ++AC_DEFUN([smr_ARG_WITHINCLUDES], [ + + AC_ARG_WITH([$1]-includes, + [ --with-$1-includes=DIR set directory for $1 headers], +@@ -116,7 +116,7 @@ + dnl x-libs (optional) extra libraries, if needed to link with lib + dnl x-flags (optional) extra flags, if needed to include header files + dnl +-AC_DEFUN(smr_CHECK_LIB, ++AC_DEFUN([smr_CHECK_LIB], + [ + ifelse($2, , smr_lib=[$1], smr_lib=[$2]) + ifelse($5, , , smr_header=[$5]) diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD index 75ac58368..804fce211 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' 'mips64el') 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/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD index aa2207e39..d7fa4a87d 100644 --- a/extra/libwebkit/PKGBUILD +++ b/extra/libwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130015 2011-07-01 08:50:25Z ibiru $ +# $Id: PKGBUILD 138139 2011-09-17 11:15:02Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=libwebkit -pkgname=(libwebkit libwebkit3) -pkgver=1.4.2 +pkgname=('libwebkit' 'libwebkit3') +pkgver=1.4.3 pkgrel=1 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64' 'mips64el') @@ -15,8 +15,9 @@ makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') options=('!libtool') install=libwebkit.install source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz - replace-switch-with-given-when.patch fix-mips-n32.patch) +md5sums=('86a4354e65853687bf942100763225bb' + '1e1971b0214f6705ceb4f816c4b52af9') build() { cd "${srcdir}/webkit-${pkgver}" @@ -72,6 +73,3 @@ package_libwebkit3() { make DESTDIR="${pkgdir}" install install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE" } -md5sums=('361f8420e93d12101d650758fec09fa0' - '3ba708a26b7af0e1e853867966fe14f7' - '1e1971b0214f6705ceb4f816c4b52af9') diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD index 7855ad22c..22d9892b3 100644 --- a/extra/libxfce4util/PKGBUILD +++ b/extra/libxfce4util/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 124279 2011-05-18 16:40:43Z andyrtr $ +# $Id: PKGBUILD 138125 2011-09-17 02:23:22Z allan $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=libxfce4util -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 pkgdesc="Basic utility non-GUI functions for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://www.xfce.org/" -depends=("glib2") +depends=('glib2') makedepends=('pkgconfig' 'intltool' 'gtk-doc') options=('!libtool') source=(http://archive.xfce.org/src/xfce/libxfce4util/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2be3af4c7db5ad293a7525e1021e6f0f') +md5sums=('3376a77637a4292a863027d595548ee2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libytnef/PKGBUILD b/extra/libytnef/PKGBUILD index 7be7bb370..e8e6d0839 100644 --- a/extra/libytnef/PKGBUILD +++ b/extra/libytnef/PKGBUILD @@ -1,29 +1,30 @@ # $Id: $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andre Klitzing <aklitzing () online () de> + pkgname=libytnef pkgver=1.5 -pkgrel=2 +pkgrel=3 pkgdesc="Yerase's TNEF Stream Reader library (decode winmail.dat)" url="http://freshmeat.net/projects/ytnef/" license=('GPL') -arch=(i686 x86_64 'mips64el') -options=(!libtool) +arch=('i686' 'x86_64' 'mips64el') +options=('!libtool') depends=('glibc') -source=("http://downloads.sourceforge.net/ytnef/${pkgname}-${pkgver}.tar.gz" - 'config.guess' - 'config.sub') -md5sums=('6c44b955f33cf714c75a7bbe895cc352' - 'fad4f4cc5caad203dee58165a1412b80' - '7905ae2a747db79964eb9a1693a15c2b') +source=("http://downloads.sourceforge.net/ytnef/${pkgname}-${pkgver}.tar.gz") +md5sums=('6c44b955f33cf714c75a7bbe895cc352') build() { # Install updated config.guess and config.sub cp "$srcdir/config.guess" "$srcdir/config.sub" "$srcdir/${pkgname}-${pkgver}" cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/lib/libytnef.a" } diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD index da76c9696..7bad05215 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 138070 2011-09-16 01:15:44Z eric $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=lua pkgver=5.1.4 -pkgrel=6 +pkgrel=8 pkgdesc="A powerful light-weight programming language designed for extending applications." arch=('i686' 'x86_64' 'mips64el') -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-3' + 'lua-arch.patch' + 'lua-5.1-cflags.diff') +md5sums=('d0870f2de55d59c1c8419f36e8fac150' + '998ef7886183f61d3a5ca891a9ce6a79' + '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 + patch -i "${srcdir}/patch-lua-5.1.4-3" -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/lxsplit/PKGBUILD b/extra/lxsplit/PKGBUILD index 73f2c026b..85de80fd7 100644 --- a/extra/lxsplit/PKGBUILD +++ b/extra/lxsplit/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 26529 2009-02-08 21:47:07Z eric $ +# $Id: PKGBUILD 137625 2011-09-10 08:31:27Z pierre $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=lxsplit pkgver=0.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="Command-line file splitter/joiner compatible with any HJSplit version" arch=('i686' 'x86_64' 'mips64el') url="http://lxsplit.sourceforge.net/" license=('GPL') depends=('glibc') -#source=(http://www.freebyte.com/download/$pkgname.tar.gz) -source=(http://downloads.sourceforge.net/sourceforge/lxsplit/lxsplit-${pkgver}.tar.gz) +source=("http://downloads.sourceforge.net/sourceforge/lxsplit/lxsplit-${pkgver}.tar.gz") md5sums=('ed21a08c167c08d4d81c820782947cb1') build() { cd ${srcdir}/${pkgname}-${pkgver} + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} install -d ${pkgdir}/usr/bin - make || return 1 - make INSTALL_PATH=${pkgdir}/usr/bin install || return 1 + make INSTALL_PATH=${pkgdir}/usr/bin install } diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index c2f1b8cc5..e3c91ccb8 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 133449 2011-07-28 03:31:32Z heftig $ +# $Id: PKGBUILD 137636 2011-09-10 09:15:43Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx -pkgver=2.0.0 -pkgrel=3 +pkgver=2.0.1 +pkgrel=2 pkgdesc="An advanced open-source document processor." arch=('i686' 'x86_64' 'mips64el') url="http://www.lyx.org" -depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'aspell' 'aiksaurus' 'boost-libs') +depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'enchant' 'boost-libs' 'libmythes') makedepends=('boost') license=('GPL') source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz \ - lyx.desktop) -sha1sums=('27bf0ee623aae0e59780d9f627cdf5cb788a2516' - 'e207a0b14d58aeb7b83f8fc47ab2e668cbc66844') - + lyx.desktop lyxrc.dist) +backup=('etc/lyx/lyxrc.dist') +install=lyx.install +sha1sums=('225b4d853f38463e986a9b42a39cac432da56d8a' + 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad' + '56416642cc3da2a13b87b84e6b87c1a239f3d09a') + build() { cd "${srcdir}/${pkgname}-${pkgver}" find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} + sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp export CXXFLAGS="$CXXFLAGS -fpermissive" ./configure --prefix=/usr \ - --with-frontend=qt4 --without-included-boost + --with-frontend=qt4 --without-included-boost \ + --without-included-mythes make } @@ -33,5 +37,9 @@ package() { # install desktop entry install -Dm644 "${srcdir}/lyx.desktop" "${pkgdir}/usr/share/applications/lyx.desktop" + + # install default config file + install -Dm644 ${srcdir}/lyxrc.dist ${pkgdir}/etc/lyx/lyxrc.dist + ln -sf /etc/lyx/lyxrc.dist ${pkgdir}/usr/share/lyx/lyxrc.dist } diff --git a/extra/lyx/lyx.desktop b/extra/lyx/lyx.desktop index 91a90d810..649b30c98 100644 --- a/extra/lyx/lyx.desktop +++ b/extra/lyx/lyx.desktop @@ -1,9 +1,14 @@ [Desktop Entry] -Name=Lyx -Comment=Latex WYSIWYM Editor -Icon=/usr/share/lyx/images/lyx.png -Exec=lyx -Terminal=false +Version=1.0 Type=Application +Name=LyX Document Processor +GenericName=Document Processor +Comment=High level LaTeX frontend +Exec=lyx %F +TryExec=lyx +Icon=lyx StartupNotify=false -Categories=Office; +StartupWMClass=Lyx +Terminal=false +Categories=Office;WordProcessor;Qt; +MimeType=text/x-lyx;application/x-lyx; diff --git a/extra/lyx/lyx.install b/extra/lyx/lyx.install new file mode 100644 index 000000000..c15c17b3a --- /dev/null +++ b/extra/lyx/lyx.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove () { + post_install +} + + + diff --git a/extra/lyx/lyxrc.dist b/extra/lyx/lyxrc.dist new file mode 100644 index 000000000..dd18694f9 --- /dev/null +++ b/extra/lyx/lyxrc.dist @@ -0,0 +1,14 @@ +### This file is part of +### ======================================================== +### LyX, The Document Processor +### +### Copyright 1995 Matthias Ettrich +### Copyright 1995-2011 The LyX Team. +### +### ======================================================== + +# The file lyxrc.dist gives initial global options for all LyX users. +# Almost all settings here can be overridden through the preferences in LyX. + +\thesaurusdir_path "/usr/share/mythes" +\hunspelldir_path "/usr/share/myspell" diff --git a/extra/mcpp/PKGBUILD b/extra/mcpp/PKGBUILD index 93f5de195..1e05b23cb 100644 --- a/extra/mcpp/PKGBUILD +++ b/extra/mcpp/PKGBUILD @@ -1,27 +1,32 @@ -# $Id: PKGBUILD 29372 2009-03-08 13:20:31Z jgc $ +# $Id: PKGBUILD 137665 2011-09-10 11:18:34Z pierre $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> + pkgname=mcpp pkgver=2.7.2 -pkgrel=2 +pkgrel=3 pkgdesc="Matsui's CPP implementation precisely conformed to standards" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://mcpp.sourceforge.net" -depends=(glibc) -options=(!libtool) -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - namlen.patch) +depends=('glibc') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'namlen.patch') md5sums=('512de48c87ab023a69250edc7a0c7b05' - '0bfc6177a58e912a9e23e368578dd3fe') + '0bfc6177a58e912a9e23e368578dd3fe') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/namlen.patch" || return 1 - ./configure --prefix=/usr --enable-mcpplib --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "${srcdir}/namlen.patch" + ./configure --prefix=/usr --enable-mcpplib --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - ln -sf ../doc/${pkgname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" + ln -sf ../../doc/${pkgname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD index 9ad023eb6..ec87ecba0 100644 --- a/extra/metalog/PKGBUILD +++ b/extra/metalog/PKGBUILD @@ -1,35 +1,33 @@ -# $Id: PKGBUILD 54835 2009-10-11 19:46:55Z giovanni $ +# $Id: PKGBUILD 137711 2011-09-10 13:12:33Z pierre $ # Maintainer: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# pkgname=metalog pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Metalog is a modern replacement for syslogd and klogd" -arch=(i686 x86_64 'mips64el') +url="http://metalog.sourceforge.net" +license=('GPL') +arch=('i686' 'x86_64' 'mips64el') depends=('pcre') -makedepends=('xz-utils') provides=('logger') -backup=(etc/metalog.conf etc/conf.d/metalog) -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-1.tar.lzma -\ - metalog metalog.confd) -md5sums=('df4ec89f6a0df24a43f9592ee80ab6be' 'cdd1d34eedbfbc2d9e659bf0a0f58f56'\ +backup=('etc/metalog.conf' 'etc/conf.d/metalog') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-1.tar.lzma" + 'metalog' 'metalog.confd') +md5sums=('df4ec89f6a0df24a43f9592ee80ab6be' + 'cdd1d34eedbfbc2d9e659bf0a0f58f56' '86bccd5a02996921e29eff8a0394d11f') -license=(GPL) -url="http://metalog.sourceforge.net" build() { - # WTF: Upstream doesn't provide gzip/bz2 compressed archives - lzma -d -c $startdir/src/${pkgname}-1.tar.lzma | tar xf - -C $startdir/src - cd $startdir/src/$pkgname-1 + cd $srcdir/$pkgname-1 ./configure --prefix=/usr --sysconfdir=/etc - /usr/bin/make || return 1 - /usr/bin/make DESTDIR=$startdir/pkg install || return 1 - /bin/install -D -m755 $startdir/src/metalog $startdir/pkg/etc/rc.d/metalog - /bin/install -D -m644 $startdir/src/metalog.confd $startdir/pkg/etc/conf.d/metalog - /bin/install -D -m644 metalog.conf $startdir/pkg/etc/metalog.conf + make } -# vim: ts=2: ft=sh +package() { + cd $srcdir/$pkgname-1 + make DESTDIR=$pkgdir install + install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog + install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog + install -D -m644 metalog.conf $pkgdir/etc/metalog.conf +} diff --git a/extra/mod_dnssd/PKGBUILD b/extra/mod_dnssd/PKGBUILD index defdd4cbc..02c0b82a6 100644 --- a/extra/mod_dnssd/PKGBUILD +++ b/extra/mod_dnssd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: $ +# $Id: PKGBUILD 137844 2011-09-12 03:00:03Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: tardo <tardo@nagi-fanboi.net> # Contributor: William Rea <sillywilly@gmail.com> pkgname=mod_dnssd pkgver=0.6 -pkgrel=3 +pkgrel=4 pkgdesc="Zeroconf module for Apache2" arch=('i686' 'x86_64' 'mips64el') url="http://0pointer.de/lennart/projects/mod_dnssd" @@ -16,8 +16,12 @@ md5sums=('bed3d95a98168bf0515922d1c05020c5') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-lynx || return 1 - make || return 1 + ./configure --prefix=/usr --disable-lynx + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" install -m755 -d "${pkgdir}/usr/lib/httpd/modules" - install -m755 src/.libs/mod_dnssd.so "${pkgdir}/usr/lib/httpd/modules/" || return 1 + install -m755 src/.libs/mod_dnssd.so "${pkgdir}/usr/lib/httpd/modules/" } diff --git a/extra/mono-addins/PKGBUILD b/extra/mono-addins/PKGBUILD index 836600130..01044c51a 100644 --- a/extra/mono-addins/PKGBUILD +++ b/extra/mono-addins/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 84508 2010-06-30 16:42:46Z daniel $ +# $Id: PKGBUILD 137544 2011-09-09 07:19:25Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: tardo <tardo@nagi-fanboi.net> pkgname=mono-addins -pkgver=0.5 +pkgver=0.6.2 pkgrel=1 pkgdesc="A generic framework for creating extensible applications and for creating libraries which extend those applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.mono-project.com/Mono.Addins" license=('custom:MIT') -depends=('gtk-sharp-2>=2.12.8' 'mono>=2.6.4') +depends=('gtk-sharp-2>=2.12.8' 'mono>=2.10.5') makedepends=('pkgconfig') -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('22c8dd470caed090b3c77c9423e5b3c6') +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('afbbe5e9fdf9b03911bc8e6b94feb60b') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index 390b89b75..11b25bd07 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120910 2011-04-27 09:25:47Z daniel $ +# $Id: PKGBUILD 137542 2011-09-09 07:16:56Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=mono -pkgver=2.10.2 +pkgver=2.10.5 pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64 'mips64el') @@ -14,9 +14,9 @@ makedepends=('pkgconfig') options=('!libtool' '!makeflags') provides=('monodoc') conflicts=('monodoc') -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mono.rc.d) -md5sums=('bff057dc3e56b8841bbb1abe053858bb' +md5sums=('1954f11932e82b2ae3b64b2ae9344d90' '8315e46c6a6e9625502521fc0ad1a322') build() { diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index fa4a7bed3..c086000fe 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,16 +1,15 @@ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=2.4 +pkgver=2.6 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64' 'mips64el') url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=2.4' 'gdb') +depends=('monodevelop>=2.6' 'gdb') makedepends=('mono') -source=(http://ftp.novell.com/pub/mono/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('f5bf8cd4dfdffac928329d98cd56985b') +source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz) build() { export MONO_SHARED_DIR="${srcdir}/.wabi" @@ -23,3 +22,4 @@ build() { make DESTDIR="${pkgdir}" install } +md5sums=('c503d0be06c81e0ed2e217fc6e095494') diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 4851ae271..4163636dc 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -3,26 +3,23 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=2.4.2 -pkgrel=2 +pkgver=2.6 +pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64' 'mips64el') url="http://www.monodevelop.org" license=('GPL') -depends=('mono>=2.10.1' 'mono-addins>=0.5' 'gnome-sharp' 'gecko-sharp-2.0>=0.10') +depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.10') options=(!makeflags) install=monodevelop.install -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - monodevelop_gnome3.patch) -md5sums=('05d20deada26a115418cb1b4526b8d15' - 'fd011f41af212fe87fb9997ebf074188') +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('5bc5f42f9710b6a1fb5180e8050b519b') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi mkdir -p $MONO_SHARED_DIR cd $srcdir/$pkgname-$pkgver - patch -p1 < ${srcdir}/monodevelop_gnome3.patch || return 1 ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb make || return 1 } diff --git a/extra/mp3wrap/PKGBUILD b/extra/mp3wrap/PKGBUILD index ab378a332..64811aeda 100644 --- a/extra/mp3wrap/PKGBUILD +++ b/extra/mp3wrap/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 27742 2009-02-25 05:39:42Z eric $ +# $Id: PKGBUILD 137634 2011-09-10 09:03:14Z pierre $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=mp3wrap pkgver=0.5 -pkgrel=2 -pkgdesc="Tool for wrapping mp3 files --- free independent alternative to AlbumWrap" +pkgrel=3 +pkgdesc="Tool for wrapping mp3 files. A free independent alternative to AlbumWrap" arch=('i686' 'x86_64' 'mips64el') url="http://mp3wrap.sourceforge.net" license=('LGPL') depends=('glibc') -source=(http://downloads.sourceforge.net/sourceforge/mp3wrap/mp3wrap-$pkgver-src.tar.gz) +source=("http://downloads.sourceforge.net/sourceforge/mp3wrap/mp3wrap-$pkgver-src.tar.gz") md5sums=('096b46295cbe3ee2f02ca7792517dc36') build() { cd $srcdir/mp3wrap-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd $srcdir/mp3wrap-$pkgver + make DESTDIR=$pkgdir install } diff --git a/extra/mt-st/PKGBUILD b/extra/mt-st/PKGBUILD index 1cae178a4..e68bac3eb 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 'mips64el') -url="ftp://ftp.ibiblio.org/pub/linux/system/backup/" -depends=('glibc') arch=('i686' 'x86_64' 'mips64el') +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 59c25746e..491cc9686 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' 'mips64el') 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/mysql/PKGBUILD b/extra/mysql/PKGBUILD index ead761fa6..6613c1aad 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 133474 2011-07-28 13:52:29Z andrea $ +# $Id: PKGBUILD 138094 2011-09-16 08:53:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.15 +pkgver=5.5.16 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,7 +15,7 @@ options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('306b5549c7bd72e8e705a890db0da82b' +md5sums=('462ab3752dd666ec06ca32f92673b59e' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') @@ -95,7 +95,7 @@ package_mysql-clients(){ done # provided by mysql - rm "${pkgdir}"/usr/bin/{mysql_upgrade,mysqlbinlog,mysqltest} + rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} } package_mysql(){ diff --git a/extra/naim/PKGBUILD b/extra/naim/PKGBUILD index 30e659211..0c20326bf 100644 --- a/extra/naim/PKGBUILD +++ b/extra/naim/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 31166 2009-03-24 21:08:09Z tpowa $ +# $Id: PKGBUILD 137675 2011-09-10 11:46:52Z pierre $ # Maintainer: dorphell <dorphell@archlinux.org> + pkgname=naim pkgver=0.11.8.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="An ncurses AOL Instant Messenger and IRC client." -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://naim.n.ml.org" depends=('ncurses') -source=(http://naim.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -options=(!makeflags) +source=("http://naim.googlecode.com/files/$pkgname-$pkgver.tar.bz2") +options=("!makeflags") +md5sums=('c9622e3f75d56310829f98fa4dae1f78') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } -md5sums=('c9622e3f75d56310829f98fa4dae1f78') diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD index c57033abc..5fe3c71da 100644 --- a/extra/notification-daemon/PKGBUILD +++ b/extra/notification-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110126 2011-02-16 17:22:45Z ibiru $ +# $Id: PKGBUILD 137530 2011-09-08 19:55:05Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> pkgname=notification-daemon -pkgver=0.7.1 +pkgver=0.7.2 pkgrel=1 pkgdesc="Notification daemon for the desktop notifications framework" arch=(i686 x86_64 'mips64el') @@ -11,10 +11,10 @@ license=('GPL') url="http://www.galago-project.org/specs/notification/" depends=('gtk3' 'libcanberra') groups=('gnome') -makedepends=('pkgconfig' 'intltool' 'dbus-glib') +makedepends=('pkgconfig' 'intltool') options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d26bf9021b3ae708d36e55437642a89d6b81693fe39d27c5d1ec869e22697b8b') +source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) +sha256sums=('74ccbedfe25c9559278ba35ef716125ada9ba0074fe7321a2271abfed5990661') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 7852a0e4d..9fdcc0f24 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136639 2011-08-31 10:15:56Z jgc $ +# $Id: PKGBUILD 138102 2011-09-16 12:01:21Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss @@ -25,7 +25,7 @@ md5sums=('ca0ca058380be200cf247ea2496b5352' 'c547b030c57fe1ed8b77c73bf52b3ded' '46bee81908f1e5b26d6a7a2e14c64d9f' 'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf' - 'f8690c4cfef46b2796026581db15b4ea' + 'ba2357c5b9881bfd7d54b037954ba0ff' 'd83c7b61abb7e9f8f7bcd157183d1ade') build() { @@ -104,17 +104,3 @@ package() { install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" } -md5sums=('ca0ca058380be200cf247ea2496b5352' - 'e5c97db0c884d5f4cfda21e562dc9bba' - 'c547b030c57fe1ed8b77c73bf52b3ded' - '46bee81908f1e5b26d6a7a2e14c64d9f' - 'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf' - 'f8690c4cfef46b2796026581db15b4ea' - 'd83c7b61abb7e9f8f7bcd157183d1ade') -md5sums=('ca0ca058380be200cf247ea2496b5352' - 'e5c97db0c884d5f4cfda21e562dc9bba' - 'c547b030c57fe1ed8b77c73bf52b3ded' - '46bee81908f1e5b26d6a7a2e14c64d9f' - 'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf' - 'ba2357c5b9881bfd7d54b037954ba0ff' - 'd83c7b61abb7e9f8f7bcd157183d1ade') diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 0da129c3d..ad388ef42 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 127685 2011-06-17 17:49:02Z andrea $ +# $Id: PKGBUILD 137991 2011-09-13 21:30:11Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=1 +pkgrel=2 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.muiline.com/obex-data-server" diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 97c35d6d9..a11606412 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 131871 2011-07-16 10:36:29Z tpowa $ +# $Id: PKGBUILD 138196 2011-09-18 13:56:45Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=ocaml +pkgbase='ocaml' +pkgname=('ocaml' 'ocaml-compiler-libs') pkgver=3.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64' 'mips64el') license=('LGPL2' 'custom: QPL-1.0') @@ -12,16 +13,12 @@ depends=('gdbm') makedepends=('tk' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz - fix-ocaml-binutils-2.21.patch fix-caml_int64_float_of_bits-n32.patch) -options=('!makeflags' '!emptydirs') -md5sums=('3ba7cc65123c3579f14e7c726d3ee782' - '8c664a0a346424ea2ec6fc6f713170c6' +md5sums=('814a047085f0f901ab7d8e3a4b7a9e65' 'e2c8bc316efe40532c5b9d7f9a1d8d62') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-ocaml-binutils-2.21.patch" patch -Np1 -i "${srcdir}/fix-caml_int64_float_of_bits-n32.patch" ./configure -prefix /usr if [ "${CARCH}" == "mips64el" ] ; then @@ -29,6 +26,10 @@ build() { else make world.opt fi +} + +package_ocaml() { + cd "${srcdir}/${pkgbase}-${pkgver}" make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install # Save >10MB with this one, makepkg only strips debug symbols. @@ -38,3 +39,21 @@ build() { install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } + +package_ocaml-compiler-libs() { +pkgdesc="Several modules used internally by the OCaml compiler" +license=('custom: QPL-1.0') +depends=('ocaml') +optdepends=() + + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Install compiler libraries + local compiler_libs="${pkgdir}/usr/lib/ocaml/compiler-libs" + mkdir -p "$compiler_libs"/{parsing,typing,utils} + cp parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "$compiler_libs"/parsing + cp typing/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/typing + cp utils/*.{cmi,cmo,cmx,ml,mli,o} "$compiler_libs"/utils + # duplicated by installation + rm -f "$compiler_libs"/typing/outcometree.{cmi,mli} +} diff --git a/extra/ogle/PKGBUILD b/extra/ogle/PKGBUILD index c0276e216..fbd7846b5 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' 'mips64el') 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/ogmtools/PKGBUILD b/extra/ogmtools/PKGBUILD index d92bb0773..02612b558 100644 --- a/extra/ogmtools/PKGBUILD +++ b/extra/ogmtools/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 68086 2010-02-10 17:57:04Z giovanni $ +# $Id: PKGBUILD 137699 2011-09-10 12:46:29Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=ogmtools pkgver=1.5 -pkgrel=3 +pkgrel=4 pkgdesc="Information, extraction or creation for OGG media streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.bunkus.org/videotools/ogmtools" license=('GPL') depends=('libvorbis' 'libdvdread' 'gcc-libs') -source=(http://www.bunkus.org/videotools/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +source=("http://www.bunkus.org/videotools/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('02d356e3d21d53b1d9715bab223d8996') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ - --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD index a32242d91..0b30d5fc8 100644 --- a/extra/openjpeg/PKGBUILD +++ b/extra/openjpeg/PKGBUILD @@ -1,27 +1,36 @@ -# $Id: $ +# $Id: PKGBUILD 137660 2011-09-10 10:58:56Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=openjpeg -pkgver=1.3 -_pkgver=v1_3 -pkgrel=3 +pkgver=1.4 +_pkgver=v1_4 +_revision=r697 +pkgrel=1 pkgdesc="An open source JPEG 2000 codec" arch=(i686 x86_64 'mips64el') license=('BSD') url="http://www.openjpeg.org" -depends=('glibc') -source=(http://www.openjpeg.org/openjpeg_${_pkgver}.tar.gz - 30_fix_build_for_debian.dpatch) -md5sums=('f9a3ccfa91ac34b589e9bf7577ce8ff9' - '2557f485513e77f6dcea77f4741c4fa1') +depends=('zlib') +source=(http://openjpeg.googlecode.com/files/openjpeg_${_pkgver}_sources_${_revision}.tgz + openjpeg-1.4-autoconf.patch) +md5sums=('7870bb84e810dec63fcf3b712ebb93db' + '46d1d26b59ce546444f3fe8d7c685775') + +options=('!makeflags' '!libtool') build() { - cd "${srcdir}/OpenJPEG_${_pkgver}" - patch -Np1 -i "${srcdir}/30_fix_build_for_debian.dpatch" || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}" + patch -Np1 -i ${srcdir}/openjpeg-1.4-autoconf.patch + # make sure we use system libs + rm -rf libs + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg" - tr '\r' '\n' < license.txt > "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1 - chmod 644 "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1 - ln -s libopenjpeg.so.2 "${pkgdir}/usr/lib/libopenjpeg.so" || return 1 + install -m644 LICENSE "${pkgdir}/usr/share/licenses/openjpeg/LICENSE" } diff --git a/extra/openjpeg/openjpeg-1.4-autoconf.patch b/extra/openjpeg/openjpeg-1.4-autoconf.patch new file mode 100644 index 000000000..988b72b7d --- /dev/null +++ b/extra/openjpeg/openjpeg-1.4-autoconf.patch @@ -0,0 +1,78 @@ +diff -up openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/doc/Makefile.am +--- openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR 2011-01-02 12:14:47.000000000 -0600 ++++ openjpeg_v1_4_sources_r697/doc/Makefile.am 2011-01-12 12:12:20.959518549 -0600 +@@ -20,30 +20,30 @@ all-local: + @cp man/man3/* . + + install-data-hook: +- $(INSTALL) -d $(doc_dir) +- $(INSTALL) -d ${mandir}/man1 ${mandir}/man3 ++ $(INSTALL) -d $(DESTDIR)$(doc_dir) ++ $(INSTALL) -d $(DESTDIR)${mandir}/man1 $(DESTDIR)${mandir}/man3 + if with_libjpwl +- @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) +- @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) ++ @(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*) ++ @(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* ) + endif +- @(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) +- @(cd ${mandir}/man3 && $(RM) libopenjpeg* ) ++ @(cd $(DESTDIR)${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) ++ @(cd $(DESTDIR)${mandir}/man3 && $(RM) libopenjpeg* ) + @gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3 +- @cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1 +- @cp libopenjpeg.3.gz ${mandir}/man3 ++ @cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(DESTDIR)${mandir}/man1 ++ @cp libopenjpeg.3.gz $(DESTDIR)${mandir}/man3 + @$(RM) *\.gz + if with_libjpwl +- @(cd ${mandir}/man1 && \ ++ @(cd $(DESTDIR)${mandir}/man1 && \ + $(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \ + $(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz) + @(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz) + endif +- @$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir) ++ @$(INSTALL) -m 644 ../LICENSE ../CHANGES $(DESTDIR)$(doc_dir) + + uninstall-hook: +- @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \ ++ @(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \ + $(RM) image_to_j2k* j2k_to_image* j2k_dump* ) +- @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \ ++ @(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \ + $(RM) libopenjpeg* ) +- @(cd $(doc_dir) && $(RM) * ) +- @rmdir $(doc_dir) ++ @(cd $(DESTDIR)$(doc_dir) && $(RM) * ) ++ @rmdir $(DESTDIR)$(doc_dir) +diff -up openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/Makefile.am +--- openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR 2011-01-02 12:14:55.000000000 -0600 ++++ openjpeg_v1_4_sources_r697/Makefile.am 2011-01-12 12:15:37.006321242 -0600 +@@ -9,7 +9,7 @@ clean-local: + + distclean-local: clean-local + +-pkgconf_dir = /usr/lib/pkgconfig ++pkgconf_dir = $(libdir)/pkgconfig + + install-data-hook: + @echo "" +@@ -17,12 +17,12 @@ install-data-hook: + cat $$f/.report.txt ; \ + done + @echo "" +- @echo "Installing: libopenjpeg1.pc $(pkgconf_dir)" ++ @echo "Installing: libopenjpeg1.pc $(DESTDIR)$(pkgconf_dir)" + @echo "" +- @$(INSTALL) -d $(pkgconf_dir) +- @cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc +- @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \ ++ @$(INSTALL) -d $(DESTDIR)$(pkgconf_dir) ++ @cp libopenjpeg.pc $(DESTDIR)$(pkgconf_dir)/libopenjpeg1.pc ++ @(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc && \ + $(LN_S) libopenjpeg1.pc libopenjpeg.pc) + + uninstall-hook: +- @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc) ++ @(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc) diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD index dbbf6311f..dd599f8d4 100644 --- a/extra/orage/PKGBUILD +++ b/extra/orage/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127986 2011-06-20 15:42:51Z andyrtr $ +# $Id: PKGBUILD 138200 2011-09-18 14:48:57Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=orage -pkgver=4.8.1 -pkgrel=3 +pkgver=4.8.2 +pkgrel=1 pkgdesc="A simple calendar application with reminders for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -15,14 +15,11 @@ makedepends=('intltool' 'xfce4-dev-tools' 'popt') options=('!libtool') replaces=('xfcalendar') install=${pkgname}.install -source=(http://archive.xfce.org/src/apps/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 - fix-infinite-reminder.patch) -md5sums=('9c1139ce03e9f309240e712cf31b6a49' - '162a6b2c97b8dff9ed180a2796aa35af') +source=(http://archive.xfce.org/src/apps/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) +md5sums=('950397c716c31e1aa5db83d35ddf6047') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i $srcdir/fix-infinite-reminder.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/orage/orage.install b/extra/orage/orage.install index 236856c64..bce670aff 100644 --- a/extra/orage/orage.install +++ b/extra/orage/orage.install @@ -8,5 +8,5 @@ post_upgrade() { } post_remove() { - post:install + post_install } diff --git a/extra/oxine/PKGBUILD b/extra/oxine/PKGBUILD index fc7a30d82..e1106a77e 100644 --- a/extra/oxine/PKGBUILD +++ b/extra/oxine/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 59896 2009-11-29 15:47:18Z jgc $ +# $Id: PKGBUILD 137856 2011-09-12 03:56:43Z eric $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Rouslan Solomakhin <rouslan@localnet.com> # Contributor: dorphell <dorphell@archlinux.org> + pkgname=oxine pkgver=0.7.1 -pkgrel=3 -pkgdesc="oxine is a lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems." +pkgrel=4 +pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems" arch=('i686' 'x86_64' 'mips64el') -depends=('xine-lib>=1.1.16.3' 'libexif>=0.6.17' 'eject' 'libcdio>=0.82' 'curl>=7.19.4' 'libxinerama' 'libsm' 'libxtst') -makedepends=('pkgconfig') -license=('GPL') url="http://oxine.sourceforge.net/" +license=('GPL') +depends=('xine-lib' 'libexif' 'eject' 'libcdio' 'curl' 'libxtst') source=(http://downloads.sourceforge.net/sourceforge/oxine/${pkgname}-${pkgver}.tar.gz) md5sums=('2a2d05ee21892624e35cf539e532c0dd') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-hal \ - --without-imagemagick --disable-gdkpixbuf || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + sed -i 's|#include <curl/types.h>||' configure src/download.c + ./configure --prefix=/usr --disable-hal --without-jsw --disable-extractor \ + --without-imagemagick --disable-gdkpixbuf --disable-weather + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD index 0804bef07..a927c4bda 100644 --- a/extra/oxygen-gtk/PKGBUILD +++ b/extra/oxygen-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135550 2011-08-15 12:45:44Z andrea $ +# $Id: PKGBUILD 138061 2011-09-15 17:22:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('gtk2') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f4d7f6203d8bcf41ff3403333f399628') +md5sums=('e3b280a61cbe4363c41c26083e94643d') build() { cd "${srcdir}" diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index 802db0d91..9b94d6247 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136806 2011-09-01 17:14:51Z ibiru $ +# $Id: PKGBUILD 138186 2011-09-18 09:16:04Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=p11-kit -pkgver=0.5 -pkgrel=1 +pkgver=0.6 +pkgrel=2 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64) url="http://p11-glue.freedesktop.org" @@ -11,11 +11,12 @@ license=('BSD') depends=(glibc) options=(!libtool) source=($url/releases/$pkgname-$pkgver.tar.gz) -md5sums=('1b4886ed4e6d25ab0b69e6350a804082') +md5sums=('c1ff3e52f172fda8bf3b426f7fb63c92') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-module-path=/usr/lib/pkcs11 make } diff --git a/extra/perl-socket6/PKGBUILD b/extra/perl-socket6/PKGBUILD new file mode 100644 index 000000000..be7ac34f0 --- /dev/null +++ b/extra/perl-socket6/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Florian Pritz <bluewind@xinu.at> +# Generator : CPANPLUS::Dist::Arch 1.18 + +pkgname='perl-socket6' +pkgver='0.23' +pkgrel='1' +pkgdesc="getaddrinfo/getnameinfo support module" +arch=('i686' 'x86_64') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl') +makedepends=() +url='http://search.cpan.org/dist/Socket6' +source=('http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-0.23.tar.gz') +md5sums=('2c02adb13c449d48d232bb704ddbd492') +sha512sums=('39ced223ecdef89e6fa241031019bb5a73e63d2dfdaf3edb55bfea0cb81b91bea09f1cc26b2d15fa28d32227cc13cdb093c70f0ba346c9bdb523359de53d96f9') +_distdir="${srcdir}/Socket6-0.23" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$_distdir" + make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index e7f9eeb54..04c9931cd 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136443 2011-08-29 12:25:25Z pierre $ +# $Id: PKGBUILD 137805 2011-09-11 11:11:53Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -8,10 +8,8 @@ pkgname=('php' 'php-fpm' 'php-embed' 'php-pear' - 'php-curl' 'php-enchant' 'php-gd' - 'php-gmp' 'php-intl' 'php-ldap' 'php-mcrypt' @@ -25,13 +23,13 @@ pkgname=('php' 'php-xsl') pkgver=5.3.8 _suhosinver=5.3.7-0.9.10 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' - 'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'libpng' 'libjpeg' 'icu' + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" @@ -39,7 +37,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'logrotate.d.php-fpm') md5sums=('704cd414a0565d905e1074ffdc1fadfb' '08582e502fed8221c6577042ca45ddb8' - '39eaa70d276fc3d45d6bcf6cd5ae1106' + '65606c606df97a0760dfe5aaf9893afc' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' '09005dabd90c48ddd392b3dbf05f8a82' @@ -212,10 +210,10 @@ build() { package_php() { pkgdesc='An HTML-embedded scripting language' - depends=('pcre' 'libxml2' 'bzip2' 'openssl') - replaces=('php-fileinfo') - provides=('php-fileinfo') - conflicts=('php-fileinfo') + depends=('pcre' 'libxml2' 'bzip2' 'curl') + replaces=('php-fileinfo' 'php-gmp' 'php-curl') + provides=('php-fileinfo' 'php-gmp' 'php-curl') + conflicts=('php-fileinfo' 'php-gmp' 'php-curl') backup=('etc/php/php.ini') cd ${srcdir}/build-php @@ -228,19 +226,21 @@ package_php() { # remove static modules rm -f ${pkgdir}/usr/lib/php/modules/*.a # remove modules provided by sub packages - rm -f ${pkgdir}/usr/lib/php/modules/{curl,enchant,gd,gmp,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove empty directory + rmdir ${pkgdir}/usr/include/php/include } package_php-cgi() { pkgdesc='CGI and FCGI SAPI for PHP' - depends=('php' 'pcre' 'libxml2') + depends=('php') install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi } package_php-apache() { pkgdesc='Apache SAPI for PHP' - depends=('php' 'apache' 'pcre' 'libxml2') + depends=('php' 'apache') backup=('etc/httpd/conf/extra/php5_module.conf') install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so @@ -262,7 +262,7 @@ package_php-fpm() { package_php-embed() { pkgdesc='Embed SAPI for PHP' - depends=('php' 'pcre' 'libxml2') + depends=('php') install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h @@ -270,7 +270,7 @@ package_php-embed() { package_php-pear() { pkgdesc='PHP Extension and Application Repository' - depends=('php' 'bash') + depends=('php') backup=('etc/php/pear.conf') cd ${srcdir}/build-pear @@ -281,12 +281,6 @@ package_php-pear() { done < <(find ${pkgdir} -name '.*') } -package_php-curl() { - depends=('php' 'curl') - pkgdesc='curl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/curl.so ${pkgdir}/usr/lib/php/modules/curl.so -} - package_php-enchant() { depends=('php' 'enchant') pkgdesc='enchant module for PHP' @@ -299,12 +293,6 @@ package_php-gd() { install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so } -package_php-gmp() { - depends=('php' 'gmp') - pkgdesc='gmp module for PHP' - install -D -m755 ${srcdir}/build-php/modules/gmp.so ${pkgdir}/usr/lib/php/modules/gmp.so -} - package_php-intl() { depends=('php' 'icu') pkgdesc='intl module for PHP' @@ -318,7 +306,7 @@ package_php-ldap() { } package_php-mcrypt() { - depends=('php' 'libmcrypt' 'libtool') + depends=('php' 'libmcrypt' 'libltdl') pkgdesc='mcrypt module for PHP' install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so } diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch index 356e190b4..46c842921 100644 --- a/extra/php/php.ini.patch +++ b/extra/php/php.ini.patch @@ -81,7 +81,7 @@ +;extension=bcmath.so +;extension=bz2.so +;extension=calendar.so -+;extension=curl.so ++extension=curl.so +;extension=dba.so +;extension=enchant.so +;extension=exif.so @@ -92,7 +92,7 @@ +;extension=iconv.so +;extension=imap.so +;extension=intl.so -+;extension=json.so ++extension=json.so +;extension=ldap.so +;extension=mcrypt.so +;extension=mssql.so diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 43f73a0d7..9a285a663 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130693 2011-07-07 17:38:24Z andyrtr $ +# $Id: PKGBUILD 137658 2011-09-10 10:56:37Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') pkgver=0.16.7 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') diff --git a/extra/psi/PKGBUILD b/extra/psi/PKGBUILD index 53700078a..a283c95ae 100644 --- a/extra/psi/PKGBUILD +++ b/extra/psi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 107019 2011-01-20 14:18:34Z pierre $ +# $Id: PKGBUILD 137579 2011-09-09 21:39:09Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=psi pkgver=0.14 -pkgrel=4 +pkgrel=5 pkgdesc='Instant messaging application designed for the Jabber IM' url='http://psi-im.org/' license=('GPL') diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD index e2103ef41..0c4a0ab44 100644 --- a/extra/psiconv/PKGBUILD +++ b/extra/psiconv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86765 2010-08-03 22:27:52Z ibiru $ +# $Id: PKGBUILD 137993 2011-09-13 21:30:15Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=psiconv pkgver=0.9.8 -pkgrel=7 +pkgrel=8 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" arch=('i686' 'x86_64' 'mips64el') url="http://software.frodo.looijaard.name/psiconv/" @@ -21,6 +21,10 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index 10a14cbc9..f2b8e5299 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136892 2011-09-02 17:05:04Z ronald $ +# $Id: PKGBUILD 137995 2011-09-13 21:30:18Z 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=1 +pkgrel=2 pkgdesc="Translates PostScript and PDF graphics into other vector formats" arch=("i686" "x86_64" 'mips64el') url="http://www.pstoedit.net/" diff --git a/extra/pygtk/PKGBUILD b/extra/pygtk/PKGBUILD index 92a5d3b2b..792c64878 100644 --- a/extra/pygtk/PKGBUILD +++ b/extra/pygtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 131736 2011-07-14 11:07:45Z stephane $ +# $Id: PKGBUILD 138082 2011-09-16 07:34:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> @@ -9,7 +9,7 @@ pkgdesc="Python bindings for the GTK widget set" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('libglade' 'python2-cairo' 'pygobject') -makedepends=('python2-numpy' 'pygobject-devel') +makedepends=('python2-numpy' 'pygobject2-devel') optdepends=('python2-numpy') options=('!libtool') url="http://www.pygtk.org/" diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index 7db9530c0..f981fe205 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 131668 2011-07-13 13:42:02Z stephane $ +# $Id: PKGBUILD 138131 2011-09-17 03:10:10Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('custom') url="http://numpy.scipy.org/" makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) -md5sums=('e0993c74cb8e83292e560eac1a9be8e9') +md5sums=('2bce18c08fc4fce461656f0f4dd9103e') build() { cd "${srcdir}" diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD index 2d15fdcf1..b29fdccd6 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' 'mips64el') 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/qt/PKGBUILD b/extra/qt/PKGBUILD index 931ea3478..1bb8ceb2b 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137496 2011-09-07 17:54:44Z andrea $ +# $Id: PKGBUILD 137970 2011-09-13 10:37:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.7.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') @@ -19,7 +19,7 @@ source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' 'blacklist-diginotar-certs.diff') -md5sums=('ddf7d83f912cf1283aa066368464fa22' +md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' diff --git a/extra/rarian/PKGBUILD b/extra/rarian/PKGBUILD index 8ab6773b1..612a21490 100644 --- a/extra/rarian/PKGBUILD +++ b/extra/rarian/PKGBUILD @@ -1,18 +1,15 @@ -# $Id: PKGBUILD 11986 2008-09-06 21:33:59Z jgc $ +# $Id: PKGBUILD 137591 2011-09-09 23:51:24Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=rarian pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper." arch=('i686' 'x86_64' 'mips64el') url="http://rarian.freedesktop.org/" license=('GPL') depends=('gcc-libs') makedepends=('libxslt') -conflicts=('scrollkeeper') -provides=('scrollkeeper') -replaces=('scrollkeeper') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.bz2 user-segfault.patch) @@ -20,10 +17,14 @@ md5sums=('75091185e13da67a0ff4279de1757b94' '457e9827197009cfa360911fe49a5ad7') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - patch -p0 -i ${srcdir}/user-segfault.patch || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + patch -p0 -i ${srcdir}/user-segfault.patch ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + --localstatedir=/var --disable-static + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${startdir}/pkg install } diff --git a/extra/sdl_net/PKGBUILD b/extra/sdl_net/PKGBUILD index ffb406155..8b8337be4 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' 'mips64el') 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/sdl_sound/PKGBUILD b/extra/sdl_sound/PKGBUILD index 0a0abd4b4..4fee4c404 100644 --- a/extra/sdl_sound/PKGBUILD +++ b/extra/sdl_sound/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 22260 2008-12-24 15:29:53Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 137585 2011-09-09 23:22:23Z allan $ +# Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_sound pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3" arch=('i686' 'x86_64' 'mips64el') url="http://icculus.org/SDL_sound/" @@ -23,7 +23,11 @@ build() { CXXFLAGS="$CXXFLAGS -I/usr/include/smpeg" \ ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/SDL_sound-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/setserial/PKGBUILD b/extra/setserial/PKGBUILD index 5229e7845..d5a876d9a 100644 --- a/extra/setserial/PKGBUILD +++ b/extra/setserial/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 68104 2010-02-10 18:44:17Z giovanni $ +# $Id: PKGBUILD 137681 2011-09-10 12:01:21Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=setserial pkgver=2.17 -pkgrel=3 +pkgrel=4 pkgdesc="Allows to change various attributes of a serial device" arch=('i686' 'x86_64' 'mips64el') url="http://setserial.sourceforge.net/" license=('GPL') depends=('glibc') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - $pkgname.patch) +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + "$pkgname.patch") md5sums=('c4867d72c41564318e0107745eb7a0f2' '99919d3be7c1550721494070a7ace66a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../$pkgname.patch || return 1 + patch -Np1 -i ../$pkgname.patch ./configure --prefix=/usr \ - --mandir=/usr/share/man || return 1 - make || return 1 + --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" install -d ${pkgdir}/usr/{bin,share/man/man8} - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/extra/smpeg/PKGBUILD b/extra/smpeg/PKGBUILD index 344f9e023..276bc8990 100644 --- a/extra/smpeg/PKGBUILD +++ b/extra/smpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 26425 2009-02-07 22:15:52Z eric $ +# $Id: PKGBUILD 137587 2011-09-09 23:30:58Z allan $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=smpeg pkgver=0.4.4 -pkgrel=5 +pkgrel=6 pkgdesc="SDL MPEG Player Library" arch=('i686' 'x86_64' 'mips64el') url="http://icculus.org/smpeg/" @@ -13,17 +13,24 @@ depends=('sdl') makedepends=('gtk' 'mesa') optdepends=('gtk: to use gtv ' 'mesa: to use glmovie') options=('!libtool' '!makeflags') -source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz smpeg-0.4.4-gcc41.patch) -md5sums=('59c76ac704088ef5539210190c4e1fe3' '8b979a58307d7196655758bd3d2466c4') -sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e') +source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz + smpeg-0.4.4-gcc41.patch) +md5sums=('59c76ac704088ef5539210190c4e1fe3' + '8b979a58307d7196655758bd3d2466c4') +sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' + '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 < ../smpeg-0.4.4-gcc41.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make LDFLAGS+=-lstdc++ || return 1 - make DESTDIR=${pkgdir} install || return 1 + patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch + ./configure --prefix=/usr --mandir=/usr/share/man + make LDFLAGS+=-lstdc++ +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install - #fix aclocal warnings - sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 || return 1 + # fix aclocal warnings + sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 } diff --git a/extra/speex/PKGBUILD b/extra/speex/PKGBUILD index e0dedc235..8acbf9792 100644 --- a/extra/speex/PKGBUILD +++ b/extra/speex/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 7447 2008-08-02 04:56:05Z eric $ +# $Id: PKGBUILD 137583 2011-09-09 22:58:20Z allan $ +# Maintainer: # Contributer: Jason Chu <jason@archlinux.org> -# Maintainer: Jason Chu <jason@archlinux.org> pkgname=speex pkgver=1.2rc1 -pkgrel=1 +pkgrel=2 pkgdesc="A free codec for free speech" arch=('i686' 'x86_64' 'mips64el') +url="http://www.speex.org/" license=('BSD') depends=('libogg') options=('!libtool') source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('c4438b22c08e5811ff10e2b06ee9b9ae') -url="http://www.speex.org/" build() { - cd $startdir/src/speex-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 - make DESTDIR=$startdir/pkg install - #to fix kde detection - cp $startdir/pkg/usr/include/speex/* $startdir/pkg/usr/include/ - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + cd $srcdir/speex-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $srcdir/speex-$pkgver + make DESTDIR=$startdir/pkg install + + install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE } diff --git a/extra/streamripper/PKGBUILD b/extra/streamripper/PKGBUILD index 9b5a60b18..52144364a 100644 --- a/extra/streamripper/PKGBUILD +++ b/extra/streamripper/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 51858 2009-09-12 21:44:06Z eric $ -# Contributor: damir <damir@archlinux.org> -# Maintainer: Thayer Williams <thayer@archlinux.org> +# $Id: PKGBUILD 137607 2011-09-10 03:20:46Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=streamripper pkgver=1.64.6 -pkgrel=1 +pkgrel=2 pkgdesc="Records and splits streaming mp3 into tracks" arch=('i686' 'x86_64' 'mips64el') url="http://streamripper.sourceforge.net" license=('GPL') -depends=('glibc' 'glib2' 'libmad' 'faad2>=2.7' 'libvorbis') +depends=('glib2' 'libmad' 'faad2' 'libvorbis') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/streamripper/streamripper-$pkgver.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/streamripper/streamripper-${pkgver}.tar.gz) md5sums=('a37a1a8b8f9228522196a122a1c2dd32') sha1sums=('bc8a8d3ad045e0772ca691d2063c39efcc0dca45') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install } diff --git a/extra/sweep/PKGBUILD b/extra/sweep/PKGBUILD index 4db2e28f3..e4c38ba27 100644 --- a/extra/sweep/PKGBUILD +++ b/extra/sweep/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 54821 2009-10-11 19:41:33Z giovanni $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 137595 2011-09-10 00:12:32Z allan $ +# Maintainer: # Contributer: Jason Chu <jchu@xentac.net> + pkgname=sweep pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="Sound editing and mixing program" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') +url="http://www.metadecks.org/software/sweep/" license=('GPL2') depends=('gtk2' 'libsamplerate' 'libmad' 'libvorbis' 'alsa-lib' 'speex') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -url="http://www.metadecks.org/software/sweep/" +md5sums=('69e19bad2673f20e15224c0a5b5d4c85') build() { - cd $startdir/src/sweep-$pkgver + cd $srcdir/sweep-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 - make prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc localstatedir=$startdir/pkg/var install + make +} + +package() { + cd $srcdir/sweep-$pkgver + make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc localstatedir=$pkgdir/var install } -md5sums=('69e19bad2673f20e15224c0a5b5d4c85') diff --git a/extra/t1lib/PKGBUILD b/extra/t1lib/PKGBUILD index 6e16819dc..cf9e754e0 100644 --- a/extra/t1lib/PKGBUILD +++ b/extra/t1lib/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 18717 2008-11-08 21:45:38Z giovanni $ +# $Id: PKGBUILD 137602 2011-09-10 01:36:02Z allan $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Rainer Moll <renari@arcor.de> pkgname=t1lib pkgver=5.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts" -arch=(i686 x86_64 'mips64el') -license=("GPL") +arch=('i686' 'x86_64' 'mips64el') +url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html" +license=('GPL') depends=('libxaw') options=(!libtool) -url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html" source=(http://www.ibiblio.org/pub/Linux/libs/graphics/${pkgname}-${pkgver}.tar.gz ) md5sums=('a5629b56b93134377718009df1435f3c') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make without_doc || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make without_doc +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/t1lib/overflow.patch b/extra/t1lib/overflow.patch new file mode 100644 index 000000000..9f033c0de --- /dev/null +++ b/extra/t1lib/overflow.patch @@ -0,0 +1,15 @@ +--- t1env.c.orig 2007-09-16 19:56:38.319184208 +0200 ++++ t1env.c 2007-09-16 20:05:02.057070439 +0200 +@@ -611,6 +611,12 @@ + #endif + strcat( pathbuf, DIRECTORY_SEP); + /* And finally the filename: */ ++ /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf ++ let's try next pathbuf */ ++ if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) { ++ i++; ++ continue; ++ } + strcat( pathbuf, StrippedName); + + /* Check for existence of the path: */ diff --git a/extra/taglib-extras/PKGBUILD b/extra/taglib-extras/PKGBUILD index a691c718c..912406c06 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" 'mips64el') +arch=('i686' 'x86_64' 'mips64el') 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/telepathy-kde-presence-dataengine/PKGBUILD b/extra/telepathy-kde-presence-dataengine/PKGBUILD index e73588178..86051ba12 100644 --- a/extra/telepathy-kde-presence-dataengine/PKGBUILD +++ b/extra/telepathy-kde-presence-dataengine/PKGBUILD @@ -1,15 +1,15 @@ -# $Id$ +# $Id: PKGBUILD 138063 2011-09-15 18:35:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-presence-dataengine pkgver=0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Plasma dataengine for managing Telepathy account presence" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde.org" license=('GPL') -depends=('kdebase-plasma' 'telepathy-qt4') +depends=('kdebase-workspace' 'telepathy-qt4') makedepends=('cmake' 'automoc4') groups=('telepathy-kde') source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}_${pkgver}.tar.bz2") diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD index ceec0f63c..0a36ede79 100644 --- a/extra/texmacs/PKGBUILD +++ b/extra/texmacs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122838 2011-05-06 11:44:16Z ronald $ +# $Id: PKGBUILD 137567 2011-09-09 18:36:00Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=texmacs -pkgver=1.0.7.10 +pkgver=1.0.7.12 pkgrel=1 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one." arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,9 @@ license=('GPL') depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2') # do not remove texlive-core dependency, as it is needed! optdepends=('transfig: convert images using fig2ps') -source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz) -sha1sums=('12491496e68b62aa07369748770771a8c2378129') +#source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz) +source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.0.7.12-src.tar.gz) +sha1sums=('9a6560dc2d8e685b97f4afe468b38d89bd29ca9d') build() { cd ${srcdir}/TeXmacs-${pkgver}-src @@ -23,7 +24,8 @@ build() { sed -i '/^LDPATH/d' src/makefile.in ./configure --prefix=/usr \ --mandir=/usr/share/man \ - --libexecdir=/usr/lib + --libexecdir=/usr/lib \ + --disable-qt make } diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 7bd89b1b6..3b7ff35df 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91207 2010-09-24 03:35:03Z eric $ +# $Id: PKGBUILD 137997 2011-09-13 21:30:20Z eric $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,22 +6,26 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.5 -pkgrel=5 +pkgrel=6 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" license=('GPL') -depends=('imagemagick' 'lzo2' 'libdv' 'libdvdread' 'ffmpeg' 'mjpegtools' - 'libmpeg2' 'libtheora' 'libxaw' 'libxml2' 'libxv' 'a52dec' 'alsa-lib') -makedepends=('nasm' 'pkg-config') +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') +md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' + 'c0bd49a88f667c68c4430ad25bbed510' + 'af4056b7530a6f147594f676849e7c7b' + 'c299cfc6c4be6a5512d1a129f04e5450') +sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' + 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' + '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' + '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/unixodbc/PKGBUILD b/extra/unixodbc/PKGBUILD index 7b95168a1..b98f97abd 100644 --- a/extra/unixodbc/PKGBUILD +++ b/extra/unixodbc/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 78429 2010-04-23 18:51:55Z andyrtr $ +# $Id: PKGBUILD 137809 2011-09-11 11:42:08Z pierre $ # Maintainer: AndyRTR <andyrtr@archlinux.org> - # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=unixodbc pkgver=2.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') url="http://www.unixodbc.org/" backup=('etc/odbc.ini' 'etc/odbcinst.ini') -depends=('readline>=6.0' 'libtool') +depends=('readline' 'libltdl') options=('!libtool') -source=(http://www.unixodbc.org/unixODBC-$pkgver.tar.gz) +source=("http://www.unixodbc.org/unixODBC-$pkgver.tar.gz") md5sums=('f2ad22cbdffe836c58987ed2332c2e99') build() { cd ${srcdir}/unixODBC-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 + make } package() { cd ${srcdir}/unixODBC-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/extra/webkit-sharp/PKGBUILD b/extra/webkit-sharp/PKGBUILD index aca4645b3..03213af1d 100644 --- a/extra/webkit-sharp/PKGBUILD +++ b/extra/webkit-sharp/PKGBUILD @@ -5,14 +5,14 @@ pkgname=webkit-sharp pkgver=0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Mono/.NET bindings for the WebKit rendering engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.mono-project.com/" license=('custom:MIT') depends=('gtk-sharp-2' 'libwebkit>=1.4.0') makedepends=('pkgconfig>=0.9.0') -source=(ftp://ftp.novell.com/pub/mono/sources/$pkgname/${pkgname}-${pkgver}.tar.bz2) +source=(http://download.mono-project.com/sources/$pkgname/${pkgname}-${pkgver}.tar.bz2) md5sums=('21482f9d5eafb0ef4acc6e790482f934') build() { @@ -20,7 +20,7 @@ build() { mkdir -p "${MONO_SHARED_DIR}" cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's:webkit-1.0@LIB_PREFIX@.2@:libwebkitgtk-1.0@LIB_PREFIX@.0.7.0@:' sources/webkit-sharp.dll.config.in + sed -i 's:webkit-1.0@LIB_PREFIX@.2@:libwebkitgtk-1.0@LIB_PREFIX@.0@:' sources/webkit-sharp.dll.config.in ./configure --prefix=/usr make } diff --git a/extra/windowmaker-crm-git/PKGBUILD b/extra/windowmaker-crm-git/PKGBUILD index 326d3a799..c4612bbda 100644 --- a/extra/windowmaker-crm-git/PKGBUILD +++ b/extra/windowmaker-crm-git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 94218 2010-10-05 16:33:23Z daniel $ +# $Id: PKGBUILD 137555 2011-09-09 11:26:39Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=windowmaker-crm-git -pkgver=20101005 +pkgver=20110909 pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ options=('!libtool') provides=('windowmaker') conflicts=('windowmaker') source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) -md5sums=('8cc7e736a8d7e446f696b80fc7dcb79c' +md5sums=('594f66f40130fe49b6350579f4d54c2b' '2fba97bebfd691836b92b8f0db79ff13') build() { @@ -22,7 +22,7 @@ build() { ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ - --enable-usermenu --enable-modelock + --enable-usermenu --enable-modelock --enable-xrandr make || return 1 make DESTDIR=$pkgdir install || return 1 install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 57a086e8a..0e1b15b7d 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 136353 2011-08-27 08:38:05Z ibiru $ +# $Id: PKGBUILD 137559 2011-09-09 12:10:57Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume at alaux dot net> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=(wireshark-cli wireshark-gtk) pkgbase=wireshark -pkgver=1.6.1 -pkgrel=3 +pkgver=1.6.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua') url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('dc1e8c9800b64130674b120a183e2308') +md5sums=('301677b5f8150265315632fb6247e06e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index 91635e6e1..3d25c530a 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=wxmaxima -pkgver=11.04.0 +pkgver=11.08.0 pkgrel=1 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://wxmaxima.sourceforge.net/" license=('GPL2') depends=('maxima' 'libxml2' 'wxgtk') source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz) -sha1sums=('eef566c6b135943fada0ce844ed4f370374c6392') +sha1sums=('852a772e4b982bc355120cc95ee6f3d600ce011b') build() { cd "${srcdir}/wxMaxima-${pkgver}" diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD index a2ba24ffe..c1324d590 100644 --- a/extra/x11vnc/PKGBUILD +++ b/extra/x11vnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91112 2010-09-22 19:40:25Z bisson $ +# $Id: PKGBUILD 137979 2011-09-13 20:01:54Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=x11vnc -pkgver=0.9.12 +pkgver=0.9.13 pkgrel=1 pkgdesc='VNC server for real X displays' arch=('i686' 'x86_64' 'mips64el') @@ -12,25 +12,25 @@ license=('GPL2') depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') optdepends=('tk: for GUI support') backup=('etc/conf.d/x11vnc') -source=("http://downloads.sourceforge.net/libvncserver/${pkgname}-${pkgver}.tar.gz" - 'x11vnc.rc' - 'x11vnc.conf') -sha1sums=('cf4e24bee5962b52d8f2a5442a7c44943a9cc0bb' - '3abb3fcadff32662ab847a9e772cd23cfdfe3d1a' - '11011cce06511e9ba61672a1c80bb63a3a187539') +source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'conf.d' + 'rc.d') +sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa' + '11011cce06511e9ba61672a1c80bb63a3a187539' + '477892cf0f0020043444b7493c80684762ded506') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver + rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver - install -D -m 755 "${srcdir}/x11vnc.rc" "${pkgdir}/etc/rc.d/x11vnc" - install -D -m 644 "${srcdir}/x11vnc.conf" "${pkgdir}/etc/conf.d/x11vnc" + install -D -m 755 "${srcdir}/rc.d" "${pkgdir}/etc/rc.d/x11vnc" + install -D -m 644 "${srcdir}/conf.d" "${pkgdir}/etc/conf.d/x11vnc" } diff --git a/extra/x11vnc/conf.d b/extra/x11vnc/conf.d new file mode 100644 index 000000000..8a81e3286 --- /dev/null +++ b/extra/x11vnc/conf.d @@ -0,0 +1,5 @@ +# +# Parameters to be passed to x11vnc +# + +X11VNC_ARGS="" diff --git a/extra/x11vnc/rc.d b/extra/x11vnc/rc.d new file mode 100644 index 000000000..b5f2a6464 --- /dev/null +++ b/extra/x11vnc/rc.d @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/x11vnc + +PID=$(pidof -o %PPID /usr/bin/x11vnc) +case "$1" in + start) + stat_busy "Starting x11vnc" + [[ -z "$PID" ]] && /usr/bin/x11vnc $X11VNC_ARGS &> /dev/null & + if [[ $? -gt 0 ]]; then + stat_fail + else + add_daemon x11vnc + stat_done + fi + ;; + stop) + stat_busy "Stopping x11vnc" + [[ ! -z "$PID" ]] && kill $PID &> /dev/null + if [[ $? -gt 0 ]]; then + stat_fail + else + rm_daemon x11vnc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD index 9635c0e9b..28a1f9c9f 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' 'mips64el') 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/extra/xcb-util/PKGBUILD b/extra/xcb-util/PKGBUILD index 38c273bac..cec5c9b2c 100644 --- a/extra/xcb-util/PKGBUILD +++ b/extra/xcb-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 50472 2009-08-27 18:32:48Z ronald $ +# $Id: PKGBUILD 137766 2011-09-10 16:41:45Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Andrea Scarpino <bash.lnx@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=xcb-util pkgver=0.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="Utility libraries for XC Binding" arch=('i686' 'x86_64' 'mips64el') url="http://xcb.freedesktop.org" @@ -12,15 +12,21 @@ license=('custom') depends=('libxcb>=1.4') makedepends=('gperf') options=('!libtool') -source=(http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2 - LICENSE) +source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2" + 'LICENSE') md5sums=('dd8968b8ee613cb027a8ef1fcbdc8fc9' '2672c2e72dedb40f773e989dd622f298') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD index 3ab60ac0a..89a8afcc3 100644 --- a/extra/xfce4-session/PKGBUILD +++ b/extra/xfce4-session/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136121 2011-08-23 06:05:20Z eric $ +# $Id: PKGBUILD 138127 2011-09-17 02:26:42Z allan $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-session -pkgver=4.8.1 -pkgrel=3 +pkgver=4.8.2 +pkgrel=1 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -22,17 +22,14 @@ options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 org.freedesktop.consolekit.pkla - org.freedesktop.upower.pkla - gdm.patch) -md5sums=('478080ff666fdd36786a243829663efd' + org.freedesktop.upower.pkla) +md5sums=('48780cbcf784ab64debc9312f17765f2' '2e2519950d8c591dc9440ed8957a49ed' - '5fa270637b5e685f033863d8664795a2' - '61423d0e235cad7ffcbbdacc96c9151b') + '5fa270637b5e685f033863d8664795a2') build() { cd ${srcdir}/${pkgname}-${pkgver} - # fix usage with gdm and custom langs https://bugs.archlinux.org/task/24327 - patch -Np1 -i ${srcdir}/gdm.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index c0637cda9..f300f061c 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135949 2011-08-20 21:30:39Z eric $ +# $Id: PKGBUILD 138129 2011-09-17 02:28:33Z allan $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfdesktop -pkgver=4.8.2 -pkgrel=3 +pkgver=4.8.3 +pkgrel=1 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -17,14 +17,11 @@ conflicts=('xfce4-menueditor') replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 - fix-desktop-drag-and-drop.patch) -md5sums=('ed25d59f478afda552d121e96657d16f' - '86d464bcd8ffae9f048454f49603658a') +source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) +md5sums=('617c667c469698e8c974e38412cb484c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../fix-desktop-drag-and-drop.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index ffdf094aa..4662ab34f 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 134420 2011-08-03 19:34:12Z eric $ +# $Id: PKGBUILD 137999 2011-09-13 21:30:22Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.1.19 -pkgrel=3 +pkgrel=5 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" license=('LGPL' 'GPL') -depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama') -makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' 'libmodplug' +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' \ @@ -19,7 +19,6 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'mesa: for using the opengl plugin' \ 'libpulse: for using the pulseaudio plugin' \ 'speex: for using the speex plugin' \ - 'libmodplug: for using the modplug plugin' \ 'v4l-utils: for using the v4l plugin' \ 'wavpack: for using the wavpack plugin' \ 'faad2: for using the faad plugin' \ diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 36068f03e..9a3abf9e0 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134875 2011-08-08 08:40:10Z jgc $ +# $Id: PKGBUILD 138136 2011-09-17 08:05:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.10.3.901 +pkgver=1.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -18,7 +18,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2' +sha1sums=('857d6377025c77851a3cc5f8ec2ce84164a2fdc6' '571f2925f2f3d1b5cdbb2e5a676205fcea256198' '629c6d8d52126eab81ee1b72a9e4209535f8cb81' '1b95e91384a57d966428c7db98ed06f4cc562f91' @@ -29,9 +29,6 @@ sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2' build() { cd "${srcdir}/${pkgbase}-${pkgver}" - # Upstream post-release commit - patch -Np1 -i "${srcdir}/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch" - # Add pointer barrier support, patch from Fedora patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch" diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD index 2621d1a84..279d11481 100644 --- a/extra/ypbind-mt/PKGBUILD +++ b/extra/ypbind-mt/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 126308 2011-06-04 12:37:21Z bisson $ +# $Id: PKGBUILD 138068 2011-09-15 22:41:35Z 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=2 +pkgrel=3 pkgdesc='Linux NIS daemon' -arch=('i686' 'x86_64' 'mips64el') url='http://www.linux-nis.org/nis/ypbind-mt/' license=('GPL2') -depends=('rpcbind' 'openslp') +arch=('i686' 'x86_64' 'mips64el') +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" +source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" 'nisdomainname.conf' 'ypbind.conf' 'ypbind') @@ -23,17 +24,23 @@ sha1sums=('49f578d15aa5d4f4130a2e96cd9c0e519263fc88' '112fc2aedfe3f761325b69647b7938bc1be5bfcd') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --disable-dbus-nm + 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 + 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/gnome-unstable/cheese/PKGBUILD b/gnome-unstable/cheese/PKGBUILD index 6a4d86599..5573350fa 100644 --- a/gnome-unstable/cheese/PKGBUILD +++ b/gnome-unstable/cheese/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137216 2011-09-06 19:33:18Z ibiru $ +# $Id: PKGBUILD 138302 2011-09-19 22:05:23Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.1.91.1 +pkgver=3.1.92 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64) @@ -14,8 +14,8 @@ groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d29a0ee92f7877a10a9f834784e9f9239eaa51eb506b1fa47cd0619e98bb957b') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('4c3fa6ad257b2592b17e2f67a7608dca596685827a3ce64ae15b5de4458195bb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch b/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch new file mode 100644 index 000000000..6ba35bc02 --- /dev/null +++ b/gnome-unstable/folks/Bug_658631_crash_at_empathy_startup.patch @@ -0,0 +1,41 @@ +From 1f85f89051e63b05e271b418687c242a83e2f296 Mon Sep 17 00:00:00 2001 +From: Philip Withnall <philip@tecnocode.co.uk> +Date: Mon, 12 Sep 2011 22:09:10 +0000 +Subject: Bug 658631 — crash at empathy startup + +In the case that a persona is removed and the individual containing that +persona is replaced by a different non-null individual which doesn't contain +that persona (because it's been removed), we need to set the persona's +individual pointer to null rather than the replacement individual. + +This stops us tripping the assertion in the setter for Persona.individual. + +Closes: bgo#658631 +--- +diff --git a/folks/individual.vala b/folks/individual.vala +index 3b6c12b..59548ee 100644 +--- a/folks/individual.vala ++++ b/folks/individual.vala +@@ -1510,7 +1510,19 @@ public class Folks.Individual : Object, + * aggregator's rewritten, it would be nice to fix this. */ + if (persona.individual == this) + { +- persona.individual = replacement_individual; ++ /* It may be the case that the persona's being removed from the ++ * individual (i.e. the replacement individual is non-null, but ++ * doesn't contain this persona). In this case, we need to set the ++ * persona's individual to null. */ ++ if (replacement_individual != null && ++ persona in replacement_individual.personas) ++ { ++ persona.individual = replacement_individual; ++ } ++ else ++ { ++ persona.individual = null; ++ } + } + } + +-- +cgit v0.9.0.2 diff --git a/gnome-unstable/gdm/fix-consolekit-registration.patch b/gnome-unstable/gdm/fix-consolekit-registration.patch new file mode 100644 index 000000000..282d7705e --- /dev/null +++ b/gnome-unstable/gdm/fix-consolekit-registration.patch @@ -0,0 +1,98 @@ +From 984038d2df357750f49658ad0c5bfe0d2e812ffd Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Tue, 06 Sep 2011 15:41:07 +0000 +Subject: daemon: fix consolekit registration + +ioni pointed out on IRC, that since commit +647cad5bf59a4ff3776ba1ae5cda6b1aaaa1cfb2 + +the greeter session isn't getting fully registered +with consolekit and so udev acls weren't being +properly applied. + +This commit passes the tty to the worker process +so that it can be used for registration. + +It also passes hostname, merely for completeness. +--- +diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c +index 1d5c16a..c25bc9b 100644 +--- a/daemon/gdm-session-direct.c ++++ b/daemon/gdm-session-direct.c +@@ -1401,6 +1401,8 @@ do_introspect (DBusConnection *connection, + " <signal name=\"SetupForProgram\">\n" + " <arg name=\"service_name\" type=\"s\"/>\n" + " <arg name=\"x11_display_name\" type=\"s\"/>\n" ++ " <arg name=\"display_device\" type=\"s\"/>\n" ++ " <arg name=\"hostname\" type=\"s\"/>\n" + " <arg name=\"x11_authority_file\" type=\"s\"/>\n" + " <arg name=\"log_file\" type=\"s\"/>\n" + " </signal>\n" +@@ -2052,6 +2054,8 @@ send_setup_for_program (GdmSessionDirect *session, + DBusMessage *message; + DBusMessageIter iter; + const char *display_name; ++ const char *display_device; ++ const char *display_hostname; + const char *display_x11_authority_file; + GdmSessionConversation *conversation; + +@@ -2062,6 +2066,16 @@ send_setup_for_program (GdmSessionDirect *session, + } else { + display_name = ""; + } ++ if (session->priv->display_hostname != NULL) { ++ display_hostname = session->priv->display_hostname; ++ } else { ++ display_hostname = ""; ++ } ++ if (session->priv->display_device != NULL) { ++ display_device = session->priv->display_device; ++ } else { ++ display_device = ""; ++ } + if (session->priv->display_x11_authority_file != NULL) { + display_x11_authority_file = session->priv->display_x11_authority_file; + } else { +@@ -2077,6 +2091,8 @@ send_setup_for_program (GdmSessionDirect *session, + dbus_message_iter_init_append (message, &iter); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &service_name); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_name); ++ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_device); ++ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_hostname); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_x11_authority_file); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &log_file); + +diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c +index 2b46ca8..c402e6c 100644 +--- a/daemon/gdm-session-worker.c ++++ b/daemon/gdm-session-worker.c +@@ -2597,6 +2597,8 @@ on_setup_for_program (GdmSessionWorker *worker, + DBusError error; + char *service; + char *x11_display_name; ++ char *console; ++ char *hostname; + char *x11_authority_file; + char *log_file; + dbus_bool_t res; +@@ -2611,6 +2613,8 @@ on_setup_for_program (GdmSessionWorker *worker, + &error, + DBUS_TYPE_STRING, &service, + DBUS_TYPE_STRING, &x11_display_name, ++ DBUS_TYPE_STRING, &console, ++ DBUS_TYPE_STRING, &hostname, + DBUS_TYPE_STRING, &x11_authority_file, + DBUS_TYPE_STRING, &log_file, + DBUS_TYPE_INVALID); +@@ -2621,6 +2625,8 @@ on_setup_for_program (GdmSessionWorker *worker, + worker->priv->service = g_strdup (service); + worker->priv->username = g_strdup (GDM_USERNAME); + worker->priv->x11_display_name = g_strdup (x11_display_name); ++ worker->priv->hostname = g_strdup (hostname); ++ worker->priv->display_device = g_strdup (console); + worker->priv->x11_authority_file = g_strdup (x11_authority_file); + worker->priv->log_file = g_strdup (log_file); + worker->priv->is_program_session = TRUE; +-- +cgit v0.9.0.2 diff --git a/gnome-unstable/gedit/PKGBUILD b/gnome-unstable/gedit/PKGBUILD index 9b0b71e2b..cd60051cd 100644 --- a/gnome-unstable/gedit/PKGBUILD +++ b/gnome-unstable/gedit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137207 2011-09-06 17:34:40Z ibiru $ +# $Id: PKGBUILD 138275 2011-09-19 19:18:02Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.1.5 +pkgver=3.1.6 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d781fd78002e39ef84cca45f390de8a354fd7acd92bb241f5ccf5263dd56856b') +sha256sums=('2aa6087150830c0fd0bfafd30d68acbab247e747cf4a729af48f04c5499d4d24') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch b/gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch new file mode 100644 index 000000000..c26f422aa --- /dev/null +++ b/gnome-unstable/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch @@ -0,0 +1,73 @@ +From 9e2aaacafb45d51cff57dc033f4b5ad5bc1a1762 Mon Sep 17 00:00:00 2001 +From: Dan Winship <danw@gnome.org> +Date: Fri, 16 Sep 2011 15:29:29 +0000 +Subject: gnutls: fix G_TLS_ERROR_EOF handling with gnutls 3.0 + +gnutls 3.0 has a new error code for "peer closed connection without +sending a Close packet", so add some #ifdefs to do the right thing +with either 2.x or 3.x. + +https://bugzilla.gnome.org/show_bug.cgi?id=659233 +--- +diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c +index c1ede79..0f792bb 100644 +--- a/tls/gnutls/gtlsconnection-gnutls.c ++++ b/tls/gnutls/gtlsconnection-gnutls.c +@@ -132,7 +132,10 @@ struct _GTlsConnectionGnutlsPrivate + + GError *error; + GCancellable *cancellable; +- gboolean blocking, eof; ++ gboolean blocking; ++#ifndef GNUTLS_E_PREMATURE_TERMINATION ++ gboolean eof; ++#endif + GIOCondition internal_direction; + }; + +@@ -548,19 +551,22 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, + gnutls->priv->need_handshake = TRUE; + return status; + } +- else if (status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH) ++ else if ( ++#ifdef GNUTLS_E_PREMATURE_TERMINATION ++ status == GNUTLS_E_PREMATURE_TERMINATION ++#else ++ status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && gnutls->priv->eof ++#endif ++ ) + { +- if (gnutls->priv->eof) ++ if (gnutls->priv->require_close_notify) + { +- if (gnutls->priv->require_close_notify) +- { +- g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, +- _("TLS connection closed unexpectedly")); +- return status; +- } +- else +- return 0; ++ g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, ++ _("TLS connection closed unexpectedly")); ++ return status; + } ++ else ++ return 0; + } + + return status; +@@ -795,8 +801,10 @@ g_tls_connection_gnutls_pull_func (gnutls_transport_ptr_t transport_data, + + if (ret < 0) + set_gnutls_error (gnutls, G_IO_IN); ++#ifndef GNUTLS_E_PREMATURE_TERMINATION + else if (ret == 0) + gnutls->priv->eof = TRUE; ++#endif + + return ret; + } +-- +cgit v0.9.0.2 diff --git a/gnome-unstable/gnome-documents/PKGBUILD b/gnome-unstable/gnome-documents/PKGBUILD new file mode 100644 index 000000000..009b4cd14 --- /dev/null +++ b/gnome-unstable/gnome-documents/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 137662 2011-09-10 11:05:53Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=gnome-documents +pkgver=0.1.91 +pkgrel=1 +pkgdesc="Documents Manager for GNOME" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL') +groups=('gnome-extra') +depends=('clutter-gtk' 'evince' 'gobject-introspection' 'gtk3' 'gnome-desktop' + 'gnome-online-accounts' 'libgdata' 'tracker') +makedepends=('intltool' 'vala') +install=gnome-documents.install +source=(http://download.gnome.org/sources/$pkgname/0.1/$pkgname-$pkgver.tar.xz) +sha256sums=('b2180d86f4c162903d2e30300271f6f03b6bc351c0addb664b7ba04341c2f3b6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-documents + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-documents/gnome-documents.install b/gnome-unstable/gnome-documents/gnome-documents.install new file mode 100644 index 000000000..95114273e --- /dev/null +++ b/gnome-unstable/gnome-documents/gnome-documents.install @@ -0,0 +1,13 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + 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/gnome-unstable/gthumb/PKGBUILD b/gnome-unstable/gthumb/PKGBUILD new file mode 100644 index 000000000..315dc1fd9 --- /dev/null +++ b/gnome-unstable/gthumb/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 137983 2011-09-13 21:08:13Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=gthumb +pkgver=2.13.90 +pkgrel=1 +pkgdesc="Image browser and viewer for the GNOME Desktop" +arch=(i686 x86_64) +license=('GPL') +url="http://gthumb.sourceforge.net/" +depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2') +makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base') +optdepends=('gstreamer0.10-base: video support') +options=('!libtool' '!emptydirs') +install=gthumb.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('14d4dc212c9f924ff3161733842edccbf6b6ac5d829808ae11f8af29d10ac5de') +sha256sums=('d11f08bc7d513ea8c5340f5b36edd620b53e9ddfc0c8b31fcda284b720145e6a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/gthumb/gthumb.install b/gnome-unstable/gthumb/gthumb.install new file mode 100644 index 000000000..6046ebb6f --- /dev/null +++ b/gnome-unstable/gthumb/gthumb.install @@ -0,0 +1,24 @@ +pkgname=gthumb + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/gnome-unstable/gtksourceview3/PKGBUILD b/gnome-unstable/gtksourceview3/PKGBUILD index 8ecea6a0b..79f876e03 100644 --- a/gnome-unstable/gtksourceview3/PKGBUILD +++ b/gnome-unstable/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137202 2011-09-06 17:16:29Z ibiru $ +# $Id: PKGBUILD 138271 2011-09-19 19:01:00Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.1.5 +pkgver=3.1.6 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz) -sha256sums=('39042c6c2f9c55385dc40e6d4e0a842081ef895ae3c2f63645ab92ecfa0743f9') +sha256sums=('5d39f8c8ec4fa6e04c319070a9c1e66daeaeaba9463939a516cca122256fb23c') build() { cd "${srcdir}/$_pkgbasename-${pkgver}" diff --git a/gnome-unstable/gucharmap/PKGBUILD b/gnome-unstable/gucharmap/PKGBUILD new file mode 100644 index 000000000..1c1593267 --- /dev/null +++ b/gnome-unstable/gucharmap/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 138238 2011-09-19 14:31:59Z ibiru $ +# Maintainer: Jan De Groot <jgc@archlinux.org> + +pkgname=gucharmap +pkgver=3.1.92 +pkgrel=1 +pkgdesc="Gnome Unicode Charmap" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org" +depends=('gconf' 'hicolor-icon-theme') +makedepends=('gtk-doc' 'intltool' 'gobject-introspection') +options=('!libtool' '!emptydirs') +install=gucharmap.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('370179135acbe87c22854932964a1f5ad469c811abe63d4c10e2394cbccfbd47') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --disable-scrollkeeper --enable-introspection + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gucharmap ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/gucharmap/gucharmap.install b/gnome-unstable/gucharmap/gucharmap.install new file mode 100644 index 000000000..4de3253f6 --- /dev/null +++ b/gnome-unstable/gucharmap/gucharmap.install @@ -0,0 +1,22 @@ +pkgname=gucharmap + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/gnome-unstable/json-glib/PKGBUILD b/gnome-unstable/json-glib/PKGBUILD new file mode 100644 index 000000000..3fe93ab3b --- /dev/null +++ b/gnome-unstable/json-glib/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 138241 2011-09-19 14:36:36Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=json-glib +pkgver=0.14.0 +pkgrel=1 +pkgdesc="JSON library built on GLib" +arch=('i686' 'x86_64') +url="http://live.gnome.org/JsonGlib" +license=('GPL') +depends=('glib2') +makedepends=('gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.14/${pkgname}-${pkgver}.tar.xz) +sha256sums=('821e90196673408a9293845e37ef572826a960a101096db9bcba45cf4c4afc56') + +build(){ + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} 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/pavucontrol/PKGBUILD b/gnome-unstable/pavucontrol/PKGBUILD new file mode 100644 index 000000000..cd12238db --- /dev/null +++ b/gnome-unstable/pavucontrol/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 138100 2011-09-16 09:17:47Z 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=pavucontrol +pkgver=0.99.2 +pkgrel=1 +pkgdesc="A GTK volume control tool for PulseAudio" +arch=(i686 x86_64) +url="http://0pointer.de/lennart/projects/pavucontrol" +license=(GPL) +depends=(gnome-icon-theme libcanberra-pulse gtkmm3 libsigc++) +makedepends=(intltool lynx) +source=(http://freedesktop.org/software/pulseaudio/$pkgname/$pkgname-$pkgver.tar.gz + pavucontrol.desktop) +sha256sums=('4a95065a4afb2a18142b60d6f0950171198372650391275dcdcd4671ba763cdf' + '5eab8c78e92c39a71ac1ca4c4464a8915d3a29d91e1703fd51c24652b747eebe') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-gtk3 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/pavucontrol.desktop" \ + "$pkgdir/usr/share/applications/pavucontrol.desktop" +} diff --git a/gnome-unstable/pavucontrol/pavucontrol.desktop b/gnome-unstable/pavucontrol/pavucontrol.desktop new file mode 100644 index 000000000..842dc96b6 --- /dev/null +++ b/gnome-unstable/pavucontrol/pavucontrol.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=PulseAudio Volume Control +GenericName=Volume Control +Comment=Adjust the volume level +Exec=pavucontrol +Icon=multimedia-volume-control +StartupNotify=true +Type=Application +Categories=AudioVideo;Audio; +GenericName[en_GB]=Volume Control diff --git a/gnome-unstable/telepathy-mission-control/PKGBUILD b/gnome-unstable/telepathy-mission-control/PKGBUILD new file mode 100644 index 000000000..bcb9c55a6 --- /dev/null +++ b/gnome-unstable/telepathy-mission-control/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 137528 2011-09-08 19:52:46Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Ju Liu <liuju86 at gmail dot com> +# Contributor: Bjorn Lindeijer <bjorn lindeijer nl> +# Contributor: Andreas Zwinkau <beza1e1@web.de> +pkgname=telepathy-mission-control +pkgver=5.9.2 +pkgrel=1 +pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org/wiki/Mission Control" +license=('LGPL2.1') +depends=('telepathy-glib' 'libgnome-keyring') +makedepends=('libxslt' 'python2') +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) +md5sums=('312fb289f644a90d4514064586445d58') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy \ + --enable-gnome-keyring + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/tomboy/PKGBUILD b/gnome-unstable/tomboy/PKGBUILD new file mode 100644 index 000000000..cef2b51e0 --- /dev/null +++ b/gnome-unstable/tomboy/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 138226 2011-09-19 12:07:16Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=tomboy +pkgver=1.7.7 +pkgrel=1 +pkgdesc="Desktop note-taking application for Linux and Unix" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/tomboy/" +depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme') +makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') +options=('!libtool' '!emptydirs' '!makeflags') +groups=('gnome-extra') +install=tomboy.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.7/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f8c38ba48abcee33ba336b526adbc8672a0c8a5053f600324c6ef84f48399e12') + +build() { + export MONO_SHARED_DIR="${srcdir}/.wabi" + mkdir -p "${MONO_SHARED_DIR}" + + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper \ + --disable-update-mimedb + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain tomboy ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/tomboy/tomboy.install b/gnome-unstable/tomboy/tomboy.install new file mode 100644 index 000000000..f8e2e4a07 --- /dev/null +++ b/gnome-unstable/tomboy/tomboy.install @@ -0,0 +1,25 @@ +pkgname=tomboy + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} diff --git a/gnome-unstable/tracker/PKGBUILD b/gnome-unstable/tracker/PKGBUILD new file mode 100644 index 000000000..c46709460 --- /dev/null +++ b/gnome-unstable/tracker/PKGBUILD @@ -0,0 +1,94 @@ +# $Id: PKGBUILD 137747 2011-09-10 15:05:23Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Alexander Fehr <pizzapunk gmail com> + +pkgbase=tracker +pkgname=(tracker libtracker-sparql) +pkgver=0.12.0 +_tver=${pkgver%.*} +pkgrel=3 +pkgdesc="All-in-one indexer, search tool and metadata database" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' + 'poppler-glib' 'libgsf' 'icu' 'enca' 'xdg-utils' + 'networkmanager' 'gobject-introspection' 'intltool' 'giflib' + 'gstreamer0.10-base' 'totem-plparser' 'evolution' 'taglib' + 'nautilus' 'gnome-panel' 'firefox' 'thunderbird' 'libvorbis' + 'flac' 'vala') +url="http://www.gnome.org" +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) +sha256sums=('6819b5fbbcaa14ac004759e4b25962f8ef36f2c4b37908a32fcf6d7a22e5b261') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + + _ffdir=/usr/lib/firefox-6.0.2/extensions + _tbdir=/usr/lib/thunderbird-6.0.2/extensions + + # Force vala regeneration + find . -name '*.stamp' -delete + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/tracker \ + --disable-unit-tests \ + --enable-libflac \ + --enable-libvorbis \ + --with-firefox-plugin-dir=$_ffdir \ + --with-thunderbird-plugin-dir=$_tbdir + + make +} + +package_tracker() { + depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring' + 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca' + 'xdg-utils' 'networkmanager') + optdepends=('giflib: extractor for GIF data' + 'gstreamer0.10-base: video extractor' + 'totem-plparser: playlist support' + 'evolution: Evolution email data miner' + 'firefox: Firefox data miner' + 'thunderbird: Thunderbird data miner' + 'nautilus: nautilus-extension' + 'libvorbis: Vorbis metadata extractor' + 'flac: FLAC metadata extractor' + 'taglib: writeback for audio files' + 'gnome-panel: tracker-search-bar') + groups=('gnome-extra') + install=tracker.install + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + +### Split libtracker-sparql + + mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver + mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig} + mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi} + + mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib" + + mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \ + "$srcdir/sparql/usr/lib/tracker-$_tver" + + mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \ + "$srcdir/sparql/usr/share/vala/vapi" + + mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc + mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir +} + +package_libtracker-sparql() { + pkgdesc="$pkgdesc (SPARQL library)" + depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') + + mv "$srcdir"/sparql/* "$pkgdir" +} diff --git a/gnome-unstable/tracker/tracker.install b/gnome-unstable/tracker/tracker.install new file mode 100644 index 000000000..95114273e --- /dev/null +++ b/gnome-unstable/tracker/tracker.install @@ -0,0 +1,13 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + 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/kde-unstable/kdebase-workspace/important-performance-bugfix.patch b/kde-unstable/kdebase-workspace/important-performance-bugfix.patch new file mode 100644 index 000000000..a34c77e5c --- /dev/null +++ b/kde-unstable/kdebase-workspace/important-performance-bugfix.patch @@ -0,0 +1,91 @@ +commit e142a1a142cbc8b87f021223e6abc947f456a7f9 +Author: Thomas Lübking <thomas.luebking@gmail.com> +Date: Thu Sep 8 22:20:35 2011 +0200 + + replace non-const QVector::operator[] accesses with const ::at() to avoid maaany deep vecor copies + +diff --git a/kwin/effects.cpp b/kwin/effects.cpp +index e0c76cb..f5863fc0 100644 +--- a/kwin/effects.cpp ++++ b/kwin/effects.cpp +@@ -200,7 +200,7 @@ void EffectsHandlerImpl::reconfigure() + void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time) + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->prePaintScreen(data, time); ++ loaded_effects.at(current_paint_screen++).second->prePaintScreen(data, time); + --current_paint_screen; + } + // no special final code +@@ -209,7 +209,7 @@ void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time) + void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& data) + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->paintScreen(mask, region, data); ++ loaded_effects.at(current_paint_screen++).second->paintScreen(mask, region, data); + --current_paint_screen; + } else + scene->finalPaintScreen(mask, region, data); +@@ -218,7 +218,7 @@ void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& + void EffectsHandlerImpl::postPaintScreen() + { + if (current_paint_screen < loaded_effects.size()) { +- loaded_effects[current_paint_screen++].second->postPaintScreen(); ++ loaded_effects.at(current_paint_screen++).second->postPaintScreen(); + --current_paint_screen; + } + // no special final code +@@ -227,7 +227,7 @@ void EffectsHandlerImpl::postPaintScreen() + void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->prePaintWindow(w, data, time); ++ loaded_effects.at(current_paint_window++).second->prePaintWindow(w, data, time); + --current_paint_window; + } + // no special final code +@@ -236,7 +236,7 @@ void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& dat + void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->paintWindow(w, mask, region, data); ++ loaded_effects.at(current_paint_window++).second->paintWindow(w, mask, region, data); + --current_paint_window; + } else + scene->finalPaintWindow(static_cast<EffectWindowImpl*>(w), mask, region, data); +@@ -245,7 +245,7 @@ void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, + void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, double opacity, double frameOpacity) + { + if (current_paint_effectframe < loaded_effects.size()) { +- loaded_effects[current_paint_effectframe++].second->paintEffectFrame(frame, region, opacity, frameOpacity); ++ loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame(frame, region, opacity, frameOpacity); + --current_paint_effectframe; + } else { + const EffectFrameImpl* frameImpl = static_cast<const EffectFrameImpl*>(frame); +@@ -256,7 +256,7 @@ void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, do + void EffectsHandlerImpl::postPaintWindow(EffectWindow* w) + { + if (current_paint_window < loaded_effects.size()) { +- loaded_effects[current_paint_window++].second->postPaintWindow(w); ++ loaded_effects.at(current_paint_window++).second->postPaintWindow(w); + --current_paint_window; + } + // no special final code +@@ -273,7 +273,7 @@ bool EffectsHandlerImpl::provides(Effect::Feature ef) + void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) + { + if (current_draw_window < loaded_effects.size()) { +- loaded_effects[current_draw_window++].second->drawWindow(w, mask, region, data); ++ loaded_effects.at(current_draw_window++).second->drawWindow(w, mask, region, data); + --current_draw_window; + } else + scene->finalDrawWindow(static_cast<EffectWindowImpl*>(w), mask, region, data); +@@ -282,7 +282,7 @@ void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, W + void EffectsHandlerImpl::buildQuads(EffectWindow* w, WindowQuadList& quadList) + { + if (current_build_quads < loaded_effects.size()) { +- loaded_effects[current_build_quads++].second->buildQuads(w, quadList); ++ loaded_effects.at(current_build_quads++).second->buildQuads(w, quadList); + --current_build_quads; + } + } diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 44ffecd3b..cc77a04c3 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -5,7 +5,7 @@ pkgname=texlive-bin-libre pkgver=2011.1 _luatex_ver=0.70.1 -pkgrel=1 +pkgrel=2 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64') @@ -63,7 +63,7 @@ build() { ../source/configure --prefix=/usr -C \ --disable-native-texlive-build \ --with-banner-add="/Parabola GNU/Linux-libre" \ - --enable-cxx-runtime-hack \ + --disable-cxx-runtime-hack \ --disable-all-pkgs \ --disable-dump-share \ --disable-ptex \ @@ -234,7 +234,8 @@ package() { rm -rf ${pkgdir}/usr/{texmf,texmf-dist} ## install luatex binary - install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/ + cd $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c + ./libtool --mode=install install -m755 luatex $pkgdir/usr/bin/ cd $pkgdir/usr/bin /bin/ln -s luatex texlua /bin/ln -s luatex texluac diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD new file mode 100644 index 000000000..c0a6c9f1f --- /dev/null +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -0,0 +1,170 @@ +# $Id: PKGBUILD 55287 2011-09-08 23:36:17Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: valgrind requires rebuild with each new glibc version + +_pkgbasename=glibc +pkgname=lib32-$_pkgbasename +pkgver=2.14 +pkgrel=6 +_glibcdate=20110908 +pkgdesc="GNU C Library for multilib" +arch=('x86_64') +url="http://www.gnu.org/software/libc" +license=('GPL' 'LGPL') +depends=("glibc>=$pkgver") +makedepends=('gcc-multilib>=4.6') +options=('!strip' '!emptydirs') +source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz + glibc-2.10-dont-build-timezone.patch + glibc-2.10-bz4781.patch + glibc-__i686.patch + glibc-2.12.1-static-shared-getpagesize.patch + glibc-2.12.2-ignore-origin-of-privileged-program.patch + glibc-2.13-futex.patch + glibc-2.13-dlclose-search-reset.patch + glibc-2.14-libdl-crash.patch + glibc-2.14-avoid-assertion-on-empty-dns-answer.patch + glibc-2.14-reexport-rpc-interface.patch + glibc-2.14-reinstall-nis-rpc-headers.patch + lib32-glibc.conf) +md5sums=('069069eb9100cc7affd7ad884cb3c3e9' + '4dadb9203b69a3210d53514bb46f41c3' + '0c5540efc51c0b93996c51b57a8540ae' + '40cd342e21f71f5e49e32622b25acc52' + 'a3ac6f318d680347bb6e2805d42b73b2' + 'b042647ea7d6f22ad319e12e796bd13e' + '7d0154b7e17ea218c9fa953599d24cc4' + '22d09c58718fb3d1d31c3a6c14ca6886' + 'cea62cc6b903d222c5f26e05a3c0e0e6' + '13728807283f111e5d9d38cf38e0a461' + 'c5de2a946215d647c8af5432ec4b0da0' + '55febbb72139ac7b65757df085024b83' + '6e052f1cb693d5d3203f50f9d4e8c33b') + +build() { + cd ${srcdir}/glibc + + # timezone data is in separate package (tzdata) + patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch + + # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 + patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch + + # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 + # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html + patch -Np1 -i ${srcdir}/glibc-__i686.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 + # using Fedora "fix" as patch in that bug report causes breakages... + patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch + + # http://www.exploit-db.com/exploits/15274/ + # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 + patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + + # https://bugzilla.redhat.com/show_bug.cgi?id=593675 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.patch + + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) + # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html + patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch + + # re-export RPC interface until libtirpc is ready as a replacement + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + + cd ${srcdir} + mkdir glibc-build + cd glibc-build + + export CC="gcc -m32" + + # Hack to fix NPTL issues with Xen, only required on 32bit platforms + export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + + echo "slibdir=/usr/lib32" >> configparms + + # remove hardening options from CFLAGS for building libraries + CFLAGS=${CFLAGS/-fstack-protector/} + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + + ${srcdir}/glibc/configure --prefix=/usr \ + --libdir=/usr/lib32 --libexecdir=/usr/lib32 \ + --with-headers=/usr/include \ + --enable-add-ons=nptl,libidn \ + --enable-kernel=2.6.27 \ + --with-tls --with-__thread \ + --enable-bind-now --without-gd \ + --without-cvs --disable-profile \ + --disable-multi-arch i686-unknown-linux-gnu + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms + make + + # re-enable hardening for programs + sed -i "s#=no#=yes#" configparms + echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + make + + # remove harding in preparation to run test-suite + sed -i '2,4d' configparms +} + +check() { + cd ${srcdir}/glibc-build + + # some errors are expected - manually check log files + make -k check || true +} + +package() { + cd ${srcdir}/glibc-build + make install_root=${pkgdir} install + + rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}} + + # We need one 32 bit specific header file + find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete + + # manually strip files as stripping libpthread-*.so and libthread_db.so + # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks + # valgrind on x86_64 + + cd $pkgdir + strip $STRIP_BINARIES usr/lib32/getconf/* + + strip $STRIP_STATIC usr/lib32/*.a \ + usr/lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so + + strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ + usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ + usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ + usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \ + usr/lib32/{pt_chown,{audit,gconv}/*.so} + + # Dynamic linker + install -d -m755 ${pkgdir}/lib + ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/ + + # Add /usr/lib32 to the default library search path + install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" + + # Symlink /usr/lib32/locale to /usr/lib/locale + ln -s ../lib/locale "$pkgdir/usr/lib32/locale" +} diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch new file mode 100644 index 000000000..cf1a97a18 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch @@ -0,0 +1,42 @@ +diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 ++++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 +@@ -120,9 +120,6 @@ + ret + + L(thread_start): +- cfi_startproc; +- /* Clearing frame pointer is insufficient, use CFI. */ +- cfi_undefined (eip); + /* Note: %esi is zero. */ + movl %esi,%ebp /* terminate the stack frame */ + #ifdef RESET_PID +@@ -155,7 +152,6 @@ + jmp L(haspid) + .previous + #endif +- cfi_endproc; + + cfi_startproc + PSEUDO_END (BP_SYM (__clone)) +diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 ++++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 +@@ -89,9 +89,6 @@ + ret + + L(thread_start): +- cfi_startproc; +- /* Clearing frame pointer is insufficient, use CFI. */ +- cfi_undefined (rip); + /* Clear the frame pointer. The ABI suggests this be done, to mark + the outermost frame obviously. */ + xorl %ebp, %ebp +@@ -116,7 +113,6 @@ + /* Call exit with return value from function call. */ + movq %rax, %rdi + call HIDDEN_JUMPTARGET (_exit) +- cfi_endproc; + + cfi_startproc; + PSEUDO_END (BP_SYM (__clone)) diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch new file mode 100644 index 000000000..d3abeff17 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch @@ -0,0 +1,13 @@ +timezone data has been split into the package sys-libs/timezone-data + +--- glibc-2.4/Makeconfig ++++ glibc-2.4/Makeconfig +@@ -931,7 +931,7 @@ + stdlib stdio-common libio malloc string wcsmbs time dirent \ + grp pwd posix io termios resource misc socket sysvipc gmon \ + gnulib iconv iconvdata wctype manual shadow gshadow po argp \ +- crypt nss localedata timezone rt conform debug \ ++ crypt nss localedata rt conform debug \ + $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) + + ifndef avoid-generated diff --git a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch new file mode 100644 index 000000000..e84754279 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch @@ -0,0 +1,11 @@ +--- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c +@@ -28,7 +28,7 @@ + int + __getpagesize () + { +-#ifdef __ASSUME_AT_PAGESIZE ++#if 0 && defined __ASSUME_AT_PAGESIZE + assert (GLRO(dl_pagesize) != 0); + return GLRO(dl_pagesize); + #else diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch new file mode 100644 index 000000000..ce089b49c --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch @@ -0,0 +1,26 @@ +From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Thu, 9 Dec 2010 15:00:59 +0100 +Subject: [PATCH 1/1] Ignore origin of privileged program + +--- + ChangeLog | 5 +++++ + elf/dl-object.c | 3 +++ + 2 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/elf/dl-object.c b/elf/dl-object.c +index 22a1635..7674d49 100644 +--- a/elf/dl-object.c ++++ b/elf/dl-object.c +@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, + out: + new->l_origin = origin; + } ++ else if (INTUSE(__libc_enable_secure) && type == lt_executable) ++ /* The origin of a privileged program cannot be trusted. */ ++ new->l_origin = (char *) -1; + + return new; + } +-- +1.7.2 diff --git a/multilib-testing/lib32-glibc/glibc-2.13-dlclose-search-reset.patch b/multilib-testing/lib32-glibc/glibc-2.13-dlclose-search-reset.patch new file mode 100644 index 000000000..3ad8b418a --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.13-dlclose-search-reset.patch @@ -0,0 +1,196 @@ +From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Wed, 26 May 2010 18:28:59 +0200 +Subject: [PATCH] Fix scope handling during dl_close + +--- + ChangeLog | 12 ++++++++++++ + elf/Makefile | 10 +++++++++- + elf/dl-close.c | 7 +++++++ + elf/unload8.c | 33 +++++++++++++++++++++++++++++++++ + elf/unload8mod1.c | 7 +++++++ + elf/unload8mod1x.c | 1 + + elf/unload8mod2.c | 7 +++++++ + elf/unload8mod3.c | 27 +++++++++++++++++++++++++++ + 8 files changed, 103 insertions(+), 1 deletions(-) + create mode 100644 elf/unload8.c + create mode 100644 elf/unload8mod1.c + create mode 100644 elf/unload8mod1x.c + create mode 100644 elf/unload8mod2.c + create mode 100644 elf/unload8mod3.c + +diff --git a/elf/Makefile b/elf/Makefile +index 59e835f..65b6deb 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -89,6 +89,7 @@ distribute := rtld-Rules \ + unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ + unload6mod1.c unload6mod2.c unload6mod3.c \ + unload7mod1.c unload7mod2.c \ ++ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \ + tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ + tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ + tst-auditmod4a.c tst-auditmod4b.c \ +@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ + tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ + tst-dlmodcount tst-dlopenrpath tst-deep1 \ + tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ +- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ ++ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ + tst-audit1 tst-audit2 \ + tst-stackguard1 tst-addr1 tst-thrlock \ + tst-unique1 tst-unique2 +@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ + unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ + unload6mod1 unload6mod2 unload6mod3 \ + unload7mod1 unload7mod2 \ ++ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \ + order2mod1 order2mod2 order2mod3 order2mod4 \ + tst-unique1mod1 tst-unique1mod2 \ + tst-unique2mod1 tst-unique2mod2 +@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl) + $(objpfx)unload6mod3.so: $(libdl) + $(objpfx)unload7mod1.so: $(libdl) + $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so ++$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so ++$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so ++$(objpfx)unload8mod3.so: $(libdl) + $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so + $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so + $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so +@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl) + $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so + unload7-ENV = MALLOC_PERTURB_=85 + ++$(objpfx)unload8: $(libdl) ++$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so ++ + ifdef libdl + $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a + $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 700e765..f47d5f8 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) + + imap->l_scope_max = new_size; + } ++ else if (new_list != NULL) ++ { ++ /* We didn't change the scope array, so reset the search ++ list. */ ++ imap->l_searchlist.r_list = NULL; ++ imap->l_searchlist.r_nlist = 0; ++ } + + /* The loader is gone, so mark the object as not having one. + Note: l_idx != IDX_STILL_USED -> object will be removed. */ +diff --git a/elf/unload8.c b/elf/unload8.c +new file mode 100644 +index 0000000..f984a38 +--- /dev/null ++++ b/elf/unload8.c +@@ -0,0 +1,33 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++ ++int ++main (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod1.so failed"); ++ return 1; ++ } ++ ++ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY); ++ if (h2 == NULL) ++ { ++ puts ("dlopen unload8mod1x.so failed"); ++ return 1; ++ } ++ dlclose (h2); ++ ++ int (*mod1) (void) = dlsym (h, "mod1"); ++ if (mod1 == NULL) ++ { ++ puts ("dlsym failed"); ++ return 1; ++ } ++ ++ mod1 (); ++ dlclose (h); ++ ++ return 0; ++} +diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c +new file mode 100644 +index 0000000..fe7e81c +--- /dev/null ++++ b/elf/unload8mod1.c +@@ -0,0 +1,7 @@ ++extern void mod2 (void); ++ ++void ++mod1 (void) ++{ ++ mod2 (); ++} +diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c +new file mode 100644 +index 0000000..835b634 +--- /dev/null ++++ b/elf/unload8mod1x.c +@@ -0,0 +1 @@ ++int mod1x; +diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c +new file mode 100644 +index 0000000..2fd8b67 +--- /dev/null ++++ b/elf/unload8mod2.c +@@ -0,0 +1,7 @@ ++extern void mod3 (void); ++ ++void ++mod2 (void) ++{ ++ mod3 (); ++} +diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c +new file mode 100644 +index 0000000..d49e22b +--- /dev/null ++++ b/elf/unload8mod3.c +@@ -0,0 +1,27 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++void ++mod3_fini2 (void) ++{ ++} ++ ++void ++mod3_fini (void) ++{ ++ mod3_fini2 (); ++} ++ ++void ++mod3 (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod2.so failed"); ++ exit (1); ++ } ++ ++ atexit (mod3_fini); ++} +-- +1.7.3.4 + diff --git a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch new file mode 100644 index 000000000..9b9c3ac45 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch @@ -0,0 +1,31 @@ +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: + + 7: movq %rdx, %rax + +-#ifndef __ASSUME_PRIVATE_FUTEX ++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME + addq $16, %rsp + cfi_adjust_cfa_offset(-16) + popq %r14 +@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) diff --git a/multilib-testing/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/multilib-testing/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch new file mode 100644 index 000000000..ef91116e5 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch @@ -0,0 +1,26 @@ +From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Thu, 1 Sep 2011 10:46:14 +0200 +Subject: [PATCH] Avoid assertion failure when first DNS answer was empty + +--- + ChangeLog | 4 ++++ + resolv/res_query.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/resolv/res_query.c b/resolv/res_query.c +index 2f7cfaa..2ded9fb 100644 +--- a/resolv/res_query.c ++++ b/resolv/res_query.c +@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, + && *resplen2 > (int) sizeof (HEADER)) + { + /* Special case of partial answer. */ +- assert (hp != hp2); ++ assert (n == 0 || hp != hp2); + hp = hp2; + } + else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) +-- +1.7.3.4 + diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch new file mode 100644 index 000000000..ee29f8c20 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch @@ -0,0 +1,132 @@ +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 73b2a2f..9bd91e3 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -1,5 +1,5 @@ + /* Close a shared object opened by `_dl_open'. +- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) + if (map->l_direct_opencount > 0 || map->l_type != lt_loaded + || dl_close_state != not_pending) + { +- if (map->l_direct_opencount == 0) +- { +- if (map->l_type == lt_loaded) +- dl_close_state = rerun; +- else if (map->l_type == lt_library) +- { +- struct link_map **oldp = map->l_initfini; +- map->l_initfini = map->l_orig_initfini; +- _dl_scope_free (oldp); +- } +- } ++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) ++ dl_close_state = rerun; + + /* There are still references to this object. Do nothing more. */ + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) +diff --git a/elf/dl-deps.c b/elf/dl-deps.c +index 9e30594..3890d00 100644 +--- a/elf/dl-deps.c ++++ b/elf/dl-deps.c +@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, + nneeded * sizeof needed[0]); + atomic_write_barrier (); + l->l_initfini = l_initfini; ++ l->l_free_initfini = 1; + } + + /* If we have no auxiliary objects just go on to the next map. */ +@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); + l_initfini[nlist] = NULL; + atomic_write_barrier (); + map->l_initfini = l_initfini; ++ map->l_free_initfini = 1; + if (l_reldeps != NULL) + { + atomic_write_barrier (); +@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); + _dl_scope_free (old_l_reldeps); + } + if (old_l_initfini != NULL) +- map->l_orig_initfini = old_l_initfini; ++ _dl_scope_free (old_l_initfini); + } +diff --git a/elf/dl-libc.c b/elf/dl-libc.c +index 7be9483..a13fce3 100644 +--- a/elf/dl-libc.c ++++ b/elf/dl-libc.c +@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) + + for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) + { +- /* Remove all additional names added to the objects. */ + for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) + { + struct libname_list *lnp = l->l_libname->next; + + l->l_libname->next = NULL; + ++ /* Remove all additional names added to the objects. */ + while (lnp != NULL) + { + struct libname_list *old = lnp; +@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) + if (! old->dont_free) + free (old); + } ++ ++ /* Free the initfini dependency list. */ ++ if (l->l_free_initfini) ++ free (l->l_initfini); + } + + if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 +diff --git a/elf/rtld.c b/elf/rtld.c +index 4a9109e..617e30e 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + lnp->dont_free = 1; + lnp = lnp->next; + } ++ l->l_free_initfini = 0; + + if (l != &GL(dl_rtld_map)) + _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, +diff --git a/include/link.h b/include/link.h +index e877104..051b99a 100644 +--- a/include/link.h ++++ b/include/link.h +@@ -1,6 +1,6 @@ + /* Data structure for communication from the run-time dynamic linker for + loaded ELF shared objects. +- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -192,6 +192,9 @@ struct link_map + during LD_TRACE_PRELINKING=1 + contains any DT_SYMBOLIC + libraries. */ ++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be ++ freed, ie. not allocated with ++ the dummy malloc in ld.so. */ + + /* Collected information about own RPATH directories. */ + struct r_search_path_struct l_rpath_dirs; +@@ -240,9 +243,6 @@ struct link_map + + /* List of object in order of the init and fini calls. */ + struct link_map **l_initfini; +- /* The init and fini list generated at startup, saved when the +- object is also loaded dynamically. */ +- struct link_map **l_orig_initfini; + + /* List of the dependencies introduced through symbol binding. */ + struct link_map_reldeps diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch new file mode 100644 index 000000000..e2beea881 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch @@ -0,0 +1,26 @@ +diff --git a/include/libc-symbols.h b/include/libc-symbols.h +index 67e1ca2..5e7cca5 100644 +--- a/include/libc-symbols.h ++++ b/include/libc-symbols.h +@@ -635,7 +635,7 @@ for linking") + # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) + # define libc_hidden_def(name) hidden_def (name) + # define libc_hidden_weak(name) hidden_weak (name) +-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) ++# define libc_hidden_nolink(name, version) hidden_def (name) + # define libc_hidden_ver(local, name) hidden_ver (local, name) + # define libc_hidden_data_def(name) hidden_data_def (name) + # define libc_hidden_data_weak(name) hidden_data_weak (name) +diff --git a/sunrpc/Makefile b/sunrpc/Makefile +index 5134ce9..40c73d1 100644 +--- a/sunrpc/Makefile ++++ b/sunrpc/Makefile +@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ + des_crypt.h) + headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ + $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h +-headers = rpc/netdb.h ++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) + install-others = $(inst_sysconfdir)/rpc + generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ + $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch new file mode 100644 index 000000000..eb0fd822d --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch @@ -0,0 +1,28 @@ +From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Tue, 17 May 2011 17:42:30 +0200 +Subject: [PATCH] Reinstall NIS RPC headers + +--- + nis/Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nis/Makefile b/nis/Makefile +index b5c9609..d2934d9 100644 +--- a/nis/Makefile ++++ b/nis/Makefile +@@ -23,9 +23,9 @@ subdir := nis + + aux := nis_hash + ++headers := $(wildcard rpcsvc/*.[hx]) + distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ +- nisplus-parser.h nis_xdr.h nss \ +- $(wildcard rpcsvc/*.[hx]) ++ nisplus-parser.h nis_xdr.h nss + + # These are the databases available for the nis (and perhaps later nisplus) + # service. This must be a superset of the services in nss. +-- +1.7.5.4 + diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch new file mode 100644 index 000000000..28d5dd424 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-__i686.patch @@ -0,0 +1,13 @@ +diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile +--- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 ++++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 +@@ -1,6 +1,7 @@ + # The mpn functions need a #define for asm syntax flavor. +-# Every i386 port in use uses gas syntax (I think). +-asm-CPPFLAGS += -DGAS_SYNTAX ++# Every i386 port in use uses gas syntax (I think). Don't replace ++# __i686 in __i686.get_pc_thunk.bx. ++asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 + + # The i386 `long double' is a distinct type we support. + long-double-fcts = yes diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf new file mode 100644 index 000000000..9b08c3f43 --- /dev/null +++ b/multilib-testing/lib32-glibc/lib32-glibc.conf @@ -0,0 +1 @@ +/usr/lib32 diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD new file mode 100644 index 000000000..60dff1b3d --- /dev/null +++ b/multilib-testing/libtool-multilib/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 55288 2011-09-08 23:39:10Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +# NOTE: requires rebuild with each new gcc version + +pkgbase=libtool-multilib +pkgname=(libtool-multilib lib32-libltdl) +pkgver=2.4 +pkgrel=5 +pkgdesc="A generic library support script for multilib" +arch=('x86_64') +url="http://www.gnu.org/software/libtool" +license=('GPL') +_gccver=4.6.1 +makedepends=("gcc-multilib=$_gccver") +options=('!libtool') +source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz) +md5sums=('4e6144439d95d7332dc50ace6dd24c55') + +build() { + cd "$srcdir" + + rm -rf libtool-64 libtool-32 + mv libtool-$pkgver libtool-64 + cp -a libtool-64 libtool-32 + + msg2 "Building libtool-64..." + cd "$srcdir/libtool-64" + ./configure --prefix=/usr + make + + msg2 "Building libtool-32..." + export CC="gcc -m32" + export CXX="g++ -m32" + + cd "$srcdir/libtool-32" + ./configure --prefix=/usr --libdir=/usr/lib32 + make +} + +check() { + cd "$srcdir/libtool-64" + make check + cd "$srcdir/libtool-32" + make check +} + +package_libtool-multilib() { + depends=('sh' "libltdl=$pkgver" "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver") + groups=('multilib-devel') + install=libtool.install + provides=("libtool=$pkgver-$pkgrel") + conflicts=(libtool) + + cd "$srcdir/libtool-64" + make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ + install-data-local + rm -rf ${pkgdir}/usr/share/libtool/libltdl/ +} + +package_lib32-libltdl() { + pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)" + depends=(lib32-glibc libltdl) + replaces=(lib32-libtool) + provides=("lib32-libtool=$pkgver-$pkgrel") + conflicts=(lib32-libtool) + + cd "$srcdir/libtool-32" + make DESTDIR="$pkgdir" install-libLTLIBRARIES +} diff --git a/multilib-testing/libtool-multilib/libtool.install b/multilib-testing/libtool-multilib/libtool.install new file mode 100644 index 000000000..424c8cb88 --- /dev/null +++ b/multilib-testing/libtool-multilib/libtool.install @@ -0,0 +1,22 @@ +infodir=/usr/share/info +filelist=(libtool.info libtool.info-1 libtool.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 +} + +# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch b/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch new file mode 100644 index 000000000..3ad8b418a --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch @@ -0,0 +1,196 @@ +From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Wed, 26 May 2010 18:28:59 +0200 +Subject: [PATCH] Fix scope handling during dl_close + +--- + ChangeLog | 12 ++++++++++++ + elf/Makefile | 10 +++++++++- + elf/dl-close.c | 7 +++++++ + elf/unload8.c | 33 +++++++++++++++++++++++++++++++++ + elf/unload8mod1.c | 7 +++++++ + elf/unload8mod1x.c | 1 + + elf/unload8mod2.c | 7 +++++++ + elf/unload8mod3.c | 27 +++++++++++++++++++++++++++ + 8 files changed, 103 insertions(+), 1 deletions(-) + create mode 100644 elf/unload8.c + create mode 100644 elf/unload8mod1.c + create mode 100644 elf/unload8mod1x.c + create mode 100644 elf/unload8mod2.c + create mode 100644 elf/unload8mod3.c + +diff --git a/elf/Makefile b/elf/Makefile +index 59e835f..65b6deb 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -89,6 +89,7 @@ distribute := rtld-Rules \ + unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ + unload6mod1.c unload6mod2.c unload6mod3.c \ + unload7mod1.c unload7mod2.c \ ++ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \ + tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ + tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ + tst-auditmod4a.c tst-auditmod4b.c \ +@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ + tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ + tst-dlmodcount tst-dlopenrpath tst-deep1 \ + tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ +- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ ++ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ + tst-audit1 tst-audit2 \ + tst-stackguard1 tst-addr1 tst-thrlock \ + tst-unique1 tst-unique2 +@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ + unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ + unload6mod1 unload6mod2 unload6mod3 \ + unload7mod1 unload7mod2 \ ++ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \ + order2mod1 order2mod2 order2mod3 order2mod4 \ + tst-unique1mod1 tst-unique1mod2 \ + tst-unique2mod1 tst-unique2mod2 +@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl) + $(objpfx)unload6mod3.so: $(libdl) + $(objpfx)unload7mod1.so: $(libdl) + $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so ++$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so ++$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so ++$(objpfx)unload8mod3.so: $(libdl) + $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so + $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so + $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so +@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl) + $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so + unload7-ENV = MALLOC_PERTURB_=85 + ++$(objpfx)unload8: $(libdl) ++$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so ++ + ifdef libdl + $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a + $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 700e765..f47d5f8 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) + + imap->l_scope_max = new_size; + } ++ else if (new_list != NULL) ++ { ++ /* We didn't change the scope array, so reset the search ++ list. */ ++ imap->l_searchlist.r_list = NULL; ++ imap->l_searchlist.r_nlist = 0; ++ } + + /* The loader is gone, so mark the object as not having one. + Note: l_idx != IDX_STILL_USED -> object will be removed. */ +diff --git a/elf/unload8.c b/elf/unload8.c +new file mode 100644 +index 0000000..f984a38 +--- /dev/null ++++ b/elf/unload8.c +@@ -0,0 +1,33 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++ ++int ++main (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod1.so failed"); ++ return 1; ++ } ++ ++ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY); ++ if (h2 == NULL) ++ { ++ puts ("dlopen unload8mod1x.so failed"); ++ return 1; ++ } ++ dlclose (h2); ++ ++ int (*mod1) (void) = dlsym (h, "mod1"); ++ if (mod1 == NULL) ++ { ++ puts ("dlsym failed"); ++ return 1; ++ } ++ ++ mod1 (); ++ dlclose (h); ++ ++ return 0; ++} +diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c +new file mode 100644 +index 0000000..fe7e81c +--- /dev/null ++++ b/elf/unload8mod1.c +@@ -0,0 +1,7 @@ ++extern void mod2 (void); ++ ++void ++mod1 (void) ++{ ++ mod2 (); ++} +diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c +new file mode 100644 +index 0000000..835b634 +--- /dev/null ++++ b/elf/unload8mod1x.c +@@ -0,0 +1 @@ ++int mod1x; +diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c +new file mode 100644 +index 0000000..2fd8b67 +--- /dev/null ++++ b/elf/unload8mod2.c +@@ -0,0 +1,7 @@ ++extern void mod3 (void); ++ ++void ++mod2 (void) ++{ ++ mod3 (); ++} +diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c +new file mode 100644 +index 0000000..d49e22b +--- /dev/null ++++ b/elf/unload8mod3.c +@@ -0,0 +1,27 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++void ++mod3_fini2 (void) ++{ ++} ++ ++void ++mod3_fini (void) ++{ ++ mod3_fini2 (); ++} ++ ++void ++mod3 (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod2.so failed"); ++ exit (1); ++ } ++ ++ atexit (mod3_fini); ++} +-- +1.7.3.4 + diff --git a/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch new file mode 100644 index 000000000..ef91116e5 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch @@ -0,0 +1,26 @@ +From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Thu, 1 Sep 2011 10:46:14 +0200 +Subject: [PATCH] Avoid assertion failure when first DNS answer was empty + +--- + ChangeLog | 4 ++++ + resolv/res_query.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/resolv/res_query.c b/resolv/res_query.c +index 2f7cfaa..2ded9fb 100644 +--- a/resolv/res_query.c ++++ b/resolv/res_query.c +@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, + && *resplen2 > (int) sizeof (HEADER)) + { + /* Special case of partial answer. */ +- assert (hp != hp2); ++ assert (n == 0 || hp != hp2); + hp = hp2; + } + else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) +-- +1.7.3.4 + diff --git a/multilib/lib32-nss/distrust-diginotar.patch b/multilib/lib32-nss/distrust-diginotar.patch new file mode 100644 index 000000000..60c63fc68 --- /dev/null +++ b/multilib/lib32-nss/distrust-diginotar.patch @@ -0,0 +1,1675 @@ +Index: security/nss/lib/ckfw/builtins/certdata.c +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.c,v +retrieving revision 1.67.2.10 +retrieving revision 1.67.2.11 +diff -u -r1.67.2.10 -r1.67.2.11 +--- security/nss/lib/ckfw/builtins/certdata.c 1 Aug 2011 06:40:03 -0000 1.67.2.10 ++++ security/nss/lib/ckfw/builtins/certdata.c 30 Aug 2011 20:04:39 -0000 1.67.2.11 +@@ -35,7 +35,7 @@ + * + * ***** END LICENSE BLOCK ***** */ + #ifdef DEBUG +-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $"; ++static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $"; + #endif /* DEBUG */ + + #ifndef BUILTINS_H +@@ -1039,12 +1039,6 @@ + static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = { + CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED + }; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE +-}; +-static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = { +- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED +-}; + #ifdef DEBUG + static const NSSItem nss_builtins_items_0 [] = { + { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +@@ -1053,7 +1047,7 @@ + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"CVS ID", (PRUint32)7 }, + { (void *)"NSS", (PRUint32)4 }, +- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $", (PRUint32)164 } ++ { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $", (PRUint32)165 } + }; + #endif /* DEBUG */ + static const NSSItem nss_builtins_items_1 [] = { +@@ -12506,151 +12500,6 @@ + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"DigiNotar Root CA", (PRUint32)18 }, +- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" +-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" +-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" +-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" +-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" +-"\154" +-, (PRUint32)97 }, +- { (void *)"0", (PRUint32)2 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" +-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" +-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" +-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" +-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" +-"\154" +-, (PRUint32)97 }, +- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" +-"\074\114" +-, (PRUint32)18 }, +- { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014" +-"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060" +-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137" +-"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060" +-"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141" +-"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151" +-"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060" +-"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156" +-"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060" +-"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132" +-"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060" +-"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022" +-"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164" +-"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147" +-"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040" +-"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151" +-"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154" +-"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" +-"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" +-"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126" +-"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201" +-"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300" +-"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177" +-"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330" +-"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213" +-"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337" +-"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045" +-"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123" +-"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007" +-"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043" +-"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042" +-"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041" +-"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324" +-"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313" +-"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110" +-"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114" +-"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376" +-"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344" +-"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357" +-"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346" +-"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314" +-"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351" +-"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154" +-"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262" +-"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042" +-"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077" +-"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102" +-"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323" +-"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176" +-"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147" +-"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216" +-"\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035" +-"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125" +-"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125" +-"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153" +-"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206" +-"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002" +-"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004" +-"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257" +-"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362" +-"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203" +-"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302" +-"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150" +-"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307" +-"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050" +-"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350" +-"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013" +-"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075" +-"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114" +-"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313" +-"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273" +-"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235" +-"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146" +-"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160" +-"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007" +-"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351" +-"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134" +-"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045" +-"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113" +-"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174" +-"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304" +-"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012" +-"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330" +-"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124" +-"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163" +-"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056" +-"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175" +-"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163" +-"\262\345\214\360\206\231\270\345\305\337\204\301\267\353" +-, (PRUint32)1422 } +-}; +-static const NSSItem nss_builtins_items_187 [] = { +- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)"DigiNotar Root CA", (PRUint32)18 }, +- { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317" +-"\201\147\107\214" +-, (PRUint32)20 }, +- { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230" +-, (PRUint32)16 }, +- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" +-"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" +-"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" +-"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" +-"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" +-"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" +-"\154" +-, (PRUint32)97 }, +- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" +-"\074\114" +-, (PRUint32)18 }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } +-}; +-static const NSSItem nss_builtins_items_188 [] = { +- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, +- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)"Network Solutions Certificate Authority", (PRUint32)40 }, + { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, + { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061" +@@ -12738,7 +12587,7 @@ + "\244\140\114\260\125\240\240\173\127\262" + , (PRUint32)1002 } + }; +-static const NSSItem nss_builtins_items_189 [] = { ++static const NSSItem nss_builtins_items_187 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12765,7 +12614,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_190 [] = { ++static const NSSItem nss_builtins_items_188 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12874,7 +12723,7 @@ + "\333" + , (PRUint32)1217 } + }; +-static const NSSItem nss_builtins_items_191 [] = { ++static const NSSItem nss_builtins_items_189 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12902,7 +12751,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_192 [] = { ++static const NSSItem nss_builtins_items_190 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -12976,7 +12825,7 @@ + "\334\335\363\377\035\054\072\026\127\331\222\071\326" + , (PRUint32)653 } + }; +-static const NSSItem nss_builtins_items_193 [] = { ++static const NSSItem nss_builtins_items_191 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13005,7 +12854,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_194 [] = { ++static const NSSItem nss_builtins_items_192 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13097,7 +12946,7 @@ + "\321\236\164\310\166\147" + , (PRUint32)1078 } + }; +-static const NSSItem nss_builtins_items_195 [] = { ++static const NSSItem nss_builtins_items_193 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13122,7 +12971,7 @@ + { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_196 [] = { ++static const NSSItem nss_builtins_items_194 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13219,7 +13068,7 @@ + "\253\205\322\140\126\132" + , (PRUint32)1030 } + }; +-static const NSSItem nss_builtins_items_197 [] = { ++static const NSSItem nss_builtins_items_195 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13247,7 +13096,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_198 [] = { ++static const NSSItem nss_builtins_items_196 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13332,7 +13181,7 @@ + "\164" + , (PRUint32)897 } + }; +-static const NSSItem nss_builtins_items_199 [] = { ++static const NSSItem nss_builtins_items_197 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13358,7 +13207,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_200 [] = { ++static const NSSItem nss_builtins_items_198 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13455,7 +13304,7 @@ + "\374\276\337\012\015" + , (PRUint32)1013 } + }; +-static const NSSItem nss_builtins_items_201 [] = { ++static const NSSItem nss_builtins_items_199 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13484,7 +13333,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_202 [] = { ++static const NSSItem nss_builtins_items_200 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13595,7 +13444,7 @@ + "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224" + , (PRUint32)1151 } + }; +-static const NSSItem nss_builtins_items_203 [] = { ++static const NSSItem nss_builtins_items_201 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13627,7 +13476,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_204 [] = { ++static const NSSItem nss_builtins_items_202 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13781,7 +13630,7 @@ + "\103\307\003\340\067\116\135\012\334\131\040\045" + , (PRUint32)1964 } + }; +-static const NSSItem nss_builtins_items_205 [] = { ++static const NSSItem nss_builtins_items_203 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13809,7 +13658,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_206 [] = { ++static const NSSItem nss_builtins_items_204 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13890,7 +13739,7 @@ + "\300\226\130\057\352\273\106\327\273\344\331\056" + , (PRUint32)940 } + }; +-static const NSSItem nss_builtins_items_207 [] = { ++static const NSSItem nss_builtins_items_205 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -13913,7 +13762,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_208 [] = { ++static const NSSItem nss_builtins_items_206 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14047,7 +13896,7 @@ + "\005\211\374\170\326\134\054\046\103\251" + , (PRUint32)1642 } + }; +-static const NSSItem nss_builtins_items_209 [] = { ++static const NSSItem nss_builtins_items_207 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14075,7 +13924,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_210 [] = { ++static const NSSItem nss_builtins_items_208 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14180,7 +14029,7 @@ + "\334\144\047\027\214\132\267\332\164\050\315\227\344\275" + , (PRUint32)1198 } + }; +-static const NSSItem nss_builtins_items_211 [] = { ++static const NSSItem nss_builtins_items_209 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14207,7 +14056,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_212 [] = { ++static const NSSItem nss_builtins_items_210 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14312,7 +14161,7 @@ + "\016\121\075\157\373\226\126\200\342\066\027\321\334\344" + , (PRUint32)1198 } + }; +-static const NSSItem nss_builtins_items_213 [] = { ++static const NSSItem nss_builtins_items_211 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14339,7 +14188,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_214 [] = { ++static const NSSItem nss_builtins_items_212 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14432,7 +14281,7 @@ + "\230" + , (PRUint32)993 } + }; +-static const NSSItem nss_builtins_items_215 [] = { ++static const NSSItem nss_builtins_items_213 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14459,7 +14308,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_216 [] = { ++static const NSSItem nss_builtins_items_214 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14548,7 +14397,7 @@ + "\126\144\127" + , (PRUint32)931 } + }; +-static const NSSItem nss_builtins_items_217 [] = { ++static const NSSItem nss_builtins_items_215 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14575,7 +14424,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_218 [] = { ++static const NSSItem nss_builtins_items_216 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14656,7 +14505,7 @@ + "\000\147\240\161\000\202\110" + , (PRUint32)919 } + }; +-static const NSSItem nss_builtins_items_219 [] = { ++static const NSSItem nss_builtins_items_217 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14680,7 +14529,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_220 [] = { ++static const NSSItem nss_builtins_items_218 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14762,7 +14611,7 @@ + "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217" + , (PRUint32)943 } + }; +-static const NSSItem nss_builtins_items_221 [] = { ++static const NSSItem nss_builtins_items_219 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14786,7 +14635,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_222 [] = { ++static const NSSItem nss_builtins_items_220 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14867,7 +14716,7 @@ + "\246\210\070\316\125" + , (PRUint32)933 } + }; +-static const NSSItem nss_builtins_items_223 [] = { ++static const NSSItem nss_builtins_items_221 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -14890,7 +14739,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_224 [] = { ++static const NSSItem nss_builtins_items_222 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15009,7 +14858,7 @@ + "\201\370\021\234" + , (PRUint32)1460 } + }; +-static const NSSItem nss_builtins_items_225 [] = { ++static const NSSItem nss_builtins_items_223 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15035,7 +14884,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_226 [] = { ++static const NSSItem nss_builtins_items_224 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15169,7 +15018,7 @@ + "\311\234\220\332\354\251\102\074\255\266\002" + , (PRUint32)1307 } + }; +-static const NSSItem nss_builtins_items_227 [] = { ++static const NSSItem nss_builtins_items_225 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15207,7 +15056,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_228 [] = { ++static const NSSItem nss_builtins_items_226 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15285,7 +15134,7 @@ + "\366\324\357\277\114\210\150" + , (PRUint32)855 } + }; +-static const NSSItem nss_builtins_items_229 [] = { ++static const NSSItem nss_builtins_items_227 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15309,7 +15158,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_230 [] = { ++static const NSSItem nss_builtins_items_228 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15387,7 +15236,7 @@ + "\246\347\313\100\003\335\171" + , (PRUint32)855 } + }; +-static const NSSItem nss_builtins_items_231 [] = { ++static const NSSItem nss_builtins_items_229 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15411,7 +15260,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_232 [] = { ++static const NSSItem nss_builtins_items_230 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15538,7 +15387,7 @@ + "\320\352\111\242\034\215\122\024\246\012\223" + , (PRUint32)1515 } + }; +-static const NSSItem nss_builtins_items_233 [] = { ++static const NSSItem nss_builtins_items_231 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15566,7 +15415,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_234 [] = { ++static const NSSItem nss_builtins_items_232 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15640,7 +15489,7 @@ + "\366\356\260\132\116\111\104\124\130\137\102\203" + , (PRUint32)828 } + }; +-static const NSSItem nss_builtins_items_235 [] = { ++static const NSSItem nss_builtins_items_233 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15663,7 +15512,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_236 [] = { ++static const NSSItem nss_builtins_items_234 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15739,7 +15588,7 @@ + "\011\333\212\101\202\236\146\233\021" + , (PRUint32)857 } + }; +-static const NSSItem nss_builtins_items_237 [] = { ++static const NSSItem nss_builtins_items_235 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15762,7 +15611,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_238 [] = { ++static const NSSItem nss_builtins_items_236 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15845,7 +15694,7 @@ + "\262\033\211\124" + , (PRUint32)932 } + }; +-static const NSSItem nss_builtins_items_239 [] = { ++static const NSSItem nss_builtins_items_237 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15869,7 +15718,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_240 [] = { ++static const NSSItem nss_builtins_items_238 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15969,7 +15818,7 @@ + "\021\055" + , (PRUint32)1026 } + }; +-static const NSSItem nss_builtins_items_241 [] = { ++static const NSSItem nss_builtins_items_239 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -15999,7 +15848,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_242 [] = { ++static const NSSItem nss_builtins_items_240 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16073,7 +15922,7 @@ + "\367\130\077\056\162\002\127\243\217\241\024\056" + , (PRUint32)652 } + }; +-static const NSSItem nss_builtins_items_243 [] = { ++static const NSSItem nss_builtins_items_241 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16102,7 +15951,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_244 [] = { ++static const NSSItem nss_builtins_items_242 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16208,7 +16057,7 @@ + "\061\324\100\032\142\064\066\077\065\001\256\254\143\240" + , (PRUint32)1070 } + }; +-static const NSSItem nss_builtins_items_245 [] = { ++static const NSSItem nss_builtins_items_243 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16240,7 +16089,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_246 [] = { ++static const NSSItem nss_builtins_items_244 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16319,7 +16168,7 @@ + "\017\212" + , (PRUint32)690 } + }; +-static const NSSItem nss_builtins_items_247 [] = { ++static const NSSItem nss_builtins_items_245 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16349,7 +16198,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_248 [] = { ++static const NSSItem nss_builtins_items_246 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16464,7 +16313,7 @@ + "\354\315\202\141\361\070\346\117\227\230\052\132\215" + , (PRUint32)1213 } + }; +-static const NSSItem nss_builtins_items_249 [] = { ++static const NSSItem nss_builtins_items_247 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16496,7 +16345,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_250 [] = { ++static const NSSItem nss_builtins_items_248 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16594,7 +16443,7 @@ + "\055\247\330\206\052\335\056\020" + , (PRUint32)904 } + }; +-static const NSSItem nss_builtins_items_251 [] = { ++static const NSSItem nss_builtins_items_249 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16627,7 +16476,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_252 [] = { ++static const NSSItem nss_builtins_items_250 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16729,7 +16578,7 @@ + "\330\316\304\143\165\077\131\107\261" + , (PRUint32)1049 } + }; +-static const NSSItem nss_builtins_items_253 [] = { ++static const NSSItem nss_builtins_items_251 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16759,7 +16608,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_254 [] = { ++static const NSSItem nss_builtins_items_252 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16878,7 +16727,7 @@ + "\370\161\012\334\271\374\175\062\140\346\353\257\212\001" + , (PRUint32)1486 } + }; +-static const NSSItem nss_builtins_items_255 [] = { ++static const NSSItem nss_builtins_items_253 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16903,7 +16752,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_256 [] = { ++static const NSSItem nss_builtins_items_254 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -16993,7 +16842,7 @@ + "\315\345\250" + , (PRUint32)1043 } + }; +-static const NSSItem nss_builtins_items_257 [] = { ++static const NSSItem nss_builtins_items_255 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17017,7 +16866,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_258 [] = { ++static const NSSItem nss_builtins_items_256 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17122,7 +16971,7 @@ + "\115\273\306\104\333\066\313\052\234\216" + , (PRUint32)1258 } + }; +-static const NSSItem nss_builtins_items_259 [] = { ++static const NSSItem nss_builtins_items_257 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17147,7 +16996,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_260 [] = { ++static const NSSItem nss_builtins_items_258 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17223,7 +17072,7 @@ + "\002\153\331\132" + , (PRUint32)820 } + }; +-static const NSSItem nss_builtins_items_261 [] = { ++static const NSSItem nss_builtins_items_259 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17247,7 +17096,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_262 [] = { ++static const NSSItem nss_builtins_items_260 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17329,7 +17178,7 @@ + "\362" + , (PRUint32)881 } + }; +-static const NSSItem nss_builtins_items_263 [] = { ++static const NSSItem nss_builtins_items_261 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17354,7 +17203,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_264 [] = { ++static const NSSItem nss_builtins_items_262 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17470,7 +17319,7 @@ + "\113\076\053\070\007\125\230\136\244" + , (PRUint32)1465 } + }; +-static const NSSItem nss_builtins_items_265 [] = { ++static const NSSItem nss_builtins_items_263 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17494,7 +17343,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_266 [] = { ++static const NSSItem nss_builtins_items_264 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17559,7 +17408,7 @@ + "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133" + , (PRUint32)576 } + }; +-static const NSSItem nss_builtins_items_267 [] = { ++static const NSSItem nss_builtins_items_265 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17586,7 +17435,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_268 [] = { ++static const NSSItem nss_builtins_items_266 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17651,7 +17500,7 @@ + "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220" + , (PRUint32)576 } + }; +-static const NSSItem nss_builtins_items_269 [] = { ++static const NSSItem nss_builtins_items_267 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17678,7 +17527,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_270 [] = { ++static const NSSItem nss_builtins_items_268 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17775,7 +17624,7 @@ + "\202\042\055\172\124\253\160\303\175\042\145\202\160\226" + , (PRUint32)1038 } + }; +-static const NSSItem nss_builtins_items_271 [] = { ++static const NSSItem nss_builtins_items_269 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17803,7 +17652,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_272 [] = { ++static const NSSItem nss_builtins_items_270 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17894,7 +17743,7 @@ + "\336\102\343\055\202\361\017\345\372\227" + , (PRUint32)954 } + }; +-static const NSSItem nss_builtins_items_273 [] = { ++static const NSSItem nss_builtins_items_271 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -17922,7 +17771,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_274 [] = { ++static const NSSItem nss_builtins_items_272 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18001,7 +17850,7 @@ + "\130\077\137" + , (PRUint32)867 } + }; +-static const NSSItem nss_builtins_items_275 [] = { ++static const NSSItem nss_builtins_items_273 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18025,7 +17874,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_276 [] = { ++static const NSSItem nss_builtins_items_274 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18118,7 +17967,7 @@ + "\045\361\224\264\146" + , (PRUint32)997 } + }; +-static const NSSItem nss_builtins_items_277 [] = { ++static const NSSItem nss_builtins_items_275 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18145,7 +17994,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_278 [] = { ++static const NSSItem nss_builtins_items_276 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18269,7 +18118,7 @@ + "\156\117\022\176\012\074\235\225" + , (PRUint32)1560 } + }; +-static const NSSItem nss_builtins_items_279 [] = { ++static const NSSItem nss_builtins_items_277 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18294,7 +18143,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_280 [] = { ++static const NSSItem nss_builtins_items_278 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18413,7 +18262,7 @@ + "\333\374\046\210\307" + , (PRUint32)1525 } + }; +-static const NSSItem nss_builtins_items_281 [] = { ++static const NSSItem nss_builtins_items_279 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18437,7 +18286,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_282 [] = { ++static const NSSItem nss_builtins_items_280 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18593,7 +18442,7 @@ + "\167\110\320" + , (PRUint32)1875 } + }; +-static const NSSItem nss_builtins_items_283 [] = { ++static const NSSItem nss_builtins_items_281 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18624,7 +18473,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_284 [] = { ++static const NSSItem nss_builtins_items_282 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18777,7 +18626,7 @@ + "\351\233\256\325\124\300\164\200\321\013\102\237\301" + , (PRUint32)1869 } + }; +-static const NSSItem nss_builtins_items_285 [] = { ++static const NSSItem nss_builtins_items_283 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18807,7 +18656,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_286 [] = { ++static const NSSItem nss_builtins_items_284 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18943,7 +18792,7 @@ + "\242\355\264\324\265\145\103\267\223\106\212\323" + , (PRUint32)1532 } + }; +-static const NSSItem nss_builtins_items_287 [] = { ++static const NSSItem nss_builtins_items_285 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -18973,7 +18822,7 @@ + { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_288 [] = { ++static const NSSItem nss_builtins_items_286 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19124,7 +18973,7 @@ + "\264" + , (PRUint32)1761 } + }; +-static const NSSItem nss_builtins_items_289 [] = { ++static const NSSItem nss_builtins_items_287 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19154,7 +19003,7 @@ + { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_290 [] = { ++static const NSSItem nss_builtins_items_288 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19290,7 +19139,7 @@ + "\111\043" + , (PRUint32)1522 } + }; +-static const NSSItem nss_builtins_items_291 [] = { ++static const NSSItem nss_builtins_items_289 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19320,7 +19169,7 @@ + { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_292 [] = { ++static const NSSItem nss_builtins_items_290 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19455,7 +19304,7 @@ + "\172\244\047\023\326\117\364\151" + , (PRUint32)1512 } + }; +-static const NSSItem nss_builtins_items_293 [] = { ++static const NSSItem nss_builtins_items_291 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19485,7 +19334,7 @@ + { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_294 [] = { ++static const NSSItem nss_builtins_items_292 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19621,7 +19470,7 @@ + "\302\021\254" + , (PRUint32)1523 } + }; +-static const NSSItem nss_builtins_items_295 [] = { ++static const NSSItem nss_builtins_items_293 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19651,7 +19500,7 @@ + { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_296 [] = { ++static const NSSItem nss_builtins_items_294 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19787,7 +19636,7 @@ + "\147\024\060" + , (PRUint32)1523 } + }; +-static const NSSItem nss_builtins_items_297 [] = { ++static const NSSItem nss_builtins_items_295 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19817,7 +19666,7 @@ + { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_298 [] = { ++static const NSSItem nss_builtins_items_296 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19951,7 +19800,7 @@ + "\217\116\235\306\066\347\134\246\253\022\017\326\317" + , (PRUint32)1501 } + }; +-static const NSSItem nss_builtins_items_299 [] = { ++static const NSSItem nss_builtins_items_297 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -19981,7 +19830,7 @@ + { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_300 [] = { ++static const NSSItem nss_builtins_items_298 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20115,7 +19964,7 @@ + "\130\113\161\203\237\146\346\254\171\110\376\376\107" + , (PRUint32)1501 } + }; +-static const NSSItem nss_builtins_items_301 [] = { ++static const NSSItem nss_builtins_items_299 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20145,7 +19994,7 @@ + { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_302 [] = { ++static const NSSItem nss_builtins_items_300 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20280,7 +20129,7 @@ + "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352" + , (PRUint32)1520 } + }; +-static const NSSItem nss_builtins_items_303 [] = { ++static const NSSItem nss_builtins_items_301 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20310,7 +20159,7 @@ + { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_304 [] = { ++static const NSSItem nss_builtins_items_302 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20438,7 +20287,7 @@ + "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221" + , (PRUint32)1392 } + }; +-static const NSSItem nss_builtins_items_305 [] = { ++static const NSSItem nss_builtins_items_303 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20468,7 +20317,7 @@ + { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_306 [] = { ++static const NSSItem nss_builtins_items_304 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20561,7 +20410,7 @@ + "\342\342\104\276\134\367\352\034\365" + , (PRUint32)969 } + }; +-static const NSSItem nss_builtins_items_307 [] = { ++static const NSSItem nss_builtins_items_305 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20589,7 +20438,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_308 [] = { ++static const NSSItem nss_builtins_items_306 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20686,7 +20535,7 @@ + "\364" + , (PRUint32)993 } + }; +-static const NSSItem nss_builtins_items_309 [] = { ++static const NSSItem nss_builtins_items_307 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20715,7 +20564,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_310 [] = { ++static const NSSItem nss_builtins_items_308 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20813,7 +20662,7 @@ + "\261\050\272" + , (PRUint32)1011 } + }; +-static const NSSItem nss_builtins_items_311 [] = { ++static const NSSItem nss_builtins_items_309 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20842,7 +20691,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_312 [] = { ++static const NSSItem nss_builtins_items_310 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20919,7 +20768,7 @@ + "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357" + , (PRUint32)848 } + }; +-static const NSSItem nss_builtins_items_313 [] = { ++static const NSSItem nss_builtins_items_311 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -20943,7 +20792,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_314 [] = { ++static const NSSItem nss_builtins_items_312 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21020,7 +20869,7 @@ + "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333" + , (PRUint32)848 } + }; +-static const NSSItem nss_builtins_items_315 [] = { ++static const NSSItem nss_builtins_items_313 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21044,7 +20893,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_316 [] = { ++static const NSSItem nss_builtins_items_314 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21153,7 +21002,7 @@ + "\051\340\266\270\011\150\031\034\030\103" + , (PRUint32)1354 } + }; +-static const NSSItem nss_builtins_items_317 [] = { ++static const NSSItem nss_builtins_items_315 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21177,7 +21026,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_318 [] = { ++static const NSSItem nss_builtins_items_316 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21234,7 +21083,7 @@ + "\214\171" + , (PRUint32)514 } + }; +-static const NSSItem nss_builtins_items_319 [] = { ++static const NSSItem nss_builtins_items_317 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21258,7 +21107,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_320 [] = { ++static const NSSItem nss_builtins_items_318 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21348,7 +21197,7 @@ + "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054" + , (PRUint32)959 } + }; +-static const NSSItem nss_builtins_items_321 [] = { ++static const NSSItem nss_builtins_items_319 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21375,7 +21224,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_322 [] = { ++static const NSSItem nss_builtins_items_320 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21493,7 +21342,7 @@ + "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171" + , (PRUint32)1440 } + }; +-static const NSSItem nss_builtins_items_323 [] = { ++static const NSSItem nss_builtins_items_321 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21519,7 +21368,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_324 [] = { ++static const NSSItem nss_builtins_items_322 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21652,7 +21501,7 @@ + "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303" + , (PRUint32)1679 } + }; +-static const NSSItem nss_builtins_items_325 [] = { ++static const NSSItem nss_builtins_items_323 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21678,7 +21527,7 @@ + { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_326 [] = { ++static const NSSItem nss_builtins_items_324 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21772,7 +21621,7 @@ + "\204\232\315" + , (PRUint32)979 } + }; +-static const NSSItem nss_builtins_items_327 [] = { ++static const NSSItem nss_builtins_items_325 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21800,7 +21649,7 @@ + { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } + }; +-static const NSSItem nss_builtins_items_328 [] = { ++static const NSSItem nss_builtins_items_326 [] = { + { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -21884,7 +21733,7 @@ + "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257" + , (PRUint32)895 } + }; +-static const NSSItem nss_builtins_items_329 [] = { ++static const NSSItem nss_builtins_items_327 [] = { + { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, + { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, + { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, +@@ -22242,13 +22091,11 @@ + { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} }, + { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }, + { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} }, +- { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }, +- { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} }, +- { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} } ++ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} } + }; + const PRUint32 + #ifdef DEBUG +- nss_builtins_nObjects = 329+1; ++ nss_builtins_nObjects = 327+1; + #else +- nss_builtins_nObjects = 329; ++ nss_builtins_nObjects = 327; + #endif /* DEBUG */ +Index: security/nss/lib/ckfw/builtins/certdata.txt +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.txt,v +retrieving revision 1.64.2.10 +retrieving revision 1.64.2.11 +diff -u -r1.64.2.10 -r1.64.2.11 +--- security/nss/lib/ckfw/builtins/certdata.txt 1 Aug 2011 06:40:04 -0000 1.64.2.10 ++++ security/nss/lib/ckfw/builtins/certdata.txt 30 Aug 2011 20:04:39 -0000 1.64.2.11 +@@ -34,7 +34,7 @@ + # the terms of any one of the MPL, the GPL or the LGPL. + # + # ***** END LICENSE BLOCK ***** +-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $" ++CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.11 $ $Date: 2011/08/30 20:04:39 $" + + # + # certdata.txt +@@ -12461,161 +12461,6 @@ + CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + # +-# Certificate "DigiNotar Root CA" +-# +-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "DigiNotar Root CA" +-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +-CKA_SUBJECT MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 +-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 +-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 +-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 +-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 +-\154 +-END +-CKA_ID UTF8 "0" +-CKA_ISSUER MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 +-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 +-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 +-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 +-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 +-\154 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 +-\074\114 +-END +-CKA_VALUE MULTILINE_OCTAL +-\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014 +-\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060 +-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137 +-\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060 +-\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141 +-\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151 +-\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060 +-\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156 +-\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060 +-\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132 +-\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060 +-\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022 +-\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164 +-\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147 +-\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040 +-\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151 +-\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154 +-\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 +-\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 +-\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126 +-\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201 +-\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300 +-\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177 +-\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330 +-\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213 +-\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337 +-\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045 +-\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123 +-\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007 +-\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043 +-\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042 +-\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041 +-\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324 +-\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313 +-\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110 +-\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114 +-\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376 +-\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344 +-\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357 +-\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346 +-\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314 +-\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351 +-\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154 +-\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262 +-\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042 +-\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077 +-\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102 +-\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323 +-\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176 +-\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147 +-\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216 +-\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035 +-\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125 +-\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125 +-\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153 +-\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206 +-\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002 +-\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004 +-\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257 +-\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362 +-\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203 +-\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302 +-\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150 +-\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307 +-\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050 +-\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350 +-\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013 +-\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075 +-\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114 +-\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313 +-\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273 +-\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235 +-\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146 +-\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160 +-\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007 +-\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351 +-\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134 +-\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045 +-\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113 +-\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174 +-\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304 +-\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012 +-\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330 +-\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124 +-\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163 +-\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056 +-\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175 +-\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163 +-\262\345\214\360\206\231\270\345\305\337\204\301\267\353 +-END +- +-# Trust for Certificate "DigiNotar Root CA" +-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +-CKA_TOKEN CK_BBOOL CK_TRUE +-CKA_PRIVATE CK_BBOOL CK_FALSE +-CKA_MODIFIABLE CK_BBOOL CK_FALSE +-CKA_LABEL UTF8 "DigiNotar Root CA" +-CKA_CERT_SHA1_HASH MULTILINE_OCTAL +-\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317 +-\201\147\107\214 +-END +-CKA_CERT_MD5_HASH MULTILINE_OCTAL +-\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230 +-END +-CKA_ISSUER MULTILINE_OCTAL +-\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 +-\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 +-\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 +-\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 +-\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 +-\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 +-\154 +-END +-CKA_SERIAL_NUMBER MULTILINE_OCTAL +-\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 +-\074\114 +-END +-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +- +-# + # Certificate "Network Solutions Certificate Authority" + # + CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +Index: security/nss/lib/ckfw/builtins/nssckbi.h +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h,v +retrieving revision 1.24.2.5 +retrieving revision 1.24.2.6 +diff -u -r1.24.2.5 -r1.24.2.6 +--- security/nss/lib/ckfw/builtins/nssckbi.h 1 Aug 2011 06:40:04 -0000 1.24.2.5 ++++ security/nss/lib/ckfw/builtins/nssckbi.h 30 Aug 2011 20:04:40 -0000 1.24.2.6 +@@ -77,8 +77,8 @@ + * of the comment in the CK_VERSION type definition. + */ + #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1 +-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84 +-#define NSS_BUILTINS_LIBRARY_VERSION "1.84" ++#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 85 ++#define NSS_BUILTINS_LIBRARY_VERSION "1.85" + + /* These version numbers detail the semantic changes to the ckfw engine. */ + #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1 diff --git a/staging/blender/PKGBUILD b/staging/blender/PKGBUILD new file mode 100644 index 000000000..a2333aed7 --- /dev/null +++ b/staging/blender/PKGBUILD @@ -0,0 +1,92 @@ +# $Id: PKGBUILD 138115 2011-09-17 00:41:35Z allan $ +# Contributor: John Sowiak <john@archlinux.org> +# Maintainer: tobias <tobias@archlinux.org> + +# Apparently, the blender guys refuse to release source tarballs for +# intermediate releases that deal mainly with binaries but incorporate tiny +# minor changes from svn. Since I'm sick and tired of the urges of users that +# look for release numbers only, we make a messy PKGBUILD that can checkout svn +# release if necessary. + +#_svn=true +_svn=false + +pkgname=blender +pkgver=2.59 +pkgrel=3 +epoch=2 +pkgdesc="A fully integrated 3D graphics creation suite" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.blender.org" +depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ + 'freetype2' 'openal' 'libsamplerate' 'ffmpeg') +makedepends=('cmake') # 'subversion' +install=blender.install +if [ $_svn = false ]; then + source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) + md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe') +else + source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) + md5sums=('7579d1139d0d6025df8afcfca64a65c4') +fi + +# source PKGBUILD && mksource +mksource() { + _svnver=38016 + _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" + _svnmod="$pkgname-$pkgver" + mkdir ${pkgname}-$pkgver + pushd ${pkgname}-$pkgver + svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* + popd +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + mkdir build + cd build + + [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" + + cmake .. \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DWITH_INSTALL_PORTABLE:BOOL=OFF \ + -DWITH_PYTHON_INSTALL:BOOL=OFF \ + -DWITH_OPENCOLLADA:BOOL=OFF \ + -DWITH_GAMEENGINE:BOOL=ON \ + -DWITH_PLAYER:BOOL=ON \ + -DWITH_BUILTIN_GLEW:BOOL=OFF \ + -DWITH_CODEC_FFMPEG:BOOL=ON \ + -DWITH_CODEC_SNDFILE:BOOL=ON \ + -DPYTHON_VERSION:STRING=3.2 \ + -DPYTHON_LIBPATH:STRING=/usr/lib \ + -DPYTHON_LIBRARY:STRING=python3.2mu \ + -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ + $ENABLESSE2 + + make $MAKEFLAGS + + cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ + "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ + cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi + chmod 755 bmake + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="${pkgdir}" install + python -m compileall "${pkgdir}/usr/share/blender" + +# install plugins + install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ +} diff --git a/staging/blender/blender.install b/staging/blender/blender.install new file mode 100644 index 000000000..f4d7cc443 --- /dev/null +++ b/staging/blender/blender.install @@ -0,0 +1,17 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_remove() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/staging/bzflag/PKGBUILD b/staging/bzflag/PKGBUILD new file mode 100644 index 000000000..edaaefe5f --- /dev/null +++ b/staging/bzflag/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 138113 2011-09-17 00:06:00Z bisson $ +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# Contributor: Kevin Piche <kevin@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=bzflag +pkgver=2.4.0 +pkgrel=2 +pkgdesc='Multiplayer 3D tank battle game' +url='http://bzflag.org/' +license=('LGPL') +options=('!libtool') +arch=('i686' 'x86_64') +depends=('curl' 'glew' 'mesa' 'sdl') +source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") +sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make + + cd misc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop + install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png +} diff --git a/staging/dvdauthor/PKGBUILD b/staging/dvdauthor/PKGBUILD new file mode 100644 index 000000000..5f06234be --- /dev/null +++ b/staging/dvdauthor/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 137846 2011-09-12 03:23:19Z allan $ +# 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/staging/enblend-enfuse/PKGBUILD b/staging/enblend-enfuse/PKGBUILD new file mode 100644 index 000000000..b85d11e59 --- /dev/null +++ b/staging/enblend-enfuse/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 138117 2011-09-17 00:53:33Z allan $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=enblend-enfuse +pkgver=4.0 +pkgrel=3 +pkgdesc="intelligent blend tool for overlapping picture" +arch=("i686" "x86_64") +license=('GPL') +url="http://enblend.sourceforge.net" +depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'libgl' 'lcms' 'texinfo' 'libpng') +makedepends=('boost' 'pkgconfig') +replaces=('enblend') +conflicts=('enblend') +provides=('enblend') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz libpng-1.4.patch) +md5sums=('2e7c950061e0085fd75d94576130250f' 'a39df8dd32ccfa020dea2ea388642575') +sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' 'eae6cf48ea082865130302d0b4d1ca0b884a563b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + patch -Np1 -i ../libpng-1.4.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + make DESTDIR="${pkgdir}" install + install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info" + install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info" +} diff --git a/staging/enblend-enfuse/enblend-enfuse.install b/staging/enblend-enfuse/enblend-enfuse.install new file mode 100644 index 000000000..0ba358878 --- /dev/null +++ b/staging/enblend-enfuse/enblend-enfuse.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(enblend.info enfuse-focus-stacking.info enfuse.info) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/enblend-enfuse/libpng-1.4.patch b/staging/enblend-enfuse/libpng-1.4.patch new file mode 100644 index 000000000..3bf852b58 --- /dev/null +++ b/staging/enblend-enfuse/libpng-1.4.patch @@ -0,0 +1,14 @@ +diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx +--- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx 2010-01-19 22:09:36.000000000 -0500 ++++ enblend-enfuse-3.2/src/vigra_impex/png.cxx 2010-01-19 22:13:43.000000000 -0500 +@@ -275,8 +275,8 @@ + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { + if (setjmp(png->jmpbuf)) +- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); +- png_set_gray_1_2_4_to_8(png); ++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); ++ png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; + } + diff --git a/staging/glew/PKGBUILD b/staging/glew/PKGBUILD new file mode 100644 index 000000000..86797b8a0 --- /dev/null +++ b/staging/glew/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 138111 2011-09-16 23:20:21Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: SleepyDog + +pkgname=glew +pkgver=1.7.0 +pkgrel=1 +pkgdesc="The OpenGL Extension Wrangler Library" +arch=('i686' 'x86_64') +url="http://glew.sourceforge.net" +license=('BSD' 'MIT' 'GPL') +depends=('libxmu' 'libxi' 'mesa') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) +sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|lib64|lib|' config/Makefile.linux + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GLEW_DEST="${pkgdir}/usr" install.all + install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a + chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} +} diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD new file mode 100644 index 000000000..fbb942cf2 --- /dev/null +++ b/staging/hugin/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 138119 2011-09-17 01:22:30Z allan $ +# Maintainer: Tobias Kieslich <tobias@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=hugin +pkgver=2011.0.0 +pkgrel=3 +pkgdesc="A frontend to the panorama-tools" +arch=('i686' 'x86_64') +url="http://hugin.sourceforge.net/" +license=('LGPL') +depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' + 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') +makedepends=('zip' 'cmake' 'boost') +install=hugin.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('ac8a129b4c3021233df6d9368c8164cf') +sha1sums=('22e1ad3846291a9bbe58570683e213921a6f0116') + +build() { + cd "${srcdir}" + mkdir build && cd build + cmake "${srcdir}/${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ + -DENABLE_LAPACK=yes + make +} + +package(){ + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install new file mode 100644 index 000000000..362749233 --- /dev/null +++ b/staging/hugin/hugin.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD new file mode 100644 index 000000000..284b8eed7 --- /dev/null +++ b/staging/imagemagick/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 137838 2011-09-12 00:54:46Z 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/staging/imagemagick/perlmagick.rpath.patch b/staging/imagemagick/perlmagick.rpath.patch new file mode 100644 index 000000000..958c0f2ee --- /dev/null +++ b/staging/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/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD new file mode 100644 index 000000000..fc0a05d64 --- /dev/null +++ b/staging/inkscape/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 137854 2011-09-12 03:46:01Z bisson $ +# 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/staging/inkscape/install b/staging/inkscape/install new file mode 100644 index 000000000..6e803bf1d --- /dev/null +++ b/staging/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/staging/obex-data-server/PKGBUILD b/staging/obex-data-server/PKGBUILD new file mode 100644 index 000000000..25b4c9bf3 --- /dev/null +++ b/staging/obex-data-server/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 137852 2011-09-12 03:35:14Z allan $ +# 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/staging/psiconv/PKGBUILD b/staging/psiconv/PKGBUILD new file mode 100644 index 000000000..474feade1 --- /dev/null +++ b/staging/psiconv/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 137848 2011-09-12 03:27:09Z allan $ +# 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/staging/pstoedit/PKGBUILD b/staging/pstoedit/PKGBUILD new file mode 100644 index 000000000..1f61e7e80 --- /dev/null +++ b/staging/pstoedit/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 137850 2011-09-12 03:31:42Z allan $ +# 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/staging/pstoedit/pstoedit-3.50-parallel.patch b/staging/pstoedit/pstoedit-3.50-parallel.patch new file mode 100644 index 000000000..4f1f73b04 --- /dev/null +++ b/staging/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/staging/pstoedit/pstoedit-3.50-plugin-close.patch b/staging/pstoedit/pstoedit-3.50-plugin-close.patch new file mode 100644 index 000000000..6787d6aef --- /dev/null +++ b/staging/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/staging/transcode/PKGBUILD b/staging/transcode/PKGBUILD new file mode 100644 index 000000000..ab57f20d8 --- /dev/null +++ b/staging/transcode/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 137842 2011-09-12 02:25:43Z 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/staging/transcode/transcode-1.1.5-jpeg-7.patch b/staging/transcode/transcode-1.1.5-jpeg-7.patch new file mode 100644 index 000000000..288932a61 --- /dev/null +++ b/staging/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/staging/transcode/transcode-1.1.5-mpa.patch b/staging/transcode/transcode-1.1.5-mpa.patch new file mode 100644 index 000000000..e7fb0fc1c --- /dev/null +++ b/staging/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/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD new file mode 100644 index 000000000..b2bb443c8 --- /dev/null +++ b/staging/xine-lib/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 137840 2011-09-12 01:59:41Z 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/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/staging/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch new file mode 100644 index 000000000..4b6ba9e35 --- /dev/null +++ b/staging/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/staging/xine-lib/xine-lib-1.1.19-xvmc.patch b/staging/xine-lib/xine-lib-1.1.19-xvmc.patch new file mode 100644 index 000000000..bef8b0bac --- /dev/null +++ b/staging/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/bitlbee/PKGBUILD b/testing/bitlbee/PKGBUILD new file mode 100644 index 000000000..b42fb6f80 --- /dev/null +++ b/testing/bitlbee/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 138148 2011-09-17 19:45:43Z bisson $ +# Contributor: FUBAR <mrfubar@gmail.com> +# Contributor: simo <simo@archlinux.org> +# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=bitlbee +pkgver=3.0.3 +pkgrel=4 +pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' +arch=('i686' 'x86_64') +url='http://www.bitlbee.org/' +license=('GPL') +depends=('openssl' 'glib2' 'libotr') +optdepends=('xinetd: to run bitlbee through xinetd') +source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" + 'xinetd' + 'rc.d') +sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff' + '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' + 'be09d29af3853825778331df451f16ca9e452d03') + +backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' 'etc/xinetd.d/bitlbee') +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --etcdir=/etc/bitlbee \ + --pidfile=/var/run/bitlbee/bitlbee.pid \ + --ipcsocket=/var/run/bitlbee/bitlbee.sock \ + --systemdsystemunitdir=/lib/systemd/system \ + --ssl=openssl \ + --strip=0 \ + --otr=1 \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -o65 -g65 -dm770 "${pkgdir}"/var/lib/bitlbee + install -Dm644 "${srcdir}"/xinetd "${pkgdir}"/etc/xinetd.d/bitlbee + install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/bitlbee + + make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install-etc + make DESTDIR="${pkgdir}" install-dev +} diff --git a/testing/bitlbee/install b/testing/bitlbee/install new file mode 100644 index 000000000..0e1caa93f --- /dev/null +++ b/testing/bitlbee/install @@ -0,0 +1,14 @@ +post_install() { + echo '==> Bitlbee can run through xinetd or as a daemon for now.' + getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null + getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null + getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null +} diff --git a/testing/bitlbee/rc.d b/testing/bitlbee/rc.d new file mode 100644 index 000000000..bd9248173 --- /dev/null +++ b/testing/bitlbee/rc.d @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=bitlbee +PID=$(pidof -o %PPID /usr/sbin/bitlbee) +install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee + +case "$1" in +start) + stat_busy "Starting $name daemon" + [[ -z "$PID" ]] && { + rm -f /var/run/bitlbee/bitlbee.pid + su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee + } && { + add_daemon $name + stat_done + } || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && { + kill $PID &>/dev/null + } && { + rm -f /var/run/bitlbee/bitlbee.pid + rm_daemon $name + stat_done + } || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 3 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart}" + exit 1 + ;; +esac diff --git a/testing/bitlbee/xinetd b/testing/bitlbee/xinetd new file mode 100644 index 000000000..d671a8cfc --- /dev/null +++ b/testing/bitlbee/xinetd @@ -0,0 +1,12 @@ +service bitlbee +{ + type = UNLISTED + socket_type = stream + protocol = tcp + wait = no + user = bitlbee + group = bitlbee + server = /usr/sbin/bitlbee + port = 6667 + disable = yes +} diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD new file mode 100644 index 000000000..ae34b1595 --- /dev/null +++ b/testing/blender/PKGBUILD @@ -0,0 +1,92 @@ +# $Id: PKGBUILD 138152 2011-09-17 21:02:40Z stephane $ +# Contributor: John Sowiak <john@archlinux.org> +# Maintainer: tobias <tobias@archlinux.org> + +# Apparently, the blender guys refuse to release source tarballs for +# intermediate releases that deal mainly with binaries but incorporate tiny +# minor changes from svn. Since I'm sick and tired of the urges of users that +# look for release numbers only, we make a messy PKGBUILD that can checkout svn +# release if necessary. + +#_svn=true +_svn=false + +pkgname=blender +pkgver=2.59 +pkgrel=3 +epoch=2 +pkgdesc="A fully integrated 3D graphics creation suite" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.blender.org" +depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ + 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ + 'freetype2' 'openal' 'libsamplerate' 'ffmpeg') +makedepends=('cmake') # 'subversion' +install=blender.install +if [ $_svn = false ]; then + source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) + md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe') +else + source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) + md5sums=('7579d1139d0d6025df8afcfca64a65c4') +fi + +# source PKGBUILD && mksource +mksource() { + _svnver=38016 + _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" + _svnmod="$pkgname-$pkgver" + mkdir ${pkgname}-$pkgver + pushd ${pkgname}-$pkgver + svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* + popd +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + mkdir build + cd build + + [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" + + cmake .. \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_BUILD_TYPE:STRING=Release \ + -DWITH_INSTALL_PORTABLE:BOOL=OFF \ + -DWITH_PYTHON_INSTALL:BOOL=OFF \ + -DWITH_OPENCOLLADA:BOOL=OFF \ + -DWITH_GAMEENGINE:BOOL=ON \ + -DWITH_PLAYER:BOOL=ON \ + -DWITH_BUILTIN_GLEW:BOOL=OFF \ + -DWITH_CODEC_FFMPEG:BOOL=ON \ + -DWITH_CODEC_SNDFILE:BOOL=ON \ + -DPYTHON_VERSION:STRING=3.2 \ + -DPYTHON_LIBPATH:STRING=/usr/lib \ + -DPYTHON_LIBRARY:STRING=python3.2mu \ + -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ + $ENABLESSE2 + + make $MAKEFLAGS + + cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ + "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ + cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi + chmod 755 bmake + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="${pkgdir}" install + python -m compileall "${pkgdir}/usr/share/blender" + +# install plugins + install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ + cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ + "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ +} diff --git a/testing/blender/blender.install b/testing/blender/blender.install new file mode 100644 index 000000000..f4d7cc443 --- /dev/null +++ b/testing/blender/blender.install @@ -0,0 +1,17 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_remove() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/testing/bzflag/PKGBUILD b/testing/bzflag/PKGBUILD new file mode 100644 index 000000000..2b661fdd9 --- /dev/null +++ b/testing/bzflag/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 138154 2011-09-17 21:02:42Z stephane $ +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# Contributor: Kevin Piche <kevin@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=bzflag +pkgver=2.4.0 +pkgrel=2 +pkgdesc='Multiplayer 3D tank battle game' +url='http://bzflag.org/' +license=('LGPL') +options=('!libtool') +arch=('i686' 'x86_64') +depends=('curl' 'glew' 'mesa' 'sdl') +source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") +sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make + + cd misc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop + install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png +} diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD new file mode 100644 index 000000000..62bb2d221 --- /dev/null +++ b/testing/coreutils/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 137548 2011-09-09 09:49:34Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=coreutils +pkgver=8.13 +pkgrel=1 +pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/coreutils" +groups=('base') +depends=('glibc' 'shadow' 'pam' 'acl' 'gmp' 'libcap') +replaces=('mktemp') +backup=('etc/pam.d/su') +install=${pkgname}.install +options=('!emptydirs') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz + coreutils-uname.patch + coreutils-pam.patch + su.pam) +md5sums=('8e1675c6c336ff55557c698706a63d6c' + 'c4fcca138b6abf6d443d48a6f0cd8833' + 'aad79a2aa6d566c375d7bdd1b0767278' + 'fa85e5cce5d723275b14365ba71a8aad') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # added su wheel group pam patch (from fedora git) + patch -Np1 -i ${srcdir}/coreutils-pam.patch + + # linux specific uname improvement (from gentoo portage) + patch -Np1 -i ${srcdir}/coreutils-uname.patch + + autoreconf -v + ./configure --prefix=/usr \ + --enable-install-program=su \ + --enable-no-install-program=groups,hostname,kill,uptime \ + --enable-pam + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make RUN_EXPENSIVE_TESTS=yes check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + cd ${pkgdir}/usr/bin + install -dm755 ${pkgdir}/{bin,usr/sbin} + + # binaries required by FHS + _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ + mkdir mknod mv pwd rm rmdir stty su sync true uname" + mv ${_fhs} ${pkgdir}/bin + + # binaries required by various Arch scripts + _bin="cut dir dircolors du install mkfifo readlink shred \ + sleep touch tr vdir" + mv ${_bin} ${pkgdir}/bin + ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep + + mv chroot ${pkgdir}/usr/sbin + install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su +} diff --git a/testing/coreutils/coreutils-pam.patch b/testing/coreutils/coreutils-pam.patch new file mode 100644 index 000000000..e61908f3f --- /dev/null +++ b/testing/coreutils/coreutils-pam.patch @@ -0,0 +1,428 @@ +diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac +--- coreutils-8.4-orig/configure.ac 2010-01-11 18:20:42.000000000 +0100 ++++ coreutils-8.4/configure.ac 2010-02-12 10:17:46.000000000 +0100 +@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then + AC_SUBST([GNULIB_WARN_CFLAGS]) + fi + ++dnl Give the chance to enable PAM ++AC_ARG_ENABLE(pam, dnl ++[ --enable-pam Enable use of the PAM libraries], ++[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM]) ++LIB_PAM="-ldl -lpam -lpam_misc" ++AC_SUBST(LIB_PAM)]) ++ + AC_FUNC_FORK + + optional_bin_progs= +diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi +--- coreutils-8.4-orig/doc/coreutils.texi 2010-01-03 18:06:20.000000000 +0100 ++++ coreutils-8.4/doc/coreutils.texi 2010-02-12 10:17:46.000000000 +0100 +@@ -15081,8 +15081,11 @@ to certain shells, etc.). + @findex syslog + @command{su} can optionally be compiled to use @code{syslog} to report + failed, and optionally successful, @command{su} attempts. (If the system +-supports @code{syslog}.) However, GNU @command{su} does not check if the +-user is a member of the @code{wheel} group; see below. ++supports @code{syslog}.) ++ ++This version of @command{su} has support for using PAM for ++authentication. You can edit @file{/etc/pam.d/su} to customize its ++behaviour. + + The program accepts the following options. Also see @ref{Common options}. + +@@ -15124,6 +15127,8 @@ environment variables except @env{TERM}, + @env{PATH} to a compiled-in default value. Change to @var{user}'s home + directory. Prepend @samp{-} to the shell's name, intended to make it + read its login startup file(s). ++Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables ++are preserved as well for PAM functionality. + + @item -m + @itemx -p +@@ -15163,33 +15168,6 @@ Exit status: + the exit status of the subshell otherwise + @end display + +-@cindex wheel group, not supported +-@cindex group wheel, not supported +-@cindex fascism +-@subsection Why GNU @command{su} does not support the @samp{wheel} group +- +-(This section is by Richard Stallman.) +- +-@cindex Twenex +-@cindex MIT AI lab +-Sometimes a few of the users try to hold total power over all the +-rest. For example, in 1984, a few users at the MIT AI lab decided to +-seize power by changing the operator password on the Twenex system and +-keeping it secret from everyone else. (I was able to thwart this coup +-and give power back to the users by patching the kernel, but I +-wouldn't know how to do that in Unix.) +- +-However, occasionally the rulers do tell someone. Under the usual +-@command{su} mechanism, once someone learns the root password who +-sympathizes with the ordinary users, he or she can tell the rest. The +-``wheel group'' feature would make this impossible, and thus cement the +-power of the rulers. +- +-I'm on the side of the masses, not that of the rulers. If you are +-used to supporting the bosses and sysadmins in whatever they do, you +-might find this idea strange at first. +- +- + @node timeout invocation + @section @command{timeout}: Run a command with a time limit + +diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am +--- coreutils-8.4-orig/src/Makefile.am 2010-01-03 18:06:20.000000000 +0100 ++++ coreutils-8.4/src/Makefile.am 2010-02-12 10:17:46.000000000 +0100 +@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP) + uptime_LDADD += $(GETLOADAVG_LIBS) + + # for crypt +-su_LDADD += $(LIB_CRYPT) ++su_LDADD += $(LIB_CRYPT) @LIB_PAM@ + + # for various ACL functions + copy_LDADD += $(LIB_ACL) +diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c +--- coreutils-8.4-orig/src/su.c 2010-02-12 10:15:15.000000000 +0100 ++++ coreutils-8.4/src/su.c 2010-02-12 10:24:29.000000000 +0100 +@@ -37,6 +37,16 @@ + restricts who can su to UID 0 accounts. RMS considers that to + be fascist. + ++#ifdef USE_PAM ++ ++ Actually, with PAM, su has nothing to do with whether or not a ++ wheel group is enforced by su. RMS tries to restrict your access ++ to a su which implements the wheel group, but PAM considers that ++ to be fascist, and gives the user/sysadmin the opportunity to ++ enforce a wheel group by proper editing of /etc/pam.conf ++ ++#endif ++ + Compile-time options: + -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. + -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. +@@ -53,6 +63,15 @@ + #include <pwd.h> + #include <grp.h> + ++#ifdef USE_PAM ++# include <signal.h> ++# include <sys/wait.h> ++# include <sys/fsuid.h> ++# include <unistd.h> ++# include <security/pam_appl.h> ++# include <security/pam_misc.h> ++#endif /* USE_PAM */ ++ + #include "system.h" + #include "getpass.h" + +@@ -120,10 +139,17 @@ + /* The user to become if none is specified. */ + #define DEFAULT_USER "root" + ++#ifndef USE_PAM + char *crypt (char const *key, char const *salt); ++#endif + +-static void run_shell (char const *, char const *, char **, size_t) ++static void run_shell (char const *, char const *, char **, size_t, ++ const struct passwd *) ++#ifdef USE_PAM ++ ; ++#else + ATTRIBUTE_NORETURN; ++#endif + + /* If true, pass the `-f' option to the subshell. */ + static bool fast_startup; +@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su + } + #endif + ++#ifdef USE_PAM ++static pam_handle_t *pamh = NULL; ++static int retval; ++static struct pam_conv conv = { ++ misc_conv, ++ NULL ++}; ++ ++#define PAM_BAIL_P if (retval) { \ ++ pam_end(pamh, PAM_SUCCESS); \ ++ return 0; \ ++} ++#define PAM_BAIL_P_VOID if (retval) { \ ++ pam_end(pamh, PAM_SUCCESS); \ ++return; \ ++} ++#endif ++ + /* Ask the user for a password. ++ If PAM is in use, let PAM ask for the password if necessary. + Return true if the user gives the correct password for entry PW, + false if not. Return true without asking for a password if run by UID 0 + or if PW has an empty password. */ +@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su + static bool + correct_password (const struct passwd *pw) + { ++#ifdef USE_PAM ++ struct passwd *caller; ++ char *tty_name, *ttyn; ++ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh); ++ PAM_BAIL_P; ++ ++ if (getuid() != 0 && !isatty(0)) { ++ fprintf(stderr, "standard in must be a tty\n"); ++ exit(1); ++ } ++ ++ caller = getpwuid(getuid()); ++ if(caller != NULL && caller->pw_name != NULL) { ++ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name); ++ PAM_BAIL_P; ++ } ++ ++ ttyn = ttyname(0); ++ if (ttyn) { ++ if (strncmp(ttyn, "/dev/", 5) == 0) ++ tty_name = ttyn+5; ++ else ++ tty_name = ttyn; ++ retval = pam_set_item(pamh, PAM_TTY, tty_name); ++ PAM_BAIL_P; ++ } ++ retval = pam_authenticate(pamh, 0); ++ PAM_BAIL_P; ++ retval = pam_acct_mgmt(pamh, 0); ++ if (retval == PAM_NEW_AUTHTOK_REQD) { ++ /* password has expired. Offer option to change it. */ ++ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); ++ PAM_BAIL_P; ++ } ++ PAM_BAIL_P; ++ /* must be authenticated if this point was reached */ ++ return 1; ++#else /* !USE_PAM */ + char *unencrypted, *encrypted, *correct; + #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP + /* Shadow passwd stuff for SVR3 and maybe other systems. */ +@@ -241,6 +324,7 @@ correct_password (const struct passwd *p + encrypted = crypt (unencrypted, correct); + memset (unencrypted, 0, strlen (unencrypted)); + return STREQ (encrypted, correct); ++#endif /* !USE_PAM */ + } + + /* Update `environ' for the new shell based on PW, with SHELL being +@@ -254,12 +338,18 @@ modify_environment (const struct passwd + /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. + Unset all other environment variables. */ + char const *term = getenv ("TERM"); ++ char const *display = getenv ("DISPLAY"); ++ char const *xauthority = getenv ("XAUTHORITY"); + if (term) + term = xstrdup (term); + environ = xmalloc ((6 + !!term) * sizeof (char *)); + environ[0] = NULL; + if (term) + xsetenv ("TERM", term); ++ if (display) ++ xsetenv ("DISPLAY", display); ++ if (xauthority) ++ xsetenv ("XAUTHORITY", xauthority); + xsetenv ("HOME", pw->pw_dir); + xsetenv ("SHELL", shell); + xsetenv ("USER", pw->pw_name); +@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw + { + #ifdef HAVE_INITGROUPS + errno = 0; +- if (initgroups (pw->pw_name, pw->pw_gid) == -1) ++ if (initgroups (pw->pw_name, pw->pw_gid) == -1) { ++#ifdef USE_PAM ++ pam_close_session(pamh, 0); ++ pam_end(pamh, PAM_ABORT); ++#endif + error (EXIT_CANCELED, errno, _("cannot set groups")); ++ } + endgrent (); + #endif + if (setgid (pw->pw_gid)) +@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw + error (EXIT_CANCELED, errno, _("cannot set user id")); + } + ++#ifdef USE_PAM ++static int caught=0; ++/* Signal handler for parent process later */ ++static void su_catch_sig(int sig) ++{ ++ ++caught; ++} ++ ++int ++pam_copyenv (pam_handle_t *pamh) ++{ ++ char **env; ++ ++ env = pam_getenvlist(pamh); ++ if(env) { ++ while(*env) { ++ if (putenv (*env)) ++ xalloc_die (); ++ env++; ++ } ++ } ++ return(0); ++} ++#endif ++ + /* Run SHELL, or DEFAULT_SHELL if SHELL is empty. + If COMMAND is nonzero, pass it to the shell with the -c option. + Pass ADDITIONAL_ARGS to the shell as more arguments; there +@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw + + static void + run_shell (char const *shell, char const *command, char **additional_args, +- size_t n_additional_args) ++ size_t n_additional_args, const struct passwd *pw) + { + size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; + char const **args = xnmalloc (n_args, sizeof *args); + size_t argno = 1; ++#ifdef USE_PAM ++ int child; ++ sigset_t ourset; ++ int status; ++ ++ retval = pam_open_session(pamh,0); ++ if (retval != PAM_SUCCESS) { ++ fprintf (stderr, "could not open session\n"); ++ exit (1); ++ } ++ ++/* do this at the last possible moment, because environment variables may ++ be passed even in the session phase ++*/ ++ if(pam_copyenv(pamh) != PAM_SUCCESS) ++ fprintf (stderr, "error copying PAM environment\n"); ++ ++ /* Credentials should be set in the parent */ ++ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) { ++ pam_close_session(pamh, 0); ++ fprintf(stderr, "could not set PAM credentials\n"); ++ exit(1); ++ } ++ ++ child = fork(); ++ if (child == 0) { /* child shell */ ++ change_identity (pw); ++ pam_end(pamh, 0); ++#endif + + if (simulate_login) + { + char *arg0; + char *shell_basename; + ++ if(chdir(pw->pw_dir)) ++ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); ++ + shell_basename = last_component (shell); + arg0 = xmalloc (strlen (shell_basename) + 2); + arg0[0] = '-'; +@@ -344,6 +496,67 @@ run_shell (char const *shell, char const + error (0, errno, "%s", shell); + exit (exit_status); + } ++#ifdef USE_PAM ++ } else if (child == -1) { ++ fprintf(stderr, "can not fork user shell: %s", strerror(errno)); ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); ++ pam_close_session(pamh, 0); ++ pam_end(pamh, PAM_ABORT); ++ exit(1); ++ } ++ /* parent only */ ++ sigfillset(&ourset); ++ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) { ++ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME); ++ caught = 1; ++ } ++ if (!caught) { ++ struct sigaction action; ++ action.sa_handler = su_catch_sig; ++ sigemptyset(&action.sa_mask); ++ action.sa_flags = 0; ++ sigemptyset(&ourset); ++ if (sigaddset(&ourset, SIGTERM) ++ || sigaddset(&ourset, SIGALRM) ++ || sigaction(SIGTERM, &action, NULL) ++ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) { ++ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME); ++ caught = 1; ++ } ++ } ++ if (!caught) { ++ do { ++ int pid; ++ ++ pid = waitpid(-1, &status, WUNTRACED); ++ ++ if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) { ++ kill(getpid(), WSTOPSIG(status)); ++ /* once we get here, we must have resumed */ ++ kill(pid, SIGCONT); ++ } ++ } while (0 != WIFSTOPPED(status)); ++ } ++ ++ if (caught) { ++ fprintf(stderr, "\nSession terminated, killing shell..."); ++ kill (child, SIGTERM); ++ } ++ /* Not checking retval on this because we need to call close session */ ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); ++ retval = pam_close_session(pamh, 0); ++ PAM_BAIL_P_VOID; ++ retval = pam_end(pamh, PAM_SUCCESS); ++ PAM_BAIL_P_VOID; ++ if (caught) { ++ sleep(2); ++ kill(child, SIGKILL); ++ fprintf(stderr, " ...killed.\n"); ++ exit(-1); ++ } ++ exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status) ++ : WTERMSIG (status) + 128); ++#endif /* USE_PAM */ + } + + /* Return true if SHELL is a restricted shell (one not returned by +@@ -511,9 +724,9 @@ main (int argc, char **argv) + shell = xstrdup (shell ? shell : pw->pw_shell); + modify_environment (pw, shell); + ++#ifndef USE_PAM + change_identity (pw); +- if (simulate_login && chdir (pw->pw_dir) != 0) +- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); ++#endif + + /* error() flushes stderr, but does not check for write failure. + Normally, we would catch this via our atexit() hook of +@@ -523,5 +736,5 @@ main (int argc, char **argv) + if (ferror (stderr)) + exit (EXIT_CANCELED); + +- run_shell (shell, command, argv + optind, MAX (0, argc - optind)); ++ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw); + } diff --git a/testing/coreutils/coreutils-uname.patch b/testing/coreutils/coreutils-uname.patch new file mode 100644 index 000000000..b458abeba --- /dev/null +++ b/testing/coreutils/coreutils-uname.patch @@ -0,0 +1,173 @@ +On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. + +Prob not suitable for upstream seeing as how it's 100% linux-specific +http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html + +Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but +heavily reworked to suck less. + +To add support for additional platforms, check out the show_cpuinfo() +func in the linux/arch/<ARCH>/ source tree of the kernel. + +--- coreutils/src/uname.c ++++ coreutils/src/uname.c +@@ -50,6 +50,11 @@ + # include <mach-o/arch.h> + #endif + ++#if defined(__linux__) ++# define USE_PROCINFO ++# define UNAME_HARDWARE_PLATFORM ++#endif ++ + #include "system.h" + #include "error.h" + #include "quote.h" +@@ -138,6 +143,117 @@ + exit (status); + } + ++#if defined(USE_PROCINFO) ++ ++# if defined(__s390__) || defined(__s390x__) ++# define CPUINFO_FILE "/proc/sysinfo" ++# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" ++# else ++# define CPUINFO_FILE "/proc/cpuinfo" ++# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" ++# endif ++ ++# define PROCINFO_PROCESSOR 0 ++# define PROCINFO_HARDWARE_PLATFORM 1 ++ ++static void __eat_cpuinfo_space(char *buf) ++{ ++ /* first eat trailing space */ ++ char *tmp = buf + strlen(buf) - 1; ++ while (tmp > buf && isspace(*tmp)) ++ *tmp-- = '\0'; ++ /* then eat leading space */ ++ tmp = buf; ++ while (*tmp && isspace(*tmp)) ++ tmp++; ++ if (tmp != buf) ++ memmove(buf, tmp, strlen(tmp)+1); ++ /* finally collapse whitespace */ ++ tmp = buf; ++ while (tmp[0] && tmp[1]) { ++ if (isspace(tmp[0]) && isspace(tmp[1])) { ++ memmove(tmp, tmp+1, strlen(tmp)); ++ continue; ++ } ++ ++tmp; ++ } ++} ++ ++static int __linux_procinfo(int x, char *fstr, size_t s) ++{ ++ FILE *fp; ++ ++ char *procinfo_keys[] = { ++ /* --processor --hardware-platform */ ++ #if defined(__alpha__) ++ "cpu model", "system type" ++ #elif defined(__arm__) ++ "Processor", "Hardware" ++ #elif defined(__avr32__) ++ "processor", "cpu family" ++ #elif defined(__bfin__) ++ "CPU", "BOARD Name" ++ #elif defined(__cris__) ++ "cpu", "cpu model" ++ #elif defined(__frv__) ++ "CPU-Core", "System" ++ #elif defined(__i386__) || defined(__x86_64__) ++ "model name", "vendor_id" ++ #elif defined(__ia64__) ++ "family", "vendor" ++ #elif defined(__hppa__) ++ "cpu", "model" ++ #elif defined(__m68k__) ++ "CPU", "MMU" ++ #elif defined(__mips__) ++ "cpu model", "system type" ++ #elif defined(__powerpc__) || defined(__powerpc64__) ++ "cpu", "machine" ++ #elif defined(__s390__) || defined(__s390x__) ++ "Type", "Manufacturer" ++ #elif defined(__sh__) ++ "cpu type", "machine" ++ #elif defined(sparc) || defined(__sparc__) ++ "type", "cpu" ++ #elif defined(__vax__) ++ "cpu type", "cpu" ++ #else ++ "unknown", "unknown" ++ #endif ++ }; ++ ++ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { ++ char key[65], value[257], eol, *ret = NULL; ++ ++ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { ++ __eat_cpuinfo_space(key); ++ if (!strcmp(key, procinfo_keys[x])) { ++ __eat_cpuinfo_space(value); ++ ret = value; ++ break; ++ } ++ if (eol != '\n') { ++ /* we need two fscanf's here in case the previous ++ * length limit caused us to read right up to the ++ * newline ... doing "%*[^\n]\n" wont eat the newline ++ */ ++ fscanf(fp, "%*[^\n]"); ++ fscanf(fp, "\n"); ++ } ++ } ++ fclose(fp); ++ ++ if (ret) { ++ strncpy(fstr, ret, s); ++ return 0; ++ } ++ } ++ ++ return -1; ++} ++ ++#endif ++ + /* Print ELEMENT, preceded by a space if something has already been + printed. */ + +@@ -250,10 +344,14 @@ main (int argc, char **argv) + if (toprint & PRINT_PROCESSOR) + { + char const *element = unknown; +-#if HAVE_SYSINFO && defined SI_ARCHITECTURE ++#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) + { + static char processor[257]; ++#if defined(USE_PROCINFO) ++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) ++#else + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) ++#endif + element = processor; + } + #endif +@@ -306,9 +404,13 @@ main (int argc, char **argv) + if (element == unknown) + { + static char hardware_platform[257]; ++#if defined(USE_PROCINFO) ++ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) ++#else + size_t s = sizeof hardware_platform; + static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; + if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) ++#endif + element = hardware_platform; + } + #endif diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install new file mode 100644 index 000000000..8caae6686 --- /dev/null +++ b/testing/coreutils/coreutils.install @@ -0,0 +1,21 @@ +infodir=usr/share/info +filelist=(coreutils.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/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 + usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + diff --git a/testing/coreutils/su.pam b/testing/coreutils/su.pam new file mode 100644 index 000000000..cf15f40f1 --- /dev/null +++ b/testing/coreutils/su.pam @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD new file mode 100644 index 000000000..fe72fa227 --- /dev/null +++ b/testing/curl/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 137981 2011-09-13 20:49:30Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=curl +pkgver=7.22.0 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') +options=('!libtool') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + curlbuild.h) +md5sums=('e8c36126d21c893f085aca233906b5cc' + '1b061c348b63ea3e90c3f2c3af6a08d6' + '751bd433ede935c8fae727377625a8ae') + + +case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unsupported architecture: %s" "$CARCH" + exit 1 + ;; +esac + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --with-random=/dev/urandom \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --enable-ipv6 \ + --disable-ldaps \ + --disable-ldap \ + --enable-manual \ + --enable-versioned-symbols \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ + --without-libidn \ + --enable-threaded-resolver + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/testing/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif 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/enblend-enfuse/PKGBUILD b/testing/enblend-enfuse/PKGBUILD new file mode 100644 index 000000000..1d8ec216c --- /dev/null +++ b/testing/enblend-enfuse/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 138156 2011-09-17 21:02:44Z stephane $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=enblend-enfuse +pkgver=4.0 +pkgrel=3 +pkgdesc="intelligent blend tool for overlapping picture" +arch=("i686" "x86_64") +license=('GPL') +url="http://enblend.sourceforge.net" +depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'libgl' 'lcms' 'texinfo' 'libpng') +makedepends=('boost' 'pkgconfig') +replaces=('enblend') +conflicts=('enblend') +provides=('enblend') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz libpng-1.4.patch) +md5sums=('2e7c950061e0085fd75d94576130250f' 'a39df8dd32ccfa020dea2ea388642575') +sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' 'eae6cf48ea082865130302d0b4d1ca0b884a563b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + patch -Np1 -i ../libpng-1.4.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + make DESTDIR="${pkgdir}" install + install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info" + install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info" +} diff --git a/testing/enblend-enfuse/enblend-enfuse.install b/testing/enblend-enfuse/enblend-enfuse.install new file mode 100644 index 000000000..0ba358878 --- /dev/null +++ b/testing/enblend-enfuse/enblend-enfuse.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(enblend.info enfuse-focus-stacking.info enfuse.info) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/enblend-enfuse/libpng-1.4.patch b/testing/enblend-enfuse/libpng-1.4.patch new file mode 100644 index 000000000..3bf852b58 --- /dev/null +++ b/testing/enblend-enfuse/libpng-1.4.patch @@ -0,0 +1,14 @@ +diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx +--- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx 2010-01-19 22:09:36.000000000 -0500 ++++ enblend-enfuse-3.2/src/vigra_impex/png.cxx 2010-01-19 22:13:43.000000000 -0500 +@@ -275,8 +275,8 @@ + // expand gray values to at least one byte size + if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { + if (setjmp(png->jmpbuf)) +- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); +- png_set_gray_1_2_4_to_8(png); ++ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); ++ png_set_expand_gray_1_2_4_to_8(png); + bit_depth = 8; + } + diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD new file mode 100644 index 000000000..3cb418c0f --- /dev/null +++ b/testing/file/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 138133 2011-09-17 03:21:49Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgname=file +pkgver=5.09 +pkgrel=1 +pkgdesc="File type identification utility" +arch=('i686' 'x86_64') +license=('custom') +groups=('base') +url="http://www.darwinsys.com/file/" +depends=('glibc' 'zlib') +options=('!libtool') +source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('6fd7cd6c4281e68fe9ec6644ce0fac6f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#\$(datadir)/misc#\$(datadir)#' configure + + ./configure --prefix=/usr --datadir=/usr/share/file + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR=${pkgdir} install + install -dm755 ${pkgdir}/usr/share/misc + ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc + + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} diff --git a/testing/glew/PKGBUILD b/testing/glew/PKGBUILD new file mode 100644 index 000000000..01b62ae91 --- /dev/null +++ b/testing/glew/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 138158 2011-09-17 21:02:46Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: SleepyDog + +pkgname=glew +pkgver=1.7.0 +pkgrel=1 +pkgdesc="The OpenGL Extension Wrangler Library" +arch=('i686' 'x86_64') +url="http://glew.sourceforge.net" +license=('BSD' 'MIT' 'GPL') +depends=('libxmu' 'libxi' 'mesa') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) +sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|lib64|lib|' config/Makefile.linux + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GLEW_DEST="${pkgdir}/usr" install.all + install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a + chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} +} diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD new file mode 100644 index 000000000..ced42f275 --- /dev/null +++ b/testing/glibc/PKGBUILD @@ -0,0 +1,207 @@ +# $Id: PKGBUILD 137534 2011-09-08 21:30:58Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: valgrind requires rebuilt with each new glibc version + +pkgname=glibc +pkgver=2.14 +pkgrel=6 +_glibcdate=20110908 +pkgdesc="GNU C Library" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/libc" +license=('GPL' 'LGPL') +groups=('base') +depends=('linux-api-headers>=3.0' 'tzdata') +makedepends=('gcc>=4.6') +backup=(etc/gai.conf + etc/locale.gen + etc/nscd.conf) +options=('!strip') +install=glibc.install +source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz + glibc-2.10-dont-build-timezone.patch + glibc-2.10-bz4781.patch + glibc-__i686.patch + glibc-2.12.1-static-shared-getpagesize.patch + glibc-2.12.2-ignore-origin-of-privileged-program.patch + glibc-2.13-futex.patch + glibc-2.13-dlclose-search-reset.patch + glibc-2.14-libdl-crash.patch + glibc-2.14-avoid-assertion-on-empty-dns-answer.patch + glibc-2.14-reexport-rpc-interface.patch + glibc-2.14-reinstall-nis-rpc-headers.patch + nscd + locale.gen.txt + locale-gen) +md5sums=('069069eb9100cc7affd7ad884cb3c3e9' + '4dadb9203b69a3210d53514bb46f41c3' + '0c5540efc51c0b93996c51b57a8540ae' + '40cd342e21f71f5e49e32622b25acc52' + 'a3ac6f318d680347bb6e2805d42b73b2' + 'b042647ea7d6f22ad319e12e796bd13e' + '7d0154b7e17ea218c9fa953599d24cc4' + '22d09c58718fb3d1d31c3a6c14ca6886' + 'cea62cc6b903d222c5f26e05a3c0e0e6' + '13728807283f111e5d9d38cf38e0a461' + 'c5de2a946215d647c8af5432ec4b0da0' + '55febbb72139ac7b65757df085024b83' + 'b587ee3a70c9b3713099295609afde49' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') + + +mksource() { + git clone git://sourceware.org/git/glibc.git + pushd glibc + git checkout -b glibc-2.14-arch origin/release/2.14/master + popd + tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* +} + +build() { + cd ${srcdir}/glibc + + # timezone data is in separate package (tzdata) + patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch + + # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 + patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch + + # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 + # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html + patch -Np1 -i ${srcdir}/glibc-__i686.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 + # using Fedora "fix" as patch in that bug report causes breakages... + patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch + + # http://www.exploit-db.com/exploits/15274/ + # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 + patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + + # https://bugzilla.redhat.com/show_bug.cgi?id=593675 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.patch + + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) + # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html + patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch + + # re-export RPC interface until libtirpc is ready as a replacement + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch + # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) + patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + + install -dm755 ${pkgdir}/etc + touch ${pkgdir}/etc/ld.so.conf + + cd ${srcdir} + mkdir glibc-build + cd glibc-build + + if [[ ${CARCH} = "i686" ]]; then + # Hack to fix NPTL issues with Xen, only required on 32bit platforms + export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + fi + + echo "slibdir=/lib" >> configparms + + # remove hardening options from CFLAGS for building libraries + CFLAGS=${CFLAGS/-fstack-protector/} + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + + ${srcdir}/glibc/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --with-headers=/usr/include \ + --enable-add-ons=nptl,libidn \ + --enable-kernel=2.6.27 \ + --with-tls --with-__thread \ + --enable-bind-now --without-gd \ + --without-cvs --disable-profile \ + --disable-multi-arch + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms + make + + # re-enable hardening for programs + sed -i "s#=no#=yes#" configparms + echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + make + + # remove harding in preparation to run test-suite + sed -i '2,4d' configparms +} + +check() { + cd ${srcdir}/glibc-build + + # some errors are expected - manually check log files + make -k check || true +} + +package() { + cd ${srcdir}/glibc-build + make install_root=${pkgdir} install + + rm -f ${pkgdir}/etc/ld.so.{cache,conf} + + install -dm755 ${pkgdir}/etc/rc.d + install -dm755 ${pkgdir}/usr/sbin + install -dm755 ${pkgdir}/usr/lib/locale + install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf + install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd + install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin + install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf + + sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf + + # create /etc/locale.gen + install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen + sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED + sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED + sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED + cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen + + if [[ ${CARCH} = "x86_64" ]]; then + # fix for the linker + sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd + # Comply with multilib binaries, they look for the linker in /lib64 + mkdir ${pkgdir}/lib64 + cd ${pkgdir}/lib64 + ln -v -s ../lib/ld* . + fi + + # manually strip files as stripping libpthread-*.so and libthread_db.so + # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks + # valgrind on x86_64 + + cd $pkgdir + strip $STRIP_BINARIES sbin/{ldconfig,sln} \ + usr/bin/{gencat,getconf,getent,iconv,locale} \ + usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \ + usr/lib/getconf/* \ + usr/sbin/{iconvconfig,nscd} + [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 + + strip $STRIP_STATIC usr/lib/*.a \ + lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so + + strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ + lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ + lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ + lib/{libmemusage,libpcprofile,libSegFault}.so \ + usr/lib/{pt_chown,{audit,gconv}/*.so} +} diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch new file mode 100644 index 000000000..cf1a97a18 --- /dev/null +++ b/testing/glibc/glibc-2.10-bz4781.patch @@ -0,0 +1,42 @@ +diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 ++++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 +@@ -120,9 +120,6 @@ + ret + + L(thread_start): +- cfi_startproc; +- /* Clearing frame pointer is insufficient, use CFI. */ +- cfi_undefined (eip); + /* Note: %esi is zero. */ + movl %esi,%ebp /* terminate the stack frame */ + #ifdef RESET_PID +@@ -155,7 +152,6 @@ + jmp L(haspid) + .previous + #endif +- cfi_endproc; + + cfi_startproc + PSEUDO_END (BP_SYM (__clone)) +diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 ++++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 +@@ -89,9 +89,6 @@ + ret + + L(thread_start): +- cfi_startproc; +- /* Clearing frame pointer is insufficient, use CFI. */ +- cfi_undefined (rip); + /* Clear the frame pointer. The ABI suggests this be done, to mark + the outermost frame obviously. */ + xorl %ebp, %ebp +@@ -116,7 +113,6 @@ + /* Call exit with return value from function call. */ + movq %rax, %rdi + call HIDDEN_JUMPTARGET (_exit) +- cfi_endproc; + + cfi_startproc; + PSEUDO_END (BP_SYM (__clone)) diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch new file mode 100644 index 000000000..d3abeff17 --- /dev/null +++ b/testing/glibc/glibc-2.10-dont-build-timezone.patch @@ -0,0 +1,13 @@ +timezone data has been split into the package sys-libs/timezone-data + +--- glibc-2.4/Makeconfig ++++ glibc-2.4/Makeconfig +@@ -931,7 +931,7 @@ + stdlib stdio-common libio malloc string wcsmbs time dirent \ + grp pwd posix io termios resource misc socket sysvipc gmon \ + gnulib iconv iconvdata wctype manual shadow gshadow po argp \ +- crypt nss localedata timezone rt conform debug \ ++ crypt nss localedata rt conform debug \ + $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) + + ifndef avoid-generated diff --git a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch new file mode 100644 index 000000000..e84754279 --- /dev/null +++ b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch @@ -0,0 +1,11 @@ +--- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c +@@ -28,7 +28,7 @@ + int + __getpagesize () + { +-#ifdef __ASSUME_AT_PAGESIZE ++#if 0 && defined __ASSUME_AT_PAGESIZE + assert (GLRO(dl_pagesize) != 0); + return GLRO(dl_pagesize); + #else diff --git a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch new file mode 100644 index 000000000..ce089b49c --- /dev/null +++ b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch @@ -0,0 +1,26 @@ +From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Thu, 9 Dec 2010 15:00:59 +0100 +Subject: [PATCH 1/1] Ignore origin of privileged program + +--- + ChangeLog | 5 +++++ + elf/dl-object.c | 3 +++ + 2 files changed, 8 insertions(+), 0 deletions(-) + +diff --git a/elf/dl-object.c b/elf/dl-object.c +index 22a1635..7674d49 100644 +--- a/elf/dl-object.c ++++ b/elf/dl-object.c +@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, + out: + new->l_origin = origin; + } ++ else if (INTUSE(__libc_enable_secure) && type == lt_executable) ++ /* The origin of a privileged program cannot be trusted. */ ++ new->l_origin = (char *) -1; + + return new; + } +-- +1.7.2 diff --git a/testing/glibc/glibc-2.13-dlclose-search-reset.patch b/testing/glibc/glibc-2.13-dlclose-search-reset.patch new file mode 100644 index 000000000..3ad8b418a --- /dev/null +++ b/testing/glibc/glibc-2.13-dlclose-search-reset.patch @@ -0,0 +1,196 @@ +From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Wed, 26 May 2010 18:28:59 +0200 +Subject: [PATCH] Fix scope handling during dl_close + +--- + ChangeLog | 12 ++++++++++++ + elf/Makefile | 10 +++++++++- + elf/dl-close.c | 7 +++++++ + elf/unload8.c | 33 +++++++++++++++++++++++++++++++++ + elf/unload8mod1.c | 7 +++++++ + elf/unload8mod1x.c | 1 + + elf/unload8mod2.c | 7 +++++++ + elf/unload8mod3.c | 27 +++++++++++++++++++++++++++ + 8 files changed, 103 insertions(+), 1 deletions(-) + create mode 100644 elf/unload8.c + create mode 100644 elf/unload8mod1.c + create mode 100644 elf/unload8mod1x.c + create mode 100644 elf/unload8mod2.c + create mode 100644 elf/unload8mod3.c + +diff --git a/elf/Makefile b/elf/Makefile +index 59e835f..65b6deb 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -89,6 +89,7 @@ distribute := rtld-Rules \ + unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ + unload6mod1.c unload6mod2.c unload6mod3.c \ + unload7mod1.c unload7mod2.c \ ++ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \ + tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ + tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ + tst-auditmod4a.c tst-auditmod4b.c \ +@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ + tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ + tst-dlmodcount tst-dlopenrpath tst-deep1 \ + tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ +- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ ++ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ + tst-audit1 tst-audit2 \ + tst-stackguard1 tst-addr1 tst-thrlock \ + tst-unique1 tst-unique2 +@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ + unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ + unload6mod1 unload6mod2 unload6mod3 \ + unload7mod1 unload7mod2 \ ++ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \ + order2mod1 order2mod2 order2mod3 order2mod4 \ + tst-unique1mod1 tst-unique1mod2 \ + tst-unique2mod1 tst-unique2mod2 +@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl) + $(objpfx)unload6mod3.so: $(libdl) + $(objpfx)unload7mod1.so: $(libdl) + $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so ++$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so ++$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so ++$(objpfx)unload8mod3.so: $(libdl) + $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so + $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so + $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so +@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl) + $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so + unload7-ENV = MALLOC_PERTURB_=85 + ++$(objpfx)unload8: $(libdl) ++$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so ++ + ifdef libdl + $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a + $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 700e765..f47d5f8 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) + + imap->l_scope_max = new_size; + } ++ else if (new_list != NULL) ++ { ++ /* We didn't change the scope array, so reset the search ++ list. */ ++ imap->l_searchlist.r_list = NULL; ++ imap->l_searchlist.r_nlist = 0; ++ } + + /* The loader is gone, so mark the object as not having one. + Note: l_idx != IDX_STILL_USED -> object will be removed. */ +diff --git a/elf/unload8.c b/elf/unload8.c +new file mode 100644 +index 0000000..f984a38 +--- /dev/null ++++ b/elf/unload8.c +@@ -0,0 +1,33 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++ ++int ++main (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod1.so failed"); ++ return 1; ++ } ++ ++ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY); ++ if (h2 == NULL) ++ { ++ puts ("dlopen unload8mod1x.so failed"); ++ return 1; ++ } ++ dlclose (h2); ++ ++ int (*mod1) (void) = dlsym (h, "mod1"); ++ if (mod1 == NULL) ++ { ++ puts ("dlsym failed"); ++ return 1; ++ } ++ ++ mod1 (); ++ dlclose (h); ++ ++ return 0; ++} +diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c +new file mode 100644 +index 0000000..fe7e81c +--- /dev/null ++++ b/elf/unload8mod1.c +@@ -0,0 +1,7 @@ ++extern void mod2 (void); ++ ++void ++mod1 (void) ++{ ++ mod2 (); ++} +diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c +new file mode 100644 +index 0000000..835b634 +--- /dev/null ++++ b/elf/unload8mod1x.c +@@ -0,0 +1 @@ ++int mod1x; +diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c +new file mode 100644 +index 0000000..2fd8b67 +--- /dev/null ++++ b/elf/unload8mod2.c +@@ -0,0 +1,7 @@ ++extern void mod3 (void); ++ ++void ++mod2 (void) ++{ ++ mod3 (); ++} +diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c +new file mode 100644 +index 0000000..d49e22b +--- /dev/null ++++ b/elf/unload8mod3.c +@@ -0,0 +1,27 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++void ++mod3_fini2 (void) ++{ ++} ++ ++void ++mod3_fini (void) ++{ ++ mod3_fini2 (); ++} ++ ++void ++mod3 (void) ++{ ++ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY); ++ if (h == NULL) ++ { ++ puts ("dlopen unload8mod2.so failed"); ++ exit (1); ++ } ++ ++ atexit (mod3_fini); ++} +-- +1.7.3.4 + diff --git a/testing/glibc/glibc-2.13-futex.patch b/testing/glibc/glibc-2.13-futex.patch new file mode 100644 index 000000000..9b9c3ac45 --- /dev/null +++ b/testing/glibc/glibc-2.13-futex.patch @@ -0,0 +1,31 @@ +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: + + 7: movq %rdx, %rax + +-#ifndef __ASSUME_PRIVATE_FUTEX ++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME + addq $16, %rsp + cfi_adjust_cfa_offset(-16) + popq %r14 +@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) diff --git a/testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch new file mode 100644 index 000000000..ef91116e5 --- /dev/null +++ b/testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch @@ -0,0 +1,26 @@ +From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Thu, 1 Sep 2011 10:46:14 +0200 +Subject: [PATCH] Avoid assertion failure when first DNS answer was empty + +--- + ChangeLog | 4 ++++ + resolv/res_query.c | 2 +- + 2 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/resolv/res_query.c b/resolv/res_query.c +index 2f7cfaa..2ded9fb 100644 +--- a/resolv/res_query.c ++++ b/resolv/res_query.c +@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, + && *resplen2 > (int) sizeof (HEADER)) + { + /* Special case of partial answer. */ +- assert (hp != hp2); ++ assert (n == 0 || hp != hp2); + hp = hp2; + } + else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) +-- +1.7.3.4 + diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch new file mode 100644 index 000000000..ee29f8c20 --- /dev/null +++ b/testing/glibc/glibc-2.14-libdl-crash.patch @@ -0,0 +1,132 @@ +diff --git a/elf/dl-close.c b/elf/dl-close.c +index 73b2a2f..9bd91e3 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -1,5 +1,5 @@ + /* Close a shared object opened by `_dl_open'. +- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) + if (map->l_direct_opencount > 0 || map->l_type != lt_loaded + || dl_close_state != not_pending) + { +- if (map->l_direct_opencount == 0) +- { +- if (map->l_type == lt_loaded) +- dl_close_state = rerun; +- else if (map->l_type == lt_library) +- { +- struct link_map **oldp = map->l_initfini; +- map->l_initfini = map->l_orig_initfini; +- _dl_scope_free (oldp); +- } +- } ++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) ++ dl_close_state = rerun; + + /* There are still references to this object. Do nothing more. */ + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) +diff --git a/elf/dl-deps.c b/elf/dl-deps.c +index 9e30594..3890d00 100644 +--- a/elf/dl-deps.c ++++ b/elf/dl-deps.c +@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, + nneeded * sizeof needed[0]); + atomic_write_barrier (); + l->l_initfini = l_initfini; ++ l->l_free_initfini = 1; + } + + /* If we have no auxiliary objects just go on to the next map. */ +@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); + l_initfini[nlist] = NULL; + atomic_write_barrier (); + map->l_initfini = l_initfini; ++ map->l_free_initfini = 1; + if (l_reldeps != NULL) + { + atomic_write_barrier (); +@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); + _dl_scope_free (old_l_reldeps); + } + if (old_l_initfini != NULL) +- map->l_orig_initfini = old_l_initfini; ++ _dl_scope_free (old_l_initfini); + } +diff --git a/elf/dl-libc.c b/elf/dl-libc.c +index 7be9483..a13fce3 100644 +--- a/elf/dl-libc.c ++++ b/elf/dl-libc.c +@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) + + for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) + { +- /* Remove all additional names added to the objects. */ + for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) + { + struct libname_list *lnp = l->l_libname->next; + + l->l_libname->next = NULL; + ++ /* Remove all additional names added to the objects. */ + while (lnp != NULL) + { + struct libname_list *old = lnp; +@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) + if (! old->dont_free) + free (old); + } ++ ++ /* Free the initfini dependency list. */ ++ if (l->l_free_initfini) ++ free (l->l_initfini); + } + + if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 +diff --git a/elf/rtld.c b/elf/rtld.c +index 4a9109e..617e30e 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + lnp->dont_free = 1; + lnp = lnp->next; + } ++ l->l_free_initfini = 0; + + if (l != &GL(dl_rtld_map)) + _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, +diff --git a/include/link.h b/include/link.h +index e877104..051b99a 100644 +--- a/include/link.h ++++ b/include/link.h +@@ -1,6 +1,6 @@ + /* Data structure for communication from the run-time dynamic linker for + loaded ELF shared objects. +- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -192,6 +192,9 @@ struct link_map + during LD_TRACE_PRELINKING=1 + contains any DT_SYMBOLIC + libraries. */ ++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be ++ freed, ie. not allocated with ++ the dummy malloc in ld.so. */ + + /* Collected information about own RPATH directories. */ + struct r_search_path_struct l_rpath_dirs; +@@ -240,9 +243,6 @@ struct link_map + + /* List of object in order of the init and fini calls. */ + struct link_map **l_initfini; +- /* The init and fini list generated at startup, saved when the +- object is also loaded dynamically. */ +- struct link_map **l_orig_initfini; + + /* List of the dependencies introduced through symbol binding. */ + struct link_map_reldeps diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch new file mode 100644 index 000000000..e2beea881 --- /dev/null +++ b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch @@ -0,0 +1,26 @@ +diff --git a/include/libc-symbols.h b/include/libc-symbols.h +index 67e1ca2..5e7cca5 100644 +--- a/include/libc-symbols.h ++++ b/include/libc-symbols.h +@@ -635,7 +635,7 @@ for linking") + # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) + # define libc_hidden_def(name) hidden_def (name) + # define libc_hidden_weak(name) hidden_weak (name) +-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) ++# define libc_hidden_nolink(name, version) hidden_def (name) + # define libc_hidden_ver(local, name) hidden_ver (local, name) + # define libc_hidden_data_def(name) hidden_data_def (name) + # define libc_hidden_data_weak(name) hidden_data_weak (name) +diff --git a/sunrpc/Makefile b/sunrpc/Makefile +index 5134ce9..40c73d1 100644 +--- a/sunrpc/Makefile ++++ b/sunrpc/Makefile +@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ + des_crypt.h) + headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ + $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h +-headers = rpc/netdb.h ++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) + install-others = $(inst_sysconfdir)/rpc + generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ + $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch new file mode 100644 index 000000000..eb0fd822d --- /dev/null +++ b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch @@ -0,0 +1,28 @@ +From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Tue, 17 May 2011 17:42:30 +0200 +Subject: [PATCH] Reinstall NIS RPC headers + +--- + nis/Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nis/Makefile b/nis/Makefile +index b5c9609..d2934d9 100644 +--- a/nis/Makefile ++++ b/nis/Makefile +@@ -23,9 +23,9 @@ subdir := nis + + aux := nis_hash + ++headers := $(wildcard rpcsvc/*.[hx]) + distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ +- nisplus-parser.h nis_xdr.h nss \ +- $(wildcard rpcsvc/*.[hx]) ++ nisplus-parser.h nis_xdr.h nss + + # These are the databases available for the nis (and perhaps later nisplus) + # service. This must be a superset of the services in nss. +-- +1.7.5.4 + diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch new file mode 100644 index 000000000..28d5dd424 --- /dev/null +++ b/testing/glibc/glibc-__i686.patch @@ -0,0 +1,13 @@ +diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile +--- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 ++++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 +@@ -1,6 +1,7 @@ + # The mpn functions need a #define for asm syntax flavor. +-# Every i386 port in use uses gas syntax (I think). +-asm-CPPFLAGS += -DGAS_SYNTAX ++# Every i386 port in use uses gas syntax (I think). Don't replace ++# __i686 in __i686.get_pc_thunk.bx. ++asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 + + # The i386 `long double' is a distinct type we support. + long-double-fcts = yes diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install new file mode 100644 index 000000000..7f85ade96 --- /dev/null +++ b/testing/glibc/glibc.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) + +post_upgrade() { + sbin/ldconfig -r . + [ -x sbin/init ] && sbin/init u + usr/sbin/locale-gen + + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen new file mode 100755 index 000000000..5aff344c4 --- /dev/null +++ b/testing/glibc/locale-gen @@ -0,0 +1,42 @@ +#!/bin/sh + +set -e + +LOCALEGEN=/etc/locale.gen +LOCALES=/usr/share/i18n/locales +if [ -n "$POSIXLY_CORRECT" ]; then + unset POSIXLY_CORRECT +fi + + +[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; + +# Remove all old locale dir and locale-archive before generating new +# locale data. +rm -rf /usr/lib/locale/* || true + +umask 022 + +is_entry_ok() { + if [ -n "$locale" -a -n "$charset" ] ; then + true + else + echo "error: Bad entry '$locale $charset'" + false + fi +} + +echo "Generating locales..." +while read locale charset; do \ + case $locale in \#*) continue;; "") continue;; esac; \ + is_entry_ok || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ + echo -n ".$charset"; \ + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ + echo -n '...'; \ + if [ -f $LOCALES/$locale ]; then input=$locale; else \ + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ + localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ + echo ' done'; \ +done < $LOCALEGEN +echo "Generation complete." diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt new file mode 100644 index 000000000..ccdd81734 --- /dev/null +++ b/testing/glibc/locale.gen.txt @@ -0,0 +1,23 @@ +# Configuration file for locale-gen +# +# lists of locales that are to be generated by the locale-gen command. +# +# Each line is of the form: +# +# <locale> <charset> +# +# where <locale> is one of the locales given in /usr/share/i18n/locales +# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps +# +# Examples: +# en_US ISO-8859-1 +# en_US.UTF-8 UTF-8 +# de_DE ISO-8859-1 +# de_DE@euro ISO-8859-15 +# +# The locale-gen command will generate all the locales, +# placing them in /usr/lib/locale. +# +# A list of supported locales is included in this file. +# Uncomment the ones you need. +# diff --git a/testing/glibc/nscd b/testing/glibc/nscd new file mode 100755 index 000000000..8b14f2a3f --- /dev/null +++ b/testing/glibc/nscd @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/nscd` +case "$1" in + start) + stat_busy "Starting nscd" + # create necessary directories if they don't already exist + mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null + # remove stale files + rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null + [ -z "$PID" ] && /usr/sbin/nscd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon nscd + stat_done + fi + ;; + stop) + stat_busy "Stopping nscd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon nscd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD new file mode 100644 index 000000000..323525123 --- /dev/null +++ b/testing/hugin/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 138160 2011-09-17 21:02:50Z stephane $ +# Maintainer: Tobias Kieslich <tobias@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=hugin +pkgver=2011.0.0 +pkgrel=3 +pkgdesc="A frontend to the panorama-tools" +arch=('i686' 'x86_64') +url="http://hugin.sourceforge.net/" +license=('LGPL') +depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' + 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') +makedepends=('zip' 'cmake' 'boost') +install=hugin.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('ac8a129b4c3021233df6d9368c8164cf') +sha1sums=('22e1ad3846291a9bbe58570683e213921a6f0116') + +build() { + cd "${srcdir}" + mkdir build && cd build + cmake "${srcdir}/${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ + -DENABLE_LAPACK=yes + make +} + +package(){ + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/hugin/hugin.install b/testing/hugin/hugin.install new file mode 100644 index 000000000..362749233 --- /dev/null +++ b/testing/hugin/hugin.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} 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/koffice/PKGBUILD b/testing/koffice/PKGBUILD new file mode 100644 index 000000000..0d1e3e5c5 --- /dev/null +++ b/testing/koffice/PKGBUILD @@ -0,0 +1,301 @@ +# $Id: PKGBUILD 138162 2011-09-17 21:02:54Z stephane $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > + +pkgbase=koffice +pkgname=( + 'koffice-filters' + 'koffice-interfaces' + 'koffice-libs' + 'koffice-plugins' + 'koffice-pics' + 'koffice-servicetypes' + 'koffice-templates' + 'koffice-tools' + 'koffice-karbon' + 'koffice-karbon-doc' +# 'koffice-kchart' +# 'koffice-kchart-doc' + 'koffice-kexi' + 'koffice-kexi-doc' + 'koffice-kformula' + 'koffice-kformula-doc' + 'koffice-kounavail' + 'koffice-kplato' +# 'koffice-kplato-doc' + 'koffice-kpresenter' + 'koffice-kpresenter-doc' + 'koffice-krita' +# 'koffice-krita-doc' # no krita-doc anymore upstream + 'koffice-kspread' + 'koffice-kspread-doc' + 'koffice-kword' +# 'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources) + 'koffice-handbook' + 'koffice-thesaurus-doc' +# 'koffice-kdgantt' # still an empty package +) +pkgver=2.3.3 +pkgrel=7 +arch=('i686' 'x86_64') +url='http://koffice.kde.org' +license=('GPL' 'LGPL' 'FDL') +makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' + 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' + 'libwpg' 'opengtl' 'libkdcraw') +groups=('koffice') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" + 'kde4-koffice-libwpg02.patch' 'gcc46.patch') +sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' + '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612' + 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" + patch -p1 -i "${srcdir}"/gcc46.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +##### 1st package common files, depends, optdepends of the koffice applications ##### + +package_koffice-filters(){ + pkgdesc="Filters for the KDE office suite" + optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' + 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' + 'libkdcraw: support for raw images') + install=filters.install + cd "${srcdir}/build/filters" + make DESTDIR="${pkgdir}" install +} + +package_koffice-interfaces(){ + pkgdesc="Interfaces for the KDE office suite" + depends=('kdelibs' 'koffice-libs') + cd "${srcdir}/build/interfaces" + make DESTDIR="${pkgdir}" install +} + +package_koffice-libs(){ + pkgdesc="Libs for the KDE office suite" + depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes') + cd "${srcdir}/build/libs" + make DESTDIR="${pkgdir}" install +} + +package_koffice-plugins(){ + pkgdesc="Plugins for the KDE office suite" + depends=('koffice-libs') + replaces=('koffice-kchart') + conflicts=('koffice-kchart') + cd "${srcdir}/build/plugins" + make DESTDIR="${pkgdir}" install +} + +package_koffice-pics(){ + pkgdesc="Icons for the KDE office suite" + install=koffice.install + cd "${srcdir}/build/pics" + make DESTDIR="${pkgdir}" install +} + +package_koffice-servicetypes(){ + pkgdesc="Servicetypes for the KDE office suite" + cd "${srcdir}/build/servicetypes" + make DESTDIR="${pkgdir}" install +} + +package_koffice-templates(){ + pkgdesc="Templates for the KDE office suite" + cd "${srcdir}/build/templates" + make DESTDIR="${pkgdir}" install +} + +package_koffice-tools(){ + pkgdesc="Tools for the KDE office suite" + depends=('koffice-libs') + cd "${srcdir}/build/tools" + make DESTDIR="${pkgdir}" install +} + +#### package common files done ##### + +#### package apps and their docs ##### + +package_koffice-karbon(){ + pkgdesc="Vector drawing application for KDE" + depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') + optdepends=('koffice-filters: import/export filters') + install=koffice.install + cd "${srcdir}/build/karbon" + make DESTDIR="${pkgdir}" install +} + +package_koffice-karbon-doc(){ + pkgdesc="Documentation for karbon" + cd "${srcdir}/build/doc/karbon" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kexi(){ + pkgdesc="Integrated data management application for the KDE office suite" + depends=('kdelibs' 'koffice-libs' 'koffice-kspread' 'sqlite3') + cd "${srcdir}/build/kexi" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kexi-doc(){ + pkgdesc="Documentation for kexi" + cd "${srcdir}/build/doc/kexi" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kformula(){ + pkgdesc="Formula editor for the KDE office suite" + depends=('kdelibs' 'koffice-libs') + cd "${srcdir}/build/kformula" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kformula-doc() { + pkgdesc="Documentation for koffice-kformula" + cd "${srcdir}/build/doc/kformula" + make DESTDIR="${pkgdir}" install +} + + +package_koffice-kounavail(){ + pkgdesc="Kounavail for the KDE office suite" + depends=('kdelibs' 'koffice-libs') + cd "${srcdir}/build/kounavail" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kplato(){ + pkgdesc="Project management application for KDE" + depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' \ + 'koffice-plugins' 'koffice-kword') + install=koffice.install + cd "${srcdir}/build/kplato" + make DESTDIR="${pkgdir}" install +} + +#package_koffice-kplato-doc(){ +# pkgdesc="Documentation for kplato" +# cd ${srcdir}/build/doc/kplato +# make DESTDIR="${pkgdir}" install +#} + +package_koffice-kpresenter(){ + pkgdesc="Presentation tool for KDE" + depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') + optdepends=('koffice-filters: import/export filters') + install=koffice.install + cd "${srcdir}/build/kpresenter" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kpresenter-doc(){ + pkgdesc="Documentation for kpresenter" + cd "${srcdir}/build/doc/kpresenter" + make DESTDIR="${pkgdir}" install +} + +package_koffice-krita(){ + pkgdesc="Graphics editor for KDE" + depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \ + 'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \ + 'openexr' 'opengtl') + optdepends=('koffice-filters: import/export filters') + install=krita.install + cd "${srcdir}/build/krita" + make DESTDIR="${pkgdir}" install +} + +#package_koffice-krita-doc(){ +# pkgdesc="Documentation for krita" +# cd ${srcdir}/build/doc/krita +# make DESTDIR="${pkgdir}" install +#} + + +package_koffice-kspread(){ + pkgdesc="Spreadsheet application for KDE" + depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-plugins') + optdepends=('koffice-filters: import/export filters') + install=koffice.install + cd "${srcdir}/build/kspread" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kspread-doc(){ + pkgdesc="Documentation for kspread" + cd "${srcdir}/build/doc/kspread" + make DESTDIR="${pkgdir}" install +} + +package_koffice-kword(){ + pkgdesc="Wordprocessor for KDE" + depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \ + 'koffice-kounavail' 'koffice-plugins') + optdepends=('koffice-filters: import/export filters') + install=koffice.install + cd "${srcdir}/build/kword" + make DESTDIR="${pkgdir}" install + + # some sed lines to have python2 in extension scripts + sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py" + sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py" + sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py" +} + +#package_koffice-kword-doc(){ +# pkgdesc="Documentation for kword" +# cd ${srcdir}/build/doc/kword +# make DESTDIR="${pkgdir}" install +#} + +##### package apps done ##### + +#package_koffice-kchart(){ +# pkgdesc="Charting tool for KDE" +# depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates') +# optdepends=('koffice-filters: import/export filters') +# install=koffice.install +# cd "${srcdir}/build/kchart" +# make DESTDIR="${pkgdir}" install +#} + +#package_koffice-kchart-doc(){ +# pkgdesc="Documentation for kchart" +# cd "${srcdir}/build/doc/kchart" +# make DESTDIR="${pkgdir}" install +#} + +#package_koffice-kdgantt(){ +# pkgdesc="Gantt for KDE" +# cd "${srcdir}/build/kdgantt" +# make DESTDIR="${pkgdir}" install +#} + +package_koffice-handbook() { + pkgdesc="Documentation for koffice" + cd "${srcdir}/build/doc/koffice" + make DESTDIR="${pkgdir}" install +} + +package_koffice-thesaurus-doc(){ + pkgdesc="Documentation for koffice-thesaurus" + cd "${srcdir}/build/doc/thesaurus" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/koffice/filters.install b/testing/koffice/filters.install new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/testing/koffice/filters.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/koffice/gcc46.patch b/testing/koffice/gcc46.patch new file mode 100644 index 000000000..dcf8a4f85 --- /dev/null +++ b/testing/koffice/gcc46.patch @@ -0,0 +1,23 @@ +diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc +--- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 2011-02-17 06:13:40.000000000 -0600 ++++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc 2011-02-19 21:15:56.597142885 -0600 +@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp + return IT_FLOAT16; + case Imf::FLOAT: + return IT_FLOAT32; ++ default: ++ // shouldn't reach here ++ return IT_UNSUPPORTED; + } + } + +@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace( + case IT_UNKNOWN: + case IT_UNSUPPORTED: + return 0; ++ default: ++ // shouldn't reach here ++ return 0; + } + } + diff --git a/testing/koffice/kde4-koffice-libwpg02.patch b/testing/koffice/kde4-koffice-libwpg02.patch new file mode 100644 index 000000000..e2a55a216 --- /dev/null +++ b/testing/koffice/kde4-koffice-libwpg02.patch @@ -0,0 +1,1323 @@ +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt +--- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt 2011-01-18 07:40:25.000000000 +0100 +@@ -1,16 +1,11 @@ + +- + include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/) + +-set(wpgimport_PART_SRCS +-WPGImport.cpp +-OdgExporter.cxx +-FileOutputHandler.cxx +-GraphicsElement.cxx) ++set(wpgimport_PART_SRCS WPGImport.cpp) + + kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS}) + +-target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES}) ++target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES}) + + install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR}) + install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx +--- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,95 +0,0 @@ +-/* libwpg +- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Library General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpg.sourceforge.net +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#include "FileOutputHandler.hxx" +- +-FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) : +- mbIsTagOpened(false), +- mContentStream(contentStream) +-{ +-} +- +-void FileOutputHandler::startDocument() +-{ +-} +- +-void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList) +-{ +- if (mbIsTagOpened) +- { +- mContentStream << ">"; +- mbIsTagOpened = false; +- } +- mContentStream << "<" << psName; +- +- for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++) +- { +- mContentStream << " " << (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\""; +- } +- mbIsTagOpened = true; +- msOpenedTagName = psName; +-} +- +-void FileOutputHandler::endElement(const char *psName) +-{ +- if (mbIsTagOpened) +- { +- if( msOpenedTagName == psName ) +- { +- mContentStream << "/>"; +- mbIsTagOpened = false; +- } +- else // should not happen, but handle it +- { +- mContentStream << ">"; +- mContentStream << "</" << psName << ">"; +- mbIsTagOpened = false; +- } +- } +- else +- { +- mContentStream << "</" << psName << ">"; +- mbIsTagOpened = false; +- } +-} +- +-void FileOutputHandler::characters(const std::string &sCharacters) +-{ +- if (mbIsTagOpened) +- { +- mContentStream << ">"; +- mbIsTagOpened = false; +- } +- mContentStream << sCharacters.c_str(); +-} +- +-void FileOutputHandler::endDocument() +-{ +- if (mbIsTagOpened) +- { +- mContentStream << ">"; +- mbIsTagOpened = false; +- } +-} +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx +--- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,49 +0,0 @@ +-/* libwpg +- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Library General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpg.sourceforge.net +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#ifndef FILEOUTPUTHANDLER_H +-#define FILEOUTPUTHANDLER_H +- +-#include <iostream> +-#include <sstream> +-#include <string> +-#include "GraphicsHandler.hxx" +- +-class FileOutputHandler : public GraphicsHandler +-{ +- public: +- explicit FileOutputHandler(std::ostringstream &contentStream); +- virtual void startDocument(); +- virtual void endDocument(); +- virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList); +- virtual void endElement(const char *psName); +- virtual void characters(const std::string &sCharacters); +- +- private: +- bool mbIsTagOpened; +- std::string msOpenedTagName; +- std::ostringstream &mContentStream; +-}; +-#endif +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx +--- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,66 +0,0 @@ +-/* GraphicsElement: The items we are collecting to be put into the Writer +- * document: paragraph and spans of text, as well as section breaks. +- * +- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpg.sourceforge.net +- * +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#include "GraphicsElement.hxx" +-#include "GraphicsHandler.hxx" +-#include <string.h> +- +-#define ASCII_SPACE 0x0020 +- +-void TagGraphicsElement::print() const +-{ +-} +- +-void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const +-{ +- pHandler->startElement(getTagName().c_str(), maAttrList); +-} +- +-void OpenTagGraphicsElement::print() const +-{ +- TagGraphicsElement::print(); +-} +- +-void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue) +-{ +- std::pair<std::string, std::string> tmpAttribute; +- tmpAttribute.first = szAttributeName; +- tmpAttribute.second = sAttributeValue; +- maAttrList.push_back(tmpAttribute); +-} +- +-void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const +-{ +- +- pHandler->endElement(getTagName().c_str()); +-} +- +-void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const +-{ +- pHandler->characters(msData); +-} +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx +--- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,84 +0,0 @@ +-/* GraphicsElement: The items we are collecting to be put into the Writer +- * document: paragraph and spans of text, as well as section breaks. +- * +- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpd.sourceforge.net +- * +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#ifndef _GRAPHICSELEMENT_H +-#define _GRAPHICSELEMENT_H +-#include <string> +-#include <map> +-#include <vector> +- +-#include "GraphicsHandler.hxx" +- +-class GraphicsElement +-{ +-public: +- virtual ~GraphicsElement() {} +- virtual void write(GraphicsHandler *pHandler) const = 0; +- virtual void print() const {} +-}; +- +-class TagGraphicsElement : public GraphicsElement +-{ +-public: +- explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {} +- const std::string &getTagName() const { return msTagName; } +- virtual void print() const; +-private: +- const std::string msTagName; +-}; +- +-class OpenTagGraphicsElement : public TagGraphicsElement +-{ +-public: +- explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} +- ~OpenTagGraphicsElement() {} +- void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue); +- virtual void write(GraphicsHandler *pHandler) const; +- virtual void print () const; +-private: +- std::vector<std::pair<std::string, std::string> > maAttrList; +-}; +- +-class CloseTagGraphicsElement : public TagGraphicsElement +-{ +-public: +- explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} +- virtual void write(GraphicsHandler *pHandler) const; +-}; +- +-class CharDataGraphicsElement : public GraphicsElement +-{ +-public: +- CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {} +- virtual void write(GraphicsHandler *pHandler) const; +-private: +- std::string msData; +-}; +- +- +-#endif +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx +--- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,43 +0,0 @@ +-/* +- * Copyright (C) 2004 William Lachance (wlach@interlog.com) +- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public License +- * as published by the Free Software Foundation; either version 2 +- * of the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * Contributor(s): Martin Gallwey (gallwey@sun.com) +- * +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +-#ifndef _GRAPHICSHANDLER_H +-#define _GRAPHICSHANDLER_H +-#include <string> +-#include <map> +-#include <vector> +- +-class GraphicsHandler +-{ +-public: +- virtual ~GraphicsHandler() {} +- virtual void startDocument() = 0; +- virtual void endDocument() = 0; +- virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0; +- virtual void endElement(const char *psName) = 0; +- virtual void characters(const std::string &sCharacters) = 0; +-}; +-#endif +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx +--- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,662 +0,0 @@ +-/* libwpg +- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) +- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Library General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpg.sourceforge.net +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#include "OdgExporter.hxx" +-#include "GraphicsElement.hxx" +-#include "GraphicsHandler.hxx" +-#include <locale.h> +- +-static std::string doubleToString(const double value) +-{ +- std::ostringstream tempStream; +- tempStream << value; +- std::string decimalPoint(localeconv()->decimal_point); +- if ((decimalPoint.size() == 0) || (decimalPoint == ".")) +- return tempStream.str(); +- std::string stringValue(tempStream.str()); +- if (!stringValue.empty()) +- { +- std::string::size_type pos; +- while ((pos = stringValue.find(decimalPoint)) != std::string::npos) +- stringValue.replace(pos,decimalPoint.size(),"."); +- } +- return stringValue; +-} +- +- +-OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML): +- mpHandler(pHandler), +- m_fillRule(AlternatingFill), +- m_gradientIndex(1), +- m_dashIndex(1), +- m_styleIndex(1), +- m_width(0.0f), +- m_height(0.0f), +- m_isFlatXML(isFlatXML) +-{ +-} +- +-OdgExporter::~OdgExporter() +-{ +- for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin(); +- iterStroke != mStrokeDashElements.end(); iterStroke++) +- delete (*iterStroke); +- +- for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin(); +- iterGradient != mGradientElements.end(); iterGradient++) +- delete (*iterGradient); +- +- for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); +- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) +- delete (*iterAutomaticStyles); +- +- for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin(); +- bodyIter != mBodyElements.end(); bodyIter++) +- delete (*bodyIter); +-} +- +-void OdgExporter::startGraphics(double width, double height) +-{ +- m_gradientIndex = 1; +- m_dashIndex = 1; +- m_styleIndex = 1; +- m_width = width; +- m_height = height; +- +- +- mpHandler->startDocument(); +- OpenTagGraphicsElement tmpOfficeDocumentContent("office:document"); +- tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/"); +- tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"); +- tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office"); +- tmpOfficeDocumentContent.addAttribute("office:version", "1.0"); +- if (m_isFlatXML) +- tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing"); +- tmpOfficeDocumentContent.write(mpHandler); +- +- OpenTagGraphicsElement("office:settings").write(mpHandler); +- +- OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set"); +- configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings"); +- configItemSetOpenElement.write(mpHandler); +- +- OpenTagGraphicsElement configItemOpenElement1("config:config-item"); +- configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop"); +- configItemOpenElement1.addAttribute("config:type", "int"); +- configItemOpenElement1.write(mpHandler); +- mpHandler->characters("0"); +- mpHandler->endElement("config:config-item"); +- +- OpenTagGraphicsElement configItemOpenElement2("config:config-item"); +- configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft"); +- configItemOpenElement2.addAttribute("config:type", "int"); +- configItemOpenElement2.write(mpHandler); +- mpHandler->characters("0"); +- mpHandler->endElement("config:config-item"); +- +- OpenTagGraphicsElement configItemOpenElement3("config:config-item"); +- configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth"); +- configItemOpenElement3.addAttribute("config:type", "int"); +- configItemOpenElement3.write(mpHandler); +- m_value.str(""); +- m_value << (unsigned)(2540 * width); +- mpHandler->characters(m_value.str()); +- mpHandler->endElement("config:config-item"); +- +- OpenTagGraphicsElement configItemOpenElement4("config:config-item"); +- configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight"); +- configItemOpenElement4.addAttribute("config:type", "int"); +- configItemOpenElement4.write(mpHandler); +- m_value.str(""); +- m_value << (unsigned)(2540 * height); +- mpHandler->characters(m_value.str()); +- mpHandler->endElement("config:config-item"); +- +- mpHandler->endElement("config:config-item-set"); +- +- mpHandler->endElement("office:settings"); +- +-} +- +-void OdgExporter::endGraphics() +-{ +- OpenTagGraphicsElement("office:styles").write(mpHandler); +- +- for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin(); +- iterStroke != mStrokeDashElements.end(); iterStroke++) +- (*iterStroke)->write(mpHandler); +- +- for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin(); +- iterGradient != mGradientElements.end(); iterGradient++) +- (*iterGradient)->write(mpHandler); +- +- mpHandler->endElement("office:styles"); +- +- OpenTagGraphicsElement("office:automatic-styles").write(mpHandler); +- +- for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); +- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) +- (*iterAutomaticStyles)->write(mpHandler); +- +- OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout"); +- tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0"); +- tmpStylePageLayoutOpenElement.write(mpHandler); +- +- OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties"); +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in"); +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in"); +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in"); +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in"); +- m_value.str(""); +- m_value << doubleToString(m_width) << "in"; +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(m_height) << "in"; +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str()); +- m_value.str(""); +- tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait"); +- tmpStylePageLayoutPropertiesOpenElement.write(mpHandler); +- +- mpHandler->endElement("style:page-layout-properties"); +- +- mpHandler->endElement("style:page-layout"); +- +- OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style"); +- tmpStyleStyleOpenElement.addAttribute("style:name", "dp1"); +- tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page"); +- tmpStyleStyleOpenElement.write(mpHandler); +- +- OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties"); +- // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border"); +- tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none"); +- tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler); +- +- mpHandler->endElement("style:drawing-page-properties"); +- +- mpHandler->endElement("style:style"); +- +- mpHandler->endElement("office:automatic-styles"); +- +- OpenTagGraphicsElement("office:master-styles").write(mpHandler); +- +- OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page"); +- tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default"); +- tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0"); +- tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1"); +- tmpStyleMasterPageOpenElement.write(mpHandler); +- +- mpHandler->endElement("style:master-page"); +- +- mpHandler->endElement("office:master-styles"); +- +- OpenTagGraphicsElement("office:body").write(mpHandler); +- +- OpenTagGraphicsElement("office:drawing").write(mpHandler); +- +- OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page"); +- tmpDrawPageOpenElement.addAttribute("draw:name", "page1"); +- tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1"); +- tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default"); +- tmpDrawPageOpenElement.write(mpHandler); +- +- for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin(); +- bodyIter != mBodyElements.end(); bodyIter++) +- { +- (*bodyIter)->write(mpHandler); +- } +- +- mpHandler->endElement("draw:page"); +- mpHandler->endElement("office:drawing"); +- mpHandler->endElement("office:body"); +- mpHandler->endElement("office:document"); +- +- mpHandler->endDocument(); +-} +- +-void OdgExporter::setPen(const libwpg::WPGPen& pen) +-{ +- m_pen = pen; +-} +- +-void OdgExporter::setBrush(const libwpg::WPGBrush& brush) +-{ +- m_brush = brush; +-} +- +-void OdgExporter::setFillRule(FillRule rule) +-{ +- m_fillRule = rule; +-} +- +-void OdgExporter::startLayer(unsigned int) +-{ +-} +- +-void OdgExporter::endLayer(unsigned int) +-{ +-} +- +-void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double ) +-{ +- writeStyle(); +- OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect"); +- m_value.str(""); +- m_value << "gr" << m_styleIndex-1; +- pDrawRectElement->addAttribute("draw:style-name", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(rect.x1) << "in"; +- pDrawRectElement->addAttribute("svg:x", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(rect.y1) << "in"; +- pDrawRectElement->addAttribute("svg:y", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(rect.x2-rect.x1) << "in"; +- pDrawRectElement->addAttribute("svg:width", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(rect.y2-rect.y1) << "in"; +- pDrawRectElement->addAttribute("svg:height", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(rx) << "in"; +- // FIXME: what to do when rx != ry ? +- pDrawRectElement->addAttribute("draw:corner-radius", m_value.str()); +- m_value.str(""); +- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement)); +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect"))); +-} +- +-void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry) +-{ +- writeStyle(); +- OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse"); +- m_value.str(""); +- m_value << "gr" << m_styleIndex-1; +- pDrawEllipseElement->addAttribute("draw:style-name", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(center.x - rx) << "in"; +- pDrawEllipseElement->addAttribute("svg:x", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(center.y - ry) << "in"; +- pDrawEllipseElement->addAttribute("svg:y", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(2 * rx) << "in"; +- pDrawEllipseElement->addAttribute("svg:width", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(2 * ry) << "in"; +- pDrawEllipseElement->addAttribute("svg:height", m_value.str()); +- m_value.str(""); +- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement)); +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse"))); +-} +- +-void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices) +-{ +- if(vertices.count() < 2) +- return; +- +- if(vertices.count() == 2) +- { +- const libwpg::WPGPoint& p1 = vertices[0]; +- const libwpg::WPGPoint& p2 = vertices[1]; +- +- writeStyle(); +- OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line"); +- m_value.str(""); +- m_value << "gr" << m_styleIndex-1; +- pDrawLineElement->addAttribute("draw:style-name", m_value.str()); +- m_value.str(""); +- pDrawLineElement->addAttribute("draw:text-style-name", "P1"); +- pDrawLineElement->addAttribute("draw:layer", "layout"); +- m_value << doubleToString(p1.x) << "in"; +- pDrawLineElement->addAttribute("svg:x1", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(p1.y) << "in"; +- pDrawLineElement->addAttribute("svg:y1", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(p2.x) << "in"; +- pDrawLineElement->addAttribute("svg:x2", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(p2.y) << "in"; +- pDrawLineElement->addAttribute("svg:y2", m_value.str()); +- m_value.str(""); +- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement)); +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line"))); +- } +- else +- { +- // draw as path +- libwpg::WPGPath path; +- path.moveTo(vertices[0]); +- for(unsigned long ii = 1; ii < vertices.count(); ii++) +- path.lineTo(vertices[ii]); +- path.closed = true; +- drawPath(path); +- } +-} +- +-void OdgExporter::drawPath(const libwpg::WPGPath& path) +-{ +- if(path.count() == 0) +- return; +- +- // try to find the bounding box +- // this is simple convex hull technique, the bounding box might not be +- // accurate but that should be enough for this purpose +- libwpg::WPGPoint p = path.element(0).point; +- libwpg::WPGPoint q = path.element(0).point; +- for(unsigned k = 0; k < path.count(); k++) +- { +- libwpg::WPGPathElement element = path.element(k); +- p.x = (p.x > element.point.x) ? element.point.x : p.x; +- p.y = (p.y > element.point.y) ? element.point.y : p.y; +- q.x = (q.x < element.point.x) ? element.point.x : q.x; +- q.y = (q.y < element.point.y) ? element.point.y : q.y; +- if(element.type == libwpg::WPGPathElement::CurveToElement) +- { +- p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x; +- p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y; +- q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x; +- q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y; +- p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x; +- p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y; +- q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x; +- q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y; +- } +- } +- double vw = q.x - p.x; +- double vh = q.y - p.y; +- +- writeStyle(); +- +- OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path"); +- m_value.str(""); +- m_value << "gr" << m_styleIndex-1; +- pDrawPathElement->addAttribute("draw:style-name", m_value.str()); +- m_value.str(""); +- pDrawPathElement->addAttribute("draw:text-style-name", "P1"); +- pDrawPathElement->addAttribute("draw:layer", "layout"); +- m_value << doubleToString(p.x) << "in"; +- pDrawPathElement->addAttribute("svg:x", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(p.y) << "in"; +- pDrawPathElement->addAttribute("svg:y", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(vw) << "in"; +- pDrawPathElement->addAttribute("svg:width", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(vh) << "in"; +- pDrawPathElement->addAttribute("svg:height", m_value.str()); +- m_value.str(""); +- m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540); +- pDrawPathElement->addAttribute("svg:viewBox", m_value.str()); +- m_value.str(""); +- +- for(unsigned i = 0; i < path.count(); i++) +- { +- libwpg::WPGPathElement element = path.element(i); +- libwpg::WPGPoint point = element.point; +- switch(element.type) +- { +- // 2540 is 2.54*1000, 2.54 in = 1 in +- case libwpg::WPGPathElement::MoveToElement: +- m_value << "M" << (int)((point.x-p.x)*2540) << " "; +- m_value << (int)((point.y-p.y)*2540); +- break; +- +- case libwpg::WPGPathElement::LineToElement: +- m_value << "L" << (int)((point.x-p.x)*2540) << " "; +- m_value << (int)((point.y-p.y)*2540); +- break; +- +- case libwpg::WPGPathElement::CurveToElement: +- m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " "; +- m_value << (int)((element.extra1.y-p.y)*2540) << " "; +- m_value << (int)((element.extra2.x-p.x)*2540) << " "; +- m_value << (int)((element.extra2.y-p.y)*2540) << " "; +- m_value << (int)((point.x-p.x)*2540) << " "; +- m_value << (int)((point.y-p.y)*2540); +- break; +- +- default: +- break; +- } +- } +- if(path.closed) +- m_value << " Z"; +- pDrawPathElement->addAttribute("svg:d", m_value.str()); +- m_value.str(""); +- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement)); +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path"))); +-} +- +- +-void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap) +-{ +- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); +- m_value.str(""); +- m_value << doubleToString(bitmap.rect.x1) << "in"; +- pDrawFrameElement->addAttribute("svg:x", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(bitmap.rect.y1) << "in"; +- pDrawFrameElement->addAttribute("svg:y", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(bitmap.rect.height()) << "in"; +- pDrawFrameElement->addAttribute("svg:height", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(bitmap.rect.width()) << "in"; +- pDrawFrameElement->addAttribute("svg:width", m_value.str()); +- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); +- +- libwpg::WPGString base64Binary; +- bitmap.generateBase64DIB(base64Binary); +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); +-} +- +-void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData) +-{ +- if (binaryData.mimeType.length() <= 0) +- return; +- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); +- m_value.str(""); +- m_value << doubleToString(binaryData.rect.x1) << "in"; +- pDrawFrameElement->addAttribute("svg:x", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(binaryData.rect.y1) << "in"; +- pDrawFrameElement->addAttribute("svg:y", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(binaryData.rect.height()) << "in"; +- pDrawFrameElement->addAttribute("svg:height", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(binaryData.rect.width()) << "in"; +- pDrawFrameElement->addAttribute("svg:width", m_value.str()); +- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); +- +- libwpg::WPGString base64Binary = binaryData.getBase64Data(); +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); +- +- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); +-} +- +- +-static std::string colorToHex(const libwpg::WPGColor& color) +-{ +- char hexdigits[] = "0123456789abcdef"; +- char buffer[] = "123456"; +- buffer[0] = hexdigits[(color.red >> 4) & 15]; +- buffer[1] = hexdigits[color.red & 15]; +- buffer[2] = hexdigits[(color.green >> 4) & 15]; +- buffer[3] = hexdigits[color.green & 15]; +- buffer[4] = hexdigits[(color.blue >> 4) & 15]; +- buffer[5] = hexdigits[color.blue & 15]; +- return std::string(buffer); +-} +- +-void OdgExporter::writeStyle() +-{ +- m_value.str(""); +- m_name.str(""); +- +- if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) ) +- { +- // ODG only supports dashes with the same length of spaces inbetween +- // here we take the first space and assume everything else the same +- // note that dash length is written in percentage +- double distance = m_pen.dashArray.at(1); +- OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash"); +- tmpDrawStrokeDashElement->addAttribute("draw:style", "rect"); +- m_value << "Dash_" << m_dashIndex++; +- tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str()); +- m_value.str(""); +- m_value << doubleToString(distance*100) << "%"; +- tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str()); +- m_value.str(""); +- for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++) +- { +- m_name << "draw:dots" << i+1; +- tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1"); +- m_name.str(""); +- m_name << "draw:dots" << i+1 << "-length"; +- m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%"; +- tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str()); +- m_name.str(""); +- m_value.str(""); +- } +- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement)); +- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash"))); +- } +- +- if(m_brush.style == libwpg::WPGBrush::Gradient) +- { +- OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient"); +- tmpDrawGradientElement->addAttribute("draw:style", "linear"); +- m_value << "Gradient_" << m_gradientIndex++; +- tmpDrawGradientElement->addAttribute("draw:name", m_value.str()); +- m_value.str(""); +- +- // ODG angle unit is 0.1 degree +- double angle = -m_brush.gradient.angle(); +- while(angle < 0) +- angle += 360; +- while(angle > 360) +- angle -= 360; +- +- m_value << (unsigned)(angle*10); +- tmpDrawGradientElement->addAttribute("draw:angle", m_value.str()); +- m_value.str(""); +- +- libwpg::WPGColor startColor = m_brush.gradient.stopColor(0); +- libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1); +- m_value << "#" << colorToHex(startColor); +- tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str()); +- m_value.str(""); +- m_value << "#" << colorToHex(stopColor); +- tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str()); +- m_value.str(""); +- tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%"); +- tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%"); +- tmpDrawGradientElement->addAttribute("draw:border", "0%"); +- mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement)); +- mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient"))); +- } +- +- OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style"); +- m_value << "gr" << m_styleIndex; +- tmpStyleStyleElement->addAttribute("style:name", m_value.str()); +- m_value.str(""); +- tmpStyleStyleElement->addAttribute("style:family", "graphic"); +- tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard"); +- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement)); +- +- OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties"); +- +- if(m_pen.width > 0.0) +- { +- m_value << doubleToString(m_pen.width) << "in"; +- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str()); +- m_value.str(""); +- m_value << "#" << colorToHex(m_pen.foreColor); +- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str()); +- m_value.str(""); +- +- if(!m_pen.solid) +- { +- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash"); +- m_value << "Dash_" << m_dashIndex-1; +- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str()); +- m_value.str(""); +- } +- } +- else +- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none"); +- +- if(m_brush.style == libwpg::WPGBrush::NoBrush) +- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none"); +- +- if(m_brush.style == libwpg::WPGBrush::Solid) +- { +- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid"); +- m_value << "#" << colorToHex(m_brush.foreColor); +- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str()); +- m_value.str(""); +- } +- +- if(m_brush.style == libwpg::WPGBrush::Gradient) +- { +- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient"); +- m_value << "Gradient_" << m_gradientIndex-1; +- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str()); +- m_value.str(""); +- } +- +- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement)); +- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties"))); +- +- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style"))); +- m_styleIndex++; +-} +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx +--- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100 +@@ -1,116 +0,0 @@ +-/* libwpg +- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Library General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02111-1301 USA +- * +- * For further information visit http://libwpg.sourceforge.net +- */ +- +-/* "This product is not manufactured, approved, or supported by +- * Corel Corporation or Corel Corporation Limited." +- */ +- +-#ifndef __ODGEXPORTER_H__ +-#define __ODGEXPORTER_H__ +- +-#include <iostream> +-#include <sstream> +-#include <string> +- +-#include <libwpg/libwpg.h> +-#include "GraphicsElement.hxx" +- +-class OdgExporter : public libwpg::WPGPaintInterface { +-public: +- explicit OdgExporter(GraphicsHandler *pHandler, +- const bool isFlatXML = false); +- ~OdgExporter(); +- +-#if LIBWPG_VERSION_MINOR<2 +- void startGraphics(double imageWidth, double imageHeight); +- void endGraphics(); +- void startLayer(unsigned int id); +- void endLayer(unsigned int id); +- +- void setPen(const libwpg::WPGPen& pen); +- void setBrush(const libwpg::WPGBrush& brush); +- void setFillRule(FillRule rule); +- +- void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry); +- void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry); +- void drawPolygon(const libwpg::WPGPointArray& vertices); +- void drawPath(const libwpg::WPGPath& path); +- void drawBitmap(const libwpg::WPGBitmap& bitmap); +- void drawImageObject(const libwpg::WPGBinaryData& binaryData); +- +-private: +- std::vector <GraphicsElement *> mBodyElements; +- std::vector <GraphicsElement *> mAutomaticStylesElements; +- std::vector <GraphicsElement *> mStrokeDashElements; +- std::vector <GraphicsElement *> mGradientElements; +- GraphicsHandler *mpHandler; +- +- libwpg::WPGPen m_pen; +- libwpg::WPGBrush m_brush; +- FillRule m_fillRule; +- int m_gradientIndex; +- int m_dashIndex; +- int m_styleIndex; +- void writeStyle(); +- std::ostringstream m_value, m_name; +- double m_width, m_height; +- const bool m_isFlatXML; +-#else +- virtual void startGraphics(const ::WPXPropertyList &propList); +- virtual void endGraphics(); +- virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient); +- virtual void startLayer(const ::WPXPropertyList &propList); +- virtual void endLayer(); +- virtual void drawRectangle(const ::WPXPropertyList& propList); +- virtual void drawEllipse(const ::WPXPropertyList& propList); +- virtual void drawPolygon(const ::WPXPropertyListVector &vertices); +- virtual void drawPath(const ::WPXPropertyListVector &path); +- virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData); +- virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList); +- virtual void endEmbeddedGraphics(); +- virtual void drawPolyline(const ::WPXPropertyListVector &vertices); +- virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path); +- virtual void endTextObject(); +- virtual void startTextLine(const ::WPXPropertyList &propList); +- virtual void endTextLine(); +- virtual void startTextSpan(const ::WPXPropertyList &propList); +- virtual void endTextSpan(); +- virtual void insertText(const ::WPXString &str); +- +- +-private: +- std::vector <GraphicsElement *> mBodyElements; +- std::vector <GraphicsElement *> mAutomaticStylesElements; +- std::vector <GraphicsElement *> mStrokeDashElements; +- std::vector <GraphicsElement *> mGradientElements; +- GraphicsHandler *mpHandler; +- +- int m_gradientIndex; +- int m_dashIndex; +- int m_styleIndex; +- void writeStyle(); +- std::ostringstream m_value, m_name; +- double m_width, m_height; +- const bool m_isFlatXML; +-#endif +-}; +- +-#endif // __ODGEXPORTER_H__ +diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp +--- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp 2011-01-15 21:05:35.000000000 +0100 ++++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp 2011-01-02 17:46:15.000000000 +0100 +@@ -20,28 +20,26 @@ + #include <WPGImport.h> + #include <WPGImport.moc> + +-#include <QBuffer> +-#include <QByteArray> +-#include <QString> +- +-#include <kdebug.h> + #include <KoFilterChain.h> + #include <KoGlobal.h> + #include <KoUnit.h> ++#include <KoXmlWriter.h> ++ + #include <kpluginfactory.h> ++#include <KDebug> + +-#include <KoXmlWriter.h> ++ ++#include <QtCore/QString> ++#include <QtCore/QFile> + + #include <libwpg/libwpg.h> + #if LIBWPG_VERSION_MINOR<2 + #include <libwpg/WPGStreamImplementation.h> + #else + #include <libwpd-stream/libwpd-stream.h> ++#include <libwpd/libwpd.h> + #endif + +-#include "FileOutputHandler.hxx" +-#include "OdgExporter.hxx" +- + #include <iostream> + + K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();) +@@ -56,35 +54,13 @@ + { + } + +-static QByteArray createManifest() +-{ +- KoXmlWriter* manifestWriter; +- QByteArray manifestData; +- QBuffer manifestBuffer(&manifestData); +- +- manifestBuffer.open(QIODevice::WriteOnly); +- manifestWriter = new KoXmlWriter(&manifestBuffer); +- +- manifestWriter->startDocument("manifest:manifest"); +- manifestWriter->startElement("manifest:manifest"); +- manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0"); +- manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics"); +- //manifestWriter->addManifestEntry( "styles.xml", "text/xml" ); +- manifestWriter->addManifestEntry("content.xml", "text/xml"); +- manifestWriter->endElement(); +- manifestWriter->endDocument(); +- delete manifestWriter; +- +- return manifestData; +-} +- + + KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to) + { + if (from != "application/x-wpg") + return KoFilter::NotImplemented; + +- if (to != "application/vnd.oasis.opendocument.graphics") ++ if (to != "image/svg+xml") + return KoFilter::NotImplemented; + + #if LIBWPG_VERSION_MINOR<2 +@@ -96,6 +72,7 @@ + input = olestream; + } + } ++ libwpg::WPGString output; + #else + WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit()); + if (input->isOLEStream()) { +@@ -105,59 +82,31 @@ + input = olestream; + } + } ++ ::WPXString output; + #endif + + if (!libwpg::WPGraphics::isSupported(input)) { +- std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl; ++ kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!"; + delete input; + return KoFilter::NotImplemented; + } + +- // do the conversion +- std::ostringstream tmpStringStream; +- FileOutputHandler tmpHandler(tmpStringStream); +- OdgExporter exporter(&tmpHandler); +- libwpg::WPGraphics::parse(input, &exporter); +- delete input; +- +- +- // create output store +- KoStore* storeout; +- storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write, +- "application/vnd.oasis.opendocument.graphics", KoStore::Zip); +- +- if (!storeout) { +- kWarning() << "Couldn't open the requested file."; +- return KoFilter::FileNotFound; +- } +- +-#if 0 +- if (!storeout->open("styles.xml")) { +- kWarning() << "Couldn't open the file 'styles.xml'."; +- return KoFilter::CreationError; ++ if (!libwpg::WPGraphics::generateSVG(input, output)) { ++ kWarning() << "ERROR: SVG Generation failed!"; ++ delete input; ++ return KoFilter::ParsingError; + } +- //storeout->write( createStyles() ); +- storeout->close(); +-#endif + +- if (!storeout->open("content.xml")) { +- kWarning() << "Couldn't open the file 'content.xml'."; +- return KoFilter::CreationError; +- } +- storeout->write(tmpStringStream.str().c_str()); +- storeout->close(); ++ delete input; + +- // store document manifest +- storeout->enterDirectory("META-INF"); +- if (!storeout->open("manifest.xml")) { +- kWarning() << "Couldn't open the file 'META-INF/manifest.xml'."; +- return KoFilter::CreationError; ++ QFile outputFile(m_chain->outputFile()); ++ if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) { ++ kWarning() << "ERROR: Could not open output file" << m_chain->outputFile(); ++ return KoFilter::InternalError; + } +- storeout->write(createManifest()); +- storeout->close(); + +- // we are done! +- delete storeout; ++ outputFile.write(output.cstr()); ++ outputFile.close(); + + return KoFilter::OK; + } + diff --git a/testing/koffice/koffice.install b/testing/koffice/koffice.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/testing/koffice/koffice.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/koffice/krita.install b/testing/koffice/krita.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/testing/koffice/krita.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/testing/libnl/PKGBUILD b/testing/libnl/PKGBUILD new file mode 100644 index 000000000..aad1e29fe --- /dev/null +++ b/testing/libnl/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 137671 2011-09-10 11:33:31Z pierre $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=libnl +pkgver=1.1 +pkgrel=3 +pkgdesc="Library for applications dealing with netlink sockets" +arch=('i686' 'x86_64') +url="http://www.infradead.org/~tgr/libnl/" +license=('GPL') +depends=('glibc') +source=("http://www.infradead.org/~tgr/libnl/files/${pkgname}-${pkgver}.tar.gz" + 'fix-compilation.patch') +md5sums=('ae970ccd9144e132b68664f98e7ceeb1' + 'e1f5e82c8aa1b3ad025c7b588178de1e') + +build() { + cd ${srcdir}/libnl-${pkgver} + patch -Np1 -i ${srcdir}/fix-compilation.patch + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/libnl-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/libnl/fix-compilation.patch b/testing/libnl/fix-compilation.patch new file mode 100644 index 000000000..891562a39 --- /dev/null +++ b/testing/libnl/fix-compilation.patch @@ -0,0 +1,10 @@ +--- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100 ++++ libnl-1.1/include/netlink-local.h 2009-06-26 11:15:33.186011844 +0200 +@@ -26,6 +26,7 @@ + #include <sys/socket.h> + #include <inttypes.h> + #include <assert.h> ++#include <limits.h> + + #include <arpa/inet.h> + #include <netdb.h> diff --git a/testing/libtool/PKGBUILD b/testing/libtool/PKGBUILD new file mode 100644 index 000000000..80148151a --- /dev/null +++ b/testing/libtool/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 137506 2011-09-08 07:11:50Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +# NOTE: requires rebuilt with each new gcc version + +pkgname=('libtool' 'libltdl') +pkgver=2.4 +pkgrel=5 +pkgdesc="A generic library support script" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/libtool" +license=('GPL') +options=('!libtool') +source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz) +md5sums=('4e6144439d95d7332dc50ace6dd24c55') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + ./configure --prefix=/usr + make +} + +check() { + cd ${srcdir}/${pkgbase}-${pkgver} + make check +} + +package_libtool() { + depends=('sh' "libltdl=$pkgver" 'gcc=4.6.1') + groups=('base-devel') + install=libtool.install + + cd ${srcdir}/${pkgbase}-${pkgver} + + make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ + install-data-local + rm -rf ${pkgdir}/usr/share/libtool/libltdl/ +} + +package_libltdl() { + pkgdesc="A system independent dlopen wrapper for GNU libtool" + + cd ${srcdir}/${pkgbase}-${pkgver} + make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \ + install-ltdlincludeHEADERS install-data-local + rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config} +} diff --git a/testing/libtool/libtool.install b/testing/libtool/libtool.install new file mode 100644 index 000000000..73cf56422 --- /dev/null +++ b/testing/libtool/libtool.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(libtool.info libtool.info-1 libtool.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/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/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD new file mode 100644 index 000000000..755373823 --- /dev/null +++ b/testing/mdadm/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 138013 2011-09-14 09:45:11Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> +pkgname=mdadm +pkgver=3.2.2 +pkgrel=4 +pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" +arch=(i686 x86_64) +license=('GPL') +url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/" +groups=('base') +conflicts=('mkinitcpio<0.7') +depends=('glibc') +backup=('etc/mdadm.conf') +source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 + mdadm + mdadm.conf + mdadm_install + mdadm_hook + mdadm_udev_install + disable-werror.patch + linux-3.0.patch) +install=mdadm.install +replaces=('raidtools') +md5sums=('12ee2fbf3beddb60601fb7a4c4905651' + '6df172c8f77b280018cf87eb3d313f29' + '00cbed931db4f15b6ce49e3e7d433966' + '9b01e96b6c3c218fb61628c9281fe688' + 'c8c0713f5c7da51822ee6f3911473a1c' + 'cd258e1bf430c02a25f40b4329df9f57' + '4ad87b74a4bc9a34621280abe0e0c3e4' + 'c499b3edbf2c400c8a1984e18c7ce7fa') + +build() { + cd $srcdir/$pkgname-$pkgver + patch -Np0 -i ../disable-werror.patch + patch -Np1 -i ../linux-3.0.patch + make CXFLAGS="$CFLAGS" + # build static mdassemble for Arch's initramfs + make MDASSEMBLE_AUTO=1 mdassemble + +} + +package() { + cd $srcdir/$pkgname-$pkgver + make INSTALL=/bin/install DESTDIR=$pkgdir install + install -D -m755 mdassemble $pkgdir/sbin/mdassemble + install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf + install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm + install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm + install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm + install -D -m644 ../mdadm_udev_install $pkgdir/lib/initcpio/install/mdadm_udev + # symlink for backward compatibility + ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid +} diff --git a/testing/mdadm/disable-werror.patch b/testing/mdadm/disable-werror.patch new file mode 100644 index 000000000..50a33f19d --- /dev/null +++ b/testing/mdadm/disable-werror.patch @@ -0,0 +1,11 @@ +--- Makefile.old 2011-06-17 09:38:03.269238332 +0200 ++++ Makefile 2011-06-17 09:38:14.122398837 +0200 +@@ -42,7 +42,7 @@ + + CC = $(CROSS_COMPILE)gcc + CXFLAGS = -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O + endif diff --git a/testing/mdadm/linux-3.0.patch b/testing/mdadm/linux-3.0.patch new file mode 100644 index 000000000..cd9d5473c --- /dev/null +++ b/testing/mdadm/linux-3.0.patch @@ -0,0 +1,45 @@ +From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001 +From: NeilBrown <neilb@suse.de> +Date: Fri, 17 Jun 2011 22:49:24 +1000 +Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers. + +The next version of Linux might be 3.0. If it is, get_linux_version +will fail. +So make it more robust. + +Reported-by: Namhyung Kim <namhyung@gmail.com> +Reported-by: Milan Broz <mbroz@redhat.com> +Signed-off-by: NeilBrown <neilb@suse.de> +--- + util.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/util.c b/util.c +index 10bbe56..55d171a 100644 +--- a/util.c ++++ b/util.c +@@ -146,16 +146,16 @@ int get_linux_version() + { + struct utsname name; + char *cp; +- int a,b,c; ++ int a = 0, b = 0,c = 0; + if (uname(&name) <0) + return -1; + + cp = name.release; + a = strtoul(cp, &cp, 10); +- if (*cp != '.') return -1; +- b = strtoul(cp+1, &cp, 10); +- if (*cp != '.') return -1; +- c = strtoul(cp+1, NULL, 10); ++ if (*cp == '.') ++ b = strtoul(cp+1, &cp, 10); ++ if (*cp == '.') ++ c = strtoul(cp+1, &cp, 10); + + return (a*1000000)+(b*1000)+c; + } +-- +1.7.2.3 + diff --git a/testing/mdadm/mdadm b/testing/mdadm/mdadm new file mode 100755 index 000000000..e196f3642 --- /dev/null +++ b/testing/mdadm/mdadm @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /sbin/mdadm` +case "$1" in + start) + stat_busy "Starting mdadm RAID Monitor" + if [ -z "$PID" ]; then + /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon mdadm + stat_done + fi + ;; + stop) + stat_busy "Stopping mdadm RAID Monitor" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon mdadm + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/mdadm/mdadm.conf b/testing/mdadm/mdadm.conf new file mode 100644 index 000000000..57bd4c683 --- /dev/null +++ b/testing/mdadm/mdadm.conf @@ -0,0 +1,67 @@ +# mdadm configuration file +# +# mdadm will function properly without the use of a configuration file, +# but this file is useful for keeping track of arrays and member disks. +# In general, a mdadm.conf file is created, and updated, after arrays +# are created. This is the opposite behavior of /etc/raidtab which is +# created prior to array construction. +# +# +# the config file takes two types of lines: +# +# DEVICE lines specify a list of devices of where to look for +# potential member disks +# +# ARRAY lines specify information about how to identify arrays so +# so that they can be activated +# + + +# You can have more than one device line and use wild cards. The first +# example includes SCSI the first partition of SCSI disks /dev/sdb, +# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second +# line looks for array slices on IDE disks. +# +#DEVICE /dev/sd[bcdjkl]1 +#DEVICE /dev/hda1 /dev/hdb1 +# +# The designation "partitions" will scan all partitions found in +# /proc/partitions +DEVICE partitions + + +# ARRAY lines specify an array to assemble and a method of identification. +# Arrays can currently be identified by using a UUID, superblock minor number, +# or a listing of devices. +# +# super-minor is usually the minor number of the metadevice +# UUID is the Universally Unique Identifier for the array +# Each can be obtained using +# +# mdadm -D <md> +# +# To capture the UUIDs for all your RAID arrays to this file, run these: +# to get a list of running arrays: +# # mdadm -D --scan >>/etc/mdadm.conf +# to get a list from superblocks: +# # mdadm -E --scan >>/etc/mdadm.conf +# +#ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371 +#ARRAY /dev/md1 super-minor=1 +#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1 +# +# ARRAY lines can also specify a "spare-group" for each array. mdadm --monitor +# will then move a spare between arrays in a spare-group if one array has a +# failed drive but no spare +#ARRAY /dev/md4 uuid=b23f3c6d:aec43a9f:fd65db85:369432df spare-group=group1 +#ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 spare-group=group1 +# + + +# When used in --follow (aka --monitor) mode, mdadm needs a +# mail address and/or a program. To start mdadm's monitor mode, add +# "mdadm" to your DAEMONS array in /etc/rc.conf +# +# If the lines are not found, mdadm will exit quietly +#MAILADDR root@mydomain.tld +#PROGRAM /usr/sbin/handle-mdadm-events diff --git a/testing/mdadm/mdadm.install b/testing/mdadm/mdadm.install new file mode 100644 index 000000000..e8404c260 --- /dev/null +++ b/testing/mdadm/mdadm.install @@ -0,0 +1,10 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then + echo "Attention mdadm update:" + echo "raid_partitions hook has been replaced by the more powerfull mdadm hook." + echo "Please update your /etc/mkinitcpio.conf accordingly." + fi +} diff --git a/testing/mdadm/mdadm_hook b/testing/mdadm/mdadm_hook new file mode 100755 index 000000000..7b2dc1ad1 --- /dev/null +++ b/testing/mdadm/mdadm_hook @@ -0,0 +1,44 @@ +# vim: set ft=sh: +run_hook () +{ + input="$(cat /proc/cmdline)" + mdconfig="/etc/mdadm.conf" + # for partitionable raid, we need to load md_mod first! + modprobe md_mod 2>/dev/null + # If md is specified on commandline, create config file from those parameters. + if [ "$(echo $input | grep "md=")" ]; then + #Create initial mdadm.conf + # scan all devices in /proc/partitions + echo DEVICE partitions > $mdconfig + for i in $input; do + case $i in + # raid + md=[0-9]*,/*) + device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device devices=$array" >> $mdconfig + ;; + # partitionable raid + md=d[0-9]*,/*) + device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device devices=$array" >> $mdconfig + ;; + # raid UUID + md=[0-9]*,[0-9,a-z]*) + device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + ;; + # partitionable raid UUID + md=d[0-9]*,[0-9,a-z]*) + device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')" + array="$(echo $i | cut -d, -f2-)" + echo "ARRAY /dev/$device UUID=$array" >> $mdconfig + ;; + esac + done + fi + # assemble everything + [ -e $mdconfig ] && /sbin/mdassemble +} diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install new file mode 100644 index 000000000..b53258676 --- /dev/null +++ b/testing/mdadm/mdadm_install @@ -0,0 +1,45 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " + BINARIES="" + FILES="" + SCRIPT="mdadm" + # check if a custom mdadm.conf exists + if grep -q ^ARRAY /etc/mdadm.conf; then + echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." + add_file "/etc/mdadm.conf" + fi + add_binary "/sbin/mdassemble" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for any raid root device, + and assembles the raid device when run. + + If arrays are defined in /etc/mdadm.conf, the file will be used instead + of command line assembling. + + Command Line Setup: + - for raid arrays with persistent superblocks: + md=<md device no.>,dev0,dev1,...,devn + md=<md device no.>,uuid + - for partitionable raid arrays with persistent superblocks: + md=d<md device no.>,dev0,dev1,...,devn + md=d<md device no.>,uuid + + Parameters: + - <md device no.> = the number of the md device: + 0 means md0, 1 means md1, ... + - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 + or 0900878d:f95f6057:c39a36e9:55efa60a + Examples: + - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 + This will setup 2 md partitionable arrays. + - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 + This will setup 2 md arrays with persistent superblocks. +HELPEOF +} diff --git a/testing/mdadm/mdadm_udev_install b/testing/mdadm/mdadm_udev_install new file mode 100644 index 000000000..9fc161624 --- /dev/null +++ b/testing/mdadm/mdadm_udev_install @@ -0,0 +1,23 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " + BINARIES="" + FILES="" + SCRIPT="" + # check if a custom mdadm.conf exists + if grep -q ^ARRAY /etc/mdadm.conf; then + echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." + add_file "/etc/mdadm.conf" + fi + add_binary "/sbin/mdadm" + add_file "/lib/udev/rules.d/64-md-raid.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads raid arrays with udev. +HELPEOF +} diff --git a/testing/mkinitcpio-nfs-utils/PKGBUILD b/testing/mkinitcpio-nfs-utils/PKGBUILD new file mode 100644 index 000000000..c52986246 --- /dev/null +++ b/testing/mkinitcpio-nfs-utils/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 137669 2011-09-10 11:25:12Z pierre $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=mkinitcpio-nfs-utils +pkgver=0.2 +pkgrel=2 +pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" +arch=('i686' 'x86_64') +url="http://www.archlinux.org/" +license=('GPL2') +depends=('glibc') +source=(ftp://ftp.archlinux.org/other/mkinitcpio/${pkgname}-${pkgver}.tar.gz) +sha256sums=('3f2839f21a420cd732d34e58f84534acdb7fc29f69381dbba3f00e3424201cd3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} 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/util-linux/agetty-typo.patch b/testing/util-linux/agetty-typo.patch new file mode 100644 index 000000000..a333d6280 --- /dev/null +++ b/testing/util-linux/agetty-typo.patch @@ -0,0 +1,27 @@ +From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 7 Sep 2011 07:37:03 +0200 +Subject: [PATCH] agetty: double equals sign typo in opentty() + +Reported-by: Francesco Cosoleto <cosoleto@gmail.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + term-utils/agetty.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/term-utils/agetty.c b/term-utils/agetty.c +index 733be38..35bb389 100644 +--- a/term-utils/agetty.c ++++ b/term-utils/agetty.c +@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op) + * In case of a virtual console the ioctl TIOCMGET fails and + * the error number will be set to EINVAL. + */ +- if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) { ++ if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) { + op->flags |= F_VCONSOLE; + if (!op->term) + op->term = DEFAULT_VCTERM; +-- +1.7.6.1 + diff --git a/testing/util-linux/dmesg-non-printk.patch b/testing/util-linux/dmesg-non-printk.patch new file mode 100644 index 000000000..ea2354420 --- /dev/null +++ b/testing/util-linux/dmesg-non-printk.patch @@ -0,0 +1,69 @@ +From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 31 Aug 2011 12:28:39 +0200 +Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels + + * dmesg(1) incorrectly assumes that lines like "<6>\n" + are broken. + + * it's more robust to assume the end of the record is "\n<" + + * print \n for empty lines + +Reported-by: "Gabor Z. Papp" <gzp@papp.hu> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/dmesg.c | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c +index 6090f4e..8e7bb4b 100644 +--- a/sys-utils/dmesg.c ++++ b/sys-utils/dmesg.c +@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + + if (!begin) + begin = p; +- if (*p == '\n') +- end = p; + if (i + 1 == rec->next_size) { + end = p + 1; + i++; +- } ++ } else if (*p == '\n' && *(p + 1) == '<') ++ end = p; ++ + if (begin && !*begin) + begin = NULL; /* zero(s) at the end of the buffer? */ + if (!begin || !end) +@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + } + } + +- if (end <= begin) +- return -1; /* error */ +- + if (*begin == '[' && (*(begin + 1) == ' ' || + isdigit(*(begin + 1)))) { + if (ctl->delta || ctl->ctime) { +@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size, + } + + while (get_next_record(ctl, &rec) == 0) { +- if (!rec.mesg_size) +- continue; + + if (!accept_record(ctl, &rec)) + continue; + ++ if (!rec.mesg_size) { ++ putchar('\n'); ++ continue; ++ } ++ + if (ctl->decode && rec.level >= 0 && rec.facility >= 0) + printf("%-6s:%-6s: ", facility_names[rec.facility].name, + level_names[rec.level].name); +-- +1.7.6.1 + diff --git a/testing/util-linux/dmesg-space.patch b/testing/util-linux/dmesg-space.patch new file mode 100644 index 000000000..2038888cc --- /dev/null +++ b/testing/util-linux/dmesg-space.patch @@ -0,0 +1,31 @@ +From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Fri, 2 Sep 2011 14:42:04 +0200 +Subject: [PATCH] dmesg: remove extra space only after time stamp + +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/dmesg.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c +index 8e7bb4b..b3713a0 100644 +--- a/sys-utils/dmesg.c ++++ b/sys-utils/dmesg.c +@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + break; + } + } ++ if (begin < end && *begin == ' ') ++ begin++; + } + +- if (begin < end && *begin == ' ') +- begin++; +- + rec->mesg = begin; + rec->mesg_size = end - begin; + +-- +1.7.6.1 + diff --git a/testing/util-linux/dont-close-0.patch b/testing/util-linux/dont-close-0.patch new file mode 100644 index 000000000..75cfc5c5e --- /dev/null +++ b/testing/util-linux/dont-close-0.patch @@ -0,0 +1,32 @@ +From 3a18db62e661fbb307ad3a53c18afabc92d3c63e Mon Sep 17 00:00:00 2001 +From: Petr Uzel <petr.uzel@suse.cz> +Date: Tue, 13 Sep 2011 11:08:46 +0200 +Subject: [PATCH 1/2] lib: do not attempt to close(0) in sysfs_deinit() + +If the 'open' fails we 'goto err' which runs 'sysfs_deinit()' on a 'cxt' +which hasn't been fully initialised. The 'dir_fd' is still 0, so +sysfs_deinit calls "close(0)". + +Addresses: https://bugzilla.novell.com/show_bug.cgi?id=714151 +Reported-by: Diego Ercolani <diego.ercolani@gmail.com> +Analysed-by: Neil Brown <nfbrown@suse.com> +Signed-off-by: Petr Uzel <petr.uzel@suse.cz> +--- + lib/sysfs.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/lib/sysfs.c b/lib/sysfs.c +index eec1f24..ebb3bb5 100644 +--- a/lib/sysfs.c ++++ b/lib/sysfs.c +@@ -140,6 +140,7 @@ int sysfs_init(struct sysfs_cxt *cxt, dev_t devno, struct sysfs_cxt *parent) + int fd, rc = 0; + + memset(cxt, 0, sizeof(*cxt)); ++ cxt->dir_fd = -1; + + if (!sysfs_devno_path(devno, path, sizeof(path))) + goto err; +-- +1.7.6.1 + diff --git a/testing/util-linux/fix-remount.patch b/testing/util-linux/fix-remount.patch new file mode 100644 index 000000000..67149ab46 --- /dev/null +++ b/testing/util-linux/fix-remount.patch @@ -0,0 +1,37 @@ +From 277a6dd53569a409e05316a7bdaed0e78e326762 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Tue, 13 Sep 2011 22:59:39 +0200 +Subject: [PATCH 2/2] mount: check for target before source on remount + +Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=737091 +Reported-by: Eric Paris <eparis@redhat.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + mount/fstab.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/mount/fstab.c b/mount/fstab.c +index 8d88f68..77bf81c 100644 +--- a/mount/fstab.c ++++ b/mount/fstab.c +@@ -272,10 +272,15 @@ getmntfilebackward (const char *name, struct mntentchn *mcprev) { + mc0 = mtab_head(); + if (!mcprev) + mcprev = mc0; ++ + for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) +- if (streq(mc->m.mnt_dir, name) || +- streq(mc->m.mnt_fsname, name)) ++ if (streq(mc->m.mnt_dir, name)) + return mc; ++ ++ for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) ++ if (streq(mc->m.mnt_fsname, name)) ++ return mc; ++ + return NULL; + } + +-- +1.7.6.1 + diff --git a/testing/util-linux/write-freopen.patch b/testing/util-linux/write-freopen.patch new file mode 100644 index 000000000..a2014a107 --- /dev/null +++ b/testing/util-linux/write-freopen.patch @@ -0,0 +1,27 @@ +From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Tue, 6 Sep 2011 03:18:46 +0200 +Subject: [PATCH] write: fix path for freopen() + +Reported-by: xinglp <xinglp@gmail.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + term-utils/write.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/term-utils/write.c b/term-utils/write.c +index a825f62..a70eb7b 100644 +--- a/term-utils/write.c ++++ b/term-utils/write.c +@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid) + + if (strlen(tty) + 6 > sizeof(path)) + errx(EXIT_FAILURE, _("tty path %s too long"), tty); +- printf(path, "/dev/%s", tty); ++ snprintf(path, sizeof(path), "/dev/%s", tty); + if ((freopen(path, "w", stdout)) == NULL) + err(EXIT_FAILURE, "%s", path); + +-- +1.7.6.1 + diff --git a/testing/wget/PKGBUILD b/testing/wget/PKGBUILD new file mode 100644 index 000000000..d37af779d --- /dev/null +++ b/testing/wget/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 138166 2011-09-17 22:43:36Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=wget +pkgver=1.13.4 +pkgrel=1 +pkgdesc="A network utility to retrieve files from the Web" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/wget/wget.html" +license=('GPL3') +groups=('base') +depends=('glibc' 'openssl') +optdepends=('ca-certificates: HTTPS downloads') +backup=('etc/wgetrc') +install=wget.install +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) +md5sums=('7f518b3a71e9efd330e9a0c3714f8463') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Note : We do not build with --enable-nls, because there is a bug in wget causing + # international domain names to be not properly converted to punycode if + # the current locale is a UTF-8 one + # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html + + ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + cat >> "$pkgdir/etc/wgetrc" <<EOF + +# default root certs location +ca_certificate=/etc/ssl/certs/ca-certificates.crt +EOF + + # remove IRI option from wgetrc as it does not work (see above) + sed -i '118,120d' $pkgdir/etc/wgetrc + +} diff --git a/testing/wget/wget.install b/testing/wget/wget.install new file mode 100644 index 000000000..8eb6a2c3f --- /dev/null +++ b/testing/wget/wget.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(wget.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $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 $infodir/dir 2> /dev/null + done +} 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="" diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD index 138325de4..209144a69 100644 --- a/~fauno/notmuch/PKGBUILD +++ b/~fauno/notmuch/PKGBUILD @@ -3,8 +3,8 @@ # Maintainer: Richard Murri <admin@richardmurri.com> pkgname=notmuch -pkgver=0.7 -pkgrel=2 +pkgver=0.8 +pkgrel=1 pkgdesc="Notmuch is not much of an email program" arch=(i686 x86_64 mips64el) url="http://notmuchmail.org/" @@ -17,7 +17,7 @@ optdepends=('emacs: for using the emacs interface' 'ruby: for using the ruby bindings' 'gnupg: for email encryption') source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('475197e505255b9603eedb53a68aa32d') +md5sums=('915fe95817e263d62e6de5c3b3c389c4') build() { cd "$srcdir/${pkgname}-${pkgver}" |
