diff options
319 files changed, 59 insertions, 29397 deletions
diff --git a/community-staging/0ad/PKGBUILD b/community-staging/0ad/PKGBUILD deleted file mode 100644 index 6b2a83894..000000000 --- a/community-staging/0ad/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> -# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com> -pkgname=0ad -pkgver=a10 -_pkgver=r11863-alpha -pkgrel=3 -pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" -arch=('i686' 'x86_64') -url="http://wildfiregames.com/0ad" -license=('GPL2' 'CCPL') -depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'gamin' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'openexr' 'python2' 'sdl' 'wxgtk' 'zip' 'zlib' 'libgl' '0ad-data') -makedepends=('boost' 'cmake' 'mesa') -source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz" - "boost-1.50.patch") -md5sums=('f42a2e18515cbcd48b99f0ea3796b3a4' - '570724341102e23730de2f70d3a1b97c') - -build() { - cd "$srcdir/$pkgname-$_pkgver/build/workspaces" - - sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" - sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" - patch -d ../.. -Np1 < $srcdir/boost-1.50.patch - - ./update-workspaces.sh \ - --with-system-enet \ - --bindir=/usr/bin \ - --libdir=/usr/lib \ - --datadir=/usr/share/${pkgname}/data - - cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc" - - make CONFIG=Release -} - -package() { - install -d ${pkgdir}/usr/{bin,lib} - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin - install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib - - install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" -} diff --git a/community-staging/0ad/boost-1.50.patch b/community-staging/0ad/boost-1.50.patch deleted file mode 100644 index 26ebd3e96..000000000 --- a/community-staging/0ad/boost-1.50.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ru 0ad-r11863-alpha/source/graphics/TextureManager.cpp 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp ---- 0ad-r11863-alpha/source/graphics/TextureManager.cpp 2012-02-19 04:30:59.000000000 +0100 -+++ 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp 2012-07-10 21:00:52.753251312 +0200 -@@ -425,9 +425,9 @@ - CTextureConverter::SettingsFile* f = GetSettingsFile(settingsPath); - if (f) - files.push_back(f); -- p = p / *it; -+ p = p / it->wstring(); - } -- return m_TextureConverter.ComputeSettings(srcPath.leaf(), files); -+ return m_TextureConverter.ComputeSettings(srcPath.leaf().wstring(), files); - } - - /** -diff -ru 0ad-r11863-alpha/source/lib/pch/pch_boost.h 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h ---- 0ad-r11863-alpha/source/lib/pch/pch_boost.h 2012-02-16 19:01:10.000000000 +0100 -+++ 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h 2012-07-10 19:51:38.413009623 +0200 -@@ -25,7 +25,7 @@ - - // the following boost libraries have been included in TR1 and are - // thus deemed usable: --#define BOOST_FILESYSTEM_VERSION 2 -+#define BOOST_FILESYSTEM_VERSION 3 - #include <boost/filesystem.hpp> - namespace fs = boost::filesystem; - #include <boost/shared_ptr.hpp> -diff -ru 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp ---- 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 2011-05-25 12:39:13.000000000 +0200 -+++ 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp 2012-07-10 20:55:52.523233843 +0200 -@@ -53,7 +53,7 @@ - fs::wpath components = pathname.string(); - fs::wpath::iterator it = components.begin(); - std::advance(it, 2); -- std::wstring dirname = *it; -+ std::wstring dirname = it->wstring(); - - CScriptValRooted ai; - self->m_ScriptInterface.Eval("({})", ai); diff --git a/community-staging/bitcoin/PKGBUILD b/community-staging/bitcoin/PKGBUILD deleted file mode 100644 index 4f7bab48f..000000000 --- a/community-staging/bitcoin/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 73543 2012-07-09 12:27:15Z tredaelli $ -# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> -# Contributor: shahid <helllamer@gmail.com> - -pkgbase=bitcoin -pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.6.3 -_commit=bbe1084 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.bitcoin.org/" -makedepends=('boost' 'automoc4' 'miniupnpc') -conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git') -replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git') -license=('MIT') -source=("$pkgbase-$pkgver.tar.gz::https://github.com/bitcoin/$pkgbase/tarball/v$pkgver") -sha256sums=('3f1a0df5d713c9e4f54f00a8f3f75c6828041afd826e16976b00229de0aecb70') - -build() { - cd "$srcdir/bitcoin-$pkgbase-$_commit" - - # and make qt gui - qmake - make - - # make bitcoind - make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS" USE_UPNP=1 -} - - -package_bitcoin-qt() { - pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT" - depends=(boost-libs qt miniupnpc) - install=bitcoin-qt.install - - cd "$srcdir/bitcoin-$pkgbase-$_commit" - install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt - install -Dm644 contrib/debian/bitcoin-qt.desktop \ - "$pkgdir"/usr/share/applications/bitcoin.desktop - install -Dm644 share/pixmaps/bitcoin80.xpm \ - "$pkgdir"/usr/share/pixmaps/bitcoin80.xpm - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -package_bitcoin-daemon() { - pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon" - depends=(boost-libs miniupnpc openssl) - - cd "$srcdir/bitcoin-$pkgbase-$_commit" - install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind - install -Dm644 contrib/debian/examples/bitcoin.conf \ - "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf" - install -Dm644 contrib/debian/manpages/bitcoind.1 \ - "$pkgdir"/usr/share/man/man1/bitcoind.1 - install -Dm644 contrib/debian/manpages/bitcoin.conf.5 \ - "$pkgdir"/usr/share/man/man5/bitcoin.conf.5 - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - diff --git a/community-staging/bitcoin/bitcoin-qt.install b/community-staging/bitcoin/bitcoin-qt.install deleted file mode 100644 index f98ba7338..000000000 --- a/community-staging/bitcoin/bitcoin-qt.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-staging/cclive/PKGBUILD b/community-staging/cclive/PKGBUILD deleted file mode 100644 index 9f067cc59..000000000 --- a/community-staging/cclive/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 73463 2012-07-08 05:01:51Z tdziedzic $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: joyfulgirl@archlinux.us -# Contributor: nathan owe ndowens04 at gmail dot com - -pkgname=cclive -pkgver=0.7.9 -pkgrel=2 -pkgdesc='Commandline downloader for popular video websites.' -arch=('i686' 'x86_64') -url='http://cclive.sourceforge.net/' -license=('GPL3') -depends=('boost-libs' 'pcre' 'curl' 'libquvi') -makedepends=('boost') -source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz") -md5sums=('2c7a3bbc2d6fdcfebb60cb3ae57944b5') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr - - make -} - -package() { - cd $pkgname-$pkgver - - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/cegui/PKGBUILD b/community-staging/cegui/PKGBUILD deleted file mode 100644 index b76a4e5e7..000000000 --- a/community-staging/cegui/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 73583 2012-07-10 18:04:30Z 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.6 -pkgrel=4 -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' 'ogre' 'irrlicht' 'gtk2' 'boost' 'graphviz') -optdepends=("python2: python bindings" - "ogre: ogre module" - "irrlicht: irrlicht module") -options=(!libtool) -source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz - cegui-0.7.6-python-detection.patch) -md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3' - '4600775f78b7349621a8a314ade8c902') - -build() { - cd $srcdir/CEGUI-${pkgver} - - patch -Np0 < $srcdir/cegui-0.7.6-python-detection.patch - - ./bootstrap - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --enable-null-renderer \ - --with-gtk2 - - make -} - -package() { - cd $srcdir/CEGUI-${pkgver} - - make DESTDIR=${pkgdir} install - - cd doc/doxygen && doxygen - cd .. && make DESTDIR=${pkgdir} install-html - - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} - diff --git a/community-staging/cegui/cegui-0.7.6-python-detection.patch b/community-staging/cegui/cegui-0.7.6-python-detection.patch deleted file mode 100644 index e14cd812e..000000000 --- a/community-staging/cegui/cegui-0.7.6-python-detection.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- acinclude.m4.original 2012-01-24 10:42:16.066632295 +0100 -+++ acinclude.m4 2012-01-24 10:43:15.800274030 +0100 -@@ -1411,7 +1411,7 @@ - if test x$ax_python_bin != x; then - AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) - AC_CHECK_HEADER([$ax_python_bin/Python.h], -- [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]], -+ [[ax_python_header="/usr/include/$ax_python_bin"]], - ax_python_header=no) - if test x$ax_python_lib != xno; then - if test x$ax_python_header != xno; then diff --git a/community-staging/encfs/PKGBUILD b/community-staging/encfs/PKGBUILD deleted file mode 100644 index f591fc9f3..000000000 --- a/community-staging/encfs/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 73387 2012-07-07 03:05:01Z tdziedzic $ -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Sven Kauber, <celeon@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=encfs -pkgver=1.7.4 -pkgrel=8 -pkgdesc='Encrypted filesystem in user-space' -arch=('i686' 'x86_64') -url='http://www.arg0.net/encfs' -license=('GPL') -depends=('rlog' 'openssl' 'fuse' 'boost-libs') -makedepends=('boost') -options=('!libtool') -source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz") -md5sums=('ac90cc10b2e9fc7e72765de88321d617') - -build(){ - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-staging/ffmpeg2theora/PKGBUILD b/community-staging/ffmpeg2theora/PKGBUILD deleted file mode 100644 index b63fe717c..000000000 --- a/community-staging/ffmpeg2theora/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 73271 2012-07-05 06:07:34Z ebelanger $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Angelo Theodorou <encelo@users.sourceforge.net> -# Contributor: Alexander Rødseth <rodseth@gmail.com> -pkgname=ffmpeg2theora -pkgver=0.29 -pkgrel=1 -pkgdesc="Simple converter to create Ogg Theora files" -arch=('x86_64' 'i686') -url="http://www.v2v.cc/~j/ffmpeg2theora/" -license=('GPL') -depends=('ffmpeg') -makedepends=('scons') # 'libkate') -source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2") -sha256sums=('214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - scons -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - scons install destdir="$pkgdir" prefix="/usr" mandir="PREFIX/share/man" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/freeorion/PKGBUILD b/community-staging/freeorion/PKGBUILD deleted file mode 100644 index 3ebe1af79..000000000 --- a/community-staging/freeorion/PKGBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# $Id: PKGBUILD 73567 2012-07-09 23:46:20Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: guini <sidtrun@googlemail.com> -# Contributor: Forrest Loomis <cybercyst _ at _ gmail dot com> -# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: fana-m <geminin@gmx.net> - -pkgname=freeorion -pkgver=0.4 -_fixedrevision=4635 -pkgrel=6 -pkgdesc="Turn-based galactic conquest game inspired by Master of Orion" -arch=('x86_64' 'i686') -url="http://www.freeorion.org/" -license=('GPL') -if [ "$CARCH" == "x86_64" ] -then - depends=('lib32-nvidia-cg-toolkit') -else - depends=('nvidia-cg-toolkit') -fi -depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils') -makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-11' 'graphviz' 'libogg' - 'desktop-file-utils' 'setconf' 'clang' 'cmake' 'gendesk' 'subversion') -options=('!strip' '!emptydirs') -install=$pkgname.install -source=("$pkgname.sh" - "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png") -sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf' - 'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f') - -build() { - cd "$srcdir" - gendesk -n - - msg2 "Checking out svn revision $_fixedrevision..." - if [[ -d "$pkgname/.svn" ]]; then - (cd "$pkgname" && svn up -r "$_fixedrevision") - else - svn co \ - https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/ \ - --config-dir ./ -r "$_fixedrevision" "$pkgname" - fi - - msg2 "Setting up build directory..." - rm -rf "$srcdir/$pkgname-build" - cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build" - cd "$srcdir/$pkgname-build" - - msg2 "Generating makefiles..." - cmake -G "Unix Makefiles" - - msg2 "GLU fix..." - setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING "'-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '" - - msg2 "Boost fix..." - sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp - - msg2 "Compiling..." - make -j1 - - msg2 "OGRE fix..." - sed -i 's:PluginFolder=.:PluginFolder=/usr/lib/OGRE/:g' \ - "$srcdir/$pkgname-build/ogre_plugins.cfg" -} - -package() { - cd "$srcdir/$pkgname-build" - - msg2 "Packaging documentation..." - install -Dm644 loki_setup/README.txt \ - "$pkgdir/usr/share/doc/$pkgname/README.txt" - - msg2 "Packaging binaries..." - install -Dm 755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/freeorion" - install -Dm 755 freeorion "$pkgdir/usr/bin/freeorion.elf" - install -Dm 755 freeorionca "$pkgdir/usr/bin/freeorionca" - install -Dm 755 freeoriond "$pkgdir/usr/bin/freeoriond" - - msg2 "Packaging data..." - mkdir -p "$pkgdir/usr/share/$pkgname" "$pkgdir/usr/lib/$pkgname" - cp -r default "$pkgdir/usr/share/$pkgname" - install -Dm 644 OISInput.cfg "$pkgdir/usr/share/OISInput.cfg" - - msg2 "Packaging license..." - install -Dm 644 default/COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" - - cd "$srcdir" - - msg2 "Packaging icon and shortcut..." - install -Dm 644 "$pkgname.png" \ - "$pkgdir/usr/share/pixmaps/freeorion.png" - install -Dm 644 "$pkgname.desktop" \ - "$pkgdir/usr/share/applications/freeorion.desktop" - - msg2 "Packaging OGRE plugins configuration..." - install -Dm 644 "$srcdir/$pkgname-build/ogre_plugins.cfg" \ - "$pkgdir/usr/share/freeorion/ogre_plugins.cfg" - - msg2 "Cleaning up..." - find "$pkgdir" -name ".svn" -print0 | xargs -0 rm -rf -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/freeorion/freeorion.install b/community-staging/freeorion/freeorion.install deleted file mode 100644 index ad97d7bab..000000000 --- a/community-staging/freeorion/freeorion.install +++ /dev/null @@ -1,13 +0,0 @@ -post_upgrade() { - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/freeorion/freeorion.sh b/community-staging/freeorion/freeorion.sh deleted file mode 100644 index d80623ab2..000000000 --- a/community-staging/freeorion/freeorion.sh +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/sh -# -# written by Markus Sinner, http://psitronic.de -# -# Nightly builds on. -# http://freeorion.psitronic.de/download/nightly/ -# -# This is a wrapper-script for starting FreeOrion on -# ix86 (and maybe x64) Linux Systems. -# This script will CD into application and set some -# enviroment variables. - -# ---- commandline PARAMETERS and ENVIROMENT variables ----- -# This script supports parameters, that will be evaluated -# BEFORE freeorion binary is called and will be removed, -# because the binary won't support them. -# Currently only one parameter at a time is supported! -# Parameters other than these will be appended as command -# line parameters to the call of the freeorion binary. -# -# --strace -# This starts freeorion using the "strace" utility. -# Generates a strace logifle /tmp/freeorion.trace. -# Make sure it is installed on your system! -# --gdb -# Runs freeorion in a gdb instance, passes the original -# parameters through the --args parameter of gdb -# -# -# ENVIROMENT variables -# This script supports some enviroment variables. To set them -# either use the followin command BEFORE you execute this script. -# export XXXX="value" -# This permanently set the variable in you current shell script. -# Or you prepend the options when running this script, like this: -# PARAM1="hello" PARAM2="yo man" /usr/bin/freeorion.elf -# -# Supportet are: -# FO_TRACE= -# Use this to prepend something to calling freorion. -# This variables also is used internally, when --gdb or --trace -# appear on the command line. -# FO_GDB_ARGS= -# If you use --gbd, you should uses this env to add GDB parameters. -# Make sure you end this list of parameters with --args, otherwise -# gdb won't start. Example: FO_GDB_ARGS="-q -s fo.symbols --args" -# LD_LIBRARY_PATH= -# This is a well known env and will be honored by this script. -# - - -# ---------- STARTS HERE --------------- -# Change into application directory -# If this is a symlink, then we -# need to change into the dir of symlink-target. -if [ -h $0 ]; then - echo "I am Symlink. Following into my targets basedir" - ME=`readlink $0` -else - echo "Following into my basedir" - ME=$0 -fi - -# This is important! Script won't work outside its installation dir -ROOT=/usr/share/freeorion -cd ${ROOT} -echo -n "CWD: " -pwd - - - -# Check for python. If freeorionca binary is missing it, use -# the shipped version. -if ldd /usr/bin/freeorionca | grep "libpython.*not found"; then - #echo "python2.5 missing. Using shipped version." - PYTHON_USE_SHIPPED=1 -else - #echo "python2.5 found. Using it." - PYTHON_USE_SHIPPED=0 -fi - -# Set Python library home for loading modules -# If no python 2.5 is detected, use shipped python 2.5 -if [ "$PYTHON_USE_SHIPPED" = "1" ]; then - export PYTHONHOME=/usr/lib/freeorion/python2.5 - export PYTHONPATH=${PYTHONHOME} - export PYTHONDEBUG=1 - export PYTHONVERBOSE=1 - echo "PYTHONHOME=${PYTHONHOME}" - - export LD_LIBRARY_PATH=${PYTHONHOME}:${LD_LIBRARY_PATH} - export LD_PRELOAD=${PYTHONHOME}/libutil.so.1:${PYTHONHOME}/libpython2.5.so -fi - - -# Command line Parameter --gdb forces running in gdb -# Setting FO_TRACE to gdb results in other settings, see -# below -if [ "$1" = "--gdb" ]; then - FO_TRACE="gdb" - - # Don't forget to remove the param - shift -fi - -if [ "$1" = "--strace" ]; then - TRACEFILE=/tmp/freeorion.trace - echo - echo "Tracing to ${TRACEFILE}" - echo - FO_TRACE="strace -f -o ${TRACEFILE}" - - # Don't forget to remove the param - shift -fi - - - -# Add a parameter FO_GDB_ARGS to support gdb -# Or warn the user, if he changed FO_GDB_ARGS and has -# forgotten to end it with --args -if [ "$FO_TRACE" = "gdb" ]; then - if [ "$FO_GDB_ARGS" = "" ]; then - FO_GDB_ARGS="--args" - else - echo "****************************************************" - echo "** NOTE NOTE NOTE NOTE **" - echo "Running FO in gdb" - echo "If you use FO_GDB_ARGS on your command line, make" - echo "sure that you END this variabble with --args." - echo "Otherwise gdb will not start." - echo - echo "Type 'start' when the gdb instance has loaded!" - echo - fi -fi - - -# Support loading libs from application/lib -export LD_LIBRARY_PATH=./lib:${LD_LIBRARY_PATH} - -# Call with settings-dir to avoid conflicting installations -${FO_TRACE} ${FO_GDB_ARGS} /usr/bin/freeorion.elf --resource-dir ./default $@ diff --git a/community-staging/gigi/PKGBUILD b/community-staging/gigi/PKGBUILD deleted file mode 100644 index 3a7c2321d..000000000 --- a/community-staging/gigi/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 73559 2012-07-09 20:29:24Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: fana-m <geminin@gmx.net> -# Contributor: Andrzej Giniewicz <gginiu@gmail.com> -# Contributor: Manuel Gaul <inkaine@hotmail.com> - -pkgname=gigi -pkgver=0.8.0 -pkgrel=11 -_fixedrevision=1074 -pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL" -url="http://gigi.sourceforge.net/" -arch=('x86_64' 'i686') -license=('LGPL') -depends=('boost' 'mesa' 'libpng' 'libjpeg' 'libtiff' 'freetype2' 'ogre' 'sdl' 'ois' 'python') -makedepends=('subversion' 'cmake' 'setconf' 'doxygen') -conflicts=('gigi-svn' 'mesa-full') - -build() { - cd "$srcdir" - - msg2 "Fetching files..." - if [ -d gigi/.svn ]; then - (cd gigi && svn up -r "$_fixedrevision") - else - svn co https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ \ - --config-dir ./ -r "$_fixedrevision" gigi - fi - - rm -rf gigi-build - svn export gigi gigi-build - cd gigi-build - - msg2 "Patching..." - sed -i 's/move_backward(/adobe::move_backward(/g' GG/adobe/vector.hpp - sed -i 's/__GNUC_MINOR__ <= 6/__GNUC_MINOR__ <= 999/g' GG/adobe/cmath.hpp - sed -i 's/insert(adobe/this->insert(adobe/g' GG/adobe/closed_hash.hpp - sed -i 's:TIME_UTC:TIME_UTC_:' src/GUI.cpp - - msg2 "Configuring..." - setconf cmake/GiGiOgre.pc.in prefix /usr - setconf cmake/GiGi.pc.in prefix /usr - setconf cmake/GiGiSDL.pc.in prefix /usr - cmake \ - -D CMAKE_INSTALL_PREFIX="$pkgdir"/usr \ - -D BUILD_TUTORIALS=OFF \ - -D CPACK_GENERATOR=GiGiDevel \ - -D CMAKE_C_FLAGS_RELEASE="-DNDEBUG" \ - . - - msg2 "Building documentation..." - cd doc - doxygen - cd .. - - msg2 "Compiling..." - make -j1 -} - -package() { - cd "$srcdir/gigi-build" - - msg2 "Packaging files..." - make install - - msg2 "Fixing documentation..." - mkdir -p "$pkgdir/usr/share/doc" - mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname" - - for f in `find "$pkgdir/usr/share/doc" -name "dir_*.html"`; do - sed -i "s:$srcdir:/:g" "$f" - done - - msg2 "Packaging license..." - install -Dm 644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/glob2/PKGBUILD b/community-staging/glob2/PKGBUILD deleted file mode 100644 index fb1ff9f9f..000000000 --- a/community-staging/glob2/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 73524 2012-07-09 02:43:24Z ebelanger $ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> - -pkgname=glob2 -pkgver=0.9.4.4 -pkgrel=12 -pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units" -arch=('i686' 'x86_64') -url="http://www.globulation2.org/" -license=('GPL3') -depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa' - 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('scons' 'boost') -install=glob2.install -source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz - glob2-0.9.4.1-gcc44.patch) -sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad' - '3e5ae81d85a727387a7049c3a0dfb3db930391b3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch" - scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share" LINKFLAGS="-lboost_system" -} - -package () { - cd "${srcdir}/${pkgname}-${pkgver}" - - scons install - find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \; - install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png" -} diff --git a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch deleted file mode 100644 index b425b25ec..000000000 --- a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h ---- libgag/include/StreamBackend.h.orig 2009-03-18 03:46:47.000000000 +0100 -+++ libgag/include/StreamBackend.h 2009-06-20 14:21:10.000000000 +0200 -@@ -43,7 +43,7 @@ namespace GAGCore - virtual void flush(void) = 0; - virtual void read(void *data, size_t size) = 0; - virtual void putc(int c) = 0; -- virtual int getc(void) = 0; -+ virtual int get_c(void) = 0; - virtual void seekFromStart(int displacement) = 0; - virtual void seekFromEnd(int displacement) = 0; - virtual void seekRelative(int displacement) = 0; -@@ -67,7 +67,7 @@ namespace GAGCore - virtual void flush(void) { assert(fp); fflush(fp); } - virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); } - virtual void putc(int c) { assert(fp); fputc(c, fp); } -- virtual int getc(void) { assert(fp); return fgetc(fp); } -+ virtual int get_c(void) { assert(fp); return fgetc(fp); } - virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); } - virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); } - virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); } -@@ -92,7 +92,7 @@ namespace GAGCore - virtual void flush(void); - virtual void read(void *data, size_t size); - virtual void putc(int c); -- virtual int getc(void); -+ virtual int get_c(void); - virtual void seekFromStart(int displacement); - virtual void seekFromEnd(int displacement); - virtual void seekRelative(int displacement); -@@ -117,7 +117,7 @@ namespace GAGCore - virtual void flush(void) { } - virtual void read(void *data, size_t size); - virtual void putc(int c); -- virtual int getc(void); -+ virtual int get_c(void); - virtual void seekFromStart(int displacement); - virtual void seekFromEnd(int displacement); - virtual void seekRelative(int displacement); -diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp ---- libgag/src/StreamBackend.cpp.orig 2009-03-18 03:46:47.000000000 +0100 -+++ libgag/src/StreamBackend.cpp 2009-06-20 14:21:53.000000000 +0200 -@@ -75,9 +75,9 @@ namespace GAGCore - buffer->putc(c); - } - -- int ZLibStreamBackend::getc(void) -+ int ZLibStreamBackend::get_c(void) - { -- return buffer->getc(); -+ return buffer->get_c(); - } - - void ZLibStreamBackend::seekFromStart(int displacement) -@@ -147,7 +147,7 @@ namespace GAGCore - write(&ch, 1); - } - -- int MemoryStreamBackend::getc(void) -+ int MemoryStreamBackend::get_c(void) - { - Uint8 ch; - read(&ch, 1); -diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp ---- libgag/src/Stream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 -+++ libgag/src/Stream.cpp 2009-06-20 14:21:35.000000000 +0200 -@@ -60,7 +60,7 @@ namespace GAGCore
- std::string s;
- while (1)
- {
-- int c = backend->getc();
-+ int c = backend->get_c();
- if(c=='\r')
- continue;
- if ((c >= 0) && (c != '\n'))
-diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp ---- libgag/src/TextStream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 -+++ libgag/src/TextStream.cpp 2009-06-20 14:21:22.000000000 +0200 -@@ -150,7 +150,7 @@ namespace GAGCore - - int nextChar(void) - { -- next = stream->getc(); -+ next = stream->get_c(); - if (next == '\n') - { - column = 0; diff --git a/community-staging/glob2/glob2.install b/community-staging/glob2/glob2.install deleted file mode 100644 index 20264b3a8..000000000 --- a/community-staging/glob2/glob2.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - diff --git a/community-staging/glom/PKGBUILD b/community-staging/glom/PKGBUILD deleted file mode 100644 index 8947063e6..000000000 --- a/community-staging/glom/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 73448 2012-07-07 19:54:15Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - -pkgname=glom -pkgver=1.22.0 -pkgrel=2 -pkgdesc="An easy-to-use database designer and user interface" -arch=('i686' 'x86_64') -url="http://www.glom.org/" -license=('GPL') -depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql') -makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') -options=('!libtool') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e6ce1b0c76cec8c85beba4900a80f257de3cc23a2c65908262fd8be87c2e546a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr \ - --with-postgres-utils=/usr/bin \ - --disable-scrollkeeper \ - --disable-update-mime-database \ - --disable-static \ - PYTHON=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/glom/glom.install b/community-staging/glom/glom.install deleted file mode 100644 index 2b88145e3..000000000 --- a/community-staging/glom/glom.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-staging/gnash/gnash-0.8.10-boost-1.50.patch b/community-staging/gnash/gnash-0.8.10-boost-1.50.patch deleted file mode 100644 index a422ce932..000000000 --- a/community-staging/gnash/gnash-0.8.10-boost-1.50.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r gnash-0.8.10/macros/boost.m4 gnash-0.8.10-boost1.50/macros/boost.m4 ---- gnash-0.8.10/macros/boost.m4 2012-01-19 20:17:49.000000000 +0100 -+++ gnash-0.8.10-boost-1.50/macros/boost.m4 2012-07-11 10:56:11.089137186 +0200 -@@ -37,7 +37,7 @@ - boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp" - dnl this is a list of *required* libraries. If any of these are missing, this - dnl test will return a failure, and Gnash won't build. -- boost_libs="thread program_options iostreams" -+ boost_libs="thread program_options iostreams system" - - dnl this is a list of *recommended* libraries. If any of these are missing, this - dnl test will return a warning, and Gnash will build, but testing won't work. diff --git a/community-staging/gource/PKGBUILD b/community-staging/gource/PKGBUILD deleted file mode 100644 index b88231769..000000000 --- a/community-staging/gource/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 73569 2012-07-10 05:52:13Z 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.38 -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' 'boost-libs') -makedepends=('boost' 'glm') -source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('6584241879dbb6dfaecc6ae6b58ad38c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i "s/filesystem3/filesystem/g" src/logmill.cpp - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR=$pkgdir install -} -# vim: ts=2:sw=2 et: diff --git a/community-staging/gpsdrive/PKGBUILD b/community-staging/gpsdrive/PKGBUILD deleted file mode 100644 index e299cc3be..000000000 --- a/community-staging/gpsdrive/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 73599 2012-07-11 07:49:53Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: damir <damir@archlinux.org> - -pkgname=gpsdrive -pkgver=2.11 -_pkgver=20120711 -pkgrel=13 -pkgdesc="A car (bike, ship, plane) navigation system" -arch=("i686" "x86_64") -url="http://www.gpsdrive.de/" -license=('GPL2') -depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn' - 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri' - 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer') -makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') -install="gpsdrive.install" -#source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz") -source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.xz") -md5sums=('48fe20e111c10d0826d9f05746c9cf74') - -build() { - cd "$srcdir" - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - rm -rf build - mkdir build - cd build - - sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c - - export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ - export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ - export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/ - export LDFLAGS="`pkg-config --libs gtk+-2.0 gmodule-2.0` -lboost_system -lboost_thread" - - # see DefineOptions.cmake for a list of common options and defaults - # cmake -L for a more in-depth listing - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \ - -DWITH_SCRIPTS=ON \ - -DWITH_MAPNIK=ON \ - -DWITH_POSTGIS=ON \ - -DWITH_GDAL=ON \ - -DWITH_BASEMAPS=ON \ - -DWITH_FRIENDSD=ON \ - -DWITH_KISMET=ON \ - -DWITH_NAVIGATION=ON \ - -DWITH_SPEECH=OFF \ - -DWITH_DBUS=OFF \ - -DLIBGPS_OLD=OFF \ - "$srcdir/gpsdrive-${_pkgver}" - make -} - -package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/gpsdrive/gpsdrive.install b/community-staging/gpsdrive/gpsdrive.install deleted file mode 100644 index 8ea63912e..000000000 --- a/community-staging/gpsdrive/gpsdrive.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "Don't forget to generate geoinfo.db with geoinfo.pl script" - echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive" -} diff --git a/community-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD deleted file mode 100644 index c7af04e67..000000000 --- a/community-staging/mapnik/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 73589 2012-07-10 21:24:11Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: David Dent <thewinch@gmail.com> -# Contributor: orbisvicis <orbisvicis@gmail.com> - -pkgname=mapnik -pkgver=2.0.1 -pkgrel=1 -pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" -arch=('i686' 'x86_64') -url="http://mapnik.org/" -license=('LGPL') -depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' - 'libxml2' 'python2' 'proj' 'cairo' 'cairomm' 'pycairo' - 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl') -optdepends=('libxslt: Web Map Service' - 'python2-lxml: Web Map Service' - 'python-imaging: Web Map Service' - 'python-nose: Web Map Service' - 'apache: Web Map Service' - 'mod_fastcgi: Web Map Service - or:' - 'mod_fcgid: Web Map Service - or:' - 'mod_wsgi: Web Map Service') -makedepends=('scons' 'boost') -install="mapnik.install" -source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2") -md5sums=('e3dd09991340e2568b99f46bac34b0a8') - -build() { - cd "$srcdir/$pkgname-v$pkgver" - sed -i 's|lib64|lib|g' SConstruct - scons configure \ - PREFIX="/usr" \ - INPUT_PLUGINS=all \ - DESTDIR="$pkgdir" - scons -} - -package(){ - cd "$srcdir/$pkgname-v$pkgver" - scons install -} diff --git a/community-staging/mapnik/mapnik.install b/community-staging/mapnik/mapnik.install deleted file mode 100644 index 46f265d5b..000000000 --- a/community-staging/mapnik/mapnik.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - /sbin/ldconfig -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-staging/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch b/community-staging/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch deleted file mode 100644 index 40dd48b42..000000000 --- a/community-staging/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3f6b2390102ea9d808c7075b5aaeec743b7d104e Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Tue, 10 Apr 2012 19:30:35 -0500 -Subject: [PATCH 1/2] Backport for mongodb 2.0.4 "Ignore --fork and --logpath - when using --shutdown SERVER-5186 SERVER-5187" - -https://github.com/mongodb/mongo/commit/fa2e2ef95c5c934eef63fff4b98d5eb060c5653923 - -Backported in preparation for backporting the fix for https://jira.mongodb.org/browse/SERVER-5358 ---- - db/cmdline.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/db/cmdline.cpp b/db/cmdline.cpp -index fd759a7..346a9ae 100644 ---- a/db/cmdline.cpp -+++ b/db/cmdline.cpp -@@ -239,7 +239,7 @@ namespace mongo { - cmdLine.noUnixSocket = true; - } - -- if (params.count("fork")) { -+ if (params.count("fork") && !params.count("shutdown")) { - if ( ! params.count( "logpath" ) ) { - cout << "--fork has to be used with --logpath" << endl; - ::exit(-1); -@@ -304,7 +304,7 @@ namespace mongo { - } - - #endif -- if (params.count("logpath")) { -+ if (params.count("logpath") && !params.count("shutdown")) { - if ( logpath.size() == 0 ) - logpath = params["logpath"].as<string>(); - uassert( 10033 , "logpath has to be non-zero" , logpath.size() ); --- -1.7.10 - diff --git a/community-staging/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch b/community-staging/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch deleted file mode 100644 index aff066450..000000000 --- a/community-staging/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 77f78f64c192572e6eb956b0fe28ecd975ff6461 Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Tue, 10 Apr 2012 19:38:58 -0500 -Subject: [PATCH 2/2] Backport for mongodb 2.0.4 "Don't check /proc/pid/exe in - --shutdown SERVER-5358" - -Backported to fix https://jira.mongodb.org/browse/SERVER-5358 - -https://github.com/mongodb/mongo/commit/c28d97d1a14a36ffc056bfd9ba7262b0a1509b5b ---- - db/db.cpp | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/db/db.cpp b/db/db.cpp -index b1d1db8..0a21f4d 100644 ---- a/db/db.cpp -+++ b/db/db.cpp -@@ -989,22 +989,6 @@ int main(int argc, char* argv[]) { - procPath = (str::stream() << "/proc/" << pid); - if (!boost::filesystem::exists(procPath)) - failed = true; -- -- string exePath = procPath + "/exe"; -- if (boost::filesystem::exists(exePath)){ -- char buf[256]; -- int ret = readlink(exePath.c_str(), buf, sizeof(buf)-1); -- buf[ret] = '\0'; // readlink doesn't terminate string -- if (ret == -1) { -- int e = errno; -- cerr << "Error resolving " << exePath << ": " << errnoWithDescription(e); -- failed = true; -- } -- else if (!endsWith(buf, "mongod")){ -- cerr << "Process " << pid << " is running " << buf << " not mongod" << endl; -- ::exit(-1); -- } -- } - } - catch (const std::exception& e){ - cerr << "Error reading pid from lock file [" << name << "]: " << e.what() << endl; --- -1.7.10 - diff --git a/community-staging/mongodb/PKGBUILD b/community-staging/mongodb/PKGBUILD deleted file mode 100644 index 455b73938..000000000 --- a/community-staging/mongodb/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 73593 2012-07-11 01:17:31Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Mathias Stearn <mathias@10gen.com> -# Contributor: Alec Thomas - -pkgname=mongodb -pkgver=2.0.6 -pkgrel=2 -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') -#checkdepends=('python2-pymongo') -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' - 'boost-1.50.patch') -md5sums=('b3b32fecdcbe8e8068ec2989be9d2da4' - '9c67e00f4626ad761a8f7d4e037a54d7' - '4839fe1d638187ca3226e8267b947318' - '5d22fd2c0ae869218488cd7c0dbc3903') - -build() { - export SCONSFLAGS="$MAKEFLAGS" - - cd mongodb-src-r${pkgver} - - patch -Np1 -i ${srcdir}/boost-1.50.patch - - scons \ - all \ - --full -} - -<<COMMENT -check() { - export SCONSFLAGS="$MAKEFLAGS" - - cd mongodb-src-r${pkgver} - - scons \ - smokeAll \ - --smokedbprefix=${srcdir} -} -COMMENT - -package() { - export SCONSFLAGS="$MAKEFLAGS" - - 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-staging/mongodb/boost-1.50.patch b/community-staging/mongodb/boost-1.50.patch deleted file mode 100644 index 4ccb898ec..000000000 --- a/community-staging/mongodb/boost-1.50.patch +++ /dev/null @@ -1,245 +0,0 @@ -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/db.cpp mongodb-src-r2.0.6-patched/db/db.cpp ---- mongodb-src-r2.0.6/db/db.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/db.cpp 2012-07-10 22:27:16.496886220 +0200 -@@ -326,7 +326,7 @@ - boost::filesystem::path path( dbpath ); - for ( boost::filesystem::directory_iterator i( path ); - i != boost::filesystem::directory_iterator(); ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if ( boost::filesystem::is_directory( *i ) && - fileName.length() && fileName[ 0 ] == '$' ) - boost::filesystem::remove_all( *i ); -@@ -655,11 +655,6 @@ - dbExecCommand = argv[0]; - - srand(curTimeMicros()); --#if( BOOST_VERSION >= 104500 ) -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); --#else -- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); --#endif - - { - unsigned x = 0x12345678; -@@ -976,7 +971,7 @@ - if (params.count("shutdown")){ - bool failed = false; - -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); - if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 ) - failed = true; - -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur.cpp mongodb-src-r2.0.6-patched/db/dur.cpp ---- mongodb-src-r2.0.6/db/dur.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/dur.cpp 2012-07-10 21:56:28.866778732 +0200 -@@ -692,7 +692,7 @@ - - bool samePartition = true; - try { -- const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string(); -+ const string dbpathDir = boost::filesystem::path(dbpath).string(); - samePartition = onSamePartition(getJournalDir().string(), dbpathDir); - } - catch(...) { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_journal.cpp mongodb-src-r2.0.6-patched/db/dur_journal.cpp ---- mongodb-src-r2.0.6/db/dur_journal.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/dur_journal.cpp 2012-07-10 22:04:18.583472723 +0200 -@@ -169,7 +169,7 @@ - for ( boost::filesystem::directory_iterator i( getJournalDir() ); - i != boost::filesystem::directory_iterator(); - ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) - return true; - } -@@ -185,7 +185,7 @@ - for ( boost::filesystem::directory_iterator i( getJournalDir() ); - i != boost::filesystem::directory_iterator(); - ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) { - try { - removeOldJournalFile(*i); -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_recover.cpp mongodb-src-r2.0.6-patched/db/dur_recover.cpp ---- mongodb-src-r2.0.6/db/dur_recover.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/dur_recover.cpp 2012-07-10 22:02:18.226799055 +0200 -@@ -71,7 +71,7 @@ - i != filesystem::directory_iterator(); - ++i ) { - filesystem::path filepath = *i; -- string fileName = filesystem::path(*i).leaf(); -+ string fileName = filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) { - unsigned u = str::toUnsigned( str::after(fileName, '_') ); - if( m.count(u) ) { -@@ -84,7 +84,7 @@ - if( i != m.begin() && m.count(i->first - 1) == 0 ) { - uasserted(13532, - str::stream() << "unexpected file in journal directory " << dir.string() -- << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file"); -+ << " : " << filesystem::path(i->second).leaf().string() << " : can't find its preceeding file"); - } - files.push_back(i->second); - } -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/instance.cpp mongodb-src-r2.0.6-patched/db/instance.cpp ---- mongodb-src-r2.0.6/db/instance.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/instance.cpp 2012-07-10 22:08:55.213488817 +0200 -@@ -645,13 +645,13 @@ - i != boost::filesystem::directory_iterator(); ++i ) { - if ( directoryperdb ) { - boost::filesystem::path p = *i; -- string dbName = p.leaf(); -+ string dbName = p.leaf().string(); - p /= ( dbName + ".ns" ); - if ( MMF::exists( p ) ) - names.push_back( dbName ); - } - else { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" ) - names.push_back( fileName.substr( 0, fileName.length() - 3 ) ); - } -@@ -893,7 +893,7 @@ - } - - void acquirePathLock(bool doingRepair) { -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); - - bool oldFile = false; - -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/pdfile.cpp mongodb-src-r2.0.6-patched/db/pdfile.cpp ---- mongodb-src-r2.0.6/db/pdfile.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/pdfile.cpp 2012-07-10 22:11:44.103498643 +0200 -@@ -1987,7 +1987,7 @@ - virtual bool apply( const Path &p ) { - if ( !boost::filesystem::exists( p ) ) - return false; -- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) ); -+ boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) ); - return true; - } - virtual const char * op() const { -@@ -2093,7 +2093,7 @@ - uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ? - "backup" : "$tmp" ); - BOOST_CHECK_EXCEPTION( boost::filesystem::create_directory( reservedPath ) ); -- string reservedPathString = reservedPath.native_directory_string(); -+ string reservedPathString = reservedPath.string(); - - bool res; - { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/dbtests/framework.cpp mongodb-src-r2.0.6-patched/dbtests/framework.cpp ---- mongodb-src-r2.0.6/dbtests/framework.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/dbtests/framework.cpp 2012-07-10 22:29:20.610226773 +0200 -@@ -281,7 +281,7 @@ - boost::filesystem::create_directory(p); - } - -- string dbpathString = p.native_directory_string(); -+ string dbpathString = p.string(); - dbpath = dbpathString.c_str(); - - cmdLine.prealloc = false; -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/pch.h mongodb-src-r2.0.6-patched/pch.h ---- mongodb-src-r2.0.6/pch.h 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/pch.h 2012-07-10 21:35:57.133373738 +0200 -@@ -79,7 +79,7 @@ - //#include <boost/any.hpp> - #include "boost/thread/once.hpp" - //#include <boost/archive/iterators/transform_width.hpp> --#define BOOST_FILESYSTEM_VERSION 2 -+#define BOOST_FILESYSTEM_VERSION 3 - #include <boost/filesystem/convenience.hpp> - #include <boost/filesystem/exception.hpp> - #include <boost/filesystem/operations.hpp> -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/shell/shell_utils.cpp mongodb-src-r2.0.6-patched/shell/shell_utils.cpp ---- mongodb-src-r2.0.6/shell/shell_utils.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/shell/shell_utils.cpp 2012-07-10 22:38:58.443593723 +0200 -@@ -388,7 +388,7 @@ - #endif - } - -- argv_.push_back( programPath.native_file_string() ); -+ argv_.push_back( programPath.string() ); - - port_ = -1; - -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/restore.cpp mongodb-src-r2.0.6-patched/tools/restore.cpp ---- mongodb-src-r2.0.6/tools/restore.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/tools/restore.cpp 2012-07-10 22:45:00.046948094 +0200 -@@ -131,7 +131,7 @@ - log(2) << "drillDown: " << root.string() << endl; - - // skip hidden files and directories -- if (root.leaf()[0] == '.' && root.leaf() != ".") -+ if (root.leaf().string()[0] == '.' && root.leaf().string() != ".") - return; - - if ( is_directory( root ) ) { -@@ -210,7 +210,7 @@ - ns += "." + _coll; - } - else { -- string l = root.leaf(); -+ string l = root.leaf().string(); - l = l.substr( 0 , l.find_last_of( "." ) ); - ns += "." + l; - } -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/tool.cpp mongodb-src-r2.0.6-patched/tools/tool.cpp ---- mongodb-src-r2.0.6/tools/tool.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/tools/tool.cpp 2012-07-10 22:23:53.356874403 +0200 -@@ -113,12 +113,6 @@ - // we want durability to be disabled. - cmdLine.dur = false; - --#if( BOOST_VERSION >= 104500 ) -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); --#else -- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); --#endif -- - _name = argv[0]; - - /* using the same style as db.cpp */ -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/background.cpp mongodb-src-r2.0.6-patched/util/background.cpp ---- mongodb-src-r2.0.6/util/background.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/util/background.cpp 2012-07-10 21:47:40.420081320 +0200 -@@ -89,7 +89,7 @@ - if ( msTimeOut ) { - // add msTimeOut millisecond to current time - boost::xtime xt; -- boost::xtime_get( &xt, boost::TIME_UTC ); -+ boost::xtime_get( &xt, boost::TIME_UTC_ ); - - unsigned long long ns = msTimeOut * 1000000ULL; // milli to nano - if ( xt.nsec + ns < 1000000000 ) { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/concurrency/mutex.h mongodb-src-r2.0.6-patched/util/concurrency/mutex.h ---- mongodb-src-r2.0.6/util/concurrency/mutex.h 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/util/concurrency/mutex.h 2012-07-10 21:45:51.333408307 +0200 -@@ -29,7 +29,7 @@ - - inline boost::xtime incxtimemillis( long long s ) { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += (int)( s / 1000 ); - xt.nsec += (int)(( s % 1000 ) * 1000000); - if ( xt.nsec >= 1000000000 ) { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/queue.h mongodb-src-r2.0.6-patched/util/queue.h ---- mongodb-src-r2.0.6/util/queue.h 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/util/queue.h 2012-07-10 22:14:00.243506560 +0200 -@@ -82,7 +82,7 @@ - Timer timer; - - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += maxSecondsToWait; - - scoped_lock l( _lock ); diff --git a/community-staging/mongodb/mongodb.conf b/community-staging/mongodb/mongodb.conf deleted file mode 100644 index c5272b7f2..000000000 --- a/community-staging/mongodb/mongodb.conf +++ /dev/null @@ -1,8 +0,0 @@ -# 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-staging/mongodb/mongodb.install b/community-staging/mongodb/mongodb.install deleted file mode 100644 index 2ea94553c..000000000 --- a/community-staging/mongodb/mongodb.install +++ /dev/null @@ -1,32 +0,0 @@ -# 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 [ "$(uname -m)" != "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-staging/mongodb/mongodb.rc b/community-staging/mongodb/mongodb.rc deleted file mode 100644 index 30f2bbf79..000000000 --- a/community-staging/mongodb/mongodb.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/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-staging/mythtv/mythbackend.service b/community-staging/mythtv/mythbackend.service deleted file mode 100644 index 9d92bd644..000000000 --- a/community-staging/mythtv/mythbackend.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=MythTV Backend -After=network.target mysqld.service - -[Service] -Type=simple -Environment=HOME=/var/lib/mythtv -User=mythtv -ExecStart=/usr/bin/mythbackend --daemon --logpath /var/log/mythtv - -[Install] -WantedBy=multi-user.target diff --git a/community-staging/openimageio/PKGBUILD b/community-staging/openimageio/PKGBUILD deleted file mode 100644 index ea6bbd54a..000000000 --- a/community-staging/openimageio/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 73518 2012-07-09 01:05:28Z svenstaro $ -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -pkgname=openimageio -pkgver=1.0.6 -pkgrel=1 -pkgdesc="A library for reading and writing images, including classes, utilities, and applications." -arch=(i686 x86_64) -url="http://www.openimageio.org/" -license=('custom') -depends=('openexr' 'boost-libs' 'jasper' 'glew') -makedepends=('cmake' 'qt' 'python2' 'boost') -optdepends=('qt: iv image viewer' - 'python2: bindings support') -source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('fa6e3f4be98d8e1868b389410b56563a') - -build() { - cd "$srcdir"/$_pkgname*/src - - [[ -d build ]] && rm -r build - mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make -} - -package() { - cd "$srcdir"/$_pkgname*/src/build - - make DESTDIR=$pkgdir install - - mv $pkgdir/usr/lib/python $pkgdir/usr/lib/python2.7 - - # license - cd ../.. - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community-staging/performous/fix-boost-1.50-xtime.patch b/community-staging/performous/fix-boost-1.50-xtime.patch deleted file mode 100644 index d13b18c26..000000000 --- a/community-staging/performous/fix-boost-1.50-xtime.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a4be6f47bcdd64e7c77db0a04415973d4c322ae8 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Alvaro=20Fernando=20Garc=C3=ADa?= <alvarofernandogarcia@gmail.com> -Date: Sat, 7 Jul 2012 18:53:56 -0300 -Subject: [PATCH] Fixed boost xtime.hpp usage (for 1.50 version) - ---- - game/xtime.hh | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/game/xtime.hh b/game/xtime.hh -index 41303cb..8f5463d 100644 ---- a/game/xtime.hh -+++ b/game/xtime.hh -@@ -1,5 +1,6 @@ - #pragma once - -+#include <boost/version.hpp> - #include <boost/thread/xtime.hpp> - #include <cmath> - -@@ -20,7 +21,11 @@ namespace { - } - boost::xtime now() { - boost::xtime time; -+#if (BOOST_VERSION / 100 % 1000 >= 50) -+ boost::xtime_get(&time, boost::TIME_UTC_); -+#else - boost::xtime_get(&time, boost::TIME_UTC); -+#endif - return time; - } - double seconds(boost::xtime const& time) { --- -1.7.4.1 - diff --git a/community-staging/pingus/ChangeLog b/community-staging/pingus/ChangeLog deleted file mode 100644 index c182f92eb..000000000 --- a/community-staging/pingus/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - - * pingus 0.7.2-8 - * Rebuilt against boost 1.41.0 - -2010-02-23 Eric Belanger <eric@archlinux.org> - - * pingus 0.7.2-7 - * Rebuilt against boost 1.42.0 - -2010-01-20 Eric Belanger <eric@archlinux.org> - - * pingus 0.7.2-6 - * Rebuilt against libpng 1.4/libjpeg 8 - -2009-07-13 Eric Belanger <eric@archlinux.org> - - * pingus 0.7.2-2 - * Rebuilt against boost 1.39 - * Added gcc 4.4 patch - * Added ChangeLog diff --git a/community-staging/pingus/PKGBUILD b/community-staging/pingus/PKGBUILD deleted file mode 100644 index a5f07bd62..000000000 --- a/community-staging/pingus/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 73461 2012-07-08 04:55:52Z tdziedzic $ -# Maintainer: Eric Belanger <eric@archlinux.org> - -pkgname=pingus -pkgver=0.7.6 -pkgrel=4 -pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." -arch=('i686' 'x86_64') -url="http://pingus.seul.org" -license=('GPL') -depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.49') -makedepends=('scons' 'boost>=1.49' 'mesa') -source=("http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" - 'pingus.desktop' - 'pingus-0.7.6-gcc470-udl.patch') -md5sums=('561798686f34d3fa4e69135d655f47ac' - '9eec34047bdcff49e08f41e81764e20c' - '3730bdad38c21c67203456a985945473') -sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487' - '579a1144f161ce89e6e024cea37210149b89c0c0' - '143dd9969e8d100d29ed4f5b2039dde627afeb06') - -build() { - cd ${pkgname}-${pkgver} - - # fedora patch to fix error due to new standards - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51282 - patch -Np0 -i ${srcdir}/pingus-0.7.6-gcc470-udl.patch - - scons prefix=/usr -} - -package() { - cd ${pkgname}-${pkgver} - - make install DESTDIR="${pkgdir}" PREFIX="/usr" - - install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" -} diff --git a/community-staging/pingus/pingus-0.7.6-gcc470-udl.patch b/community-staging/pingus/pingus-0.7.6-gcc470-udl.patch deleted file mode 100644 index 843439321..000000000 --- a/community-staging/pingus/pingus-0.7.6-gcc470-udl.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/pingus/pingus_main.cpp~ 2011-12-24 15:46:47.000000000 -0600 -+++ src/pingus/pingus_main.cpp 2012-01-03 13:13:03.034195720 -0600 -@@ -465,7 +465,7 @@ - void - PingusMain::print_greeting_message() - { -- std::string greeting = "Welcome to Pingus "VERSION; -+ std::string greeting = "Welcome to Pingus " VERSION; - greeting += "!"; - std::cout << greeting << std::endl; - for (unsigned int i = 0; i < greeting.length(); ++i) ---- src/pingus/screens/pingus_menu.cpp~ 2011-12-24 15:46:47.000000000 -0600 -+++ src/pingus/screens/pingus_menu.cpp 2012-01-03 13:30:28.967700554 -0600 -@@ -153,7 +153,7 @@ - gc.get_height()/2 - 280)); - - gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140), -- "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n" -+ "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n" - "See the file AUTHORS for a complete list of contributors.\n" - "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n" - "welcome to redistribute it under certain conditions; see the file COPYING for details.\n"); diff --git a/community-staging/pingus/pingus.desktop b/community-staging/pingus/pingus.desktop deleted file mode 100644 index 276db36a4..000000000 --- a/community-staging/pingus/pingus.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Pingus -Comment=A free Lemmings[tm] clone -Exec=pingus -Terminal=false -Type=Application -Categories=Application;Game;LogicGame -Icon=/usr/share/pingus/images/core/editor/actions.png diff --git a/community-staging/pion-net/PKGBUILD b/community-staging/pion-net/PKGBUILD deleted file mode 100644 index f428f8caf..000000000 --- a/community-staging/pion-net/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 73465 2012-07-08 06:28:16Z stativ $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: David Watzke <david@watzke.cz> -pkgname=pion-net -pkgver=4.0.12 -pkgrel=3 -pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" -url="http://www.pion.org/projects/pion-network-library" -arch=('i686' 'x86_64') -license=('custom:Boost') -depends=('boost-libs' 'openssl' 'log4cpp') -makedepends=('boost') -source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" \ - gcc_4.7_fix.diff boost_1.50_support.diff) -md5sums=('baf0b6a006660dc4051c824e4660cb9d' - 'd6c5314678709184e983b301cea11566' - 'fcd2a7520b818354308315dc1e8053d4') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # override configure bug (forces debug even when nobody asked for it) - sed -i "s/ -ggdb//g" configure - # override Makefile bug - sed -i "/docs:/ s/doxygen-doc//" Makefile.in - # fix compilation with new versions of gcc - patch -Np1 < "$srcdir"/gcc_4.7_fix.diff || true - # fix build with boost 1.50 - port to filesystem v3 - patch -Np1 < "$srcdir"/boost_1.50_support.diff || true - - ./configure --prefix=/usr --disable-doxygen-doc - - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - # install license - install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost" -} diff --git a/community-staging/pion-net/boost_1.50_support.diff b/community-staging/pion-net/boost_1.50_support.diff deleted file mode 100644 index 7b82f34b9..000000000 --- a/community-staging/pion-net/boost_1.50_support.diff +++ /dev/null @@ -1,223 +0,0 @@ -diff -rup pion-net-4.0.12/common/src/PionPlugin.cpp pion-net-4.0.12-new/common/src/PionPlugin.cpp ---- pion-net-4.0.12/common/src/PionPlugin.cpp 2011-03-22 04:35:12.000000000 +0100 -+++ pion-net-4.0.12-new/common/src/PionPlugin.cpp 2012-07-07 20:42:22.084660696 +0200 -@@ -58,7 +58,7 @@ void PionPlugin::addPluginDirectory(cons - if (! boost::filesystem::exists(plugin_path) ) - throw DirectoryNotFoundException(dir); - boost::mutex::scoped_lock plugin_lock(m_plugin_mutex); -- m_plugin_dirs.push_back(plugin_path.directory_string()); -+ m_plugin_dirs.push_back(plugin_path.string()); - } - - void PionPlugin::resetPluginDirectories(void) -@@ -204,7 +204,7 @@ bool PionPlugin::checkForFile(std::strin - try { - // is_regular may throw if directory is not readable - if (boost::filesystem::is_regular(test_path)) { -- final_path = test_path.file_string(); -+ final_path = test_path.string(); - return true; - } - } catch (...) {} -@@ -225,7 +225,7 @@ bool PionPlugin::checkForFile(std::strin - try { - // is_regular may throw if directory is not readable - if (boost::filesystem::is_regular(test_path)) { -- final_path = test_path.file_string(); -+ final_path = test_path.string(); - return true; - } - } catch (...) {} -@@ -291,7 +291,7 @@ void PionPlugin::getAllPluginNames(std:: - for (boost::filesystem::directory_iterator it2(*it); it2 != end; ++it2) { - if (boost::filesystem::is_regular(*it2)) { - if (boost::filesystem::extension(it2->path()) == PionPlugin::PION_PLUGIN_EXTENSION) { -- plugin_names.push_back(PionPlugin::getPluginName(it2->path().leaf())); -+ plugin_names.push_back(PionPlugin::getPluginName(it2->path().filename().string())); - } - } - } -@@ -309,11 +309,11 @@ void *PionPlugin::loadDynamicLibrary(con - #else - // convert into a full/absolute/complete path since dlopen() - // does not always search the CWD on some operating systems -- const boost::filesystem::path full_path = boost::filesystem::complete(plugin_file); -+ const boost::filesystem::path full_path = boost::filesystem::absolute(plugin_file); - // NOTE: you must load shared libraries using RTLD_GLOBAL on Unix platforms - // due to a bug in GCC (or Boost::any, depending on which crowd you want to believe). - // see: http://svn.boost.org/trac/boost/ticket/754 -- return dlopen(full_path.file_string().c_str(), RTLD_LAZY | RTLD_GLOBAL); -+ return dlopen(full_path.string().c_str(), RTLD_LAZY | RTLD_GLOBAL); - #endif - } - -diff -rup pion-net-4.0.12/common/src/PionScheduler.cpp pion-net-4.0.12-new/common/src/PionScheduler.cpp ---- pion-net-4.0.12/common/src/PionScheduler.cpp 2008-11-08 00:41:17.000000000 +0100 -+++ pion-net-4.0.12-new/common/src/PionScheduler.cpp 2012-07-07 20:42:22.084660696 +0200 -@@ -102,7 +102,7 @@ boost::xtime PionScheduler::getWakeupTim - boost::uint32_t sleep_nsec) - { - boost::xtime wakeup_time; -- boost::xtime_get(&wakeup_time, boost::TIME_UTC); -+ boost::xtime_get(&wakeup_time, boost::TIME_UTC_); - wakeup_time.sec += sleep_sec; - wakeup_time.nsec += sleep_nsec; - if (static_cast<boost::uint32_t>(wakeup_time.nsec) >= NSEC_IN_SECOND) { -diff -rup pion-net-4.0.12/common/tests/PionPluginPtrTests.cpp pion-net-4.0.12-new/common/tests/PionPluginPtrTests.cpp ---- pion-net-4.0.12/common/tests/PionPluginPtrTests.cpp 2009-10-13 18:20:43.000000000 +0200 -+++ pion-net-4.0.12-new/common/tests/PionPluginPtrTests.cpp 2012-07-07 20:42:22.084660696 +0200 -@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_SUITE_END() - class Sandbox_F { - public: - Sandbox_F() { -- m_cwd = boost::filesystem::current_path().directory_string(); -+ m_cwd = boost::filesystem::current_path().string(); - boost::filesystem::remove_all("sandbox"); - BOOST_REQUIRE(boost::filesystem::create_directory("sandbox")); - BOOST_REQUIRE(boost::filesystem::create_directory("sandbox/dir1")); -diff -rup pion-net-4.0.12/configure pion-net-4.0.12-new/configure ---- pion-net-4.0.12/configure 2012-03-24 08:00:10.000000000 +0100 -+++ pion-net-4.0.12-new/configure 2012-07-07 20:42:22.094660551 +0200 -@@ -22091,7 +22091,7 @@ fi - - - # AC_MSG_NOTICE(Boost home directory: $BOOST_HOME_DIR) --CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=2" -+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=3" - LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" - - # Check for Boost library extension -@@ -22197,7 +22197,7 @@ LIBS="$LIBS_SAVED" - BOOST_TRY_LIB=thread - BOOST_TRY_LINK="boost_${BOOST_TRY_LIB}${BOOST_LIB_EXTENSION}" - LIBS_SAVED="$LIBS" --LIBS="$LIBS_SAVED -l${BOOST_TRY_LINK} ${BOOST_DATE_TIME_LIB}" -+LIBS="$LIBS_SAVED -lboost_system -l${BOOST_TRY_LINK} ${BOOST_DATE_TIME_LIB}" - echo "$as_me:$LINENO: checking for boost::${BOOST_TRY_LIB} library" >&5 - echo $ECHO_N "checking for boost::${BOOST_TRY_LIB} library... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -diff -rup pion-net-4.0.12/net/include/pion/net/TCPConnection.hpp pion-net-4.0.12-new/net/include/pion/net/TCPConnection.hpp ---- pion-net-4.0.12/net/include/pion/net/TCPConnection.hpp 2012-01-12 17:30:03.000000000 +0100 -+++ pion-net-4.0.12-new/net/include/pion/net/TCPConnection.hpp 2012-07-07 20:43:34.530273709 +0200 -@@ -26,6 +26,7 @@ - #include <boost/array.hpp> - #include <boost/function.hpp> - #include <boost/function/function1.hpp> -+#include <boost/system/system_error.hpp> - #include <pion/PionConfig.hpp> - #include <string> - -diff -rup pion-net-4.0.12/net/services/FileService.cpp pion-net-4.0.12-new/net/services/FileService.cpp ---- pion-net-4.0.12/net/services/FileService.cpp 2009-08-06 20:58:13.000000000 +0200 -+++ pion-net-4.0.12-new/net/services/FileService.cpp 2012-07-07 20:42:22.097993836 +0200 -@@ -137,8 +137,8 @@ void FileService::operator()(HTTPRequest - - // make sure that the requested file is within the configured directory - file_path.normalize(); -- std::string file_string = file_path.file_string(); -- if (file_string.find(m_directory.directory_string()) != 0) { -+ std::string file_string = file_path.string(); -+ if (file_string.find(m_directory.string()) != 0) { - PION_LOG_WARN(m_logger, "Request for file outside of directory (" - << getResource() << "): " << relative_path); - static const std::string FORBIDDEN_HTML_START = -@@ -319,7 +319,7 @@ void FileService::operator()(HTTPRequest - << getResource() << "): " << relative_path); - - // determine the MIME type -- response_file.setMimeType(findMIMEType( response_file.getFilePath().leaf() )); -+ response_file.setMimeType(findMIMEType( response_file.getFilePath().filename().string() )); - - // get the file_size and last_modified timestamp - response_file.update(); -@@ -597,7 +597,7 @@ void FileService::stop(void) - void FileService::scanDirectory(const boost::filesystem::path& dir_path) - { - PION_LOG_DEBUG(m_logger, "Scanning directory (" << getResource() << "): " -- << dir_path.directory_string()); -+ << dir_path.string()); - - // iterate through items in the directory - boost::filesystem::directory_iterator end_itr; -@@ -614,8 +614,8 @@ void FileService::scanDirectory(const bo - // item is a regular file - - // figure out relative path to the file -- std::string file_path_string( itr->path().file_string() ); -- std::string relative_path( file_path_string.substr(m_directory.directory_string().size() + 1) ); -+ std::string file_path_string( itr->path().string() ); -+ std::string relative_path( file_path_string.substr(m_directory.string().size() + 1) ); - - // add item to cache (use placeholder if scan == 1) - addCacheEntry(relative_path, *itr, m_scan_setting == 1); -@@ -628,7 +628,7 @@ FileService::addCacheEntry(const std::st - const boost::filesystem::path& file_path, - const bool placeholder) - { -- DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.leaf())); -+ DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.filename().string())); - if (! placeholder) { - cache_entry.update(); - // only read the file if its size is <= max_cache_size -@@ -636,7 +636,7 @@ FileService::addCacheEntry(const std::st - try { cache_entry.read(); } - catch (std::exception&) { - PION_LOG_ERROR(m_logger, "Unable to add file to cache: " -- << file_path.file_string()); -+ << file_path.string()); - return std::make_pair(m_cache_map.end(), false); - } - } -@@ -647,10 +647,10 @@ FileService::addCacheEntry(const std::st - - if (add_entry_result.second) { - PION_LOG_DEBUG(m_logger, "Added file to cache: " -- << file_path.file_string()); -+ << file_path.string()); - } else { - PION_LOG_ERROR(m_logger, "Unable to insert cache entry for file: " -- << file_path.file_string()); -+ << file_path.string()); - } - - return add_entry_result; -@@ -713,7 +713,7 @@ void DiskFile::read(void) - - // read the file into memory - if (!file_stream.is_open() || !file_stream.read(m_file_content.get(), m_file_size)) -- throw FileService::FileReadException(m_file_path.file_string()); -+ throw FileService::FileReadException(m_file_path.string()); - } - - bool DiskFile::checkUpdated(void) -@@ -751,7 +751,7 @@ DiskFileSender::DiskFileSender(DiskFile& - { - PION_LOG_DEBUG(m_logger, "Preparing to send file" - << (m_disk_file.hasFileContent() ? " (cached): " : ": ") -- << m_disk_file.getFilePath().file_string()); -+ << m_disk_file.getFilePath().string()); - - // set the Content-Type HTTP header using the file's MIME type - m_writer->getResponse().setContentType(m_disk_file.getMimeType()); -@@ -795,7 +795,7 @@ void DiskFileSender::send(void) - m_file_stream.open(m_disk_file.getFilePath(), std::ios::in | std::ios::binary); - if (! m_file_stream.is_open()) { - PION_LOG_ERROR(m_logger, "Unable to open file: " -- << m_disk_file.getFilePath().file_string()); -+ << m_disk_file.getFilePath().string()); - return; - } - } -@@ -811,10 +811,10 @@ void DiskFileSender::send(void) - if (! m_file_stream.read(m_content_buf.get(), m_file_bytes_to_send)) { - if (m_file_stream.gcount() > 0) { - PION_LOG_ERROR(m_logger, "File size inconsistency: " -- << m_disk_file.getFilePath().file_string()); -+ << m_disk_file.getFilePath().string()); - } else { - PION_LOG_ERROR(m_logger, "Unable to read file: " -- << m_disk_file.getFilePath().file_string()); -+ << m_disk_file.getFilePath().string()); - } - return; - } diff --git a/community-staging/pion-net/gcc_4.7_fix.diff b/community-staging/pion-net/gcc_4.7_fix.diff deleted file mode 100644 index 5c2ed3cfe..000000000 --- a/community-staging/pion-net/gcc_4.7_fix.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup pion-net-4.0.12/common/include/pion/PluginManager.hpp pion-net-4.0.12-new/common/include/pion/PluginManager.hpp ---- pion-net-4.0.12/common/include/pion/PluginManager.hpp 2011-02-12 01:46:50.000000000 +0100 -+++ pion-net-4.0.12-new/common/include/pion/PluginManager.hpp 2012-07-07 16:54:22.470284487 +0200 -@@ -420,7 +420,7 @@ inline void PluginManager<PLUGIN_TYPE>:: - delete i->second.first; - } - } -- erase(std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::begin(), -+ this->erase(std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::begin(), - std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::end()); - } - } diff --git a/community-staging/pokerth/PKGBUILD b/community-staging/pokerth/PKGBUILD deleted file mode 100644 index ad02ab999..000000000 --- a/community-staging/pokerth/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 73496 2012-07-08 17:05:06Z foutrelis $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> -# Contributor: Vasco Costa <vasco.costa@meiodigital.com> - -pkgname=pokerth -_realname=PokerTH -pkgver=0.9.5 -pkgrel=2 -pkgdesc="Poker game written in C++/QT4" -arch=('i686' 'x86_64') -url="http://www.pokerth.net/" -license=('GPL' 'custom') -depends=('curl' 'boost-libs' 'gsasl' 'gnutls' - 'qt' 'sdl_mixer' 'libircclient' 'tinyxml') -makedepends=('boost') -source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2) -md5sums=('4bdea98bfc142a825c64b77feb4667d0') - -build() { - cd "$srcdir/$_realname-$pkgver-src" - - sed -i '1 i #include <unistd.h>' src/third_party/qtsingleapplication/qtlocalpeer.cpp - - sed -i '23 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp - - # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' - sed \ - -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ - -i zlib_compress.pro pokerth_game.pro pokerth_server.pro - - qmake $pkgname.pro - make -} - -package() { - cd "$srcdir/$_realname-$pkgver-src" - - make INSTALL_ROOT="$pkgdir" install - - install -D "$pkgname" "$pkgdir/usr/bin/$pkgname" - install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1" - install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt" - rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt" -} diff --git a/community-staging/python2-pyopencl/LICENSE.txt b/community-staging/python2-pyopencl/LICENSE.txt deleted file mode 100644 index 3ce400f9d..000000000 --- a/community-staging/python2-pyopencl/LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. diff --git a/community-staging/python2-pyopencl/PKGBUILD b/community-staging/python2-pyopencl/PKGBUILD deleted file mode 100644 index 3007ce2a6..000000000 --- a/community-staging/python2-pyopencl/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 73358 2012-07-06 16:18:30Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> - -pkgname=python2-pyopencl -pkgver=2012.1 -pkgrel=2 -pkgdesc="A complete, object-oriented language binding of OpenCL to Python" -arch=('i686' 'x86_64') -url="http://mathema.tician.de/software/pyopencl" -license=('custom') -depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa' 'boost') -makedepends=('ctags' 'python2-distribute') -source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz" - 'LICENSE.txt') -sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff' - '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7') - -build() { - cd "${srcdir}/pyopencl-${pkgver}" - python2 ./configure.py --cl-enable-gl --no-use-shipped-boost - - python2 setup.py build -} - -package() { - cd "${srcdir}/pyopencl-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build - - install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community-staging/schroot/PKGBUILD b/community-staging/schroot/PKGBUILD deleted file mode 100644 index e5ebcc2e0..000000000 --- a/community-staging/schroot/PKGBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# $Id: PKGBUILD 73547 2012-07-09 13:09:50Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> - -pkgname=schroot -pkgver=1.6.0 -pkgrel=1 -pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." -url="http://packages.qa.debian.org/s/schroot.html" -license=('GPL3') -depends=('pam' 'lockdev' 'boost' 'e2fsprogs') -optdepends=('btrfs-progs-unstable' 'lvm2') -arch=('i686' 'x86_64') -conflicts=('dchroot') -replaces=('dchroot') -provides=('schroot' 'sbuild' 'dchroot') -backup=('etc/schroot/schroot.conf' - 'etc/schroot/arch32/config' - 'etc/schroot/arch32/copyfiles' - 'etc/schroot/arch32/mount' - 'etc/schroot/arch32/nssdatabases') -options=(!libtool) -source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz" - 'pam.d.schroot.patch' - 'arch32-example' - 'arch32-config' - 'arch32-copyfiles' - 'arch32-mount' - 'arch32-nssdatabases') -md5sums=('9b0a12077dbb0e3e384b4c9af0dc3195' - 'a8d77cac806a0a9adef3f93cdbeb280a' - '1e34db5387c4e5de911e15d8a9208bdb' - '5a3f7b839c7e0b8933748da7c5b6385b' - '06db41d42f9fce5449a28feb76ded556' - 'f0d5d5b5e34a860f6f90b5628c680f46' - 'af1da6edd8c8c0dafeeb2c2c4e0c840b') - -build() { - cd ${pkgname}-${pkgver} - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-dchroot \ - --enable-lvm-snapshot \ - --enable-btrfs-snapshot \ - --with-bash-completion-dir=/usr/share/bash-completion/completions/ \ - BTRFS=/sbin/btrfs \ - BTRFSCTL=/sbin/btrfsctl \ - LVCREATE=/sbin/lvcreate \ - LVREMOVE=/sbin/lvremove - # --enable-csbuild - make -} - -check() { - cd ${pkgname}-${pkgver} - make -k check -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR=$pkgdir install - install -dm 755 ${pkgdir}/etc/schroot/arch32 - install -m 644 ${srcdir}/arch32-{config,mount,copyfiles,nssdatabases} ${pkgdir}/etc/schroot/arch32 - rename 'arch32-' '' ${pkgdir}/etc/schroot/arch32/* - install -m 644 ${srcdir}/arch32-example ${pkgdir}/etc/schroot/chroot.d/arch32.conf.example - patch -i ${srcdir}/pam.d.schroot.patch ${pkgdir}/etc/pam.d/schroot -} diff --git a/community-staging/schroot/arch32-config b/community-staging/schroot/arch32-config deleted file mode 100644 index 0ee72d522..000000000 --- a/community-staging/schroot/arch32-config +++ /dev/null @@ -1,11 +0,0 @@ -# Default settings for chroot setup and exec scripts. -# See schroot-script-config(5) for further details. - -# Filesystems to mount inside the chroot. -FSTAB="/etc/schroot/arch32/mount" - -# Files to copy from the host system into the chroot. -COPYFILES="/etc/schroot/arch32/copyfiles" - -# System databases to copy into the chroot -NSSDATABASES="/etc/schroot/arch32/nssdatabases" diff --git a/community-staging/schroot/arch32-copyfiles b/community-staging/schroot/arch32-copyfiles deleted file mode 100644 index 88f093ceb..000000000 --- a/community-staging/schroot/arch32-copyfiles +++ /dev/null @@ -1,7 +0,0 @@ -/etc/group -/etc/hosts -/etc/passwd -/etc/resolv.conf -/etc/rc.conf -/etc/localtime -/etc/locale.gen diff --git a/community-staging/schroot/arch32-example b/community-staging/schroot/arch32-example deleted file mode 100644 index 3f059e3c0..000000000 --- a/community-staging/schroot/arch32-example +++ /dev/null @@ -1,10 +0,0 @@ -[arch32] -description=Arch32 -type=directory -directory=/opt/arch32 -#users=username -groups=users -root-groups=root -script-config=arch32/config -personality=linux32 -#aliases=32,i686 diff --git a/community-staging/schroot/arch32-mount b/community-staging/schroot/arch32-mount deleted file mode 100644 index 075d6e451..000000000 --- a/community-staging/schroot/arch32-mount +++ /dev/null @@ -1,12 +0,0 @@ -# mount.defaults: static file system information for chroots. -# Note that the mount point will be prefixed by the chroot path -# (CHROOT_PATH) -# -# <file system> <mount point> <type> <options> <dump> <pass> -proc /proc proc defaults 0 0 -/dev /dev none rw,bind 0 0 -#/dev/pts /dev/pts none rw,bind 0 0 -tmpfs /dev/shm tmpfs defaults 0 0 -/sys /sys none rw,bind 0 0 -/tmp /tmp none rw,bind 0 0 -/home /home none rw,bind 0 0 diff --git a/community-staging/schroot/arch32-nssdatabases b/community-staging/schroot/arch32-nssdatabases deleted file mode 100644 index 815ddce3f..000000000 --- a/community-staging/schroot/arch32-nssdatabases +++ /dev/null @@ -1,6 +0,0 @@ -# System databases to copy into the chroot from the host system. -# -# <database name> -passwd -shadow -group diff --git a/community-staging/schroot/pam.d.schroot.patch b/community-staging/schroot/pam.d.schroot.patch deleted file mode 100644 index 528acb5f7..000000000 --- a/community-staging/schroot/pam.d.schroot.patch +++ /dev/null @@ -1,15 +0,0 @@ -@@ -23,13 +23,6 @@ - # time restrainst on schroot usage. - # account requisite pam_time.so - --# The standard Unix authentication modules, used with --# NIS (man nsswitch) as well as normal /etc/passwd and --# /etc/shadow entries. --@include common-auth --@include common-account --@include common-session -- - # Sets up user limits, please uncomment and read /etc/security/limits.conf - # to enable this functionality. - # session required pam_limits.so - diff --git a/community-staging/springlobby/PKGBUILD b/community-staging/springlobby/PKGBUILD deleted file mode 100644 index 9e792f136..000000000 --- a/community-staging/springlobby/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 73520 2012-07-09 01:15:30Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: DuGi <dugi@irc.pl> - -pkgname=springlobby -pkgver=0.147 -pkgrel=2 -pkgdesc="A free cross-platform lobby client for the Spring RTS project." -arch=('i686' 'x86_64') -url="http://springlobby.info/" -license=('GPL2') -depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs') -optdepends=('sdl' 'sdl_sound' 'sdl_mixer') -makedepends=('boost' 'asio' 'cmake') -install=springlobby.install -source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1dd17f3f573d40b10b66bdbdc77181f0') - -build() { - cd $srcdir/${pkgname}-$pkgver - - #export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - - sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt - - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DOPTION_SOUND=false - make -} - -package() { - cd $srcdir/${pkgname}-$pkgver - - make DESTDIR=$pkgdir install - # - # install -m755 -d $pkgdir/usr/share/applications - # install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications - - # install -m755 -d -p $pkgdir/usr/share/pixmaps - # install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps -} - -# vim: sw=2:ts=2 et: diff --git a/community-staging/springlobby/springlobby.desktop b/community-staging/springlobby/springlobby.desktop deleted file mode 100644 index 1dce96b90..000000000 --- a/community-staging/springlobby/springlobby.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=SpringLobby -Comment=Lobby for Spring. An open source RTS with similar gameplay to TA -Exec=springlobby -Icon=springlobby.png -Terminal=false -Type=Application -Categories=Application;Game;StrategyGame; diff --git a/community-staging/springlobby/springlobby.install b/community-staging/springlobby/springlobby.install deleted file mode 100644 index 1a05f573e..000000000 --- a/community-staging/springlobby/springlobby.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-staging/springlobby/springlobby.png b/community-staging/springlobby/springlobby.png Binary files differdeleted file mode 100644 index 89c7ab0ac..000000000 --- a/community-staging/springlobby/springlobby.png +++ /dev/null diff --git a/community-staging/tagpy/PKGBUILD b/community-staging/tagpy/PKGBUILD deleted file mode 100644 index 95c398585..000000000 --- a/community-staging/tagpy/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 73441 2012-07-07 18:57:56Z tdziedzic $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Callan Barrett <wizzomafizzo@gmail.com> -# Contributor: Scott Horowitz <stonecrest@gmail.com> - -pkgname=tagpy -pkgver=0.94.8 -pkgrel=8 -pkgdesc="Python bindings for TagLib" -arch=('i686' 'x86_64') -url="http://pypi.python.org/pypi/tagpy" -license=('MIT') -depends=('python2' 'taglib' 'boost-libs') -makedepends=('python2-distribute' 'boost') -source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('6baff63318cf90b9bc5a2497a0597802') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find . -name '*.py') - - ./configure.py --taglib-lib-dir=/usr/lib/ \ - --taglib-inc-dir=/usr/include/taglib/ \ - --boost-inc-dir=/usr/include/boost/ \ - --boost-lib-dir=/usr/lib/ \ - --boost-python-libname=boost_python - python2 setup.py build -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - python2 setup.py install --root="${pkgdir}" --optimize=1 - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community-staging/wesnoth/PKGBUILD b/community-staging/wesnoth/PKGBUILD deleted file mode 100644 index 33a660c7b..000000000 --- a/community-staging/wesnoth/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 73579 2012-07-10 15:22:42Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Jacobo Arvelo <unix4all@ya.com> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=wesnoth -pkgver=1.10.3 -pkgrel=2 -pkgdesc="A turn-based strategy game on a fantasy world" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.wesnoth.org/" -depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data" 'dbus-core' 'python2') -makedepends=('boost' 'cmake') -install=wesnoth.install -options=(!emptydirs) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - wesnoth.tmpfiles.conf - wesnothd.rc.d - boost_foreach.patch) -md5sums=('b25354c71d58f82c2c60cc12c6f09c36' - 'b8122f5054e3895c9c054e87460869dc' - '85659b47d22dfdf4e4d046556973fc3e' - '07e78c6ece06ed10119fc57ebc16ea9d') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np0 < $srcdir/boost_foreach.patch - - mkdir build && cd build - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_OMP=ON \ - -DENABLE_TOOLS=ON \ - -DMANDIR=share/man \ - -DFIFO_DIR=/var/run/wesnothd - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - cd build - make DESTDIR="$pkgdir" install - - rm -r $pkgdir/usr/share/applications - rm -r $pkgdir/usr/share/doc - rm -r $pkgdir/usr/share/pixmaps - rm -r $pkgdir/usr/share/wesnoth - - install -Dm644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf" - install -Dm755 "$srcdir/wesnothd.rc.d" "$pkgdir/etc/rc.d/wesnothd" -} diff --git a/community-staging/wesnoth/boost_foreach.patch b/community-staging/wesnoth/boost_foreach.patch deleted file mode 100644 index 95b98828e..000000000 --- a/community-staging/wesnoth/boost_foreach.patch +++ /dev/null @@ -1,11890 +0,0 @@ ------------------------------------------------------------------------- -r54625 | loonycyborg | 2012-07-08 16:26:21 +0200 (So, 08 Jul 2012) | 5 lines - -Backport r54604: Use BOOST_FOREACH directly instead of #define foreach BOOST_FOREACH - -The define is extremely unreliable, will break compile with boost >= -1.50 and upstream can't fix issues with it, see -https://svn.boost.org/trac/boost/ticket/6131 - -Index: src/foreach.hpp (deleted) -=================================================================== -Index: src/scripting/lua.cpp -=================================================================== ---- src/scripting/lua.cpp (revision 54624) -+++ src/scripting/lua.cpp (revision 54625) -@@ -39,7 +39,6 @@ - #include "ai/manager.hpp" - #include "attack_prediction.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_preferences.hpp" - #include "gamestatus.hpp" -@@ -77,6 +76,8 @@ - #include "scripting/debug_lua.hpp" - #endif - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_scripting_lua("scripting/lua"); - #define LOG_LUA LOG_STREAM(info, log_scripting_lua) - #define ERR_LUA LOG_STREAM(err, log_scripting_lua) -@@ -87,7 +88,7 @@ - void extract_preload_scripts(config const &game_config) - { - preload_scripts.clear(); -- foreach (config const &cfg, game_config.child_range("lua")) { -+ BOOST_FOREACH(config const &cfg, game_config.child_range("lua")) { - preload_scripts.push_back(cfg); - } - preload_config = game_config.child("game_config"); -@@ -254,7 +255,7 @@ - return; - - int k = 1; -- foreach (const config::any_child &ch, cfg.all_children_range()) -+ BOOST_FOREACH(const config::any_child &ch, cfg.all_children_range()) - { - lua_createtable(L, 2, 0); - lua_pushstring(L, ch.key.c_str()); -@@ -264,7 +265,7 @@ - lua_rawseti(L, -2, 2); - lua_rawseti(L, -2, k++); - } -- foreach (const config::attribute &attr, cfg.attribute_range()) -+ BOOST_FOREACH(const config::attribute &attr, cfg.attribute_range()) - { - luaW_pushscalar(L, attr.second); - lua_setfield(L, -2, attr.first.c_str()); -@@ -534,7 +535,7 @@ - { - if (ptr) return ptr; - if (side) { -- foreach (unit &u, (*resources::teams)[side - 1].recall_list()) { -+ BOOST_FOREACH(unit &u, (*resources::teams)[side - 1].recall_list()) { - if (u.underlying_id() == uid) return &u; - } - return NULL; -@@ -710,7 +711,7 @@ - if (shallow_literal || strcmp(m, "__shallow_parsed") == 0) - { - lua_newtable(L); -- foreach (const config::attribute &a, v->get_config().attribute_range()) { -+ BOOST_FOREACH(const config::attribute &a, v->get_config().attribute_range()) { - if (shallow_literal) - luaW_pushscalar(L, a.second); - else -@@ -813,7 +814,7 @@ - const std::vector<std::string>& vector = accessor; \ - lua_createtable(L, vector.size(), 0); \ - int i = 1; \ -- foreach (const std::string& s, vector) { \ -+ BOOST_FOREACH(const std::string& s, vector) { \ - lua_pushstring(L, s.c_str()); \ - lua_rawseti(L, -2, i); \ - ++i; \ -@@ -1292,9 +1293,9 @@ - lua_rawget(L, LUA_REGISTRYINDEX); - lua_newtable(L); - int i = 1, s = 1; -- foreach (team &t, *resources::teams) -+ BOOST_FOREACH(team &t, *resources::teams) - { -- foreach (unit &u, t.recall_list()) -+ BOOST_FOREACH(unit &u, t.recall_list()) - { - if (!filter.null()) { - scoped_recall_unit auto_store("this_unit", -@@ -1560,7 +1561,7 @@ - std::set<std::string> const &recruits = t.recruits(); - lua_createtable(L, recruits.size(), 0); - int i = 1; -- foreach (std::string const &r, t.recruits()) { -+ BOOST_FOREACH(std::string const &r, t.recruits()) { - lua_pushstring(L, r.c_str()); - lua_rawseti(L, -2, i++); - } -@@ -3130,7 +3131,7 @@ - - lua_createtable(L, res.size(), 0); - int i = 1; -- foreach (map_location const &loc, res) -+ BOOST_FOREACH(map_location const &loc, res) - { - lua_createtable(L, 2, 0); - lua_pushinteger(L, loc.x + 1); -@@ -3227,7 +3228,7 @@ - lua_rawget(L, LUA_REGISTRYINDEX); - lua_createtable(L, sides.size(), 0); - unsigned index = 1; -- foreach(int side, sides) { -+ BOOST_FOREACH(int side, sides) { - // Create a full userdata containing a pointer to the team. - team** t = static_cast<team**>(lua_newuserdata(L, sizeof(team*))); - *t = &((*resources::teams)[side - 1]); -@@ -3247,7 +3248,7 @@ - static int intf_get_traits(lua_State* L) - { - lua_newtable(L); -- foreach(const config& trait, unit_types.traits()) { -+ BOOST_FOREACH(const config& trait, unit_types.traits()) { - const std::string& id = trait["id"]; - //It seems the engine does nowhere check the id field for emptyness or duplicates - //(also not later on). -@@ -3767,7 +3768,7 @@ - , static_cast<void *>(const_cast<char *>(&gettypeKey))); - lua_rawget(L, LUA_REGISTRYINDEX); - lua_newtable(L); -- foreach (const unit_type_data::unit_type_map::value_type &ut, unit_types.types()) -+ BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &ut, unit_types.types()) - { - lua_createtable(L, 0, 1); - lua_pushstring(L, ut.first.c_str()); -@@ -3786,7 +3787,7 @@ - lua_rawget(L, LUA_REGISTRYINDEX); - const race_map& races = unit_types.races(); - lua_createtable(L, 0, races.size()); -- foreach(const race_map::value_type &race, races) -+ BOOST_FOREACH(const race_map::value_type &race, races) - { - lua_createtable(L, 0, 1); - char const* id = race.first.c_str(); -@@ -3801,10 +3802,10 @@ - - // Execute the preload scripts. - game_config::load_config(preload_config); -- foreach (const config &cfg, preload_scripts) { -+ BOOST_FOREACH(const config &cfg, preload_scripts) { - execute(cfg["code"].str().c_str(), 0, 0); - } -- foreach (const config &cfg, level_.child_range("lua")) { -+ BOOST_FOREACH(const config &cfg, level_.child_range("lua")) { - execute(cfg["code"].str().c_str(), 0, 0); - } - -@@ -3822,7 +3823,7 @@ - - static bool is_handled_file_tag(const std::string &s) - { -- foreach (char const *t, handled_file_tags) { -+ BOOST_FOREACH(char const *t, handled_file_tags) { - if (s == t) return true; - } - return false; -@@ -3841,7 +3842,7 @@ - - lua_newtable(L); - int k = 1; -- foreach (const config::any_child &v, level_.all_children_range()) -+ BOOST_FOREACH(const config::any_child &v, level_.all_children_range()) - { - if (is_handled_file_tag(v.key)) continue; - lua_createtable(L, 2, 0); -@@ -3861,7 +3862,7 @@ - */ - void LuaKernel::save_game(config &cfg) - { -- foreach (const config &v, level_.child_range("lua")) { -+ BOOST_FOREACH(const config &v, level_.child_range("lua")) { - cfg.add_child("lua", v); - } - -Index: src/dialogs.cpp -=================================================================== ---- src/dialogs.cpp (revision 54624) -+++ src/dialogs.cpp (revision 54625) -@@ -22,7 +22,6 @@ - - #include "actions.hpp" - #include "dialogs.hpp" --#include "foreach.hpp" - #include "game_events.hpp" - #include "game_display.hpp" - #include "game_preferences.hpp" -@@ -49,6 +48,7 @@ - #include "gui/dialogs/game_save.hpp" - #include "gui/dialogs/transient_message.hpp" - -+#include <boost/foreach.hpp> - - //#ifdef _WIN32 - //#include "locale.h" -@@ -95,7 +95,7 @@ - } - - bool always_display = false; -- foreach (const config &mod, u->get_modification_advances()) -+ BOOST_FOREACH(const config &mod, u->get_modification_advances()) - { - if (mod["always_display"].to_bool()) always_display = true; - sample_units.push_back(::get_advanced_unit(*u, u->type_id())); -@@ -1009,7 +1009,7 @@ - } - - //FIXME: This probably must be move into a unit_type function -- foreach (const config &tr, t->possible_traits()) -+ BOOST_FOREACH(const config &tr, t->possible_traits()) - { - if (tr["availability"] != "musthave") continue; - std::string gender_string = (!t->genders().empty() && t->genders().front()== unit_race::FEMALE) ? "female_name" : "male_name"; -@@ -1038,7 +1038,7 @@ - // Check if AMLA color is needed - // FIXME: not sure if it's fully accurate (but not very important for unit_type) - // xp_color also need a simpler function for doing this -- foreach (const config &adv, t->modification_advancements()) -+ BOOST_FOREACH(const config &adv, t->modification_advancements()) - { - if (!adv["strict_amla"].to_bool() || !t->can_advance()) { - det.xp_color = "<170,0,255>"; // from unit::xp_color() -Index: src/menu_events.cpp -=================================================================== ---- src/menu_events.cpp (revision 54624) -+++ src/menu_events.cpp (revision 54625) -@@ -27,7 +27,6 @@ - #include "dialogs.hpp" - #include "formatter.hpp" - #include "filechooser.hpp" --#include "foreach.hpp" - #include "game_end_exceptions.hpp" - #include "game_events.hpp" - #include "game_preferences.hpp" -@@ -66,6 +65,7 @@ - #include "widgets/combo.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_engine("engine"); - #define ERR_NG LOG_STREAM(err, log_engine) -@@ -863,7 +863,7 @@ - - - DBG_WB <<"menu_handler::recall: Contents of wb-modified recall list:\n"; -- foreach(const unit* unit, recall_list_team) -+ BOOST_FOREACH(const unit* unit, recall_list_team) - { - DBG_WB << unit->name() << " [" << unit->id() <<"]\n"; - } -@@ -896,7 +896,7 @@ - options.push_back(heading.str()); - options_to_filter.push_back(options.back()); - -- foreach (const unit* u, recall_list_team) -+ BOOST_FOREACH(const unit* u, recall_list_team) - { - std::stringstream option, option_to_filter; - std::string name = u->name(); -@@ -933,7 +933,7 @@ - option_to_filter << u->type_name() << " " << name << " " << u->level(); - - option << COLUMN_SEPARATOR; -- foreach (const t_string& trait, u->trait_names()) { -+ BOOST_FOREACH(const t_string& trait, u->trait_names()) { - option << trait << '\n'; - option_to_filter << " " << trait; - } -@@ -1540,7 +1540,7 @@ - _("Type"); - options.push_back(heading); - -- foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types()) -+ BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types()) - { - std::stringstream row; - -@@ -2047,7 +2047,7 @@ - std::vector<std::string> get_commands_list() const - { - std::vector<std::string> res; -- foreach(typename command_map::value_type i, command_map_) { -+ BOOST_FOREACH(typename command_map::value_type i, command_map_) { - res.push_back(i.first); - } - return res; -@@ -2638,7 +2638,7 @@ - - if (const config &alias_list = preferences::get_alias()) - { -- foreach (const config::attribute &a, alias_list.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &a, alias_list.attribute_range()) { - register_alias(a.second, a.first); - } - } -@@ -3241,7 +3241,7 @@ - tile->rebuild_cache(tod_id, &tile_logs); - - int order = 1; -- foreach(const terrain_builder::tile::log_details det, tile_logs) { -+ BOOST_FOREACH(const terrain_builder::tile::log_details det, tile_logs) { - const terrain_builder::tile::rule_image_rand& ri = *det.first; - const terrain_builder::rule_image_variant& variant = *det.second; - -@@ -3356,7 +3356,7 @@ - void console_handler::do_choose_level() { - std::vector<std::string> options; - int next = 0, nb = 0; -- foreach (const config &sc, menu_handler_.game_config_.child_range("scenario")) -+ BOOST_FOREACH(const config &sc, menu_handler_.game_config_.child_range("scenario")) - { - const std::string &id = sc["id"]; - options.push_back(id); -@@ -3367,7 +3367,7 @@ - // find scenarios of multiplayer campaigns - // (assumes that scenarios are ordered properly in the game_config) - std::string& scenario = menu_handler_.gamestate_.mp_settings().mp_scenario; -- foreach (const config &mp, menu_handler_.game_config_.child_range("multiplayer")) -+ BOOST_FOREACH(const config &mp, menu_handler_.game_config_.child_range("multiplayer")) - { - if (mp["id"] == scenario) - { -@@ -3596,7 +3596,7 @@ - } - }*/ - void console_handler::do_discover() { -- foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types()) { -+ BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types()) { - preferences::encountered_units().insert(i.second.id()); - } - } -Index: src/multiplayer_wait.cpp -=================================================================== ---- src/multiplayer_wait.cpp (revision 54624) -+++ src/multiplayer_wait.cpp (revision 54625) -@@ -16,7 +16,6 @@ - #include "global.hpp" - - #include "dialogs.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "game_preferences.hpp" - #include "gui/dialogs/transient_message.hpp" -@@ -30,6 +29,8 @@ - #include "wml_separators.hpp" - #include "formula_string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_network("network"); - #define DBG_NW LOG_STREAM(debug, log_network) - #define LOG_NW LOG_STREAM(info, log_network) -@@ -222,7 +223,7 @@ - //available side. - const config *side_choice = NULL; - int side_num = -1, nb_sides = 0; -- foreach (const config &sd, level_.child_range("side")) -+ BOOST_FOREACH(const config &sd, level_.child_range("side")) - { - if (sd["controller"] == "reserved" && sd["current_player"] == preferences::login()) - { -@@ -275,7 +276,7 @@ - color = game_config::color_info(color_str).index() - 1; - - std::vector<const config *> leader_sides; -- foreach (const config &side, possible_sides) { -+ BOOST_FOREACH(const config &side, possible_sides) { - leader_sides.push_back(&side); - } - -@@ -287,7 +288,7 @@ - } - - std::vector<std::string> choices; -- foreach (const config *s, leader_sides) -+ BOOST_FOREACH(const config *s, leader_sides) - { - const config &side = *s; - const std::string &name = side["name"]; -@@ -442,7 +443,7 @@ - std::vector<std::string> details; - std::vector<std::string> playerlist; - -- foreach (const config &sd, level_.child_range("side")) -+ BOOST_FOREACH(const config &sd, level_.child_range("side")) - { - if (!sd["allow_player"].to_bool(true)) { - continue; -@@ -458,7 +459,7 @@ - // Hack: if there is a unit which can recruit, use it as a - // leader. Necessary to display leader information when loading - // saves. -- foreach (const config &side_unit, sd.child_range("unit")) -+ BOOST_FOREACH(const config &side_unit, sd.child_range("unit")) - { - if (side_unit["canrecruit"].to_bool()) { - leader_type = side_unit["type"].str(); -Index: src/serialization/schema_validator.cpp -=================================================================== ---- src/serialization/schema_validator.cpp (revision 54624) -+++ src/serialization/schema_validator.cpp (revision 54625) -@@ -17,12 +17,13 @@ - - - #include "filesystem.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "log.hpp" - #include "serialization/preprocessor.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - namespace schema_validation{ - - static lg::log_domain log_validation("validation"); -@@ -143,14 +144,14 @@ - } catch(config::error&) { - return false; - } -- foreach (const config &g, cfg.child_range("wml_schema")) { -- foreach (const config &schema, g.child_range("tag")) { -+ BOOST_FOREACH(const config &g, cfg.child_range("wml_schema")) { -+ BOOST_FOREACH(const config &schema, g.child_range("tag")) { - if (schema["name"].str() == "root"){ - //@NOTE Don't know, maybe merging of roots needed. - root_ = class_tag (schema); - } - } -- foreach (const config &type, g.child_range("type")) { -+ BOOST_FOREACH(const config &type, g.child_range("type")) { - try{ - types_[type["name"].str()] = boost::regex( type["value"].str()); - } -Index: src/serialization/preprocessor.cpp -=================================================================== ---- src/serialization/preprocessor.cpp (revision 54624) -+++ src/serialization/preprocessor.cpp (revision 54625) -@@ -23,7 +23,6 @@ - - #include "config.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "game_config.hpp" - #include "log.hpp" - #include "wesconfig.h" -@@ -34,6 +33,8 @@ - #include "util.hpp" - #include "version.hpp" - -+#include <boost/foreach.hpp> -+ - #include <stdexcept> - - static lg::log_domain log_config("config"); -@@ -64,7 +65,7 @@ - int n = 0; - s >> std::hex >> n; - -- foreach(const t_file_number_map::value_type& p, file_number_map){ -+ BOOST_FOREACH(const t_file_number_map::value_type& p, file_number_map){ - if(p.second == n) - return p.first; - } -@@ -142,7 +143,7 @@ - writer.write_key_val("linenum", lexical_cast<std::string>(linenum)); - writer.write_key_val("location", get_location(location)); - -- foreach (const std::string &arg, arguments) -+ BOOST_FOREACH(const std::string &arg, arguments) - write_argument(writer, arg); - - writer.close_child(key); -@@ -160,7 +161,7 @@ - linenum = cfg["linenum"]; - location = cfg["location"].str(); - -- foreach (const config &arg, cfg.child_range("argument")) -+ BOOST_FOREACH(const config &arg, cfg.child_range("argument")) - read_argument(arg); - } - -@@ -1157,14 +1158,14 @@ - get_files_in_dir(res_name, &files, &dirs, ENTIRE_FILE_PATH, SKIP_MEDIA_DIR, DO_REORDER); - - // subdirectories -- foreach(const std::string& dir, dirs) -+ BOOST_FOREACH(const std::string& dir, dirs) - { - LOG_PREPROC<<"processing sub-dir: "<<dir<<'\n'; - preprocess_resource(dir,defines_map,write_cfg,write_plain_cfg,target_directory); - } - - // files in current directory -- foreach(const std::string& file, files) -+ BOOST_FOREACH(const std::string& file, files) - { - preprocess_resource(file,defines_map,write_cfg,write_plain_cfg,target_directory); - } -Index: src/serialization/parser.cpp -=================================================================== ---- src/serialization/parser.cpp (revision 54624) -+++ src/serialization/parser.cpp (revision 54625) -@@ -32,7 +32,6 @@ - #include "serialization/tokenizer.hpp" - #include "serialization/string_utils.hpp" - #include "serialization/validator.hpp" --#include "foreach.hpp" - - #include <stack> - -@@ -40,6 +39,7 @@ - #include <boost/iostreams/filter/gzip.hpp> - #include <boost/algorithm/string/replace.hpp> - #include <boost/variant.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_config("config"); - #define ERR_CF LOG_STREAM(err, log_config) -@@ -343,7 +343,7 @@ - { - i18n_symbols["pos"] = ::lineno_string(lineno); - std::string result = _(error_string); -- foreach(utils::string_map::value_type& var, i18n_symbols) -+ BOOST_FOREACH(utils::string_map::value_type& var, i18n_symbols) - boost::algorithm::replace_all(result, std::string("$") + var.first, std::string(var.second)); - return result; - } -@@ -503,11 +503,11 @@ - if (tab > max_recursion_levels) - throw config::error("Too many recursion levels in config write"); - -- foreach (const config::attribute &i, cfg.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, cfg.attribute_range()) { - write_key_val(out, i.first, i.second, tab, textdomain); - } - -- foreach (const config::any_child &item, cfg.all_children_range()) -+ BOOST_FOREACH(const config::any_child &item, cfg.all_children_range()) - { - write_open_child(out, item.key, tab); - write_internal(item.cfg, out, textdomain, tab + 1); -Index: src/game_controller_abstract.cpp -=================================================================== ---- src/game_controller_abstract.cpp (revision 54624) -+++ src/game_controller_abstract.cpp (revision 54625) -@@ -15,7 +15,6 @@ - - #include "game_controller_abstract.hpp" - --#include "foreach.hpp" - #include "game_display.hpp" - #include "gettext.hpp" - #include "hotkeys.hpp" -@@ -24,6 +23,8 @@ - - #include "preferences.hpp" - -+#include <boost/foreach.hpp> -+ - #include <iostream> - - game_controller_abstract::game_controller_abstract(const commandline_options &cmdline_opts) : -@@ -80,7 +81,7 @@ - language_def locale; - if(cmdline_opts_.language) { - std::vector<language_def> langs = get_languages(); -- foreach(const language_def & def, langs) { -+ BOOST_FOREACH(const language_def & def, langs) { - if(def.localename == *cmdline_opts_.language) { - locale = def; - break; -Index: src/terrain.cpp -=================================================================== ---- src/terrain.cpp (revision 54624) -+++ src/terrain.cpp (revision 54625) -@@ -15,13 +15,14 @@ - - #include "global.hpp" - --#include "foreach.hpp" - #include "gettext.hpp" - #include "log.hpp" - #include "serialization/string_utils.hpp" - #include "terrain.hpp" - #include "util.hpp" - -+#include <boost/foreach.hpp> -+ - #include <set> - - static lg::log_domain log_config("config"); -@@ -284,7 +285,7 @@ - t_translation::t_list& terrain_list, - std::map<t_translation::t_terrain, terrain_type>& letter_to_terrain) - { -- foreach (const config &t, cfgs) -+ BOOST_FOREACH(const config &t, cfgs) - { - terrain_type terrain(t); - DBG_G << "create_terrain_maps: " << terrain.number() << " " -@@ -301,9 +302,9 @@ - std::vector<std::string> eg2 = utils::split(terrain.editor_group()); - std::set<std::string> egs; - bool clean_merge = true; -- foreach(std::string& t, eg1) -+ BOOST_FOREACH(std::string& t, eg1) - clean_merge &= egs.insert(t).second; -- foreach(std::string& t, eg2) -+ BOOST_FOREACH(std::string& t, eg2) - clean_merge &= egs.insert(t).second; - - std::string joined = utils::join(egs); -Index: src/config.cpp -=================================================================== ---- src/config.cpp (revision 54624) -+++ src/config.cpp (revision 54625) -@@ -22,7 +22,6 @@ - #include "global.hpp" - - #include "config.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "serialization/string_utils.hpp" - #include "util.hpp" -@@ -31,6 +30,7 @@ - #include <cstring> - #include <deque> - #include <boost/variant.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_config("config"); - #define ERR_CF LOG_STREAM(err, log_config) -@@ -255,7 +255,7 @@ - { - check_valid(cfg); - -- foreach (const any_child &value, cfg.all_children_range()) { -+ BOOST_FOREACH(const any_child &value, cfg.all_children_range()) { - add_child(value.key, value.cfg); - } - } -@@ -263,7 +263,7 @@ - void config::append(const config &cfg) - { - append_children(cfg); -- foreach (const attribute &v, cfg.values) { -+ BOOST_FOREACH(const attribute &v, cfg.values) { - values[v.first] = v.second; - } - } -@@ -275,7 +275,7 @@ - if (child_count(key) < 2) return; - - config merged_children; -- foreach (const config &cfg, child_range(key)) { -+ BOOST_FOREACH(const config &cfg, child_range(key)) { - merged_children.append(cfg); - } - -@@ -291,7 +291,7 @@ - - typedef std::map<std::string, config> config_map; - config_map merged_children_map; -- foreach (const config &cfg, child_range(key)) { -+ BOOST_FOREACH(const config &cfg, child_range(key)) { - const std::string &value = cfg[attribute]; - config_map::iterator m = merged_children_map.find(value); - if ( m!=merged_children_map.end() ) { -@@ -302,7 +302,7 @@ - } - - clear_children(key); -- foreach (const config_map::value_type &i, merged_children_map) { -+ BOOST_FOREACH(const config_map::value_type &i, merged_children_map) { - add_child(key,i.second); - } - } -@@ -459,7 +459,7 @@ - ordered_children.erase(std::remove_if(ordered_children.begin(), - ordered_children.end(), remove_ordered(i)), ordered_children.end()); - -- foreach (config *c, i->second) { -+ BOOST_FOREACH(config *c, i->second) { - delete c; - } - -@@ -495,7 +495,7 @@ - - values.erase(key); - -- foreach (const any_child &value, all_children_range()) { -+ BOOST_FOREACH(const any_child &value, all_children_range()) { - const_cast<config *>(&value.cfg)->recursive_clear_value(key); - } - } -@@ -506,7 +506,7 @@ - /* Find the position with the correct index and decrement all the - indices in the ordering that are above this index. */ - unsigned found = 0; -- foreach (child_pos &p, ordered_children) -+ BOOST_FOREACH(child_pos &p, ordered_children) - { - if (p.pos != pos) continue; - if (p.index == index) -@@ -590,7 +590,7 @@ - check_valid(cfg); - - assert(this != &cfg); -- foreach (const attribute &v, cfg.values) { -+ BOOST_FOREACH(const attribute &v, cfg.values) { - values[v.first] = v.second; - } - } -@@ -860,21 +860,21 @@ - if (track) values[diff_track_attribute] = "modified"; - - if (const config &inserts = diff.child("insert")) { -- foreach (const attribute &v, inserts.attribute_range()) { -+ BOOST_FOREACH(const attribute &v, inserts.attribute_range()) { - values[v.first] = v.second; - } - } - - if (const config &deletes = diff.child("delete")) { -- foreach (const attribute &v, deletes.attribute_range()) { -+ BOOST_FOREACH(const attribute &v, deletes.attribute_range()) { - values.erase(v.first); - } - } - -- foreach (const config &i, diff.child_range("change_child")) -+ BOOST_FOREACH(const config &i, diff.child_range("change_child")) - { - const size_t index = lexical_cast<size_t>(i["index"].str()); -- foreach (const any_child &item, i.all_children_range()) -+ BOOST_FOREACH(const any_child &item, i.all_children_range()) - { - if (item.key.empty()) { - continue; -@@ -889,19 +889,19 @@ - } - } - -- foreach (const config &i, diff.child_range("insert_child")) -+ BOOST_FOREACH(const config &i, diff.child_range("insert_child")) - { - const size_t index = lexical_cast<size_t>(i["index"].str()); -- foreach (const any_child &item, i.all_children_range()) { -+ BOOST_FOREACH(const any_child &item, i.all_children_range()) { - config& inserted = add_child_at(item.key, item.cfg, index); - if (track) inserted[diff_track_attribute] = "new"; - } - } - -- foreach (const config &i, diff.child_range("delete_child")) -+ BOOST_FOREACH(const config &i, diff.child_range("delete_child")) - { - const size_t index = lexical_cast<size_t>(i["index"].str()); -- foreach (const any_child &item, i.all_children_range()) { -+ BOOST_FOREACH(const any_child &item, i.all_children_range()) { - if (!track) { - remove_child(item.key, index); - } else { -@@ -918,18 +918,18 @@ - void config::clear_diff_track(const config& diff) - { - remove_attribute(diff_track_attribute); -- foreach (const config &i, diff.child_range("delete_child")) -+ BOOST_FOREACH(const config &i, diff.child_range("delete_child")) - { - const size_t index = lexical_cast<size_t>(i["index"].str()); -- foreach (const any_child &item, i.all_children_range()) { -+ BOOST_FOREACH(const any_child &item, i.all_children_range()) { - remove_child(item.key, index); - } - } - -- foreach (const config &i, diff.child_range("change_child")) -+ BOOST_FOREACH(const config &i, diff.child_range("change_child")) - { - const size_t index = lexical_cast<size_t>(i["index"].str()); -- foreach (const any_child &item, i.all_children_range()) -+ BOOST_FOREACH(const any_child &item, i.all_children_range()) - { - if (item.key.empty()) { - continue; -@@ -943,7 +943,7 @@ - itor->second[index]->clear_diff_track(item.cfg); - } - } -- foreach (const any_child &value, all_children_range()) { -+ BOOST_FOREACH(const any_child &value, all_children_range()) { - const_cast<config *>(&value.cfg)->remove_attribute(diff_track_attribute); - } - } -@@ -984,20 +984,20 @@ - { - check_valid(filter); - -- foreach (const attribute &i, filter.attribute_range()) -+ BOOST_FOREACH(const attribute &i, filter.attribute_range()) - { - const attribute_value *v = get(i.first); - if (!v || *v != i.second) return false; - } - -- foreach (const any_child &i, filter.all_children_range()) -+ BOOST_FOREACH(const any_child &i, filter.all_children_range()) - { - if (i.key == "not") { - if (matches(i.cfg)) return false; - continue; - } - bool found = false; -- foreach (const config &j, child_range(i.key)) { -+ BOOST_FOREACH(const config &j, child_range(i.key)) { - if (j.matches(i.cfg)) { - found = true; - break; -@@ -1021,11 +1021,11 @@ - { - static int i = 0; - i++; -- foreach (const config::attribute &val, cfg.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &val, cfg.attribute_range()) { - for (int j = 0; j < i-1; j++){ outstream << char(9); } - outstream << val.first << " = " << val.second << '\n'; - } -- foreach (const config::any_child &child, cfg.all_children_range()) -+ BOOST_FOREACH(const config::any_child &child, cfg.all_children_range()) - { - for (int j = 0; j < i - 1; ++j) outstream << char(9); - outstream << "[" << child.key << "]\n"; -@@ -1054,7 +1054,7 @@ - hash_str[hash_length] = 0; - - i = 0; -- foreach (const attribute &val, values) -+ BOOST_FOREACH(const attribute &val, values) - { - for (c = val.first.begin(); c != val.first.end(); ++c) { - hash_str[i] ^= *c; -@@ -1067,10 +1067,10 @@ - } - } - -- foreach (const any_child &ch, all_children_range()) -+ BOOST_FOREACH(const any_child &ch, all_children_range()) - { - std::string child_hash = ch.cfg.hash(); -- foreach (char c, child_hash) { -+ BOOST_FOREACH(char c, child_hash) { - hash_str[i] ^= c; - ++i; - if(i == hash_length) { -Index: src/soundsource.cpp -=================================================================== ---- src/soundsource.cpp (revision 54624) -+++ src/soundsource.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - - #include "display.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "serialization/string_utils.hpp" - #include "sound.hpp" -Index: src/sound.cpp -=================================================================== ---- src/sound.cpp (revision 54624) -+++ src/sound.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "config.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "log.hpp" - #include "serialization/string_utils.hpp" -@@ -27,6 +26,8 @@ - - #include "SDL_mixer.h" - -+#include <boost/foreach.hpp> -+ - #include <list> - - static lg::log_domain log_audio("audio"); -@@ -596,7 +597,7 @@ - return; - - // If current track no longer on playlist, change it. -- foreach (const music_track &m, current_track_list) { -+ BOOST_FOREACH(const music_track &m, current_track_list) { - if (current_track == m) - return; - } -@@ -614,7 +615,7 @@ - { - // First entry clears playlist, others append to it. - bool append = false; -- foreach (music_track &m, current_track_list) { -+ BOOST_FOREACH(music_track &m, current_track_list) { - m.write(snapshot, append); - append = true; - } -Index: src/game_preferences.cpp -=================================================================== ---- src/game_preferences.cpp (revision 54624) -+++ src/game_preferences.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #define GETTEXT_DOMAIN "wesnoth-lib" - --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_preferences.hpp" - #include "gamestatus.hpp" -@@ -31,6 +30,8 @@ - #include "unit_map.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_config("config"); - #define ERR_CFG LOG_STREAM(err , log_config) - -@@ -112,9 +113,9 @@ - message = foobar - [/line] - */ -- foreach (const config::any_child &h, history.all_children_range()) -+ BOOST_FOREACH(const config::any_child &h, history.all_children_range()) - { -- foreach (const config &l, h.cfg.child_range("line")) { -+ BOOST_FOREACH(const config &l, h.cfg.child_range("line")) { - history_map[h.key].push_back(l["message"]); - } - } -@@ -142,10 +143,10 @@ - */ - config history; - typedef std::pair<std::string, std::vector<std::string> > hack; -- foreach(const hack& history_id, history_map) { -+ BOOST_FOREACH(const hack& history_id, history_map) { - - config history_id_cfg; // [history_id] -- foreach(const std::string& line, history_id.second) { -+ BOOST_FOREACH(const std::string& line, history_id.second) { - config cfg; // [line] - - cfg["message"] = line; -@@ -314,7 +315,7 @@ - std::vector<game_config::server_info> &game_servers = game_config::server_list; - VALIDATE(!game_servers.empty(), _("No server has been defined.")); - pref_servers.insert(pref_servers.begin(), game_servers.begin(), game_servers.end()); -- foreach (const config &server, get_prefs()->child_range("server")) { -+ BOOST_FOREACH(const config &server, get_prefs()->child_range("server")) { - game_config::server_info sinf; - sinf.name = server["name"].str(); - sinf.address = server["address"].str(); -@@ -945,8 +946,8 @@ - } - - void encounter_recallable_units(std::vector<team>& teams){ -- foreach(const team& t, teams) { -- foreach(const unit& u, t.recall_list()) { -+ BOOST_FOREACH(const team& t, teams) { -+ BOOST_FOREACH(const unit& u, t.recall_list()) { - encountered_units_set.insert(u.type_id()); - } - } -Index: src/map_label.cpp -=================================================================== ---- src/map_label.cpp (revision 54624) -+++ src/map_label.cpp (revision 54625) -@@ -16,12 +16,13 @@ - #include "global.hpp" - - #include "display.hpp" --#include "foreach.hpp" - #include "gamestatus.hpp" - #include "map_label.hpp" - #include "resources.hpp" - #include "formula_string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - //our definition of map labels being obscured is if the tile is obscured, - //or the tile below is obscured. This is because in the case where the tile - //itself is visible, but the tile below is obscured, the bottom half of the -@@ -59,7 +60,7 @@ - { - clear_all(); - -- foreach (const config &i, cfg.child_range("label")) -+ BOOST_FOREACH(const config &i, cfg.child_range("label")) - { - const map_location loc(i, resources::state_of_game); - terrain_label *label = new terrain_label(*this, i); -@@ -222,7 +223,7 @@ - - void map_labels::clear_all() - { -- foreach (team_label_map::value_type &m, labels_) -+ BOOST_FOREACH(team_label_map::value_type &m, labels_) - { - clear_map(m.second, true); - } -@@ -231,9 +232,9 @@ - - void map_labels::recalculate_labels() - { -- foreach (team_label_map::value_type &m, labels_) -+ BOOST_FOREACH(team_label_map::value_type &m, labels_) - { -- foreach (label_map::value_type &l, m.second) -+ BOOST_FOREACH(label_map::value_type &l, m.second) - { - l.second->recalculate(); - } -@@ -249,9 +250,9 @@ - - void map_labels::recalculate_shroud() - { -- foreach (team_label_map::value_type &m, labels_) -+ BOOST_FOREACH(team_label_map::value_type &m, labels_) - { -- foreach (label_map::value_type &l, m.second) -+ BOOST_FOREACH(label_map::value_type &l, m.second) - { - l.second->calculate_shroud(); - } -Index: src/actions.cpp -=================================================================== ---- src/actions.cpp (revision 54624) -+++ src/actions.cpp (revision 54625) -@@ -21,7 +21,6 @@ - #include "actions.hpp" - - #include "attack_prediction.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_events.hpp" - #include "game_preferences.hpp" -@@ -40,6 +39,7 @@ - #include "whiteboard/manager.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_engine("engine"); - #define DBG_NG LOG_STREAM(debug, log_engine) -@@ -206,7 +206,7 @@ - placements.push_back("map"); - placements.push_back("recall"); - -- foreach(std::string place, placements) { -+ BOOST_FOREACH(std::string place, placements) { - map_location loc; - bool pass((place == "leader_passable") || (place == "map_passable")); - -@@ -417,7 +417,7 @@ - leader_in_place= true; - else continue; - -- foreach (const unit& recall_unit, recall_list) -+ BOOST_FOREACH(const unit& recall_unit, recall_list) - { - //Only units which match the leaders recall filter are valid. - scoped_recall_unit this_unit("this_unit", t.save_id(), &recall_unit - &recall_list[0]); -@@ -435,7 +435,7 @@ - } - - if (!(recall_loc_is_castle && leader_in_place)) { -- foreach (const unit &recall, recall_list) -+ BOOST_FOREACH(const unit &recall, recall_list) - { - result.push_back(&recall); - } -@@ -546,7 +546,7 @@ - - bool can_recruit_unit = is_on_team_list; - if (!can_recruit_unit) { -- foreach (const std::string &recruitable, leader->recruits()) { -+ BOOST_FOREACH(const std::string &recruitable, leader->recruits()) { - if (recruitable == unit_type) { - can_recruit_unit = true; - break; -@@ -1925,7 +1925,7 @@ - // Simple algorithm: no maximum number of patients per healer. - void reset_resting(unit_map& units, int side) - { -- foreach (unit &u, units) { -+ BOOST_FOREACH(unit &u, units) { - if (u.side() == side) - u.set_resting(true); - } -@@ -1946,7 +1946,7 @@ - std::list<unit_healing_struct> l; - - // We look for all allied units, then we see if our healer is near them. -- foreach (unit &u, units) { -+ BOOST_FOREACH(unit &u, units) { - - if (u.get_state("unhealable") || u.incapacitated()) - continue; -@@ -2307,7 +2307,7 @@ - } - - pathfind::paths p(*resources::game_map, *resources::units, loc, *resources::teams, true, false, tm, 0, false, true); -- foreach (const pathfind::paths::step &dest, p.destinations) { -+ BOOST_FOREACH(const pathfind::paths::step &dest, p.destinations) { - clear_shroud_loc(tm, dest.curr, &cleared_locations); - } - -@@ -2350,7 +2350,7 @@ - - tm.refog(); - -- foreach (unit &u, *resources::units) -+ BOOST_FOREACH(unit &u, *resources::units) - { - if (u.side() == side) { - const unit_movement_resetter move_resetter(u); -@@ -2372,7 +2372,7 @@ - - bool result = false; - -- foreach (unit &u, *resources::units) -+ BOOST_FOREACH(unit &u, *resources::units) - { - if (u.side() == side) { - const unit_movement_resetter move_resetter(u); -@@ -2435,7 +2435,7 @@ - - std::set<map_location> known_units; - if(check_shroud) { -- foreach (const unit &u, units) { -+ BOOST_FOREACH(const unit &u, units) { - if (!tm->fogged(u.get_location())) { - known_units.insert(u.get_location()); - tm->see(u.side() - 1); -@@ -2860,7 +2860,7 @@ - */ - - std::set<map_location> known_units; -- foreach (const unit &u, units) { -+ BOOST_FOREACH(const unit &u, units) { - if (!tm.fogged(u.get_location())) { - known_units.insert(u.get_location()); - } -Index: src/font.cpp -=================================================================== ---- src/font.cpp (revision 54624) -+++ src/font.cpp (revision 54625) -@@ -21,7 +21,6 @@ - #include "config.hpp" - #include "filesystem.hpp" - #include "font.hpp" --#include "foreach.hpp" - #include "game_config.hpp" - #include "log.hpp" - #include "marked-up_text.hpp" -@@ -32,6 +31,8 @@ - #include "serialization/preprocessor.hpp" - #include "serialization/string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - #include <list> - #include <set> - #include <stack> -@@ -355,10 +356,10 @@ - #endif - - #if CAIRO_HAS_WIN32_FONT -- foreach(const std::string& path, get_binary_paths("fonts")) { -+ BOOST_FOREACH(const std::string& path, get_binary_paths("fonts")) { - std::vector<std::string> files; - get_files_in_dir(path, &files, NULL, ENTIRE_FILE_PATH); -- foreach(const std::string& file, files) -+ BOOST_FOREACH(const std::string& file, files) - if(file.substr(file.length() - 4) == ".ttf" || file.substr(file.length() - 4) == ".ttc") - AddFontResource(file.c_str()); - } -@@ -372,10 +373,10 @@ - #endif - - #if CAIRO_HAS_WIN32_FONT -- foreach(const std::string& path, get_binary_paths("fonts")) { -+ BOOST_FOREACH(const std::string& path, get_binary_paths("fonts")) { - std::vector<std::string> files; - get_files_in_dir(path, &files, NULL, ENTIRE_FILE_PATH); -- foreach(const std::string& file, files) -+ BOOST_FOREACH(const std::string& file, files) - if(file.substr(file.length() - 4) == ".ttf" || file.substr(file.length() - 4) == ".ttc") - RemoveFontResource(file.c_str()); - } -@@ -425,7 +426,7 @@ - const subset_id subset = font_names.size(); - font_names.push_back(itor->name); - -- foreach (const subset_descriptor::range &cp_range, itor->present_codepoints) { -+ BOOST_FOREACH(const subset_descriptor::range &cp_range, itor->present_codepoints) { - char_blocks.insert(cp_range.first, cp_range.second, subset); - } - } -@@ -582,7 +583,7 @@ - w_ = 0; - h_ = 0; - -- foreach (text_chunk const &chunk, chunks_) -+ BOOST_FOREACH(text_chunk const &chunk, chunks_) - { - TTF_Font* ttfont = get_font(font_id(chunk.subset, font_size_)); - if(ttfont == NULL) -@@ -628,7 +629,7 @@ - if(width() > max_text_line_width) - return surfs_; - -- foreach (text_chunk const &chunk, chunks_) -+ BOOST_FOREACH(text_chunk const &chunk, chunks_) - { - TTF_Font* ttfont = get_font(font_id(chunk.subset, font_size_)); - if (ttfont == NULL) -@@ -1261,7 +1262,7 @@ - return false; - - std::set<std::string> known_fonts; -- foreach (const config &font, fonts_config.child_range("font")) { -+ BOOST_FOREACH(const config &font, fonts_config.child_range("font")) { - known_fonts.insert(font["name"]); - } - -Index: src/unit_animation.cpp -=================================================================== ---- src/unit_animation.cpp (revision 54624) -+++ src/unit_animation.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "unit_animation.hpp" - --#include "foreach.hpp" - #include "game_display.hpp" - #include "halo.hpp" - #include "map.hpp" -@@ -26,6 +25,8 @@ - #include "resources.hpp" - #include "play_controller.hpp" - -+#include <boost/foreach.hpp> -+ - #include <algorithm> - - struct tag_name_manager { -@@ -78,7 +79,7 @@ - config merge() const - { - config result = attributes; -- foreach (const config::all_children_iterator &i, children) -+ BOOST_FOREACH(const config::all_children_iterator &i, children) - result.add_child(i->key, i->cfg); - return result; - } -@@ -99,7 +100,7 @@ - animation_cursor(const config &cfg, animation_cursor *p): - itors(cfg.all_children_range()), branches(p->branches), parent(p) - { -- foreach (animation_branch &ab, branches) -+ BOOST_FOREACH(animation_branch &ab, branches) - ab.attributes.merge_attributes(cfg); - } - }; -@@ -122,7 +123,7 @@ - if (ac.itors.first->key != "if") - { - // Append current config object to all the branches in scope. -- foreach (animation_branch &ab, ac.branches) { -+ BOOST_FOREACH(animation_branch &ab, ac.branches) { - ab.children.push_back(ac.itors.first); - } - ++ac.itors.first; -@@ -154,7 +155,7 @@ - static animation_branches prepare_animation(const config &cfg, const std::string &animation_tag) - { - animation_branches expanded_animations; -- foreach (const config &anim, cfg.child_range(animation_tag)) { -+ BOOST_FOREACH(const config &anim, cfg.child_range(animation_tag)) { - prepare_single_animation(anim, expanded_animations); - } - return expanded_animations; -@@ -207,7 +208,7 @@ - overlaped_hex_() - { - // if(!cfg["debug"].empty()) printf("DEBUG WML: FINAL\n%s\n\n",cfg.debug().c_str()); -- foreach (const config::any_child &fr, cfg.all_children_range()) -+ BOOST_FOREACH(const config::any_child &fr, cfg.all_children_range()) - { - if (fr.key == frame_string) continue; - if (fr.key.find("_frame", fr.key.size() - 6) == std::string::npos) continue; -@@ -221,11 +222,11 @@ - const map_location::DIRECTION d = map_location::parse_direction(*i); - directions_.push_back(d); - } -- foreach (const config &filter, cfg.child_range("filter")) { -+ BOOST_FOREACH(const config &filter, cfg.child_range("filter")) { - unit_filter_.push_back(filter); - } - -- foreach (const config &filter, cfg.child_range("filter_second")) { -+ BOOST_FOREACH(const config &filter, cfg.child_range("filter_second")) { - secondary_unit_filter_.push_back(filter); - } - -@@ -253,10 +254,10 @@ - for(value2=value2_str.begin() ; value2 != value2_str.end() ; ++value2) { - value2_.push_back(atoi(value2->c_str())); - } -- foreach (const config &filter, cfg.child_range("filter_attack")) { -+ BOOST_FOREACH(const config &filter, cfg.child_range("filter_attack")) { - primary_attack_filter_.push_back(filter); - } -- foreach (const config &filter, cfg.child_range("filter_second_attack")) { -+ BOOST_FOREACH(const config &filter, cfg.child_range("filter_second_attack")) { - secondary_attack_filter_.push_back(filter); - } - play_offscreen_ = cfg["offscreen"].to_bool(true); -@@ -487,7 +488,7 @@ - display::tdrawing_layer layer = display::LAYER_UNIT_DEFAULT, - bool offscreen = true) - { -- foreach (const animation_branch &ab, prepare_animation(cfg, tag_name)) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, tag_name)) - { - config anim = ab.merge(); - anim["apply_to"] = apply_to; -@@ -503,7 +504,7 @@ - - void unit_animation::add_anims( std::vector<unit_animation> & animations, const config & cfg) - { -- foreach (const animation_branch &ab, prepare_animation(cfg, "animation")) { -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "animation")) { - animations.push_back(unit_animation(ab.merge())); - } - -@@ -519,7 +520,7 @@ - add_simple_anim(animations, cfg, "levelin_anim", "levelin"); - add_simple_anim(animations, cfg, "levelout_anim", "levelout"); - -- foreach (const animation_branch &ab, prepare_animation(cfg, "standing_anim")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "standing_anim")) - { - config anim = ab.merge(); - anim["apply_to"] = "default"; -@@ -528,7 +529,7 @@ - if (anim["offscreen"].empty()) anim["offscreen"] = false; - animations.push_back(unit_animation(anim)); - } -- foreach (const animation_branch &ab, prepare_animation(cfg, "standing_anim")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "standing_anim")) - { - config anim = ab.merge(); - anim["apply_to"] = "standing"; -@@ -537,7 +538,7 @@ - if (anim["offscreen"].empty()) anim["offscreen"] = false; - animations.push_back(unit_animation(anim)); - } -- foreach (const animation_branch &ab, prepare_animation(cfg, "healing_anim")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "healing_anim")) - { - config anim = ab.merge(); - anim["apply_to"] = "healing"; -@@ -546,7 +547,7 @@ - animations.push_back(unit_animation(anim)); - } - -- foreach (const animation_branch &ab, prepare_animation(cfg, "healed_anim")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "healed_anim")) - { - config anim = ab.merge(); - anim["apply_to"] = "healed"; -@@ -558,7 +559,7 @@ - animations.back().sub_anims_["_healed_sound"].add_frame(1,frame_builder().sound("heal.wav"),true); - } - -- foreach (const animation_branch &ab, prepare_animation(cfg, "poison_anim")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "poison_anim")) - { - config anim = ab.merge(); - anim["apply_to"] ="poisoned"; -@@ -572,7 +573,7 @@ - - add_simple_anim(animations, cfg, "pre_movement_anim", "pre_movement", display::LAYER_UNIT_MOVE_DEFAULT); - -- foreach (const animation_branch &ab, prepare_animation(cfg, "movement_anim")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "movement_anim")) - { - config anim = ab.merge(); - if (anim["offset"].empty()) { -@@ -585,7 +586,7 @@ - - add_simple_anim(animations, cfg, "post_movement_anim", "post_movement", display::LAYER_UNIT_MOVE_DEFAULT); - -- foreach (const animation_branch &ab, prepare_animation(cfg, "defend")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "defend")) - { - config anim = ab.merge(); - anim["apply_to"] = "defend"; -@@ -607,7 +608,7 @@ - else - { - std::vector<std::string> v = utils::split(anim["hits"]); -- foreach (const std::string &hit_type, v) -+ BOOST_FOREACH(const std::string &hit_type, v) - { - config tmp = anim; - tmp["hits"] = hit_type; -@@ -625,7 +626,7 @@ - add_simple_anim(animations, cfg, "draw_weapon_anim", "draw_wepaon", display::LAYER_UNIT_MOVE_DEFAULT); - add_simple_anim(animations, cfg, "sheath_weapon_anim", "sheath_wepaon", display::LAYER_UNIT_MOVE_DEFAULT); - -- foreach (const animation_branch &ab, prepare_animation(cfg, "attack_anim")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "attack_anim")) - { - config anim = ab.merge(); - anim["apply_to"] = "attack"; -@@ -646,7 +647,7 @@ - animations.push_back(unit_animation(anim)); - } - -- foreach (const animation_branch &ab, prepare_animation(cfg, "death")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "death")) - { - config anim = ab.merge(); - anim["apply_to"] = "death"; -@@ -663,7 +664,7 @@ - - add_simple_anim(animations, cfg, "victory_anim", "victory"); - -- foreach (const animation_branch &ab, prepare_animation(cfg, "extra_anim")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "extra_anim")) - { - config anim = ab.merge(); - anim["apply_to"] = anim["flag"]; -@@ -671,7 +672,7 @@ - animations.push_back(unit_animation(anim)); - } - -- foreach (const animation_branch &ab, prepare_animation(cfg, "teleport_anim")) -+ BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "teleport_anim")) - { - config anim = ab.merge(); - if (anim["layer"].empty()) anim["layer"] = default_layer; -@@ -742,14 +743,14 @@ - config::const_child_itors range = cfg.child_range(frame_string+"frame"); - starting_frame_time_=INT_MAX; - if(cfg[frame_string+"start_time"].empty() &&range.first != range.second) { -- foreach (const config &frame, range) { -+ BOOST_FOREACH(const config &frame, range) { - starting_frame_time_ = std::min(starting_frame_time_, frame["begin"].to_int()); - } - } else { - starting_frame_time_ = cfg[frame_string+"start_time"]; - } - -- foreach (const config &frame, range) -+ BOOST_FOREACH(const config &frame, range) - { - unit_frame tmp_frame(frame); - add_frame(tmp_frame.duration(),tmp_frame,!tmp_frame.does_not_change()); -Index: src/storyscreen/render.cpp -=================================================================== ---- src/storyscreen/render.cpp (revision 54624) -+++ src/storyscreen/render.cpp (revision 54625) -@@ -22,7 +22,6 @@ - - #include "global.hpp" - #include "asserts.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "storyscreen/part.hpp" - #include "storyscreen/render.hpp" -@@ -34,6 +33,8 @@ - #include "text.hpp" - #include "video.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define ERR_NG LOG_STREAM(err, log_engine) - #define WARN_NG LOG_STREAM(warn, log_engine) -@@ -167,7 +168,7 @@ - void part_ui::prepare_floating_images() - { - // Build floating image surfaces -- foreach(const floating_image& fi, p_.get_floating_images()) { -+ BOOST_FOREACH(const floating_image& fi, p_.get_floating_images()) { - imgs_.push_back( fi.get_render_input(scale_factor_, base_rect_) ); - } - } -@@ -190,7 +191,7 @@ - last_key_ = true; - - size_t fi_n = 0; -- foreach(floating_image::render_input& ri, imgs_) { -+ BOOST_FOREACH(floating_image::render_input& ri, imgs_) { - const floating_image& fi = p_.get_floating_images()[fi_n]; - - if(!ri.image.null()) { -Index: src/storyscreen/interface.cpp -=================================================================== ---- src/storyscreen/interface.cpp (revision 54624) -+++ src/storyscreen/interface.cpp (revision 54625) -@@ -19,7 +19,6 @@ - */ - - #include "global.hpp" --#include "foreach.hpp" - #include "variable.hpp" - - #include "storyscreen/interface.hpp" -Index: src/storyscreen/controller.cpp -=================================================================== ---- src/storyscreen/controller.cpp (revision 54624) -+++ src/storyscreen/controller.cpp (revision 54625) -@@ -25,7 +25,6 @@ - #include "storyscreen/render.hpp" - - #include "asserts.hpp" --#include "foreach.hpp" - #include "variable.hpp" - - #include "display.hpp" -@@ -37,6 +36,8 @@ - #include "resources.hpp" - #include "widgets/button.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define ERR_NG LOG_STREAM(err, log_engine) - #define LOG_NG LOG_STREAM(info, log_engine) -@@ -138,7 +139,7 @@ - // caching the scaled backgrounds can take over a decent amount of memory. - #ifndef LOW_MEM - std::vector< render_pointer_type > uis_; -- foreach(part_pointer_type p, parts_) { -+ BOOST_FOREACH(part_pointer_type p, parts_) { - ASSERT_LOG( p != NULL, "Ouch: hit NULL storyscreen part in collection" ); - render_pointer_type const rpt(new part_ui(*p, disp_, next_button, back_button, play_button)); - uis_.push_back(rpt); -Index: src/storyscreen/part.cpp -=================================================================== ---- src/storyscreen/part.cpp (revision 54624) -+++ src/storyscreen/part.cpp (revision 54625) -@@ -20,7 +20,6 @@ - - #include "global.hpp" - #include "asserts.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "resources.hpp" - #include "storyscreen/part.hpp" -Index: src/game.cpp -=================================================================== ---- src/game.cpp (revision 54624) -+++ src/game.cpp (revision 54625) -@@ -40,6 +40,7 @@ - #include <fstream> - #include <libintl.h> - -+#include <boost/foreach.hpp> - #include <boost/iostreams/copy.hpp> - #include <boost/iostreams/filter/gzip.hpp> - -@@ -218,7 +219,7 @@ - int read = 0; - - // use static preproc_define::read_pair(config) to make a object -- foreach ( const config::any_child &value, cfg.all_children_range() ) { -+ BOOST_FOREACH( const config::any_child &value, cfg.all_children_range() ) { - const preproc_map::value_type def = preproc_define::read_pair( value.cfg ); - input_macros[def.first] = def.second; - ++read; -@@ -245,7 +246,7 @@ - if ( cmdline_opts.preprocess_defines ) { - - // add the specified defines -- foreach ( const std::string &define, *cmdline_opts.preprocess_defines ) { -+ BOOST_FOREACH( const std::string &define, *cmdline_opts.preprocess_defines ) { - if (define.empty()){ - std::cerr << "empty define supplied\n"; - continue; -@@ -452,7 +453,7 @@ - const config &cfg = game->game_config().child("titlescreen_music"); - if (cfg) { - sound::play_music_repeatedly(game_config::title_music); -- foreach (const config &i, cfg.child_range("music")) { -+ BOOST_FOREACH(const config &i, cfg.child_range("music")) { - sound::play_music_config(i); - } - sound::commit_music_changes(); -Index: src/playsingle_controller.cpp -=================================================================== ---- src/playsingle_controller.cpp (revision 54624) -+++ src/playsingle_controller.cpp (revision 54625) -@@ -27,7 +27,6 @@ - #include "ai/game_info.hpp" - #include "ai/testing.hpp" - #include "dialogs.hpp" --#include "foreach.hpp" - #include "game_end_exceptions.hpp" - #include "game_events.hpp" - #include "game_preferences.hpp" -@@ -48,6 +47,8 @@ - #include "whiteboard/manager.hpp" - #include "util.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define ERR_NG LOG_STREAM(err, log_engine) - #define LOG_NG LOG_STREAM(info, log_engine) -@@ -324,7 +325,7 @@ - LOG_NG << "in playsingle_controller::play_scenario()...\n"; - - // Start music. -- foreach (const config &m, level_.child_range("music")) { -+ BOOST_FOREACH(const config &m, level_.child_range("music")) { - sound::play_music_config(m); - } - sound::commit_music_changes(); -@@ -336,7 +337,7 @@ - - // Read sound sources - assert(soundsources_manager_ != NULL); -- foreach (const config &s, level_.child_range("sound_source")) { -+ BOOST_FOREACH(const config &s, level_.child_range("sound_source")) { - soundsource::sourcespec spec(s); - soundsources_manager_->add(spec); - } -@@ -906,14 +907,14 @@ - new_side["previous_recruits"] = can_recruit_str; - LOG_NG << "stored side in snapshot:\n" << new_side["save_id"] << std::endl; - //add the units of the recall list -- foreach(const unit& u, i->recall_list()) { -+ BOOST_FOREACH(const unit& u, i->recall_list()) { - config& new_unit = new_side.add_child("unit"); - u.write(new_unit); - } - } - } - //add any players from starting_pos that do not have a team in the current scenario -- foreach (const config &player_cfg, gamestate_.starting_pos.child_range("player")) { -+ BOOST_FOREACH(const config &player_cfg, gamestate_.starting_pos.child_range("player")) { - if (side_ids.count(player_cfg["save_id"]) == 0) { - LOG_NG << "stored inactive side in snapshot:\n" << player_cfg["save_id"] << std::endl; - gamestate_.snapshot.add_child("side", player_cfg); -@@ -938,7 +939,7 @@ - } - - int persistent_teams = 0; -- foreach (const team &t, teams_) { -+ BOOST_FOREACH(const team &t, teams_) { - if (t.persistent()) ++persistent_teams; - } - -@@ -953,7 +954,7 @@ - int turns_left = std::max<int>(0, tod_manager_.number_of_turns() - turn()); - int finishing_bonus = (end_level.gold_bonus && turns_left > -1) ? - finishing_bonus_per_turn * turns_left : 0; -- foreach (const team &t, teams_) -+ BOOST_FOREACH(const team &t, teams_) - { - if (!t.persistent()) continue; - int carryover_gold = div100rounded((t.gold() + finishing_bonus) * end_level.carryover_percentage); -Index: src/controller_base.cpp -=================================================================== ---- src/controller_base.cpp (revision 54624) -+++ src/controller_base.cpp (revision 54625) -@@ -18,11 +18,12 @@ - - #include "dialogs.hpp" - #include "display.hpp" --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "log.hpp" - #include "mouse_handler_base.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_display("display"); - #define ERR_DP LOG_STREAM(err, log_display) - -@@ -144,7 +145,7 @@ - int dx = 0, dy = 0; - int scroll_threshold = (preferences::mouse_scroll_enabled()) - ? preferences::mouse_scroll_threshold() : 0; -- foreach (const theme::menu& m, get_display().get_theme().menus()) { -+ BOOST_FOREACH(const theme::menu& m, get_display().get_theme().menus()) { - if (point_in_rect(mousex, mousey, m.get_location())) { - scroll_threshold = 0; - } -Index: src/gamestatus.cpp -=================================================================== ---- src/gamestatus.cpp (revision 54624) -+++ src/gamestatus.cpp (revision 54625) -@@ -24,7 +24,6 @@ - #include "gamestatus.hpp" - - #include "actions.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "log.hpp" - #include "game_preferences.hpp" -@@ -42,6 +41,7 @@ - #include "whiteboard/side_actions.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #ifndef _MSC_VER - #include <sys/time.h> -@@ -178,9 +178,9 @@ - tags.push_back("side"); - tags.push_back("player"); //merge [player] tags for backwards compatibility of saves - -- foreach (const std::string& side_tag, tags) -+ BOOST_FOREACH(const std::string& side_tag, tags) - { -- foreach (config &carryover_side, source->child_range(side_tag)) -+ BOOST_FOREACH(config &carryover_side, source->child_range(side_tag)) - { - config *scenario_side = NULL; - -@@ -226,13 +226,13 @@ - (*scenario_side)["color"] = carryover_side["color"]; - - //add recallable units -- foreach (const config &u, carryover_side.child_range("unit")) { -+ BOOST_FOREACH(const config &u, carryover_side.child_range("unit")) { - scenario_side->add_child("unit", u); - } - } - } - } else { -- foreach(const config &snapshot_side, source->child_range("side")) { -+ BOOST_FOREACH(const config &snapshot_side, source->child_range("side")) { - //take all side tags and add them as players (assuming they only contain carryover information) - cfg.add_child("player", snapshot_side); - } -@@ -306,7 +306,7 @@ - //See also playcampaign::play_game, where after finishing the scenario the replay - //will be saved. - if(!starting_pos.empty()) { -- foreach (const config &p, cfg.child_range("player")) { -+ BOOST_FOREACH(const config &p, cfg.child_range("player")) { - config& cfg_player = starting_pos.add_child("player"); - cfg_player.merge_with(p); - } -@@ -400,7 +400,7 @@ - std::string leader; - std::string leader_image; - -- //foreach (const config &p, cfg_save.child_range("player")) -+ //BOOST_FOREACH(const config &p, cfg_save.child_range("player")) - //{ - // if (utils::string_bool(p["canrecruit"], false)) { - // leader = p["save_id"]; -@@ -413,7 +413,7 @@ - //{ - if (const config &snapshot = *(has_snapshot ? &cfg_snapshot : &cfg_replay_start)) - { -- foreach (const config &side, snapshot.child_range("side")) -+ BOOST_FOREACH(const config &side, snapshot.child_range("side")) - { - if (side["controller"] != "human") { - continue; -@@ -430,7 +430,7 @@ - break; - } - -- foreach (const config &u, side.child_range("unit")) -+ BOOST_FOREACH(const config &u, side.child_range("unit")) - { - if (u["canrecruit"].to_bool()) { - leader = u["id"].str(); -@@ -794,7 +794,7 @@ - // can be recruited for the player, add them. - if (!player_cfg_) return; - if (const config::attribute_value *v = player_cfg_->get("previous_recruits")) { -- foreach (const std::string &rec, utils::split(*v)) { -+ BOOST_FOREACH(const std::string &rec, utils::split(*v)) { - DBG_NG_TC << "adding previous recruit: " << rec << '\n'; - t_->add_recruit(rec); - } -@@ -857,7 +857,7 @@ - if (!side_cfg_["no_leader"].to_bool() && side_cfg_["controller"] != "null") { - handle_leader(side_cfg_); - } -- foreach (const config &l, side_cfg_.child_range("leader")) { -+ BOOST_FOREACH(const config &l, side_cfg_.child_range("leader")) { - handle_leader(l); - } - } -@@ -871,13 +871,13 @@ - //only relevant in start-of-scenario saves, that's why !shapshot - //units that are in '[scenario][side]' are 'first' - //for create-or-recall semantics to work: for each unit with non-empty id, unconditionally put OTHER, later, units with same id directly to recall list, not including them in unit_configs_ -- foreach(const config &u, (*player_cfg_).child_range("unit")) { -+ BOOST_FOREACH(const config &u, (*player_cfg_).child_range("unit")) { - handle_unit(u,"player_cfg"); - } - - } else { - //units in [side] -- foreach (const config &su, side_cfg_.child_range("unit")) { -+ BOOST_FOREACH(const config &su, side_cfg_.child_range("unit")) { - handle_unit(su, "side_cfg"); - } - } -@@ -902,7 +902,7 @@ - "allow_changes", "faction_name", "user_description", "faction" }; - - log_step("place units"); -- foreach (const config *u, unit_configs_) { -+ BOOST_FOREACH(const config *u, unit_configs_) { - unit_creator uc(*t_,map_.starting_position(side_)); - uc - .allow_add_to_recall(true) -@@ -913,7 +913,7 @@ - .allow_show(false); - - config cfg = *u; -- foreach (const char *attr, side_attrs) { -+ BOOST_FOREACH(const char *attr, side_attrs) { - cfg.remove_attribute(attr); - } - uc.add_unit(cfg); -@@ -953,7 +953,7 @@ - void game_state::set_menu_items(const config::const_child_itors &menu_items) - { - clear_wmi(wml_menu_items); -- foreach (const config &item, menu_items) -+ BOOST_FOREACH(const config &item, menu_items) - { - std::string id = item["id"]; - wml_menu_item*& mref = wml_menu_items[id]; -Index: src/log.cpp -=================================================================== ---- src/log.cpp (revision 54624) -+++ src/log.cpp (revision 54625) -@@ -25,8 +25,9 @@ - #include "SDL.h" - - #include "log.hpp" --#include "foreach.hpp" - -+#include <boost/foreach.hpp> -+ - #include <map> - #include <sstream> - #include <ctime> -@@ -88,11 +89,11 @@ - { - std::string::size_type s = name.size(); - if (name == "all") { -- foreach (logd &l, *domains) { -+ BOOST_FOREACH(logd &l, *domains) { - l.second = severity; - } - } else if (s > 2 && name.compare(s - 2, 2, "/*") == 0) { -- foreach (logd &l, *domains) { -+ BOOST_FOREACH(logd &l, *domains) { - if (l.first.compare(0, s - 1, name, 0, s - 1) == 0) - l.second = severity; - } -@@ -108,7 +109,7 @@ - std::string list_logdomains(const std::string& filter) - { - std::ostringstream res; -- foreach (logd &l, *domains) { -+ BOOST_FOREACH(logd &l, *domains) { - if(l.first.find(filter) != std::string::npos) - res << l.first << "\n"; - } -Index: src/replay_controller.cpp -=================================================================== ---- src/replay_controller.cpp (revision 54624) -+++ src/replay_controller.cpp (revision 54625) -@@ -16,7 +16,6 @@ - - #include "global.hpp" - --#include "foreach.hpp" - #include "game_end_exceptions.hpp" - #include "game_events.hpp" - #include "gettext.hpp" -@@ -27,6 +26,8 @@ - #include "resources.hpp" - #include "savegame.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define DBG_NG LOG_STREAM(debug, log_engine) - -@@ -417,7 +418,7 @@ - finish_side_turn(); - - // This is necessary for replays in order to show possible movements. -- foreach (unit &u, units_) { -+ BOOST_FOREACH(unit &u, units_) { - if (u.side() != player_number_) { - u.new_turn(); - } -Index: src/multiplayer_ui.cpp -=================================================================== ---- src/multiplayer_ui.cpp (revision 54624) -+++ src/multiplayer_ui.cpp (revision 54625) -@@ -16,7 +16,6 @@ - #include "global.hpp" - - #include "construct_dialog.hpp" --#include "foreach.hpp" - #include "gamestatus.hpp" - #include "game_display.hpp" - #include "game_preferences.hpp" -@@ -33,6 +32,8 @@ - #include "wml_separators.hpp" - #include "formula_string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define LOG_NG LOG_STREAM(info, log_engine) - #define ERR_NG LOG_STREAM(err, log_engine) -@@ -163,9 +164,9 @@ - state.starting_pos.child_range("side"); - config::const_child_itors level_sides = level.child_range("side"); - -- foreach (config &side, saved_sides) -+ BOOST_FOREACH(config &side, saved_sides) - { -- foreach (const config &lside, level_sides) -+ BOOST_FOREACH(const config &lside, level_sides) - { - if (side["side"] == lside["side"] && - (side["current_player"] != lside["current_player"] || -@@ -599,7 +600,7 @@ - if (const config &ms = c.child("members")) { - std::stringstream ss; - ss << "Room " << c["room"].str() << " members: "; -- foreach (const config& m, ms.child_range("member")) { -+ BOOST_FOREACH(const config& m, ms.child_range("member")) { - ss << m["name"] << " "; - } - chat_.add_message(time(NULL), "server", ss.str()); -@@ -608,7 +609,7 @@ - if (const config &rs = c.child("rooms")) { - std::stringstream ss; - ss << "Rooms: "; -- foreach (const config& r, rs.child_range("room")) { -+ BOOST_FOREACH(const config& r, rs.child_range("room")) { - ss << r["name"].str() << "(" << r["size"].str() << ") "; - } - chat_.add_message(time(NULL), "server", ss.str()); -@@ -706,7 +707,7 @@ - { - std::list<user_info> u_list; - -- foreach (const config &user, gamelist_.child_range("user")) -+ BOOST_FOREACH(const config &user, gamelist_.child_range("user")) - { - user_info u_elem; - u_elem.name = user["name"].str(); -@@ -848,12 +849,12 @@ - } - - int res = -1, index = 0, best_score = 0; -- foreach (const config *faction, fl) -+ BOOST_FOREACH(const config *faction, fl) - { - int faction_score = 0; - std::vector<std::string> recruit = utils::split((*faction)[search_field]); -- foreach (const std::string &search, find) { -- foreach (const std::string &r, recruit) { -+ BOOST_FOREACH(const std::string &search, find) { -+ BOOST_FOREACH(const std::string &r, recruit) { - if (r == search) { - ++faction_score; - break; -Index: src/display.cpp -=================================================================== ---- src/display.cpp (revision 54624) -+++ src/display.cpp (revision 54625) -@@ -21,7 +21,6 @@ - #include "builder.hpp" - #include "cursor.hpp" - #include "display.hpp" --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "gettext.hpp" - #include "halo.hpp" -@@ -41,6 +40,8 @@ - - #include "SDL_image.h" - -+#include <boost/foreach.hpp> -+ - #ifdef __SUNPRO_CC - // GCC doesn't have hypot in cmath so include it for Sun Studio - #include <math.h> -@@ -629,7 +630,7 @@ - // now get the surfaces - std::vector<surface> res; - -- foreach(std::string& name, names) { -+ BOOST_FOREACH(std::string& name, names) { - const surface surf(image::get_image(name, image_type)); - if (surf) - res.push_back(surf); -@@ -828,8 +829,8 @@ - * layergroup > location > layer > 'tblit' > surface - */ - -- foreach(const tblit &blit, drawing_buffer_) { -- foreach(const surface& surf, blit.surf()) { -+ BOOST_FOREACH(const tblit &blit, drawing_buffer_) { -+ BOOST_FOREACH(const surface& surf, blit.surf()) { - // Note that dstrect can be changed by sdl_blit - // and so a new instance should be initialized - // to pass to each call to sdl_blit. -@@ -1903,7 +1904,7 @@ - int ticks3 = SDL_GetTicks(); - LOG_DP << "invalidate and draw: " << (ticks3 - ticks2) << " and " << (ticks2 - ticks1) << "\n"; - -- foreach (boost::function<void(display&)> f, redraw_observers_) { -+ BOOST_FOREACH(boost::function<void(display&)> f, redraw_observers_) { - f(*this); - } - -@@ -1992,7 +1993,7 @@ - SDL_Rect clip_rect = get_clip_rect(); - surface screen = get_screen_surface(); - clip_rect_setter set_clip_rect(screen, &clip_rect); -- foreach (const map_location& loc, invalidated_) { -+ BOOST_FOREACH(const map_location& loc, invalidated_) { - int xpos = get_location_x(loc); - int ypos = get_location_y(loc); - -@@ -2058,7 +2059,7 @@ - // Paint arrows - arrows_map_t::const_iterator arrows_in_hex = arrows_map_.find(loc); - if(arrows_in_hex != arrows_map_.end()) { -- foreach(arrow* const a, arrows_in_hex->second) { -+ BOOST_FOREACH(arrow* const a, arrows_in_hex->second) { - a->draw_hex(loc); - } - } -@@ -2388,7 +2389,7 @@ - if(invalidateAll_) - return false; - bool ret = false; -- foreach (const map_location& loc, locs) { -+ BOOST_FOREACH(const map_location& loc, locs) { - #ifdef _OPENMP - #pragma omp critical(invalidated_) - #endif //_OPENMP -@@ -2438,7 +2439,7 @@ - return false; - - bool result = false; -- foreach (const map_location &loc, hexes_under_rect(rect)) { -+ BOOST_FOREACH(const map_location &loc, hexes_under_rect(rect)) { - result |= invalidate(loc); - } - return result; -@@ -2450,7 +2451,7 @@ - animate_map_ = preferences::animate_map(); - if (!animate_map_) return; - -- foreach (const map_location &loc, get_visible_hexes()) -+ BOOST_FOREACH(const map_location &loc, get_visible_hexes()) - { - if (shrouded(loc)) continue; - if (builder_->update_animation(loc)) { -@@ -2464,7 +2465,7 @@ - void display::add_arrow(arrow& arrow) - { - const arrow_path_t & arrow_path = arrow.get_path(); -- foreach (const map_location& loc, arrow_path) -+ BOOST_FOREACH(const map_location& loc, arrow_path) - { - arrows_map_[loc].push_back(&arrow); - } -@@ -2473,7 +2474,7 @@ - void display::remove_arrow(arrow& arrow) - { - const arrow_path_t & arrow_path = arrow.get_path(); -- foreach (const map_location& loc, arrow_path) -+ BOOST_FOREACH(const map_location& loc, arrow_path) - { - arrows_map_[loc].remove(&arrow); - } -@@ -2482,12 +2483,12 @@ - void display::update_arrow(arrow & arrow) - { - const arrow_path_t & previous_path = arrow.get_previous_path(); -- foreach (const map_location& loc, previous_path) -+ BOOST_FOREACH(const map_location& loc, previous_path) - { - arrows_map_[loc].remove(&arrow); - } - const arrow_path_t & arrow_path = arrow.get_path(); -- foreach (const map_location& loc, arrow_path) -+ BOOST_FOREACH(const map_location& loc, arrow_path) - { - arrows_map_[loc].push_back(&arrow); - } -Index: src/about.cpp -=================================================================== ---- src/about.cpp (revision 54624) -+++ src/about.cpp (revision 54625) -@@ -22,10 +22,11 @@ - - #include "construct_dialog.hpp" - #include "display.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "marked-up_text.hpp" - -+#include <boost/foreach.hpp> -+ - /** - * @namespace about - * Display credits %about all contributors. -@@ -52,7 +53,7 @@ - } - - std::vector<std::string> lines = utils::split(c["text"], '\n'); -- foreach (std::string &line, lines) -+ BOOST_FOREACH(std::string &line, lines) - { - if (line.size() > 1 && line[0] == '+') - line = "+ " + line.substr(1); -@@ -67,7 +68,7 @@ - } - } - -- foreach (const config &entry, c.child_range("entry")) { -+ BOOST_FOREACH(const config &entry, c.child_range("entry")) { - res.push_back("- "+ entry["name"].str()); - } - } -@@ -80,7 +81,7 @@ - config::child_itors about_entries = about_list.child_range("about"); - - if (!campaign.empty()) { -- foreach (const config &about, about_entries) { -+ BOOST_FOREACH(const config &about, about_entries) { - // just finished a particular campaign - if (campaign == about["id"]) { - add_lines(res, about); -@@ -88,7 +89,7 @@ - } - } - -- foreach (const config &about, about_entries) { -+ BOOST_FOREACH(const config &about, about_entries) { - add_lines(res, about); - } - -@@ -101,7 +102,7 @@ - images.clear(); - images_default = ""; - -- foreach (const config &about, cfg.child_range("about")) -+ BOOST_FOREACH(const config &about, cfg.child_range("about")) - { - about_list.add_child("about", about); - const std::string &im = about["images"]; -@@ -114,7 +115,7 @@ - } - } - -- foreach (const config &campaign, cfg.child_range("campaign")) -+ BOOST_FOREACH(const config &campaign, cfg.child_range("campaign")) - { - config::const_child_itors abouts = campaign.child_range("about"); - if (abouts.first == abouts.second) continue; -@@ -126,7 +127,7 @@ - temp["id"] = id; - std::string campaign_images; - -- foreach (const config &about, abouts) -+ BOOST_FOREACH(const config &about, abouts) - { - const std::string &subtitle = about["title"]; - if (!subtitle.empty()) -@@ -139,12 +140,12 @@ - text << '\n'; - } - -- foreach (const std::string &line, utils::split(about["text"], '\n')) -+ BOOST_FOREACH(const std::string &line, utils::split(about["text"], '\n')) - { - text << " " << line << '\n'; - } - -- foreach (const config &entry, about.child_range("entry")) -+ BOOST_FOREACH(const config &entry, about.child_range("entry")) - { - text << " " << entry["name"] << '\n'; - } -Index: src/arrow.cpp -=================================================================== ---- src/arrow.cpp (revision 54624) -+++ src/arrow.cpp (revision 54625) -@@ -20,11 +20,12 @@ - - #include "arrow.hpp" - --#include "foreach.hpp" - #include "game_display.hpp" - #include "log.hpp" - #include "resources.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_arrows("arrows"); - #define ERR_ARR LOG_STREAM(err, log_arrows) - #define WRN_ARR LOG_STREAM(warn, log_arrows) -@@ -293,7 +294,7 @@ - { - if(!SCREEN) return; - -- foreach(map_location const& loc, path) -+ BOOST_FOREACH(map_location const& loc, path) - { - SCREEN->invalidate(loc); - } -Index: src/game_display.cpp -=================================================================== ---- src/game_display.cpp (revision 54624) -+++ src/game_display.cpp (revision 54625) -@@ -34,7 +34,6 @@ - Growl_Delegate growl_obj; - #endif - --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "halo.hpp" - #include "log.hpp" -@@ -47,6 +46,8 @@ - #include "sound.hpp" - #include "whiteboard/manager.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_display("display"); - #define ERR_DP LOG_STREAM(err, log_display) - #define LOG_DP LOG_STREAM(info, log_display) -@@ -297,7 +298,7 @@ - halo::unrender(invalidated_); - display::draw_invalidated(); - -- foreach(unit* temp_unit, fake_units_) { -+ BOOST_FOREACH(unit* temp_unit, fake_units_) { - const map_location& loc = temp_unit->get_location(); - exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc); - if (invalidated_.find(loc) != invalidated_.end() -@@ -305,7 +306,7 @@ - temp_unit->redraw_unit(); - } - -- foreach (const map_location& loc, invalidated_) { -+ BOOST_FOREACH(const map_location& loc, invalidated_) { - unit_map::iterator u_it = units_.find(loc); - exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc); - if (u_it != units_.end() -@@ -451,7 +452,7 @@ - - // We display the unit the mouse is over if it is over a unit, - // otherwise we display the unit that is selected. -- foreach (const std::string &name, reports::report_list()) { -+ BOOST_FOREACH(const std::string &name, reports::report_list()) { - draw_report(name); - } - invalidateGameStatus_ = false; -@@ -744,7 +745,7 @@ - void game_display::highlight_another_reach(const pathfind::paths &paths_list) - { - // Fold endpoints of routes into reachability map. -- foreach (const pathfind::paths::step &dest, paths_list.destinations) { -+ BOOST_FOREACH(const pathfind::paths::step &dest, paths_list.destinations) { - reach_map_[dest.curr]++; - } - reach_map_changed_ = true; -@@ -897,17 +898,17 @@ - void game_display::invalidate_animations() - { - display::invalidate_animations(); -- foreach (unit& u, units_) { -+ BOOST_FOREACH(unit& u, units_) { - u.refresh(); - } -- foreach(unit* temp_unit, fake_units_) { -+ BOOST_FOREACH(unit* temp_unit, fake_units_) { - temp_unit->refresh(); - } - std::vector<unit*> unit_list; -- foreach (unit &u, units_) { -+ BOOST_FOREACH(unit &u, units_) { - unit_list.push_back(&u); - } -- foreach (unit *u, fake_units_) { -+ BOOST_FOREACH(unit *u, fake_units_) { - unit_list.push_back(u); - } - bool new_inval; -@@ -1079,7 +1080,7 @@ - { - const team& curr_team = teams_[playing_team()]; - const team& prev_team = teams_[playing_team()-1 < teams_.size() ? playing_team()-1 : teams_.size()-1]; -- foreach (const game_display::overlay_map::value_type i, overlays_) { -+ BOOST_FOREACH(const game_display::overlay_map::value_type i, overlays_) { - const overlay& ov = i.second; - if (!ov.team_name.empty() && - ((ov.team_name.find(curr_team.team_name()) + 1) != 0) != -@@ -1485,7 +1486,7 @@ - } - } - -- foreach (const chat_message &cm, chat_messages_) { -+ BOOST_FOREACH(const chat_message &cm, chat_messages_) { - font::move_floating_label(cm.speaker_handle, 0, - movement); - font::move_floating_label(cm.handle, 0, - movement); - } -Index: src/formula_function.cpp -=================================================================== ---- src/formula_function.cpp (revision 54624) -+++ src/formula_function.cpp (revision 54625) -@@ -16,14 +16,14 @@ - #include "global.hpp" - - --//#include "foreach.hpp" - #include "callable_objects.hpp" --#include "foreach.hpp" - #include "formula_debugger.hpp" - #include "formula_function.hpp" - #include "game_display.hpp" - #include "log.hpp" - -+#include <boost/foreach.hpp> -+ - #ifdef HAVE_VISUAL_LEAK_DETECTOR - #include "vld.h" - #endif -@@ -46,7 +46,7 @@ - s << get_name(); - s << '('; - bool first_arg = true; -- foreach(expression_ptr a , args()) { -+ BOOST_FOREACH(expression_ptr a , args()) { - if (!first_arg) { - s << ','; - } else { -@@ -451,7 +451,7 @@ - - std::string result; - -- foreach(expression_ptr arg, args()) { -+ BOOST_FOREACH(expression_ptr arg, args()) { - result += arg->evaluate(variables, fdb).string_cast(); - } - -Index: src/unit_map.cpp -=================================================================== ---- src/unit_map.cpp (revision 54624) -+++ src/unit_map.cpp (revision 54625) -@@ -17,13 +17,14 @@ - /** @file */ - - #include "unit_id.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "unit.hpp" - - #include <functional> - #include "unit_map.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define ERR_NG LOG_STREAM(err, log_engine) - #define WRN_NG LOG_STREAM(warn, log_engine) -@@ -444,7 +445,7 @@ - { - assert(u); - -- foreach(const unit_pod& item, ilist_) { -+ BOOST_FOREACH(const unit_pod& item, ilist_) { - if(item.unit == u) { - return true; - } -Index: src/pathfind/teleport.cpp -=================================================================== ---- src/pathfind/teleport.cpp (revision 54624) -+++ src/pathfind/teleport.cpp (revision 54625) -@@ -19,7 +19,7 @@ - #include "log.hpp" - #include "resources.hpp" - --#include "foreach.hpp" -+#include <boost/foreach.hpp> - - static lg::log_domain log_engine("engine"); - #define ERR_PF LOG_STREAM(err, log_engine) -@@ -108,16 +108,16 @@ - , targets_() - { - -- foreach(const teleport_group& group, groups) { -+ BOOST_FOREACH(const teleport_group& group, groups) { - - teleport_pair locations; - group.get_teleport_pair(locations, u, ignore_units); - if (!see_all && !group.always_visible() && viewing_team.is_enemy(u.side())) { - teleport_pair filter_locs; -- foreach(const map_location &loc, locations.first) -+ BOOST_FOREACH(const map_location &loc, locations.first) - if(!viewing_team.fogged(loc)) - filter_locs.first.insert(loc); -- foreach(const map_location &loc, locations.second) -+ BOOST_FOREACH(const map_location &loc, locations.second) - if(!viewing_team.fogged(loc)) - filter_locs.second.insert(loc); - locations.first.swap(filter_locs.first); -Index: src/pathfind/astarsearch.cpp -=================================================================== ---- src/pathfind/astarsearch.cpp (revision 54624) -+++ src/pathfind/astarsearch.cpp (revision 54625) -@@ -20,7 +20,6 @@ - #include "map.hpp" - #include "pathfind/pathfind.hpp" - #include "pathfind/teleport.hpp" --#include "foreach.hpp" - - #include <queue> - #include <map> -Index: src/pathfind/pathfind.cpp -=================================================================== ---- src/pathfind/pathfind.cpp (revision 54624) -+++ src/pathfind/pathfind.cpp (revision 54625) -@@ -24,7 +24,6 @@ - #include "pathfind/pathfind.hpp" - #include "pathfind/teleport.hpp" - --#include "foreach.hpp" - #include "game_display.hpp" - #include "gettext.hpp" - #include "log.hpp" -@@ -35,6 +34,8 @@ - #include "unit_map.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - #include <iostream> - #include <vector> - #include <algorithm> -@@ -59,7 +60,7 @@ - std::set<map_location> tiles_checking; - tiles_checking.swap(pending_tiles_to_check); - //Iterate over all the hexes we need to check -- foreach (const map_location &loc, tiles_checking) -+ BOOST_FOREACH(const map_location &loc, tiles_checking) - { - //If this area is not a castle but should, skip it. - if (vacancy == pathfind::VACANT_CASTLE && !map.is_castle(loc)) continue; -@@ -76,7 +77,7 @@ - if (units.find(loc) == units.end() && !pass_check_and_unreachable) return loc; - map_location adjs[6]; - get_adjacent_tiles(loc,adjs); -- foreach (const map_location &loc, adjs) -+ BOOST_FOREACH(const map_location &loc, adjs) - { - if (!map.on_board(loc)) continue; - // Add the tile to be checked if it hasn't already been and -Index: src/time_of_day.cpp -=================================================================== ---- src/time_of_day.cpp (revision 54624) -+++ src/time_of_day.cpp (revision 54625) -@@ -16,9 +16,9 @@ - /** @file */ - - #include "config.hpp" --#include "foreach.hpp" - #include "time_of_day.hpp" - -+#include <boost/foreach.hpp> - - std::ostream &operator<<(std::ostream &s, const tod_color& c){ - s << c.r << "," << c.g << "," << c.b; -@@ -62,7 +62,7 @@ - - void time_of_day::parse_times(const config& cfg, std::vector<time_of_day>& normal_times) - { -- foreach (const config &t, cfg.child_range("time")) { -+ BOOST_FOREACH(const config &t, cfg.child_range("time")) { - normal_times.push_back(time_of_day(t)); - } - -Index: src/persist_manager.cpp -=================================================================== ---- src/persist_manager.cpp (revision 54624) -+++ src/persist_manager.cpp (revision 54625) -@@ -16,7 +16,7 @@ - #include "persist_context.hpp" - #include "persist_manager.hpp" - --#include "foreach.hpp" -+#include <boost/foreach.hpp> - - persist_context &persist_manager::get_context(const std::string &ns) - { -@@ -36,7 +36,7 @@ - bool persist_manager::start_transaction() { - if (in_transaction_) return false; - bool result = true; -- foreach (context_map::reference ctx, contexts_){ -+ BOOST_FOREACH(context_map::reference ctx, contexts_){ - result &= ctx.second->start_transaction(); - } - in_transaction_ = true; -@@ -46,7 +46,7 @@ - bool persist_manager::end_transaction() { - if (!in_transaction_) return false; - bool result = true; -- foreach (context_map::reference ctx, contexts_){ -+ BOOST_FOREACH(context_map::reference ctx, contexts_){ - result &= ctx.second->end_transaction(); - } - in_transaction_ = !result; -@@ -56,7 +56,7 @@ - bool persist_manager::cancel_transaction() { - if (!in_transaction_) return false; - bool result = true; -- foreach (context_map::reference ctx, contexts_){ -+ BOOST_FOREACH(context_map::reference ctx, contexts_){ - result &= ctx.second->cancel_transaction(); - } - in_transaction_ = false; -Index: src/side_filter.cpp -=================================================================== ---- src/side_filter.cpp (revision 54624) -+++ src/side_filter.cpp (revision 54625) -@@ -18,7 +18,6 @@ - #include "global.hpp" - - #include "config.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "resources.hpp" - #include "side_filter.hpp" -@@ -26,6 +25,8 @@ - #include "team.hpp" - #include "serialization/string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine_sf("engine/side_filter"); - #define ERR_NG LOG_STREAM(err, log_engine_sf) - -@@ -61,7 +62,7 @@ - { - //@todo: replace with better implementation - std::vector<int> result; -- foreach (const team &t, *resources::teams) { -+ BOOST_FOREACH(const team &t, *resources::teams) { - if (match(t)) { - result.push_back(t.side()); - } -@@ -109,7 +110,7 @@ - else { - const std::vector<std::string>& these_team_names = utils::split(this_team_name); - bool search_futile = true; -- foreach(const std::string& this_single_team_name, these_team_names) { -+ BOOST_FOREACH(const std::string& this_single_team_name, these_team_names) { - if(this_single_team_name == that_team_name) { - search_futile = false; - break; -@@ -123,7 +124,7 @@ - if(cfg_.has_child("has_unit")) { - const vconfig& unit_filter = cfg_.child("has_unit"); - bool found = false; -- foreach (unit &u, *resources::units) { -+ BOOST_FOREACH(unit &u, *resources::units) { - if (u.side() != t.side()) { - continue; - } -@@ -134,7 +135,7 @@ - } - if(!found && unit_filter["search_recall_list"].to_bool(false)) { - const std::vector<unit>& recall_list = t.recall_list(); -- foreach(const unit& u, recall_list) { -+ BOOST_FOREACH(const unit& u, recall_list) { - scoped_recall_unit this_unit("this_unit", t.save_id(), &u - &recall_list[0]); - if(u.matches_filter(unit_filter, u.get_location(), flat_)) { - found = true; -@@ -152,7 +153,7 @@ - side_filter s_filter(enemy_of); - const std::vector<int>& teams = s_filter.get_teams(); - if(teams.empty()) return false; -- foreach(const int side, teams) { -+ BOOST_FOREACH(const int side, teams) { - if(!(*resources::teams)[side - 1].is_enemy(t.side())) - return false; - } -@@ -163,7 +164,7 @@ - side_filter s_filter(allied_with); - const std::vector<int>& teams = s_filter.get_teams(); - if(teams.empty()) return false; -- foreach(const int side, teams) { -+ BOOST_FOREACH(const int side, teams) { - if((*resources::teams)[side - 1].is_enemy(t.side())) - return false; - } -Index: src/theme.cpp -=================================================================== ---- src/theme.cpp (revision 54624) -+++ src/theme.cpp (revision 54625) -@@ -18,7 +18,6 @@ - #include "global.hpp" - - #include "font.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "hotkeys.hpp" - #include "log.hpp" -@@ -26,6 +25,7 @@ - #include "theme.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> - - static lg::log_domain log_display("display"); - #define DBG_DP LOG_STREAM(debug, log_display) -@@ -162,7 +162,7 @@ - { - std::vector<config> res_cfgs_; - // resolve all the partialresolutions -- foreach (const config &part, top_cfg.child_range("partialresolution")) -+ BOOST_FOREACH(const config &part, top_cfg.child_range("partialresolution")) - { - // follow the inheritance hierarchy and push all the nodes on the stack - std::vector<const config*> parent_stack(1, &part); -@@ -182,11 +182,11 @@ - while (!parent_stack.empty()) { - //override attributes - res_cfgs_.back().merge_attributes(*parent_stack.back()); -- foreach (const config &rm, parent_stack.back()->child_range("remove")) { -+ BOOST_FOREACH(const config &rm, parent_stack.back()->child_range("remove")) { - find_ref(rm["id"], res_cfgs_.back(), true); - } - -- foreach (const config &chg, parent_stack.back()->child_range("change")) -+ BOOST_FOREACH(const config &chg, parent_stack.back()->child_range("change")) - { - config &target = find_ref(chg["id"], res_cfgs_.back()); - target.merge_attributes(chg); -@@ -195,7 +195,7 @@ - // cannot add [status] sub-elements, but who cares - if (const config &c = parent_stack.back()->child("add")) - { -- foreach (const config::any_child &j, c.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &j, c.all_children_range()) { - res_cfgs_.back().add_child(j.key, j.cfg); - } - } -@@ -204,7 +204,7 @@ - } - } - // Add all the resolutions -- foreach (const config &res, top_cfg.child_range("resolution")) { -+ BOOST_FOREACH(const config &res, top_cfg.child_range("resolution")) { - dst_cfg.add_child("resolution", res); - } - // Add all the resolved resolutions -@@ -217,7 +217,7 @@ - static void do_resolve_rects(const config& cfg, config& resolved_config, config* resol_cfg = NULL) { - - // recursively resolve children -- foreach (const config::any_child &value, cfg.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &value, cfg.all_children_range()) { - config &childcfg = resolved_config.add_child(value.key); - do_resolve_rects(value.cfg, childcfg, - value.key == "resolution" ? &childcfg : resol_cfg); -@@ -549,7 +549,7 @@ - - int current_rating = 1000000; - const config *current = NULL; -- foreach (const config &i, cfg_.child_range("resolution")) -+ BOOST_FOREACH(const config &i, cfg_.child_range("resolution")) - { - int width = i["width"]; - int height = i["height"]; -@@ -611,7 +611,7 @@ - - if (const config &status_cfg = cfg.child("status")) - { -- foreach (const config::any_child &i, status_cfg.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &i, status_cfg.all_children_range()) { - status_.insert(std::pair<std::string, status_item>(i.key, status_item(i.cfg))); - } - if (const config &unit_image_cfg = status_cfg.child("unit_image")) { -@@ -621,19 +621,19 @@ - } - } - -- foreach (const config &p, cfg.child_range("panel")) { -+ BOOST_FOREACH(const config &p, cfg.child_range("panel")) { - panel new_panel(p); - set_object_location(new_panel, p["rect"], p["ref"]); - panels_.push_back(new_panel); - } - -- foreach (const config &lb, cfg.child_range("label")) { -+ BOOST_FOREACH(const config &lb, cfg.child_range("label")) { - label new_label(lb); - set_object_location(new_label, lb["rect"], lb["ref"]); - labels_.push_back(new_label); - } - -- foreach (const config &m, cfg.child_range("menu")) -+ BOOST_FOREACH(const config &m, cfg.child_range("menu")) - { - menu new_menu(m); - DBG_DP << "adding menu: " << (new_menu.is_context() ? "is context" : "not context") << "\n"; -@@ -699,7 +699,7 @@ - } - - // Change existing theme objects. -- foreach (const config &c, cfg.child_range("change")) -+ BOOST_FOREACH(const config &c, cfg.child_range("change")) - { - std::string id = c["id"]; - std::string ref_id = c["ref"]; -@@ -709,12 +709,12 @@ - } - - // Add new theme objects. -- foreach (const config &c, cfg.child_range("add")) { -+ BOOST_FOREACH(const config &c, cfg.child_range("add")) { - add_object(c); - } - - // Remove existent theme objects. -- foreach (const config &c, cfg.child_range("remove")) { -+ BOOST_FOREACH(const config &c, cfg.child_range("remove")) { - remove_object(c["id"]); - } - -@@ -758,7 +758,7 @@ - if (!cfg) - return; - -- foreach (const config &thm, cfg->child_range("theme")) -+ BOOST_FOREACH(const config &thm, cfg->child_range("theme")) - { - std::string thm_name = thm["name"]; - if (!thm["hidden"].to_bool(false)) -@@ -778,7 +778,7 @@ - - const theme::menu *theme::get_menu_item(const std::string &key) const - { -- foreach (const theme::menu &m, menus_) { -+ BOOST_FOREACH(const theme::menu &m, menus_) { - if (m.get_id() == key) return &m; - } - return NULL; -Index: src/addon/manager.cpp -=================================================================== ---- src/addon/manager.cpp (revision 54624) -+++ src/addon/manager.cpp (revision 54625) -@@ -19,7 +19,6 @@ - #include "addon/manager.hpp" - #include "dialogs.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "formatter.hpp" - #include "game_display.hpp" - #include "game_preferences.hpp" -@@ -41,6 +40,8 @@ - #include "wml_separators.hpp" - #include "formula_string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_config("config"); - #define ERR_CFG LOG_STREAM(err , log_config) - #define LOG_CFG LOG_STREAM(info, log_config) -@@ -321,11 +322,11 @@ - - make_directory(dir); - -- foreach (const config &d, cfg.child_range("dir")) { -+ BOOST_FOREACH(const config &d, cfg.child_range("dir")) { - unarchive_dir(dir, d); - } - -- foreach (const config &f, cfg.child_range("file")) { -+ BOOST_FOREACH(const config &f, cfg.child_range("file")) { - unarchive_file(dir, f); - } - } -@@ -701,7 +702,7 @@ - std::string missing = ""; - size_t count_missing = 0; - -- foreach(const std::string& i, dependencies) { -+ BOOST_FOREACH(const std::string& i, dependencies) { - if (std::find(installed.begin(), installed.end(), i) == installed.end()) { - missing += "\n" + i; - ++count_missing; -@@ -717,7 +718,7 @@ - std::vector< std::string > unsafe_matches; - std::ostringstream unsafe_list; - std::map<std::string, version_info> remote_version_map; -- foreach (const config &remote_addon, remote_addons_list) -+ BOOST_FOREACH(const config &remote_addon, remote_addons_list) - { - const std::string& name = remote_addon["name"]; - if (std::find(dependencies.begin(), dependencies.end(), name) != dependencies.end()) { -@@ -837,7 +838,7 @@ - if(!result) { - assert(failed_titles.empty() == false); - std::string failed_titles_list_fmt; -- foreach(const std::string& entry, failed_titles) { -+ BOOST_FOREACH(const std::string& entry, failed_titles) { - failed_titles_list_fmt += '\n'; - failed_titles_list_fmt += entry; - } -@@ -870,7 +871,7 @@ - std::vector<version_info> safe_local_versions; - std::vector<version_info> unsafe_local_versions; - std::map<std::string, version_info> remote_version_map; -- foreach (const config &remote_addon, remote_addons_list) -+ BOOST_FOREACH(const config &remote_addon, remote_addons_list) - { - const std::string& name = remote_addon["name"]; - const std::string& version = remote_addon["version"]; -@@ -1065,7 +1066,7 @@ - if(!result) { - assert(failed_titles.empty() == false); - std::string failed_titles_list_fmt; -- foreach(const std::string& entry, failed_titles) { -+ BOOST_FOREACH(const std::string& entry, failed_titles) { - failed_titles_list_fmt += '\n'; - failed_titles_list_fmt += entry; - } -@@ -1090,7 +1091,7 @@ - const std::string& addon, - const std::vector<std::string>& own_addons) - { -- foreach(const std::string& current_own_addon, own_addons) { -+ BOOST_FOREACH(const std::string& current_own_addon, own_addons) { - if(current_own_addon == addon) { - utils::string_map symbols; - symbols["addon"] = addon; -@@ -1171,7 +1172,7 @@ - - std::vector< addon_info > infos; - -- foreach(const config &c, addon_cfgs) -+ BOOST_FOREACH(const config &c, addon_cfgs) - { - const std::string& name = c["name"]; - const std::string& downloads = c["downloads"].str(); -@@ -1254,13 +1255,13 @@ - infos.push_back(inf); - } - -- foreach(const std::string& pub, publish_options) { -+ BOOST_FOREACH(const std::string& pub, publish_options) { - static const std::string publish_icon = "icons/icon-addon-publish.png"; - const std::string text = _("Publish add-on: ") + get_addon_name(pub); - options.push_back(IMAGE_PREFIX + publish_icon + COLUMN_SEPARATOR + font::GOOD_TEXT + text); - options_to_filter.push_back(text); - } -- foreach(const std::string& del, delete_options) { -+ BOOST_FOREACH(const std::string& del, delete_options) { - static const std::string delete_icon = "icons/icon-addon-delete.png"; - const std::string text = _("Delete add-on: ") + get_addon_name(del); - options.push_back(IMAGE_PREFIX + delete_icon + COLUMN_SEPARATOR + font::BAD_TEXT + text); -@@ -1408,7 +1409,7 @@ - - remove_names.clear(); - -- foreach(const std::string& id, remove_ids) { -+ BOOST_FOREACH(const std::string& id, remove_ids) { - remove_names.push_back(get_addon_name(id)); - } - -@@ -1425,7 +1426,7 @@ - - std::vector<std::string> failed_names, skipped_names, succeeded_names; - -- foreach(const std::string& id, remove_ids) { -+ BOOST_FOREACH(const std::string& id, remove_ids) { - const std::string& name = get_addon_name(id); - - if(have_addon_pbl_info(id) || have_addon_in_vcs_tree(id)) { -@@ -1531,12 +1532,12 @@ - } - static const std::string parentd = get_addon_campaigns_dir(); - std::vector<std::string> addon_info_files; -- foreach(std::string const& dir, addons) -+ BOOST_FOREACH(std::string const& dir, addons) - addon_info_files.push_back(parentd+"/"+dir+"/_info.cfg"); - - size_t i = 0; - -- foreach(std::string const& info_file, addon_info_files) { -+ BOOST_FOREACH(std::string const& info_file, addon_info_files) { - assert(i < addons.size()); - - std::string const& addon = addons[i]; -Index: src/addon/validation.cpp -=================================================================== ---- src/addon/validation.cpp (revision 54624) -+++ src/addon/validation.cpp (revision 54625) -@@ -17,8 +17,9 @@ - #include "global.hpp" - #include "addon/validation.hpp" - #include "config.hpp" --#include "foreach.hpp" - -+#include <boost/foreach.hpp> -+ - #include <cstring> - - const unsigned short default_campaignd_port = 15002; -@@ -44,10 +45,10 @@ - - bool check_names_legal(const config& dir) - { -- foreach (const config &path, dir.child_range("file")) { -+ BOOST_FOREACH(const config &path, dir.child_range("file")) { - if (!addon_name_legal(path["name"])) return false; - } -- foreach (const config &path, dir.child_range("dir")) { -+ BOOST_FOREACH(const config &path, dir.child_range("dir")) { - if (!addon_name_legal(path["name"])) return false; - if (!check_names_legal(path)) return false; - } -Index: src/mapgen.cpp -=================================================================== ---- src/mapgen.cpp (revision 54624) -+++ src/mapgen.cpp (revision 54625) -@@ -20,7 +20,6 @@ - - #include "global.hpp" - --#include "foreach.hpp" - #include "gettext.hpp" - #include "language.hpp" - #include "log.hpp" -@@ -34,6 +33,7 @@ - #include "formula_string_utils.hpp" - #include "SDL.h" - -+#include <boost/foreach.hpp> - - static lg::log_domain log_engine("engine"); - #define ERR_NG LOG_STREAM(err, log_engine) -@@ -777,7 +777,7 @@ - - std::vector<terrain_height_mapper> height_conversion; - -- foreach (const config &h, cfg.child_range("height")) { -+ BOOST_FOREACH(const config &h, cfg.child_range("height")) { - height_conversion.push_back(terrain_height_mapper(h)); - } - -@@ -912,7 +912,7 @@ - LOG_NG << (SDL_GetTicks() - ticks) << "\n"; ticks = SDL_GetTicks(); - - std::vector<terrain_converter> converters; -- foreach (const config &cv, cfg.child_range("convert")) { -+ BOOST_FOREACH(const config &cv, cfg.child_range("convert")) { - converters.push_back(terrain_converter(cv)); - } - -Index: src/cavegen.cpp -=================================================================== ---- src/cavegen.cpp (revision 54624) -+++ src/cavegen.cpp (revision 54625) -@@ -21,13 +21,14 @@ - #include "global.hpp" - - #include "cavegen.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "map.hpp" - #include "pathfind/pathfind.hpp" - #include "serialization/string_utils.hpp" - #include "util.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define LOG_NG LOG_STREAM(info, log_engine) - -@@ -147,7 +148,7 @@ - - void cave_map_generator::generate_chambers() - { -- foreach (const config &ch, cfg_.child_range("chamber")) -+ BOOST_FOREACH(const config &ch, cfg_.child_range("chamber")) - { - // If there is only a chance of the chamber appearing, deal with that here. - if (ch.has_attribute("chance") && (rand() % 100) < ch["chance"].to_int()) { -@@ -195,7 +196,7 @@ - - chambers_.push_back(new_chamber); - -- foreach (const config &p, ch.child_range("passage")) -+ BOOST_FOREACH(const config &p, ch.child_range("passage")) - { - const std::string &dst = p["destination"]; - -@@ -220,7 +221,7 @@ - if (c.items == NULL || c.locs.empty()) return; - - size_t index = 0; -- foreach (const config::any_child &it, c.items->all_children_range()) -+ BOOST_FOREACH(const config::any_child &it, c.items->all_children_range()) - { - config cfg = it.cfg; - config &filter = cfg.child("filter"); -Index: src/ai/lua/core.cpp -=================================================================== ---- src/ai/lua/core.cpp (revision 54624) -+++ src/ai/lua/core.cpp (revision 54625) -@@ -34,7 +34,6 @@ - #include "../../actions.hpp" - #include "../../attack_prediction.hpp" - #include "../../filesystem.hpp" --#include "../../foreach.hpp" - #include "../../game_display.hpp" - #include "../../gamestatus.hpp" - #include "../../log.hpp" -Index: src/ai/default/attack.cpp -=================================================================== ---- src/ai/default/attack.cpp (revision 54624) -+++ src/ai/default/attack.cpp (revision 54625) -@@ -25,7 +25,6 @@ - #include "../manager.hpp" - - #include "../../attack_prediction.hpp" --#include "foreach.hpp" - #include "../../game_config.hpp" - #include "../../log.hpp" - #include "../../map.hpp" -Index: src/ai/default/contexts.cpp -=================================================================== ---- src/ai/default/contexts.cpp (revision 54624) -+++ src/ai/default/contexts.cpp (revision 54625) -@@ -22,7 +22,6 @@ - #include "contexts.hpp" - - #include "../../actions.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - #include "../../map.hpp" - #include "../../resources.hpp" -Index: src/ai/default/ai.cpp -=================================================================== ---- src/ai/default/ai.cpp (revision 54624) -+++ src/ai/default/ai.cpp (revision 54625) -@@ -26,7 +26,6 @@ - - #include "../../array.hpp" - #include "../../dialogs.hpp" --#include "../../foreach.hpp" - #include "../../game_end_exceptions.hpp" - #include "../../game_events.hpp" - #include "../../game_preferences.hpp" -@@ -41,6 +40,8 @@ - - #include "../../pathfind/pathfind.hpp" - -+#include <boost/foreach.hpp> -+ - #include <iterator> - #include <algorithm> - #include <fstream> -@@ -144,7 +145,7 @@ - - void ai_default_recruitment_stage::on_create() { - stage::on_create(); -- foreach (const config &c, cfg_.child_range("limit")) { -+ BOOST_FOREACH(const config &c, cfg_.child_range("limit")) { - if (c.has_attribute("type") && c.has_attribute("max") ) { - maximum_counts_.insert(std::make_pair(c["type"],lexical_cast_default<int>(c["max"],0))); - } -@@ -193,7 +194,7 @@ - bool found = false; - // Find an available unit that can be recruited, - // matches the desired usage type, and comes in under budget. -- foreach (const std::string &name, current_team().recruits()) -+ BOOST_FOREACH(const std::string &name, current_team().recruits()) - { - const unit_type *ut = unit_types.find(name); - if (!ut) continue; -@@ -435,7 +436,7 @@ - - team &enemy_team = (*resources::teams)[j->side() - 1]; - const std::set<std::string> &recruits = enemy_team.recruits(); -- foreach (const std::string &rec, recruits) { -+ BOOST_FOREACH(const std::string &rec, recruits) { - get_combat_score_vs(ut,rec,score,weighting,0,0); - } - continue; -@@ -677,7 +678,7 @@ - double best_combat_score_of_advancement = 0; - bool best_combat_score_of_advancement_found = false; - int best_cost = recall_cost; -- foreach (const std::string &i, u.advances_to()) { -+ BOOST_FOREACH(const std::string &i, u.advances_to()) { - const unit_type *ut = unit_types.find(i); - if (!ut) { - continue; -Index: src/ai/configuration.cpp -=================================================================== ---- src/ai/configuration.cpp (revision 54624) -+++ src/ai/configuration.cpp (revision 54625) -@@ -22,12 +22,13 @@ - #include "configuration.hpp" - - #include "../filesystem.hpp" --#include "../foreach.hpp" - #include "../log.hpp" - #include "../serialization/parser.hpp" - #include "../serialization/preprocessor.hpp" - #include "../team.hpp" - -+#include <boost/foreach.hpp> -+ - #include <vector> - - namespace ai { -@@ -93,7 +94,7 @@ - } - - -- foreach (const config &ai_configuration, ais.child_range("ai")) { -+ BOOST_FOREACH(const config &ai_configuration, ais.child_range("ai")) { - const std::string &id = ai_configuration["id"]; - if (id.empty()){ - -@@ -118,7 +119,7 @@ - void configuration::add_era_ai_from_config(const config &era) - { - era_ai_configurations_.clear(); -- foreach (const config &ai_configuration, era.child_range("ai")) { -+ BOOST_FOREACH(const config &ai_configuration, era.child_range("ai")) { - const std::string &id = ai_configuration["id"]; - if (id.empty()){ - -@@ -196,7 +197,7 @@ - config aspect_config; - aspect_config["id"] = id; - -- foreach (const config &aiparam, cfg.child_range("ai")) { -+ BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) { - const config &_aspect = aiparam.find_child("aspect","id",id); - if (_aspect) { - aspect_config.append(_aspect); -@@ -216,7 +217,7 @@ - if (aspect_was_attribute) { - facet_config["value"] = aiparam[id]; - } else { -- foreach (const config &value, aiparam.child_range(id)) { -+ BOOST_FOREACH(const config &value, aiparam.child_range(id)) { - facet_config.add_child("value",value); - } - } -@@ -242,7 +243,7 @@ - - //leave only the [ai] children - cfg = config(); -- foreach (const config &aiparam, original_cfg.child_range("ai")) { -+ BOOST_FOREACH(const config &aiparam, original_cfg.child_range("ai")) { - cfg.add_child("ai",aiparam); - } - -@@ -264,7 +265,7 @@ - - //find version - int version = 10600; -- foreach (const config &aiparam, cfg.child_range("ai")) { -+ BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) { - if (const config::attribute_value *a = aiparam.get("version")){ - int v = a->to_int(version); - if (version<v) { -@@ -290,7 +291,7 @@ - config parsed_cfg = config(); - - LOG_AI_CONFIGURATION << "side "<< side <<": merging AI configurations"<< std::endl; -- foreach (const config &aiparam, cfg.child_range("ai")) { -+ BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) { - parsed_cfg.append(aiparam); - } - -@@ -302,7 +303,7 @@ - parsed_cfg.merge_children_by_attribute("aspect","id"); - - LOG_AI_CONFIGURATION << "side "<< side <<": removing duplicate [default] tags from aspects"<< std::endl; -- foreach (config &aspect_cfg, parsed_cfg.child_range("aspect")) { -+ BOOST_FOREACH(config &aspect_cfg, parsed_cfg.child_range("aspect")) { - if (!aspect_cfg.child("default")) { - WRN_AI_CONFIGURATION << "side "<< side <<": aspect with id=["<<aspect_cfg["id"]<<"] lacks default config facet!" <<std::endl; - continue; -@@ -341,7 +342,7 @@ - if (cfg["ai_algorithm"]=="idle_ai") { - is_idle_ai = true; - } else { -- foreach (config &aiparam, cfg.child_range("ai")) { -+ BOOST_FOREACH(config &aiparam, cfg.child_range("ai")) { - if (aiparam["ai_algorithm"]=="idle_ai") { - is_idle_ai = true; - break; -@@ -360,8 +361,8 @@ - - config fallback_stage_cfg_ai; - -- foreach (config &aiparam, cfg.child_range("ai")) { -- foreach (const well_known_aspect &wka, well_known_aspects) { -+ BOOST_FOREACH(config &aiparam, cfg.child_range("ai")) { -+ BOOST_FOREACH(const well_known_aspect &wka, well_known_aspects) { - if (wka.was_an_attribute_) { - aiparam.remove_attribute(wka.name_); - } else { -@@ -370,7 +371,7 @@ - } - - -- foreach (const config &aitarget, aiparam.child_range("target")) { -+ BOOST_FOREACH(const config &aitarget, aiparam.child_range("target")) { - config aigoal; - transfer_turns_and_time_of_day_data(aiparam,aigoal); - -@@ -388,14 +389,14 @@ - aiparam.clear_children("target"); - - -- foreach (config &ai_protect_unit, aiparam.child_range("protect_unit")) { -+ BOOST_FOREACH(config &ai_protect_unit, aiparam.child_range("protect_unit")) { - transfer_turns_and_time_of_day_data(aiparam,ai_protect_unit); - upgrade_protect_goal_config_from_1_07_02_to_1_07_03(side,ai_protect_unit,parsed_cfg,true); - } - aiparam.clear_children("protect_unit"); - - -- foreach (config &ai_protect_location, aiparam.child_range("protect_location")) { -+ BOOST_FOREACH(config &ai_protect_location, aiparam.child_range("protect_location")) { - transfer_turns_and_time_of_day_data(aiparam,ai_protect_location); - upgrade_protect_goal_config_from_1_07_02_to_1_07_03(side,ai_protect_location,parsed_cfg,false); - } -@@ -423,19 +424,19 @@ - fallback_stage_cfg_ai.clear_children("aspect"); - - //move [stage]s to root of the config -- foreach (const config &aistage, fallback_stage_cfg_ai.child_range("stage")) { -+ BOOST_FOREACH(const config &aistage, fallback_stage_cfg_ai.child_range("stage")) { - parsed_cfg.add_child("stage",aistage); - } - fallback_stage_cfg_ai.clear_children("stage"); - - //move [goal]s to root of the config -- foreach (const config &aigoal, fallback_stage_cfg_ai.child_range("goal")) { -+ BOOST_FOREACH(const config &aigoal, fallback_stage_cfg_ai.child_range("goal")) { - parsed_cfg.add_child("goal",aigoal); - } - fallback_stage_cfg_ai.clear_children("goal"); - - //move [modify_ai]'s to root of the config -- foreach (const config &aimodifyai, fallback_stage_cfg_ai.child_range("modify_ai")) { -+ BOOST_FOREACH(const config &aimodifyai, fallback_stage_cfg_ai.child_range("modify_ai")) { - parsed_cfg.add_child("modify_ai",aimodifyai); - } - fallback_stage_cfg_ai.clear_children("modify_ai"); -@@ -452,12 +453,12 @@ - { - config cfg; - -- foreach (const config &aiparam, ai_parameters) { -+ BOOST_FOREACH(const config &aiparam, ai_parameters) { - cfg.add_child("ai",aiparam); - } - - DBG_AI_CONFIGURATION << "side "<< side <<": upgrading aspects from syntax of 1.7.2 to 1.7.3, old-style config is:" << std::endl << cfg << std::endl; -- foreach (const well_known_aspect &wka, well_known_aspects) { -+ BOOST_FOREACH(const well_known_aspect &wka, well_known_aspects) { - upgrade_aspect_config_from_1_07_02_to_1_07_03(side, cfg,parsed_cfg,wka.name_,wka.was_an_attribute_); - } - } -Index: src/ai/contexts.cpp -=================================================================== ---- src/ai/contexts.cpp (revision 54624) -+++ src/ai/contexts.cpp (revision 54625) -@@ -47,6 +47,8 @@ - #include "../tod_manager.hpp" - #include "../unit_display.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_ai("ai/general"); - #define DBG_AI LOG_STREAM(debug, log_ai) - #define LOG_AI LOG_STREAM(info, log_ai) -@@ -223,19 +225,19 @@ - - void readonly_context_impl::on_readonly_context_create() { - //init the composite ai engines -- foreach(const config &cfg_element, cfg_.child_range("engine")){ -+ BOOST_FOREACH(const config &cfg_element, cfg_.child_range("engine")){ - engine::parse_engine_from_config(*this,cfg_element,std::back_inserter(engines_)); - } - - // init the composite ai aspects -- foreach(const config &cfg_element, cfg_.child_range("aspect")){ -+ BOOST_FOREACH(const config &cfg_element, cfg_.child_range("aspect")){ - std::vector<aspect_ptr> aspects; - engine::parse_aspect_from_config(*this,cfg_element,cfg_element["id"],std::back_inserter(aspects)); - add_aspects(aspects); - } - - // init the composite ai goals -- foreach(const config &cfg_element, cfg_.child_range("goal")){ -+ BOOST_FOREACH(const config &cfg_element, cfg_.child_range("goal")){ - engine::parse_goal_from_config(*this,cfg_element,std::back_inserter(get_goals())); - } - } -@@ -255,13 +257,13 @@ - config readonly_context_impl::to_readonly_context_config() const - { - config cfg; -- foreach(const engine_ptr e, engines_) { -+ BOOST_FOREACH(const engine_ptr e, engines_) { - cfg.add_child("engine",e->to_config()); - } -- foreach(const aspect_map::value_type a, aspects_) { -+ BOOST_FOREACH(const aspect_map::value_type a, aspects_) { - cfg.add_child("aspect",a.second->to_config()); - } -- foreach(const goal_ptr g, goals_) { -+ BOOST_FOREACH(const goal_ptr g, goals_) { - cfg.add_child("goal",g->to_config()); - } - return cfg; -@@ -366,7 +368,7 @@ - } - - for(std::map<map_location,pathfind::paths>::iterator m = res.begin(); m != res.end(); ++m) { -- foreach (const pathfind::paths::step &dest, m->second.destinations) -+ BOOST_FOREACH(const pathfind::paths::step &dest, m->second.destinations) - { - const map_location& src = m->first; - const map_location& dst = dest.curr; -@@ -406,7 +408,7 @@ - - void readonly_context_impl::add_aspects(std::vector< aspect_ptr > &aspects ) - { -- foreach (aspect_ptr a, aspects) { -+ BOOST_FOREACH(aspect_ptr a, aspects) { - const std::string id = a->get_id(); - known_aspect_map::iterator i = known_aspects_.find(id); - if (i != known_aspects_.end()) { -@@ -1024,7 +1026,7 @@ - // The 0.5 power avoids underestimating too much the damage of a wounded unit. - int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000); - int most_damage = 0; -- foreach (const attack_type &att, un.attacks()) -+ BOOST_FOREACH(const attack_type &att, un.attacks()) - { - int damage = att.damage() * att.num_attacks() * (100 + tod_modifier); - if (damage > most_damage) { -@@ -1112,7 +1114,7 @@ - map_location const* best_occupied_keep = &map_location::null_location; - double move_left_at_best_occupied_keep = 0.0; - -- foreach (const pathfind::paths::step &dest, leader_paths.destinations) -+ BOOST_FOREACH(const pathfind::paths::step &dest, leader_paths.destinations) - { - const map_location &loc = dest.curr; - if (keeps().find(loc)!=keeps().end()){ -Index: src/ai/manager.cpp -=================================================================== ---- src/ai/manager.cpp (revision 54624) -+++ src/ai/manager.cpp (revision 54625) -@@ -27,13 +27,14 @@ - #include "registry.hpp" - #include "../game_events.hpp" - #include "../game_preferences.hpp" --#include "../foreach.hpp" - #include "../log.hpp" - #include "../replay.hpp" - #include "../serialization/string_utils.hpp" - #include "../statistics.hpp" - #include "composite/component.hpp" - -+#include <boost/foreach.hpp> -+ - #include <map> - #include <stack> - #include <vector> -@@ -89,7 +90,7 @@ - - if (this->ai_) { - ai_->on_create(); -- foreach (config &mod_ai, cfg_.child_range("modify_ai")) { -+ BOOST_FOREACH(config &mod_ai, cfg_.child_range("modify_ai")) { - if (!mod_ai.has_attribute("side")) { - mod_ai["side"] = side; - } -@@ -149,8 +150,8 @@ - cfg_.merge_children_by_attribute("aspect","id"); - } else { - // else run 'add_facet' command on each [aspect][facet] -- foreach (const config &cfg_a, cfg.child_range("aspect")) { -- foreach (const config &cfg_f, cfg_a.child_range("facet")) { -+ BOOST_FOREACH(const config &cfg_a, cfg.child_range("aspect")) { -+ BOOST_FOREACH(const config &cfg_f, cfg_a.child_range("facet")) { - readonly_context_->add_facet(cfg_a["id"],cfg_f); - } - } -Index: src/ai/composite/component.cpp -=================================================================== ---- src/ai/composite/component.cpp (revision 54624) -+++ src/ai/composite/component.cpp (revision 54625) -@@ -23,12 +23,12 @@ - #include "property_handler.hpp" - #include "../../config.hpp" - #include "../../log.hpp" --#include "../../foreach.hpp" - - #include "../formula/ai.hpp" - - #include <boost/lexical_cast.hpp> - #include <boost/regex.hpp> -+#include <boost/foreach.hpp> - - namespace pathfind { - -@@ -125,7 +125,7 @@ - std::vector<std::string> component::get_children_types() - { - std::vector<std::string> types; -- foreach (property_handler_map::value_type &ph, property_handlers_) { -+ BOOST_FOREACH(property_handler_map::value_type &ph, property_handlers_) { - types.push_back(ph.first); - } - return types; -@@ -241,9 +241,9 @@ - - s << offset_str << type<<"["<<root->get_id() <<"] "<<root->get_engine()<<" "<<root->get_name()<< std::endl; - -- foreach (std::string t, t_list) { -+ BOOST_FOREACH(std::string t, t_list) { - std::vector<component*> c_list = root->get_children(t); -- foreach (component *c, c_list) { -+ BOOST_FOREACH(component *c, c_list) { - print_component(c,t,s,offset+1); - } - } -Index: src/ai/composite/stage.cpp -=================================================================== ---- src/ai/composite/stage.cpp (revision 54624) -+++ src/ai/composite/stage.cpp (revision 54625) -@@ -22,7 +22,6 @@ - #include "engine.hpp" - #include "stage.hpp" - #include "../contexts.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - #include "../../resources.hpp" - #include "../../tod_manager.hpp" -Index: src/ai/composite/engine.cpp -=================================================================== ---- src/ai/composite/engine.cpp (revision 54624) -+++ src/ai/composite/engine.cpp (revision 54625) -@@ -21,7 +21,6 @@ - #include "engine.hpp" - #include "contexts.hpp" - --#include "../../foreach.hpp" - #include "../../log.hpp" - - namespace ai { -Index: src/ai/composite/engine_default.cpp -=================================================================== ---- src/ai/composite/engine_default.cpp (revision 54624) -+++ src/ai/composite/engine_default.cpp (revision 54625) -@@ -24,7 +24,6 @@ - #include "engine_default.hpp" - #include "rca.hpp" - #include "stage.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - - namespace ai { -Index: src/ai/composite/goal.cpp -=================================================================== ---- src/ai/composite/goal.cpp (revision 54624) -+++ src/ai/composite/goal.cpp (revision 54625) -@@ -24,7 +24,6 @@ - #include "../../log.hpp" - #include "../lua/lua_object.hpp" - #include "../../gamestatus.hpp" --#include "../../foreach.hpp" - #include "../../resources.hpp" - #include "../../scripting/lua.hpp" - #include "../../terrain_filter.hpp" -@@ -34,6 +33,7 @@ - #include "../../variable.hpp" - - #include <boost/lexical_cast.hpp> -+#include <boost/foreach.hpp> - - namespace ai { - -@@ -128,7 +128,7 @@ - if (!criteria) return; - - //find the enemy leaders and explicit targets -- foreach (const unit &u, *resources::units) { -+ BOOST_FOREACH(const unit &u, *resources::units) { - if (u.matches_filter(vconfig(criteria), u.get_location())) { - LOG_AI_GOAL << "found explicit target unit at ... " << u.get_location() << " with value: " << value() << "\n"; - *target_list = target(u.get_location(), value(), target::EXPLICIT); -@@ -173,7 +173,7 @@ - - std::set<map_location> items; - filter_ptr_->get_locations(items); -- foreach (const map_location &loc, items) -+ BOOST_FOREACH(const map_location &loc, items) - { - LOG_AI_GOAL << "found explicit target location ... " << loc << " with value: " << value() << std::endl; - *target_list = target(loc, value(), target::EXPLICIT); -@@ -252,7 +252,7 @@ - - std::set<map_location> items; - if (protect_unit_) { -- foreach (const unit &u, units) -+ BOOST_FOREACH(const unit &u, units) - { - if (protect_only_own_unit_ && u.side() != get_side()) { - continue; -@@ -268,9 +268,9 @@ - } - DBG_AI_GOAL << "side " << get_side() << ": seaching for threats in "+goal_type+" goal" << std::endl; - // Look for directions to protect a specific location or specific unit. -- foreach (const map_location &loc, items) -+ BOOST_FOREACH(const map_location &loc, items) - { -- foreach (const unit &u, units) -+ BOOST_FOREACH(const unit &u, units) - { - int distance = distance_between(u.get_location(), loc); - if (current_team().is_enemy(u.side()) && distance < radius_ && -@@ -325,7 +325,7 @@ - handler_->handle(c, true, l_obj); - std::vector < target > targets = *(l_obj->get()); - -- foreach (target tg, targets) -+ BOOST_FOREACH(target tg, targets) - { - *target_list = tg; - } -Index: src/ai/composite/engine_fai.cpp -=================================================================== ---- src/ai/composite/engine_fai.cpp (revision 54624) -+++ src/ai/composite/engine_fai.cpp (revision 54625) -@@ -25,7 +25,6 @@ - #include "../formula/candidates.hpp" - #include "../formula/stage_side_formulas.hpp" - #include "../formula/stage_unit_formulas.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - - namespace ai { -Index: src/ai/composite/aspect.hpp -=================================================================== ---- src/ai/composite/aspect.hpp (revision 54624) -+++ src/ai/composite/aspect.hpp (revision 54625) -@@ -265,7 +265,7 @@ - , facets_() - , default_() - { -- foreach (const config &cfg_element, this->cfg_.child_range("facet") ){ -+ BOOST_FOREACH(const config &cfg_element, this->cfg_.child_range("facet") ){ - add_facet(-1,cfg_element); - } - -@@ -291,7 +291,7 @@ - { - std::vector<aspect_ptr> facets_base; - engine::parse_aspect_from_config(*this,cfg,this->get_id(),std::back_inserter(facets_base)); -- foreach (aspect_ptr a, facets_base ){ -+ BOOST_FOREACH(aspect_ptr a, facets_base ){ - typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> > (a); - facets.push_back(b); - } -@@ -301,7 +301,7 @@ - virtual void recalculate() const - { - ///@todo 1.9 optimize in case of an aspect which returns variant -- foreach (const typename aspect_type<T>::typesafe_ptr &f, make_pair(facets_.rbegin(),facets_.rend())) { -+ BOOST_FOREACH(const typename aspect_type<T>::typesafe_ptr &f, make_pair(facets_.rbegin(),facets_.rend())) { - if (f->active()) { - this->value_ = boost::shared_ptr<T>(f->get_ptr()); - this->valid_ = true; -@@ -316,7 +316,7 @@ - virtual config to_config() const - { - config cfg = aspect::to_config(); -- foreach (const typename aspect_type<T>::typesafe_ptr f, facets_) { -+ BOOST_FOREACH(const typename aspect_type<T>::typesafe_ptr f, facets_) { - cfg.add_child("facet",f->to_config()); - } - if (default_) { -@@ -334,7 +334,7 @@ - std::vector< aspect_ptr > facets; - engine::parse_aspect_from_config(*this,cfg,this->get_id(),std::back_inserter(facets)); - int j=0; -- foreach (aspect_ptr a, facets ){ -+ BOOST_FOREACH(aspect_ptr a, facets ){ - typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> > (a); - facets_.insert(facets_.begin()+pos+j,b); - j++; -Index: src/ai/composite/property_handler.hpp -=================================================================== ---- src/ai/composite/property_handler.hpp (revision 54624) -+++ src/ai/composite/property_handler.hpp (revision 54625) -@@ -23,9 +23,9 @@ - #define AI_COMPOSITE_PROPERTY_HANDLER_HPP_INCLUDED - - #include <boost/function.hpp> -+#include <boost/foreach.hpp> - - #include "config.hpp" --#include "foreach.hpp" - #include "ai/composite/component.hpp" - - namespace ai{ -@@ -134,7 +134,7 @@ - std::vector<component*> handle_get_children() - { - std::vector<component*> children; -- foreach (t_ptr v, values_) { -+ BOOST_FOREACH(t_ptr v, values_) { - children.push_back(&*v); - } - return children; -@@ -149,7 +149,7 @@ - t_ptr_vector values; - factory_(values,cfg); - int j=0; -- foreach (t_ptr b, values ){ -+ BOOST_FOREACH(t_ptr b, values ){ - values_.insert(values_.begin()+pos+j,b); - j++; - } -@@ -200,7 +200,7 @@ - //* is a special case - 'delete all facets' - if (child.id == "*") { - bool b = false; -- foreach(typename aspect_map::value_type a, aspects_) { -+ BOOST_FOREACH(typename aspect_map::value_type a, aspects_) { - b |= a.second->delete_all_facets(); - } - return b; -@@ -212,7 +212,7 @@ - std::vector<component*> handle_get_children() - { - std::vector<component*> children; -- foreach(typename aspect_map::value_type a, aspects_) { -+ BOOST_FOREACH(typename aspect_map::value_type a, aspects_) { - children.push_back(&*a.second); - } - return children; -Index: src/ai/composite/ai.cpp -=================================================================== ---- src/ai/composite/ai.cpp (revision 54624) -+++ src/ai/composite/ai.cpp (revision 54625) -@@ -27,11 +27,11 @@ - #include "stage.hpp" - #include "../manager.hpp" - #include "../../actions.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - - #include <boost/bind.hpp> - #include <boost/function.hpp> -+#include <boost/foreach.hpp> - - namespace ai { - -@@ -60,7 +60,7 @@ - cfg_["id"]<<"]"<<std::endl; - - // init the composite ai stages -- foreach(const config &cfg_element, cfg_.child_range("stage")){ -+ BOOST_FOREACH(const config &cfg_element, cfg_.child_range("stage")){ - add_stage(cfg_element); - } - -@@ -115,7 +115,7 @@ - std::vector< stage_ptr > stages; - create_stage(stages,cfg); - int j=0; -- foreach (stage_ptr b, stages ){ -+ BOOST_FOREACH(stage_ptr b, stages ){ - stages_.push_back(b); - j++; - } -@@ -128,7 +128,7 @@ - std::vector< goal_ptr > goals; - create_goal(goals,cfg); - int j=0; -- foreach (goal_ptr b, goals ){ -+ BOOST_FOREACH(goal_ptr b, goals ){ - get_goals().push_back(b); - j++; - } -@@ -137,7 +137,7 @@ - - - void ai_composite::play_turn(){ -- foreach(stage_ptr &s, stages_){ -+ BOOST_FOREACH(stage_ptr &s, stages_){ - s->play_stage(); - } - } -@@ -206,7 +206,7 @@ - config cfg; - - //serialize the composite ai stages -- foreach(const stage_ptr &s, stages_){ -+ BOOST_FOREACH(const stage_ptr &s, stages_){ - cfg.add_child("stage",s->to_config()); - } - -Index: src/ai/formula/candidates.cpp -=================================================================== ---- src/ai/formula/candidates.cpp (revision 54624) -+++ src/ai/formula/candidates.cpp (revision 54625) -@@ -19,10 +19,11 @@ - - #include "ai.hpp" - #include "candidates.hpp" --#include "foreach.hpp" - #include "../../log.hpp" - #include "../../resources.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_formula_ai("ai/engine/fai"); - #define ERR_AI LOG_STREAM(err, log_formula_ai) - -@@ -32,7 +33,7 @@ - void candidate_action_manager::load_config(const config& cfg, ai::formula_ai* ai, function_symbol_table* function_table) - { - // register candidate actions -- foreach (const config &rc_action, cfg.child_range("register_candidate_action")) -+ BOOST_FOREACH(const config &rc_action, cfg.child_range("register_candidate_action")) - { - candidate_action_ptr new_ca = load_candidate_action_from_config(rc_action,ai,function_table); - -@@ -67,7 +68,7 @@ - { - evaluated_candidate_actions_.clear(); - -- foreach(candidate_action_ptr cm, candidate_actions_) -+ BOOST_FOREACH(candidate_action_ptr cm, candidate_actions_) - { - cm->evaluate(ai, units); - evaluated_candidate_actions_.insert(cm); -@@ -116,7 +117,7 @@ - const config & filter_params = cfg.child("filter"); - - if( filter_params ) { -- foreach( const config::attribute filter_param, filter_params.attribute_range() ) -+ BOOST_FOREACH( const config::attribute filter_param, filter_params.attribute_range() ) - { - game_logic::const_formula_ptr filter_formula( - new game_logic::formula(filter_param.second, function_table)); -Index: src/ai/formula/stage_side_formulas.cpp -=================================================================== ---- src/ai/formula/stage_side_formulas.cpp (revision 54624) -+++ src/ai/formula/stage_side_formulas.cpp (revision 54625) -@@ -22,7 +22,6 @@ - #include "stage_side_formulas.hpp" - #include "ai.hpp" - --#include "../../foreach.hpp" - #include "../../formula.hpp" - #include "../../formula_function.hpp" - #include "../../log.hpp" -Index: src/ai/formula/ai.cpp -=================================================================== ---- src/ai/formula/ai.cpp (revision 54624) -+++ src/ai/formula/ai.cpp (revision 54625) -@@ -32,7 +32,6 @@ - - #include "../../callable_objects.hpp" - #include "../../game_display.hpp" --#include "../../foreach.hpp" - #include "../../formula_debugger.hpp" - #include "../../log.hpp" - #include "../../menu_events.hpp" -@@ -42,6 +41,8 @@ - #include "../../tod_manager.hpp" - #include "../../pathfind/pathfind.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_formula_ai("ai/engine/fai"); - #define DBG_AI LOG_STREAM(debug, log_formula_ai) - #define LOG_AI LOG_STREAM(info, log_formula_ai) -@@ -548,7 +549,7 @@ - variant villages_from_set(const Container& villages, - const std::set<map_location>* exclude=NULL) { - std::vector<variant> vars; -- foreach(const map_location& loc, villages) { -+ BOOST_FOREACH(const map_location& loc, villages) { - if(exclude && exclude->count(loc)) { - continue; - } -@@ -617,7 +618,7 @@ - { - const std::vector<std::string> &rp = get_recruitment_pattern(); - std::vector<variant> vars; -- foreach (const std::string &i, rp) { -+ BOOST_FOREACH(const std::string &i, rp) { - vars.push_back(variant(i)); - } - return variant(&vars); -@@ -751,7 +752,7 @@ - std::vector<variant> v; - tmp.push_back( v ); - } -- foreach (const unit &u, units) { -+ BOOST_FOREACH(const unit &u, units) { - tmp[u.side() - 1].push_back(variant(new unit_callable(u))); - } - for( size_t i = 0; i<tmp.size(); ++i) -@@ -924,7 +925,7 @@ - //make sure we don't run out of refcount - vars_.add_ref(); - -- foreach (const config &func, cfg_.child_range("function")) -+ BOOST_FOREACH(const config &func, cfg_.child_range("function")) - { - const t_string &name = func["name"]; - const t_string &inputs = func["inputs"]; -@@ -947,7 +948,7 @@ - if (const config &ai_vars = cfg_.child("vars")) - { - variant var; -- foreach (const config::attribute &i, ai_vars.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, ai_vars.attribute_range()) { - var.serialize_from_string(i.second); - vars_.add(i.first, var); - } -Index: src/ai/formula/function_table.cpp -=================================================================== ---- src/ai/formula/function_table.cpp (revision 54624) -+++ src/ai/formula/function_table.cpp (revision 54625) -@@ -24,7 +24,6 @@ - - #include "../../attack_prediction.hpp" - #include "../../filesystem.hpp" --#include "../../foreach.hpp" - #include "../../game_display.hpp" - #include "../../log.hpp" - #include "../../map_label.hpp" -@@ -36,6 +35,7 @@ - #include "../../unit.hpp" - #include "../../pathfind/pathfind.hpp" - -+#include <boost/foreach.hpp> - - static lg::log_domain log_formula_ai("ai/engine/fai"); - #define LOG_AI LOG_STREAM(info, log_formula_ai) -@@ -355,7 +355,7 @@ - if( scores[current_side][i] > 98 ) - continue; - -- foreach( int side , enemies) { -+ BOOST_FOREACH( int side , enemies) { - int diff = scores[current_side][i] - scores[side][i]; - if ( diff > enemy_tollerancy) { - valid = false; -@@ -365,7 +365,7 @@ - } - - if( valid ) { -- foreach( int side , allies) { -+ BOOST_FOREACH( int side , allies) { - if ( scores[current_side][i] - scores[side][i] > ally_tollerancy ) { - valid = false; - break; -@@ -563,7 +563,7 @@ - visited_locs.erase(starting_loc); - - std::vector<variant> res; -- foreach( const map_location& ml, visited_locs) { -+ BOOST_FOREACH( const map_location& ml, visited_locs) { - res.push_back( variant(new location_callable( ml ) ) ); - } - -@@ -841,7 +841,7 @@ - ai::attack_analysis* analysis = convert_variant<ai::attack_analysis>(attack); - //unit_map units_with_moves(*resources::units); - //typedef std::pair<map_location, map_location> mv; -- //foreach (const mv &m, analysis->movements) { -+ //BOOST_FOREACH(const mv &m, analysis->movements) { - // units_with_moves.move(m.first, m.second); - //} - -@@ -1629,7 +1629,7 @@ - - std::vector<attack_type> attacks = attacker.attacks(); - -- foreach(const attack_type &attack, attacks) { -+ BOOST_FOREACH(const attack_type &attack, attacks) { - const int dmg = round_damage(attack.damage(), defender.damage_from(attack), 100) * attack.num_attacks(); - if (attack.range() == "melee") { - highest_melee_damage = std::max(highest_melee_damage, dmg); -Index: src/ai/testing/ca_testing_move_to_targets.cpp -=================================================================== ---- src/ai/testing/ca_testing_move_to_targets.cpp (revision 54624) -+++ src/ai/testing/ca_testing_move_to_targets.cpp (revision 54625) -@@ -22,7 +22,6 @@ - - #include "../composite/ai.hpp" - #include "../actions.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - #include "../../map.hpp" - #include "../../resources.hpp" -Index: src/ai/testing/ca_testing_recruitment.cpp -=================================================================== ---- src/ai/testing/ca_testing_recruitment.cpp (revision 54624) -+++ src/ai/testing/ca_testing_recruitment.cpp (revision 54625) -@@ -25,7 +25,6 @@ - #include "../composite/rca.hpp" - #include "../composite/stage.hpp" - #include "../../gamestatus.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - #include "../../map.hpp" - #include "../../resources.hpp" -@@ -33,6 +32,7 @@ - #include "../../wml_exception.hpp" - #include "../../pathfind/pathfind.hpp" - -+#include <boost/foreach.hpp> - - #include <numeric> - #include <string> -@@ -206,7 +206,7 @@ - int get_current_qty(const std::string &name) const - { - int counter = 0; -- foreach(unit &un, *resources::units){ -+ BOOST_FOREACH(unit &un, *resources::units){ - if(un.side() == side() && un.type_id() == name) // @todo: is type_id good? - { - counter++; -@@ -345,7 +345,7 @@ - const int hitpoints_const = 100; - double score = 0; - double total_weight = 0; -- foreach(const unit &enemy_unit, *resources::units) -+ BOOST_FOREACH(const unit &enemy_unit, *resources::units) - { - if(enemy_unit.can_recruit() || !t.is_enemy(enemy_unit.side())) - { -@@ -358,13 +358,13 @@ - - score += compare_unit_types(info, *enemy_info) * weight; - } -- foreach(fake_team &enemy_team, fake_teams) -+ BOOST_FOREACH(fake_team &enemy_team, fake_teams) - { - if(!t.is_enemy(enemy_team.side())) - { - continue; - } -- foreach(const potential_recruit &enemy_unit, enemy_team.extra_units()) -+ BOOST_FOREACH(const potential_recruit &enemy_unit, enemy_team.extra_units()) - { - const unit_type *enemy_info = enemy_unit.type(); - VALIDATE(enemy_info, "Unknown unit type : " + enemy_unit.id() + " while updating recruit quality."); -@@ -386,7 +386,7 @@ - - /*static void update_recruit_qualities(fake_team &t, std::vector<fake_team> &fake_teams) - { -- foreach ( potential_recruit &recruit, t.recruit_list() ) -+ BOOST_FOREACH( potential_recruit &recruit, t.recruit_list() ) - { - double score = get_unit_quality(*recruit.type(),t,fake_teams); - recruit.set_quality(score); -@@ -425,11 +425,11 @@ - } - - std::map<std::string, int> current_units; -- foreach (const potential_recruit &i, t.extra_units()) -+ BOOST_FOREACH(const potential_recruit &i, t.extra_units()) - { - current_units[(i.id())]++; - } -- foreach (const unit &i, *resources::units) -+ BOOST_FOREACH(const unit &i, *resources::units) - { - if (i.side()==t.side()) - { -@@ -440,7 +440,7 @@ - double max_quality = recruit_list[0].quality(); - int max_cost = recruit_list[0].cost(); - std::vector<const potential_recruit*> sorted = std::vector<const potential_recruit*>(); -- foreach(const potential_recruit &i, recruit_list) -+ BOOST_FOREACH(const potential_recruit &i, recruit_list) - { - if(i.cost() > max_cost) - { -@@ -457,7 +457,7 @@ - potential_recruit_sorter sorter(max_cost, max_quality, quality_factor); - std::sort(sorted.begin(), sorted.end(), sorter); - int recruited = 0; -- foreach(const potential_recruit *i, sorted) -+ BOOST_FOREACH(const potential_recruit *i, sorted) - { - if(recruited < max_units_to_recruit) - { -@@ -488,7 +488,7 @@ - static void ai_choose_recruits(fake_team &t, int max_units_to_recruit, double quality_factor, bool counter_recruit) - { - std::vector<potential_recruit> recruits = ai_choose_best_recruits(t, max_units_to_recruit, quality_factor, counter_recruit); -- foreach(potential_recruit &i, recruits) { -+ BOOST_FOREACH(potential_recruit &i, recruits) { - t.fake_recruit(i); - } - -@@ -554,7 +554,7 @@ - //DBG_AI << "start of get_recruit_qualities" << std::endl; - typedef std::map<const unit_type*, std::vector<double> > unit_map; - unit_map enemies; -- foreach(unit &un, *resources::units){ -+ BOOST_FOREACH(unit &un, *resources::units){ - if(t.is_enemy(un.side()) && !un.can_recruit()){ - enemies[un.type()].push_back( - static_cast<double>(un.hitpoints()) -@@ -562,10 +562,10 @@ - } - } - DBG_AI << "before extra_units of fake_teams: enemies.size() = " << enemies.size() << std::endl; -- foreach(fake_team &tmp_t, fake_teams) -+ BOOST_FOREACH(fake_team &tmp_t, fake_teams) - { - if (t.is_enemy(tmp_t.side())) { -- foreach(potential_recruit &rec, tmp_t.extra_units()) -+ BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()) - { - enemies[rec.type()].push_back(1.0); - } -@@ -573,10 +573,10 @@ - } - DBG_AI << "after extra_units of fake_teams: enemies.size() = " << enemies.size() << std::endl; - -- foreach(potential_recruit &rec, recruit_list) { -+ BOOST_FOREACH(potential_recruit &rec, recruit_list) { - double score = 0; - double weighting = 0; -- foreach(unit_map::value_type &enemy, enemies) { -+ BOOST_FOREACH(unit_map::value_type &enemy, enemies) { - double hitpoints_sum = std::accumulate(enemy.second.begin(),enemy.second.end(),0); - score += compare_unit_types(*rec.type(), *enemy.first) * hitpoints_sum; - weighting += hitpoints_sum; -@@ -621,14 +621,14 @@ - { - std::vector<defender_pair_type*> defenders; - std::vector<enemy_pair_type*> enemies; -- foreach(unit &un, *resources::units) -+ BOOST_FOREACH(unit &un, *resources::units) - { - if(t.is_enemy(un.side())) - { - // const unit_type &enemy_type = *un.type(); - //enemy_pair_type *pair = new enemy_pair_type(new unit_data(un.id(), un.type())); - enemy_pair_type *pair = new enemy_pair_type(un.type()); -- foreach(unit &defender, *resources::units) -+ BOOST_FOREACH(unit &defender, *resources::units) - { - if(!t.is_enemy(defender.side())){ - //int score = compare_unit_types(*defender.type(), enemy_type); -@@ -639,9 +639,9 @@ - //} - } - } -- foreach(fake_team &tmp_t, fake_teams){ -+ BOOST_FOREACH(fake_team &tmp_t, fake_teams){ - if(!t.is_enemy(tmp_t.side())){ -- foreach(potential_recruit &rec, tmp_t.extra_units()){ -+ BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){ - // int score = compare_unit_types(*rec.type(), enemy_type); - // if(score >= 0){ - //pair->add_defender(new unit_data(rec.id(), rec.type())); -@@ -657,7 +657,7 @@ - //const unit_type &defender_type = *un.type(); - //defender_pair_type *pair = new defender_pair_type(new unit_data(un.id(), un.type())); - defender_pair_type *pair = new defender_pair_type(un.type()); -- foreach(unit &enemy, *resources::units) -+ BOOST_FOREACH(unit &enemy, *resources::units) - { - //int score = compare_unit_types(defender_type, *enemy.type()); - //if(score >= 0) -@@ -666,9 +666,9 @@ - pair->add_enemy(enemy.type()); - //} - } -- foreach(fake_team &tmp_t, fake_teams){ -+ BOOST_FOREACH(fake_team &tmp_t, fake_teams){ - if(t.is_enemy(tmp_t.side())){ -- foreach(potential_recruit &rec, tmp_t.extra_units()){ -+ BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){ - //int score = compare_unit_types(defender_type, *rec.type()); - //if(score >= 0){ - //pair->add_enemy(new unit_data(rec.id(), rec.type())); -@@ -680,14 +680,14 @@ - defenders.push_back(pair); - } - } -- foreach(fake_team &tmp_t, fake_teams) -+ BOOST_FOREACH(fake_team &tmp_t, fake_teams) - { -- foreach(potential_recruit &rec, tmp_t.extra_units()){ -+ BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){ - if(t.is_enemy(tmp_t.side())){ - //const unit_type &enemy_type = *rec.type(); - //enemy_pair_type *pair = new enemy_pair_type(new unit_data(rec.id(), rec.type())); - enemy_pair_type *pair = new enemy_pair_type(rec.type()); -- foreach(unit &defender, *resources::units){ -+ BOOST_FOREACH(unit &defender, *resources::units){ - if(t.is_enemy(defender.side())){ - continue; - } -@@ -698,11 +698,11 @@ - //} - } - //HIER -- foreach(fake_team &sub_t, fake_teams){ -+ BOOST_FOREACH(fake_team &sub_t, fake_teams){ - if(t.is_enemy(sub_t.side())){ - continue; - } -- foreach(potential_recruit &sub_rec, sub_t.extra_units()){ -+ BOOST_FOREACH(potential_recruit &sub_rec, sub_t.extra_units()){ - //int score = compare_unit_types(*sub_rec.type(), enemy_type); - //if(score >= 0){ - //pair->add_defender(new unit_data(sub_rec.id(), sub_rec.type())); -@@ -715,7 +715,7 @@ - //const unit_type &defender_type = *rec.type(); - //defender_pair_type *pair = new defender_pair_type(new unit_data(rec.id(), rec.type())); - defender_pair_type *pair = new defender_pair_type(rec.type()); -- foreach(unit &enemy, *resources::units) -+ BOOST_FOREACH(unit &enemy, *resources::units) - { - if(!t.is_enemy(enemy.side())){ - continue; -@@ -726,11 +726,11 @@ - pair->add_enemy(rec.type()); - // } - } -- foreach(fake_team &sub_t, fake_teams){ -+ BOOST_FOREACH(fake_team &sub_t, fake_teams){ - if(!t.is_enemy(sub_t.side())){ - continue; - } -- foreach(potential_recruit &sub_rec, sub_t.extra_units()){ -+ BOOST_FOREACH(potential_recruit &sub_rec, sub_t.extra_units()){ - // int score = compare_unit_types(defender_type, *sub_rec.type()); - // if(score >= 0){ - //pair->add_enemy(new unit_data(sub_rec.id(), sub_rec.type())); -@@ -744,17 +744,17 @@ - } - double min_score = 0; - double max_score = 0; -- foreach(enemy_pair_type *pair, enemies) -+ BOOST_FOREACH(enemy_pair_type *pair, enemies) - { - // if(pair->defenders.size() == 0) - // { - // pair->score = -10000; - // }else{ -- //foreach(unit_data *defender, pair->defenders) -- foreach(unit_type *defender, pair->defenders) -+ //BOOST_FOREACH(unit_data *defender, pair->defenders) -+ BOOST_FOREACH(unit_type *defender, pair->defenders) - { - unsigned int defender_enemies = 0; -- foreach(defender_pair_type *defender_p, defenders) -+ BOOST_FOREACH(defender_pair_type *defender_p, defenders) - { - //if(defender->id == defender_p->defender->id){ - if(defender->type_name()() == defender_p->defender->type_name()){ -@@ -778,7 +778,7 @@ - } - double score = 0; - score -= max_score - min_score; -- foreach(enemy_pair_type *pair, enemies) -+ BOOST_FOREACH(enemy_pair_type *pair, enemies) - { - score += pair->score; - } -@@ -798,16 +798,16 @@ - typedef std::map<const unit_type*, std::vector<double> > unit_map; - unit_map enemies; - unit_map defenders; -- foreach(unit &un, *resources::units){ -+ BOOST_FOREACH(unit &un, *resources::units){ - if(t.is_enemy(un.side())){ - enemies[un.type()].push_back((double)un.hitpoints() / (double)un.max_hitpoints()); - }else{ - defenders[un.type()].push_back(un.hitpoints() / un.max_hitpoints()); - } - } -- foreach(fake_team &tmp_t, fake_teams) -+ BOOST_FOREACH(fake_team &tmp_t, fake_teams) - { -- foreach(potential_recruit &rec, tmp_t.extra_units()) -+ BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()) - { - if(t.is_enemy(tmp_t.side())){ - enemies[rec.type()].push_back(1.0); -@@ -817,13 +817,13 @@ - } - } - double result = 0; -- foreach(unit_map::value_type &defender, defenders) -+ BOOST_FOREACH(unit_map::value_type &defender, defenders) - { - double defenders_score = 0; -- foreach(unit_map::value_type &enemy, enemies) -+ BOOST_FOREACH(unit_map::value_type &enemy, enemies) - { - double hitpoints_sum = 0; -- foreach(double i, enemy.second) -+ BOOST_FOREACH(double i, enemy.second) - { - hitpoints_sum += i; - } -@@ -831,7 +831,7 @@ - - } - double hitpoints_sum = 0; -- foreach(double i, defender.second) -+ BOOST_FOREACH(double i, defender.second) - { - hitpoints_sum += i; - } -@@ -842,7 +842,7 @@ - return result; - // vector<defender_pair> defenders; - // vector<enemy_pair> enemies; --// //foreach(unit &un, *resources::units) -+// //BOOST_FOREACH(unit &un, *resources::units) - // //{ - // // if(t.is_enemy(un.side())) - // // { -@@ -851,14 +851,14 @@ - // // defenders.push_back(un.id()); - // // } - // //} --// foreach(unit &un, *resources::units) -+// BOOST_FOREACH(unit &un, *resources::units) - // { - // if(t.is_enemy(un.side())) - // { - // const unit_type &enemy_type = un.type(); - // enemy_pair pair; - // pair.enemy = new unit_data(un.id(), enemy_type); --// foreach(unit &defender, *resources::units) -+// BOOST_FOREACH(unit &defender, *resources::units) - // { - // int score = compare_unit_types(defender.type(), enemy_type); - // if(score >= 0) -@@ -873,7 +873,7 @@ - // const unit_type &defender_type = un.type(); - // defender_pair pair; - // pair.defender = new unit_data(defender.id(), defender_type); --// foreach(unit &enemy, *resources::units) -+// BOOST_FOREACH(unit &enemy, *resources::units) - // { - // int score = compare_unit_types(defender_type, enemy.type()); - // if(score >= 0) -@@ -885,10 +885,10 @@ - // enemies.push_back(pair); - // } - // } --// foreach(fake_team &tmp_t, fake_teams) -+// BOOST_FOREACH(fake_team &tmp_t, fake_teams) - // { - // if(t.is_enemy(tmp_t.side())){ --// foreach(potential_recruit &rec, tmp_t.extra_units()) -+// BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()) - // { - // - // } -@@ -898,7 +898,7 @@ - // - // } - // //std::vector<unit> no_defense_enemies; --// foreach(enemy_pair &pair, enemies) -+// BOOST_FOREACH(enemy_pair &pair, enemies) - // { - // if(pair.defenders.size() == 0) - // { -@@ -906,11 +906,11 @@ - // - // pair.score = 0; - // }else{ --// foreach(unit_data &defender, pair.defenders) -+// BOOST_FOREACH(unit_data &defender, pair.defenders) - // { - // //unit_type &defender = defender_data.type; - // unsigned int defender_enemies = 0; --// foreach(defender_pair &defender_p, defenders) -+// BOOST_FOREACH(defender_pair &defender_p, defenders) - // { - // if(defender.id == defender_p.defender.id){ - // defender_enemies = defender_p.enemies.size(); -@@ -924,7 +924,7 @@ - // } - // //enemy_pair *worst_pair = &enemies[0]; - // double total_score = 0; --// foreach(enemy_pair &pair, enemies) -+// BOOST_FOREACH(enemy_pair &pair, enemies) - // { - // total_score += pair.score; - // } -@@ -936,7 +936,7 @@ - // //unit &worst_def_unit; - // vector<defender_pair> defenders; - // vector<enemy_pair> enemies; --// /*foreach(unit &un, *resources::units) -+// /*BOOST_FOREACH(unit &un, *resources::units) - // { - // if(t.is_enemy(un.side())) - // { -@@ -945,14 +945,14 @@ - // defenders.push_back(un.id()); - // } - // }*/ --// foreach(unit &un, *resources::units) -+// BOOST_FOREACH(unit &un, *resources::units) - // { - // if(t.is_enemy(un.side())) - // { - // const unit_type &enemy_type = un.type(); - // enemy_pair pair; - // pair.enemy = un; --// foreach(unit &defender, *resources::units) -+// BOOST_FOREACH(unit &defender, *resources::units) - // { - // int score = compare_unit_types(defender.type(), enemy_type); - // if(score >= 0) -@@ -967,7 +967,7 @@ - // const unit_type &defender_type = un.type(); - // defender_pair pair; - // pair.defender = un; --// foreach(unit &enemy, *resources::units) -+// BOOST_FOREACH(unit &enemy, *resources::units) - // { - // int score = compare_unit_types(defender_type, enemy.type()); - // if(score >= 0) -@@ -980,7 +980,7 @@ - // } - // } - // //std::vector<unit> no_defense_enemies; --// foreach(enemy_pair &pair, enemies) -+// BOOST_FOREACH(enemy_pair &pair, enemies) - // { - // if(pair.defenders.size() == 0) - // { -@@ -988,10 +988,10 @@ - // return pair.enemy; - // //pair.score = 0; - // }else{ --// foreach(unit &defender, pair.defenders) -+// BOOST_FOREACH(unit &defender, pair.defenders) - // { - // unsigned int defender_enemies = 0; --// foreach(defender_pair &defender_p, defenders) -+// BOOST_FOREACH(defender_pair &defender_p, defenders) - // { - // if(defender.id() == defender_p.defender.id()){ - // defender_enemies = defender_p.enemies.size(); -@@ -1004,7 +1004,7 @@ - // } - // } - // enemy_pair *worst_pair = &enemies[0]; --// foreach(enemy_pair &pair, enemies) -+// BOOST_FOREACH(enemy_pair &pair, enemies) - // { - // if(pair.score < worst_pair.score) - // { -@@ -1039,16 +1039,16 @@ - for(int recruited_amount = 0; recruited_amount < max_units_to_recruit; recruited_amount++) - { - -- foreach(fake_team &t, fake_teams) -+ BOOST_FOREACH(fake_team &t, fake_teams) - { - t.reset(); - } - - std::vector<potential_recruit> ai_recruit_list = ai_t->recruit_list(); - -- foreach(potential_recruit &recruit_type, ai_recruit_list) -+ BOOST_FOREACH(potential_recruit &recruit_type, ai_recruit_list) - { -- foreach(fake_team &t, fake_teams) -+ BOOST_FOREACH(fake_team &t, fake_teams) - { - t.reset(); - } -@@ -1063,7 +1063,7 @@ - } - LOG_AI << "Pretend that we recruited: " << recruit_type.id() << std::endl; - ai_t->fake_recruit(recruit_type); -- foreach(fake_team &t, fake_teams) -+ BOOST_FOREACH(fake_team &t, fake_teams) - { - if(ai_t->side() == t.side()) - { -Index: src/ai/testing/ca_global_fallback.cpp -=================================================================== ---- src/ai/testing/ca_global_fallback.cpp (revision 54624) -+++ src/ai/testing/ca_global_fallback.cpp (revision 54625) -@@ -25,7 +25,6 @@ - #include "../actions.hpp" - - #include "../../game_display.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - #include "../../map.hpp" - #include "../../map_label.hpp" -@@ -36,6 +35,7 @@ - #include "../../terrain_filter.hpp" - #include "../../tod_manager.hpp" - -+#include <boost/foreach.hpp> - - namespace ai { - -@@ -89,7 +89,7 @@ - LOG_AI << "start" << std::endl; - const int ticks = SDL_GetTicks(); - double res_sum = 0; -- foreach( unit &u, *resources::units) -+ BOOST_FOREACH( unit &u, *resources::units) - { - if (u.side()!=get_side()) - { -Index: src/ai/testing/stage_fallback.cpp -=================================================================== ---- src/ai/testing/stage_fallback.cpp (revision 54624) -+++ src/ai/testing/stage_fallback.cpp (revision 54625) -@@ -23,7 +23,6 @@ - #include "../configuration.hpp" - #include "../manager.hpp" - #include "../composite/ai.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - - namespace ai { -Index: src/ai/testing/ca.cpp -=================================================================== ---- src/ai/testing/ca.cpp (revision 54624) -+++ src/ai/testing/ca.cpp (revision 54625) -@@ -25,7 +25,6 @@ - #include "../composite/rca.hpp" - #include "../composite/stage.hpp" - #include "../../gamestatus.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - #include "../../map.hpp" - #include "../../resources.hpp" -@@ -33,6 +32,7 @@ - #include "../../wml_exception.hpp" - #include "../../pathfind/pathfind.hpp" - -+#include <boost/foreach.hpp> - - #include <numeric> - -@@ -306,7 +306,7 @@ - bool found = false; - // Find an available unit that can be recruited, - // matches the desired usage type, and comes in under budget. -- foreach (const std::string &name, current_team().recruits()) -+ BOOST_FOREACH(const std::string &name, current_team().recruits()) - { - const unit_type *ut = unit_types.find(name); - if (!ut) continue; -@@ -686,7 +686,7 @@ - possible_moves.insert(std::pair<map_location,pathfind::paths>(leader->get_location(), leader_paths)); - - map_location loc; -- foreach (const map_location &l, route.steps) -+ BOOST_FOREACH(const map_location &l, route.steps) - { - if (leader_paths.destinations.contains(l) && - power_projection(l, get_enemy_dstsrc()) < leader->hitpoints() * max_risk) -@@ -779,7 +779,7 @@ - // The leader can't move to his keep, try to move to the closest location - // to the keep where there are no enemies in range. - int current_distance = distance_between(leader->get_location(), keep); -- foreach (const pathfind::paths::step &dest, leader_paths.destinations) -+ BOOST_FOREACH(const pathfind::paths::step &dest, leader_paths.destinations) - { - if (!units_.find(dest.curr).valid()){ - const int new_distance = distance_between(dest.curr,keep); -@@ -1728,12 +1728,12 @@ - }*/ - //int leader_adj_count = 0; - std::vector<map_location> leaders_adj_v; -- foreach(unit_map::const_iterator leader, leaders){ -+ BOOST_FOREACH(unit_map::const_iterator leader, leaders){ - map_location tmp_leader_adj[6]; - get_adjacent_tiles(leader->get_location(), tmp_leader_adj); -- foreach(map_location &loc, tmp_leader_adj){ -+ BOOST_FOREACH(map_location &loc, tmp_leader_adj){ - bool found = false; -- foreach(map_location &new_loc, leaders_adj_v){ -+ BOOST_FOREACH(map_location &new_loc, leaders_adj_v){ - if(new_loc == loc){ - found = true; - break; -@@ -1974,7 +1974,7 @@ - } - std::vector<unit_map::unit_iterator> ai_leaders = resources::units->find_leaders(get_side()); - bool allied_leaders_available = false; -- foreach(team &tmp_team, *resources::teams){ -+ BOOST_FOREACH(team &tmp_team, *resources::teams){ - if(!current_team().is_enemy(tmp_team.side())){ - std::vector<unit_map::unit_iterator> allied_leaders = resources::units->find_leaders(get_side()); - if (!allied_leaders.empty()){ -@@ -2001,7 +2001,7 @@ - calculate_moves(*resources::units, possible_moves, friends_srcdst, friends_dstsrc, false, true); - - //check for each ai leader if he should move away from his keep -- foreach(unit_map::unit_iterator &ai_leader, ai_leaders){ -+ BOOST_FOREACH(unit_map::unit_iterator &ai_leader, ai_leaders){ - //only if leader is on a keep - if (!resources::game_map->is_keep(ai_leader->get_location())) { - continue; -@@ -2059,7 +2059,7 @@ - } - ai_leader->remove_movement_ai(); - } -- foreach(unit_map::unit_iterator &leader, ai_leaders){ -+ BOOST_FOREACH(unit_map::unit_iterator &leader, ai_leaders){ - leader->remove_movement_ai(); - } - //ERR_AI_TESTING_AI_DEFAULT << get_name() << ": evaluate - not yet implemented" << std::endl; -Index: src/ai/testing/stage_rca.cpp -=================================================================== ---- src/ai/testing/stage_rca.cpp (revision 54624) -+++ src/ai/testing/stage_rca.cpp (revision 54625) -@@ -25,10 +25,10 @@ - #include "../composite/engine.hpp" - #include "../composite/property_handler.hpp" - #include "../gamestate_observer.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - namespace ai { - -@@ -49,7 +49,7 @@ - void candidate_action_evaluation_loop::on_create() - { - //init the candidate actions -- foreach(const config &cfg_element, cfg_.child_range("candidate_action")){ -+ BOOST_FOREACH(const config &cfg_element, cfg_.child_range("candidate_action")){ - engine::parse_candidate_action_from_config(*this,cfg_element,back_inserter(candidate_actions_)); - } - -@@ -69,7 +69,7 @@ - config candidate_action_evaluation_loop::to_config() const - { - config cfg = stage::to_config(); -- foreach(candidate_action_ptr ca, candidate_actions_){ -+ BOOST_FOREACH(candidate_action_ptr ca, candidate_actions_){ - cfg.add_child("candidate_action",ca->to_config()); - } - return cfg; -@@ -88,7 +88,7 @@ - { - LOG_AI_TESTING_RCA_DEFAULT << "Starting candidate action evaluation loop for side "<< get_side() << std::endl; - -- foreach(candidate_action_ptr ca, candidate_actions_){ -+ BOOST_FOREACH(candidate_action_ptr ca, candidate_actions_){ - ca->enable(); - } - -@@ -103,7 +103,7 @@ - candidate_action_ptr best_ptr; - - //Evaluation -- foreach(candidate_action_ptr ca_ptr, candidate_actions_){ -+ BOOST_FOREACH(candidate_action_ptr ca_ptr, candidate_actions_){ - if (!ca_ptr->is_enabled()){ - DBG_AI_TESTING_RCA_DEFAULT << "Skipping disabled candidate action: "<< *ca_ptr << std::endl; - continue; -Index: src/ai/testing/aspect_attacks.cpp -=================================================================== ---- src/ai/testing/aspect_attacks.cpp (revision 54624) -+++ src/ai/testing/aspect_attacks.cpp (revision 54625) -@@ -22,7 +22,6 @@ - - #include "../manager.hpp" - #include "../../actions.hpp" --#include "../../foreach.hpp" - #include "../../log.hpp" - #include "../../map.hpp" - #include "../../team.hpp" -@@ -31,6 +30,8 @@ - #include "../../unit.hpp" - #include "../../pathfind/pathfind.hpp" - -+#include <boost/foreach.hpp> -+ - namespace ai { - - namespace testing_ai_default { -@@ -468,7 +469,7 @@ - // The 0.5 power avoids underestimating too much the damage of a wounded unit. - int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000); - int most_damage = 0; -- foreach (const attack_type &att, un.attacks()) -+ BOOST_FOREACH(const attack_type &att, un.attacks()) - { - int damage = att.damage() * att.num_attacks() * (100 + tod_modifier); - if (damage > most_damage) { -@@ -572,7 +573,7 @@ - // The 0.5 power avoids underestimating too much the damage of a wounded unit. - int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000); - int most_damage = 0; -- foreach (const attack_type &att, un.attacks()) -+ BOOST_FOREACH(const attack_type &att, un.attacks()) - { - int damage = att.damage() * att.num_attacks() * (100 + tod_modifier); - if (damage > most_damage) { -Index: src/play_controller.cpp -=================================================================== ---- src/play_controller.cpp (revision 54624) -+++ src/play_controller.cpp (revision 54625) -@@ -21,7 +21,6 @@ - - #include "play_controller.hpp" - #include "dialogs.hpp" --#include "foreach.hpp" - #include "game_events.hpp" - #include "gettext.hpp" - #include "halo.hpp" -@@ -46,6 +45,8 @@ - #include "whiteboard/manager.hpp" - #include "scripting/lua.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define LOG_NG LOG_STREAM(info, log_engine) - #define DBG_NG LOG_STREAM(debug, log_engine) -@@ -173,7 +174,7 @@ - place_sides_in_preferred_locations(); - } - -- foreach (const config &t, level_.child_range("time_area")) { -+ BOOST_FOREACH(const config &t, level_.child_range("time_area")) { - tod_manager_.add_time_area(t); - } - -@@ -192,7 +193,7 @@ - std::vector<team_builder_ptr> team_builders; - - int team_num = 0; -- foreach (const config &side, level_.child_range("side")) -+ BOOST_FOREACH(const config &side, level_.child_range("side")) - { - std::string save_id = get_unique_saveid(side, seen_save_ids); - seen_save_ids.insert(save_id); -@@ -212,7 +213,7 @@ - team_builders.push_back(tb_ptr); - } - -- foreach (team_builder_ptr tb_ptr, team_builders) -+ BOOST_FOREACH(team_builder_ptr tb_ptr, team_builders) - { - gamestate_.build_team_stage_two(tb_ptr); - } -@@ -337,7 +338,7 @@ - int num_pos = map_.num_valid_starting_positions(); - - int side_num = 1; -- foreach (const config &side, level_.child_range("side")) -+ BOOST_FOREACH(const config &side, level_.child_range("side")) - { - for(int p = 1; p <= num_pos; ++p) { - const map_location& pos = map_.starting_position(p); -@@ -703,7 +704,7 @@ - } - - // Write terrain_graphics data in snapshot, too -- foreach (const config &tg, level_.child_range("terrain_graphics")) { -+ BOOST_FOREACH(const config &tg, level_.child_range("terrain_graphics")) { - cfg.add_child("terrain_graphics", tg); - } - -@@ -914,7 +915,7 @@ - switch(mode) { - case gui::TEXTBOX_SEARCH: - { -- foreach (const unit &u, units_){ -+ BOOST_FOREACH(const unit &u, units_){ - const map_location& loc = u.get_location(); - if(!gui_->fogged(loc) && - !(teams_[gui_->viewing_team()].is_enemy(u.side()) && u.invisible(loc))) -@@ -931,13 +932,13 @@ - } - case gui::TEXTBOX_MESSAGE: - { -- foreach(const team& t, teams_) { -+ BOOST_FOREACH(const team& t, teams_) { - if(!t.is_empty()) - dictionary.insert(t.current_player()); - } - - // Add observers -- foreach(const std::string& o, gui_->observers()){ -+ BOOST_FOREACH(const std::string& o, gui_->observers()){ - dictionary.insert(o); - } - //Exclude own nick from tab-completion. -@@ -1341,7 +1342,7 @@ - - if (non_interactive()) { - std::cout << "winner: "; -- foreach (unsigned l, seen_leaders) { -+ BOOST_FOREACH(unsigned l, seen_leaders) { - std::string ai = ai::manager::get_active_ai_identifier_for_side(l); - if (ai.empty()) ai = "default ai"; - std::cout << l << " (using " << ai << ") "; -Index: src/unit_abilities.cpp -=================================================================== ---- src/unit_abilities.cpp (revision 54624) -+++ src/unit_abilities.cpp (revision 54625) -@@ -18,7 +18,6 @@ - * Manage unit-abilities, like heal, cure, and weapon_specials. - */ - --#include "foreach.hpp" - #include "gamestatus.hpp" - #include "log.hpp" - #include "resources.hpp" -@@ -27,6 +26,8 @@ - #include "team.hpp" - #include "unit_abilities.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define ERR_NG LOG_STREAM(err, log_engine) - -@@ -124,7 +125,7 @@ - { - if (const config &abilities = cfg_.child("abilities")) - { -- foreach (const config &i, abilities.child_range(ability)) { -+ BOOST_FOREACH(const config &i, abilities.child_range(ability)) { - if (ability_active(ability, i, loc) && - ability_affects_self(ability, i, loc)) - return true; -@@ -141,7 +142,7 @@ - const config &adj_abilities = it->cfg_.child("abilities"); - if (!adj_abilities) - continue; -- foreach (const config &j, adj_abilities.child_range(ability)) { -+ BOOST_FOREACH(const config &j, adj_abilities.child_range(ability)) { - if (unit_abilities::affects_side(j, teams_manager::get_teams(), side(), it->side()) && - it->ability_active(ability, j, adjacent[i]) && - ability_affects_adjacent(ability, j, i, loc)) -@@ -158,7 +159,7 @@ - - if (const config &abilities = cfg_.child("abilities")) - { -- foreach (const config &i, abilities.child_range(ability)) { -+ BOOST_FOREACH(const config &i, abilities.child_range(ability)) { - if (ability_active(ability, i, loc) && - ability_affects_self(ability, i, loc)) - res.cfgs.push_back(std::pair<const config *, map_location>(&i, loc)); -@@ -175,7 +176,7 @@ - const config &adj_abilities = it->cfg_.child("abilities"); - if (!adj_abilities) - continue; -- foreach (const config &j, adj_abilities.child_range(ability)) { -+ BOOST_FOREACH(const config &j, adj_abilities.child_range(ability)) { - if (unit_abilities::affects_side(j, teams_manager::get_teams(), side(), it->side()) && - it->ability_active(ability, j, adjacent[i]) && - ability_affects_adjacent(ability, j, i, loc)) -@@ -193,7 +194,7 @@ - - const config &abilities = cfg_.child("abilities"); - if (!abilities) return res; -- foreach (const config::any_child &ab, abilities.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range()) { - std::string const &id = ab.cfg["id"]; - if (!id.empty()) - res.push_back(id); -@@ -208,7 +209,7 @@ - const config &abilities = cfg_.child("abilities"); - if (!abilities) return res; - -- foreach (const config::any_child &ab, abilities.all_children_range()) -+ BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range()) - { - if (force_active || ability_active(ab.key, ab.cfg, loc_)) - { -@@ -265,9 +266,9 @@ - get_adjacent_tiles(loc,adjacent); - const unit_map& units = *resources::units; - -- foreach (const config &i, cfg.child_range("filter_adjacent")) -+ BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent")) - { -- foreach (const std::string &j, utils::split(i["adjacent"])) -+ BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"])) - { - map_location::DIRECTION index = - map_location::parse_direction(j); -@@ -282,9 +283,9 @@ - } - } - -- foreach (const config &i, cfg.child_range("filter_adjacent_location")) -+ BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent_location")) - { -- foreach (const std::string &j, utils::split(i["adjacent"])) -+ BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"])) - { - map_location::DIRECTION index = map_location::parse_direction(j); - if (index == map_location::NDIRECTIONS) { -@@ -310,7 +311,7 @@ - - assert(dir >=0 && dir <= 5); - static const std::string adjacent_names[6] = {"n","ne","se","s","sw","nw"}; -- foreach (const config &i, cfg.child_range("affect_adjacent")) -+ BOOST_FOREACH(const config &i, cfg.child_range("affect_adjacent")) - { - std::vector<std::string> dirs = utils::split(i["adjacent"]); - if(std::find(dirs.begin(),dirs.end(),adjacent_names[dir]) != dirs.end()) { -@@ -366,7 +367,7 @@ - int flat = 0; - int stack = 0; - typedef std::pair<const config *, map_location> pt; -- foreach (pt const &p, cfgs) -+ BOOST_FOREACH(pt const &p, cfgs) - { - int value = (*p.first)[key].to_int(def); - if ((*p.first)["cumulative"].to_bool()) { -@@ -398,7 +399,7 @@ - int flat = 0; - int stack = 0; - typedef std::pair<const config *, map_location> pt; -- foreach (pt const &p, cfgs) -+ BOOST_FOREACH(pt const &p, cfgs) - { - int value = (*p.first)[key].to_int(def); - if ((*p.first)["cumulative"].to_bool()) { -@@ -448,7 +449,7 @@ - namespace { - bool get_special_children(std::vector<const config*>& result, const config& parent, - const std::string& id, bool just_peeking=false) { -- foreach (const config::any_child &sp, parent.all_children_range()) -+ BOOST_FOREACH(const config::any_child &sp, parent.all_children_range()) - { - if (sp.key == id || sp.cfg["id"] == id) { - if(just_peeking) { -@@ -495,7 +496,7 @@ - unit_ability_list res; - if (const config &specials = cfg_.child("specials")) - { -- foreach (const config &i, specials.child_range(special)) { -+ BOOST_FOREACH(const config &i, specials.child_range(special)) { - if (special_active(i, true)) - res.cfgs.push_back(std::pair<const config *, map_location> - (&i, attacker_ ? aloc_ : dloc_)); -@@ -504,7 +505,7 @@ - if (!other_attack_) return res; - if (const config &specials = other_attack_->cfg_.child("specials")) - { -- foreach (const config &i, specials.child_range(special)) { -+ BOOST_FOREACH(const config &i, specials.child_range(special)) { - if (other_attack_->special_active(i, false)) - res.cfgs.push_back(std::pair<const config *, map_location> - (&i, attacker_ ? dloc_ : aloc_)); -@@ -519,7 +520,7 @@ - const config &specials = cfg_.child("specials"); - if (!specials) return res; - -- foreach (const config::any_child &sp, specials.all_children_range()) -+ BOOST_FOREACH(const config::any_child &sp, specials.all_children_range()) - { - if (force || special_active(sp.cfg, true)) { - const t_string &name = sp.cfg["name"]; -@@ -544,7 +545,7 @@ - const config &specials = cfg_.child("specials"); - if (!specials) return res; - -- foreach (const config::any_child &sp, specials.all_children_range()) -+ BOOST_FOREACH(const config::any_child &sp, specials.all_children_range()) - { - char const *s = force || special_active(sp.cfg, true) ? - "name" : "name_inactive"; -@@ -679,9 +680,9 @@ - get_adjacent_tiles(dloc_,adjacent); - } - -- foreach (const config &i, cfg.child_range("filter_adjacent")) -+ BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent")) - { -- foreach (const std::string &j, utils::split(i["adjacent"])) -+ BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"])) - { - map_location::DIRECTION index = - map_location::parse_direction(j); -@@ -694,9 +695,9 @@ - } - } - -- foreach (const config &i, cfg.child_range("filter_adjacent_location")) -+ BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent_location")) - { -- foreach (const std::string &j, utils::split(i["adjacent"])) -+ BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"])) - { - map_location::DIRECTION index = - map_location::parse_direction(j); -Index: src/video.cpp -=================================================================== ---- src/video.cpp (revision 54624) -+++ src/video.cpp (revision 54625) -@@ -21,7 +21,6 @@ - #include "global.hpp" - - #include "font.hpp" --#include "foreach.hpp" - #include "image.hpp" - #include "log.hpp" - #include "preferences.hpp" -@@ -29,6 +28,8 @@ - #include "sdl_utils.hpp" - #include "video.hpp" - -+#include <boost/foreach.hpp> -+ - #include <vector> - #include <map> - #include <algorithm> -@@ -105,7 +106,7 @@ - { - events.clear(); - -- foreach (SDL_Rect const &rect, update_rects) { -+ BOOST_FOREACH(SDL_Rect const &rect, update_rects) { - events.push_back(event(rect, true)); - events.push_back(event(rect, false)); - } -@@ -354,7 +355,7 @@ - int CVideo::bppForMode( int x, int y, int flags) - { - int test_values[3] = {getBpp(), 32, 16}; -- foreach(int &bpp, test_values) { -+ BOOST_FOREACH(int &bpp, test_values) { - if(modePossible(x, y, bpp, flags) > 0) { - return bpp; - } -Index: src/tools/schema/tag.cpp -=================================================================== ---- src/tools/schema/tag.cpp (revision 54624) -+++ src/tools/schema/tag.cpp (revision 54625) -@@ -21,7 +21,9 @@ - #include "tools/schema/tag.hpp" - - #include "config.hpp" --#include "foreach.hpp" -+ -+#include <boost/foreach.hpp> -+ - namespace schema_validation{ - - /*WIKI -@@ -81,15 +83,15 @@ - if (cfg.has_attribute("super")){ - super_ = cfg["super"].str(); - } -- foreach (const config &child, cfg.child_range("tag")) { -+ BOOST_FOREACH(const config &child, cfg.child_range("tag")) { - class_tag child_tag (child); - add_tag(child_tag); - } -- foreach (const config &child, cfg.child_range("key")) { -+ BOOST_FOREACH(const config &child, cfg.child_range("key")) { - class_key child_key (child); - add_key(child_key); - } -- foreach (const config &link, cfg.child_range("link")) { -+ BOOST_FOREACH(const config &link, cfg.child_range("link")) { - std::string link_name = link["name"].str(); - add_link(link_name); - } -Index: src/tools/exploder_cutter.cpp -=================================================================== ---- src/tools/exploder_cutter.cpp (revision 54624) -+++ src/tools/exploder_cutter.cpp (revision 54625) -@@ -15,12 +15,13 @@ - - #include "exploder_cutter.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "serialization/parser.hpp" - #include "serialization/preprocessor.hpp" - #include "serialization/string_utils.hpp" - #include "SDL_image.h" - -+#include <boost/foreach.hpp> -+ - #include <iostream> - - cutter::cutter() -@@ -48,7 +49,7 @@ - - void cutter::load_masks(const config& conf) - { -- foreach (const config &m, conf.child_range("mask")) -+ BOOST_FOREACH(const config &m, conf.child_range("mask")) - { - const std::string name = m["name"]; - const std::string image = get_mask_dir() + "/" + std::string(m["image"]); -@@ -94,7 +95,7 @@ - { - surface_map res; - -- foreach (const config &part, conf.child_range("part")) { -+ BOOST_FOREACH(const config &part, conf.child_range("part")) { - add_sub_image(surf, res, &part); - } - -Index: src/builder.cpp -=================================================================== ---- src/builder.cpp (revision 54624) -+++ src/builder.cpp (revision 54625) -@@ -20,13 +20,14 @@ - - #include "builder.hpp" - --#include "foreach.hpp" - #include "loadscreen.hpp" - #include "log.hpp" - #include "map.hpp" - #include "serialization/string_utils.hpp" - #include "image.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define ERR_NG LOG_STREAM(err, log_engine) - #define WRN_NG LOG_STREAM(warn, log_engine) -@@ -65,12 +66,12 @@ - sorted_images = true; - } - -- foreach(const rule_image_rand& ri, images){ -+ BOOST_FOREACH(const rule_image_rand& ri, images){ - bool is_background = ri->is_background(); - - imagelist& img_list = is_background ? images_background : images_foreground; - -- foreach(const rule_image_variant& variant, ri->variants){ -+ BOOST_FOREACH(const rule_image_variant& variant, ri->variants){ - if(!variant.tods.empty() && variant.tods.find(tod) == variant.tods.end()) - continue; - -@@ -250,12 +251,12 @@ - - tile& btile = tile_map_[loc]; - -- foreach(animated<image::locator>& a, btile.images_background) { -+ BOOST_FOREACH(animated<image::locator>& a, btile.images_background) { - if(a.need_update()) - changed = true; - a.update_last_draw_time(); - } -- foreach(animated<image::locator>& a, btile.images_foreground) { -+ BOOST_FOREACH(animated<image::locator>& a, btile.images_foreground) { - if(a.need_update()) - changed = true; - a.update_last_draw_time(); -@@ -326,7 +327,7 @@ - } - std::vector<std::string> vars = utils::split(variations, ';', 0); - -- foreach(const std::string& v, vars){ -+ BOOST_FOREACH(const std::string& v, vars){ - res.push_back(base); - std::string::size_type pos = 0; - while ((pos = res.back().find("@V", pos)) != std::string::npos) { -@@ -345,21 +346,21 @@ - - // Parse images and animations data - // If one is not valid, return false. -- foreach(terrain_constraint &constraint, rule.constraints) -+ BOOST_FOREACH(terrain_constraint &constraint, rule.constraints) - { -- foreach(rule_image& ri, constraint.images) -+ BOOST_FOREACH(rule_image& ri, constraint.images) - { -- foreach(rule_image_variant& variant, ri.variants) -+ BOOST_FOREACH(rule_image_variant& variant, ri.variants) - { - - std::vector<std::string> var_strings = get_variations(variant.image_string, variant.variations); -- foreach(const std::string& var, var_strings) -+ BOOST_FOREACH(const std::string& var, var_strings) - { - /** @todo improve this, 99% of terrains are not animated. */ - std::vector<std::string> frames = utils::parenthetical_split(var,','); - animated<image::locator> res; - -- foreach(const std::string& frame, frames) -+ BOOST_FOREACH(const std::string& frame, frames) - { - const std::vector<std::string> items = utils::split(frame, ':'); - const std::string& str = items.front(); -@@ -499,7 +500,7 @@ - void terrain_builder::replace_rotate_tokens(rule_image &image, int angle, - const std::vector<std::string> &replacement) - { -- foreach(rule_image_variant& variant, image.variants) { -+ BOOST_FOREACH(rule_image_variant& variant, image.variants) { - replace_rotate_tokens(variant, angle, replacement); - } - } -@@ -507,7 +508,7 @@ - void terrain_builder::replace_rotate_tokens(rule_imagelist &list, int angle, - const std::vector<std::string> &replacement) - { -- foreach (rule_image &img, list) { -+ BOOST_FOREACH(rule_image &img, list) { - replace_rotate_tokens(img, angle, replacement); - } - } -@@ -515,16 +516,16 @@ - void terrain_builder::replace_rotate_tokens(building_rule &rule, int angle, - const std::vector<std::string> &replacement) - { -- foreach (terrain_constraint &cons, rule.constraints) -+ BOOST_FOREACH(terrain_constraint &cons, rule.constraints) - { - // Transforms attributes -- foreach (std::string &flag, cons.set_flag) { -+ BOOST_FOREACH(std::string &flag, cons.set_flag) { - replace_rotate_tokens(flag, angle, replacement); - } -- foreach (std::string &flag, cons.no_flag) { -+ BOOST_FOREACH(std::string &flag, cons.no_flag) { - replace_rotate_tokens(flag, angle, replacement); - } -- foreach (std::string &flag, cons.has_flag) { -+ BOOST_FOREACH(std::string &flag, cons.has_flag) { - replace_rotate_tokens(flag, angle, replacement); - } - replace_rotate_tokens(cons.images, angle, replacement); -@@ -541,7 +542,7 @@ - return; - } - -- foreach (terrain_constraint &cons, ret.constraints) { -+ BOOST_FOREACH(terrain_constraint &cons, ret.constraints) { - rotate(cons, angle); - } - -@@ -549,7 +550,7 @@ - int minx = INT_MAX; - int miny = INT_MAX; - -- foreach (const terrain_constraint &cons, ret.constraints) { -+ BOOST_FOREACH(const terrain_constraint &cons, ret.constraints) { - minx = std::min<int>(cons.loc.x, minx); - miny = std::min<int>(2 * cons.loc.y + (cons.loc.x & 1), miny); - } -@@ -559,7 +560,7 @@ - if(!(miny & 1) && (minx & 1) && (minx > 0)) - miny -= 2; - -- foreach (terrain_constraint &cons, ret.constraints) { -+ BOOST_FOREACH(terrain_constraint &cons, ret.constraints) { - cons.loc.legacy_sum_assign(map_location(-minx, -((miny - 1) / 2))); - } - -@@ -581,7 +582,7 @@ - - void terrain_builder::add_images_from_config(rule_imagelist& images, const config &cfg, bool global, int dx, int dy) - { -- foreach (const config &img, cfg.child_range("image")) -+ BOOST_FOREACH(const config &img, cfg.child_range("image")) - { - int layer = img["layer"]; - -@@ -606,7 +607,7 @@ - images.push_back(rule_image(layer, basex - dx, basey - dy, global, center_x, center_y)); - - // Adds the other variants of the image -- foreach (const config &variant, img.child_range("variant")) -+ BOOST_FOREACH(const config &variant, img.child_range("variant")) - { - const std::string &name = variant["name"]; - const std::string &variations = img["variations"]; -@@ -631,7 +632,7 @@ - const t_translation::t_match& type, const config& global_images) - { - terrain_constraint *cons = NULL; -- foreach (terrain_constraint &c, constraints) { -+ BOOST_FOREACH(terrain_constraint &c, constraints) { - if (c.loc == loc) { - cons = &c; - break; -@@ -769,7 +770,7 @@ - log_scope("terrain_builder::parse_config"); - - // Parses the list of building rules (BRs) -- foreach (const config &br, cfg.child_range("terrain_graphics")) -+ BOOST_FOREACH(const config &br, cfg.child_range("terrain_graphics")) - { - building_rule pbr; // Parsed Building rule - pbr.local = local; -@@ -788,7 +789,7 @@ - parse_mapstring(br["map"], pbr, anchors, br); - - // Parses the terrain constraints (TCs) -- foreach (const config &tc, br.child_range("tile")) -+ BOOST_FOREACH(const config &tc, br.child_range("tile")) - { - // Adds the terrain constraint to the current built terrain's list - // of terrain constraints, if it does not exist. -@@ -831,7 +832,7 @@ - const std::vector<std::string> global_has_flag = utils::split(br["has_flag"]); - const std::vector<std::string> global_set_no_flag = utils::split(br["set_no_flag"]); - -- foreach (terrain_constraint &constraint, pbr.constraints) -+ BOOST_FOREACH(terrain_constraint &constraint, pbr.constraints) - { - constraint.set_flag.insert(constraint.set_flag.end(), - global_set_flag.begin(), global_set_flag.end()); -@@ -925,7 +926,7 @@ - } - } - -- foreach (const terrain_constraint &cons, rule.constraints) -+ BOOST_FOREACH(const terrain_constraint &cons, rule.constraints) - { - // Translated location - const map_location tloc = loc.legacy_sum(cons.loc); -@@ -943,13 +944,13 @@ - - const std::set<std::string> &flags = tile_map_[tloc].flags; - -- foreach (const std::string &s, cons.no_flag) { -+ BOOST_FOREACH(const std::string &s, cons.no_flag) { - // If a flag listed in "no_flag" is present, the rule does not match - if (flags.find(s) != flags.end()) { - return false; - } - } -- foreach (const std::string &s, cons.has_flag) { -+ BOOST_FOREACH(const std::string &s, cons.has_flag) { - // If a flag listed in "has_flag" is not present, this rule does not match - if (flags.find(s) == flags.end()) { - return false; -@@ -964,7 +965,7 @@ - { - unsigned int rand_seed = get_noise(loc, rule.get_hash()); - -- foreach (const terrain_constraint &constraint, rule.constraints) -+ BOOST_FOREACH(const terrain_constraint &constraint, rule.constraints) - { - const map_location tloc = loc.legacy_sum(constraint.loc); - if(!tile_map_.on_map(tloc)) { -@@ -973,12 +974,12 @@ - - tile& btile = tile_map_[tloc]; - -- foreach (const rule_image &img, constraint.images) { -+ BOOST_FOREACH(const rule_image &img, constraint.images) { - btile.images.push_back(tile::rule_image_rand(&img, rand_seed)); - } - - // Sets flags -- foreach (const std::string &flag, constraint.set_flag) { -+ BOOST_FOREACH(const std::string &flag, constraint.set_flag) { - btile.flags.insert(flag); - } - -@@ -1001,9 +1002,9 @@ - if(hash_ != DUMMY_HASH) - return hash_; - -- foreach(const terrain_constraint &constraint, constraints) { -- foreach(const rule_image& ri, constraint.images) { -- foreach(const rule_image_variant& variant, ri.variants) { -+ BOOST_FOREACH(const terrain_constraint &constraint, constraints) { -+ BOOST_FOREACH(const rule_image& ri, constraint.images) { -+ BOOST_FOREACH(const rule_image_variant& variant, ri.variants) { - // we will often hash the same string, but that seems fast enough - hash_ += hash_str(variant.image_string); - } -@@ -1031,7 +1032,7 @@ - } - } - -- foreach (const building_rule &rule, building_rules_) -+ BOOST_FOREACH(const building_rule &rule, building_rules_) - { - // Find the constraint that contains the less terrain of all terrain rules. - // We will keep a track of the matching terrains of this constraint -@@ -1040,7 +1041,7 @@ - t_translation::t_list min_types; - const terrain_constraint *min_constraint = NULL; - -- foreach (const terrain_constraint &constraint, rule.constraints) -+ BOOST_FOREACH(const terrain_constraint &constraint, rule.constraints) - { - const t_translation::t_match& match = constraint.terrain_types_match; - t_translation::t_list matching_types; -Index: src/game_config.cpp -=================================================================== ---- src/game_config.cpp (revision 54624) -+++ src/game_config.cpp (revision 54625) -@@ -18,7 +18,6 @@ - - #include "color_range.hpp" - #include "config.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "log.hpp" - #include "util.hpp" -@@ -29,6 +28,8 @@ - #include "revision.hpp" - #endif /* HAVE_REVISION */ - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define DBG_NG LOG_STREAM(debug, log_engine) - #define ERR_NG LOG_STREAM(err, log_engine) -@@ -259,7 +260,7 @@ - } - - server_list.clear(); -- foreach (const config &server, v.child_range("server")) -+ BOOST_FOREACH(const config &server, v.child_range("server")) - { - server_info sinf; - sinf.name = server["name"].str(); -@@ -270,7 +271,7 @@ - - void add_color_info(const config &v) - { -- foreach (const config &teamC, v.child_range("color_range")) -+ BOOST_FOREACH(const config &teamC, v.child_range("color_range")) - { - const config::attribute_value *a1 = teamC.get("id"), - *a2 = teamC.get("rgb"); -@@ -304,9 +305,9 @@ - DBG_NG << str.str() << '\n'; - } - -- foreach (const config &cp, v.child_range("color_palette")) -+ BOOST_FOREACH(const config &cp, v.child_range("color_palette")) - { -- foreach (const config::attribute &rgb, cp.attribute_range()) -+ BOOST_FOREACH(const config::attribute &rgb, cp.attribute_range()) - { - std::vector<Uint32> temp; - if(!string2rgb(rgb.second, temp)) { -Index: src/whiteboard/recall.cpp -=================================================================== ---- src/whiteboard/recall.cpp (revision 54624) -+++ src/whiteboard/recall.cpp (revision 54625) -@@ -24,7 +24,6 @@ - #include "utility.hpp" - #include "visitor.hpp" - --#include "foreach.hpp" - #include "game_display.hpp" - #include "menu_events.hpp" - #include "play_controller.hpp" -@@ -32,6 +31,8 @@ - #include "team.hpp" - #include "unit.hpp" - -+#include <boost/foreach.hpp> -+ - namespace wb - { - -@@ -71,7 +72,7 @@ - { - // Construct and validate temp_unit_ - size_t underlying_id = cfg["temp_unit_"]; -- foreach(unit const& recall_unit, resources::teams->at(team_index()).recall_list()) -+ BOOST_FOREACH(unit const& recall_unit, resources::teams->at(team_index()).recall_list()) - { - if(recall_unit.underlying_id()==underlying_id) - { -Index: src/whiteboard/utility.cpp -=================================================================== ---- src/whiteboard/utility.cpp (revision 54624) -+++ src/whiteboard/utility.cpp (revision 54625) -@@ -22,7 +22,6 @@ - #include "manager.hpp" - - #include "actions.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "map.hpp" - #include "play_controller.hpp" -@@ -30,6 +29,8 @@ - #include "team.hpp" - #include "unit.hpp" - -+#include <boost/foreach.hpp> -+ - namespace wb { - - size_t viewer_team() -@@ -60,7 +61,7 @@ - { - assert(leader.can_recruit()); - assert(resources::game_map->is_keep(leader.get_location())); -- foreach(unit const& unit, *resources::units) -+ BOOST_FOREACH(unit const& unit, *resources::units) - { - if (unit.can_recruit() && - resources::game_map->is_keep(unit.get_location()) && -@@ -83,7 +84,7 @@ - if(!map.is_castle(hex)) - return NULL; - -- foreach(unit& u, *resources::units) -+ BOOST_FOREACH(unit& u, *resources::units) - if(u.can_recruit() - && u.side() == static_cast<int>(team_index+1) - && can_recruit_on(map,u.get_location(),hex)) -@@ -124,7 +125,7 @@ - - int result = 0; - gamemap const& map = *resources::game_map; -- foreach(map_location const& loc, std::make_pair(path.begin()+1,path.end())) -+ BOOST_FOREACH(map_location const& loc, std::make_pair(path.begin()+1,path.end())) - result += u.movement_cost(map[loc]); - return result; - } -@@ -149,7 +150,7 @@ - - bool has_actions() - { -- foreach(team& t, *resources::teams) -+ BOOST_FOREACH(team& t, *resources::teams) - if (!t.get_side_actions()->empty()) - return true; - -Index: src/whiteboard/visitor.hpp -=================================================================== ---- src/whiteboard/visitor.hpp (revision 54624) -+++ src/whiteboard/visitor.hpp (revision 54625) -@@ -33,11 +33,11 @@ - #include "action.hpp" - #include "side_actions.hpp" - --#include "foreach.hpp" - #include "play_controller.hpp" - #include "resources.hpp" - - #include <boost/noncopyable.hpp> -+#include <boost/foreach.hpp> - - namespace wb - { -@@ -81,7 +81,7 @@ - - //Determine how many turns' worth of plans there are - size_t max_turns = 0; -- foreach(team& t, *resources::teams) -+ BOOST_FOREACH(team& t, *resources::teams) - max_turns = std::max(max_turns,t.get_side_actions()->num_turns()); - - size_t const current_team = resources::controller->current_side() - 1; -Index: src/whiteboard/side_actions.cpp -=================================================================== ---- src/whiteboard/side_actions.cpp (revision 54624) -+++ src/whiteboard/side_actions.cpp (revision 54625) -@@ -31,12 +31,13 @@ - #include "validate_visitor.hpp" - - #include "actions.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_end_exceptions.hpp" - #include "map.hpp" - #include "resources.hpp" - -+#include <boost/foreach.hpp> -+ - #include <set> - #include <sstream> - -@@ -48,13 +49,13 @@ - { - s << "Content of side_actions:"; - int turn = 1; -- foreach(action_queue const& turn_queue, side_actions.actions()) -+ BOOST_FOREACH(action_queue const& turn_queue, side_actions.actions()) - { - s << "\n Turn " << turn; - ++turn; - - int count = 1; -- foreach(action_ptr const& action, turn_queue) -+ BOOST_FOREACH(action_ptr const& action, turn_queue) - { - s << "\n (" << count << ") " << action; - ++count; -@@ -114,7 +115,7 @@ - main_number = index; - } - -- foreach(weak_action_ptr action, highlighter->get_secondary_highlights()) -+ BOOST_FOREACH(weak_action_ptr action, highlighter->get_secondary_highlights()) - { - if (action.lock() == *it) - { -@@ -199,7 +200,7 @@ - size_t side_actions::size() const - { - size_t result = 0; -- foreach(action_queue const& queue, actions_) -+ BOOST_FOREACH(action_queue const& queue, actions_) - result += queue.size(); - return result; - } -@@ -234,7 +235,7 @@ - return; - } - -- foreach(action_ptr act, *this) -+ BOOST_FOREACH(action_ptr act, *this) - act->hide(); - } - void side_actions::show() -@@ -244,7 +245,7 @@ - - hidden_ = false; - -- foreach(action_ptr act, *this) -+ BOOST_FOREACH(action_ptr act, *this) - act->show(); - } - -@@ -507,7 +508,7 @@ - size_t side_actions::count_actions_of(unit const* unit) - { - size_t count = 0; -- foreach(action_ptr action, *this) -+ BOOST_FOREACH(action_ptr action, *this) - { - if (action->get_unit() == unit) - { -@@ -783,7 +784,7 @@ - else if(type=="refresh") - { - safe_clear(); -- foreach(net_cmd const& sub_cmd, cmd.child_range("net_cmd")) -+ BOOST_FOREACH(net_cmd const& sub_cmd, cmd.child_range("net_cmd")) - execute_net_cmd(sub_cmd); - } - else -@@ -890,7 +891,7 @@ - - //find units who still have plans for turn 0 (i.e. were too lazy to finish their jobs) - std::set<unit const*> lazy_units; -- foreach(action_ptr const& act, iter_turn(0)) -+ BOOST_FOREACH(action_ptr const& act, iter_turn(0)) - { - unit const* u = act->get_unit(); - if(u) -@@ -913,7 +914,7 @@ - } - - //push any remaining first-turn plans into the second turn -- foreach(action_ptr act, actions_.front()) -+ BOOST_FOREACH(action_ptr act, actions_.front()) - actions_[1].push_front(act); - actions_.front().clear(); - -Index: src/whiteboard/move.cpp -=================================================================== ---- src/whiteboard/move.cpp (revision 54624) -+++ src/whiteboard/move.cpp (revision 54625) -@@ -26,7 +26,6 @@ - - #include "arrow.hpp" - #include "config.hpp" --#include "foreach.hpp" - #include "game_end_exceptions.hpp" - #include "mouse_events.hpp" - #include "play_controller.hpp" -@@ -37,6 +36,8 @@ - #include "unit_display.hpp" - #include "unit_map.hpp" - -+#include <boost/foreach.hpp> -+ - namespace wb { - - std::ostream& operator<<(std::ostream &s, move_ptr move) -@@ -108,10 +109,10 @@ - if(!route_cfg) - throw action::ctor_err("move: Invalid route_"); - route_->move_cost = route_cfg["move_cost"]; -- foreach(config const& loc_cfg, route_cfg.child_range("step")) { -+ BOOST_FOREACH(config const& loc_cfg, route_cfg.child_range("step")) { - route_->steps.push_back(map_location(loc_cfg["x"],loc_cfg["y"])); - } -- foreach(config const& mark_cfg, route_cfg.child_range("mark")) { -+ BOOST_FOREACH(config const& mark_cfg, route_cfg.child_range("mark")) { - route_->marks[map_location(mark_cfg["x"],mark_cfg["y"])] - = pathfind::marked_route::mark(mark_cfg["turns"],mark_cfg["zoc"],mark_cfg["capture"],mark_cfg["invisible"]); - } -@@ -470,7 +471,7 @@ - //Serialize route_ - config route_cfg; - route_cfg["move_cost"]=route_->move_cost; -- foreach(map_location const& loc, route_->steps) -+ BOOST_FOREACH(map_location const& loc, route_->steps) - { - config loc_cfg; - loc_cfg["x"]=loc.x; -@@ -478,7 +479,7 @@ - route_cfg.add_child("step",loc_cfg); - } - typedef std::pair<map_location,pathfind::marked_route::mark> pair_loc_mark; -- foreach(pair_loc_mark const& item, route_->marks) -+ BOOST_FOREACH(pair_loc_mark const& item, route_->marks) - { - config mark_cfg; - mark_cfg["x"]=item.first.x; -Index: src/whiteboard/validate_visitor.cpp -=================================================================== ---- src/whiteboard/validate_visitor.cpp (revision 54624) -+++ src/whiteboard/validate_visitor.cpp (revision 54625) -@@ -28,12 +28,13 @@ - #include "utility.hpp" - - #include "arrow.hpp" --#include "foreach.hpp" - #include "pathfind/pathfind.hpp" - #include "play_controller.hpp" - #include "resources.hpp" - #include "team.hpp" - -+#include <boost/foreach.hpp> -+ - namespace wb - { - -@@ -60,7 +61,7 @@ - { - int side_actions_size_before = viewer_actions_.size(); - LOG_WB << "Erasing " << actions_to_erase_.size() << " invalid actions.\n"; -- foreach(action_ptr action, actions_to_erase_) -+ BOOST_FOREACH(action_ptr action, actions_to_erase_) - { - viewer_actions_.remove_action(viewer_actions_.get_position_of(action), false); - } -Index: src/whiteboard/manager.cpp -=================================================================== ---- src/whiteboard/manager.cpp (revision 54624) -+++ src/whiteboard/manager.cpp (revision 54625) -@@ -32,7 +32,6 @@ - #include "actions.hpp" - #include "arrow.hpp" - #include "chat_events.hpp" --#include "foreach.hpp" - #include "formula_string_utils.hpp" - #include "game_preferences.hpp" - #include "gettext.hpp" -@@ -47,6 +46,8 @@ - #include "unit_display.hpp" - - #include <boost/lexical_cast.hpp> -+#include <boost/foreach.hpp> -+ - #include <sstream> - - namespace wb { -@@ -268,7 +269,7 @@ - } - - //Look for planned recruits that depend on this leader -- foreach(action_const_ptr action, *viewer_actions()) -+ BOOST_FOREACH(action_const_ptr action, *viewer_actions()) - { - recruit_const_ptr recruit = boost::dynamic_pointer_cast<class recruit const>(action); - recall_const_ptr recall = boost::dynamic_pointer_cast<class recall const>(action); -@@ -332,7 +333,7 @@ - - static void hide_all_plans() - { -- foreach(team& t, *resources::teams) -+ BOOST_FOREACH(team& t, *resources::teams) - t.get_side_actions()->hide(); - } - -@@ -344,7 +345,7 @@ - hide_all_plans(); - else //< normal circumstance - { -- foreach(team& t, *resources::teams) -+ BOOST_FOREACH(team& t, *resources::teams) - { - //make sure only appropriate teams are hidden - if(!t.is_network_human()) -@@ -498,7 +499,7 @@ - if (can_modify_game_state() && has_actions()) - { - units_owning_moves_ = move_owners_finder().get_units_owning_moves(); -- foreach(size_t unit_id, units_owning_moves_) -+ BOOST_FOREACH(size_t unit_id, units_owning_moves_) - { - unit_map::iterator unit_iter = resources::units->find(unit_id); - assert(unit_iter.valid()); -@@ -509,7 +510,7 @@ - - void manager::post_draw() - { -- foreach(size_t unit_id, units_owning_moves_) -+ BOOST_FOREACH(size_t unit_id, units_owning_moves_) - { - unit_map::iterator unit_iter = resources::units->find(unit_id); - if (unit_iter.valid()) { -@@ -558,7 +559,7 @@ - - //Info about the action numbers to be displayed on screen. - side_actions::numbers_t numbers; -- foreach(team& t, *resources::teams) -+ BOOST_FOREACH(team& t, *resources::teams) - { - side_actions& sa = *t.get_side_actions(); - if(!sa.hidden()) -@@ -571,7 +572,7 @@ - - void manager::on_mouseover_change(const map_location& hex) - { -- foreach(map_location const& hex, hidden_unit_hexes_) -+ BOOST_FOREACH(map_location const& hex, hidden_unit_hexes_) - resources::screen->remove_exclusive_draw(hex); - hidden_unit_hexes_.clear(); - -@@ -636,7 +637,7 @@ - LOG_WB << "Received wb data (" << count << ").\n"; - - team& team_from = resources::teams->at(wb_cfg["side"]-1); -- foreach(side_actions::net_cmd const& cmd, wb_cfg.child_range("net_cmd")) -+ BOOST_FOREACH(side_actions::net_cmd const& cmd, wb_cfg.child_range("net_cmd")) - team_from.get_side_actions()->execute_net_cmd(cmd); - } - } -@@ -1138,7 +1139,7 @@ - options.push_back(_("HIDE ALL allies’ plans")); - - //populate list of networked allies -- foreach(team &t, *resources::teams) -+ BOOST_FOREACH(team &t, *resources::teams) - { - //Exclude enemies, AIs, and local players - if(t.is_enemy(v_side) || !t.is_network()) -@@ -1164,11 +1165,11 @@ - switch(selection) - { - case 0: -- foreach(team* t, allies) -+ BOOST_FOREACH(team* t, allies) - team_plans_hidden_[t->side()-1]=false; - break; - case 1: -- foreach(team* t, allies) -+ BOOST_FOREACH(team* t, allies) - team_plans_hidden_[t->side()-1]=true; - break; - default: -Index: src/whiteboard/suppose_dead.cpp -=================================================================== ---- src/whiteboard/suppose_dead.cpp (revision 54624) -+++ src/whiteboard/suppose_dead.cpp (revision 54625) -@@ -26,7 +26,6 @@ - - #include "arrow.hpp" - #include "config.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_end_exceptions.hpp" - #include "mouse_events.hpp" -Index: src/whiteboard/mapbuilder.cpp -=================================================================== ---- src/whiteboard/mapbuilder.cpp (revision 54624) -+++ src/whiteboard/mapbuilder.cpp (revision 54625) -@@ -24,12 +24,13 @@ - #include "side_actions.hpp" - #include "utility.hpp" - --#include "foreach.hpp" - #include "play_controller.hpp" - #include "resources.hpp" - #include "unit.hpp" - #include "unit_map.hpp" - -+#include <boost/foreach.hpp> -+ - namespace wb - { - -@@ -51,14 +52,14 @@ - - void mapbuilder::pre_build() - { -- foreach(team& t, *resources::teams) -+ BOOST_FOREACH(team& t, *resources::teams) - { - //Reset spent gold to zero, it'll be recalculated during the map building - t.get_side_actions()->reset_gold_spent(); - } - - int current_side = resources::controller->current_side(); -- foreach(unit& u, *resources::units) -+ BOOST_FOREACH(unit& u, *resources::units) - { - bool on_current_side = (u.side() == current_side); - -Index: src/whiteboard/highlight_visitor.cpp -=================================================================== ---- src/whiteboard/highlight_visitor.cpp (revision 54624) -+++ src/whiteboard/highlight_visitor.cpp (revision 54625) -@@ -29,11 +29,12 @@ - #include "suppose_dead.hpp" - - #include "arrow.hpp" --#include "foreach.hpp" - #include "play_controller.hpp" - #include "resources.hpp" - #include "unit_map.hpp" - -+#include <boost/foreach.hpp> -+ - namespace wb - { - -@@ -147,7 +148,7 @@ - { - //Highlight secondary highlights - mode_ = HIGHLIGHT_SECONDARY; -- foreach(weak_action_ptr weak, secondary_highlights_) -+ BOOST_FOREACH(weak_action_ptr weak, secondary_highlights_) - { - if (action_ptr action = weak.lock()) - { -@@ -169,7 +170,7 @@ - - //unhighlight secondary highlights - mode_ = UNHIGHLIGHT_SECONDARY; -- foreach(weak_action_ptr weak, secondary_highlights_) -+ BOOST_FOREACH(weak_action_ptr weak, secondary_highlights_) - { - if (action_ptr action = weak.lock()) - { -@@ -178,7 +179,7 @@ - } - - //unhide other units if needed -- foreach(map_location hex, exclusive_display_hexes_) -+ BOOST_FOREACH(map_location hex, exclusive_display_hexes_) - { - resources::screen->remove_exclusive_draw(hex); - } -Index: src/language.cpp -=================================================================== ---- src/language.cpp (revision 54624) -+++ src/language.cpp (revision 54625) -@@ -16,7 +16,6 @@ - #include "global.hpp" - - #include "filesystem.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "language.hpp" - #include "log.hpp" -@@ -27,6 +26,7 @@ - #include <stdexcept> - #include <clocale> - #include <boost/scoped_array.hpp> -+#include <boost/foreach.hpp> - - #ifdef _WIN32 - #include <windows.h> -@@ -101,7 +101,7 @@ - known_languages.push_back( - language_def("", t_string(N_("System default language"), "wesnoth"), "ltr", "", "A")); - -- foreach (const config &lang, cfg.child_range("locale")) -+ BOOST_FOREACH(const config &lang, cfg.child_range("locale")) - { - known_languages.push_back( - language_def(lang["locale"], lang["name"], lang["dir"], -@@ -226,9 +226,9 @@ - std::cerr << "No [language] block found\n"; - return false; - } -- foreach (const config &lang, languages_) { -+ BOOST_FOREACH(const config &lang, languages_) { - DBG_G << "[language]\n"; -- foreach (const config::attribute &j, lang.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &j, lang.attribute_range()) { - DBG_G << j.first << "=\"" << j.second << "\"\n"; - strings_[j.first] = j.second; - } -@@ -283,7 +283,7 @@ - - void init_textdomains(const config& cfg) - { -- foreach (const config &t, cfg.child_range("textdomain")) -+ BOOST_FOREACH(const config &t, cfg.child_range("textdomain")) - { - const std::string &name = t["name"]; - const std::string &path = t["path"]; -@@ -307,7 +307,7 @@ - bool init_strings(const config& cfg) - { - languages_.clear(); -- foreach(const config &l, cfg.child_range("language")) { -+ BOOST_FOREACH(const config &l, cfg.child_range("language")) { - languages_.push_back(l); - } - return load_strings(true); -Index: src/multiplayer_lobby.cpp -=================================================================== ---- src/multiplayer_lobby.cpp (revision 54624) -+++ src/multiplayer_lobby.cpp (revision 54625) -@@ -20,7 +20,6 @@ - #include "global.hpp" - - #include "filesystem.hpp" --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "lobby_preferences.hpp" - #include "map_exception.hpp" -@@ -34,6 +33,8 @@ - #include "wml_exception.hpp" - #include "formula_string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_config("config"); - #define ERR_CF LOG_STREAM(err, log_config) - -@@ -424,7 +425,7 @@ - - games_.clear(); - -- foreach (const config &game, cfg.child("gamelist").child_range("game")) -+ BOOST_FOREACH(const config &game, cfg.child("gamelist").child_range("game")) - { - bool verified = true; - games_.push_back(game_item()); -@@ -502,7 +503,7 @@ - if (map_hashes_ && !games_.back().reloaded) { - std::string hash = game["hash"]; - bool hash_found = false; -- foreach (const config::attribute &i, map_hashes_.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, map_hashes_.attribute_range()) { - if (i.first == game["mp_scenario"] && i.second == hash) { - hash_found = true; - break; -@@ -639,7 +640,7 @@ - - if(preferences::fi_friends_in_game()) { - bool found_friend = false; -- foreach(const config &user, cfg.child_range("user")) { -+ BOOST_FOREACH(const config &user, cfg.child_range("user")) { - if(preferences::is_friend(user["name"]) && user["game_id"] == i.id) { - found_friend = true; - break; -@@ -650,7 +651,7 @@ - - if(!preferences::fi_text().empty()) { - bool found_match = true; -- foreach(const std::string& search_string, utils::split(preferences::fi_text(), ' ', utils::STRIP_SPACES)) { -+ BOOST_FOREACH(const std::string& search_string, utils::split(preferences::fi_text(), ' ', utils::STRIP_SPACES)) { - if(std::search(i.map_info.begin(), i.map_info.end(), search_string.begin(), search_string.end(), chars_equal_insensitive) == i.map_info.end() && - std::search(i.name.begin(), i.name.end(), search_string.begin(), search_string.end(), chars_equal_insensitive) == i.name.end()) { - found_match = false; -Index: src/reports.cpp -=================================================================== ---- src/reports.cpp (revision 54624) -+++ src/reports.cpp (revision 54625) -@@ -20,7 +20,6 @@ - #include "editor/editor_controller.hpp" - #include "editor/editor_palettes.hpp" - #include "font.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_preferences.hpp" - #include "gettext.hpp" -@@ -36,6 +35,7 @@ - #include "unit.hpp" - #include "whiteboard/manager.hpp" - -+#include <boost/foreach.hpp> - - #include <cassert> - #include <ctime> -@@ -260,7 +260,7 @@ - if (!u) return report(); - config res; - typedef std::pair<std::string, std::string> pair_string; -- foreach(const pair_string &ps, u->amla_icons()) { -+ BOOST_FOREACH(const pair_string &ps, u->amla_icons()) { - add_image(res, ps.first, ps.second); - } - return res; -@@ -395,7 +395,7 @@ - - bool att_def_diff = false; - map_location displayed_unit_hex = resources::screen->displayed_unit_hex(); -- foreach (const utils::string_map::value_type &resist, u->get_base_resistances()) -+ BOOST_FOREACH(const utils::string_map::value_type &resist, u->get_base_resistances()) - { - std::ostringstream line; - line << gettext(resist.first.c_str()) << ": "; -@@ -415,7 +415,7 @@ - if (att_def_diff) - tooltip << _("(Att / Def)"); - tooltip << '\n'; -- foreach (const std::string &line, resistances_table) { -+ BOOST_FOREACH(const std::string &line, resistances_table) { - tooltip << line; - } - return text_report(str.str(), tooltip.str()); -@@ -458,7 +458,7 @@ - if (!u) return report(); - config res; - typedef std::pair<std::string, std::string> pair_string; -- foreach (const pair_string &ps, u->advancement_icons()) { -+ BOOST_FOREACH(const pair_string &ps, u->advancement_icons()) { - add_image(res, ps.first, ps.second); - } - return res; -@@ -497,7 +497,7 @@ - bool revert = false; - if (underlyings.size() != 1 || underlyings.front() != terrain) - { -- foreach (const t_translation::t_terrain &t, underlyings) -+ BOOST_FOREACH(const t_translation::t_terrain &t, underlyings) - { - if (t == t_translation::MINUS) { - revert = true; -@@ -641,7 +641,7 @@ - std::set<std::string> seen_types; - const team &unit_team = (*resources::teams)[u->side() - 1]; - const team &viewing_team = (*resources::teams)[resources::screen->viewing_team()]; -- foreach(const unit &enemy, *resources::units) -+ BOOST_FOREACH(const unit &enemy, *resources::units) - { - if (!unit_team.is_enemy(enemy.side())) - continue; -@@ -662,7 +662,7 @@ - damage_multiplier += tod_bonus; - - typedef std::pair<int, std::set<std::string> > resist_units; -- foreach (const resist_units &resist, resistances) { -+ BOOST_FOREACH(const resist_units &resist, resistances) { - int damage = round_damage(base_damage, damage_multiplier * resist.first, damage_divisor); - tooltip << "<b>" << damage << "</b> " - << "<i>(" << utils::signed_percent(resist.first-100) << ")</i> : " -@@ -755,7 +755,7 @@ - } - } - -- foreach(const battle_context& weapon, weapons) { -+ BOOST_FOREACH(const battle_context& weapon, weapons) { - - // Predict the battle outcome. - combatant attacker_combatant(weapon.get_attacker_stats()); -@@ -869,7 +869,7 @@ - map_location displayed_unit_hex = resources::screen->displayed_unit_hex(); - config res; - -- foreach (const attack_type &at, u->attacks()) -+ BOOST_FOREACH(const attack_type &at, u->attacks()) - { - attack_info(at, res, u, displayed_unit_hex); - } -@@ -1023,7 +1023,7 @@ - str << td.villages << '/'; - if (viewing_team.uses_shroud()) { - int unshrouded_villages = 0; -- foreach (const map_location &loc, resources::game_map->villages()) { -+ BOOST_FOREACH(const map_location &loc, resources::game_map->villages()) { - if (!viewing_team.shrouded(loc)) - ++unshrouded_villages; - } -@@ -1178,7 +1178,7 @@ - - std::ostringstream str; - str << _("Observers:") << '\n'; -- foreach (const std::string &obs, observers) { -+ BOOST_FOREACH(const std::string &obs, observers) { - str << obs << '\n'; - } - return image_report(game_config::images::observer, str.str()); -@@ -1250,7 +1250,7 @@ - - void reports::reset_generators() - { -- foreach (dynamic_report_generators::value_type &rg, dynamic_generators) { -+ BOOST_FOREACH(dynamic_report_generators::value_type &rg, dynamic_generators) { - delete rg.second; - } - dynamic_generators.clear(); -@@ -1283,10 +1283,10 @@ - const std::set<std::string> &reports::report_list() - { - if (!all_reports.empty()) return all_reports; -- foreach (const static_report_generators::value_type &v, static_generators) { -+ BOOST_FOREACH(const static_report_generators::value_type &v, static_generators) { - all_reports.insert(v.first); - } -- foreach (const dynamic_report_generators::value_type &v, dynamic_generators) { -+ BOOST_FOREACH(const dynamic_report_generators::value_type &v, dynamic_generators) { - all_reports.insert(v.first); - } - return all_reports; -Index: src/playmp_controller.cpp -=================================================================== ---- src/playmp_controller.cpp (revision 54624) -+++ src/playmp_controller.cpp (revision 54625) -@@ -17,7 +17,7 @@ - #include "playmp_controller.hpp" - - #include "dialogs.hpp" --#include "foreach.hpp" -+ - #include "game_end_exceptions.hpp" - #include "gettext.hpp" - #include "log.hpp" -@@ -29,6 +29,8 @@ - #include "formula_string_utils.hpp" - #include "whiteboard/manager.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define LOG_NG LOG_STREAM(info, log_engine) - -@@ -326,7 +328,7 @@ - // stay stuck in linger state when the *next* scenario is over. - gamestate_.classification().completion = "running"; - // End all unit moves -- foreach (unit &u, units_) { -+ BOOST_FOREACH(unit &u, units_) { - u.set_user_end_turn(true); - } - //current_team().set_countdown_time(0); -Index: src/tests/gui/test_gui2.cpp -=================================================================== ---- src/tests/gui/test_gui2.cpp (revision 54624) -+++ src/tests/gui/test_gui2.cpp (revision 54625) -@@ -20,7 +20,6 @@ - - #include "config_cache.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "formula_debugger.hpp" - #include "gettext.hpp" - #include "game_config.hpp" -@@ -66,6 +65,7 @@ - #include "wml_exception.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #include <memory> - -@@ -139,7 +139,7 @@ - template<class T> - void test_resolutions(const tresolution_list& resolutions) - { -- foreach(const tresolution& resolution, resolutions) { -+ BOOST_FOREACH(const tresolution& resolution, resolutions) { - video().make_test_fake(resolution.first, resolution.second); - - boost::scoped_ptr<gui2::tdialog> dlg(twrapper<T>::create()); -@@ -178,7 +178,7 @@ - { - bool interact = false; - for(int i = 0; i < 2; ++i) { -- foreach(const tresolution& resolution, resolutions) { -+ BOOST_FOREACH(const tresolution& resolution, resolutions) { - video().make_test_fake(resolution.first, resolution.second); - - boost::scoped_ptr<gui2::tpopup> dlg(twrapper<T>::create()); -@@ -225,7 +225,7 @@ - void test_tip_resolutions(const tresolution_list& resolutions - , const std::string& id) - { -- foreach(const tresolution& resolution, resolutions) { -+ BOOST_FOREACH(const tresolution& resolution, resolutions) { - video().make_test_fake(resolution.first, resolution.second); - - std::vector<std::string>& list = -@@ -416,7 +416,7 @@ - - // Test size() instead of empty() to get the number of offenders - BOOST_CHECK_EQUAL(list.size(), 0); -- foreach(const std::string& id, list) { -+ BOOST_FOREACH(const std::string& id, list) { - std::cerr << "Window '" << id << "' registered but not tested.\n"; - } - } -@@ -638,7 +638,7 @@ - BOOST_REQUIRE_MESSAGE(result, "Failed to create a dialog."); - - std::vector<map_generator*> map_generators; -- foreach (const config &i, main_config.child_range("multiplayer")) { -+ BOOST_FOREACH(const config &i, main_config.child_range("multiplayer")) { - if(i["map_generation"] == "default") { - const config &generator_cfg = i.child("generator"); - if (generator_cfg) { -@@ -694,7 +694,7 @@ - BOOST_REQUIRE_MESSAGE(cfg, "No editor time-of-day defined"); - - std::vector<time_of_day> tods; -- foreach (const config &i, cfg.child_range("time")) { -+ BOOST_FOREACH(const config &i, cfg.child_range("time")) { - tods.push_back(time_of_day(i)); - } - return new gui2::teditor_settings(NULL, tods); -Index: src/filesystem.cpp -=================================================================== ---- src/filesystem.cpp (revision 54624) -+++ src/filesystem.cpp (revision 54625) -@@ -56,7 +56,6 @@ - - #include "config.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "game_config.hpp" - #include "game_preferences.hpp" - #include "log.hpp" -@@ -65,6 +64,8 @@ - #include "serialization/string_utils.hpp" - #include "version.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_filesystem("filesystem"); - #define DBG_FS LOG_STREAM(debug, log_filesystem) - #define LOG_FS LOG_STREAM(info, log_filesystem) -@@ -1010,7 +1011,7 @@ - cleanup(); - init_binary_paths(); - -- foreach (const config &bp, cfg.child_range("binary_path")) -+ BOOST_FOREACH(const config &bp, cfg.child_range("binary_path")) - { - std::string path = bp["path"].str(); - if (path.find("..") != std::string::npos) { -@@ -1057,7 +1058,7 @@ - - init_binary_paths(); - -- foreach (const std::string &path, binary_paths) -+ BOOST_FOREACH(const std::string &path, binary_paths) - { - res.push_back(get_user_data_dir() + "/" + path + type + "/"); - -@@ -1098,7 +1099,7 @@ - return std::string(); - } - -- foreach (const std::string &path, get_binary_paths(type)) -+ BOOST_FOREACH(const std::string &path, get_binary_paths(type)) - { - const std::string file = path + filename; - DBG_FS << " checking '" << path << "'\n"; -@@ -1126,7 +1127,7 @@ - return std::string(); - } - -- foreach (const std::string &path, get_binary_paths(type)) -+ BOOST_FOREACH(const std::string &path, get_binary_paths(type)) - { - const std::string file = path + filename; - DBG_FS << " checking '" << path << "'\n"; -@@ -1291,7 +1292,7 @@ - p4 << drive; - #endif - -- foreach (const std::string &s, components) -+ BOOST_FOREACH(const std::string &s, components) - { - p4 << '/' << s; - } -Index: src/help.cpp -=================================================================== ---- src/help.cpp (revision 54624) -+++ src/help.cpp (revision 54625) -@@ -27,7 +27,6 @@ - #include "about.hpp" - #include "display.hpp" - #include "exceptions.hpp" --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "gettext.hpp" - #include "gui/dialogs/transient_message.hpp" -@@ -40,6 +39,8 @@ - #include "wml_separators.hpp" - #include "serialization/parser.hpp" - -+#include <boost/foreach.hpp> -+ - #include <queue> - - static lg::log_domain log_display("display"); -@@ -793,7 +794,7 @@ - // opening the help browser in the default manner. - config hidden_toplevel; - std::stringstream ss; -- foreach (const config §ion, help_config->child_range("section")) -+ BOOST_FOREACH(const config §ion, help_config->child_range("section")) - { - const std::string id = section["id"]; - if (find_section(toplevel, id) == NULL) { -@@ -810,7 +811,7 @@ - } - hidden_toplevel["sections"] = ss.str(); - ss.str(""); -- foreach (const config &topic, help_config->child_range("topic")) -+ BOOST_FOREACH(const config &topic, help_config->child_range("topic")) - { - const std::string id = topic["id"]; - if (find_topic(toplevel, id) == NULL) { -@@ -861,7 +862,7 @@ - } - } - -- foreach (const config §ion, cfg.child_range("section")) -+ BOOST_FOREACH(const config §ion, cfg.child_range("section")) - { - const std::vector<std::string> sections_refd - = utils::quoted_split(section["sections"]); -@@ -885,7 +886,7 @@ - } - } - -- foreach (const config §ion, cfg.child_range("section")) -+ BOOST_FOREACH(const config §ion, cfg.child_range("section")) - { - const std::vector<std::string> topics_refd - = utils::quoted_split(section["topics"]); -@@ -1103,7 +1104,7 @@ - std::map<t_string, std::string> special_description; - std::map<t_string, std::set<std::string, string_less> > special_units; - -- foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types()) -+ BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types()) - { - const unit_type &type = i.second; - // Only show the weapon special if we find it on a unit that -@@ -1171,7 +1172,7 @@ - // should have a full description, if so, add this units abilities - // for display. We do not want to show abilities that the user has - // not encountered yet. -- foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types()) -+ BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types()) - { - const unit_type &type = i.second; - if (description_type(type) == FULL_DESCRIPTION) { -@@ -1244,7 +1245,7 @@ - const config& era = game_cfg->child("era"); - if (era) { - std::vector<std::string> faction_links; -- foreach (const config &f, era.child_range("multiplayer_side")) { -+ BOOST_FOREACH(const config &f, era.child_range("multiplayer_side")) { - const std::string& id = f["id"]; - if (id == "Random") - continue; -@@ -1260,7 +1261,7 @@ - text << "<header>text='" << _("Leaders:") << "'</header>" << "\n"; - const std::vector<std::string> leaders = - make_unit_links_list( utils::split(f["leader"]), true ); -- foreach (const std::string &link, leaders) { -+ BOOST_FOREACH(const std::string &link, leaders) { - text << link << "\n"; - } - -@@ -1269,7 +1270,7 @@ - text << "<header>text='" << _("Recruits:") << "'</header>" << "\n"; - const std::vector<std::string> recruits = - make_unit_links_list( utils::split(f["recruit"]), true ); -- foreach (const std::string &link, recruits) { -+ BOOST_FOREACH(const std::string &link, recruits) { - text << link << "\n"; - } - -@@ -1291,7 +1292,7 @@ - text << "<header>text='" << _("Factions:") << "'</header>" << "\n"; - - std::sort(faction_links.begin(), faction_links.end()); -- foreach (const std::string &link, faction_links) { -+ BOOST_FOREACH(const std::string &link, faction_links) { - text << link << "\n"; - } - -@@ -1366,7 +1367,7 @@ - reverse ? type_.advances_from() : type_.advances_to(); - bool first = true; - -- foreach (const std::string &adv, adv_units) -+ BOOST_FOREACH(const std::string &adv, adv_units) - { - const unit_type *type = unit_types.find(adv); - if (!type || type->hide_help()) continue; -@@ -1676,7 +1677,7 @@ - std::vector<std::string> make_unit_links_list(const std::vector<std::string>& type_id_list, bool ordered) - { - std::vector<std::string> links_list; -- foreach (const std::string &type_id, type_id_list) { -+ BOOST_FOREACH(const std::string &type_id, type_id_list) { - std::string unit_link = make_unit_link(type_id); - if (!unit_link.empty()) - links_list.push_back(unit_link); -@@ -1693,7 +1694,7 @@ - std::set<std::string, string_less> races; - std::set<std::string, string_less> visible_races; - -- foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types()) -+ BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types()) - { - const unit_type &type = i.second; - UNIT_DESCRIPTION_TYPE desc_type = description_type(type); -@@ -1736,7 +1737,7 @@ - std::set<std::string, string_less> race_units; - std::set<std::string, string_less> race_topics; - -- foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types()) -+ BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types()) - { - const unit_type &type = i.second; - -@@ -1768,7 +1769,7 @@ - race_name = r->plural_name(); - race_description = r->description(); - // if (description.empty()) description = _("No description Available"); -- foreach (const config &additional_topic, r->additional_topics()) -+ BOOST_FOREACH(const config &additional_topic, r->additional_topics()) - { - std::string id = additional_topic["id"]; - std::string title = additional_topic["title"]; -Index: src/savegame.cpp -=================================================================== ---- src/savegame.cpp (revision 54624) -+++ src/savegame.cpp (revision 54625) -@@ -17,7 +17,6 @@ - #include "savegame.hpp" - - #include "dialogs.hpp" //FIXME: get rid of this as soon as the two remaining dialogs are moved to gui2 --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_end_exceptions.hpp" - #include "game_preferences.hpp" -@@ -40,6 +39,8 @@ - #include "unit_id.hpp" - #include "version.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define LOG_SAVE LOG_STREAM(info, log_engine) - #define ERR_SAVE LOG_STREAM(err, log_engine) -@@ -913,7 +914,7 @@ - bool shrouded = false; - - const config& snapshot = has_snapshot ? gamestate_.snapshot : gamestate_.starting_pos; -- foreach (const config &side, snapshot.child_range("side")) -+ BOOST_FOREACH(const config &side, snapshot.child_range("side")) - { - if (side["controller"] != "human") { - continue; -@@ -922,7 +923,7 @@ - shrouded = true; - } - -- foreach (const config &u, side.child_range("unit")) -+ BOOST_FOREACH(const config &u, side.child_range("unit")) - { - if (u["canrecruit"].to_bool()) { - leader = u["id"].str(); -@@ -960,7 +961,7 @@ - // if there is no scenario information in the starting pos, add the (persistent) sides from the snapshot - // else do nothing, as persistence information was already added at the end of the previous scenario - if (gamestate().starting_pos["id"].empty()) { -- foreach(const config &snapshot_side, gamestate().snapshot.child_range("side")) { -+ BOOST_FOREACH(const config &snapshot_side, gamestate().snapshot.child_range("side")) { - //add all side tags (assuming they only contain carryover information) - gamestate().starting_pos.add_child("side", snapshot_side); - } -Index: src/replay.cpp -=================================================================== ---- src/replay.cpp (revision 54624) -+++ src/replay.cpp (revision 54625) -@@ -23,7 +23,6 @@ - #include "global.hpp" - - #include "dialogs.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_end_exceptions.hpp" - #include "game_events.hpp" -@@ -41,6 +40,7 @@ - #include "whiteboard/manager.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_replay("replay"); - #define DBG_REPLAY LOG_STREAM(debug, log_replay) -@@ -67,7 +67,7 @@ - << nunits << " according to data source. " << units.size() << " locally\n"; - - std::set<map_location> locs; -- foreach (const config &u, cfg.child_range("unit")) -+ BOOST_FOREACH(const config &u, cfg.child_range("unit")) - { - const map_location loc(u, resources::state_of_game); - locs.insert(loc); -@@ -88,7 +88,7 @@ - errbuf.clear(); - } - -- foreach (const config &un, cfg.child_range("unit")) -+ BOOST_FOREACH(const config &un, cfg.child_range("unit")) - { - const map_location loc(un, resources::state_of_game); - const unit_map::const_iterator u = units.find(loc); -@@ -560,7 +560,7 @@ - const map_location &src = steps.front(); - const map_location &dst = steps.back(); - -- foreach (const async_cmd &ac, async_cmds) -+ BOOST_FOREACH(const async_cmd &ac, async_cmds) - { - if (config &async_child = ac.cfg->child("rename")) { - map_location aloc(async_child, resources::state_of_game); -@@ -576,7 +576,7 @@ - // A unit is being un-recruited or un-recalled. - // Remove unsynced commands that would act on that unit. - map_location src(*chld, resources::state_of_game); -- foreach (const async_cmd &ac, async_cmds) -+ BOOST_FOREACH(const async_cmd &ac, async_cmds) - { - if (config &async_child = ac.cfg->child("rename")) - { -@@ -680,7 +680,7 @@ - - void replay::add_config(const config& cfg, MARK_SENT mark) - { -- foreach (const config &cmd, cfg.child_range("command")) -+ BOOST_FOREACH(const config &cmd, cfg.child_range("command")) - { - config &cfg = cfg_.add_child("command", cmd); - if (cfg.child("speak")) -@@ -730,7 +730,7 @@ - if(! game_config::mp_debug) { - return; - } -- foreach (const config &ch, cfg.child_range("checksum")) -+ BOOST_FOREACH(const config &ch, cfg.child_range("checksum")) - { - map_location loc(ch, resources::state_of_game); - unit_map::const_iterator u = resources::units->find(loc); -@@ -1151,7 +1151,7 @@ - } - else if (const config &child = cfg->child("fire_event")) - { -- foreach (const config &v, child.child_range("set_variable")) { -+ BOOST_FOREACH(const config &v, child.child_range("set_variable")) { - resources::state_of_game->set_variable(v["name"], v["value"]); - } - const std::string &event = child["raise"]; -Index: src/game_preferences_display.cpp -=================================================================== ---- src/game_preferences_display.cpp (revision 54624) -+++ src/game_preferences_display.cpp (revision 54625) -@@ -19,7 +19,6 @@ - #include "display.hpp" - #include "filesystem.hpp" - #include "filechooser.hpp" --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "gettext.hpp" - #include "gui/dialogs/simple_item_selector.hpp" -@@ -30,6 +29,7 @@ - #include "widgets/slider.hpp" - #include "formula_string_utils.hpp" - -+#include <boost/foreach.hpp> - - namespace preferences { - -@@ -1071,7 +1071,7 @@ - void preferences_dialog::set_advanced_menu() - { - std::vector<std::string> advanced_items; -- foreach (const config &adv, adv_preferences_cfg_) -+ BOOST_FOREACH(const config &adv, adv_preferences_cfg_) - { - std::ostringstream str; - std::string field = preferences::get(adv["field"]); -@@ -1096,7 +1096,7 @@ - { - adv_preferences_cfg_.clear(); - -- foreach(const config& adv, game_cfg_.child_range("advanced_preference")) { -+ BOOST_FOREACH(const config& adv, game_cfg_.child_range("advanced_preference")) { - adv_preferences_cfg_.push_back(adv); - } - -Index: src/image.cpp -=================================================================== ---- src/image.cpp (revision 54624) -+++ src/image.cpp (revision 54625) -@@ -25,7 +25,6 @@ - #include "color_range.hpp" - #include "config.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "game_config.hpp" - #include "image.hpp" - #include "image_modifications.hpp" -@@ -36,6 +35,7 @@ - #include "SDL_image.h" - - #include <boost/functional/hash.hpp> -+#include <boost/foreach.hpp> - - #include <list> - #include <set> -@@ -376,7 +376,7 @@ - std::string trackpath = get_binary_file_location("", "l10n-track"); - std::string contents = read_file(trackpath); - std::vector<std::string> lines = utils::split(contents, '\n'); -- foreach (const std::string &line, lines) { -+ BOOST_FOREACH(const std::string &line, lines) { - size_t p1 = line.find(fsep); - if (p1 == std::string::npos) - continue; -@@ -423,7 +423,7 @@ - // add en_US with lowest priority, since the message above will - // not have it when translated. - langs.push_back("en_US"); -- foreach (const std::string &lang, langs) { -+ BOOST_FOREACH(const std::string &lang, langs) { - std::string loc_file = dir + "l10n" + "/" + lang + "/" + loc_base; - if (file_exists(loc_file) && localized_file_uptodate(loc_file)) { - return loc_file; -Index: src/team.cpp -=================================================================== ---- src/team.cpp (revision 54624) -+++ src/team.cpp (revision 54625) -@@ -21,13 +21,14 @@ - #include "team.hpp" - - #include "ai/manager.hpp" --#include "foreach.hpp" - #include "game_events.hpp" - #include "gamestatus.hpp" - #include "resources.hpp" - #include "game_preferences.hpp" - #include "whiteboard/side_actions.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define DBG_NG LOG_STREAM(debug, log_engine) - #define LOG_NG LOG_STREAM(info, log_engine) -@@ -318,7 +319,7 @@ - // Was it correct? - - // Load in the villages the side controls at the start -- foreach (const config &v, cfg.child_range("village")) -+ BOOST_FOREACH(const config &v, cfg.child_range("village")) - { - map_location loc(v, resources::state_of_game); - if (map.is_village(loc)) { -@@ -397,7 +398,7 @@ - return info_.minimum_recruit_price; - }else{ - int min = 20; -- foreach(std::string recruit, info_.can_recruit){ -+ BOOST_FOREACH(std::string recruit, info_.can_recruit){ - const unit_type *ut = unit_types.find(recruit); - if(!ut) - continue; -@@ -605,7 +606,7 @@ - return true; - } - -- foreach (const team &t, *teams) { -+ BOOST_FOREACH(const team &t, *teams) { - if (t.is_human()) - return false; - } -Index: src/config_cache.cpp -=================================================================== ---- src/config_cache.cpp (revision 54624) -+++ src/config_cache.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "config_cache.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "game_config.hpp" - #include "game_display.hpp" -@@ -29,6 +28,7 @@ - #include "serialization/parser.hpp" - #include "version.hpp" - -+#include <boost/foreach.hpp> - #include <boost/algorithm/string/replace.hpp> - - static lg::log_domain log_cache("cache"); -@@ -113,7 +113,7 @@ - config_writer writer(*stream, gzip, game_config::cache_compression_level); - - // write all defines to stream -- foreach (const preproc_map::value_type &define, defines_map) { -+ BOOST_FOREACH(const preproc_map::value_type &define, defines_map) { - define.second.write(writer, define.first); - } - } -@@ -262,7 +262,7 @@ - - // use static preproc_define::read_pair(config) to make a object - // and pass that object config_cache_transaction::insert_to_active method -- foreach (const config::any_child &value, cfg.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &value, cfg.all_children_range()) { - config_cache_transaction::instance().insert_to_active( - preproc_define::read_pair(value.cfg)); - } -@@ -271,7 +271,7 @@ - void config_cache::read_defines_queue() - { - const config_cache_transaction::filenames& files = config_cache_transaction::instance().get_define_files(); -- foreach (const std::string &path, files) { -+ BOOST_FOREACH(const std::string &path, files) { - read_defines_file(path); - } - } -@@ -394,7 +394,7 @@ - std::insert_iterator<preproc_map>(temp,temp.begin()), - &compare_define); - -- foreach (const preproc_map::value_type &def, temp) { -+ BOOST_FOREACH(const preproc_map::value_type &def, temp) { - insert_to_active(def); - } - -Index: src/game_events.cpp -=================================================================== ---- src/game_events.cpp (revision 54624) -+++ src/game_events.cpp (revision 54625) -@@ -23,7 +23,6 @@ - #include "actions.hpp" - #include "ai/manager.hpp" - #include "dialogs.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_events.hpp" - #include "game_preferences.hpp" -@@ -60,6 +59,8 @@ - #include <iomanip> - #include <iostream> - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define DBG_NG LOG_STREAM(debug, log_engine) - #define LOG_NG LOG_STREAM(info, log_engine) -@@ -341,7 +342,7 @@ - std::vector<std::pair<int,int> > counts = (*u).has_attribute("count") - ? utils::parse_ranges((*u)["count"]) : default_counts; - int match_count = 0; -- foreach (const unit &i, *resources::units) -+ BOOST_FOREACH(const unit &i, *resources::units) - { - if(i.hitpoints() > 0 && unit_matches_filter(i, *u)) { - ++match_count; -@@ -396,7 +397,7 @@ - const vconfig::child_list& variables = cond.get_children("variable"); - backwards_compat = backwards_compat && variables.empty(); - -- foreach (const vconfig &values, variables) -+ BOOST_FOREACH(const vconfig &values, variables) - { - const std::string name = values["name"]; - config::attribute_value value = resources::state_of_game->get_variable_const(name); -@@ -589,7 +590,7 @@ - const std::vector<game_events::event_handler>& handlers, - const std::string& msg) { - -- foreach(const game_events::event_handler& h, handlers){ -+ BOOST_FOREACH(const game_events::event_handler& h, handlers){ - const config& cfg = h.get_config(); - ss << "name=" << cfg["name"] << ", with id=" << cfg["id"] << "; "; - } -@@ -603,7 +604,7 @@ - std::stringstream ss; - log_handler(ss, active_, "active"); - log_handler(ss, insert_buffer_, "insert buffered"); -- foreach(const std::string& h, remove_buffer_){ -+ BOOST_FOREACH(const std::string& h, remove_buffer_){ - ss << "id=" << h << "; "; - } - DBG_EH << "remove buffered handlers are now " << ss.str() << "\n"; -@@ -631,7 +632,7 @@ - const config & cfg = new_handler.get_config(); - std::string id = cfg["id"]; - if(!id.empty()) { -- foreach( game_events::event_handler const & eh, active_) { -+ BOOST_FOREACH( game_events::event_handler const & eh, active_) { - config const & temp_config( eh.get_config()); - if(id == temp_config["id"]) { - DBG_EH << "ignoring event handler for name=" << cfg["name"] << -@@ -698,12 +699,12 @@ - return; - - // Commit any event removals -- foreach(std::string const & i , remove_buffer_ ){ -+ BOOST_FOREACH(std::string const & i , remove_buffer_ ){ - remove_event_handler( i ); } - remove_buffer_.clear(); - - // Commit any spawned events-within-events -- foreach( game_events::event_handler const & i , insert_buffer_ ){ -+ BOOST_FOREACH( game_events::event_handler const & i , insert_buffer_ ){ - add_event_handler( i ); } - insert_buffer_.clear(); - -@@ -735,7 +736,7 @@ - std::vector<int> sides = game_events::get_sides_vector(cfg); - size_t index; - -- foreach (const int &side_num, sides) -+ BOOST_FOREACH(const int &side_num, sides) - { - index = side_num - 1; - team &t = (*resources::teams)[index]; -@@ -744,7 +745,7 @@ - filter.restrict_size(game_config::max_loop); - filter.get_locations(locs, true); - -- foreach (map_location const &loc, locs) -+ BOOST_FOREACH(map_location const &loc, locs) - { - if (remove) { - t.clear_shroud(loc); -@@ -774,7 +775,7 @@ - const bool remove = utils::string_bool(cfg["remove"], false); - if (remove) { - const std::vector<std::string> ids = utils::split(cfg["id"]); -- foreach(const std::string &id, ids) { -+ BOOST_FOREACH(const std::string &id, ids) { - resources::tunnels->remove(id); - } - } else if (cfg.get_children("source").empty() || -@@ -941,7 +942,7 @@ - WML_HANDLER_FUNCTION(modify_ai, /*event_info*/, cfg) - { - std::vector<int> sides = game_events::get_sides_vector(cfg); -- foreach (const int &side_num, sides) -+ BOOST_FOREACH(const int &side_num, sides) - { - ai::manager::modify_active_ai_for_side(side_num,cfg.get_parsed_config()); - } -@@ -967,7 +968,7 @@ - std::vector<int> sides = game_events::get_sides_vector(cfg); - size_t team_index; - -- foreach (const int &side_num, sides) -+ BOOST_FOREACH(const int &side_num, sides) - { - team_index = side_num - 1; - LOG_NG << "modifying side: " << side_num << "\n"; -@@ -1212,7 +1213,7 @@ - - size_t longest_path = 0; - -- foreach(const vconfig& config, unit_cfgs) { -+ BOOST_FOREACH(const vconfig& config, unit_cfgs) { - const std::vector<std::string> xvals = utils::split(config["x"]); - const std::vector<std::string> yvals = utils::split(config["y"]); - int skip_steps = config["skip_steps"]; -@@ -1461,7 +1462,7 @@ - - variable_info vi(array_name, true, variable_info::TYPE_ARRAY); - bool first = true; -- foreach (const config &cfg, vi.as_array()) -+ BOOST_FOREACH(const config &cfg, vi.as_array()) - { - std::string current_string = cfg[key_name]; - if (remove_empty && current_string.empty()) continue; -@@ -1589,7 +1590,7 @@ - dest.vars->merge_with(data); - } - } else if(mode == "insert" || dest.explicit_index) { -- foreach (const config &child, data.child_range(dest.key)) -+ BOOST_FOREACH(const config &child, data.child_range(dest.key)) - { - dest.vars->add_child_at(dest.key, child, dest.index++); - } -@@ -1619,7 +1620,7 @@ - item["type"] = *ti; - } - unit_map::iterator itor; -- foreach (unit &u, *resources::units) { -+ BOOST_FOREACH(unit &u, *resources::units) { - if (game_events::unit_matches_filter(u, filter)) { - u.set_role(cfg["role"]); - found = true; -@@ -1632,7 +1633,7 @@ - std::set<std::string> player_ids; - std::vector<std::string> sides = utils::split(cfg["side"]); - const bool has_any_sides = !sides.empty(); -- foreach(std::string const& side_str, sides) { -+ BOOST_FOREACH(std::string const& side_str, sides) { - size_t side_num = lexical_cast_default<size_t>(side_str,0); - if(side_num > 0 && side_num <= resources::teams->size()) { - player_ids.insert((resources::teams->begin() + (side_num - 1))->save_id()); -@@ -1699,7 +1700,7 @@ - game_map->set_terrain(loc, new_t); - screen_needs_rebuild = true; - -- foreach (const t_translation::t_terrain &ut, game_map->underlying_union_terrain(loc)) { -+ BOOST_FOREACH(const t_translation::t_terrain &ut, game_map->underlying_union_terrain(loc)) { - preferences::encountered_terrains().insert(ut); - } - } -@@ -1820,7 +1821,7 @@ - const map_location cfg_loc = cfg_to_loc(cfg); - - //TODO fendrin: comment this monster -- foreach (unit_map::const_unit_iterator leader, leaders) { -+ BOOST_FOREACH(unit_map::const_unit_iterator leader, leaders) { - DBG_NG << "...considering " + leader->id() + " as the recalling leader...\n"; - map_location loc = cfg_loc; - if ( (leader_filter.null() || leader->matches_filter(leader_filter, leader->get_location())) && -@@ -1879,7 +1880,7 @@ - - map_location loc; - if(!filter.null()) { -- foreach (const unit &u, *resources::units) { -+ BOOST_FOREACH(const unit &u, *resources::units) { - if (game_events::unit_matches_filter(u, filter)) { - loc = u.get_location(); - break; -@@ -1926,7 +1927,7 @@ - } - } - -- foreach (const vconfig &cmd, cfg.get_children(command_type)) { -+ BOOST_FOREACH(const vconfig &cmd, cfg.get_children(command_type)) { - handle_event_commands(event_info, cmd); - } - } -@@ -2029,13 +2030,13 @@ - std::vector<unit *> dead_men_walking; - // unit_map::iterator uit(resources::units->begin()), uend(resources::units->end()); - // for(;uit!=uend; ++uit){ -- foreach(unit & u, *resources::units){ -+ BOOST_FOREACH(unit & u, *resources::units){ - if(game_events::unit_matches_filter(u, cfg)){ - dead_men_walking.push_back(&u); - } - } - -- foreach(unit * un, dead_men_walking) { -+ BOOST_FOREACH(unit * un, dead_men_walking) { - map_location loc(un->get_location()); - bool fire_event = false; - game_events::entity_location death_loc(*un); -@@ -2429,7 +2430,7 @@ - - if (clear_shroud_bool) { - side_filter filter(cfg); -- foreach(const int side, filter.get_teams()){ -+ BOOST_FOREACH(const int side, filter.get_teams()){ - clear_shroud(side); - } - screen.recalculate_minimap(); -@@ -2466,7 +2467,7 @@ - const vconfig healers_filter = cfg.child("filter_second"); - std::vector<unit*> healers; - if (!healers_filter.null()) { -- foreach (unit& u, *units) { -+ BOOST_FOREACH(unit& u, *units) { - if (game_events::unit_matches_filter(u, healers_filter) && u.has_ability_type("heals")) { - healers.push_back(&u); - } -@@ -2835,7 +2836,7 @@ - return; - } - -- foreach (const vconfig &cmd, option_events[option_chosen]) { -+ BOOST_FOREACH(const vconfig &cmd, option_events[option_chosen]) { - handle_event_commands(event_info, cmd); - } - } -@@ -2858,7 +2859,7 @@ - if(remove) { - const std::vector<std::string> id_list = - utils::split(ids, ',', utils::STRIP_SPACES | utils::REMOVE_EMPTY); -- foreach(const std::string& id, id_list) { -+ BOOST_FOREACH(const std::string& id, id_list) { - resources::tod_manager->remove_time_area(id); - LOG_NG << "event WML removed time_area '" << id << "'\n"; - } -@@ -2997,7 +2998,7 @@ - if(is_empty_command) { - mref->command.add_child("allow_undo"); - } -- foreach(game_events::event_handler& hand, event_handlers) { -+ BOOST_FOREACH(game_events::event_handler& hand, event_handlers) { - if(hand.is_menu_item() && hand.matches_name(mref->name)) { - LOG_NG << "changing command for " << mref->name << " to:\n" << *wcc.second; - hand = game_events::event_handler(mref->command, true); -@@ -3029,14 +3030,14 @@ - vconfig filters(handler.get_config()); - - -- foreach (const vconfig &condition, filters.get_children("filter_condition")) -+ BOOST_FOREACH(const vconfig &condition, filters.get_children("filter_condition")) - { - if (!game_events::conditional_passed(condition)) { - return false; - } - } - -- foreach (const vconfig &f, filters.get_children("filter")) -+ BOOST_FOREACH(const vconfig &f, filters.get_children("filter")) - { - if (unit1 == units->end() || !game_events::unit_matches_filter(*unit1, f)) { - return false; -@@ -3046,7 +3047,7 @@ - } - } - -- foreach (const vconfig &f, filters.get_children("filter_side")) -+ BOOST_FOREACH(const vconfig &f, filters.get_children("filter_side")) - { - side_filter ssf(f); - const int current_side = resources::controller->current_side(); -@@ -3055,7 +3056,7 @@ - - vconfig::child_list special_filters = filters.get_children("filter_attack"); - bool special_matches = special_filters.empty(); -- foreach (const vconfig &f, special_filters) -+ BOOST_FOREACH(const vconfig &f, special_filters) - { - if (unit1 != units->end() && game_events::matches_special_filter(ev.data.child("first"), f)) { - special_matches = true; -@@ -3068,7 +3069,7 @@ - return false; - } - -- foreach (const vconfig &f, filters.get_children("filter_second")) -+ BOOST_FOREACH(const vconfig &f, filters.get_children("filter_second")) - { - if (unit2 == units->end() || !game_events::unit_matches_filter(*unit2, f)) { - return false; -@@ -3080,7 +3081,7 @@ - - special_filters = filters.get_children("filter_second_attack"); - special_matches = special_filters.empty(); -- foreach (const vconfig &f, special_filters) -+ BOOST_FOREACH(const vconfig &f, special_filters) - { - if (unit2 != units->end() && game_events::matches_special_filter(ev.data.child("second"), f)) { - special_matches = true; -@@ -3275,17 +3276,17 @@ - : variable_manager() - { - assert(!manager_running); -- foreach (const config &ev, cfg.child_range("event")) { -+ BOOST_FOREACH(const config &ev, cfg.child_range("event")) { - event_handlers.add_event_handler(game_events::event_handler(ev)); - } -- foreach (const std::string &id, utils::split(cfg["unit_wml_ids"])) { -+ BOOST_FOREACH(const std::string &id, utils::split(cfg["unit_wml_ids"])) { - unit_wml_ids.insert(id); - } - - resources::lua_kernel = new LuaKernel(cfg); - manager_running = true; - -- foreach (static_wml_action_map::value_type &action, static_wml_actions) { -+ BOOST_FOREACH(static_wml_action_map::value_type &action, static_wml_actions) { - resources::lua_kernel->set_wml_action(action.first, action.second); - } - -@@ -3298,7 +3299,7 @@ - } - int wmi_count = 0; - typedef std::pair<std::string, wml_menu_item *> item; -- foreach (const item &itor, resources::state_of_game->wml_menu_items) { -+ BOOST_FOREACH(const item &itor, resources::state_of_game->wml_menu_items) { - if (!itor.second->command.empty()) { - event_handlers.add_event_handler(game_events::event_handler(itor.second->command, true)); - } -@@ -3312,7 +3313,7 @@ - void write_events(config& cfg) - { - assert(manager_running); -- foreach (const game_events::event_handler &eh, event_handlers) { -+ BOOST_FOREACH(const game_events::event_handler &eh, event_handlers) { - if (eh.disabled() || eh.is_menu_item()) continue; - cfg.add_child("event", eh.get_config()); - } -@@ -3385,7 +3386,7 @@ - if(std::find(unit_wml_ids.begin(),unit_wml_ids.end(),type) != unit_wml_ids.end()) return; - unit_wml_ids.insert(type); - } -- foreach (const config &new_ev, cfgs) { -+ BOOST_FOREACH(const config &new_ev, cfgs) { - if(type.empty() && new_ev["id"].empty()) - { - WRN_NG << "attempt to add an [event] with empty id=, ignoring \n"; -@@ -3427,7 +3428,7 @@ - - if(!lg::debug.dont_log("event_handler")) { - std::stringstream ss; -- foreach(const game_events::queued_event& ev, events_queue) { -+ BOOST_FOREACH(const game_events::queued_event& ev, events_queue) { - ss << "name=" << ev.name << "; "; - } - DBG_EH << "processing queued events: " << ss.str() << "\n"; -@@ -3454,7 +3455,7 @@ - - bool init_event_vars = true; - -- foreach(game_events::event_handler& handler, event_handlers) { -+ BOOST_FOREACH(game_events::event_handler& handler, event_handlers) { - if(!handler.matches_name(event_name)) - continue; - // Set the variables for the event -Index: src/formula_tokenizer.cpp -=================================================================== ---- src/formula_tokenizer.cpp (revision 54624) -+++ src/formula_tokenizer.cpp (revision 54625) -@@ -13,7 +13,6 @@ - - #include <sstream> - --#include "foreach.hpp" - #include "formula_tokenizer.hpp" - - namespace formula_tokenizer -Index: src/playcampaign.cpp -=================================================================== ---- src/playcampaign.cpp (revision 54624) -+++ src/playcampaign.cpp (revision 54625) -@@ -21,7 +21,6 @@ - - #include "global.hpp" - --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "gui/dialogs/message.hpp" - #include "gui/dialogs/transient_message.hpp" -@@ -41,6 +40,8 @@ - #include "wml_exception.hpp" - #include "formula_string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - #define LOG_G LOG_STREAM(info, lg::general) - - static lg::log_domain log_engine("engine"); -@@ -260,7 +261,7 @@ - controller_map controllers; - - if(io_type == IO_SERVER) { -- foreach (config &side, const_cast<config *>(scenario)->child_range("side")) -+ BOOST_FOREACH(config &side, const_cast<config *>(scenario)->child_range("side")) - { - if (side["current_player"] == preferences::login()) { - side["controller"] = preferences::client_type(); -@@ -280,7 +281,7 @@ - scenario = &starting_pos; - } - -- foreach (config &side, starting_pos.child_range("side")) -+ BOOST_FOREACH(config &side, starting_pos.child_range("side")) - { - if (side["current_player"] == preferences::login()) { - side["controller"] = preferences::client_type(); -@@ -474,7 +475,7 @@ - - if(io_type == IO_SERVER && scenario != NULL) { - // Tweaks sides to adapt controllers and descriptions. -- foreach (config &side, starting_pos.child_range("side")) -+ BOOST_FOREACH(config &side, starting_pos.child_range("side")) - { - std::string id = side["save_id"]; - if(id.empty()) { -@@ -547,7 +548,7 @@ - next_cfg.add_child("replay_start", gamestate.starting_pos); - //move side information from gamestate into the config that is sent to the other clients - next_cfg.clear_children("side"); -- foreach (config& side, gamestate.starting_pos.child_range("side")) -+ BOOST_FOREACH(config& side, gamestate.starting_pos.child_range("side")) - next_cfg.add_child("side", side); - - network::send_data(cfg, 0); -Index: src/multiplayer.cpp -=================================================================== ---- src/multiplayer.cpp (revision 54624) -+++ src/multiplayer.cpp (revision 54625) -@@ -40,6 +40,7 @@ - #include "unit_id.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_network("network"); - #define LOG_NW LOG_STREAM(info, log_network) -@@ -573,7 +574,7 @@ - while (true) { - const config &cfg = game_config.child("lobby_music"); - if (cfg) { -- foreach (const config &i, cfg.child_range("music")) { -+ BOOST_FOREACH(const config &i, cfg.child_range("music")) { - sound::play_music_config(i); - } - sound::commit_music_changes(); -Index: src/terrain_filter.cpp -=================================================================== ---- src/terrain_filter.cpp (revision 54624) -+++ src/terrain_filter.cpp (revision 54625) -@@ -19,7 +19,6 @@ - - #include "actions.hpp" - #include "config.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "map.hpp" - #include "resources.hpp" -@@ -27,6 +26,8 @@ - #include "tod_manager.hpp" - #include "variable.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define ERR_NG LOG_STREAM(err, log_engine) - -@@ -129,7 +130,7 @@ - } - } else { - bool found = false; -- foreach (const config &cfg, vi.as_array()) { -+ BOOST_FOREACH(const config &cfg, vi.as_array()) { - if (map_location(cfg, NULL) == loc) { - found = true; - break; -@@ -358,7 +359,7 @@ - } - } else { - std::set<map_location> findin_locs; -- foreach (const config &cfg, vi.as_array()) { -+ BOOST_FOREACH(const config &cfg, vi.as_array()) { - map_location test_loc(cfg, NULL); - if (xy_set.count(test_loc)) { - findin_locs.insert(test_loc); -Index: src/playturn.cpp -=================================================================== ---- src/playturn.cpp (revision 54624) -+++ src/playturn.cpp (revision 54625) -@@ -16,7 +16,6 @@ - #include "playturn.hpp" - - #include "construct_dialog.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_end_exceptions.hpp" - #include "game_preferences.hpp" -@@ -31,6 +30,8 @@ - #include "formula_string_utils.hpp" - #include "play_controller.hpp" - -+#include <boost/foreach.hpp> -+ - #include <ctime> - - static lg::log_domain log_network("network"); -@@ -124,11 +125,11 @@ - preferences::message_bell()); - } - -- foreach (const config &ob, cfg.child_range("observer")) { -+ BOOST_FOREACH(const config &ob, cfg.child_range("observer")) { - resources::screen->add_observer(ob["name"]); - } - -- foreach (const config &ob, cfg.child_range("observer_quit")) { -+ BOOST_FOREACH(const config &ob, cfg.child_range("observer_quit")) { - resources::screen->remove_observer(ob["name"]); - } - -@@ -147,7 +148,7 @@ - const config& change = cfg.child_or_empty("change_controller"); - const std::string& side_drop = cfg["side_drop"].str(); - -- foreach (const config &t, turns) -+ BOOST_FOREACH(const config &t, turns) - { - handle_turn(turn_end, t, skip_replay, backlog); - } -@@ -240,7 +241,7 @@ - options.push_back(_("Abort game")); - - //get all observers in as options to transfer control -- foreach (const std::string &ob, resources::screen->observers()) -+ BOOST_FOREACH(const std::string &ob, resources::screen->observers()) - { - t_vars["player"] = ob; - options.push_back(vgettext("Replace with $player", t_vars)); -@@ -248,7 +249,7 @@ - } - - //get all allies in as options to transfer control -- foreach (team &t, *resources::teams) -+ BOOST_FOREACH(team &t, *resources::teams) - { - if (!t.is_enemy(side) && !t.is_human() && !t.is_ai() && !t.is_empty() - && t.current_player() != tm.current_player()) -Index: src/tod_manager.cpp -=================================================================== ---- src/tod_manager.cpp (revision 54624) -+++ src/tod_manager.cpp (revision 54625) -@@ -12,7 +12,6 @@ - See the COPYING file for more details. - */ - --#include "foreach.hpp" - #include "tod_manager.hpp" - #include "wml_exception.hpp" - #include "gettext.hpp" -@@ -25,6 +24,8 @@ - #include "unit.hpp" - #include "unit_abilities.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define LOG_NG LOG_STREAM(info, log_engine) - -@@ -279,7 +280,7 @@ - void tod_manager::set_new_current_times(const int new_current_turn_number) - { - currentTime_ = calculate_current_time(times_.size(), new_current_turn_number, currentTime_); -- foreach(area_time_of_day& area, areas_) { -+ BOOST_FOREACH(area_time_of_day& area, areas_) { - area.currentTime = calculate_current_time( - area.times.size(), - new_current_turn_number, -Index: src/multiplayer_create.cpp -=================================================================== ---- src/multiplayer_create.cpp (revision 54624) -+++ src/multiplayer_create.cpp (revision 54625) -@@ -20,7 +20,6 @@ - - #include "global.hpp" - --#include "foreach.hpp" - #include "gettext.hpp" - #include "game_display.hpp" - #include "game_preferences.hpp" -@@ -40,6 +39,8 @@ - #include "wml_separators.hpp" - #include "formula_string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_config("config"); - #define ERR_CF LOG_STREAM(err, log_config) - -@@ -127,7 +128,7 @@ - - // Standard maps - i = 0; -- foreach (const config &j, cfg.child_range("multiplayer")) -+ BOOST_FOREACH(const config &j, cfg.child_range("multiplayer")) - { - if (j["allow_new_game"].to_bool(true)) - { -@@ -217,7 +218,7 @@ - - // The possible eras to play - std::vector<std::string> eras; -- foreach (const config &er, cfg.child_range("era")) { -+ BOOST_FOREACH(const config &er, cfg.child_range("era")) { - eras.push_back(er["name"]); - } - if(eras.empty()) { -@@ -547,7 +548,7 @@ - } - - int nsides = 0; -- foreach (const config &k, parameters_.scenario_data.child_range("side")) { -+ BOOST_FOREACH(const config &k, parameters_.scenario_data.child_range("side")) { - if (k["allow_player"].to_bool(true)) ++nsides; - } - -Index: src/commandline_options.cpp -=================================================================== ---- src/commandline_options.cpp (revision 54624) -+++ src/commandline_options.cpp (revision 54625) -@@ -14,12 +14,12 @@ - */ - - #include "commandline_options.hpp" --#include "foreach.hpp" - #include "serialization/string_utils.hpp" - #include "util.hpp" - #include "lua/llimits.h" - - #include <boost/version.hpp> -+#include <boost/foreach.hpp> - - namespace po = boost::program_options; - -@@ -374,7 +374,7 @@ - void commandline_options::parse_log_domains_(const std::string &domains_string, const int severity) - { - const std::vector<std::string> domains = utils::split(domains_string, ','); -- foreach (const std::string& domain, domains) -+ BOOST_FOREACH(const std::string& domain, domains) - { - if (!log) - log = std::vector<boost::tuple<int, std::string> >(); -@@ -396,7 +396,7 @@ - { - std::vector<boost::tuple<unsigned int,std::string> > vec; - boost::tuple<unsigned int,std::string> elem; -- foreach(const std::string &s, strings) -+ BOOST_FOREACH(const std::string &s, strings) - { - const std::vector<std::string> tokens = utils::split(s, separator); - if (tokens.size()!=2) -@@ -415,7 +415,7 @@ - { - std::vector<boost::tuple<unsigned int,std::string,std::string> > vec; - boost::tuple<unsigned int,std::string,std::string> elem; -- foreach(const std::string &s, strings) -+ BOOST_FOREACH(const std::string &s, strings) - { - const std::vector<std::string> tokens = utils::split(s, separator); - if (tokens.size()!=3) -Index: src/gui/dialogs/editor_set_starting_position.cpp -=================================================================== ---- src/gui/dialogs/editor_set_starting_position.cpp (revision 54624) -+++ src/gui/dialogs/editor_set_starting_position.cpp (revision 54625) -@@ -17,7 +17,7 @@ - - #include "gui/dialogs/editor_set_starting_position.hpp" - --#include "foreach.hpp" -+#include <boost/foreach.hpp> - #include "formatter.hpp" - #include "formula_string_utils.hpp" - #include "gettext.hpp" -Index: src/gui/dialogs/gamestate_inspector.cpp -=================================================================== ---- src/gui/dialogs/gamestate_inspector.cpp (revision 54624) -+++ src/gui/dialogs/gamestate_inspector.cpp (revision 54625) -@@ -27,7 +27,6 @@ - #include "gui/widgets/settings.hpp" - #include "gui/widgets/window.hpp" - --#include "../../foreach.hpp" - #include "../../gamestatus.hpp" - #include "../../resources.hpp" - #include "../../team.hpp" -@@ -36,6 +35,7 @@ - #include <vector> - #include <boost/bind.hpp> - #include <boost/shared_ptr.hpp> -+#include <boost/foreach.hpp> - - namespace gui2 { - -@@ -189,11 +189,11 @@ - ? resources::state_of_game->get_variables() - : config(); - -- foreach( const config::attribute &a, vars.attribute_range()) { -+ BOOST_FOREACH( const config::attribute &a, vars.attribute_range()) { - model_.add_row_to_stuff_list(a.first,a.first); - } - -- foreach( const config::any_child &c, vars.all_children_range()) { -+ BOOST_FOREACH( const config::any_child &c, vars.all_children_range()) { - model_.add_row_to_stuff_list("["+c.key+"]","["+c.key+"]"); - } - -@@ -214,7 +214,7 @@ - ? resources::state_of_game->get_variables() - : config(); - -- foreach( const config::attribute &a, vars.attribute_range()) { -+ BOOST_FOREACH( const config::attribute &a, vars.attribute_range()) { - if (selected==i) { - model_.set_inspect_window_text(a.second); - return; -@@ -222,7 +222,7 @@ - i++; - } - -- foreach( const config::any_child &c, vars.all_children_range()) { -+ BOOST_FOREACH( const config::any_child &c, vars.all_children_range()) { - if (selected==i) { - model_.set_inspect_window_text(c.cfg.debug()); - return; -@@ -268,7 +268,7 @@ - << '/' << i->max_experience() << " xp; " - << i->hitpoints() << '/' << i->max_hitpoints() - << " hp; "; -- foreach (const std::string &str, i->get_traits_list()) { -+ BOOST_FOREACH(const std::string &str, i->get_traits_list()) { - s << str <<" "; - } - -@@ -371,9 +371,9 @@ - : std::vector<unit>(); - - std::stringstream s; -- foreach (const unit &u, recall_list) { -+ BOOST_FOREACH(const unit &u, recall_list) { - s << "id=["<<u.id() << "] "<<u.type_id() << "; L"<<u.level()<<"; " << u.experience() <<"/" << u.max_experience()<< " xp "<< std::endl; -- foreach (const std::string &str, u.get_traits_list() ) { -+ BOOST_FOREACH(const std::string &str, u.get_traits_list() ) { - s << "\t" << str<< std::endl; - } - s << std::endl << std::endl; -@@ -388,7 +388,7 @@ - : std::vector<unit>(); - - config c; -- foreach (const unit &u, recall_list) { -+ BOOST_FOREACH(const unit &u, recall_list) { - config c_unit; - u.write(c_unit); - c.add_child("unit",c_unit); -@@ -423,7 +423,7 @@ - << i->max_experience() << " xp; " - << i->hitpoints() << '/' - << i->max_hitpoints()<<" hp.\n"; -- foreach (const std::string &str, i->get_traits_list() ) { -+ BOOST_FOREACH(const std::string &str, i->get_traits_list() ) { - s << "\t" << str<< std::endl; - } - s << std::endl << std::endl; -@@ -457,7 +457,7 @@ - boost::shared_ptr<single_mode_controller>(new variable_mode_controller("variables",model_))); - sm_controllers_.push_back( - boost::shared_ptr<single_mode_controller>(new unit_mode_controller("units",model_))); -- //foreach team -+ //BOOST_FOREACHteam - int sides = resources::teams - ? static_cast<int>((*resources::teams).size()) - : 0; -@@ -481,7 +481,7 @@ - void show_stuff_types_list() - { - model_.clear_stuff_types_list(); -- foreach (boost::shared_ptr<single_mode_controller> sm_controller, sm_controllers_ ) { -+ BOOST_FOREACH(boost::shared_ptr<single_mode_controller> sm_controller, sm_controllers_ ) { - model_.add_row_to_stuff_types_list(sm_controller->name(),sm_controller->name()); - } - } -Index: src/gui/dialogs/unit_attack.cpp -=================================================================== ---- src/gui/dialogs/unit_attack.cpp (revision 54624) -+++ src/gui/dialogs/unit_attack.cpp (revision 54625) -@@ -27,6 +27,8 @@ - #include "gui/widgets/window.hpp" - #include "unit.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - /*WIKI -@@ -106,7 +108,7 @@ - const config empty; - attack_type no_weapon(empty); - -- foreach(const battle_context& weapon, weapons) { -+ BOOST_FOREACH(const battle_context& weapon, weapons) { - const battle_context_unit_stats& attacker = - weapon.get_attacker_stats(); - -Index: src/gui/dialogs/data_manage.cpp -=================================================================== ---- src/gui/dialogs/data_manage.cpp (revision 54624) -+++ src/gui/dialogs/data_manage.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/data_manage.hpp" - --#include "foreach.hpp" - #include "formula_string_utils.hpp" - #include "game_config.hpp" - #include "game_preferences.hpp" -@@ -43,6 +42,7 @@ - - #include <cctype> - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - namespace gui2 { - -@@ -101,7 +101,7 @@ - tlistbox& list = find_widget<tlistbox>(&window, "persist_list", false); - list.clear(); - -- foreach(const savegame::save_info game, games) { -+ BOOST_FOREACH(const savegame::save_info game, games) { - std::map<std::string, string_map> data; - string_map item; - -@@ -142,7 +142,7 @@ - find_widget<tlabel>(*it, "filename", false); - - bool found = false; -- foreach (const std::string& word, words){ -+ BOOST_FOREACH(const std::string& word, words){ - found = std::search(filename_label.label().str().begin() - , filename_label.label().str().end() - , word.begin(), word.end() -Index: src/gui/dialogs/dialog.cpp -=================================================================== ---- src/gui/dialogs/dialog.cpp (revision 54624) -+++ src/gui/dialogs/dialog.cpp (revision 54625) -@@ -17,16 +17,17 @@ - - #include "gui/dialogs/dialog.hpp" - --#include "foreach.hpp" - #include "gui/dialogs/field.hpp" - #include "gui/widgets/integer_selector.hpp" - #include "video.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - tdialog::~tdialog() - { -- foreach(tfield_* field, fields_) { -+ BOOST_FOREACH(tfield_* field, fields_) { - delete field; - } - } -@@ -193,7 +194,7 @@ - - void tdialog::init_fields(twindow& window) - { -- foreach(tfield_* field, fields_) { -+ BOOST_FOREACH(tfield_* field, fields_) { - field->attach_to_window(window); - field->widget_init(window); - } -@@ -207,7 +208,7 @@ - - void tdialog::finalize_fields(twindow& window, const bool save_fields) - { -- foreach(tfield_* field, fields_) { -+ BOOST_FOREACH(tfield_* field, fields_) { - if(save_fields) { - field->widget_finalize(window); - } -Index: src/gui/dialogs/debug_clock.cpp -=================================================================== ---- src/gui/dialogs/debug_clock.cpp (revision 54624) -+++ src/gui/dialogs/debug_clock.cpp (revision 54625) -@@ -24,6 +24,7 @@ - #include "gui/widgets/progress_bar.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #include <ctime> - -@@ -153,7 +154,7 @@ - } - - if(clock_) { -- foreach(tcanvas& canvas, clock_->canvas()) { -+ BOOST_FOREACH(tcanvas& canvas, clock_->canvas()) { - canvas.set_variable("hour", variant(hour_stamp)); - canvas.set_variable("minute", variant(minute_stamp)); - canvas.set_variable("second", variant(second_stamp)); -Index: src/gui/dialogs/wml_message.cpp -=================================================================== ---- src/gui/dialogs/wml_message.cpp (revision 54624) -+++ src/gui/dialogs/wml_message.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/wml_message.hpp" - --#include "foreach.hpp" - #include "gui/auxiliary/old_markup.hpp" - #include "gui/widgets/button.hpp" - #include "gui/widgets/label.hpp" -Index: src/gui/dialogs/simple_item_selector.cpp -=================================================================== ---- src/gui/dialogs/simple_item_selector.cpp (revision 54624) -+++ src/gui/dialogs/simple_item_selector.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/simple_item_selector.hpp" - --#include "foreach.hpp" - #include "gui/widgets/button.hpp" - #include "gui/widgets/label.hpp" - #ifdef GUI2_EXPERIMENTAL_LISTBOX -@@ -28,6 +27,8 @@ - #include "gui/widgets/settings.hpp" - #include "gui/widgets/window.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - /*WIKI -@@ -79,7 +80,7 @@ - tlistbox& list = find_widget<tlistbox>(&window, "listbox", false); - window.keyboard_capture(&list); - -- foreach(const tsimple_item_selector::item_type& it, items_) { -+ BOOST_FOREACH(const tsimple_item_selector::item_type& it, items_) { - std::map<std::string, string_map> data; - string_map column; - -Index: src/gui/dialogs/game_load.cpp -=================================================================== ---- src/gui/dialogs/game_load.cpp (revision 54624) -+++ src/gui/dialogs/game_load.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/game_load.hpp" - --#include "foreach.hpp" - #include "formula_string_utils.hpp" - #include "gettext.hpp" - #include "game_config.hpp" -@@ -43,6 +42,7 @@ - - #include <cctype> - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - namespace gui2 { - -@@ -151,7 +151,7 @@ - tlistbox& list = find_widget<tlistbox>(&window, "savegame_list", false); - list.clear(); - -- foreach(const savegame::save_info game, games) { -+ BOOST_FOREACH(const savegame::save_info game, games) { - std::map<std::string, string_map> data; - string_map item; - -@@ -193,7 +193,7 @@ - find_widget<tlabel>(*it, "filename", false); - - bool found = false; -- foreach (const std::string& word, words){ -+ BOOST_FOREACH(const std::string& word, words){ - found = std::search(filename_label.label().str().begin() - , filename_label.label().str().end() - , word.begin(), word.end() -Index: src/gui/dialogs/lobby_main.cpp -=================================================================== ---- src/gui/dialogs/lobby_main.cpp (revision 54624) -+++ src/gui/dialogs/lobby_main.cpp (revision 54625) -@@ -38,7 +38,6 @@ - #include "gui/widgets/toggle_panel.hpp" - #include "gui/widgets/tree_view_node.hpp" - --#include "foreach.hpp" - #include "formula_string_utils.hpp" - #include "game_preferences.hpp" - #include "gettext.hpp" -@@ -50,6 +49,7 @@ - #include "sound.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_network("network"); - #define DBG_NW LOG_STREAM(debug, log_network) -@@ -499,14 +499,14 @@ - void modify_grid_with_data(tgrid* grid, const std::map<std::string, string_map>& map) - { - typedef std::map<std::string, string_map> strstrmap; -- foreach (const strstrmap::value_type v, map) { -+ BOOST_FOREACH(const strstrmap::value_type v, map) { - const std::string& key = v.first; - const string_map& strmap = v.second; - twidget* w = grid->find(key, false); - if (w == NULL) continue; - tcontrol* c = dynamic_cast<tcontrol*>(w); - if (c == NULL) continue; -- foreach (const string_map::value_type& vv, strmap) { -+ BOOST_FOREACH(const string_map::value_type& vv, strmap) { - if (vv.first == "label") { - c->set_label(vv.second); - } else if (vv.first == "tooltip") { -@@ -816,7 +816,7 @@ - player_list_.other_games.tree->clear(); - player_list_.other_rooms.tree->clear(); - -- foreach (user_info* userptr, lobby_info_.users_sorted()) -+ BOOST_FOREACH(user_info* userptr, lobby_info_.users_sorted()) - { - user_info& user = *userptr; - tsub_player_list* target_list(NULL); -@@ -1093,7 +1093,7 @@ - - tlobby_chat_window* tlobby_main::search_create_window(const std::string& name, bool whisper, bool open_new) - { -- foreach (tlobby_chat_window& t, open_windows_) { -+ BOOST_FOREACH(tlobby_chat_window& t, open_windows_) { - if (t.name == name && t.whisper == whisper) return &t; - } - if (open_new) { -@@ -1477,7 +1477,7 @@ - //TODO: this should really open a nice join room dialog instead - std::stringstream ss; - ss << "Rooms:"; -- foreach (const config& r, rooms.child_range("room")) { -+ BOOST_FOREACH(const config& r, rooms.child_range("room")) { - ss << " " << r["name"]; - } - add_active_window_message("server", ss.str()); -@@ -1667,7 +1667,7 @@ - const std::vector<user_info>& match_infos = lobby_info_.users(); - std::vector<std::string> matches; - -- foreach(const user_info& ui, match_infos) { -+ BOOST_FOREACH(const user_info& ui, match_infos) { - if(ui.name != preferences::login()) { - matches.push_back(ui.name); - } -@@ -1694,7 +1694,7 @@ - { - lobby_info_.clear_game_filter(); - -- foreach (const std::string& s, utils::split(filter_text_->get_value(), ' ')) { -+ BOOST_FOREACH(const std::string& s, utils::split(filter_text_->get_value(), ' ')) { - lobby_info_.add_game_filter(new game_filter_general_string_part(s)); - } - //TODO: make changing friend/ignore lists trigger a refresh -Index: src/gui/dialogs/campaign_difficulty.cpp -=================================================================== ---- src/gui/dialogs/campaign_difficulty.cpp (revision 54624) -+++ src/gui/dialogs/campaign_difficulty.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/campaign_difficulty.hpp" - --#include "foreach.hpp" - #include "gui/auxiliary/old_markup.hpp" - #ifdef GUI2_EXPERIMENTAL_LISTBOX - #include "gui/widgets/list.hpp" -@@ -27,6 +26,8 @@ - #include "gui/widgets/settings.hpp" - #include "gui/widgets/window.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - /*WIKI -@@ -65,7 +66,7 @@ - tcampaign_difficulty::tcampaign_difficulty(const std::vector<std::string>& items) - : index_(-1), items_() - { -- foreach(const std::string& it, items) { -+ BOOST_FOREACH(const std::string& it, items) { - items_.push_back(tlegacy_menu_item(it)); - } - } -@@ -77,7 +78,7 @@ - - std::map<std::string, string_map> data; - -- foreach(const tlegacy_menu_item& item, items_) { -+ BOOST_FOREACH(const tlegacy_menu_item& item, items_) { - if(item.is_default()) { - index_ = list.get_item_count(); - } -Index: src/gui/dialogs/unit_create.cpp -=================================================================== ---- src/gui/dialogs/unit_create.cpp (revision 54624) -+++ src/gui/dialogs/unit_create.cpp (revision 54625) -@@ -27,9 +27,10 @@ - #include "gui/widgets/settings.hpp" - #include "gui/widgets/toggle_button.hpp" - #include "gui/widgets/window.hpp" --#include "foreach.hpp" - #include "unit_types.hpp" - -+#include <boost/foreach.hpp> -+ - namespace { - static std::string last_chosen_type_id = ""; - static unit_race::GENDER last_gender = unit_race::MALE; -@@ -109,7 +110,7 @@ - - std::vector< std::string > type_labels, race_labels; - -- foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types()) -+ BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types()) - { - unit_types.find(i.first, unit_type::HELP_INDEX); - -Index: src/gui/dialogs/formula_debugger.cpp -=================================================================== ---- src/gui/dialogs/formula_debugger.cpp (revision 54624) -+++ src/gui/dialogs/formula_debugger.cpp (revision 54625) -@@ -21,10 +21,10 @@ - #include "gui/widgets/button.hpp" - #include "gui/widgets/settings.hpp" - #include "gui/widgets/window.hpp" --#include "../../foreach.hpp" - #include "../../formula_debugger.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - namespace gui2 { - -@@ -73,7 +73,7 @@ - std::stringstream stack_text; - std::string indent = " "; - int c = 0; -- foreach (const game_logic::debug_info &i, fdb_.get_call_stack()) { -+ BOOST_FOREACH(const game_logic::debug_info &i, fdb_.get_call_stack()) { - for(int d = 0; d < c; ++d) { - stack_text << indent; - } -@@ -92,7 +92,7 @@ - &window, "execution", false, true); - - std::stringstream execution_text; -- foreach (const game_logic::debug_info &i, fdb_.get_execution_trace()) { -+ BOOST_FOREACH(const game_logic::debug_info &i, fdb_.get_execution_trace()) { - for(int d = 0; d < i.level(); ++d) { - execution_text << indent; - } -Index: src/gui/dialogs/title_screen.cpp -=================================================================== ---- src/gui/dialogs/title_screen.cpp (revision 54624) -+++ src/gui/dialogs/title_screen.cpp (revision 54625) -@@ -35,6 +35,7 @@ - #include "preferences_display.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #include <algorithm> - -@@ -306,7 +307,7 @@ - WRN_CF << "There are not tips of day available.\n"; - } - -- foreach(const ttip& tip, tips) { -+ BOOST_FOREACH(const ttip& tip, tips) { - - string_map widget; - std::map<std::string, string_map> page; -Index: src/gui/dialogs/addon_list.cpp -=================================================================== ---- src/gui/dialogs/addon_list.cpp (revision 54624) -+++ src/gui/dialogs/addon_list.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/addon_list.hpp" - --#include "foreach.hpp" - #ifdef GUI2_EXPERIMENTAL_LISTBOX - #include "gui/widgets/list.hpp" - #else -@@ -26,6 +25,8 @@ - #include "gui/widgets/settings.hpp" - #include "gui/widgets/window.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - /*WIKI -@@ -70,7 +71,7 @@ - * @todo do we really want to keep the length limit for the various - * items? - */ -- foreach(const config &c, cfg_.child_range("campaign")) { -+ BOOST_FOREACH(const config &c, cfg_.child_range("campaign")) { - std::map<std::string, string_map> data; - string_map item; - -Index: src/gui/dialogs/campaign_selection.cpp -=================================================================== ---- src/gui/dialogs/campaign_selection.cpp (revision 54624) -+++ src/gui/dialogs/campaign_selection.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/campaign_selection.hpp" - --#include "foreach.hpp" - #include "gui/dialogs/helper.hpp" - #include "gui/widgets/image.hpp" - #ifdef GUI2_EXPERIMENTAL_LISTBOX -@@ -34,6 +33,7 @@ - #include "serialization/string_utils.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - namespace gui2 { - -@@ -140,7 +140,7 @@ - &window, "campaign_details", false); - - unsigned id = 0; -- foreach(const config &campaign, campaigns_) { -+ BOOST_FOREACH(const config &campaign, campaigns_) { - - /*** Add tree item ***/ - tree_group_field["label"] = campaign["icon"]; -@@ -206,7 +206,7 @@ - tmulti_page& multi_page = find_widget<tmulti_page>( - &window, "campaign_details", false); - -- foreach (const config &c, campaigns_) { -+ BOOST_FOREACH(const config &c, campaigns_) { - - /*** Add list item ***/ - string_map list_item; -Index: src/gui/dialogs/mp_connect.cpp -=================================================================== ---- src/gui/dialogs/mp_connect.cpp (revision 54624) -+++ src/gui/dialogs/mp_connect.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/mp_connect.hpp" - --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "gui/dialogs/field.hpp" - #include "gui/widgets/button.hpp" -@@ -30,6 +29,7 @@ - #include "video.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - namespace gui2 { - -@@ -90,7 +90,7 @@ - const std::vector<game_config::server_info>& - pref_servers = preferences::server_list(); - -- foreach(const game_config::server_info& server, pref_servers) { -+ BOOST_FOREACH(const game_config::server_info& server, pref_servers) { - - std::map<std::string, string_map> data; - string_map item; -Index: src/gui/dialogs/language_selection.cpp -=================================================================== ---- src/gui/dialogs/language_selection.cpp (revision 54624) -+++ src/gui/dialogs/language_selection.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/language_selection.hpp" - --#include "foreach.hpp" - #ifdef GUI2_EXPERIMENTAL_LISTBOX - #include "gui/widgets/list.hpp" - #else -@@ -28,6 +27,8 @@ - #include "language.hpp" - #include "preferences.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - /*WIKI -@@ -65,7 +66,7 @@ - - const std::vector<language_def>& languages = get_languages(); - const language_def& current_language = get_language(); -- foreach(const language_def& lang, languages) { -+ BOOST_FOREACH(const language_def& lang, languages) { - string_map item; - item.insert(std::make_pair("label", lang.language)); - -Index: src/gui/dialogs/mp_create_game.cpp -=================================================================== ---- src/gui/dialogs/mp_create_game.cpp (revision 54624) -+++ src/gui/dialogs/mp_create_game.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/mp_create_game.hpp" - --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "gettext.hpp" - #include "gui/dialogs/field.hpp" -@@ -35,6 +34,7 @@ - #ifdef GUI2_EXPERIMENTAL_LISTBOX - #include <boost/bind.hpp> - #endif -+#include <boost/foreach.hpp> - namespace gui2 { - - REGISTER_DIALOG(mp_create_game) -@@ -101,7 +101,7 @@ - std::vector<std::string> maps; - get_files_in_dir(get_user_data_dir() + "/editor/maps", &maps, NULL, FILE_NAME_ONLY); - -- foreach(const std::string& map, maps) { -+ BOOST_FOREACH(const std::string& map, maps) { - std::map<std::string, t_string> item; - item.insert(std::make_pair("label", map)); - list->add_row(item); -@@ -110,7 +110,7 @@ - - // Standard maps - int i = 0; -- foreach (const config &map, cfg_.child_range("multiplayer")) -+ BOOST_FOREACH(const config &map, cfg_.child_range("multiplayer")) - { - if (map["allow_new_game"].to_bool(true)) { - string_map item; -Index: src/gui/dialogs/network_transmission.cpp -=================================================================== ---- src/gui/dialogs/network_transmission.cpp (revision 54624) -+++ src/gui/dialogs/network_transmission.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/network_transmission.hpp" - --#include "foreach.hpp" - #include "formula_string_utils.hpp" - #include "gettext.hpp" - #include "gui/widgets/button.hpp" -Index: src/gui/dialogs/addon/description.cpp -=================================================================== ---- src/gui/dialogs/addon/description.cpp (revision 54624) -+++ src/gui/dialogs/addon/description.cpp (revision 54625) -@@ -17,14 +17,15 @@ - - #include "gui/dialogs/addon/description.hpp" - --#include "foreach.hpp" - #include "gui/widgets/settings.hpp" - #include "language.hpp" - -+#include <boost/foreach.hpp> -+ - namespace { - std::string langcode_to_string(const std::string& lcode) - { -- foreach(const language_def& ld, get_languages()) { -+ BOOST_FOREACH(const language_def& ld, get_languages()) { - if(ld.localename == lcode || ld.localename.substr(0, 2) == lcode) { - return ld.language; - } -@@ -90,7 +91,7 @@ - - std::string languages; - -- foreach(const std::string& lc, addon.translations) { -+ BOOST_FOREACH(const std::string& lc, addon.translations) { - const std::string& langlabel = langcode_to_string(lc); - if(!langlabel.empty()) { - if(!languages.empty()) { -Index: src/gui/dialogs/addon/uninstall_list.cpp -=================================================================== ---- src/gui/dialogs/addon/uninstall_list.cpp (revision 54624) -+++ src/gui/dialogs/addon/uninstall_list.cpp (revision 54625) -@@ -15,7 +15,6 @@ - - #include "gui/dialogs/addon/uninstall_list.hpp" - --#include "foreach.hpp" - #include "gui/widgets/grid.hpp" - #ifdef GUI2_EXPERIMENTAL_LISTBOX - #include "gui/widgets/list.hpp" -@@ -26,6 +25,8 @@ - #include "gui/widgets/toggle_button.hpp" - #include "gui/widgets/window.hpp" - -+#include <boost/foreach.hpp> -+ - #include <algorithm> - - namespace { -@@ -50,7 +51,7 @@ - this->names_.clear(); - this->selections_.clear(); - -- foreach(const std::string& id, this->ids_) { -+ BOOST_FOREACH(const std::string& id, this->ids_) { - this->names_.push_back(make_addon_name(id)); - this->selections_[id] = false; - -@@ -87,7 +88,7 @@ - std::vector<std::string> retv; - - typedef std::map<std::string, bool> selections_map_type; -- foreach(const selections_map_type::value_type& entry, this->selections_) { -+ BOOST_FOREACH(const selections_map_type::value_type& entry, this->selections_) { - if(entry.second) { - retv.push_back(entry.first); - } -Index: src/gui/dialogs/chat_log.cpp -=================================================================== ---- src/gui/dialogs/chat_log.cpp (revision 54624) -+++ src/gui/dialogs/chat_log.cpp (revision 54625) -@@ -28,7 +28,6 @@ - #include "gui/widgets/window.hpp" - #include "gui/widgets/slider.hpp" - --#include "../../foreach.hpp" - #include "../../gamestatus.hpp" - #include "../../log.hpp" - #include "../../resources.hpp" -@@ -38,6 +37,7 @@ - #include <vector> - #include <boost/bind.hpp> - #include <boost/shared_ptr.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_chat_log("chat_log"); - #define DBG_CHAT_LOG LOG_STREAM(debug, log_chat_log) -@@ -113,7 +113,7 @@ - std::stringstream str; - LOG_CHAT_LOG << "entering tchat_log::model::add_row_to_chat_message_list\n"; - if (first<last) { -- foreach (const chat_msg &t, make_pair(chat_log_history.begin()+first,chat_log_history.begin()+last)) -+ BOOST_FOREACH(const chat_msg &t, make_pair(chat_log_history.begin()+first,chat_log_history.begin()+last)) - { - std::string prefix("/me"); - bool me = false; -Index: src/gui/dialogs/mp_change_control.cpp -=================================================================== ---- src/gui/dialogs/mp_change_control.cpp (revision 54624) -+++ src/gui/dialogs/mp_change_control.cpp (revision 54625) -@@ -36,7 +36,7 @@ - #include <vector> - #include <boost/bind.hpp> - #include <boost/shared_ptr.hpp> --#include <gui/widgets/button.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_gui("gui/dialogs/mp_change_control"); - #define ERR_GUI LOG_STREAM(err, log_gui) -@@ -184,7 +184,7 @@ - - int i = 0; // because we need to know which row contains the controlling player - -- foreach (const std::string &nick, nicks) -+ BOOST_FOREACH(const std::string &nick, nicks) - { - if (side_number_ <= static_cast<int>(resources::teams->size()) && - resources::teams->at(side_number_-1).current_player() == nick) -Index: src/gui/dialogs/message.cpp -=================================================================== ---- src/gui/dialogs/message.cpp (revision 54624) -+++ src/gui/dialogs/message.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/message.hpp" - --#include "foreach.hpp" - #include "gettext.hpp" - #include "gui/widgets/button.hpp" - #include "gui/widgets/image.hpp" -@@ -26,6 +25,8 @@ - #include "gui/widgets/window.hpp" - #include "log.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - REGISTER_DIALOG(message) -@@ -97,7 +98,7 @@ - - void tmessage::post_show(twindow& /*window*/) - { -- foreach(tbutton_status& button_status, buttons_) { -+ BOOST_FOREACH(tbutton_status& button_status, buttons_) { - button_status.button = NULL; - } - } -Index: src/gui/dialogs/lobby/lobby_data.cpp -=================================================================== ---- src/gui/dialogs/lobby/lobby_data.cpp (revision 54624) -+++ src/gui/dialogs/lobby/lobby_data.cpp (revision 54625) -@@ -18,7 +18,6 @@ - #include "config.hpp" - #include "game_preferences.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "formula_string_utils.hpp" - #include "gettext.hpp" - #include "network.hpp" -@@ -27,6 +26,8 @@ - #include "map_exception.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - #include <iterator> - - static lg::log_domain log_config("config"); -@@ -89,7 +90,7 @@ - void room_info::process_room_members(const config& data) - { - members_.clear(); -- foreach (const config& m, data.child_range("member")) { -+ BOOST_FOREACH(const config& m, data.child_range("member")) { - members_.insert(m["name"]); - } - } -@@ -254,7 +255,7 @@ - if (const config& hashes = game_config.child("multiplayer_hashes")) { - std::string hash = game["hash"]; - bool hash_found = false; -- foreach (const config::attribute &i, hashes.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, hashes.attribute_range()) { - if (i.first == game["mp_scenario"] && i.second == hash) { - hash_found = true; - break; -@@ -357,7 +358,7 @@ - - game_filter_stack::~game_filter_stack() - { -- foreach (game_filter_base* f, filters_) { -+ BOOST_FOREACH(game_filter_base* f, filters_) { - delete f; - } - } -@@ -369,7 +370,7 @@ - - void game_filter_stack::clear() - { -- foreach (game_filter_base* f, filters_) { -+ BOOST_FOREACH(game_filter_base* f, filters_) { - delete f; - } - filters_.clear(); -@@ -377,7 +378,7 @@ - - bool game_filter_and_stack::match(const game_info &game) const - { -- foreach (game_filter_base* f, filters_) { -+ BOOST_FOREACH(game_filter_base* f, filters_) { - if (!f->match(game)) return false; - } - return true; -Index: src/gui/dialogs/lobby/lobby_info.cpp -=================================================================== ---- src/gui/dialogs/lobby/lobby_info.cpp (revision 54624) -+++ src/gui/dialogs/lobby/lobby_info.cpp (revision 54625) -@@ -18,7 +18,6 @@ - #include "config.hpp" - #include "game_preferences.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "formula_string_utils.hpp" - #include "gettext.hpp" - #include "network.hpp" -@@ -27,6 +26,8 @@ - #include "map_exception.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - #include <iterator> - - static lg::log_domain log_config("config"); -@@ -66,7 +67,7 @@ - - void lobby_info::delete_games() - { -- foreach (const game_info_map::value_type& v, games_by_id_) { -+ BOOST_FOREACH(const game_info_map::value_type& v, games_by_id_) { - delete v.second; - } - } -@@ -76,7 +77,7 @@ - std::string dump_games_map(const lobby_info::game_info_map& games) - { - std::stringstream ss; -- foreach (const lobby_info::game_info_map::value_type& v, games) { -+ BOOST_FOREACH(const lobby_info::game_info_map::value_type& v, games) { - const game_info& game = *v.second; - ss << "G" << game.id << "(" << game.name << ") " << game.display_status_string() << " "; - } -@@ -87,7 +88,7 @@ - std::string dump_games_config(const config& gamelist) - { - std::stringstream ss; -- foreach (const config& c, gamelist.child_range("game")) { -+ BOOST_FOREACH(const config& c, gamelist.child_range("game")) { - ss << "g" << c["id"] << "(" << c["name"] << ") " << c[config::diff_track_attribute] << " "; - } - ss << "\n"; -@@ -103,7 +104,7 @@ - gamelist_initialized_ = true; - delete_games(); - games_by_id_.clear(); -- foreach (const config& c, gamelist_.child("gamelist").child_range("game")) { -+ BOOST_FOREACH(const config& c, gamelist_.child("gamelist").child_range("game")) { - game_info* game = new game_info(c, game_config_); - games_by_id_[game->id] = game; - } -@@ -180,10 +181,10 @@ - { - SCOPE_LB; - users_.clear(); -- foreach (const config& c, gamelist_.child_range("user")) { -+ BOOST_FOREACH(const config& c, gamelist_.child_range("user")) { - users_.push_back(user_info(c)); - } -- foreach (user_info& ui, users_) { -+ BOOST_FOREACH(user_info& ui, users_) { - if (ui.game_id != 0) { - game_info* g = get_game_by_id(ui.game_id); - if (g == NULL) { -@@ -235,7 +236,7 @@ - - room_info* lobby_info::get_room(const std::string &name) - { -- foreach (room_info& r, rooms_) { -+ BOOST_FOREACH(room_info& r, rooms_) { - if (r.name() == name) return &r; - } - return NULL; -@@ -243,7 +244,7 @@ - - const room_info* lobby_info::get_room(const std::string &name) const - { -- foreach (const room_info& r, rooms_) { -+ BOOST_FOREACH(const room_info& r, rooms_) { - if (r.name() == name) return &r; - } - return NULL; -@@ -301,7 +302,7 @@ - games_filtered_.clear(); - games_visibility_.clear(); - games_.clear(); -- foreach (const game_info_map::value_type& v, games_by_id_) { -+ BOOST_FOREACH(const game_info_map::value_type& v, games_by_id_) { - games_.push_back(v.second); - } - } -@@ -310,7 +311,7 @@ - { - games_filtered_.clear(); - games_visibility_.clear(); -- foreach (game_info* g, games_) { -+ BOOST_FOREACH(game_info* g, games_) { - game_info& gi = *g; - bool show = game_filter_.match(gi); - if (game_filter_invert_) { -@@ -325,7 +326,7 @@ - - void lobby_info::update_user_statuses(int game_id, const room_info *room) - { -- foreach (user_info& user, users_) { -+ BOOST_FOREACH(user_info& user, users_) { - user.update_state(game_id, room); - } - } -@@ -365,7 +366,7 @@ - void lobby_info::sort_users(bool by_name, bool by_relation) - { - users_sorted_.clear(); -- foreach (user_info& u, users_) { -+ BOOST_FOREACH(user_info& u, users_) { - users_sorted_.push_back(&u); - } - if (by_name) { -Index: src/gui/dialogs/game_save.cpp -=================================================================== ---- src/gui/dialogs/game_save.cpp (revision 54624) -+++ src/gui/dialogs/game_save.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/dialogs/game_save.hpp" - --#include "foreach.hpp" - #include "gettext.hpp" - #include "gui/dialogs/field.hpp" - #include "gui/widgets/button.hpp" -Index: src/gui/widgets/settings.cpp -=================================================================== ---- src/gui/widgets/settings.cpp (revision 54624) -+++ src/gui/widgets/settings.cpp (revision 54625) -@@ -25,7 +25,6 @@ - #include "asserts.hpp" - #include "config_cache.hpp" - #include "filesystem.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/tips.hpp" -@@ -35,6 +34,8 @@ - #include "serialization/schema_validator.hpp" - #include "formula_string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - bool new_widgets = false; -@@ -283,12 +284,12 @@ - , const config& - , const char *key)> > thack; - -- foreach(thack& widget_type, registred_widget_type()) { -+ BOOST_FOREACH(thack& widget_type, registred_widget_type()) { - widget_type.second(*this, widget_type.first, cfg, NULL); - } - - /***** Window types *****/ -- foreach (const config &w, cfg.child_range("window")) { -+ BOOST_FOREACH(const config &w, cfg.child_range("window")) { - std::pair<std::string, twindow_builder> child; - child.first = child.second.read(w); - window_types.insert(child); -@@ -423,7 +424,7 @@ - const std::string& definition_type - , const std::vector<tcontrol_definition_ptr>& definitions) - { -- foreach(const tcontrol_definition_ptr& def, definitions) { -+ BOOST_FOREACH(const tcontrol_definition_ptr& def, definitions) { - - // We assume all definitions are unique if not we would leak memory. - assert(control_definition[definition_type].find(def->id) -@@ -497,7 +498,7 @@ - ERR_GUI_P << e.message; - } - // Parse guis -- foreach (const config &g, cfg.child_range("gui")) { -+ BOOST_FOREACH(const config &g, cfg.child_range("gui")) { - std::pair<std::string, tgui_definition> child; - child.first = child.second.read(g); - guis.insert(child); -Index: src/gui/widgets/window.cpp -=================================================================== ---- src/gui/widgets/window.cpp (revision 54624) -+++ src/gui/widgets/window.cpp (revision 54625) -@@ -23,7 +23,6 @@ - #include "gui/widgets/window_private.hpp" - - #include "font.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "gettext.hpp" - #include "log.hpp" -@@ -44,6 +43,7 @@ - #include "video.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__ - #define LOG_HEADER LOG_SCOPE_HEADER + ':' -@@ -716,7 +716,7 @@ - return; - } - -- foreach(std::vector<twidget*>& item, dirty_list_) { -+ BOOST_FOREACH(std::vector<twidget*>& item, dirty_list_) { - - assert(!item.empty()); - -@@ -1047,12 +1047,12 @@ - { - // evaluate the group sizes - typedef std::pair<const std::string, tlinked_size> hack; -- foreach(hack& linked_size, linked_size_) { -+ BOOST_FOREACH(hack& linked_size, linked_size_) { - - tpoint max_size(0, 0); - - // Determine the maximum size. -- foreach(twidget* widget, linked_size.second.widgets) { -+ BOOST_FOREACH(twidget* widget, linked_size.second.widgets) { - - const tpoint size = widget->get_best_size(); - -@@ -1065,7 +1065,7 @@ - } - - // Set the maximum size. -- foreach(twidget* widget, linked_size.second.widgets) { -+ BOOST_FOREACH(twidget* widget, linked_size.second.widgets) { - - tpoint size = widget->get_best_size(); - -Index: src/gui/widgets/stacked_widget.cpp -=================================================================== ---- src/gui/widgets/stacked_widget.cpp (revision 54624) -+++ src/gui/widgets/stacked_widget.cpp (revision 54625) -@@ -17,13 +17,13 @@ - - #include "gui/widgets/stacked_widget.hpp" - --#include "foreach.hpp" - #include "gui/auxiliary/widget_definition/stacked_widget.hpp" - #include "gui/auxiliary/window_builder/stacked_widget.hpp" - #include "gui/widgets/settings.hpp" - #include "gui/widgets/generator.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - namespace gui2 { - -@@ -83,7 +83,7 @@ - { - assert(generator_); - string_map empty_data; -- foreach(const tbuilder_grid_const_ptr& builder, widget_builder) { -+ BOOST_FOREACH(const tbuilder_grid_const_ptr& builder, widget_builder) { - generator_->create_item(-1, builder, empty_data, NULL); - } - swap_grid(NULL, &grid(), generator_, "_content_grid"); -Index: src/gui/widgets/text_box.cpp -=================================================================== ---- src/gui/widgets/text_box.cpp (revision 54624) -+++ src/gui/widgets/text_box.cpp (revision 54625) -@@ -18,7 +18,6 @@ - #include "gui/widgets/text_box.hpp" - - #include "font.hpp" --#include "foreach.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/widget_definition/text_box.hpp" - #include "gui/auxiliary/window_builder/text_box.hpp" -@@ -27,6 +26,7 @@ - #include "game_preferences.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__ - #define LOG_HEADER LOG_SCOPE_HEADER + ':' -@@ -162,7 +162,7 @@ - const int max_width = get_text_maximum_width(); - const int max_height = get_text_maximum_height(); - -- foreach(tcanvas& tmp, canvas()) { -+ BOOST_FOREACH(tcanvas& tmp, canvas()) { - - tmp.set_variable("text", variant(get_value())); - tmp.set_variable("text_x_offset", variant(text_x_offset_)); -@@ -260,7 +260,7 @@ - - // Since this variable doesn't change set it here instead of in - // update_canvas(). -- foreach(tcanvas& tmp, canvas()) { -+ BOOST_FOREACH(tcanvas& tmp, canvas()) { - tmp.set_variable("text_font_height", variant(text_height_)); - } - -Index: src/gui/widgets/toggle_panel.cpp -=================================================================== ---- src/gui/widgets/toggle_panel.cpp (revision 54624) -+++ src/gui/widgets/toggle_panel.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/widgets/toggle_panel.hpp" - --#include "foreach.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/widget_definition/toggle_panel.hpp" - #include "gui/auxiliary/window_builder/toggle_panel.hpp" -@@ -26,6 +25,7 @@ - #include "sound.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__ - #define LOG_HEADER LOG_SCOPE_HEADER + ':' -@@ -72,7 +72,7 @@ - { - // typedef boost problem work around. - typedef std::pair<std::string, string_map> hack ; -- foreach(const hack& item, data) { -+ BOOST_FOREACH(const hack& item, data) { - tcontrol* control = dynamic_cast<tcontrol*>(find(item.first, false)); - if(control) { - control->set_members(item.second); -Index: src/gui/widgets/tree_view_node.cpp -=================================================================== ---- src/gui/widgets/tree_view_node.cpp (revision 54624) -+++ src/gui/widgets/tree_view_node.cpp (revision 54625) -@@ -24,6 +24,7 @@ - #include "gui/widgets/tree_view.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #define LOG_SCOPE_HEADER \ - get_control_type() + " [" + tree_view().id() + "] " + __func__ -@@ -48,7 +49,7 @@ - grid_.set_parent(this); - set_parent(&parent_tree_view); - if(id != "root") { -- foreach(const tnode_definition& node_definition, node_definitions_) { -+ BOOST_FOREACH(const tnode_definition& node_definition, node_definitions_) { - if(node_definition.id == id) { - node_definition.builder->build(&grid_); - init_grid(&grid_, data); -@@ -217,7 +218,7 @@ - int height_reduction = 0; - - if(!is_folded()) { -- foreach(const ttree_view_node& node, children_) { -+ BOOST_FOREACH(const ttree_view_node& node, children_) { - height_reduction += node.get_current_size().y; - } - } -@@ -300,7 +301,7 @@ - return; - } - -- foreach(ttree_view_node& node, children_) { -+ BOOST_FOREACH(ttree_view_node& node, children_) { - std::vector<twidget*> child_call_stack = call_stack; - node.impl_populate_dirty_list(caller, child_call_stack); - } -@@ -455,7 +456,7 @@ - } - - DBG_GUI_L << LOG_HEADER << " set children.\n"; -- foreach(ttree_view_node& node, children_) { -+ BOOST_FOREACH(ttree_view_node& node, children_) { - origin.y += node.place(indention_step_size, origin, width); - } - -@@ -477,7 +478,7 @@ - return; - } - -- foreach(ttree_view_node& node, children_) { -+ BOOST_FOREACH(ttree_view_node& node, children_) { - node.set_visible_area(area); - } - } -@@ -490,7 +491,7 @@ - return; - } - -- foreach(ttree_view_node& node, children_) { -+ BOOST_FOREACH(ttree_view_node& node, children_) { - node.impl_draw_children(frame_buffer); - } - } -Index: src/gui/widgets/settings.hpp -=================================================================== ---- src/gui/widgets/settings.hpp (revision 54624) -+++ src/gui/widgets/settings.hpp (revision 54625) -@@ -24,6 +24,7 @@ - #include "gui/auxiliary/widget_definition/window.hpp" - - #include <boost/function.hpp> -+#include <boost/foreach.hpp> - - #include <string> - #include <vector> -@@ -124,7 +125,7 @@ - { - std::vector<tcontrol_definition_ptr> definitions; - -- foreach(const config& definition -+ BOOST_FOREACH(const config& definition - , cfg.child_range(key ? key : definition_type + "_definition")) { - - definitions.push_back(new T(definition)); -Index: src/gui/widgets/slider.cpp -=================================================================== ---- src/gui/widgets/slider.cpp (revision 54624) -+++ src/gui/widgets/slider.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/widgets/slider.hpp" - --#include "foreach.hpp" - #include "formatter.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/widget_definition/slider.hpp" -@@ -27,6 +26,7 @@ - #include "sound.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__ - #define LOG_HEADER LOG_SCOPE_HEADER + ':' -@@ -232,7 +232,7 @@ - // Inherited. - tscrollbar_::update_canvas(); - -- foreach(tcanvas& tmp, canvas()) { -+ BOOST_FOREACH(tcanvas& tmp, canvas()) { - tmp.set_variable("text", variant(get_value_label())); - } - } -Index: src/gui/widgets/scrollbar.cpp -=================================================================== ---- src/gui/widgets/scrollbar.cpp (revision 54624) -+++ src/gui/widgets/scrollbar.cpp (revision 54625) -@@ -17,11 +17,11 @@ - - #include "gui/widgets/scrollbar.hpp" - --#include "foreach.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/widgets/window.hpp" // Needed for invalidate_layout() - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__ - #define LOG_HEADER LOG_SCOPE_HEADER + ':' -@@ -132,7 +132,7 @@ - - void tscrollbar_::update_canvas() { - -- foreach(tcanvas& tmp, canvas()) { -+ BOOST_FOREACH(tcanvas& tmp, canvas()) { - tmp.set_variable("positioner_offset", variant(positioner_offset_)); - tmp.set_variable("positioner_length", variant(positioner_length_)); - } -@@ -287,7 +287,7 @@ - void tscrollbar_::load_config_extra() - { - // These values won't change so set them here. -- foreach(tcanvas& tmp, canvas()) { -+ BOOST_FOREACH(tcanvas& tmp, canvas()) { - tmp.set_variable("offset_before", variant(offset_before())); - tmp.set_variable("offset_after", variant(offset_after())); - } -Index: src/gui/widgets/grid_private.hpp -=================================================================== ---- src/gui/widgets/grid_private.hpp (revision 54624) -+++ src/gui/widgets/grid_private.hpp (revision 54625) -@@ -33,7 +33,7 @@ - - #include "gui/widgets/grid.hpp" - --#include "foreach.hpp" -+#include <boost/foreach.hpp> - - namespace gui2 { - -@@ -56,7 +56,7 @@ - const tpoint& coordinate, const bool must_be_active) - { - typedef typename tconst_duplicator<W, tgrid::tchild>::type hack; -- foreach(hack& child, grid.children_) { -+ BOOST_FOREACH(hack& child, grid.children_) { - - W* widget = child.widget(); - if(!widget) { -@@ -91,7 +91,7 @@ - } - - typedef typename tconst_duplicator<W, tgrid::tchild>::type hack; -- foreach(hack& child, grid.children_) { -+ BOOST_FOREACH(hack& child, grid.children_) { - - widget = child.widget(); - if(!widget) { -Index: src/gui/widgets/grid.cpp -=================================================================== ---- src/gui/widgets/grid.cpp (revision 54624) -+++ src/gui/widgets/grid.cpp (revision 54625) -@@ -21,6 +21,8 @@ - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/layout_exception.hpp" - -+#include <boost/foreach.hpp> -+ - #include <numeric> - - #define LOG_SCOPE_HEADER "tgrid [" + id() + "] " + __func__ -@@ -48,7 +50,7 @@ - { - // Delete the children in this destructor since resizing a vector copies the - // children and thus frees the child prematurely. -- foreach(tchild& child, children_) { -+ BOOST_FOREACH(tchild& child, children_) { - delete child.widget(); - } - } -@@ -99,7 +101,7 @@ - { - assert(widget); - -- foreach(tchild& child, children_) { -+ BOOST_FOREACH(tchild& child, children_) { - if(child.id() != id) { - - if(recurse) { -@@ -145,7 +147,7 @@ - - void tgrid::remove_child(const std::string& id, const bool find_all) - { -- foreach(tchild& child, children_) { -+ BOOST_FOREACH(tchild& child, children_) { - - if(child.id() == id) { - delete child.widget(); -@@ -160,7 +162,7 @@ - - void tgrid::set_active(const bool active) - { -- foreach(tchild& child, children_) { -+ BOOST_FOREACH(tchild& child, children_) { - - twidget* widget = child.widget(); - if(!widget) { -@@ -186,7 +188,7 @@ - twidget::layout_init(full_initialization); - - // Clear child caches. -- foreach(tchild& child, children_) { -+ BOOST_FOREACH(tchild& child, children_) { - - child.layout_init(full_initialization); - -@@ -426,7 +428,7 @@ - - bool tgrid::can_wrap() const - { -- foreach(const tchild& child, children_) { -+ BOOST_FOREACH(const tchild& child, children_) { - if(child.can_wrap()) { - return true; - } -@@ -485,7 +487,7 @@ - - if(w_size == 0) { - // If all sizes are 0 reset them to 1 -- foreach(unsigned& val, col_grow_factor_) { -+ BOOST_FOREACH(unsigned& val, col_grow_factor_) { - val = 1; - } - w_size = cols_; -@@ -516,7 +518,7 @@ - - if(h_size == 0) { - // If all sizes are 0 reset them to 1 -- foreach(unsigned& val, row_grow_factor_) { -+ BOOST_FOREACH(unsigned& val, row_grow_factor_) { - val = 1; - } - h_size = rows_; -@@ -551,7 +553,7 @@ - // Inherited. - twidget::set_origin(origin); - -- foreach(tchild& child, children_) { -+ BOOST_FOREACH(tchild& child, children_) { - - twidget* widget = child.widget(); - assert(widget); -@@ -567,7 +569,7 @@ - // Inherited. - twidget::set_visible_area(area); - -- foreach(tchild& child, children_) { -+ BOOST_FOREACH(tchild& child, children_) { - - twidget* widget = child.widget(); - assert(widget); -@@ -578,7 +580,7 @@ - - void tgrid::layout_children() - { -- foreach(tchild& child, children_) { -+ BOOST_FOREACH(tchild& child, children_) { - assert(child.widget()); - child.widget()->layout_children(); - } -@@ -589,7 +591,7 @@ - { - assert(!call_stack.empty() && call_stack.back() == this); - -- foreach(tchild& child, children_) { -+ BOOST_FOREACH(tchild& child, children_) { - - assert(child.widget()); - -@@ -627,7 +629,7 @@ - - bool tgrid::has_widget(const twidget* widget) const - { -- foreach(const tchild& child, children_) { -+ BOOST_FOREACH(const tchild& child, children_) { - if(child.widget() == widget) { - return true; - } -@@ -641,7 +643,7 @@ - return false; - } - -- foreach(const tchild& child, children_) { -+ BOOST_FOREACH(const tchild& child, children_) { - const twidget* widget = child.widget(); - assert(widget); - -@@ -936,7 +938,7 @@ - assert(get_visible() == twidget::VISIBLE); - set_dirty(false); - -- foreach(tchild& child, children_) { -+ BOOST_FOREACH(tchild& child, children_) { - - twidget* widget = child.widget(); - assert(widget); -Index: src/gui/widgets/toggle_button.cpp -=================================================================== ---- src/gui/widgets/toggle_button.cpp (revision 54624) -+++ src/gui/widgets/toggle_button.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/widgets/toggle_button.hpp" - --#include "foreach.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/widget_definition/toggle_button.hpp" - #include "gui/auxiliary/window_builder/toggle_button.hpp" -@@ -26,6 +25,7 @@ - #include "sound.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__ - #define LOG_HEADER LOG_SCOPE_HEADER + ':' -@@ -89,7 +89,7 @@ - - // set icon in canvases - std::vector<tcanvas>& canvases = tcontrol::canvas(); -- foreach(tcanvas& canvas, canvases) { -+ BOOST_FOREACH(tcanvas& canvas, canvases) { - canvas.set_variable("icon", variant(icon_name_)); - } - -Index: src/gui/widgets/control.cpp -=================================================================== ---- src/gui/widgets/control.cpp (revision 54624) -+++ src/gui/widgets/control.cpp (revision 54625) -@@ -18,7 +18,6 @@ - #include "control.hpp" - - #include "font.hpp" --#include "foreach.hpp" - #include "formula_string_utils.hpp" - #include "gui/auxiliary/iterator/walker_widget.hpp" - #include "gui/auxiliary/log.hpp" -@@ -29,6 +28,7 @@ - #include "marked-up_text.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #include <iomanip> - -@@ -211,7 +211,7 @@ - void tcontrol::place(const tpoint& origin, const tpoint& size) - { - // resize canvasses -- foreach(tcanvas& canvas, canvas_) { -+ BOOST_FOREACH(tcanvas& canvas, canvas_) { - canvas.set_width(size.x); - canvas.set_height(size.y); - } -@@ -297,7 +297,7 @@ - const int max_height = get_text_maximum_height(); - - // set label in canvases -- foreach(tcanvas& canvas, canvas_) { -+ BOOST_FOREACH(tcanvas& canvas, canvas_) { - canvas.set_variable("text", variant(label_)); - canvas.set_variable("text_markup", variant(use_markup_)); - canvas.set_variable("text_alignment" -Index: src/gui/widgets/scrollbar_container.cpp -=================================================================== ---- src/gui/widgets/scrollbar_container.cpp (revision 54624) -+++ src/gui/widgets/scrollbar_container.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/widgets/scrollbar_container_private.hpp" - --#include "foreach.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/layout_exception.hpp" - #include "gui/widgets/clickable.hpp" -@@ -25,6 +24,7 @@ - #include "gui/widgets/window.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__ - #define LOG_HEADER LOG_SCOPE_HEADER + ':' -@@ -692,7 +692,7 @@ - - /***** Setup the scrollbar buttons *****/ - typedef std::pair<std::string, tscrollbar_::tscroll> hack; -- foreach(const hack& item, scroll_lookup()) { -+ BOOST_FOREACH(const hack& item, scroll_lookup()) { - - // Vertical. - tclickable_* button = find_widget<tclickable_>( -@@ -838,7 +838,7 @@ - { - if(true) { /** @todo scrollbar visibility. */ - /***** set scroll up button status *****/ -- foreach(const std::string& name, button_up_names) { -+ BOOST_FOREACH(const std::string& name, button_up_names) { - tcontrol* button = find_widget<tcontrol>( - vertical_scrollbar_grid_, name, false, false); - -@@ -848,7 +848,7 @@ - } - - /***** set scroll down status *****/ -- foreach(const std::string& name, button_down_names) { -+ BOOST_FOREACH(const std::string& name, button_down_names) { - tcontrol* button = find_widget<tcontrol>( - vertical_scrollbar_grid_, name, false, false); - -@@ -864,7 +864,7 @@ - - if(true) { /** @todo scrollbar visibility. */ - /***** Set scroll left button status *****/ -- foreach(const std::string& name, button_up_names) { -+ BOOST_FOREACH(const std::string& name, button_up_names) { - tcontrol* button = find_widget<tcontrol>( - horizontal_scrollbar_grid_, name, false, false); - -@@ -874,7 +874,7 @@ - } - - /***** Set scroll right button status *****/ -- foreach(const std::string& name, button_down_names) { -+ BOOST_FOREACH(const std::string& name, button_down_names) { - tcontrol* button = find_widget<tcontrol>( - horizontal_scrollbar_grid_, name, false, false); - -Index: src/gui/widgets/generator_private.hpp -=================================================================== ---- src/gui/widgets/generator_private.hpp (revision 54624) -+++ src/gui/widgets/generator_private.hpp (revision 54625) -@@ -19,12 +19,13 @@ - #include "gui/widgets/generator.hpp" - - #include "asserts.hpp" --#include "foreach.hpp" - #include "gui/widgets/grid.hpp" - #include "gui/widgets/selectable.hpp" - #include "gui/widgets/toggle_button.hpp" - #include "gui/widgets/toggle_panel.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - /** -@@ -584,7 +585,7 @@ - /** Inherited from tgenerator_. */ - void clear() - { -- foreach(titem* item, items_) { -+ BOOST_FOREACH(titem* item, items_) { - delete item; - } - selected_item_count_ = 0; -@@ -750,7 +751,7 @@ - /** Inherited from tgenerator_. */ - void layout_init(const bool full_initialization) - { -- foreach(titem* item, items_) { -+ BOOST_FOREACH(titem* item, items_) { - if(item->grid.get_visible() != twidget::INVISIBLE && item->shown) { - item->grid.layout_init(full_initialization); - } -@@ -804,7 +805,7 @@ - { - assert(this->get_visible() == twidget::VISIBLE); - -- foreach(titem* item, items_) { -+ BOOST_FOREACH(titem* item, items_) { - if(item->grid.get_visible() == twidget::VISIBLE && item->shown) { - item->grid.draw_children(frame_buffer); - } -@@ -815,7 +816,7 @@ - void child_populate_dirty_list(twindow& caller, - const std::vector<twidget*>& call_stack) - { -- foreach(titem* item, items_) { -+ BOOST_FOREACH(titem* item, items_) { - std::vector<twidget*> child_call_stack = call_stack; - item->grid.populate_dirty_list(caller, child_call_stack); - } -@@ -838,7 +839,7 @@ - /** Inherited from widget. */ - bool disable_click_dismiss() const - { -- foreach(titem* item, items_) { -+ BOOST_FOREACH(titem* item, items_) { - if(item->grid.disable_click_dismiss()) { - return true; - } -@@ -974,7 +975,7 @@ - void (*callback)(twidget*)) - { - int i = index; -- foreach(const T& item_data, data) { -+ BOOST_FOREACH(const T& item_data, data) { - create_item(i, list_builder, item_data, callback); - if(i != -1) { - ++i; -Index: src/gui/widgets/generator.cpp -=================================================================== ---- src/gui/widgets/generator.cpp (revision 54624) -+++ src/gui/widgets/generator.cpp (revision 54625) -@@ -19,6 +19,8 @@ - - #include "gui/widgets/window.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - namespace policy { -@@ -678,7 +680,7 @@ - assert(!callback); - - typedef std::pair<std::string, string_map> hack; -- foreach(const hack& item, data) { -+ BOOST_FOREACH(const hack& item, data) { - if(item.first.empty()) { - for(unsigned row = 0; row < grid->get_rows(); ++row) { - for(unsigned col = 0; col < grid->get_cols(); ++col) { -Index: src/gui/widgets/progress_bar.cpp -=================================================================== ---- src/gui/widgets/progress_bar.cpp (revision 54624) -+++ src/gui/widgets/progress_bar.cpp (revision 54625) -@@ -23,6 +23,7 @@ - #include "gui/widgets/settings.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__ - #define LOG_HEADER LOG_SCOPE_HEADER + ':' -@@ -38,7 +39,7 @@ - if(percentage_ != percentage) { - percentage_ = percentage; - -- foreach(tcanvas& c, canvas()) { -+ BOOST_FOREACH(tcanvas& c, canvas()) { - c.set_variable("percentage", variant(percentage)); - } - -Index: src/gui/auxiliary/widget_definition.hpp -=================================================================== ---- src/gui/auxiliary/widget_definition.hpp (revision 54624) -+++ src/gui/auxiliary/widget_definition.hpp (revision 54625) -@@ -17,9 +17,10 @@ - #define GUI_AUXILIARY_WIDGET_DEFINITION_HPP_INCLUDED - - #include "config.hpp" --#include "foreach.hpp" - #include "gui/auxiliary/canvas.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - /** -@@ -98,7 +99,7 @@ - void load_resolutions(const config &cfg) - { - config::const_child_itors itors = cfg.child_range("resolution"); -- foreach(const config &resolution, itors) { -+ BOOST_FOREACH(const config &resolution, itors) { - resolutions.push_back(new T(resolution)); - } - } -Index: src/gui/auxiliary/event/dispatcher.cpp -=================================================================== ---- src/gui/auxiliary/event/dispatcher.cpp (revision 54624) -+++ src/gui/auxiliary/event/dispatcher.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/auxiliary/event/dispatcher_private.hpp" - --#include "foreach.hpp" - #include "gui/auxiliary/log.hpp" - - namespace gui2 { -Index: src/gui/auxiliary/event/handler.cpp -=================================================================== ---- src/gui/auxiliary/event/handler.cpp (revision 54624) -+++ src/gui/auxiliary/event/handler.cpp (revision 54625) -@@ -18,7 +18,6 @@ - #include "gui/auxiliary/event/handler.hpp" - - #include "clipboard.hpp" --#include "foreach.hpp" - #include "gui/auxiliary/event/dispatcher.hpp" - #include "gui/auxiliary/timer.hpp" - #include "gui/auxiliary/log.hpp" -@@ -28,6 +27,8 @@ - #include "hotkeys.hpp" - #include "video.hpp" - -+#include <boost/foreach.hpp> -+ - #include <cassert> - - /** -@@ -429,7 +430,7 @@ - } - - /***** Set proper state for the other dispatchers. *****/ -- foreach(tdispatcher* dispatcher, dispatchers_) { -+ BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) { - dynamic_cast<twidget&>(*dispatcher).set_dirty(); - } - -@@ -448,7 +449,7 @@ - - void thandler::activate() - { -- foreach(tdispatcher* dispatcher, dispatchers_) { -+ BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) { - dispatcher->fire(SDL_ACTIVATE - , dynamic_cast<twidget&>(*dispatcher) - , NULL); -@@ -472,7 +473,7 @@ - * - * For now we use a hack, but would be nice to rewrite it for 1.9/1.11. - */ -- foreach(tdispatcher* dispatcher, dispatchers_) { -+ BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) { - if(!first) { - /* - * This leaves glitches on window borders if the window beneath it -@@ -503,7 +504,7 @@ - { - DBG_GUI_E << "Firing: " << SDL_VIDEO_RESIZE << ".\n"; - -- foreach(tdispatcher* dispatcher, dispatchers_) { -+ BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) { - dispatcher->fire(SDL_VIDEO_RESIZE - , dynamic_cast<twidget&>(*dispatcher) - , new_size); -Index: src/gui/auxiliary/canvas.cpp -=================================================================== ---- src/gui/auxiliary/canvas.cpp (revision 54624) -+++ src/gui/auxiliary/canvas.cpp (revision 54625) -@@ -24,7 +24,6 @@ - - #include "config.hpp" - #include "../../image.hpp" --#include "foreach.hpp" - #include "formatter.hpp" - #include "gettext.hpp" - #include "gui/auxiliary/formula.hpp" -@@ -33,6 +32,8 @@ - #include "../../text.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - namespace { -@@ -1455,7 +1456,7 @@ - log_scope2(log_gui_parse, "Canvas: parsing config."); - shapes_.clear(); - -- foreach(const config::any_child& shape, cfg.all_children_range()) { -+ BOOST_FOREACH(const config::any_child& shape, cfg.all_children_range()) { - const std::string &type = shape.key; - const config &data = shape.cfg; - -@@ -1474,7 +1475,7 @@ - } else if(type == "pre_commit") { - - /* note this should get split if more preprocessing is used. */ -- foreach(const config::any_child& function, -+ BOOST_FOREACH(const config::any_child& function, - data.all_children_range()) { - - if(function.key == "blur") { -Index: src/gui/auxiliary/window_builder.cpp -=================================================================== ---- src/gui/auxiliary/window_builder.cpp (revision 54624) -+++ src/gui/auxiliary/window_builder.cpp (revision 54625) -@@ -18,7 +18,6 @@ - #include "gui/auxiliary/window_builder_private.hpp" - - #include "asserts.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/window_builder/helper.hpp" -@@ -43,6 +42,7 @@ - #include "formula_string_utils.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - namespace gui2 { - -@@ -67,7 +67,7 @@ - std::string - , boost::function<tbuilder_widget_ptr(config)> > - thack; -- foreach(const thack& item, builder_widget_lookup()) { -+ BOOST_FOREACH(const thack& item, builder_widget_lookup()) { - if(item.first == "window" || item.first == "tooltip") { - continue; - } -@@ -153,7 +153,7 @@ - , definition->helptip); - assert(window); - -- foreach(const twindow_builder::tresolution::tlinked_group& lg, -+ BOOST_FOREACH(const twindow_builder::tresolution::tlinked_group& lg, - definition->linked_groups) { - - if(window->has_linked_size_group(lg.id)) { -@@ -238,7 +238,7 @@ - - config::const_child_itors cfgs = cfg.child_range("resolution"); - VALIDATE(cfgs.first != cfgs.second, _("No resolution defined.")); -- foreach (const config &i, cfgs) { -+ BOOST_FOREACH(const config &i, cfgs) { - resolutions.push_back(tresolution(i)); - } - -@@ -386,7 +386,7 @@ - definition = "default"; - } - -- foreach (const config &lg, cfg.child_range("linked_group")) { -+ BOOST_FOREACH(const config &lg, cfg.child_range("linked_group")) { - tlinked_group linked_group; - linked_group.id = lg["id"].str(); - linked_group.fixed_width = lg["fixed_width"].to_bool(); -@@ -501,13 +501,13 @@ - */ - log_scope2(log_gui_parse, "Window builder: parsing a grid"); - -- foreach (const config &row, cfg.child_range("row")) -+ BOOST_FOREACH(const config &row, cfg.child_range("row")) - { - unsigned col = 0; - - row_grow_factor.push_back(row["grow_factor"]); - -- foreach (const config &c, row.child_range("column")) -+ BOOST_FOREACH(const config &c, row.child_range("column")) - { - flags.push_back(implementation::read_flags(c)); - border_size.push_back(c["border_size"]); -Index: src/gui/auxiliary/tips.cpp -=================================================================== ---- src/gui/auxiliary/tips.cpp (revision 54624) -+++ src/gui/auxiliary/tips.cpp (revision 54625) -@@ -18,10 +18,11 @@ - #include "gui/auxiliary/tips.hpp" - - #include "config.hpp" --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "serialization/string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - ttip::ttip(const t_string& text -@@ -39,7 +40,7 @@ - { - std::vector<ttip> result; - -- foreach(const config &tip, cfg.child_range("tip")) { -+ BOOST_FOREACH(const config &tip, cfg.child_range("tip")) { - result.push_back(ttip(tip["text"] - , tip["source"] - , tip["encountered_units"])); -@@ -54,11 +55,11 @@ - - const std::set<std::string>& units = preferences::encountered_units(); - -- foreach(const ttip& tip, tips) { -+ BOOST_FOREACH(const ttip& tip, tips) { - if(tip.unit_filter_.empty()) { - result.push_back(tip); - } else { -- foreach(const std::string& unit, tip.unit_filter_) { -+ BOOST_FOREACH(const std::string& unit, tip.unit_filter_) { - if(units.find(unit) != units.end()) { - result.push_back(tip); - break; -Index: src/gui/auxiliary/notifier.hpp -=================================================================== ---- src/gui/auxiliary/notifier.hpp (revision 54624) -+++ src/gui/auxiliary/notifier.hpp (revision 54625) -@@ -16,10 +16,10 @@ - #ifndef GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED - #define GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED - --#include "foreach.hpp" -- - #include "gui/auxiliary/notifiee.hpp" - -+#include <boost/foreach.hpp> -+ - #include <cassert> - #include <map> - -@@ -47,7 +47,7 @@ - ~tnotifier() - { - typedef std::pair<tnotifiee<tfunctor>* const, tfunctor> thack; -- foreach(thack& item, notifiees_) { -+ BOOST_FOREACH(thack& item, notifiees_) { - assert(item.first); - assert((*item.first).notifier_ == this); - -Index: src/gui/auxiliary/window_builder/helper.cpp -=================================================================== ---- src/gui/auxiliary/window_builder/helper.cpp (revision 54624) -+++ src/gui/auxiliary/window_builder/helper.cpp (revision 54625) -@@ -18,11 +18,12 @@ - #include "gui/auxiliary/window_builder/helper.hpp" - - #include "config.hpp" --#include "foreach.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/widgets/grid.hpp" - #include "gui/widgets/window.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - namespace implementation { -@@ -60,7 +61,7 @@ - unsigned get_border(const std::vector<std::string>& border) - { - unsigned result = 0; -- foreach (const std::string& s, border) { -+ BOOST_FOREACH(const std::string& s, border) { - if (s == "all") { - return tgrid::BORDER_ALL; - } else if (s == "top") { -Index: src/gui/auxiliary/window_builder/stacked_widget.cpp -=================================================================== ---- src/gui/auxiliary/window_builder/stacked_widget.cpp (revision 54624) -+++ src/gui/auxiliary/window_builder/stacked_widget.cpp (revision 54625) -@@ -18,13 +18,14 @@ - #include "gui/auxiliary/window_builder/stacked_widget.hpp" - - #include "config.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/widget_definition/stacked_widget.hpp" - #include "gui/widgets/stacked_widget.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - namespace implementation { -@@ -35,7 +36,7 @@ - { - const config &s = cfg.child("stack"); - VALIDATE(s, _("No stack defined.")); -- foreach(const config &layer, s.child_range("layer")) { -+ BOOST_FOREACH(const config &layer, s.child_range("layer")) { - stack.push_back(new tbuilder_grid(layer)); - } - } -Index: src/gui/auxiliary/window_builder/slider.cpp -=================================================================== ---- src/gui/auxiliary/window_builder/slider.cpp (revision 54624) -+++ src/gui/auxiliary/window_builder/slider.cpp (revision 54625) -@@ -18,12 +18,13 @@ - #include "gui/auxiliary/window_builder/slider.hpp" - - #include "config.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/widgets/slider.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - namespace implementation { -@@ -44,7 +45,7 @@ - return; - } - -- foreach(const config& label, labels.child_range("value")) { -+ BOOST_FOREACH(const config& label, labels.child_range("value")) { - value_labels_.push_back(label["label"]); - } - } -Index: src/gui/auxiliary/window_builder/horizontal_listbox.cpp -=================================================================== ---- src/gui/auxiliary/window_builder/horizontal_listbox.cpp (revision 54624) -+++ src/gui/auxiliary/window_builder/horizontal_listbox.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/auxiliary/window_builder/horizontal_listbox.hpp" - --#include "foreach.hpp" - #include "gettext.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/widget_definition/listbox.hpp" -@@ -29,6 +28,8 @@ - #endif - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - namespace implementation { -@@ -53,12 +54,12 @@ - const config &data = cfg.child("list_data"); - if (!data) return; - -- foreach(const config &row, data.child_range("row")) { -+ BOOST_FOREACH(const config &row, data.child_range("row")) { - unsigned col = 0; - -- foreach(const config &c, row.child_range("column")) { -+ BOOST_FOREACH(const config &c, row.child_range("column")) { - list_data.push_back(string_map()); -- foreach (const config::attribute &i, c.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, c.attribute_range()) { - list_data.back()[i.first] = i.second; - } - ++col; -Index: src/gui/auxiliary/window_builder/listbox.cpp -=================================================================== ---- src/gui/auxiliary/window_builder/listbox.cpp (revision 54624) -+++ src/gui/auxiliary/window_builder/listbox.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/auxiliary/window_builder/listbox.hpp" - --#include "foreach.hpp" - #include "gettext.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/widget_definition/listbox.hpp" -@@ -30,6 +29,8 @@ - #include "gui/widgets/settings.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - namespace implementation { -@@ -66,12 +67,12 @@ - return; - } - -- foreach(const config& row, data.child_range("row")) { -+ BOOST_FOREACH(const config& row, data.child_range("row")) { - unsigned col = 0; - -- foreach(const config& c, row.child_range("column")) { -+ BOOST_FOREACH(const config& c, row.child_range("column")) { - list_data.push_back(string_map()); -- foreach(const config::attribute& i, c.attribute_range()) { -+ BOOST_FOREACH(const config::attribute& i, c.attribute_range()) { - list_data.back()[i.first] = i.second; - } - ++col; -Index: src/gui/auxiliary/window_builder/multi_page.cpp -=================================================================== ---- src/gui/auxiliary/window_builder/multi_page.cpp (revision 54624) -+++ src/gui/auxiliary/window_builder/multi_page.cpp (revision 54625) -@@ -18,13 +18,14 @@ - #include "gui/auxiliary/window_builder/multi_page.hpp" - - #include "config.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/widget_definition/multi_page.hpp" - #include "gui/widgets/multi_page.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - namespace implementation { -@@ -46,12 +47,12 @@ - return; - } - -- foreach(const config &row, d.child_range("row")) { -+ BOOST_FOREACH(const config &row, d.child_range("row")) { - unsigned col = 0; - -- foreach(const config &column, row.child_range("column")) { -+ BOOST_FOREACH(const config &column, row.child_range("column")) { - data.push_back(string_map()); -- foreach(const config::attribute &i, column.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, column.attribute_range()) { - data.back()[i.first] = i.second; - } - ++col; -Index: src/gui/auxiliary/window_builder/tree_view.cpp -=================================================================== ---- src/gui/auxiliary/window_builder/tree_view.cpp (revision 54624) -+++ src/gui/auxiliary/window_builder/tree_view.cpp (revision 54625) -@@ -17,7 +17,6 @@ - - #include "gui/auxiliary/window_builder/tree_view.hpp" - --#include "foreach.hpp" - #include "gettext.hpp" - #include "gui/auxiliary/log.hpp" - #include "gui/auxiliary/widget_definition/tree_view.hpp" -@@ -25,6 +24,8 @@ - #include "gui/widgets/tree_view.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - namespace gui2 { - - namespace implementation { -@@ -39,7 +40,7 @@ - , nodes() - { - -- foreach(const config &node, cfg.child_range("node")) { -+ BOOST_FOREACH(const config &node, cfg.child_range("node")) { - nodes.push_back(tnode(node)); - } - -Index: src/unit_types.cpp -=================================================================== ---- src/unit_types.cpp (revision 54624) -+++ src/unit_types.cpp (revision 54625) -@@ -22,13 +22,13 @@ - - #include "unit_types.hpp" - --#include "foreach.hpp" - #include "game_config.hpp" - #include "gettext.hpp" - #include "loadscreen.hpp" - #include "log.hpp" - #include "map.hpp" - -+#include <boost/foreach.hpp> - - static lg::log_domain log_config("config"); - #define ERR_CF LOG_STREAM(err, log_config) -@@ -156,7 +156,7 @@ - if (config &specials = cfg_.child("specials")) - { - config new_specials; -- foreach (const config::any_child &vp, specials.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &vp, specials.all_children_range()) { - std::vector<std::string>::const_iterator found_id = - std::find(dsl.begin(), dsl.end(), vp.cfg["id"]); - if (found_id == dsl.end()) { -@@ -174,7 +174,7 @@ - cfg_.clear_children("specials"); - } - config &new_specials = cfg_.child_or_add("specials"); -- foreach (const config::any_child &value, set_specials.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &value, set_specials.all_children_range()) { - new_specials.add_child(value.key, value.cfg); - } - } -@@ -345,7 +345,7 @@ - - if (const config &resistance = cfg_.child("resistance")) - { -- foreach (const config::attribute &i, resistance.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, resistance.attribute_range()) { - res[i.first] = i.second; - } - } -@@ -666,11 +666,11 @@ - movementType_ = unit_movement_type(cfg); - alpha_ = ftofxp(1.0); - -- foreach (const config &t, traits) -+ BOOST_FOREACH(const config &t, traits) - { - possibleTraits_.add_child("trait", t); - } -- foreach (config &var_cfg, cfg.child_range("variation")) -+ BOOST_FOREACH(config &var_cfg, cfg.child_range("variation")) - { - if (var_cfg["inherit"].to_bool()) { - config nvar_cfg(cfg); -@@ -710,7 +710,7 @@ - if (cfg["ignore_race_traits"].to_bool()) { - possibleTraits_.clear(); - } else { -- foreach (const config &t, race_->additional_traits()) -+ BOOST_FOREACH(const config &t, race_->additional_traits()) - { - if (alignment_ != NEUTRAL || t["id"] != "fearless") - possibleTraits_.add_child("trait", t); -@@ -722,7 +722,7 @@ - } - - // Insert any traits that are just for this unit type -- foreach (const config &trait, cfg.child_range("trait")) -+ BOOST_FOREACH(const config &trait, cfg.child_range("trait")) - { - possibleTraits_.add_child("trait", trait); - } -@@ -750,7 +750,7 @@ - game_config::add_color_info(cfg); - - -- foreach (const config &portrait, cfg_.child_range("portrait")) { -+ BOOST_FOREACH(const config &portrait, cfg_.child_range("portrait")) { - portraits_.push_back(tportrait(portrait)); - } - -@@ -807,7 +807,7 @@ - - if (const config &abil_cfg = cfg.child("abilities")) - { -- foreach (const config::any_child &ab, abil_cfg.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &ab, abil_cfg.all_children_range()) { - const config::attribute_value &name = ab.cfg["name"]; - if (!name.empty()) { - abilities_.push_back(name.t_str()); -@@ -816,15 +816,15 @@ - } - } - -- foreach (const config &adv, cfg.child_range("advancement")) -+ BOOST_FOREACH(const config &adv, cfg.child_range("advancement")) - { -- foreach (const config &effect, adv.child_range("effect")) -+ BOOST_FOREACH(const config &effect, adv.child_range("effect")) - { - const config &abil_cfg = effect.child("abilities"); - if (!abil_cfg || effect["apply_to"] != "new_ability") { - continue; - } -- foreach (const config::any_child &ab, abil_cfg.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &ab, abil_cfg.all_children_range()) { - const config::attribute_value &name = ab.cfg["name"]; - if (!name.empty()) { - adv_abilities_.push_back(name.t_str()); -@@ -934,7 +934,7 @@ - std::vector<attack_type> unit_type::attacks() const - { - std::vector<attack_type> res; -- foreach (const config &att, cfg_.child_range("attack")) { -+ BOOST_FOREACH(const config &att, cfg_.child_range("attack")) { - res.push_back(attack_type(att)); - } - -@@ -990,7 +990,7 @@ - { - if (const config &abil = cfg_.child("abilities")) - { -- foreach (const config::any_child &ab, abil.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &ab, abil.all_children_range()) { - if (ab.cfg["id"] == ability) - return true; - } -@@ -1005,7 +1005,7 @@ - const config &abilities = cfg_.child("abilities"); - if (!abilities) return res; - -- foreach (const config::any_child &ab, abilities.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range()) { - const std::string &id = ab.cfg["id"]; - if (!id.empty()) - res.push_back(id); -@@ -1077,7 +1077,7 @@ - if (!ut) - return; - -- foreach(const std::string& adv, ut->advances_to()) { -+ BOOST_FOREACH(const std::string& adv, ut->advances_to()) { - if (tree.insert(adv).second) { - // insertion succeed, expand the new type - advancement_tree_internal(adv, tree); -@@ -1098,9 +1098,9 @@ - unit_types.build_all(unit_type::HELP_INDEX); - - std::vector<std::string> adv_from; -- foreach (const unit_type_data::unit_type_map::value_type &ut, unit_types.types()) -+ BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &ut, unit_types.types()) - { -- foreach(const std::string& adv, ut.second.advances_to()) { -+ BOOST_FOREACH(const std::string& adv, ut.second.advances_to()) { - if (adv == id_) - adv_from.push_back(ut.second.id()); - } -@@ -1127,7 +1127,7 @@ - clear(); - set_unit_config(cfg); - -- foreach (const config &mt, cfg.child_range("movetype")) -+ BOOST_FOREACH(const config &mt, cfg.child_range("movetype")) - { - const unit_movement_type move_type(mt); - movement_types_.insert( -@@ -1135,14 +1135,14 @@ - loadscreen::increment_progress(); - } - -- foreach (const config &r, cfg.child_range("race")) -+ BOOST_FOREACH(const config &r, cfg.child_range("race")) - { - const unit_race race(r); - races_.insert(std::pair<std::string,unit_race>(race.id(),race)); - loadscreen::increment_progress(); - } - -- foreach (config &ut, cfg.child_range("unit_type")) -+ BOOST_FOREACH(config &ut, cfg.child_range("unit_type")) - { - std::string id = ut["id"]; - if (const config &bu = ut.child("base_unit")) -@@ -1195,7 +1195,7 @@ - - void unit_type_data::check_types(const std::vector<std::string>& types) const - { -- foreach(const std::string& type, types) { -+ BOOST_FOREACH(const std::string& type, types) { - if(!find(type)) throw game::game_error("unknown unit type: " + type); - } - } -@@ -1279,7 +1279,7 @@ - - std::vector<std::string> trees = utils::split(cfg["type_adv_tree"]); - hide_help_type_.back().insert(trees.begin(), trees.end()); -- foreach(const std::string& t_id, trees) { -+ BOOST_FOREACH(const std::string& t_id, trees) { - unit_type_map::iterator ut = types_.find(t_id); - if (ut != types_.end()) { - std::set<std::string> adv_tree = ut->second.advancement_tree(); -@@ -1310,7 +1310,7 @@ - { - const config& cfg = to_unit.get_cfg(); - -- foreach (const config &af, cfg.child_range("advancefrom")) -+ BOOST_FOREACH(const config &af, cfg.child_range("advancefrom")) - { - const std::string &from = af["unit"]; - int xp = af["experience"]; -@@ -1349,12 +1349,12 @@ - // status gets changed. In the unlikely event it gets changed - // multiple times, we want to try to do it in the same order - // that unit::apply_modifications does things. -- foreach (const config &mod, possible_traits()) -+ BOOST_FOREACH(const config &mod, possible_traits()) - { - if (mod["availability"] != "musthave") - continue; - -- foreach (const config &effect, mod.child_range("effect")) -+ BOOST_FOREACH(const config &effect, mod.child_range("effect")) - { - // See if the effect only applies to - // certain unit types But don't worry -Index: src/game_controller.cpp -=================================================================== ---- src/game_controller.cpp (revision 54624) -+++ src/game_controller.cpp (revision 54625) -@@ -50,6 +50,8 @@ - #include "statistics.hpp" - #include "wml_exception.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_config("config"); - #define ERR_CONFIG LOG_STREAM(err, log_config) - #define WRN_CONFIG LOG_STREAM(warn, log_config) -@@ -478,7 +480,7 @@ - } - - int side_num = 1; -- foreach (config &s, level.child_range("side")) -+ BOOST_FOREACH(config &s, level.child_range("side")) - { - std::map<int,std::string>::const_iterator type = side_types.find(side_num), - controller = side_controllers.find(side_num), -@@ -507,7 +509,7 @@ - faction_excepts.clear(); - } - unsigned j = 0; -- foreach (const config &faction, era_cfg.child_range("multiplayer_side")) -+ BOOST_FOREACH(const config &faction, era_cfg.child_range("multiplayer_side")) - { - if (faction["random_faction"].to_bool()) continue; - const std::string &faction_id = faction["id"]; -@@ -673,7 +675,7 @@ - } - - if(state_.classification().campaign_type == "multiplayer") { -- foreach (config &side, state_.snapshot.child_range("side")) -+ BOOST_FOREACH(config &side, state_.snapshot.child_range("side")) - { - if (side["controller"] == "network") - side["controller"] = "human"; -@@ -683,10 +685,10 @@ - } - - if (load.cancel_orders()) { -- foreach (config &side, state_.snapshot.child_range("side")) -+ BOOST_FOREACH(config &side, state_.snapshot.child_range("side")) - { - if (side["controller"] != "human") continue; -- foreach (config &unit, side.child_range("unit")) -+ BOOST_FOREACH(config &unit, side.child_range("unit")) - { - unit["goto_x"] = -999; - unit["goto_y"] = -999; -@@ -710,7 +712,7 @@ - - void game_controller::mark_completed_campaigns(std::vector<config> &campaigns) - { -- foreach (config &campaign, campaigns) { -+ BOOST_FOREACH(config &campaign, campaigns) { - campaign["completed"] = preferences::is_campaign_completed(campaign["id"]); - } - } -@@ -1218,7 +1220,7 @@ - game_config_.splice_children(core_terrain_rules, "terrain_graphics"); - - config& hashes = game_config_.add_child("multiplayer_hashes"); -- foreach (const config &ch, game_config_.child_range("multiplayer")) { -+ BOOST_FOREACH(const config &ch, game_config_.child_range("multiplayer")) { - hashes[ch["id"]] = ch.hash(); - } - -Index: src/unit.cpp -=================================================================== ---- src/unit.cpp (revision 54624) -+++ src/unit.cpp (revision 54625) -@@ -21,7 +21,6 @@ - #include "unit.hpp" - - #include "callable_objects.hpp" --#include "foreach.hpp" - #include "formula.hpp" - #include "game_display.hpp" - #include "game_preferences.hpp" -@@ -38,6 +37,7 @@ - #include "side_filter.hpp" - #include "play_controller.hpp" - -+#include <boost/foreach.hpp> - static lg::log_domain log_unit("unit"); - #define DBG_UT LOG_STREAM(debug, log_unit) - #define LOG_UT LOG_STREAM(info, log_unit) -@@ -288,7 +288,7 @@ - filter_recall_ = filter_recall.get_config(); - - const vconfig::child_list& events = vcfg->get_children("event"); -- foreach(const vconfig& e, events) { -+ BOOST_FOREACH(const vconfig& e, events) { - events_.add_child("event", e.get_config()); - } - } -@@ -296,7 +296,7 @@ - { - filter_recall_ = cfg.child_or_empty("filter_recall"); - -- foreach(const config& unit_event, cfg.child_range("event")) { -+ BOOST_FOREACH(const config& unit_event, cfg.child_range("event")) { - events_.add_child("event", unit_event); - } - } -@@ -375,7 +375,7 @@ - formula_vars_ = new game_logic::map_formula_callable; - - variant var; -- foreach (const config::attribute &i, ai_vars.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, ai_vars.attribute_range()) { - var.serialize_from_string(i.second); - formula_vars_->add(i.first, var); - } -@@ -432,7 +432,7 @@ - - if (const config &status_flags = cfg.child("status")) - { -- foreach (const config::attribute &st, status_flags.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &st, status_flags.attribute_range()) { - if (st.first == "healable") { - ///@deprecated 1.9.2 'healable' instead of 'unhealable' - ERR_UT << "Usage of 'healable' is deprecated, use 'unhealable' instead, " -@@ -449,7 +449,7 @@ - } - - // Remove animations from private cfg, they're not needed there now -- foreach(const std::string& tag_name, unit_animation::all_tag_names()) { -+ BOOST_FOREACH(const std::string& tag_name, unit_animation::all_tag_names()) { - cfg_.clear_children(tag_name); - } - -@@ -518,7 +518,7 @@ - "canrecruit", "extra_recruit", "x", "y", "placement", - // Useless attributes created when saving units to WML: - "flag_rgb", "language_name" }; -- foreach (const char *attr, internalized_attrs) { -+ BOOST_FOREACH(const char *attr, internalized_attrs) { - input_cfg.remove_attribute(attr); - cfg_.remove_attribute(attr); - } -@@ -526,11 +526,11 @@ - static char const *raw_attrs[] = { "description", "halo", - "profile", "small_profile", "upkeep", "usage", "ellipse", - "image", "image_icon", "random_traits", "generate_name" }; -- foreach (const char *attr, raw_attrs) { -+ BOOST_FOREACH(const char *attr, raw_attrs) { - input_cfg.remove_attribute(attr); - } - -- foreach (const config::attribute &attr, input_cfg.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &attr, input_cfg.attribute_range()) { - if (attr.first == "do_not_list") continue; - WRN_UT << "Unknown attribute '" << attr.first << "' discarded.\n"; - } -@@ -715,12 +715,12 @@ - config::const_child_itors current_traits = modifications_.child_range("trait"); - std::vector<config> candidate_traits; - -- foreach (const config &t, type->possible_traits()) -+ BOOST_FOREACH(const config &t, type->possible_traits()) - { - // Skip the trait if the unit already has it. - const std::string &tid = t["id"]; - bool already = false; -- foreach (const config &mod, current_traits) -+ BOOST_FOREACH(const config &mod, current_traits) - { - if (mod["id"] == tid) { - already = true; -@@ -767,7 +767,7 @@ - { - std::vector<std::string> res; - -- foreach (const config &mod, modifications_.child_range("trait")) -+ BOOST_FOREACH(const config &mod, modifications_.child_range("trait")) - { - std::string const &id = mod["id"]; - if (!id.empty()) -@@ -797,7 +797,7 @@ - config new_cfg; - static char const *persistent_attrs[] = { "upkeep", "ellipse", - "image", "image_icon", "usage", "random_traits", "generate_name" }; -- foreach (const char *attr, persistent_attrs) { -+ BOOST_FOREACH(const char *attr, persistent_attrs) { - if (const config::attribute_value *v = old_cfg.get(attr)) { - new_cfg[attr] = *v; - } -@@ -813,7 +813,7 @@ - static char const *unit_type_attrs[] = { "movement", "movement_type", - "die_sound", "flies", "inherit", "variation_name", - "ignore_race_traits", "hide_help" }; -- foreach (const char *attr, unit_type_attrs) { -+ BOOST_FOREACH(const char *attr, unit_type_attrs) { - new_cfg.remove_attribute(attr); - } - -@@ -1020,7 +1020,7 @@ - const std::vector<std::string> unit::advances_to_translated() const - { - std::vector<std::string> result; -- foreach (std::string type_id, advances_to_) -+ BOOST_FOREACH(std::string type_id, advances_to_) - { - const unit_type *type = unit_types.find(type_id); - if (type) -@@ -1120,7 +1120,7 @@ - const std::map<std::string,std::string> unit::get_states() const - { - std::map<std::string, std::string> all_states; -- foreach (std::string const &s, states_) { -+ BOOST_FOREACH(std::string const &s, states_) { - all_states[s] = "yes"; - } - for (std::map<std::string, state_t>::const_iterator i = known_boolean_state_names_.begin(), -@@ -1195,7 +1195,7 @@ - { - if (const config &abil = cfg_.child("abilities")) - { -- foreach (const config::any_child &ab, abil.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &ab, abil.all_children_range()) { - if (ab.cfg["id"] == ability) - return true; - } -@@ -2197,7 +2197,7 @@ - if (const config &resistance = cfg_.child("resistance")) - { - utils::string_map res; -- foreach (const config::attribute &i, resistance.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, resistance.attribute_range()) { - res[i.first] = i.second; - } - return res; -@@ -2222,7 +2222,7 @@ - { - std::ostringstream tooltip; - const std::string &image = game_config::images::level; -- foreach (const std::string &s, advances_to()) -+ BOOST_FOREACH(const std::string &s, advances_to()) - { - if (!s.empty()) - tooltip << s << '\n'; -@@ -2230,7 +2230,7 @@ - temp[image] = tooltip.str(); - } - -- foreach (const config &adv, get_modification_advances()) -+ BOOST_FOREACH(const config &adv, get_modification_advances()) - { - const std::string &image = adv["image"]; - if (image.empty()) continue; -@@ -2248,7 +2248,7 @@ - std::vector<std::pair<std::string,std::string> > temp; - std::pair<std::string,std::string> icon; //<image,tooltip> - -- foreach (const config &adv, get_modification_advances()) -+ BOOST_FOREACH(const config &adv, get_modification_advances()) - { - icon.first = adv["icon"].str(); - icon.second = adv["description"].str(); -@@ -2265,7 +2265,7 @@ - std::vector<config> unit::get_modification_advances() const - { - std::vector<config> res; -- foreach (const config &adv, modification_advancements()) -+ BOOST_FOREACH(const config &adv, modification_advancements()) - { - if (adv["strict_amla"].to_bool() && !advances_to_.empty()) - continue; -@@ -2283,7 +2283,7 @@ - std::unique_copy(temp.begin(), temp.end(), std::back_inserter(uniq)); - - bool requirements_done = true; -- foreach (const std::string &s, uniq) -+ BOOST_FOREACH(const std::string &s, uniq) - { - int required_num = std::count(temp.begin(), temp.end(), s); - int mod_num = modification_count("advance", s); -@@ -2302,7 +2302,7 @@ - size_t unit::modification_count(const std::string& type, const std::string& id) const - { - size_t res = 0; -- foreach (const config &item, modifications_.child_range(type)) { -+ BOOST_FOREACH(const config &item, modifications_.child_range(type)) { - if (item["id"] == id) { - ++res; - } -@@ -2314,7 +2314,7 @@ - /** Helper function for add_modifications */ - static void mod_mdr_merge(config& dst, const config& mod, bool delta) - { -- foreach (const config::attribute &i, mod.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, mod.attribute_range()) { - int v = 0; - if (delta) v = dst[i.first]; - dst[i.first] = v + i.second.to_int(); -@@ -2336,7 +2336,7 @@ - } - config last_effect; - std::vector<t_string> effects_description; -- foreach (const config &effect, mod.child_range("effect")) -+ BOOST_FOREACH(const config &effect, mod.child_range("effect")) - { - // See if the effect only applies to certain unit types - const std::string &type_filter = effect["unit_type"]; -@@ -2524,7 +2524,7 @@ - config &def = cfg_.child_or_add("defense"); - if (const config &ap = effect.child("defense")) { - bool replace = effect["replace"].to_bool(); -- foreach (const config::attribute &i, ap.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, ap.attribute_range()) { - int v = i.second.to_int(); - config::attribute_value &dst = def[i.first]; - if (!replace) { -@@ -2551,7 +2551,7 @@ - config &ab = cfg_.child_or_add("abilities"); - if (const config &ab_effect = effect.child("abilities")) { - config to_append; -- foreach (const config::any_child &ab, ab_effect.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &ab, ab_effect.all_children_range()) { - if(!has_ability_by_id(ab.cfg["id"])) { - to_append.add_child(ab.key, ab.cfg); - } -@@ -2560,7 +2560,7 @@ - } - } else if (apply_to == "remove_ability") { - if (const config &ab_effect = effect.child("abilities")) { -- foreach (const config::any_child &ab, ab_effect.all_children_range()) { -+ BOOST_FOREACH(const config::any_child &ab, ab_effect.all_children_range()) { - remove_ability_by_id(ab.cfg["id"]); - } - } -@@ -2749,7 +2749,7 @@ - - for(size_t i = 0; i != NumModificationTypes; ++i) { - const std::string& mod = ModificationTypes[i]; -- foreach (const config &m, modifications_.child_range(mod)) { -+ BOOST_FOREACH(const config &m, modifications_.child_range(mod)) { - log_scope("add mod"); - add_modification(ModificationTypes[i], m, true); - } -@@ -2779,7 +2779,7 @@ - bool is_inv = !get_state(STATE_UNCOVERED) && get_ability_bool(hides,loc); - if(is_inv){ - const std::vector<team>& teams = *resources::teams; -- foreach (const unit &u, *resources::units) -+ BOOST_FOREACH(const unit &u, *resources::units) - { - const map_location &u_loc = u.get_location(); - if (teams[side_-1].is_enemy(u.side()) && tiles_adjacent(loc, u_loc)) { -@@ -2881,7 +2881,7 @@ - int side_units(int side) - { - int res = 0; -- foreach (const unit &u, *resources::units) { -+ BOOST_FOREACH(const unit &u, *resources::units) { - if (u.side() == side) ++res; - } - return res; -@@ -2890,7 +2890,7 @@ - int side_units_cost(int side) - { - int res = 0; -- foreach (const unit &u, *resources::units) { -+ BOOST_FOREACH(const unit &u, *resources::units) { - if (u.side() == side) res += u.cost(); - } - return res; -@@ -2899,7 +2899,7 @@ - int side_upkeep(int side) - { - int res = 0; -- foreach (const unit &u, *resources::units) { -+ BOOST_FOREACH(const unit &u, *resources::units) { - if (u.side() == side) res += u.upkeep(); - } - return res; -@@ -3029,7 +3029,7 @@ - const tportrait* unit::portrait( - const unsigned size, const tportrait::tside side) const - { -- foreach(const tportrait& portrait, (type()->portraits())) { -+ BOOST_FOREACH(const tportrait& portrait, (type()->portraits())) { - if(portrait.size == size - && (side == portrait.side || portrait.side == tportrait::BOTH)) { - -@@ -3107,20 +3107,20 @@ - "number", - ""}; - -- foreach (const config &att, unit_config.child_range("attack")) -+ BOOST_FOREACH(const config &att, unit_config.child_range("attack")) - { - config& child = wcfg.add_child("attack"); - for (int i = 0; !attack_keys[i].empty(); ++i) { - child[attack_keys[i]] = att[attack_keys[i]]; - } -- foreach (const config &spec, att.child_range("specials")) { -+ BOOST_FOREACH(const config &spec, att.child_range("specials")) { - config& child_spec = child.add_child("specials", spec); - child_spec.recursive_clear_value("description"); - } - - } - -- foreach (const config &abi, unit_config.child_range("abilities")) -+ BOOST_FOREACH(const config &abi, unit_config.child_range("abilities")) - { - config& child = wcfg.add_child("abilities", abi); - child.recursive_clear_value("description"); -@@ -3129,7 +3129,7 @@ - child.recursive_clear_value("name_inactive"); - } - -- foreach (const config &trait, unit_config.child_range("trait")) -+ BOOST_FOREACH(const config &trait, unit_config.child_range("trait")) - { - config& child = wcfg.add_child("trait", trait); - child.recursive_clear_value("description"); -@@ -3142,7 +3142,7 @@ - - for (int i = 0; !child_keys[i].empty(); ++i) - { -- foreach (const config &c, unit_config.child_range(child_keys[i])) { -+ BOOST_FOREACH(const config &c, unit_config.child_range(child_keys[i])) { - wcfg.add_child(child_keys[i], c); - } - } -Index: src/campaign_server/campaign_server.cpp -=================================================================== ---- src/campaign_server/campaign_server.cpp (revision 54624) -+++ src/campaign_server/campaign_server.cpp (revision 54625) -@@ -21,7 +21,6 @@ - */ - - #include "filesystem.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "network_worker.hpp" - #include "serialization/binary_or_text.hpp" -@@ -35,6 +34,7 @@ - - #include <csignal> - -+#include <boost/foreach.hpp> - #include <boost/iostreams/filter/gzip.hpp> - - // the fork execute is unix specific only tested on Linux quite sure it won't -@@ -202,7 +202,7 @@ - - void find_translations(const config& cfg, config& campaign) - { -- foreach (const config &dir, cfg.child_range("dir")) -+ BOOST_FOREACH(const config &dir, cfg.child_range("dir")) - { - if (dir["name"] == "LC_MESSAGES") { - config &language = campaign.add_child("translation"); -@@ -249,7 +249,7 @@ - LOG_CS << "Encoding all stored addons. Number of addons: " - << std::distance(camps.first, camps.second) << '\n'; - -- foreach (const config &cm, camps) -+ BOOST_FOREACH(const config &cm, camps) - { - LOG_CS << "Encoding " << cm["name"] << '\n'; - std::string filename = cm["filename"], newfilename = filename + ".new"; -@@ -345,7 +345,7 @@ - } catch(bad_lexical_cast) {} - - std::string name = req["name"], lang = req["language"]; -- foreach (const config &i, campaigns().child_range("campaign")) -+ BOOST_FOREACH(const config &i, campaigns().child_range("campaign")) - { - if (!name.empty() && name != i["name"]) continue; - std::string tm = i["timestamp"]; -@@ -353,7 +353,7 @@ - if (after_flag && (tm.empty() || lexical_cast_default<time_t>(tm, 0) <= after)) continue; - if (!lang.empty()) { - bool found = false; -- foreach (const config &j, i.child_range("translation")) { -+ BOOST_FOREACH(const config &j, i.child_range("translation")) { - if (j["language"] == lang) { - found = true; - break; -@@ -364,7 +364,7 @@ - campaign_list.add_child("campaign", i); - } - -- foreach (config &j, campaign_list.child_range("campaign")) { -+ BOOST_FOREACH(config &j, campaign_list.child_range("campaign")) { - j["passphrase"] = t_string(); - j["upload_ip"] = t_string(); - j["email"] = t_string(); -@@ -402,7 +402,7 @@ - std::string lc_name(name.size(), ' '); - std::transform(name.begin(), name.end(), lc_name.begin(), tolower); - config *campaign = NULL; -- foreach (config &c, campaigns().child_range("campaign")) { -+ BOOST_FOREACH(config &c, campaigns().child_range("campaign")) { - if (utils::lowercase(c["name"]) == lc_name) { - campaign = &c; - break; -Index: src/image_modifications.cpp -=================================================================== ---- src/image_modifications.cpp (revision 54624) -+++ src/image_modifications.cpp (revision 54625) -@@ -15,13 +15,14 @@ - - #include "color_range.hpp" - #include "config.hpp" --#include "foreach.hpp" - #include "game_config.hpp" - #include "image.hpp" - #include "image_modifications.hpp" - #include "log.hpp" - #include "serialization/string_utils.hpp" - -+#include <boost/foreach.hpp> -+ - #include <map> - - #define GETTEXT_DOMAIN "wesnoth-lib" -@@ -99,7 +100,7 @@ - { - modification_queue mods; - -- foreach(const std::string& encoded_mod, -+ BOOST_FOREACH(const std::string& encoded_mod, - utils::parenthetical_split(encoded_mods, '~')) { - modification* mod = decode_modification(encoded_mod); - -Index: src/statistics.cpp -=================================================================== ---- src/statistics.cpp (revision 54624) -+++ src/statistics.cpp (revision 54625) -@@ -20,12 +20,13 @@ - - #include "global.hpp" - #include "statistics.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "serialization/binary_or_text.hpp" - #include "unit.hpp" - #include "util.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_engine("engine"); - #define DBG_NG LOG_STREAM(debug, log_engine) - -@@ -57,7 +58,7 @@ - team_stats(), - scenario_name(cfg["scenario"]) - { -- foreach (const config &team, cfg.child_range("team")) { -+ BOOST_FOREACH(const config &team, cfg.child_range("team")) { - team_stats[team["save_id"]] = stats(team); - } - } -@@ -121,7 +122,7 @@ - static stats::str_int_map read_str_int_map(const config& cfg) - { - stats::str_int_map m; -- foreach (const config::attribute &i, cfg.attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, cfg.attribute_range()) { - m[i.first] = i.second; - } - -@@ -159,7 +160,7 @@ - static stats::battle_result_map read_battle_result_map(const config& cfg) - { - stats::battle_result_map m; -- foreach (const config &i, cfg.child_range("sequence")) -+ BOOST_FOREACH(const config &i, cfg.child_range("sequence")) - { - config item = i; - int key = item["_num"]; -@@ -612,7 +613,7 @@ - fresh_stats(); - mid_scenario = cfg["mid_scenario"].to_bool(); - -- foreach (const config &s, cfg.child_range("scenario")) { -+ BOOST_FOREACH(const config &s, cfg.child_range("scenario")) { - master_stats.push_back(scenario_stats(s)); - } - } -Index: src/tooltips.cpp -=================================================================== ---- src/tooltips.cpp (revision 54624) -+++ src/tooltips.cpp (revision 54625) -@@ -17,13 +17,14 @@ - #include "tooltips.hpp" - - #include "font.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "help.hpp" - #include "marked-up_text.hpp" - #include "resources.hpp" - #include "video.hpp" - -+#include <boost/foreach.hpp> -+ - namespace { - - CVideo* video_ = NULL; -@@ -172,7 +173,7 @@ - - bool click(int mousex, int mousey) - { -- foreach(tooltip tip, tips) { -+ BOOST_FOREACH(tooltip tip, tips) { - if(!tip.action.empty() && point_in_rect(mousex, mousey, tip.rect)) { - display* disp = resources::screen; - help::show_help(*disp, tip.action); -Index: src/server/ban.cpp -=================================================================== ---- src/server/ban.cpp (revision 54624) -+++ src/server/ban.cpp (revision 54625) -@@ -14,7 +14,6 @@ - */ - - #include "config.hpp" --#include "foreach.hpp" - #include "log.hpp" - #include "filesystem.hpp" - #include "serialization/parser.hpp" -@@ -24,7 +23,7 @@ - - #include "ban.hpp" - -- -+#include <boost/foreach.hpp> - #include <boost/bind.hpp> - - namespace wesnothd { -@@ -260,7 +259,7 @@ - scoped_istream ban_file = istream_file(filename_); - read_gz(cfg, *ban_file); - -- foreach (const config &b, cfg.child_range("ban")) -+ BOOST_FOREACH(const config &b, cfg.child_range("ban")) - { - try { - banned_ptr new_ban(new banned(b)); -@@ -276,7 +275,7 @@ - // load deleted too - if (const config &cfg_del = cfg.child("deleted")) - { -- foreach (const config &b, cfg_del.child_range("ban")) -+ BOOST_FOREACH(const config &b, cfg_del.child_range("ban")) - { - try { - banned_ptr new_ban(new banned(b)); -@@ -680,7 +679,7 @@ - void ban_manager::load_config(const config& cfg) - { - ban_times_.clear(); -- foreach (const config &bt, cfg.child_range("ban_time")) { -+ BOOST_FOREACH(const config &bt, cfg.child_range("ban_time")) { - time_t duration = 0; - if (parse_time(bt["time"], &duration)) { - ban_times_.insert(default_ban_times::value_type(bt["name"], duration)); -Index: src/server/server.cpp -=================================================================== ---- src/server/server.cpp (revision 54624) -+++ src/server/server.cpp (revision 54625) -@@ -23,7 +23,6 @@ - #include "../global.hpp" - - #include "../config.hpp" --#include "../foreach.hpp" - #include "../game_config.hpp" - #include "../log.hpp" - #include "../map.hpp" // gamemap::MAX_PLAYERS -@@ -54,6 +53,7 @@ - #include <boost/bind.hpp> - #include <boost/scoped_ptr.hpp> - #include <boost/scoped_array.hpp> -+#include <boost/foreach.hpp> - #include <boost/utility.hpp> - #include <algorithm> - #include <cassert> -@@ -556,15 +556,15 @@ - } - - redirected_versions_.clear(); -- foreach (const config &redirect, cfg_.child_range("redirect")) { -- foreach (const std::string &version, utils::split(redirect["version"])) { -+ BOOST_FOREACH(const config &redirect, cfg_.child_range("redirect")) { -+ BOOST_FOREACH(const std::string &version, utils::split(redirect["version"])) { - redirected_versions_[version] = redirect; - } - } - - proxy_versions_.clear(); -- foreach (const config &proxy, cfg_.child_range("proxy")) { -- foreach (const std::string &version, utils::split(proxy["version"])) { -+ BOOST_FOREACH(const config &proxy, cfg_.child_range("proxy")) { -+ BOOST_FOREACH(const std::string &version, utils::split(proxy["version"])) { - proxy_versions_[version] = proxy; - } - } -@@ -704,7 +704,7 @@ - simple_wml::document ping( strstr.str().c_str(), - simple_wml::INIT_COMPRESSED ); - simple_wml::string_span s = ping.output_compressed(); -- foreach (network::connection sock, ghost_players_) { -+ BOOST_FOREACH(network::connection sock, ghost_players_) { - if (!lg::debug.dont_log(log_server)) { - wesnothd::player_map::const_iterator i = players_.find(sock); - if (i != players_.end()) { -@@ -720,7 +720,7 @@ - // Only a single thread should be accessing this - // Erase before we copy - speeds inserts - ghost_players_.clear(); -- foreach (const wesnothd::player_map::value_type v, players_) { -+ BOOST_FOREACH(const wesnothd::player_map::value_type v, players_) { - ghost_players_.insert(v.first); - } - last_ping_ = now; -Index: src/server/room_manager.cpp -=================================================================== ---- src/server/room_manager.cpp (revision 54624) -+++ src/server/room_manager.cpp (revision 54625) -@@ -21,9 +21,10 @@ - #include "../serialization/string_utils.hpp" - #include "../util.hpp" - #include "../filesystem.hpp" --#include "../foreach.hpp" - #include "../log.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_server_lobby("server/lobby"); - #define ERR_LOBBY LOG_STREAM(err, log_server_lobby) - #define WRN_LOBBY LOG_STREAM(warn, log_server_lobby) -@@ -58,7 +59,7 @@ - // this assumes the server is shutting down, so there's no need to - // send the actual room-quit messages to clients - write_rooms(); -- foreach (t_rooms_by_name_::value_type i, rooms_by_name_) { -+ BOOST_FOREACH(t_rooms_by_name_::value_type i, rooms_by_name_) { - delete i.second; - } - } -@@ -97,7 +98,7 @@ - read(cfg, *file); - } - -- foreach (const config &c, cfg.child_range("room")) { -+ BOOST_FOREACH(const config &c, cfg.child_range("room")) { - room* r(new room(c)); - if (room_exists(r->name())) { - ERR_LOBBY << "Duplicate room ignored in stored rooms: " -@@ -122,7 +123,7 @@ - if (filename_.empty()) return; - LOG_LOBBY << "Writing rooms to " << filename_ << "\n"; - config cfg; -- foreach (const t_rooms_by_name_::value_type& v, rooms_by_name_) { -+ BOOST_FOREACH(const t_rooms_by_name_::value_type& v, rooms_by_name_) { - const room& r = *v.second; - if (r.persistent()) { - config& c = cfg.add_child("room"); -@@ -211,7 +212,7 @@ - - void room_manager::enter_lobby(const wesnothd::game &game) - { -- foreach (network::connection player, game.all_game_users()) { -+ BOOST_FOREACH(network::connection player, game.all_game_users()) { - enter_lobby(player); - } - } -@@ -225,7 +226,7 @@ - store_player_rooms(player); - t_rooms_by_player_::iterator i = rooms_by_player_.find(player); - if (i != rooms_by_player_.end()) { -- foreach (room* r, i->second) { -+ BOOST_FOREACH(room* r, i->second) { - r->remove_player(player); - } - } -@@ -244,7 +245,7 @@ - lobby_->remove_player(player); - t_rooms_by_player_::iterator i = rooms_by_player_.find(player); - if (i != rooms_by_player_.end()) { -- foreach (room* r, i->second) { -+ BOOST_FOREACH(room* r, i->second) { - r->remove_player(player); - } - } -@@ -315,7 +316,7 @@ - t_player_stored_rooms_::iterator it = - player_stored_rooms_.insert(std::make_pair(player, std::set<std::string>())).first; - std::set<std::string>& store = it->second; -- foreach (room* r, i->second) { -+ BOOST_FOREACH(room* r, i->second) { - store.insert(r->name()); - } - } -@@ -337,7 +338,7 @@ - simple_wml::document doc; - simple_wml::node& join_msg = doc.root().add_child("room_join"); - join_msg.set_attr_dup("player", user->second.name().c_str()); -- foreach (const std::string& room_name, it->second) { -+ BOOST_FOREACH(const std::string& room_name, it->second) { - room* r = get_create_room(room_name, user->first); - if (r == NULL) { - LOG_LOBBY << "Player " << user->second.name() << " unable to rejoin room " << room_name << "\n"; -@@ -528,7 +529,7 @@ - void room_manager::fill_room_list(simple_wml::node& root) - { - simple_wml::node& rooms = root.add_child("rooms"); -- foreach (const t_rooms_by_name_::value_type& tr, rooms_by_name_) { -+ BOOST_FOREACH(const t_rooms_by_name_::value_type& tr, rooms_by_name_) { - const room& r = *tr.second; - simple_wml::node& room = rooms.add_child("room"); - room.set_attr_dup("name", r.name().c_str()); -@@ -539,7 +540,7 @@ - void room_manager::fill_member_list(const room* room, simple_wml::node& root) - { - simple_wml::node& members = root.add_child("members"); -- foreach (network::connection m, room->members()) { -+ BOOST_FOREACH(network::connection m, room->members()) { - simple_wml::node& member = members.add_child("member"); - player_map::const_iterator mi = all_players_.find(m); - if (mi != all_players_.end()) { -Index: src/variable.cpp -=================================================================== ---- src/variable.cpp (revision 54624) -+++ src/variable.cpp (revision 54625) -@@ -24,7 +24,6 @@ - - #include "variable.hpp" - --#include "foreach.hpp" - #include "formula_string_utils.hpp" - #include "gamestatus.hpp" - #include "log.hpp" -@@ -34,6 +33,7 @@ - #include "team.hpp" - - #include <boost/variant.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_engine("engine"); - #define LOG_NG LOG_STREAM(info, log_engine) -@@ -233,11 +233,11 @@ - { - config res; - -- foreach (const config::attribute &i, cfg_->attribute_range()) { -+ BOOST_FOREACH(const config::attribute &i, cfg_->attribute_range()) { - res[i.first] = expand(i.first); - } - -- foreach (const config::any_child &child, cfg_->all_children_range()) -+ BOOST_FOREACH(const config::any_child &child, cfg_->all_children_range()) - { - if (child.key == "insert_tag") { - vconfig insert_cfg(child.cfg); -@@ -283,7 +283,7 @@ - { - vconfig::child_list res; - -- foreach (const config::any_child &child, cfg_->all_children_range()) -+ BOOST_FOREACH(const config::any_child &child, cfg_->all_children_range()) - { - if (child.key == key) { - res.push_back(vconfig(&child.cfg, cache_key_)); -@@ -319,7 +319,7 @@ - if (const config &natural = cfg_->child(key)) { - return vconfig(&natural, cache_key_); - } -- foreach (const config &ins, cfg_->child_range("insert_tag")) -+ BOOST_FOREACH(const config &ins, cfg_->child_range("insert_tag")) - { - vconfig insert_cfg(ins); - if(insert_cfg["name"] == key) { -@@ -339,7 +339,7 @@ - if (cfg_->child(key)) { - return true; - } -- foreach (const config &ins, cfg_->child_range("insert_tag")) -+ BOOST_FOREACH(const config &ins, cfg_->child_range("insert_tag")) - { - vconfig insert_cfg(ins); - if(insert_cfg["name"] == key) { -@@ -475,7 +475,7 @@ - - config &scoped_wml_variable::store(const config &var_value) - { -- foreach (const config &i, repos->get_variables().child_range(var_name_)) { -+ BOOST_FOREACH(const config &i, repos->get_variables().child_range(var_name_)) { - previous_val_.add_child(var_name_, i); - } - repos->clear_variable_cfg(var_name_); -@@ -489,7 +489,7 @@ - { - if(activated_) { - repos->clear_variable_cfg(var_name_); -- foreach (const config &i, previous_val_.child_range(var_name_)) { -+ BOOST_FOREACH(const config &i, previous_val_.child_range(var_name_)) { - repos->add_variable_cfg(var_name_, i); - } - LOG_NG << "scoped_wml_variable: var_name \"" << var_name_ << "\" has been reverted.\n"; -Index: src/preferences_display.cpp -=================================================================== ---- src/preferences_display.cpp (revision 54624) -+++ src/preferences_display.cpp (revision 54625) -@@ -25,7 +25,6 @@ - - #include "construct_dialog.hpp" - #include "display.hpp" --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "gettext.hpp" - #include "gui/dialogs/simple_item_selector.hpp" -@@ -35,6 +34,8 @@ - #include "marked-up_text.hpp" - #include "wml_separators.hpp" - -+#include <boost/foreach.hpp> -+ - namespace preferences { - - display* disp = NULL; -@@ -82,7 +83,7 @@ - bpp = video.modePossible(resolution.first, resolution.second, - DefaultBPP, video_flags, true); - -- foreach (const res_t &res, res_list) -+ BOOST_FOREACH(const res_t &res, res_list) - { - if (bpp != 0) break; - std::cerr << "Video mode " << resolution.first << 'x' -Index: src/hotkeys.cpp -=================================================================== ---- src/hotkeys.cpp (revision 54624) -+++ src/hotkeys.cpp (revision 54625) -@@ -19,7 +19,6 @@ - - #include "construct_dialog.hpp" - #include "display.hpp" --#include "foreach.hpp" - #include "hotkeys.hpp" - #include "game_end_exceptions.hpp" - #include "game_preferences.hpp" -@@ -33,6 +32,8 @@ - #include "wesconfig.h" - #include "wml_separators.hpp" - -+#include <boost/foreach.hpp> -+ - static lg::log_domain log_config("config"); - #define ERR_G LOG_STREAM(err, lg::general) - #define LOG_G LOG_STREAM(info, lg::general) -@@ -609,7 +610,7 @@ - - void load_hotkeys(const config& cfg) - { -- foreach (const config &hk, cfg.child_range(hotkey_tag_name)) -+ BOOST_FOREACH(const config &hk, cfg.child_range(hotkey_tag_name)) - { - hotkey_item& h = get_hotkey(hk["command"]); - if(h.get_id() != HOTKEY_NULL) { -Index: src/unit_display.cpp -=================================================================== ---- src/unit_display.cpp (revision 54624) -+++ src/unit_display.cpp (revision 54625) -@@ -18,7 +18,6 @@ - #include "global.hpp" - #include "unit_display.hpp" - --#include "foreach.hpp" - #include "game_preferences.hpp" - #include "game_events.hpp" - #include "log.hpp" -@@ -26,6 +25,7 @@ - #include "resources.hpp" - #include "terrain_filter.hpp" - -+#include <boost/foreach.hpp> - - #define LOG_DP LOG_STREAM(info, display) - -@@ -472,7 +472,7 @@ - disp->display_unit_hex(healed_loc); - unit_animator animator; - -- foreach (unit *h, healers) { -+ BOOST_FOREACH(unit *h, healers) { - h->set_facing(h->get_location().get_relative_dir(healed_loc)); - animator.add_animation(h, "healing", h->get_location(), - healed_loc, healing); -Index: src/editor/map_fragment.cpp -=================================================================== ---- src/editor/map_fragment.cpp (revision 54624) -+++ src/editor/map_fragment.cpp (revision 54625) -@@ -16,9 +16,10 @@ - - #include "map_fragment.hpp" - --#include "../foreach.hpp" - #include "util.hpp" - -+#include <boost/foreach.hpp> -+ - namespace editor { - - map_fragment::map_fragment() -@@ -44,7 +45,7 @@ - - void map_fragment::add_tiles(const gamemap& map, const std::set<map_location>& locs) - { -- foreach (const map_location& loc, locs) { -+ BOOST_FOREACH(const map_location& loc, locs) { - add_tile(map, loc); - } - } -@@ -57,7 +58,7 @@ - std::set<map_location> map_fragment::get_offset_area(const map_location& loc) const - { - std::set<map_location> result; -- foreach (const tile_info& i, items_) { -+ BOOST_FOREACH(const tile_info& i, items_) { - result.insert(i.offset.vector_sum(loc)); - } - return result; -@@ -65,14 +66,14 @@ - - void map_fragment::paste_into(gamemap& map, const map_location& loc) const - { -- foreach (const tile_info& i, items_) { -+ BOOST_FOREACH(const tile_info& i, items_) { - map.set_terrain(i.offset.vector_sum(loc), i.terrain); - } - } - - void map_fragment::shift(const map_location& offset) - { -- foreach (tile_info& ti, items_) { -+ BOOST_FOREACH(tile_info& ti, items_) { - ti.offset.vector_sum_assign(offset); - } - } -@@ -80,7 +81,7 @@ - map_location map_fragment::center_of_mass() const - { - map_location sum(0, 0); -- foreach (const tile_info& ti, items_) { -+ BOOST_FOREACH(const tile_info& ti, items_) { - sum.vector_sum_assign(ti.offset); - } - sum.x /= static_cast<int>(items_.size()); -@@ -92,7 +93,7 @@ - { - shift(center_of_mass().vector_negation()); - area_.clear(); -- foreach (tile_info& ti, items_) { -+ BOOST_FOREACH(tile_info& ti, items_) { - area_.insert(ti.offset); - } - } -@@ -100,7 +101,7 @@ - void map_fragment::rotate_60_cw() - { - area_.clear(); -- foreach (tile_info& ti, items_) { -+ BOOST_FOREACH(tile_info& ti, items_) { - map_location l(0,0); - int x = ti.offset.x; - int y = ti.offset.y; -@@ -120,7 +121,7 @@ - void map_fragment::rotate_60_ccw() - { - area_.clear(); -- foreach (tile_info& ti, items_) { -+ BOOST_FOREACH(tile_info& ti, items_) { - map_location l(0,0); - int x = ti.offset.x; - int y = ti.offset.y; -@@ -139,7 +140,7 @@ - - void map_fragment::flip_horizontal() - { -- foreach (tile_info& ti, items_) { -+ BOOST_FOREACH(tile_info& ti, items_) { - ti.offset.x = -ti.offset.x; - } - center_by_mass(); -@@ -147,7 +148,7 @@ - - void map_fragment::flip_vertical() - { -- foreach (tile_info& ti, items_) { -+ BOOST_FOREACH(tile_info& ti, items_) { - ti.offset.y = -ti.offset.y; - if (ti.offset.x % 2) { - ti.offset.y--; -@@ -166,11 +167,11 @@ - { - std::stringstream ss; - ss << "MF: "; -- foreach (const tile_info& ti, items_) { -+ BOOST_FOREACH(const tile_info& ti, items_) { - ss << "(" << ti.offset << ")"; - } - ss << " -- "; -- foreach (const map_location& loc, area_) { -+ BOOST_FOREACH(const map_location& loc, area_) { - ss << "(" << loc << ")"; - } - return ss.str(); -Index: src/editor/action.cpp -=================================================================== ---- src/editor/action.cpp (revision 54624) -+++ src/editor/action.cpp (revision 54625) -@@ -21,10 +21,10 @@ - - #include "editor/action.hpp" - #include "editor/map_context.hpp" --#include "foreach.hpp" - #include "gettext.hpp" - #include "util.hpp" - -+#include <boost/foreach.hpp> - namespace editor { - - int editor_action::next_id_ = 1; -@@ -75,25 +75,25 @@ - editor_action_chain::editor_action_chain(const editor::editor_action_chain &other) - : editor_action(), actions_() - { -- foreach (editor_action* a, other.actions_) { -+ BOOST_FOREACH(editor_action* a, other.actions_) { - actions_.push_back(a->clone()); - } - } - editor_action_chain& editor_action_chain::operator=(const editor_action_chain& other) - { - if (this == &other) return *this; -- foreach (editor_action* a, actions_) { -+ BOOST_FOREACH(editor_action* a, actions_) { - delete a; - } - actions_.clear(); -- foreach (editor_action* a, other.actions_) { -+ BOOST_FOREACH(editor_action* a, other.actions_) { - actions_.push_back(a->clone()); - } - return *this; - } - editor_action_chain::~editor_action_chain() - { -- foreach (editor_action* a, actions_) { -+ BOOST_FOREACH(editor_action* a, actions_) { - delete a; - } - } -@@ -103,7 +103,7 @@ - } - int editor_action_chain::action_count() const { - int count = 0; -- foreach (const editor_action* a, actions_) { -+ BOOST_FOREACH(const editor_action* a, actions_) { - if (a) { - count += a->action_count(); - } -@@ -133,7 +133,7 @@ - } - editor_action_chain* editor_action_chain::perform(map_context& mc) const { - util::unique_ptr<editor_action_chain> undo(new editor_action_chain()); -- foreach (editor_action* a, actions_) { -+ BOOST_FOREACH(editor_action* a, actions_) { - if (a != NULL) { - undo->append_action(a->perform(mc)); - } -@@ -143,7 +143,7 @@ - } - void editor_action_chain::perform_without_undo(map_context& mc) const - { -- foreach (editor_action* a, actions_) { -+ BOOST_FOREACH(editor_action* a, actions_) { - if (a != NULL) { - a->perform_without_undo(mc); - } -@@ -257,7 +257,7 @@ - } - void editor_action_select::extend(const editor_map& map, const std::set<map_location>& locs) - { -- foreach (const map_location& loc, locs) { -+ BOOST_FOREACH(const map_location& loc, locs) { - LOG_ED << "Checking " << loc << "\n"; - if (map.in_selection(loc)) { - LOG_ED << "Extending by " << loc << "\n"; -@@ -268,7 +268,7 @@ - editor_action* editor_action_select::perform(map_context& mc) const - { - std::set<map_location> undo_locs; -- foreach (const map_location& loc, area_) { -+ BOOST_FOREACH(const map_location& loc, area_) { - if (!mc.get_map().in_selection(loc)) { - undo_locs.insert(loc); - mc.add_changed_location(loc); -@@ -279,7 +279,7 @@ - } - void editor_action_select::perform_without_undo(map_context& mc) const - { -- foreach (const map_location& loc, area_) { -+ BOOST_FOREACH(const map_location& loc, area_) { - mc.get_map().add_to_selection(loc); - mc.add_changed_location(loc); - } -@@ -291,7 +291,7 @@ - } - void editor_action_deselect::extend(const editor_map& map, const std::set<map_location>& locs) - { -- foreach (const map_location& loc, locs) { -+ BOOST_FOREACH(const map_location& loc, locs) { - LOG_ED << "Checking " << loc << "\n"; - if (!map.in_selection(loc)) { - LOG_ED << "Extending by " << loc << "\n"; -@@ -302,7 +302,7 @@ - editor_action* editor_action_deselect::perform(map_context& mc) const - { - std::set<map_location> undo_locs; -- foreach (const map_location& loc, area_) { -+ BOOST_FOREACH(const map_location& loc, area_) { - if (mc.get_map().in_selection(loc)) { - undo_locs.insert(loc); - mc.add_changed_location(loc); -@@ -313,7 +313,7 @@ - } - void editor_action_deselect::perform_without_undo(map_context& mc) const - { -- foreach (const map_location& loc, area_) { -+ BOOST_FOREACH(const map_location& loc, area_) { - mc.get_map().remove_from_selection(loc); - mc.add_changed_location(loc); - } -Index: src/editor/map_context.cpp -=================================================================== ---- src/editor/map_context.cpp (revision 54624) -+++ src/editor/map_context.cpp (revision 54625) -@@ -19,7 +19,6 @@ - - #include "../display.hpp" - #include "../filesystem.hpp" --#include "../foreach.hpp" - #include "../gettext.hpp" - #include "../map_exception.hpp" - #include "../map_label.hpp" -@@ -28,6 +27,7 @@ - #include "formula_string_utils.hpp" - - #include <boost/regex.hpp> -+#include <boost/foreach.hpp> - - - namespace editor { -@@ -146,7 +146,7 @@ - if (!one_layer_only) { - terrain = map_.get_terrain_info(terrain).terrain_with_default_base(); - } -- foreach (const map_location& loc, locs) { -+ BOOST_FOREACH(const map_location& loc, locs) { - draw_terrain_actual(terrain, loc, one_layer_only); - } - } -@@ -374,7 +374,7 @@ - - void map_context::clear_stack(action_stack& stack) - { -- foreach (editor_action* a, stack) { -+ BOOST_FOREACH(editor_action* a, stack) { - delete a; - } - stack.clear(); -Index: src/editor/brush.cpp -=================================================================== ---- src/editor/brush.cpp (revision 54624) -+++ src/editor/brush.cpp (revision 54625) -@@ -17,9 +17,10 @@ - #include "brush.hpp" - #include "editor_common.hpp" - --#include "../foreach.hpp" - #include "../pathutils.hpp" - -+#include <boost/foreach.hpp> -+ - namespace editor { - - /*WIKI -@@ -74,11 +75,11 @@ - if (radius > 0) { - std::vector<map_location> in_radius; - get_tiles_in_radius(map_location(0, 0), radius, in_radius); -- foreach (map_location& loc, in_radius) { -+ BOOST_FOREACH(map_location& loc, in_radius) { - add_relative_location(loc.x, loc.y); - } - } -- foreach (const config &relative, cfg.child_range("relative")) -+ BOOST_FOREACH(const config &relative, cfg.child_range("relative")) - { - int x = relative["x"]; - int y = relative["y"]; -@@ -97,7 +98,7 @@ - std::set<map_location> brush::project(const map_location& hotspot) const - { - std::set<map_location> result; -- foreach (const map_location& relative, relative_tiles_) { -+ BOOST_FOREACH(const map_location& relative, relative_tiles_) { - result.insert(relative.vector_sum(hotspot)); - } - return result; -Index: src/editor/editor_map.cpp -=================================================================== ---- src/editor/editor_map.cpp (revision 54624) -+++ src/editor/editor_map.cpp (revision 54625) -@@ -20,12 +20,12 @@ - - #include "../display.hpp" - #include "../filesystem.hpp" --#include "../foreach.hpp" - #include "../gettext.hpp" - #include "../map_exception.hpp" - #include "../map_label.hpp" - #include "../wml_exception.hpp" - -+#include <boost/foreach.hpp> - - namespace editor { - -@@ -111,7 +111,7 @@ - ++errors; - } - } -- foreach (const map_location& loc, selection_) { -+ BOOST_FOREACH(const map_location& loc, selection_) { - if (!on_board_with_border(loc)) { - ERR_ED << "Off-map tile in selection: " << loc << "\n"; - } -Index: src/editor/editor_palettes.cpp -=================================================================== ---- src/editor/editor_palettes.cpp (revision 54624) -+++ src/editor/editor_palettes.cpp (revision 54625) -@@ -23,13 +23,14 @@ - #include "editor_common.hpp" - #include "editor_palettes.hpp" - --#include "../foreach.hpp" - #include "../gettext.hpp" - #include "../serialization/string_utils.hpp" - #include "../sound.hpp" - #include "../tooltips.hpp" - #include "../marked-up_text.hpp" - -+#include <boost/foreach.hpp> -+ - namespace { - static std::string selected_terrain; - } -@@ -84,7 +85,7 @@ - - // Get the available groups and add them to the structure - std::set<std::string> group_names; -- foreach (const config &g, cfg.child_range("editor_group")) -+ BOOST_FOREACH(const config &g, cfg.child_range("editor_group")) - { - if (group_names.find(g["id"]) == group_names.end()) { - terrain_groups_.push_back(terrain_group(g, gui)); -@@ -97,14 +98,14 @@ - } - } - std::map<std::string, terrain_group*> id_to_group; -- foreach (terrain_group& tg, terrain_groups_) { -+ BOOST_FOREACH(terrain_group& tg, terrain_groups_) { - id_to_group.insert(std::make_pair(tg.id, &tg)); - } - // The rest of the code assumes this is a valid pointer - assert(checked_group_btn_ != 0); - - // add the groups for all terrains to the map -- foreach (const t_translation::t_terrain& t, terrains_) { -+ BOOST_FOREACH(const t_translation::t_terrain& t, terrains_) { - const terrain_type& t_info = map().get_terrain_info(t); - DBG_ED << "Palette: processing terrain " << t_info.name() - << "(editor name: '" << t_info.editor_name() << "') " -@@ -119,7 +120,7 @@ - // add the terrain to the requested groups - const std::vector<std::string>& keys = utils::split(t_info.editor_group()); - bool core = false; -- foreach (const std::string& k, keys) { -+ BOOST_FOREACH(const std::string& k, keys) { - terrain_map_[k].push_back(t); - nmax_terrains_ = std::max(nmax_terrains_, terrain_map_[k].size()); - std::map<std::string, terrain_group*>::iterator i = id_to_group.find(k); -@@ -380,7 +381,7 @@ - scroll_down(); - } - -- foreach (terrain_group& g, terrain_groups_) { -+ BOOST_FOREACH(terrain_group& g, terrain_groups_) { - if (g.button.pressed()) { - checked_group_btn_ = &g.button; - set_group(g.id); -@@ -388,7 +389,7 @@ - } - } - -- foreach (terrain_group& g, terrain_groups_) { -+ BOOST_FOREACH(terrain_group& g, terrain_groups_) { - if (&g.button == checked_group_btn_) { - g.button.set_check(true); - } else { -Index: src/editor/editor_controller.cpp -=================================================================== ---- src/editor/editor_controller.cpp (revision 54624) -+++ src/editor/editor_controller.cpp (revision 54625) -@@ -32,7 +32,6 @@ - #include "../clipboard.hpp" - #include "../filechooser.hpp" - #include "../filesystem.hpp" --#include "../foreach.hpp" - #include "../game_preferences.hpp" - #include "../gettext.hpp" - #include "../map_create.hpp" -@@ -44,6 +43,7 @@ - #include "formula_string_utils.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - namespace { - static std::vector<std::string> saved_windows_; -@@ -135,7 +135,7 @@ - image::set_color_adjustment(preferences::editor::tod_r(), preferences::editor::tod_g(), preferences::editor::tod_b()); - theme& theme = gui().get_theme(); - const theme::menu* default_tool_menu = NULL; -- foreach (const theme::menu& m, theme.menus()) { -+ BOOST_FOREACH(const theme::menu& m, theme.menus()) { - if (m.get_id() == "draw_button_editor") { - default_tool_menu = &m; - break; -@@ -173,7 +173,7 @@ - - void editor_controller::init_brushes(const config& game_config) - { -- foreach (const config &i, game_config.child_range("brush")) { -+ BOOST_FOREACH(const config &i, game_config.child_range("brush")) { - brushes_.push_back(brush(i)); - } - if (brushes_.empty()) { -@@ -196,7 +196,7 @@ - new mouse_action_starting_position(key_))); - mouse_actions_.insert(std::make_pair(hotkey::HOTKEY_EDITOR_PASTE, - new mouse_action_paste(clipboard_, key_))); -- foreach (const theme::menu& menu, gui().get_theme().menus()) { -+ BOOST_FOREACH(const theme::menu& menu, gui().get_theme().menus()) { - if (menu.items().size() == 1) { - hotkey::HOTKEY_COMMAND hk = hotkey::get_hotkey(menu.items().front()).get_id(); - mouse_action_map::iterator i = mouse_actions_.find(hk); -@@ -205,7 +205,7 @@ - } - } - } -- foreach (const config &c, game_config.child_range("editor_tool_hint")) { -+ BOOST_FOREACH(const config &c, game_config.child_range("editor_tool_hint")) { - mouse_action_map::iterator i = - mouse_actions_.find(hotkey::get_hotkey(c["id"]).get_id()); - if (i != mouse_actions_.end()) { -@@ -216,7 +216,7 @@ - - void editor_controller::init_map_generators(const config& game_config) - { -- foreach (const config &i, game_config.child_range("multiplayer")) -+ BOOST_FOREACH(const config &i, game_config.child_range("multiplayer")) - { - if (i["map_generation"] == "default") { - const config &generator_cfg = i.child("generator"); -@@ -238,7 +238,7 @@ - ERR_ED << "No editor time-of-day defined\n"; - return; - } -- foreach (const config &i, cfg.child_range("time")) { -+ BOOST_FOREACH(const config &i, cfg.child_range("time")) { - tods_.push_back(time_of_day(i)); - } - } -@@ -250,7 +250,7 @@ - ERR_ED << "No editor music defined\n"; - return; - } -- foreach (const config &i, cfg.child_range("music")) { -+ BOOST_FOREACH(const config &i, cfg.child_range("music")) { - sound::play_music_config(i); - } - sound::commit_music_changes(); -@@ -265,13 +265,13 @@ - - editor_controller::~editor_controller() - { -- foreach (const mouse_action_map::value_type a, mouse_actions_) { -+ BOOST_FOREACH(const mouse_action_map::value_type a, mouse_actions_) { - delete a.second; - } -- foreach (map_generator* m, map_generators_) { -+ BOOST_FOREACH(map_generator* m, map_generators_) { - delete m; - } -- foreach (map_context* mc, map_contexts_) { -+ BOOST_FOREACH(map_context* mc, map_contexts_) { - delete mc; - } - } -@@ -303,7 +303,7 @@ - void editor_controller::quit_confirm(EXIT_STATUS mode) - { - std::vector<std::string> modified; -- foreach (map_context* mc, map_contexts_) { -+ BOOST_FOREACH(map_context* mc, map_contexts_) { - if (mc->modified()) { - if (!mc->get_filename().empty()) { - modified.push_back(mc->get_filename()); -@@ -319,7 +319,7 @@ - message = _("Do you really want to quit? Changes in the map since the last save will be lost."); - } else { - message = _("Do you really want to quit? The following maps were modified and all changes since the last save will be lost:"); -- foreach (std::string& str, modified) { -+ BOOST_FOREACH(std::string& str, modified) { - message += "\n" + str; - } - } -@@ -342,7 +342,7 @@ - map_context* mc = new map_context(editor_map(game_config_, 44, 33, t_translation::GRASS_LAND)); - add_map_context(mc); - } else { -- foreach(const std::string& filename, saved_windows_) { -+ BOOST_FOREACH(const std::string& filename, saved_windows_) { - map_context* mc = new map_context(game_config_, filename); - add_map_context(mc); - } -@@ -796,7 +796,7 @@ - get_map_context().set_needs_terrain_rebuild(false); - gui().invalidate_all(); - } else { -- foreach (const map_location& loc, changed_locs) { -+ BOOST_FOREACH(const map_location& loc, changed_locs) { - gui().rebuild_terrain(loc); - } - gui().invalidate(changed_locs); -@@ -1290,7 +1290,7 @@ - - void editor_controller::redraw_toolbar() - { -- foreach (mouse_action_map::value_type a, mouse_actions_) { -+ BOOST_FOREACH(mouse_action_map::value_type a, mouse_actions_) { - if (a.second->toolbar_button() != NULL) { - SDL_Rect r = a.second->toolbar_button()->location(gui().screen_area()); - SDL_Rect outline = create_rect(r.x - 2, r.y - 2, r.h + 4, r.w + 4); -Index: src/formula.cpp -=================================================================== ---- src/formula.cpp (revision 54624) -+++ src/formula.cpp (revision 54625) -@@ -17,11 +17,12 @@ - #include <set> - #include <sstream> - --#include "foreach.hpp" - #include "formula_callable.hpp" - #include "formula_function.hpp" - #include "map_utils.hpp" - -+#include <boost/foreach.hpp> -+ - namespace game_logic - { - -@@ -117,7 +118,7 @@ - std::stringstream s; - s << '['; - bool first_item = true; -- foreach(expression_ptr a , items_) { -+ BOOST_FOREACH(expression_ptr a , items_) { - if (!first_item) { - s << ','; - } else { -@@ -468,7 +469,7 @@ - std::stringstream s; - s << "{where:("; - s << body_->str(); -- foreach (const expr_table::value_type &a, *clauses_) { -+ BOOST_FOREACH(const expr_table::value_type &a, *clauses_) { - s << ", [" << a.first << "] -> ["<< a.second->str()<<"]"; - } - s << ")}"; -Index: src/mouse_events.cpp -=================================================================== ---- src/mouse_events.cpp (revision 54624) -+++ src/mouse_events.cpp (revision 54625) -@@ -21,7 +21,6 @@ - #include "actions.hpp" - #include "attack_prediction_display.hpp" - #include "dialogs.hpp" --#include "foreach.hpp" - #include "game_end_exceptions.hpp" - #include "game_events.hpp" - #include "gettext.hpp" -@@ -45,6 +44,7 @@ - #include "whiteboard/manager.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_engine("engine"); - #define ERR_NG LOG_STREAM(err, log_engine) -@@ -1048,7 +1048,7 @@ - - map_location adj[6]; - get_adjacent_tiles(loc, adj); -- foreach (const map_location &aloc, adj) { -+ BOOST_FOREACH(const map_location &aloc, adj) { - unit_map::const_iterator i = find_unit(aloc); - if (i != units_.end() && uteam.is_enemy(i->side())) - res.insert(aloc); -@@ -1063,7 +1063,7 @@ - - map_location adj[6]; - get_adjacent_tiles(u->get_location(), adj); -- foreach (const map_location &loc, adj) -+ BOOST_FOREACH(const map_location &loc, adj) - { - if (!map_.on_board(loc)) continue; - unit_map::const_iterator i = units_.find(loc); -Index: src/multiplayer_connect.cpp -=================================================================== ---- src/multiplayer_connect.cpp (revision 54624) -+++ src/multiplayer_connect.cpp (revision 54625) -@@ -23,7 +23,6 @@ - - #include "ai/configuration.hpp" - #include "dialogs.hpp" --#include "foreach.hpp" - #include "game_display.hpp" - #include "game_preferences.hpp" - #include "gettext.hpp" -@@ -39,6 +38,7 @@ - #include "wml_exception.hpp" - - #include <boost/bind.hpp> -+#include <boost/foreach.hpp> - - static lg::log_domain log_network("network"); - #define LOG_NW LOG_STREAM(info, log_network) -@@ -189,7 +189,7 @@ - // Hack: if there is a unit which can recruit, use it as a leader. - // Necessary to display leader information when loading saves. - std::string leader_type; -- foreach (const config &side_unit, cfg.child_range("unit")) -+ BOOST_FOREACH(const config &side_unit, cfg.child_range("unit")) - { - if (side_unit["canrecruit"].to_bool()) { - leader_type = side_unit["type"].str(); -@@ -539,7 +539,7 @@ - std::vector<ai::description*> &ais_list = parent_->ai_algorithms_; - std::vector<std::string> ais; - int i = 0; -- foreach (const ai::description *desc, ais_list){ -+ BOOST_FOREACH(const ai::description *desc, ais_list){ - ais.push_back(desc->text); - if (desc->id==ai_algorithm_){ - sel = i; -@@ -557,7 +557,7 @@ - void connect::side::update_faction_combo() - { - std::vector<std::string> factions; -- foreach (const config *faction, parent_->era_sides_) -+ BOOST_FOREACH(const config *faction, parent_->era_sides_) - { - const std::string& name = (*faction)["name"]; - const std::string& icon = (*faction)["image"]; -@@ -724,7 +724,7 @@ - static char const *attrs[] = { "side", "controller", "id", - "team_name", "user_team_name", "color", "colour", "gold", - "income", "allow_changes" }; -- foreach (const char *attr, attrs) { -+ BOOST_FOREACH(const char *attr, attrs) { - trimmed.remove_attribute(attr); - } - -@@ -827,8 +827,8 @@ - { - std::map<std::string, config> children; - -- foreach(const std::string& children_to_swap, get_children_to_swap()) -- foreach(const config& child, cfg_.child_range(children_to_swap)) -+ BOOST_FOREACH(const std::string& children_to_swap, get_children_to_swap()) -+ BOOST_FOREACH(const config& child, cfg_.child_range(children_to_swap)) - children.insert(std::pair<std::string, config>(children_to_swap, child)); - - return children; -@@ -836,12 +836,12 @@ - - void connect::side::set_side_children(std::map<std::string, config> children) - { -- foreach(const std::string& children_to_remove, get_children_to_swap()) -+ BOOST_FOREACH(const std::string& children_to_remove, get_children_to_swap()) - cfg_.clear_children(children_to_remove); - - std::pair<std::string, config> child_map; - -- foreach(child_map, children) -+ BOOST_FOREACH(child_map, children) - cfg_.add_child(child_map.first, child_map.second); - } - -@@ -920,7 +920,7 @@ - // Builds the list of sides eligible for choice (nonrandom factions) - std::vector<int> nonrandom_sides; - int num = -1; -- foreach (const config *i, parent_->era_sides_) -+ BOOST_FOREACH(const config *i, parent_->era_sides_) - { - ++num; - if (!(*i)["random_faction"].to_bool()) { -@@ -1524,7 +1524,7 @@ - player_types_.push_back(_("Computer Player")); - player_types_.push_back(_("Empty")); - -- foreach (const config *faction, era_sides_) { -+ BOOST_FOREACH(const config *faction, era_sides_) { - player_factions_.push_back((*faction)["name"]); - } - -@@ -1539,7 +1539,7 @@ - // Teams - if(params_.use_map_settings) { - int side_num = 1; -- foreach (config &side, sides) -+ BOOST_FOREACH(config &side, sides) - { - config::attribute_value &team_name = side["team_name"]; - config::attribute_value &user_team_name = side["user_team_name"]; -@@ -1566,7 +1566,7 @@ - } else { - std::vector<std::string> map_team_names; - int _side_num = 1; -- foreach (config &side, sides) -+ BOOST_FOREACH(config &side, sides) - { - const std::string side_num = lexical_cast<std::string>(_side_num); - config::attribute_value &team_name = side["team_name"]; -@@ -1599,7 +1599,7 @@ - - // Populates "sides_" from the level configuration - int index = 0; -- foreach (const config &s, sides) { -+ BOOST_FOREACH(const config &s, sides) { - sides_.push_back(side(*this, s, index++)); - } - int offset=0; -@@ -1683,7 +1683,7 @@ - else - { - era_sides_.clear(); -- foreach (const config &e, era_cfg.child_range("multiplayer_side")) { -+ BOOST_FOREACH(const config &e, era_cfg.child_range("multiplayer_side")) { - era_sides_.push_back(&e); - } - level_.add_child("era", era_cfg); -@@ -1789,7 +1789,7 @@ - * creative in what is used in multiplayer [1] so use a simpler test now. - * [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568029 - */ -- foreach(const side& s, sides_) { -+ BOOST_FOREACH(const side& s, sides_) { - if(s.get_controller() != CNTR_EMPTY) { - if(s.allow_player()) { - return true; - ------------------------------------------------------------------------- diff --git a/community-staging/wesnoth/wesnoth.install b/community-staging/wesnoth/wesnoth.install deleted file mode 100644 index 4f1e419ae..000000000 --- a/community-staging/wesnoth/wesnoth.install +++ /dev/null @@ -1,9 +0,0 @@ -# arg 1: the new package version -post_install() { -cat << EOF -Note: -==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma" -==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth -==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output. -EOF -} diff --git a/community-staging/wesnoth/wesnoth.tmpfiles.conf b/community-staging/wesnoth/wesnoth.tmpfiles.conf deleted file mode 100644 index 3ec0f6013..000000000 --- a/community-staging/wesnoth/wesnoth.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -D /run/wesnothd 0700 root root - diff --git a/community-staging/wesnoth/wesnothd.rc.d b/community-staging/wesnoth/wesnothd.rc.d deleted file mode 100755 index 95e312b7b..000000000 --- a/community-staging/wesnoth/wesnothd.rc.d +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/wesnothd) - -case "$1" in - start) - stat_busy "Starting Wesnoth Server Daemon" - [[ -d /var/run/wesnothd ]] || mkdir /var/run/wesnothd - [ -z "$PID" ] && /usr/bin/wesnothd -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -o %PPID /usr/bin/wesnothd) - echo $PID > /var/run/wesnotd/pid - add_daemon wesnothd - stat_done - fi - ;; - stop) - stat_busy "Stopping Wesnoth Server Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon wesnothd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/wt/PKGBUILD b/community-staging/wt/PKGBUILD deleted file mode 100644 index f6a9365c4..000000000 --- a/community-staging/wt/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 73575 2012-07-10 14:02:36Z svenstaro $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Denis Martinez <deuns.martinez@gmail.com> - -pkgname=wt -pkgver=3.2.2rc1 -_pkgver=3.2.2-rc1 -pkgrel=1 -pkgdesc="a C++ library and application server for developing and deploying web applications" -arch=('i686' 'x86_64') -url="http://www.webtoolkit.eu/" -license=('GPL') -depends=('boost-libs>=1.36') -makedepends=('boost>=1.36' 'cmake>=2.8' - 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt') -optdepends=('openssl: for SSL support in built-in webserver' - 'zlib: for compression in HTTP protocol' - 'fcgi: for FastCGI support' - 'postgresql-libs: for PostgreSQL Dbo support' - 'sqlite: for Sqlite Dbo support' - 'libharu: for PDF generation (WPdfImage)' - 'graphicsmagick: for raster image support (WRasterImage)' - 'pango: for advanced font rendering (WRasterImage)' - 'mysql++: for the hangman example' - 'qt: for the Wt/Qt interopability example (wtwithqt)') -backup=('etc/wt/wt_config.xml') -source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('4709f48c65eceb862da693f122ccca59') - -build() { - cd ${srcdir}/${pkgname}-${_pkgver} - sed -i "s/<< s /<< *s /g" src/Wt/Ext/DataStore.C - - mkdir -p build - cd build - cmake \ - -DCONNECTOR_HTTP=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \ - -DWEBUSER=http \ - -DWEBGROUP=http \ - -DUSE_SYSTEM_SQLITE3=ON \ - -DINSTALL_EXAMPLES=ON \ - .. - make -} - -package() { - cd ${srcdir}/${pkgname}-${_pkgver}/build - make DESTDIR=${pkgdir} install - - mkdir -p ${pkgdir}/usr/share/cmake-2.8/Modules - mv ${pkgdir}/usr/cmake/FindWt.cmake ${pkgdir}/usr/share/cmake-2.8/Modules/ - rm -r ${pkgdir}/usr/cmake - rm -rf $pkgdir/var/run -} diff --git a/community-testing/cdfs/PKGBUILD b/community-testing/cdfs/PKGBUILD deleted file mode 100644 index 0ea673faf..000000000 --- a/community-testing/cdfs/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 73211 2012-07-04 00:43:09Z dreisner $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> - -pkgname=cdfs -pkgver=2.6.27 -pkgrel=23 -pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." -arch=(i686 x86_64) -url="http://www.elis.UGent.be/~ronsse/cdfs/" -license=('GPL') -makedepends=('linux-headers') -install=cdfs.install -source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2" - "cdfs-3.0.patch" - "cdfs-3.2.patch" - "cdfs-3.4.patch") -md5sums=('ac64c014a90e3c488394832ea29605b3' - 'aba7da94a9dcbb8a93ea423cb6958fef' - 'e934407b3460257a301822ffc4ab3933' - '9215e7bdac728bd2f889fb525e543454') - -build() { - _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` - depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") - _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-ARCH/version` - - cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/cdfs-3.0.patch - patch -p1 <$srcdir/cdfs-3.2.patch - patch -p1 <$srcdir/cdfs-3.4.patch - make KDIR=/usr/lib/modules/${_kernverfull}/build - install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko - sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/cdfs.install -} diff --git a/community-testing/cdfs/cdfs-3.0.patch b/community-testing/cdfs/cdfs-3.0.patch deleted file mode 100644 index 20194b848..000000000 --- a/community-testing/cdfs/cdfs-3.0.patch +++ /dev/null @@ -1,274 +0,0 @@ -diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c ---- cdfs-2.6.27/cddata.c 2009-12-21 17:04:03.000000000 +0300 -+++ cdfs-2.6.27.my/cddata.c 2011-07-24 21:18:44.000000000 +0400 -@@ -83,7 +83,7 @@ - #else - .mmap = generic_file_readonly_mmap, - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) -- .sendfile = generic_file_sendfile -+// .sendfile = generic_file_sendfile - #else - .splice_read = generic_file_splice_read - #endif -diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c ---- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 -+++ cdfs-2.6.27.my/root.c 2011-07-25 13:16:59.000000000 +0400 -@@ -32,19 +30,14 @@ - * Added code to transform /proc/cdfs into a sequential synthetic file. * - *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ - -- - #include <linux/seq_file.h> -- --#ifndef OLD_KERNEL - #include <linux/statfs.h> --#endif -+#include <linux/sched.h> - - extern struct seq_operations cdfs_operations; - extern struct _track_info *dummy_track_p; - --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) - struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); --#endif - /*============================================================================* - * cdfs_open() * - * Description: * -@@ -115,15 +108,8 @@ - - /********************************************************************/ - --#ifdef OLD_KERNEL --static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){ -- kdev_t dev = sb->s_dev; -- int i, j, t; -- struct cdrom_tochdr hdr; --#else - static int cdfs_fill_super(struct super_block *sb, void *data, int silent){ - int i, t; --#endif - struct cdrom_tocentry entry; - int no_audio=0, no_data=0; - cd * this_cd; -@@ -131,24 +117,13 @@ - - PRINT("cdfs_mount\n"); - --#ifdef OLD_KERNEL -- MOD_INC_USE_COUNT; -- -- set_blocksize(dev, CD_FRAMESIZE); // voor bread met ide-cd --#else - sb_set_blocksize(sb, CD_FRAMESIZE); // voor bread met ide-cd --#endif - - sb->s_blocksize = CD_FRAMESIZE; - sb->s_blocksize_bits = 11; - - if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){ --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - return -ENOMEM; --#endif - } - - this_cd->mode = MODE; -@@ -160,13 +135,8 @@ - - // Initialize cache for maximum sector size - if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) { --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - kfree(cdfs_info(sb)); - return -ENOMEM; --#endif - } - - // Cache is still invalid -@@ -183,23 +153,13 @@ - if (this_cd->toc_scsi){ - if (cdfs_toc_read_full(sb)){ - printk("TOC read failed\n"); --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - goto invalid; --#endif - } - } else { - //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){ - if (cdfs_toc_read(sb)){ - printk("cdfs_toc_read failed\n"); --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; -- return NULL; --#else - goto invalid; --#endif - } - } - -@@ -365,11 +325,7 @@ - sb->s_flags |= MS_RDONLY; - sb->s_op = &cdfs_ops; - /* always get inode status */ --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) - retinode=cdfs_iget(sb, 0); --#else -- retinode=iget(sb, 0); --#endif - if ( IS_ERR(retinode) ) - return PTR_ERR(retinode); - -@@ -379,16 +335,12 @@ - - cdfs_proc_cd = this_cd; - --#ifdef OLD_KERNEL -- return sb; --#else - return 0; - - invalid: - kfree(this_cd->cache); - kfree(cdfs_info(sb)); - return -EINVAL; --#endif - } - - /************************************************************************/ -@@ -410,27 +362,12 @@ - // Remove /proc entry - cdfs_proc_cd = NULL; - kfree(cdfs_info(sb)); -- --#ifdef OLD_KERNEL -- MOD_DEC_USE_COUNT; --#endif -- - } - - /************************************************************************/ - --#ifdef OLD_KERNEL --static int cdfs_statfs(struct super_block *sb, struct statfs *buf) { -- cd * this_cd = cdfs_info(sb); --#else --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) - static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) { - cd * this_cd = cdfs_info(d->d_sb); --#else --static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) { -- cd * this_cd = cdfs_info(sb); --#endif --#endif - PRINT("rmfs_statfs\n"); - - buf->f_type = CDFS_MAGIC; -@@ -460,11 +397,7 @@ - - /************************************************************************/ - --#ifdef OLD_KERNEL --static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){ --#else - static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){ --#endif - struct inode * inode; - int i; - cd * this_cd = cdfs_info(dir->i_sb); -@@ -480,15 +413,9 @@ - /* Use goto and read inode with iget()/cdfs_iget() */ - /* Thanks to David Howells for patch and Master class in his mail */ - found: --#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) - inode = cdfs_iget(dir->i_sb, i); - if (IS_ERR(inode)) - return ERR_CAST(inode); --#else -- inode = iget(dir->i_sb, i); -- if (!inode) -- return ERR_PTR(-ENOMEM); --#endif - d_add(dentry, inode); - return NULL; - } -@@ -529,12 +456,8 @@ - i->i_fop = &cdfs_dir_operations; - } else { /* file */ - i->i_size = this_cd->track[i->i_ino].size; --#ifdef OLD_KERNEL -- i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time; --#else - i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time; - i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0; --#endif - i->i_mode = this_cd->mode; - if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) { - i->i_fop = &cdfs_cddata_file_operations; -@@ -587,33 +510,21 @@ - /******************************************************************/ - - static struct super_operations cdfs_ops = { --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) -- .read_inode = cdfs_read_inode, --#endif - .put_super = cdfs_umount, - .statfs = cdfs_statfs - }; - --#ifdef OLD_KERNEL --static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount); --#else --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) --static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { -- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); --#else --static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { -- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super); --#endif --} -+//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { -+// return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); -+//} - - static struct file_system_type cdfs_fs_type = { - .owner = THIS_MODULE, - .name = "cdfs", -- .get_sb = cdfs_get_sb, -+// .get_sb = cdfs_get_sb, - .kill_sb = kill_block_super, - .fs_flags = FS_REQUIRES_DEV - }; --#endif - - /******************************************************/ - -@@ -621,10 +532,6 @@ - MODULE_DESCRIPTION("CDfs: a CD filesystem"); - MODULE_LICENSE("GPL"); - --#ifdef OLD_KERNEL --EXPORT_NO_SYMBOLS; --#endif -- - /******************************************************************/ - - static int __init cdfs_init(void) { -@@ -676,11 +583,7 @@ - - if (!options) return; - --#ifdef OLD_KERNEL -- for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) { --#else - while ((this_char = strsep(&options,",")) != NULL) { --#endif - - if (!strcmp(this_char,"single")) - this_cd->single=TRUE; diff --git a/community-testing/cdfs/cdfs-3.2.patch b/community-testing/cdfs/cdfs-3.2.patch deleted file mode 100644 index d3300bdbc..000000000 --- a/community-testing/cdfs/cdfs-3.2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c ---- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 -+++ cdfs-2.6.27.my/root.c 2012-01-18 11:23:03.000000000 +0400 -@@ -517,7 +517,7 @@ - - i->i_uid = this_cd->uid; - i->i_gid = this_cd->gid; -- i->i_nlink = 1; -+ i->__i_nlink = 1; - i->i_op = &cdfs_inode_operations; - i->i_fop = NULL; - i->i_data.a_ops = NULL; diff --git a/community-testing/cdfs/cdfs-3.4.patch b/community-testing/cdfs/cdfs-3.4.patch deleted file mode 100644 index 5c2cb9b24..000000000 --- a/community-testing/cdfs/cdfs-3.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c ---- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 -+++ cdfs-2.6.27.my/root.c 2012-06-15 17:09:27.000000000 +0400 -@@ -375,7 +375,7 @@ - - PRINT("retinode = %ld\n", retinode->i_ino); - -- sb->s_root = d_alloc_root(retinode); -+ sb->s_root = d_make_root(retinode); - - cdfs_proc_cd = this_cd; - diff --git a/community-testing/cdfs/cdfs.install b/community-testing/cdfs/cdfs.install deleted file mode 100644 index 6be46f6d5..000000000 --- a/community-testing/cdfs/cdfs.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.4-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.4-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.4-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/community-testing/chromaprint/PKGBUILD b/community-testing/chromaprint/PKGBUILD deleted file mode 100644 index b4ac256ec..000000000 --- a/community-testing/chromaprint/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 73323 2012-07-06 15:22:09Z ibiru $ -# Contributor: Wieland Hoffmann <the_mineo@web.de> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=chromaprint -pkgver=0.6 -pkgrel=3 -pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' -url='http://acoustid.org/chromaprint/' -arch=('i686' 'x86_64') -license=('LGPL') -depends=('ffmpeg') -makedepends=('cmake') -source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'ffmpeg.patch') -sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0' - '56057f824a29194fc6041bd73e0d07412fcc065b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../ffmpeg.patch - cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON . - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/chromaprint/ffmpeg.patch b/community-testing/chromaprint/ffmpeg.patch deleted file mode 100644 index 7c0b86d77..000000000 --- a/community-testing/chromaprint/ffmpeg.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c ---- old/examples/fpcalc.c 2011-12-22 22:11:23.000000000 +1100 -+++ new/examples/fpcalc.c 2012-06-04 10:44:30.596604910 +1000 -@@ -28,7 +28,7 @@ - #endif - int16_t *buffer; - -- if (av_open_input_file(&format_ctx, file_name, NULL, 0, NULL) != 0) { -+ if (avformat_open_input(&format_ctx, file_name, NULL, NULL) != 0) { - fprintf(stderr, "ERROR: couldn't open the file\n"); - goto done; - } -@@ -71,9 +71,9 @@ - goto done; - } - -- if (codec_ctx->sample_fmt != SAMPLE_FMT_S16) { -+ if (codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) { - #ifdef HAVE_AV_AUDIO_CONVERT -- convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, codec_ctx->channels, -+ convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codec_ctx->channels, - codec_ctx->sample_fmt, codec_ctx->channels, NULL, 0); - if (!convert_ctx) { - fprintf(stderr, "ERROR: couldn't create sample format converter\n"); -@@ -133,7 +133,7 @@ - if (convert_ctx) { - const void *ibuf[6] = { buffer1 }; - void *obuf[6] = { buffer2 }; -- int istride[6] = { av_get_bits_per_sample_format(codec_ctx->sample_fmt) / 8 }; -+ int istride[6] = { av_get_bytes_per_sample(codec_ctx->sample_fmt) }; - int ostride[6] = { 2 }; - int len = buffer_size / istride[0]; - if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) { diff --git a/community-testing/deadbeef/PKGBUILD b/community-testing/deadbeef/PKGBUILD deleted file mode 100644 index b38985962..000000000 --- a/community-testing/deadbeef/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 73325 2012-07-06 15:22:25Z ibiru $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Alexey Yakovenko <waker@users.sourceforge.net> - -pkgname=deadbeef -pkgver=0.5.5 -pkgrel=1 -pkgdesc='An audio player for GNU/Linux based on GTK2.' -arch=('i686' 'x86_64') -url='http://deadbeef.sourceforge.net' -license=('GPL2') -depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' - 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate' - 'yasm') -optdepends=('libsamplerate: for Resampler plugin' - 'libvorbis: for Ogg Vorbis playback' - 'libmad: for MP1/MP2/MP3 playback' - 'flac: for FLAC playback' - 'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support' - 'imlib2: for artwork plugin' - 'wavpack: for WavPack playback' - 'libsndfile: for Wave playback' - 'libcdio: audio cd plugin' - 'libcddb: audio cd plugin' - 'faad2: for AAC/MP4 support' - 'dbus: for OSD notifications support' - 'pulseaudio: for PulseAudio output plugin' - 'libx11: for global hotkeys plugin' - 'zlib: for Audio Overload plugin' - 'libzip: for vfs_zip plugin') -options=('!libtool') -install='deadbeef.install' -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7cc10cefda0f4044eea897893e4cc1a9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --disable-ffmpeg - make -} - -package () { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}/usr" install -} diff --git a/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch deleted file mode 100644 index db1c79638..000000000 --- a/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001 -From: Igor Murzov <e-mail@date.by> -Date: Mon, 4 Jul 2011 16:47:25 +0400 -Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT() - -For ffmpeg < 0.5. Copied from libavutil 0.5. - -ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc - -fixes build with lavc 53. - -ffmpeg: fix erroneous version comparisons - -Comparing versions this way: (x.y < x1.y1) is obviously equivalent to -(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1). - -ffmpeg: use av_register_protocol2() if available - -fixes usage with ffmpeg-0.8 ---- - plugins/ffmpeg/ffmpeg.c | 37 ++++++++++++++++++++++++++++++------- - 1 files changed, 30 insertions(+), 7 deletions(-) - -diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c -index cd7edf4..0cb9955 100644 ---- a/plugins/ffmpeg/ffmpeg.c -+++ b/plugins/ffmpeg/ffmpeg.c -@@ -44,6 +44,10 @@ - #define av_register_protocol register_protocol - #endif - -+#ifndef AV_VERSION_INT -+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) -+#endif -+ - #endif - - //#define trace(...) { fprintf(stderr, __VA_ARGS__); } -@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) { - for (i = 0; i < info->fctx->nb_streams; i++) - { - info->ctx = info->fctx->streams[i]->codec; -- if (info->ctx->codec_type == CODEC_TYPE_AUDIO) -+ if (info->ctx->codec_type == -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ AVMEDIA_TYPE_AUDIO) -+#else -+ CODEC_TYPE_AUDIO) -+#endif - { - info->codec = avcodec_find_decoder (info->ctx->codec_id); - if (info->codec != NULL) { -@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) { - int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; - int len; - //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size); --#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25) -- len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size); --#else -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0) - len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt); -+#else -+ len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size); - #endif - trace ("out: out_size=%d, len=%d\n", out_size, len); - if (len <= 0) { -@@ -418,7 +427,7 @@ static const char *map[] = { - - static int - ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) { --#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43 -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0) - if (!strlen (fctx->title)) { - // title is empty, this call will set track title to filename without extension - deadbeef->pl_add_meta (it, "title", NULL); -@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) { - for (i = 0; i < fctx->nb_streams; i++) - { - ctx = fctx->streams[i]->codec; -- if (ctx->codec_type == CODEC_TYPE_AUDIO) -+ if (ctx->codec_type == -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ AVMEDIA_TYPE_AUDIO) -+#else -+ CODEC_TYPE_AUDIO) -+#endif - { - codec = avcodec_find_decoder(ctx->codec_id); - if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams -@@ -704,7 +718,11 @@ ffmpeg_start (void) { - ffmpeg_init_exts (); - avcodec_init (); - av_register_all (); -+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); -+#else - av_register_protocol (&vfswrapper); -+#endif - return 0; - } - -@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) { - for (i = 0; i < fctx->nb_streams; i++) - { - ctx = fctx->streams[i]->codec; -- if (ctx->codec_type == CODEC_TYPE_AUDIO) -+ if (ctx->codec_type == -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ AVMEDIA_TYPE_AUDIO) -+#else -+ CODEC_TYPE_AUDIO) -+#endif - { - codec = avcodec_find_decoder(ctx->codec_id); - if (codec != NULL) --- -1.7.8.4 - diff --git a/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch deleted file mode 100644 index af8c282c0..000000000 --- a/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001 -From: Igor Murzov <e-mail@date.by> -Date: Thu, 7 Jul 2011 22:31:44 +0400 -Subject: [PATCH 2/2] ffmpeg: version check fix - ---- - plugins/ffmpeg/ffmpeg.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c -index 0cb9955..37c7e80 100644 ---- a/plugins/ffmpeg/ffmpeg.c -+++ b/plugins/ffmpeg/ffmpeg.c -@@ -718,7 +718,7 @@ ffmpeg_start (void) { - ffmpeg_init_exts (); - avcodec_init (); - av_register_all (); --#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0) - av_register_protocol2 (&vfswrapper, sizeof(vfswrapper)); - #else - av_register_protocol (&vfswrapper); --- -1.7.8.4 - diff --git a/community-testing/deadbeef/deadbeef.install b/community-testing/deadbeef/deadbeef.install deleted file mode 100644 index fcdbf15fb..000000000 --- a/community-testing/deadbeef/deadbeef.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=deadbeef - -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install - - cat <<EOF -==> ffmpeg support was disabled in this deadbeef release due to -==> incompatibilities with ffmpeg 0.11. It might be re-introduced soon. -EOF -} - -post_remove() { - post_install -} diff --git a/community-testing/electricsheep/PKGBUILD b/community-testing/electricsheep/PKGBUILD deleted file mode 100644 index 55b4b0a3b..000000000 --- a/community-testing/electricsheep/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 73326 2012-07-06 15:22:28Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=electricsheep -pkgver=2.7b33 -pkgrel=1 -pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" -arch=('i686' 'x86_64') -url="http://community.electricsheep.org/" -license=('GPL') -depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua' 'libgtop' 'boost-libs' 'freeglut' 'glee') -makedepends=('boost' 'tinyxml') -optdepends=('xscreensaver: to use electricsheep with xscreensaver') -options=('!emptydirs') -source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) -sha1sums=('d86607d97accad8519df2a21d67253abe45f5fdd' - 'fda3aae435507d03973f0c4d1ed3509067657f06') - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) - _svnver=r125 - _svntrunk="http://electricsheep.googlecode.com/svn/trunk/client_generic" - _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 {} \; - (cd ${pkgname}-${pkgver} ; rm -r boost Build_guides curlTest ffmpeg InstallerMSVC \ - Launcher libpng libxml lua5.1 MacBuild RuntimeMSVC wxConfig) - tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* - popd - rm -r ${pkgname}-${pkgver} - gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/wx-config/wx-config-2.9/g' configure.ac - sed -i '12 i\ -#include <cstdio>' Common/Singleton.h - ./autogen.sh - ./configure --prefix=/usr - make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 menu-entries/ElectricSheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop" - install -D -m644 Runtime/logo.png "${pkgdir}/usr/share/icons/electricsheep.png" -} diff --git a/community-testing/ffmpeg-compat/PKGBUILD b/community-testing/ffmpeg-compat/PKGBUILD deleted file mode 100644 index 19336feeb..000000000 --- a/community-testing/ffmpeg-compat/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=ffmpeg-compat -pkgver=20120509 -pkgrel=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" -arch=('i686' 'x86_64') -url="http://ffmpeg.org/" -license=('GPL') -depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib) -makedepends=('yasm' 'git' 'libvdpau') -#git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-$pkgver.tar.xz) -md5sums=('a35359e424608f369d380f03e4dc9966') - -build() { - cd "ffmpeg" - - ./configure \ - --prefix=/usr \ - --incdir=/usr/include/ffmpeg-compat \ - --libdir=/usr/lib/ffmpeg-compat \ - --shlibdir=/usr/lib/ffmpeg-compat \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-libgsm \ - --enable-libspeex \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libschroedinger \ - --enable-libopenjpeg \ - --enable-librtmp \ - --enable-libpulse \ - --enable-gpl \ - --enable-version3 \ - --enable-runtime-cpudetect \ - --disable-debug \ - --disable-static - - make -} - -package() { - cd "ffmpeg" - make DESTDIR="$pkgdir" install - rm -rf $pkgdir/usr/{bin,share} -} diff --git a/community-testing/ffmpeg2theora/PKGBUILD b/community-testing/ffmpeg2theora/PKGBUILD deleted file mode 100644 index b4f76b350..000000000 --- a/community-testing/ffmpeg2theora/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 73327 2012-07-06 15:22:31Z ibiru $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Angelo Theodorou <encelo@users.sourceforge.net> -# Contributor: Alexander Rødseth <rodseth@gmail.com> -pkgname=ffmpeg2theora -pkgver=0.29 -pkgrel=1 -pkgdesc="Simple converter to create Ogg Theora files" -arch=('x86_64' 'i686') -url="http://www.v2v.cc/~j/ffmpeg2theora/" -license=('GPL') -depends=('ffmpeg') -makedepends=('scons') # 'libkate') -source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2") -sha256sums=('214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - scons -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - scons install destdir="$pkgdir" prefix="/usr" mandir="PREFIX/share/man" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/freerdp/PKGBUILD b/community-testing/freerdp/PKGBUILD deleted file mode 100644 index ca25093c4..000000000 --- a/community-testing/freerdp/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 73328 2012-07-06 15:22:36Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Stijn Segers <francesco dot borromini at gmail dot com> - -pkgname=freerdp -pkgver=1.0.1 -pkgrel=5 -pkgdesc="Free RDP client" -arch=('i686' 'x86_64') -url="http://freerdp.sourceforge.net" -license=('GPL') -depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage' - 'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv') -makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl') -conflicts=('freerdp-git') -changelog=${pkgname}.changelog -options=('!libtool') -source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz) -md5sums=('c843185e0ff22ce8409954651718f338') - -build() { - cd `find ${srcdir}/ -type d -name freerdp-\*` - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib . - make -} - -package() { - cd `find ${srcdir}/ -type d -name freerdp-\*` - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/freerdp/freerdp.changelog b/community-testing/freerdp/freerdp.changelog deleted file mode 100644 index d47f165c3..000000000 --- a/community-testing/freerdp/freerdp.changelog +++ /dev/null @@ -1,2 +0,0 @@ -0.7.1-1 to 0.7.1-2 -* Added x86_64 to supported architectures (tested by figue). diff --git a/community-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD deleted file mode 100644 index 5088d73a0..000000000 --- a/community-testing/gnash/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# $Id: PKGBUILD 73329 2012-07-06 15:22:43Z ibiru $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgbase=gnash -pkgname=(gnash-common gnash-gtk) -pkgver=0.8.10 -pkgrel=3 -arch=(i686 x86_64) -url="http://www.gnu.org/software/gnash/" -license=(GPL3) -makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa - speex fontconfig - gstreamer0.10-base - gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext - pkgconfig boost) -options=(!libtool !emptydirs) -source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 - nodebug.patch) -sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224' - '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551') - -build() { - cd "$srcdir/gnash-$pkgver" - - # Disable very, very verbose debugging (gigabytes of logs) - patch -Np1 -i "$srcdir/nodebug.patch" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-plugins-install=system \ - --with-npapi-plugindir=/usr/lib/mozilla/plugins \ - --enable-gui=sdl,gtk,dump \ - --enable-media=gst \ - --enable-renderer=all \ - --enable-device=x11 - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package_gnash-common() { - pkgdesc="A GNU Flash movie player" - depends=(curl giflib sdl agg libjpeg libpng libltdl mesa - speex fontconfig cairo - gstreamer0.10-base - boost-libs) - backup=(etc/gnashrc etc/gnashthumbnailrc) - - cd "$srcdir/gnash-$pkgver" - - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - # Split gnash-gtk - mkdir -p "$srcdir"/gtk/{etc,usr/{bin,share/man/man1}} - mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} \ - "$srcdir/gtk/usr/bin/" - mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 \ - "$srcdir/gtk/usr/share/man/man1/" - mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/usr/share/" - mv "$pkgdir"/etc/gnashpluginrc "$srcdir/gtk/etc/" -} - -package_gnash-gtk() { - pkgdesc="A GNU Flash movie player" - depends=("gnash-common=$pkgver" - gtk2 libldap hicolor-icon-theme desktop-file-utils gconf gtkglext) - install=gnash-gtk.install - backup=(etc/gnashpluginrc) - - mv "$srcdir"/gtk/* "$pkgdir" - - cd "$srcdir/gnash-$pkgver" - make DESTDIR="$pkgdir" install-plugin - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/gnash.schemas" --domain gnash \ - "$pkgdir"/usr/share/applications/*.schemas - rm -f "$pkgdir"/usr/share/applications/*.schemas -} diff --git a/community-testing/gnash/gnash-gtk.install b/community-testing/gnash/gnash-gtk.install deleted file mode 100644 index 6678a7f8a..000000000 --- a/community-testing/gnash/gnash-gtk.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - gconfpkg --install gnash - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - gconfpkg --uninstall gnash -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-testing/gnash/nodebug.patch b/community-testing/gnash/nodebug.patch deleted file mode 100644 index ca160b898..000000000 --- a/community-testing/gnash/nodebug.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h ---- gnash-0.8.9/libbase/log.h 2011-02-26 19:11:08.000000000 +0100 -+++ gnash-0.8.9-nodebug/libbase/log.h 2012-01-18 09:39:02.004103494 +0100 -@@ -331,27 +331,27 @@ - - // Define to 0 to completely remove parse debugging at compile-time - #ifndef VERBOSE_PARSE --#define VERBOSE_PARSE 1 -+#define VERBOSE_PARSE 0 - #endif - - // Define to 0 to completely remove action debugging at compile-time - #ifndef VERBOSE_ACTION --#define VERBOSE_ACTION 1 -+#define VERBOSE_ACTION 0 - #endif - - // Define to 0 to remove ActionScript errors verbosity at compile-time - #ifndef VERBOSE_ASCODING_ERRORS --#define VERBOSE_ASCODING_ERRORS 1 -+#define VERBOSE_ASCODING_ERRORS 0 - #endif - - // Define to 0 this to remove invalid SWF verbosity at compile-time - #ifndef VERBOSE_MALFORMED_SWF --#define VERBOSE_MALFORMED_SWF 1 -+#define VERBOSE_MALFORMED_SWF 0 - #endif - - // Define to 0 this to remove Networking verbosity at compile-time - #ifndef VERBOSE_NETWORKING --#define VERBOSE_NETWORKING 1 -+#define VERBOSE_NETWORKING 0 - #endif - - #if VERBOSE_PARSE -diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp ---- gnash-0.8.9/libcore/vm/ActionExec.cpp 2011-03-13 17:47:36.000000000 +0100 -+++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp 2012-01-18 09:40:25.653458508 +0100 -@@ -46,7 +46,7 @@ - // too much information for my tastes. I really want just - // to see how stack changes while executing actions... - // --strk Fri Jun 30 02:28:46 CEST 2006 --# define DEBUG_STACK 1 -+//# define DEBUG_STACK 1 - - // Max number of stack item to dump. 0 for unlimited. - # define STACK_DUMP_LIMIT 32 diff --git a/community-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD deleted file mode 100644 index 72b1487d7..000000000 --- a/community-testing/gpac/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 73330 2012-07-06 15:22:46Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=gpac -pkgver=4065 -pkgrel=1 -pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" -arch=('i686' 'x86_64') -url="http://gpac.sourceforge.net" -license=('LGPL') -depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa') -makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad') -optdepends=('jack: for jack support' 'a52dec: for A52 support' - 'faad2: for AAC support' 'libmad: for mp3 support') -options=('!makeflags') -source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) -sha1sums=('9a60014c4467acf3ac070e4e4a42d13b35575da8' - 'a015cef1fd003c57bd91a6d0959ccd58df2357d4') - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) - _svnver=$pkgver - _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac" - _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 - rm -r ${pkgname}-${pkgver} - gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install install-lib -} diff --git a/community-testing/kid3/PKGBUILD b/community-testing/kid3/PKGBUILD deleted file mode 100644 index 4621218d0..000000000 --- a/community-testing/kid3/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 73331 2012-07-06 15:22:55Z ibiru $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Alois Nespor <alois.nespor@gmail.com> - -pkgname=kid3 -pkgver=2.1 -pkgrel=4 -pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE" -arch=('i686' 'x86_64') -url="http://kid3.sourceforge.net/" -license=('GPL') -depends=('chromaprint' 'id3lib' 'taglib' 'kdebase-runtime') -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" - 'ffmpeg-0.11.diff') -sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225' - '76ab3c119817a0e1f26e368afb757488c3865ff634771d4d176e729492991a54') - -build() { - cd ${pkgname}-${pkgver} - - # fix error building with latest ffmpeg - # http://kid3.git.sourceforge.net/git/gitweb.cgi?p=kid3/kid3;a=commit;h=2a91bff2810281e58948f478e9396c73e5c6154a - patch -Np1 -i ${srcdir}/ffmpeg-0.11.diff - - cd ${srcdir} - - mkdir build - cd build - - cmake \ - ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - - make -} - -package() { - cd build - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/kid3/ffmpeg-0.11.diff b/community-testing/kid3/ffmpeg-0.11.diff deleted file mode 100644 index 349ca4b3d..000000000 --- a/community-testing/kid3/ffmpeg-0.11.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 2a91bff2810281e58948f478e9396c73e5c6154a Mon Sep 17 00:00:00 2001 -From: Urs Fleisch <ufleisch@users.sourceforge.net> -Date: Mon, 4 Jun 2012 15:23:36 +0200 -Subject: [PATCH 1/1] Support building with ffmpeg-0.11. - ---- - src/core/import/fingerprintcalculator.cpp | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/core/import/fingerprintcalculator.cpp b/src/core/import/fingerprintcalculator.cpp -index 05158ae..6ac632c 100644 ---- a/src/core/import/fingerprintcalculator.cpp -+++ b/src/core/import/fingerprintcalculator.cpp -@@ -218,7 +218,7 @@ public: - } - - bool createForCodec(const Codec& codecCtx) { -- m_ptr = ::av_audio_convert_alloc(SAMPLE_FMT_S16, codecCtx.channels(), -+ m_ptr = ::av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codecCtx.channels(), - codecCtx.sampleFormat(), codecCtx.channels(), 0, 0); - return m_ptr != 0; - } -@@ -342,7 +342,7 @@ FingerprintCalculator::Result::Error FingerprintCalculator::decodeAudioFile( - return Result::NoCodecFound; - - Converter converter; -- if (codec.sampleFormat() != SAMPLE_FMT_S16) { -+ if (codec.sampleFormat() != AV_SAMPLE_FMT_S16) { - if (!converter.createForCodec(codec)) - return Result::NoConverterFound; - } --- -1.7.4.1 - diff --git a/community-testing/kid3/kid3.changelog b/community-testing/kid3/kid3.changelog deleted file mode 100644 index 8c440c611..000000000 --- a/community-testing/kid3/kid3.changelog +++ /dev/null @@ -1,29 +0,0 @@ -2012-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * kid3 2.1-1 - -2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * kid3 2.0.1-1 - -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 - -2010-09-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v1.5 - -2010-03-13 Andrea Scarpino <andrea@archlinux.org> - * Update to major release v1.4 - * MP4V2 enabled - * Cleanup dependencies - -2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v1.3 - * MP4V2 disabled, package in [extra] needs to be updated to be used with kid3 - -2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v1.2 - -2008-10-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v1.1 diff --git a/community-testing/kid3/kid3.install b/community-testing/kid3/kid3.install deleted file mode 100644 index 8ec315e7c..000000000 --- a/community-testing/kid3/kid3.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/mlt/PKGBUILD b/community-testing/mlt/PKGBUILD deleted file mode 100644 index 31293f16f..000000000 --- a/community-testing/mlt/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 73333 2012-07-06 15:23:01Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> -# Contributor: funkyou <spamopfer@nickname.berlin.de> -# Contributor: tardo <tardo@nagi-fanboi.net> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> - -pkgbase=mlt -pkgname=('mlt' 'mlt-python-bindings') -pkgver=0.8.0 -pkgrel=1 -pkgdesc="An open source multimedia framework" -arch=('i686' 'x86_64') -url="http://www.mltframework.org" -license=('GPL') -makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg' - 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('d56e0cdfba9c5b5608bf84493322615f') - -build() { - # mlt - cd "$srcdir/mlt-$pkgver" - -# [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= - SSE2=--disable-sse2 - - msg "SSE2=$SSE2" - ./configure --prefix=/usr --enable-gpl \ - --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \ - --avformat-vdpau \ - --avformat-swscale $SSE2 - make - - # mlt python bindings - cd "$srcdir/mlt-$pkgver/src/swig/python" - sed -i 's_path=`which python_path=`which python2_' build - sed -i 's_`python -c_`python2 -c_' build - sed -i 's#python-config#python2-config#' build - ./build -} - -package_mlt() { - depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins') - optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa") - conflicts=('mlt++<=0.3.8') - - cd "$srcdir/mlt-$pkgver" - make DESTDIR="$pkgdir" install -} - -package_mlt-python-bindings() { - depends=('python2' 'mlt') - - cd "$srcdir/mlt-$pkgver/src/swig/python" - mkdir -p "$pkgdir/usr/lib/python2.7/" - install -m755 mlt.py "$pkgdir/usr/lib/python2.7/" - install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/" - install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/" -} diff --git a/community-testing/motion/PKGBUILD b/community-testing/motion/PKGBUILD deleted file mode 100644 index a68b65526..000000000 --- a/community-testing/motion/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 73334 2012-07-06 15:23:12Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=motion -pkgver=3.2.12 -pkgrel=6 -pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome" -depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat') -backup=('etc/motion/motion.conf') -options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - rc.motion - ffmpeg-0.8.patch - linux-headers.patch - ffmpeg-compat.patch) -md5sums=('1ba0065ed50509aaffb171594c689f46' - '2e8c53c4980edddd420f08fdd572c9be' - 'd36687710837d69fbce4608b1345fa34' - 'd8c3c4fdded5cfbd729710475559a21d' - 'e85c596292aceb425fcf17e5072e2fff') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH - patch -Np1 -i $srcdir/ffmpeg-0.8.patch - patch -Np1 -i $srcdir/linux-headers.patch - patch -Np1 -i $srcdir/ffmpeg-compat.patch - autoreconf - ./configure --prefix=/usr \ - --without-pgsql \ - --without-mysql \ - --sysconfdir=/etc/motion \ - --with-ffmpeg - make -} - -package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf" - install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion" -} diff --git a/community-testing/motion/ffmpeg-0.8.patch b/community-testing/motion/ffmpeg-0.8.patch deleted file mode 100644 index 5dcc6e686..000000000 --- a/community-testing/motion/ffmpeg-0.8.patch +++ /dev/null @@ -1,112 +0,0 @@ -diff -aur motion-3.2.12/ffmpeg.c motion-3.2.12.new/ffmpeg.c ---- motion-3.2.12/ffmpeg.c 2010-06-01 08:48:23.000000000 +0200 -+++ motion-3.2.12.new/ffmpeg.c 2011-10-31 17:25:03.000000000 +0100 -@@ -14,7 +14,7 @@ - - #include "ffmpeg.h" - #include "motion.h" -- -+#include <libavformat/avformat.h> - #if LIBAVCODEC_BUILD > 4680 - /* FFmpeg after build 4680 doesn't have support for mpeg1 videos with - * non-standard framerates. Previous builds contained a broken hack -@@ -228,10 +228,12 @@ - mpeg1_file_protocol.url_close = file_protocol.url_close; - - /* Register the append file protocol. */ --#if LIBAVFORMAT_BUILD >= (52<<16 | 31<<8) -- av_register_protocol(&mpeg1_file_protocol); -+#ifdef have_av_register_protocol2 -+ av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol)); -+#elif defined have_av_register_protocol -+ av_register_protocol(&mpeg1_file_protocol); - #else -- register_protocol(&mpeg1_file_protocol); -+# warning av_register_protocolXXX missing - #endif - } - -@@ -244,7 +246,7 @@ - const char *ext; - AVOutputFormat *of = NULL; - -- /* Here, we use guess_format to automatically setup the codec information. -+ /* Here, we use av_guess_format to automatically setup the codec information. - * If we are using msmpeg4, manually set that codec here. - * We also dynamically add the file extension to the filename here. This was - * done to support both mpeg1 and mpeg4 codecs since they have different extensions. -@@ -258,7 +260,7 @@ - /* We use "mpeg1video" for raw mpeg1 format. Using "mpeg" would - * result in a muxed output file, which isn't appropriate here. - */ -- of = guess_format("mpeg1video", NULL, NULL); -+ of = av_guess_format("mpeg1video", NULL, NULL); - if (of) { - /* But we want the trailer to be correctly written. */ - of->write_trailer = mpeg1_write_trailer; -@@ -270,24 +272,24 @@ - #endif - } else if (strcmp(codec, "mpeg4") == 0) { - ext = ".avi"; -- of = guess_format("avi", NULL, NULL); -+ of = av_guess_format("avi", NULL, NULL); - } else if (strcmp(codec, "msmpeg4") == 0) { - ext = ".avi"; -- of = guess_format("avi", NULL, NULL); -+ of = av_guess_format("avi", NULL, NULL); - if (of) { - /* Manually override the codec id. */ - of->video_codec = CODEC_ID_MSMPEG4V2; - } - } else if (strcmp(codec, "swf") == 0) { - ext = ".swf"; -- of = guess_format("swf", NULL, NULL); -+ of = av_guess_format("swf", NULL, NULL); - } else if (strcmp(codec, "flv") == 0) { - ext = ".flv"; -- of = guess_format("flv", NULL, NULL); -+ of = av_guess_format("flv", NULL, NULL); - of->video_codec = CODEC_ID_FLV1; - } else if (strcmp(codec, "ffv1") == 0) { - ext = ".avi"; -- of = guess_format("avi", NULL, NULL); -+ of = av_guess_format("avi", NULL, NULL); - if (of) { - /* Use the FFMPEG Lossless Video codec (experimental!). - Requires strict_std_compliance to be <= -2 */ -@@ -295,7 +297,7 @@ - } - } else if (strcmp(codec, "mov") == 0) { - ext = ".mov"; -- of = guess_format("mov", NULL, NULL); -+ of = av_guess_format("mov", NULL, NULL); - } else { - motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec); - return NULL; -@@ -377,7 +379,7 @@ - - ffmpeg->c = c = AVSTREAM_CODEC_PTR(ffmpeg->video_st); - c->codec_id = ffmpeg->oc->oformat->video_codec; -- c->codec_type = CODEC_TYPE_VIDEO; -+ c->codec_type = AVMEDIA_TYPE_VIDEO; - is_mpeg1 = c->codec_id == CODEC_ID_MPEG1VIDEO; - - if (strcmp(ffmpeg_video_codec, "ffv1") == 0) -@@ -646,7 +648,7 @@ - if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) { - /* raw video case. The API will change slightly in the near future for that */ - #ifdef FFMPEG_AVWRITEFRAME_NEWAPI -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - pkt.data = (uint8_t *)pic; - pkt.size = sizeof(AVPicture); - ret = av_write_frame(ffmpeg->oc, &pkt); -@@ -667,7 +669,7 @@ - #ifdef FFMPEG_AVWRITEFRAME_NEWAPI - pkt.pts = AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->pts; - if (AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->key_frame) { -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - } - pkt.data = ffmpeg->video_outbuf; - pkt.size = out_size; diff --git a/community-testing/motion/ffmpeg-compat.patch b/community-testing/motion/ffmpeg-compat.patch deleted file mode 100644 index 278166e18..000000000 --- a/community-testing/motion/ffmpeg-compat.patch +++ /dev/null @@ -1,172 +0,0 @@ -diff -wbBur motion-3.2.12/configure.in motion-3.2.12.q/configure.in ---- motion-3.2.12/configure.in 2010-06-01 10:48:23.000000000 +0400 -+++ motion-3.2.12.q/configure.in 2012-06-20 13:51:42.000000000 +0400 -@@ -290,163 +290,11 @@ - fi - - --# --# Check for libavcodec and libavformat from ffmpeg --# --FFMPEG_DIR="yes" --FFMPEG_OK="no_found" --FFMPEG_OBJ="" --AC_ARG_WITH(ffmpeg, --[ --with-ffmpeg[=DIR] Specify the prefix for the install path for -- libavcodec/libavformat (part of ffmpeg) be able to -- encode mpeg movies realtime. -- If this is not specified motion will try to find -- the libraries in /usr and /usr/local. -- ], --FFMPEG_DIR="$withval" --) --# --# --without-ffmpeg or with-ffmpeg=no --# --if test "${FFMPEG_DIR}" = "no"; then -- AC_MSG_CHECKING(for ffmpeg) -- AC_MSG_RESULT(skipping) --# --# with-ffmpeg=<dir> or nothing --# --else if test "${FFMPEG_DIR}" = "yes"; then -- # AUTODETECT STATIC/SHARED LIB -- AC_MSG_CHECKING(for ffmpeg autodetecting) -- -- if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then -- AC_MSG_RESULT(found in /usr/lib64) -- FFMPEG_OK="found" -- FFMPEG_LIB="/usr/lib64" -- FFMPEG_DIR="/usr" -- elif test -f /usr/lib/libavcodec.a -o -f /usr/lib/libavcodec.so && test -f /usr/lib/libavformat.a -o -f /usr/lib/libavformat.so ; then -- AC_MSG_RESULT(found in /usr/lib) -- FFMPEG_OK="found" -- FFMPEG_LIB="/usr/lib" -- FFMPEG_DIR="/usr" -- elif test -f /usr/local/lib/libavcodec.a -o -f /usr/local/lib/libavcodec.so && test -f /usr/local/lib/libavformat.a -o -f /usr/local/lib/libavformat.so ; then -- AC_MSG_RESULT(found in /usr/local/lib) -- FFMPEG_OK="found" -- FFMPEG_LIB="/usr/local/lib" -- FFMPEG_DIR="/usr/local" -- else -- AC_MSG_RESULT(not found) -- echo "" -- echo "**********************************************" -- echo "* libavcodec.a or libavcodec.so or *" -- echo "* libavformat.a or libavformat.so not found: *" -- echo "* ALL FFMPEG FEATURES DISABLED *" -- echo "* *" -- echo "* Please read the Motion Guide for help: *" -- echo "* http://motion.sourceforge.net *" -- echo "**********************************************" -- echo "" -- fi --else -- AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-) -- if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then -- AC_MSG_RESULT(found) -- FFMPEG_OK="found" -- FFMPEG_LIB="${FFMPEG_DIR}/lib" -- elif test -f ${FFMPEG_DIR}/libavcodec.a -o -f ${FFMPEG_DIR}/libavcodec.so && test -f ${FFMPEG_DIR}/libavformat.a -o -f ${FFMPEG_DIR}/libavformat.so ; then -- AC_MSG_RESULT(found) -- FFMPEG_LIB="${FFMPEG_DIR}" -- FFMPEG_OK="found" -- else -- AC_MSG_RESULT(not found) -- if test "${FFMPEG_OK}" != "found"; then -- echo "" -- echo "**********************************************" -- echo "* libavcodec.a or libavcodec.so or *" -- echo "* libavformat.a or libavformat.so not found: *" -- echo "* ALL FFMPEG FEATURES DISABLED *" -- echo "* *" -- echo "* Please read the Motion Guide for help: *" -- echo "* http://motion.sourceforge.net *" -- echo "**********************************************" -- echo "" -- fi -- fi --fi -- --# --# Now check for ffmpeg headers ( avformat.h ) if ffmpeg libs were found --# -- --if test "${FFMPEG_OK}" = "found"; then -- AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR}) -- -- if test -f ${FFMPEG_DIR}/include/avformat.h; then -- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h) -- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include" -- elif test -f ${FFMPEG_DIR}/avformat.h; then -- AC_MSG_RESULT(found ${FFMPEG_DIR}/avformat.h) -- FFMPEG_CFLAGS="-I${FFMPEG_DIR}" -- elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then -- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h) -- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg" -- elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then -- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h) -- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES" -- elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then -- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h) -- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" -- else -- AC_MSG_RESULT(not found) -- FFMPEG_OK="no_found" -- echo "**********************************************" -- echo "* avformat.h not found: *" -- echo "* ALL FFMPEG FEATURES DISABLED *" -- echo "* *" -- echo "* Please read the Motion Guide for help: *" -- echo "* http://motion.sourceforge.net *" -- echo "**********************************************" -- echo "" -- fi -- --# --# If ffmpeg libs and headers have been found --# -- -- if test "${FFMPEG_OK}" = "found"; then -- TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz" -- TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}" -- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}" -- -- FFMPEG_OBJ="ffmpeg.o" -- AC_SUBST(FFMPEG_OBJ) -- -- AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?]) -- saved_CFLAGS=$CFLAGS -- saved_LIBS=$LIBS -- CFLAGS="${FFMPEG_CFLAGS}" -- LIBS="$TEMP_LIBS" -- -- AC_COMPILE_IFELSE( -- [ -- #include <avformat.h> -- URLProtocol test_file_protocol; -- int main(void){ -- test_file_protocol.url_read = file_protocol.url_read; -- return 0; -- } -- ], -- [AC_MSG_RESULT(yes)], -- [ -- AC_MSG_RESULT(no) -- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG_NEW" -- ] -- ) -- CFLAGS=$saved_CFLAGS -- LIBS=$saved_LIBS -- fi --fi --fi -- -+TEMP_CFLAGS+=" `pkg-config --cflags libavformat libavcodec` -DHAVE_FFMPEG -DFFMPEG_NEW_INCLUDES -DHAVE_FFMPEG_NEW" -+TEMP_LIBS+=" `pkg-config --libs libavformat libavcodec` -lavutil -Wl,-rpath /usr/lib/ffmpeg-compat" -+FFMPEG_OK=found -+FFMPEG_OBJ="ffmpeg.o" -+AC_SUBST(FFMPEG_OBJ) - - # - # Check Mysql diff --git a/community-testing/motion/linux-headers.patch b/community-testing/motion/linux-headers.patch deleted file mode 100644 index 795c8aec5..000000000 --- a/community-testing/motion/linux-headers.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -urN motion-3.2.12-OLD/motion.h motion-3.2.12-NEW/motion.h ---- motion-3.2.12-OLD/motion.h 2010-05-31 23:48:23.000000000 -0700 -+++ motion-3.2.12-NEW/motion.h 2011-08-30 02:11:08.000000000 -0700 -@@ -40,7 +40,7 @@ - - #define _LINUX_TIME_H 1 - #if !defined(WITHOUT_V4L) && !defined(BSD) --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - #endif - - #include <pthread.h> -diff -urN motion-3.2.12-OLD/track.c motion-3.2.12-NEW/track.c ---- motion-3.2.12-OLD/track.c 2010-05-31 23:48:23.000000000 -0700 -+++ motion-3.2.12-NEW/track.c 2011-08-30 23:05:09.000000000 -0700 -@@ -11,6 +11,7 @@ - #include "motion.h" - - #ifndef WITHOUT_V4L -+#include <linux/videodev2.h> - #include "pwc-ioctl.h" - #endif - -diff -urN motion-3.2.12-OLD/video.h motion-3.2.12-NEW/video.h ---- motion-3.2.12-OLD/video.h 2010-05-31 23:48:23.000000000 -0700 -+++ motion-3.2.12-NEW/video.h 2011-08-30 02:11:12.000000000 -0700 -@@ -12,7 +12,7 @@ - - #define _LINUX_TIME_H 1 - #ifndef WITHOUT_V4L --#include <linux/videodev.h> -+#include <libv4l1-videodev.h> - #include <sys/mman.h> - #include "pwc-ioctl.h" - #endif diff --git a/community-testing/motion/rc.motion b/community-testing/motion/rc.motion deleted file mode 100644 index 5b4c65500..000000000 --- a/community-testing/motion/rc.motion +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/motion` -case "$1" in - start) - stat_busy "Starting Motion" - mkdir -p /var/run/motion - [ -z "$PID" ] && /usr/bin/motion 1>/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon motion - stat_done - fi - ;; - stop) - stat_busy "Stopping Motion" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon motion - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/mplayer2/PKGBUILD b/community-testing/mplayer2/PKGBUILD deleted file mode 100644 index e14dcf9b1..000000000 --- a/community-testing/mplayer2/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 73335 2012-07-06 15:23:17Z ibiru $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Martin Panter <vadmium+aur@gmail.com> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> - -pkgname=mplayer2 -pkgver=20120517 -pkgrel=4 -pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.mplayer2.org/" -install=$pkgname.install -depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' - 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss' - 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'libvdpau' - 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') -makedepends=('mesa' 'unzip' 'yasm') -backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -provides=('mplayer') -conflicts=('mplayer') -options=(!emptydirs) -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('814cc9545937e13796df1d4747c3c5d0') - -build() { - cd "${srcdir}"/$pkgname-$pkgver - - sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop - - ./configure --prefix=/usr --confdir=/etc/mplayer \ - --enable-translation --language=all \ - --enable-runtime-cpudetection \ - --enable-joystick \ - --disable-speex \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - --disable-mga - make -} - -package() { - cd "${srcdir}"/$pkgname-$pkgver - - make DESTDIR="${pkgdir}" install - install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/ - install -dm755 "${pkgdir}"/usr/share/mplayer/ - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf - - install -dm755 "${pkgdir}"/usr/share/applications/ - install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/ -} diff --git a/community-testing/mplayer2/mplayer2.install b/community-testing/mplayer2/mplayer2.install deleted file mode 100644 index 660593cf5..000000000 --- a/community-testing/mplayer2/mplayer2.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/mythtv/PKGBUILD b/community-testing/mythtv/PKGBUILD deleted file mode 100644 index 65a66b19c..000000000 --- a/community-testing/mythtv/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 73356 2012-07-06 15:47:35Z ibiru $ -# Maintainer: Jonathan Conder <jonno.conder@gmail.com> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: <kleptophobiac@gmail.com> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=mythtv -pkgver=0.25.1 -pkgrel=2 -epoch=1 -pkgdesc="A Homebrew PVR project" -arch=('i686' 'x86_64') -url="http://www.mythtv.org/" -license=('GPL') -depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883' - 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mesa' - 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' - 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber' - 'x264') -makedepends=('glew' 'libcec' 'libxml2' 'openssl' 'yasm') -optdepends=('glew: for GPU commercial flagging' - 'libcec: for consumer electronics control capabilities' - 'libxml2: to read blu-ray metadata' - 'openssl: for AirTunes (RAOP) support' - 'xmltv: to download tv listings') -conflicts=('myththemes' 'mythplugins-mythvideo') -replaces=('myththemes' 'mythplugins-mythvideo') -backup=('etc/conf.d/mythbackend') -install='mythtv.install' -source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" - 'mythbackend.rc' - 'mythbackend.conf' - 'mythbackend.service') -md5sums=('4d6375cc3a820abdb2ac5300734687ac' - 'c8f935d42fb8617e9279bd539811ca5f' - 'ab962d83614cbd0ac11ce3fcc929829d' - '813008d14a44e9c6212f364723aeaa74') - -build() { - cd "$srcdir/$pkgname-$pkgver" - find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - - sed -re 's@Key, &@Key, @' -i 'bindings/php/MythBase.php' - - ARCH="${CARCH/_/-}" - ./configure --prefix=/usr \ - --cpu="$ARCH" \ - --disable-altivec \ - --disable-audio-jack \ - --disable-ccache \ - --disable-distcc \ - --enable-libfftw3 \ - --enable-libmp3lame \ - --enable-libx264 \ - --enable-vaapi \ - --python=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make INSTALL_ROOT="$pkgdir" install - - install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend" - install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend" - install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service" - install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql" - - mkdir -p "$pkgdir/usr/share/mythtv" - cp -R 'contrib' "$pkgdir/usr/share/mythtv" - mkdir -p "$pkgdir/var/log/mythtv" -} diff --git a/community-testing/mythtv/mythbackend.conf b/community-testing/mythtv/mythbackend.conf deleted file mode 100644 index 49bbca877..000000000 --- a/community-testing/mythtv/mythbackend.conf +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) by the MythTV Development Team. -# -# Derived from work by: -# -# Michael Thomson <linux at m-thomson dot net> -# Stu Tomlinson <stu at nosnilmot dot com> -# Axel Thimm <axel.thimm at atrpms dot net> -# Adopted for ArchLinux: -# Jürgen Hoetzel <juergen@archinux.org> -# -# 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 General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -############################################################################### -# -# User who should start the mythbackend process -# -# Running mythbackend as non-root requires you to ensure that audio/video -# devices used for recording have suitable user permissions. One way -# to achieve this is to modify existing or create new udev rules which -# assign these devices to a non-root group with rw permissions and add -# your mythbackend user to that group. Be aware that console.perms can -# also affect device permissions and may need additional configuration. -# Running as non-root may also introduce increased process latency. -# -# MBE_USER='root' - -# -# Startup options for mythbackend (see 'mythbackend --help' for a list). -# -# MBE_OPTS='' - -# -# Directory holding the mythbackend log file -# -# LOG_PATH='/var/log/mythtv' - -# -# Logging options for mythbackend (see 'mythbackend -v help' for a list) -# -# LOG_OPTS='' diff --git a/community-testing/mythtv/mythbackend.rc b/community-testing/mythtv/mythbackend.rc deleted file mode 100644 index 488b4cb8e..000000000 --- a/community-testing/mythtv/mythbackend.rc +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/profile - -############################################################################### -# Default values to use if none are supplied in the config file. -# -# User who should start the mythbackend process -MBE_USER='mythtv' - -# Startup options for mythbackend -MBE_OPTS='' - -# Directory holding the mythbackend log file -LOG_PATH='/var/log/mythtv' - -# Logging options for mythbackend -LOG_OPTS='' -############################################################################### - -CONFIG_FILE=/etc/conf.d/mythbackend -PIDFILE=/var/run/mythbackend.pid - -if [[ -r "$CONFIG_FILE" ]]; then - . "$CONFIG_FILE" -fi - -PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)" -export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)" - -case "$1" in - start) - stat_busy "Starting MythTV Backend" - - if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then - stat_fail - exit 0 - fi - - touch "$PIDFILE" - chown "$MBE_USER" "$PIDFILE" "$LOG_PATH" - - MBE_CMD="/usr/bin/mythbackend --daemon \ - --logpath "$LOG_PATH" $LOG_OPTS \ - --pidfile "$PIDFILE" $MBE_OPTS" - if su "$MBE_USER" -c "$MBE_CMD"; then - add_daemon mythbackend - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping MythTV Backend" - if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then - rm_daemon mythbackend - stat_done - rm -f "$PIDFILE" - else - stat_fail - fi - ;; - restart) - "$0" stop - "$0" start - ;; - *) - echo "usage: $0 (start|stop|restart)" - ;; -esac -exit 0 diff --git a/community-testing/mythtv/mythbackend.service b/community-testing/mythtv/mythbackend.service deleted file mode 100644 index 9d92bd644..000000000 --- a/community-testing/mythtv/mythbackend.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=MythTV Backend -After=network.target mysqld.service - -[Service] -Type=simple -Environment=HOME=/var/lib/mythtv -User=mythtv -ExecStart=/usr/bin/mythbackend --daemon --logpath /var/log/mythtv - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/mythtv/mythtv.install b/community-testing/mythtv/mythtv.install deleted file mode 100644 index eed25b868..000000000 --- a/community-testing/mythtv/mythtv.install +++ /dev/null @@ -1,20 +0,0 @@ -post_upgrade() { - if ! getent passwd mythtv &>/dev/null; then - getent group mythtv &>/dev/null || groupadd -r mythtv >/dev/null - useradd -rmd /var/lib/mythtv -g mythtv -G video,audio,optical -s /bin/bash mythtv >/dev/null - fi -} - -post_install() { - echo -e "For installation information, visit:\nhttps://wiki.archlinux.org/index.php/MythTV" - - post_upgrade -} - -post_remove() { - echo -e "The MythTV database was not removed. To remove it, run:\n mysql -u root -e 'drop database mythconverg;'" - [ -d var/lib/mythtv ] && echo "The MythTV home directory /var/lib/mythtv can also be removed." - - getent passwd mythtv &>/dev/null && userdel mythtv >/dev/null - getent group mythtv &>/dev/null && groupdel mythtv >/dev/null -} diff --git a/community-testing/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD deleted file mode 100644 index cfa40ee15..000000000 --- a/community-testing/openscenegraph/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 73336 2012-07-06 15:23:22Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Hans Janssen <janserv@gmail.com> -# Contributor: my64 <packages@obordes.com> -# Contributor: Colin Pitrat <colin.pitrat@gmail.com> - -pkgname=openscenegraph -pkgver=3.0.1 -pkgrel=6 -pkgdesc="An Open Source, high performance real-time graphics toolkit" -arch=('i686' 'x86_64') -license=('custom:OSGPL') -url="http://www.openscenegraph.org" -depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth') -makedepends=('cmake' 'libvncserver' 'qt' 'ffmpeg-compat') -optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt') -conflicts=('openthreads') -provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip - osg-xine-1.2.patch) -#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") -md5sums=('c43a25d023e635c3566b2083d8e6d956' - 'b05a486fdc2aaf06b29efb5e0714672e') - -build() { - cd OpenSceneGraph-$pkgver - export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH - LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat" - CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" - CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" - [ $NOEXTRACT -eq 1 ] || cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ - -DFFMPEG_LIBAVCODEC_LIBRARIES=/usr/lib/ffmpeg-compat/libavcodec.so \ - -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ - -DFFMPEG_LIBAVDEVICE_LIBRARIES=/usr/lib/ffmpeg-compat/libavdevice.so \ - -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ - -DFFMPEG_LIBAVFORMAT_LIBRARIES=/usr/lib/ffmpeg-compat/libavformat.so \ - -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ - -DFFMPEG_LIBAVUTIL_LIBRARIES=/usr/lib/ffmpeg-compat/libavutil.so \ - -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ - -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so - - sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp - patch -p1 <$srcdir/osg-xine-1.2.patch - make -} - -package() { - cd OpenSceneGraph-$pkgver - make DESTDIR="$pkgdir" install - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true -} diff --git a/community-testing/openscenegraph/osg-xine-1.2.patch b/community-testing/openscenegraph/osg-xine-1.2.patch deleted file mode 100644 index c73b588dc..000000000 --- a/community-testing/openscenegraph/osg-xine-1.2.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c ---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300 -+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400 -@@ -2769,8 +2769,8 @@ - clear(rgb_class, sizeof(rgbout_class_t)); - - rgb_class->driver_class.open_plugin = open_plugin; -- rgb_class->driver_class.get_identifier = get_identifier; -- rgb_class->driver_class.get_description = get_description; -+ rgb_class->driver_class.identifier = get_identifier(NULL); -+ rgb_class->driver_class.description = get_description(NULL); - rgb_class->driver_class.dispose = dispose_class; - - return(rgb_class); diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD deleted file mode 100644 index eba6a3806..000000000 --- a/community-testing/performous/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 73337 2012-07-06 15:23:31Z ibiru $ -# Maintainer : Laurent Carlier <lordheavym@gmail.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=performous -pkgver=0.6.1 -pkgrel=14 -pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' -arch=('i686' 'x86_64') -url="http://performous.org/" -license=('GPL') -depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg') -#depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ -# 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') -makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48') -optdepends=('performous-freesongs: free songs for performous') -source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 - boost-filesystem-v3.patch - ffmpeg-0.11.patch - png15.patch) -md5sums=('451a759de77984b5a699e91107fe52e2' - '42a8c825d80b0de16bd5752d2a80e585' - '07e52e926595d053155bbfb7168e308f' - '89157d5e21b0efd09fcbeee299d23c7e') - -build() { - cd ${srcdir}/Performous-${pkgver}-Source - - # fix to built against boost 1.46 and later, upstream (git) now support v3 - patch -Np1 -i ../boost-filesystem-v3.patch - # fix with ffmpeg-0.11 - patch -Np1 -i ../ffmpeg-0.11.patch - # fix for libpng 1.5 - patch -Np1 -i ../png15.patch - # fix glib2.0 building - # #error "Only <glib.h> can be included directly." - sed -i -e 's#/gconvert.h#.h#g' game/unicode.cc - - mkdir -p build - cd build - - # fix config loading with libxml++ - export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} - - 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/performous/boost-filesystem-v3.patch b/community-testing/performous/boost-filesystem-v3.patch deleted file mode 100644 index 22dd07213..000000000 --- a/community-testing/performous/boost-filesystem-v3.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff --git a/game/backgrounds.cc b/game/backgrounds.cc -index 7fd3cd0..cdedefb 100644 ---- a/game/backgrounds.cc -+++ b/game/backgrounds.cc -@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) { - for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { - fs::path p = dirIt->path(); - if (fs::is_directory(p)) { reload_internal(p); continue; } -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string name = p.leaf(); // File basename - std::string path = p.directory_string(); // Path without filename -+#else -+ std::string name = p.filename().string(); // File basename -+ std::string path = p.string(); // Path without filename -+#endif - path.erase(path.size() - name.size()); - if (!regex_match(name.c_str(), match, expression)) continue; - { -diff --git a/game/cache.cc b/game/cache.cc -index 69974e2..0f1edd0 100644 ---- a/game/cache.cc -+++ b/game/cache.cc -@@ -9,7 +9,11 @@ namespace cache { - fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){ - fs::path cache_filename; - std::string const lod = (boost::format("%.2f") % factor).str(); -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png"; -+#else -+ std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png"; -+#endif - - if (isThemeResource(svgfilename)) { - std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s()); -diff --git a/game/filemagic.hh b/game/filemagic.hh -index bf87ded..29e81fe 100644 ---- a/game/filemagic.hh -+++ b/game/filemagic.hh -@@ -71,7 +71,11 @@ namespace filemagic { - // For now, just check the extension an assume it's not lying. - - // Get file extension in lower case -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string ext = filename.extension(); -+#else -+ std::string ext = filename.extension().string(); -+#endif - // somehow this does not convert the extension to lower case: - //std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower)); - std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower ); -diff --git a/game/fs.cc b/game/fs.cc -index e34a784..767a7ab 100644 ---- a/game/fs.cc -+++ b/game/fs.cc -@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) { - - bool isThemeResource(fs::path filename){ - try { -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string themefile = getThemePath(filename.filename()); -+#else -+ std::string themefile = getThemePath(filename.filename().string()); -+#endif - return themefile == filename; - } catch (...) { return false; } - } -diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc -index 38e163b..db15d79 100644 ---- a/game/songparser-ini.cc -+++ b/game/songparser-ini.cc -@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() { - // Search the dir for the music files - for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { - boost::filesystem::path p = dirIt->path(); -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string name = p.leaf(); // File basename (notes.txt) -+#else -+ std::string name = p.filename().string(); // File basename (notes.txt) -+#endif - if (regex_match(name.c_str(), match, midifile)) { - s.midifilename = name; - } else if (regex_match(name.c_str(), match, audiofile_background)) { -diff --git a/game/songparser.cc b/game/songparser.cc -index 2b7b9b4..ac9f3f6 100644 ---- a/game/songparser.cc -+++ b/game/songparser.cc -@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s): - - for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { - boost::filesystem::path p = dirIt->path(); -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string name = p.leaf(); // File basename -+#else -+ std::string name = p.filename().string(); // File basename -+#endif - if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) { - m_song.cover = name; - } else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) { -diff --git a/game/songs.cc b/game/songs.cc -index 62ab26d..afab383 100644 ---- a/game/songs.cc -+++ b/game/songs.cc -@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) { - for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { - fs::path p = dirIt->path(); - if (fs::is_directory(p)) { reload_internal(p); continue; } -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string name = p.leaf(); // File basename (notes.txt) - std::string path = p.directory_string(); // Path without filename -+#else -+ std::string name = p.filename().string(); // File basename (notes.txt) -+ std::string path = p.string(); // Path without filename -+#endif - path.erase(path.size() - name.size()); - if (!regex_match(name.c_str(), match, expression)) continue; - try { -diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh -index 58e19dc..8895d94 100644 ---- a/tools/ss_helpers.hh -+++ b/tools/ss_helpers.hh -@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st - void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); } - void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); } - -+#if BOOST_FILESYSTEM_VERSION < 3 - std::string filename(boost::filesystem::path const& p) { return *--p.end(); } -+#else -+std::string filename(boost::filesystem::path const& p) { return p.filename().string(); } -+#endif - - /** Fix Singstar's b0rked XML **/ - std::string xmlFix(std::vector<char> const& data) { --- -1.7.4.1 - diff --git a/community-testing/performous/ffmpeg-0.11.patch b/community-testing/performous/ffmpeg-0.11.patch deleted file mode 100644 index 2962123ed..000000000 --- a/community-testing/performous/ffmpeg-0.11.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ru Performous-0.6.1-Source/game/ffmpeg.cc Performous-0.6.1a-Source/game/ffmpeg.cc ---- Performous-0.6.1-Source/game/ffmpeg.cc 2010-10-31 16:05:43.000000000 +0000 -+++ Performous-0.6.1a-Source/game/ffmpeg.cc 2012-06-08 21:40:10.876636789 +0000 -@@ -47,11 +47,17 @@ - return d >= 0.0 ? d : getInf(); - } - -+// FFMPEG has fluctuating API -+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(64<<8)+0) -+#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO -+#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO -+#endif -+ - void FFmpeg::open() { - boost::mutex::scoped_lock l(s_avcodec_mutex); - av_register_all(); - av_log_set_level(AV_LOG_ERROR); -- if (av_open_input_file(&pFormatCtx, m_filename.c_str(), NULL, 0, NULL)) throw std::runtime_error("Cannot open input file"); -+ if (avformat_open_input(&pFormatCtx, m_filename.c_str(), NULL, NULL)) throw std::runtime_error("Cannot open input file"); - if (av_find_stream_info(pFormatCtx) < 0) throw std::runtime_error("Cannot find stream information"); - pFormatCtx->flags |= AVFMT_FLAG_GENPTS; - videoStream = -1; -@@ -60,8 +66,8 @@ - for (unsigned int i=0; i<pFormatCtx->nb_streams; i++) { - AVCodecContext* cc = pFormatCtx->streams[i]->codec; - cc->workaround_bugs = FF_BUG_AUTODETECT; -- if (videoStream == -1 && cc->codec_type==CODEC_TYPE_VIDEO) videoStream = i; -- if (audioStream == -1 && cc->codec_type==CODEC_TYPE_AUDIO) audioStream = i; -+ if (videoStream == -1 && cc->codec_type==AVMEDIA_TYPE_VIDEO) videoStream = i; -+ if (audioStream == -1 && cc->codec_type==AVMEDIA_TYPE_AUDIO) audioStream = i; - } - if (videoStream == -1 && decodeVideo) throw std::runtime_error("No video stream found"); - if (audioStream == -1 && decodeAudio) throw std::runtime_error("No audio stream found"); -@@ -92,7 +98,7 @@ - pAudioCodecCtx = cc; - #if LIBAVCODEC_VERSION_INT > ((52<<16)+(12<<8)+0) - pResampleCtx = av_audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate, -- SAMPLE_FMT_S16, SAMPLE_FMT_S16, 16, 10, 0, 0.8); -+ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, 16, 10, 0, 0.8); - #else - pResampleCtx = audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate); - #endif diff --git a/community-testing/performous/png15.patch b/community-testing/performous/png15.patch deleted file mode 100644 index b6fb8fb14..000000000 --- a/community-testing/performous/png15.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur Performous-0.6.1-Source/cmake/Modules/FindPng.cmake Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake ---- Performous-0.6.1-Source/cmake/Modules/FindPng.cmake 2010-10-31 17:05:44.000000000 +0100 -+++ Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake 2012-01-29 01:07:56.339648832 +0100 -@@ -10,7 +10,7 @@ - - include(LibFindMacros) - --libfind_pkg_check_modules(Png_PKGCONF Png) -+libfind_pkg_check_modules(Png_PKGCONF libpng) - - find_path(Png_INCLUDE_DIR - NAMES pngconf.h -@@ -18,7 +18,7 @@ - ) - - find_library(Png_LIBRARY -- NAMES png png12 png14 -+ NAMES png png12 png14 png15 - PATHS ${Png_PKGCONF_LIBRARY_DIRS} - ) - -diff -ur Performous-0.6.1-Source/game/image.hh Performous-0.6.1a-Source/game/image.hh ---- Performous-0.6.1-Source/game/image.hh 2010-10-31 17:05:43.000000000 +0100 -+++ Performous-0.6.1a-Source/game/image.hh 2012-01-29 01:44:16.050575186 +0100 -@@ -26,7 +26,7 @@ - } - void loadPNG_internal(png_structp pngPtr, png_infop infoPtr, std::ifstream& file, std::vector<unsigned char>& image, std::vector<png_bytep>& rows, unsigned& w, unsigned& h) { - if (setjmp(png_jmpbuf(pngPtr))) throw std::runtime_error("Reading PNG failed"); -- png_set_read_fn(pngPtr,(voidp)&file, readPngHelper); -+ png_set_read_fn(pngPtr, &file, readPngHelper); - png_read_info(pngPtr, infoPtr); - png_set_expand(pngPtr); // Expand everything to RGB(A) - png_set_strip_16(pngPtr); // Strip everything down to 8 bit/component diff --git a/community-testing/qmmp/PKGBUILD b/community-testing/qmmp/PKGBUILD deleted file mode 100644 index ab07566af..000000000 --- a/community-testing/qmmp/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -#$Id: PKGBUILD 73424 2012-07-07 13:49:25Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - -pkgname=qmmp -pkgver=0.6.0 -pkgrel=2 -pkgdesc="Qt4 based audio-player" -arch=('i686' 'x86_64') -url="http://qmmp.ylsoftware.com/" -license=('GPL') -depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg' 'qt' 'taglib' 'xdg-utils') -makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack') -optdepends=('flac: native FLAC support' - 'jack: JACK sound output' - 'libmpcdec: Musepack support' - 'pulseaudio: PulseAudio output' - 'libcdio: Compact Disc input and control support' - 'libcddb: CDDB server support' - 'libmms: MMS stream protocol support' - 'libmodplug: MOD playing library' - 'libsndfile: sampled sound support' - 'ffmpeg' 'libsamplerate' 'wavpack') -install=$pkgname.install -source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe') - -build() { - cd ${srcdir}/$pkgname-$pkgver - - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/qmmp/ffmpeg-0.11.diff b/community-testing/qmmp/ffmpeg-0.11.diff deleted file mode 100644 index f414ffbf6..000000000 --- a/community-testing/qmmp/ffmpeg-0.11.diff +++ /dev/null @@ -1,14 +0,0 @@ -Index: src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp -=================================================================== ---- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp (revision 2728) -+++ src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp (revision 2729) -@@ -133,9 +133,6 @@ - m_stream->seekable = !input()->isSequential(); - m_stream->max_packet_size = INPUT_BUFFER_SIZE; - -- AVFormatParameters ap; -- memset(&ap, 0, sizeof(ap)); -- - if(avformat_open_input(&ic, m_path.toLocal8Bit().constData(), fmt, 0) != 0) - { - qDebug("DecoderFFmpeg: av_open_input_stream() failed"); diff --git a/community-testing/qmmp/qmmp.changelog b/community-testing/qmmp/qmmp.changelog deleted file mode 100644 index bfd002e57..000000000 --- a/community-testing/qmmp/qmmp.changelog +++ /dev/null @@ -1,72 +0,0 @@ -2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.6.0-2 ffmpeg 0.11 rebuild - -2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.6.0-1 - -2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.5.6-2 ffmpeg 0.11 rebuild - -2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.5.6-1 - -2012-06-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.5.5-2 ffmpeg 0.11 rebuild - -2012-05-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.5.5-1 - -2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.5.4-1 - -2011-11-12 Andrea Scarpino <andrea@archlinux.org> - * qmmp 0.5.2-3 - * rebuild with qt 4.7 - -2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.5.2-1 - -2011-07-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.5.1-1 - -2011-04-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.5.0-1 - -2011-02-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qmmp 0.4.4-1 - -2010-11-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.4.3 - -2010-09-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.4.2 - -2010-06-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.4.1 - -2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.4.0 - -2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.3.4 - -2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.3.3 - -2010-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.3.2 - -2009-07-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.3.0 - -2009-03-30 Giovanni Scafora <giovanni@archlinux.org> - * Fixed x86_64 build - -2009-03-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.2.4 - -2008-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.2.3 - -2008-08-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v0.2.2 diff --git a/community-testing/qmmp/qmmp.install b/community-testing/qmmp/qmmp.install deleted file mode 100644 index 4c0972beb..000000000 --- a/community-testing/qmmp/qmmp.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/r8168-lts/PKGBUILD b/community-testing/r8168-lts/PKGBUILD deleted file mode 100644 index 1278371e7..000000000 --- a/community-testing/r8168-lts/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 73215 2012-07-04 00:45:12Z dreisner $ -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> - -pkgname=r8168-lts -_pkgname=r8168 -pkgver=8.031.00 -pkgrel=2 -pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" -url="http://www.realtek.com.tw" -license=("GPL") -arch=('i686' 'x86_64') -depends=('glibc' "linux-lts>=3.0" "linux-lts<3.1") -makedepends=("linux-lts-headers>=3.0" "linux-lts-headers<3.1") -source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) -install=$pkgname.install -md5sums=('ec1654f02e2dad930bbeb0210ddab7e5') -sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779') - -_extramodules=extramodules-3.0-lts -_kernver="$(cat /usr/lib/modules/$_extramodules/version || true)" - -build() { - cd "$_pkgname-$pkgver" - make -C /usr/lib/modules/$_kernver/build \ - SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ - modules -} - -package() { - cd "$_pkgname-$pkgver" - install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + -} diff --git a/community-testing/r8168-lts/r8168-lts.install b/community-testing/r8168-lts/r8168-lts.install deleted file mode 100644 index 2aab9e1e3..000000000 --- a/community-testing/r8168-lts/r8168-lts.install +++ /dev/null @@ -1,17 +0,0 @@ -rebuild_module_dependencies() { - EXTRAMODULES='extramodules-3.0-lts' - depmod $(cat /lib/modules/$EXTRAMODULES/version) -} - -post_install() { - rebuild_module_dependencies - echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:' - echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`' -} -post_upgrade() { - rebuild_module_dependencies -} - -post_remove() { - rebuild_module_dependencies -} diff --git a/community-testing/rsyslog/PKGBUILD b/community-testing/rsyslog/PKGBUILD deleted file mode 100644 index aa89ef596..000000000 --- a/community-testing/rsyslog/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 73254 2012-07-04 12:54:32Z dreisner $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=rsyslog -pkgver=6.2.2 -pkgrel=2 -pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" -url="http://www.rsyslog.com/" -arch=('i686' 'x86_64') -license=('GPL3') -depends=('zlib' 'libestr' 'libee') -makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') -optdepends=('postgresql-libs: PostgreSQL Database Support' - 'libmysqlclient: MySQL Database Support' - 'net-snmp' - 'gnutls') -backup=('etc/rsyslog.conf' - 'etc/logrotate.d/rsyslog' - 'etc/conf.d/rsyslog') -options=('strip' 'zipman' '!libtool') -source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" - 'rsyslog' - 'rsyslog.logrotate' - 'rsyslog.conf.d') -md5sums=('b797b8222d6ea4d5dfa007efe8aafa7f' - 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' - '8065db4bef3061a4f000ba58779f6829' - '1a0cd4530dd5d1439456d5ae230574d9') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --enable-mysql \ - --enable-pgsql \ - --enable-mail \ - --enable-imfile \ - --enable-imtemplate \ - --enable-snmp \ - --enable-gnutls \ - --enable-inet \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile - make -} -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} - # Install Daemons and Configuration Files - install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d - install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf - install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} - install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} - - # fix location of systemctl and remove start precondition - sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \ - -e 's@/bin/systemctl@/usr&@' \ - -e '/^ExecStartPre/d' -} diff --git a/community-testing/rsyslog/rsyslog b/community-testing/rsyslog/rsyslog deleted file mode 100644 index ee0145418..000000000 --- a/community-testing/rsyslog/rsyslog +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/rsyslog - -PID=`pidof -o %PPID /usr/sbin/rsyslogd` -case "$1" in - start) - stat_busy "Starting RSyslogd" - [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon rsyslogd - stat_done - fi - ;; - stop) - stat_busy "Stopping RSyslogd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/rsyslogd.pid - rm -f /var/rsyslogd.persist - rm_daemon rsyslogd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/rsyslog/rsyslog.conf.d b/community-testing/rsyslog/rsyslog.conf.d deleted file mode 100644 index e39f8c3b9..000000000 --- a/community-testing/rsyslog/rsyslog.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Parameters to be passed to rsyslogd -# This should almost certainly include at least the current compatability -# level, e.g. -c4 -# -RSYSLOGD_ARGS="-c4" diff --git a/community-testing/rsyslog/rsyslog.logrotate b/community-testing/rsyslog/rsyslog.logrotate deleted file mode 100644 index 76306c560..000000000 --- a/community-testing/rsyslog/rsyslog.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log { - missingok - sharedscripts - postrotate - /usr/bin/killall -HUP /usr/sbin/rsyslogd - endscript -} diff --git a/community-testing/synfig/PKGBUILD b/community-testing/synfig/PKGBUILD deleted file mode 100644 index 90ad0b07c..000000000 --- a/community-testing/synfig/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 73340 2012-07-06 15:23:53Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Franco Iacomella <yaco@gnu.org> - -pkgname=synfig -pkgver=0.63.05 -pkgrel=2 -pkgdesc="Professional vector animation program (CLI renderer only)" -arch=(i686 x86_64) -url="http://synfig.org" -license=('GPL2') -depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat' 'fontconfig' 'libpng' - 'libtiff' 'libdv' 'libmng') -optdepends=('openexr' 'libsigc++') -conflicts=('synfig-core') -replaces=('synfig-core') -options=(!libtool) -source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz - build-fix.patch - ffmpeg-0.8.patch) -md5sums=('8591cf17c26405d68d2cc050a2929292' - 'b5568b06fae1a7ee465b5380b1139b83' - 'ebf41046097cfd778dee9a9854561dae') - -build() { - cd $srcdir/$pkgname-$pkgver - export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH - LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat" - CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" - CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" - [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } - [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv - patch -p1 -i $srcdir/build-fix.patch - patch -Np1 -i $srcdir/ffmpeg-0.8.patch - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/community-testing/synfig/build-fix.patch b/community-testing/synfig/build-fix.patch deleted file mode 100644 index be45fdc68..000000000 --- a/community-testing/synfig/build-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp ---- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-05 13:04:07.000000000 +0400 -+++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp 2011-06-14 14:32:49.000000000 +0400 -@@ -31,6 +31,10 @@ - # include <config.h> - #endif - -+#include <libavcodec/avcodec.h> -+#include <libavformat/avformat.h> -+#include <libswscale/swscale.h> -+ - #include "trgt_av.h" - - extern "C" -@@ -116,14 +120,14 @@ - picture = avcodec_alloc_frame(); - if (!picture) - return NULL; -- size = avpicture_get_size(pix_fmt, width, height); -+ size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height); - picture_buf = (uint8_t *)malloc(size); - if (!picture_buf) { - av_free(picture); - return NULL; - } - avpicture_fill((AVPicture *)picture, picture_buf, -- pix_fmt, width, height); -+ (enum ::PixelFormat)pix_fmt, width, height); - return picture; - } - diff --git a/community-testing/synfig/ffmpeg-0.8.patch b/community-testing/synfig/ffmpeg-0.8.patch deleted file mode 100644 index 4ba40fff2..000000000 --- a/community-testing/synfig/ffmpeg-0.8.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp ---- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp 2011-09-29 10:51:41.000000000 +0200 -+++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp 2011-10-31 16:39:03.000000000 +0100 -@@ -441,7 +441,7 @@ - if( context->coded_frame ) - pkt.pts = context->coded_frame->pts; - if( context->coded_frame && context->coded_frame->key_frame) -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - - //kluge for raw picture format (they said they'd fix) - if (formatc->oformat->flags & AVFMT_RAWPICTURE) -@@ -463,7 +463,7 @@ - if( context->coded_frame ) - pkt.pts = context->coded_frame->pts; - if( context->coded_frame && context->coded_frame->key_frame) -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - - ret = av_write_frame(formatc, &pkt); - -@@ -567,17 +567,17 @@ - if (typestring) - { - //formatptr guess_format(type, filename, MIME type) -- format = guess_format(typestring,NULL,NULL); -+ format = av_guess_format(typestring,NULL,NULL); - } - else - { -- format = guess_format(NULL, filename, NULL); -+ format = av_guess_format(NULL, filename, NULL); - } - - if(!format) - { - synfig::warning("Unable to Guess the output, defaulting to mpeg"); -- format = guess_format("mpeg", NULL, NULL); -+ format = av_guess_format("mpeg", NULL, NULL); - } - - if(!format) -@@ -753,7 +753,7 @@ - - context = st->codec; - context->codec_id = (CodecID)codec_id; -- context->codec_type = CODEC_TYPE_VIDEO; -+ context->codec_type = AVMEDIA_TYPE_VIDEO; - - //PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???) - -@@ -800,7 +800,7 @@ - - context = stream->codec; - context->codec_id = (CodecID)codec_id; -- context->codec_type = CODEC_TYPE_AUDIO; -+ context->codec_type = AVMEDIA_TYPE_AUDIO; - - /* put sample parameters */ - context->bit_rate = 64000; diff --git a/community-testing/xmms2/PKGBUILD b/community-testing/xmms2/PKGBUILD deleted file mode 100644 index 3e8493bbf..000000000 --- a/community-testing/xmms2/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 73341 2012-07-06 15:24:10Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=xmms2 -pkgver=0.8DrO_o -pkgrel=7 -pkgdesc="complete rewrite of the popular music player" -arch=('i686' 'x86_64') -url="http://xmms2.org/" -license=('LGPL') -backup=('etc/conf.d/xmms2d.conf') -depends=('sqlite' 'libmad') -makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib' - 'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout' - 'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex' - 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi') -optdepends=('alsa-lib: ALSA audio output' - 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' - 'boost: C++ language bindings' - 'curl: play HTTP streams' - 'faad2: AAC support' - 'ffmpeg: WMA, avcodec & avformat support' - 'fftw: calculations for visualization' - 'flac: FLAC support' - 'jack: JACK audio output' - 'libao: liboa audio output' - 'libgme: game-music-emu support' - 'libofa: MusicDNS fingerprinting' - 'libmms: play MMS streams' - 'libmodplug: to play MOD files' - 'libmpcdec: Musepack support' - 'libsamplerate: vocoder support' - 'libshout: Icecast audio output' - 'libvorbis: Ogg Vorbis support' - 'libxml2: XSPF and podcast support' - 'mpg123: alternative MP3 plugin' - 'oss: OSS audio output' - 'perl: Perl language bindings' - 'pulseaudio: PulseAudio audio output' - 'pyrex: Python language bindings' - 'ruby: Ruby language bindings' - 'smbclient: direct CIFS/SMB access' - 'speex: Speex support' - 'wavpack: WavPack support') -# 'sidplay: to play a Commodore 64 music files AKA zaks' -# we do not have sidplay 2 series in repos; also it's -# somehow connected with resid i guess(not in repos also) -conflicts=('xmms2-devel') -install=xmms2.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - xmms2d.conf - xmms2d.rc - 'ffmpeg-0.11.diff') -md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' - 'af13c937bf3c86b77ae6820107aab9b8' - '9d8e3e1a434f271423bdd228a1e9bd7c' - 'e176971ef96807f72fa8fc17d260c20a') - -build() { - cd xmms2-${pkgver}/src/plugins/avcodec/ - # remove call to avcodec_init - # http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=3211932c513338566b31d990d06957e15a644d13 - patch -Np0 -i ${srcdir}/ffmpeg-0.11.diff - - cd ${srcdir}/${pkgname}-${pkgver} - - # python2 fix -# sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf - - ./waf configure --prefix=/usr \ - --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater \ - --with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \ - --with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'` - ./waf build - ./waf --destdir=${pkgdir} install - - PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d - ./waf build - ./waf --destdir=${pkgdir} install - - install -D -m 0755 ../xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d - install -D -m 0644 ../xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf -} diff --git a/community-testing/xmms2/ffmpeg-0.11.diff b/community-testing/xmms2/ffmpeg-0.11.diff deleted file mode 100644 index 91d3a3106..000000000 --- a/community-testing/xmms2/ffmpeg-0.11.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- avcodec.c.orig 2012-06-07 15:08:23.796225671 -0500 -+++ avcodec.c 2012-06-07 15:08:36.649489373 -0500 -@@ -134,7 +134,6 @@ - - xmms_xform_private_data_set (xform, data); - -- avcodec_init (); - avcodec_register_all (); - - mimetype = xmms_xform_indata_get_str (xform, diff --git a/community-testing/xmms2/vorbis-albumart.patch b/community-testing/xmms2/vorbis-albumart.patch deleted file mode 100644 index de4305f6f..000000000 --- a/community-testing/xmms2/vorbis-albumart.patch +++ /dev/null @@ -1,200 +0,0 @@ -From f38882beb1c9b4f3e3c63ac7d65603ad5917cd9d Mon Sep 17 00:00:00 2001 -From: Brad Jorsch <anomie@users.sourceforge.net> -Date: Tue, 09 Mar 2010 15:41:33 +0000 -Subject: OTHER: Add support for METADATA_BLOCK_PICTURE in Vorbis plugin - -Bug-Debian: http://bugs.debian.org/565479 ---- -diff --git a/src/plugins/vorbis_common/common.c b/src/plugins/vorbis_common/common.c -index c1f4ef9..fc4ff1b 100644 ---- a/src/plugins/vorbis_common/common.c -+++ b/src/plugins/vorbis_common/common.c -@@ -243,6 +243,74 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc) - } - } - -+static void -+handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len) -+{ -+ guint32 typ, mime_len, desc_len, img_len; -+ guchar *pos, *end, *mime_data, *img_data; -+ gchar hash[33]; -+ -+ pos = value; -+ end = value + len; -+ -+ if (pos + 4 > end) { -+ XMMS_DBG ("Malformed picture comment"); -+ return; -+ } -+ typ = GUINT32_FROM_BE (*(guint32 *)pos); -+ if (typ != 0 && typ != 3) { -+ XMMS_DBG ("Picture type %d not handled", typ); -+ return; -+ } -+ pos += 4; -+ -+ if (pos + 4 > end) { -+ XMMS_DBG ("Malformed picture comment"); -+ return; -+ } -+ mime_len = GUINT32_FROM_BE (*(guint32 *)pos); -+ pos += 4; -+ mime_data = pos; -+ pos += mime_len; -+ -+ if (pos + 4 > end) { -+ XMMS_DBG ("Malformed picture comment"); -+ return; -+ } -+ desc_len = GUINT32_FROM_BE (*(guint32 *)pos); -+ pos += 4; -+ pos += desc_len; -+ -+ pos += 4; /* width */ -+ pos += 4; /* height */ -+ pos += 4; /* depth */ -+ pos += 4; /* indexed palette length */ -+ -+ if (pos + 4 > end) { -+ XMMS_DBG ("Malformed picture comment"); -+ return; -+ } -+ img_len = GUINT32_FROM_BE (*(guint32 *)pos); -+ pos += 4; -+ img_data = pos; -+ -+ if (img_data + img_len > end) { -+ XMMS_DBG ("Malformed picture comment"); -+ return; -+ } -+ -+ if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) { -+ const gchar *metakey; -+ -+ metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT; -+ xmms_xform_metadata_set_str (xform, metakey, hash); -+ -+ metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME; -+ mime_data[mime_len] = '\0'; -+ xmms_xform_metadata_set_str (xform, metakey, mime_data); -+ } -+} -+ - /* note that "key" is NOT NUL-terminated here, - * but "value" is. - */ -@@ -253,6 +321,14 @@ handle_comment (xmms_xform_t *xform, - { - gint i; - -+ if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) { -+ gsize dlen; -+ gchar *dvalue = g_base64_decode (value, &dlen); -+ handle_image_comment (xform, dvalue, dlen); -+ g_free (dvalue); -+ return; -+ } -+ - for (i = 0; i < G_N_ELEMENTS (properties); i++) { - if (key_len != strlen (properties[i].vname)) - continue; --- -cgit v0.8.3.4 - - -From d8273630bd92ecea581240ae93c6795cc538d076 Mon Sep 17 00:00:00 2001 -From: Erik Massop <e.massop@hccnet.nl> -Date: Tue, 09 Mar 2010 15:45:03 +0000 -Subject: OTHER: Add Brad Jorsch to AUTHORS, disable Vorbis albumart for glib < 2.12 - -(Name found using e-mail address at http://sourceforge.net/users/anomie ) ---- -diff --git a/AUTHORS b/AUTHORS -index f2ef9af..7331d4b 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -146,6 +146,10 @@ N: Johannes Jordan - E: ypnos@lanrules.de - D: Visualization - -+N: Brad Jorsch -+E: anomie@users.sourceforge.net -+D: Support for front picture from Vorbis. -+ - N: Daniel Kamiński - E: maniel.rulez@gmail.com - D: mlib remove command in cli, Ruby fixes. -diff --git a/src/plugins/vorbis_common/common.c b/src/plugins/vorbis_common/common.c -index fc4ff1b..ab1dc75 100644 ---- a/src/plugins/vorbis_common/common.c -+++ b/src/plugins/vorbis_common/common.c -@@ -27,6 +27,7 @@ - #include "xmms/xmms_sample.h" - #include "xmms/xmms_log.h" - #include "xmms/xmms_medialib.h" -+#include "xmms/xmms_bindata.h" - - #include <glib.h> - -@@ -244,12 +245,22 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc) - } - - static void --handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len) -+handle_image_comment (xmms_xform_t *xform, const gchar *encoded_value) - { -+ gsize len; -+ guchar *value; -+ - guint32 typ, mime_len, desc_len, img_len; - guchar *pos, *end, *mime_data, *img_data; - gchar hash[33]; - -+#if GLIB_CHECK_VERSION(2,12,0) -+ value = g_base64_decode (encoded_value, &len); -+#else -+ /* TODO: Implement/backport base64 decoding */ -+ return; -+#endif -+ - pos = value; - end = value + len; - -@@ -299,7 +310,7 @@ handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len) - return; - } - -- if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) { -+ if (xmms_bindata_plugin_add (img_data, img_len, hash)) { - const gchar *metakey; - - metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT; -@@ -307,8 +318,10 @@ handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len) - - metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME; - mime_data[mime_len] = '\0'; -- xmms_xform_metadata_set_str (xform, metakey, mime_data); -+ xmms_xform_metadata_set_str (xform, metakey, (gchar *)mime_data); - } -+ -+ g_free (value); - } - - /* note that "key" is NOT NUL-terminated here, -@@ -322,10 +335,7 @@ handle_comment (xmms_xform_t *xform, - gint i; - - if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) { -- gsize dlen; -- gchar *dvalue = g_base64_decode (value, &dlen); -- handle_image_comment (xform, dvalue, dlen); -- g_free (dvalue); -+ handle_image_comment (xform, value); - return; - } - --- -cgit v0.8.3.4 - - diff --git a/community-testing/xmms2/xmms2-helpers.patch b/community-testing/xmms2/xmms2-helpers.patch deleted file mode 100644 index f6e6aa49e..000000000 --- a/community-testing/xmms2/xmms2-helpers.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -wbBur xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h ---- xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h 2008-06-15 21:31:38.000000000 +0400 -+++ xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h 2008-06-18 14:22:24.000000000 +0400 -@@ -33,6 +33,8 @@ - #include <list> - #include <vector> - -+#include <linux/limits.h> -+ - namespace Xmms - { - - diff --git a/community-testing/xmms2/xmms2-ruby-1.9.patch b/community-testing/xmms2/xmms2-ruby-1.9.patch deleted file mode 100644 index 6316ace61..000000000 --- a/community-testing/xmms2/xmms2-ruby-1.9.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c ---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c 2009-04-21 17:51:11.000000000 +0000 -+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c 2009-09-14 09:13:19.000000000 +0000 -@@ -241,10 +241,10 @@ - COLL_METHOD_HANDLER_HEADER - - rb_ary = RARRAY (ids); -- ary = malloc (sizeof (unsigned int *) * (rb_ary->len + 1)); -+ ary = malloc (sizeof (unsigned int *) * (RARRAYLEN(rb_ary) + 1)); - -- for (i = 0; i < rb_ary->len; i++) -- ary[i] = NUM2UINT (rb_ary->ptr[i]); -+ for (i = 0; i < RARRAYLEN(rb_ary); i++) -+ ary[i] = NUM2UINT (RARRAY_PTR(rb_ary)[i]); - - ary[i] = 0; - -diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c ---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c 2009-04-21 17:51:11.000000000 +0000 -+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c 2009-09-14 09:14:51.000000000 +0000 -@@ -1421,10 +1421,10 @@ - if (!NIL_P (rb_check_array_type (value))) { - struct RArray *ary = RARRAY (value); - -- ret = malloc (sizeof (char *) * (ary->len + 1)); -+ ret = malloc (sizeof (char *) * (RARRAYLEN(ary) + 1)); - -- for (i = 0; i < ary->len; i++) -- ret[i] = StringValuePtr (ary->ptr[i]); -+ for (i = 0; i < RARRAYLEN(ary); i++) -+ ret[i] = StringValuePtr (RARRAY_PTR(ary)[i]); - - ret[i] = NULL; - } else { -@@ -1451,10 +1451,10 @@ - struct RArray *ary = RARRAY (value); - int i; - -- for (i = 0; i < ary->len; i++) { -+ for (i = 0; i < RARRAYLEN(ary); i++) { - xmmsv_t *elem; - -- elem = xmmsv_new_string (StringValuePtr (ary->ptr[i])); -+ elem = xmmsv_new_string (StringValuePtr (RARRAY_PTR(ary)[i])); - xmmsv_list_append (list, elem); - xmmsv_unref (elem); - } -diff -wbBur xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h ---- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h 2009-04-21 17:51:11.000000000 +0000 -+++ xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h 2009-09-14 09:00:11.000000000 +0000 -@@ -33,6 +33,8 @@ - #include <list> - #include <vector> - -+#include <linux/limits.h> -+ - namespace Xmms - { - diff --git a/community-testing/xmms2/xmms2.install b/community-testing/xmms2/xmms2.install deleted file mode 100644 index 2205a3492..000000000 --- a/community-testing/xmms2/xmms2.install +++ /dev/null @@ -1,3 +0,0 @@ -pre_install() { - echo "-- DO NOT FORGET edit /etc/conf.d/xmms2.conf!" -} diff --git a/community-testing/xmms2/xmms2d.conf b/community-testing/xmms2/xmms2d.conf deleted file mode 100644 index c8304fe1d..000000000 --- a/community-testing/xmms2/xmms2d.conf +++ /dev/null @@ -1,31 +0,0 @@ -# -# xmms2-launcher cmdline parameters -# -XMMS2_PARAMETERS="" - -# -# xmms2 user -# You may want to add user to run xmms or use your username -# -XMMS2_USER="xmms2user" - -# -# If you set XMMS2_USER to a different user than the one who will be controlling -# xmms2d using xmms2 clients, make sure that the clients are aware of the path to -# xmms2d's IPC socket, or they might not be able to connect. On failure to connect -# some clients will try to run xmms2d themselves. These xmms2d instances will of -# course run as the user running the client, and not as the one configured below. -# -# If an IPC path is specified on the command line to xmms2d (using -# XMMS2_PARAMETERS="-i tcp://127.0.0.1:9667" -# for instance) that will be used. If not, xmms2d will use the path from its -# configuration file which is typically in ~/.config/xmms2/xmms2.conf. If this -# fails, a unix socket at /tmp/xmms-ipc-[username] will be used, where username -# is of the user starting xmms2d. -# -# Clients typically try to get the ipc path from the XMMS_PATH environment variable, -# (which might be set by adding say 'export XMMS_PATH="tcp://127.0.0.1:9667"' to -# ~/.profile). If this fails they can check their configuration file (if they have -# one) and finally use unix:///tmp/xmms-ipc-[username], where username is of the user -# starting the client. Upon failing to connect some will try to start xmms2d themselves. -# diff --git a/community-testing/xmms2/xmms2d.rc b/community-testing/xmms2/xmms2d.rc deleted file mode 100644 index 9d4d2b7e9..000000000 --- a/community-testing/xmms2/xmms2d.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/conf.d/xmms2d.conf -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof xmms2d xmms2-et` -case "$1" in - start) - stat_busy "Starting xmms2d" - [ -z "$PID" ] && su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon xmms2d - stat_done - fi - ;; - stop) - stat_busy "Stopping xmms2d" - [ ! -z "$PID" ] && su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER - if [ $? -gt 0 ]; then - stat_fail - else - for i in `seq 1 10`; do - [ -d /proc/$PID ] || { stat_done; rm_daemon xmms2d; exit 0; } - sleep 1 - done - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index f986423c6..25f70513c 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('bitcoin-daemon' 'bitcoin-qt') pkgver=0.6.3 _commit=bbe1084 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'miniupnpc') conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git') diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 0f052815b..3f7fbc1a1 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -11,6 +11,7 @@ else fi pkgver=4.7.1 pkgrel=4 +pkgrel=3 #holdver #_snapshot=4.7-20120505 _libstdcppmanver=20120605 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" @@ -320,3 +321,10 @@ md5sums=('933e6f15f51c031060af64a9e14149ff' '474b8f5a7dee6ddd96b95a7240bfb961' '2acbc9d35cc9d72329dc71d6b1f162ef' 'df82dd175ac566c8a6d46b11ac21f14c') +md5sums=('933e6f15f51c031060af64a9e14149ff' + '767c62f9a047c4434f2345decf1d0819' + 'ced48436c1b3c981d721a829f1094de1' + '474b8f5a7dee6ddd96b95a7240bfb961' + '2acbc9d35cc9d72329dc71d6b1f162ef' + 'df82dd175ac566c8a6d46b11ac21f14c' + '8e847244dba042d0aa3297713edaf70c') diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 19fd64301..cfdd1424a 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -7,8 +7,8 @@ pkgname=glibc pkgver=2.16.0 pkgrel=1 -_glibcportsver=2.15 -_glibcportsdate=20120127 +_glibcportsver=2.16 +_glibcportsdate=20120710 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -22,7 +22,7 @@ backup=(etc/gai.conf options=('!strip') install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} - http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz + http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz{,.sig} glibc-2.15-fix-res_query-assert.patch glibc-2.15-revert-c5a0802a.patch nscd.rcd @@ -32,7 +32,7 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} locale-gen) mksource-ports() { - git clone http://sourceware.org/git/glibc-ports.git + git clone git://sourceware.org/git/glibc-ports.git pushd glibc-ports git checkout -b glibc-${_glibcportsver}-arch origin/release/${_glibcportsver}/master popd @@ -160,3 +160,27 @@ package() { lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } + + + +md5sums=('80b181b02ab249524ec92822c0174cf7' + '2a1221a15575820751c325ef4d2fbb90' + 'e1a95db2cd37e805afefee1a055d02a6' + '31f415b41197d85d3bbee3d1eecd06a3' + '0a0383d50d63f1c02919fe9943b82014' + '589d79041aa767a5179eaa4e2737dd3f' + 'ad8a9af15ab7eeaa23dc7ee85024af9f' + 'bccbe5619e75cf1d97312ec3681c605c' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') +md5sums=('80b181b02ab249524ec92822c0174cf7' + '2a1221a15575820751c325ef4d2fbb90' + 'e1a95db2cd37e805afefee1a055d02a6' + 'ffc870fd046ac8bf9d70459e680bf2c0' + '31f415b41197d85d3bbee3d1eecd06a3' + '0a0383d50d63f1c02919fe9943b82014' + '589d79041aa767a5179eaa4e2737dd3f' + 'ad8a9af15ab7eeaa23dc7ee85024af9f' + 'bccbe5619e75cf1d97312ec3681c605c' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') diff --git a/extra/tinycdb/PKGBUILD b/extra/tinycdb/PKGBUILD index 2e803febd..5467ce5ff 100644 --- a/extra/tinycdb/PKGBUILD +++ b/extra/tinycdb/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc='Very fast and simple package for creating and reading constant data bases' url='http://www.corpit.ru/mjt/tinycdb.html' license=('custom') -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') source=("http://www.corpit.ru/mjt/tinycdb/${pkgname}-${pkgver}.tar.gz") sha1sums=('ade42ee1e7c56f66a63cb933206c089b9983adba') diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index b480c74ca..5731a5134 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -243,3 +243,17 @@ md5sums=('65a53b11bc01dcc97ee9b201dc620c32' '376c70308715cd2643f7bff936d9934b' 'd4f7dfc6be4ef4e2c6dd7632a9d88abe' 'd335870a88231cdbdd2919dd4ca76a1f') +md5sums=('65a53b11bc01dcc97ee9b201dc620c32' + 'ea4852dedbb89550f6bc113ca66348a2' + '4f3bc572ad32e6ed22efc38d2a5e429a' + '52fd3effd80d7bc6c1660d4ecf23d31c' + '376c70308715cd2643f7bff936d9934b' + 'd4f7dfc6be4ef4e2c6dd7632a9d88abe' + 'd335870a88231cdbdd2919dd4ca76a1f') +sha256sums=('3654b613393734ce0c7c23e81ca4ceb6e8afefb5f0649233ffd105c1220544fe' + '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' + 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' + 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' + '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' + '966b8c509006e3b7e6ac951c93a760ecbb2cb2ad7a5807fb919f0c4ee5e079a5') diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD index 23817afc0..a55d219e0 100644 --- a/libre/dpkg/PKGBUILD +++ b/libre/dpkg/PKGBUILD @@ -10,7 +10,7 @@ debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; } # TODO: split into (dpkg dpkg-devtools dselect dpkg-perl) pkgname=dpkg -pkgver=1.16.2 +pkgver=1.16.4.3 pkgrel=1 pkgdesc="The Debian Package Manager and utilities. Don't use it instead of 'pacman'." arch=('i686' 'x86_64' 'mips64el') @@ -47,3 +47,9 @@ package() { md5sums=('629ba7ee2024e6a5c0ff807aa2db02f8' 'bc36609f6191c5b509fae58c21966c95' '24ab12e79989a2e7f31653fb1dd3cdf9') +md5sums=('39c74a948c6fe4c02ed9f15556fe179d' + 'bc36609f6191c5b509fae58c21966c95' + '24ab12e79989a2e7f31653fb1dd3cdf9') +md5sums=('39c74a948c6fe4c02ed9f15556fe179d' + 'bc36609f6191c5b509fae58c21966c95' + '24ab12e79989a2e7f31653fb1dd3cdf9') diff --git a/multilib-staging/gcc-multilib/PKGBUILD b/multilib-staging/gcc-multilib/PKGBUILD deleted file mode 100644 index d4a2f7ac2..000000000 --- a/multilib-staging/gcc-multilib/PKGBUILD +++ /dev/null @@ -1,325 +0,0 @@ -# $Id: PKGBUILD 73094 2012-07-01 03:25:23Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgbase='gcc-multilib' -pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') -pkgver=4.7.1 -pkgrel=2 -#_snapshot=4.7-20120505 -_libstdcppmanver=20120605 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection for multilib" -arch=('x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' - 'lib32-glibc>=2.14') -checkdepends=('dejagnu') -options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64-multilib.patch - gcc-4.7.0-cloog-0.17.patch - gcc-4.7.1-libada-pic.patch - gcc-4.7.1-libgo-write.patch) -md5sums=('933e6f15f51c031060af64a9e14149ff' - '767c62f9a047c4434f2345decf1d0819' - 'ec24c32d3d1030c2bc8cb2ad2d1dc629' - '575f7d17b022e609447a590e481b18b5' - '2acbc9d35cc9d72329dc71d6b1f162ef' - 'df82dd175ac566c8a6d46b11ac21f14c') - - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - patch -p1 -i ${srcdir}/gcc_pure64-multilib.patch - - # compatibility with latest cloog - patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch - - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679 - patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch - - # bug to file... - patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --disable-libstdcxx-pch --enable-libstdcxx-time \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --with-linker-hash-style=gnu \ - --enable-multilib --disable-libssp \ - --disable-build-with-cxx --disable-build-poststage1-with-cxx \ - --enable-checking=release --with-fpmath=sse - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs-multilib() -{ - pkgdesc="Runtime libraries shipped by GCC for multilib" - depends=('glibc>=2.15' "lib32-gcc-libs=$pkgver-$pkgrel") - provides=("gcc-libs=$pkgver-$pkgrel") - conflicts=('gcc-libs') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src libitm; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove stuff in lib32-gcc-libs - rm -r ${pkgdir}/usr/lib32 - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_lib32-gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC (32-bit)" - depends=('lib32-glibc>=2.15' "gcc-libs>=$pkgver") - - cd gcc-build - make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src libitm; do - make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm ${pkgdir}/usr/lib32/libgfortran.spec - - # remove stuff in gcc-libs-multilib - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/info - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-multilib() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib" - depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl') - groups=('multilib-devel') - provides=("gcc=$pkgver-$pkgrel") - conflicts=('gcc') - install=gcc.install - - cd gcc-build - - make -j1 DESTDIR=${pkgdir} install - - install -d $pkgdir/usr/share/gdb/auto-load/usr/lib - mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib{,32}/*.so* - rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib{,32}/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{,32/}{libcaf_single,libgfortranbegin}.a - rm -r $pkgdir/usr/lib{,32}/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - #install -dm755 ${pkgdir}/lib - #ln -s /usr/bin/cpp ${pkgdir}/lib/cpp - ln -s gcc ${pkgdir}/usr/bin/cc - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/libstdc++-api.${_libstdcppmanver}.man/man3/* \ - ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran-multilib() -{ - pkgdesc="Fortran front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-fortran=$pkgver-$pkgrel") - conflicts=('gcc-fortran') - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - ln -s gfortran ${pkgdir}/usr/bin/f95 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc-multilib() -{ - pkgdesc="Objective-C front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-objc=$pkgver-$pkgrel") - conflicts=('gcc-objc') - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada-multilib() -{ - pkgdesc="Ada front-end for GCC (GNAT) for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-ada=$pkgver-$pkgrel") - conflicts=('gcc-ada') - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - cd ../$CHOST/32/libada - make -j1 DESTDIR=${pkgdir} INSTALL="install" \ - INSTALL_DATA="install -m644" install-gnatlib - - ln -s gcc ${pkgdir}/usr/bin/gnatgcc - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go-multilib() -{ - pkgdesc="Go front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-go=$pkgver-$pkgrel") - conflicts=('gcc-go') - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/multilib-staging/gcc-multilib/gcc-4.7.0-cloog-0.17.patch b/multilib-staging/gcc-multilib/gcc-4.7.0-cloog-0.17.patch deleted file mode 100644 index c7146fa04..000000000 --- a/multilib-staging/gcc-multilib/gcc-4.7.0-cloog-0.17.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure ---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 -+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 -@@ -6049,8 +6049,8 @@ - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - - if test "${cloog_org}" = yes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 --$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 -+$as_echo_n "checking for version 0.17 of CLooG... " >&6; } - if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -@@ -6061,8 +6061,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 16 \ -- || CLOOG_VERSION_REVISION < 1 -+ || CLOOG_VERSION_MINOR != 17 - choke me - #endif - ; diff --git a/multilib-staging/gcc-multilib/gcc-4.7.1-libada-pic.patch b/multilib-staging/gcc-multilib/gcc-4.7.1-libada-pic.patch deleted file mode 100644 index 591da1e4a..000000000 --- a/multilib-staging/gcc-multilib/gcc-4.7.1-libada-pic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in ---- gcc-4.7.1-orig/libada/Makefile.in 2012-06-13 01:12:37.000000000 +1000 -+++ gcc-4.7.1/libada/Makefile.in 2012-06-16 15:04:32.179911023 +1000 -@@ -54,7 +54,7 @@ - PICFLAG = @PICFLAG@ - GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc - GNATLIBCFLAGS= -g -O2 --GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \ -+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \ - -fexceptions -DIN_RTS @have_getipinfo@ - - host_subdir = @host_subdir@ diff --git a/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-write.patch b/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-write.patch deleted file mode 100644 index a7be83fda..000000000 --- a/multilib-staging/gcc-multilib/gcc-4.7.1-libgo-write.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c ---- gcc-4.7.1-orig/libgo/runtime/print.c 2012-05-26 04:22:14.000000000 +1000 -+++ gcc-4.7.1/libgo/runtime/print.c 2012-06-16 15:06:28.553138502 +1000 -@@ -17,7 +17,8 @@ - G* g = runtime_g(); - - if(g == nil || g->writebuf == nil) { -- runtime_write(2, v, n); -+ ssize_t bytesWritten = runtime_write(2, v, n); -+ (void)bytesWritten; - return; - } - diff --git a/multilib-staging/gcc-multilib/gcc-ada.install b/multilib-staging/gcc-multilib/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/multilib-staging/gcc-multilib/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) - -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/multilib-staging/gcc-multilib/gcc-fortran.install b/multilib-staging/gcc-multilib/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/multilib-staging/gcc-multilib/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/multilib-staging/gcc-multilib/gcc-go.install b/multilib-staging/gcc-multilib/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/multilib-staging/gcc-multilib/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.info) - -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/multilib-staging/gcc-multilib/gcc-libs.install b/multilib-staging/gcc-multilib/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/multilib-staging/gcc-multilib/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/multilib-staging/gcc-multilib/gcc.install b/multilib-staging/gcc-multilib/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/multilib-staging/gcc-multilib/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) - -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/multilib-staging/gcc-multilib/gcc_pure64-multilib.patch b/multilib-staging/gcc-multilib/gcc_pure64-multilib.patch deleted file mode 100644 index b5576ae0e..000000000 --- a/multilib-staging/gcc-multilib/gcc_pure64-multilib.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -u -r gcc-4.7.0/gcc/config/i386/linux64.h gcc-4.7.0-pure64/gcc/config/i386/linux64.h ---- gcc-4.7.0/gcc/config/i386/linux64.h 2011-07-07 17:38:34.000000000 +0200 -+++ gcc-4.7.0-pure64/gcc/config/i386/linux64.h 2012-03-24 11:52:58.926204014 +0100 -@@ -29,5 +29,5 @@ - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -diff -u -r gcc-4.7.0/gcc/config/i386/t-linux64 gcc-4.7.0-pure64/gcc/config/i386/t-linux64 ---- gcc-4.7.0/gcc/config/i386/t-linux64 2011-11-02 16:23:48.000000000 +0100 -+++ gcc-4.7.0-pure64/gcc/config/i386/t-linux64 2012-03-24 11:52:44.119651885 +0100 -@@ -34,6 +34,6 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64 --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 - MULTILIB_OSDIRNAMES+= mx32=../libx32 diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD deleted file mode 100644 index adcc23cf0..000000000 --- a/multilib-testing/binutils-multilib/PKGBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# $Id: PKGBUILD 73235 2012-07-04 01:11:59Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils-multilib -pkgver=2.22 -pkgrel=8 -_date=20120323 -pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" -arch=('x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('multilib-devel') -provides=("binutils=$pkgver-$pkgrel") -conflicts=('binutils') -depends=('glibc>=2.16' 'zlib') -makedepends=('gcc-multilib') # Make sure we compile this with gcc-multilib -checkdepends=('dejagnu') -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2) -md5sums=('de2ac4298732827f8af706fc24020330') - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared \ - --enable-64-bit-bfd --enable-multilib - - # check the host environment and makes sure all the necessary tools are available - make configure-host - - make tooldir=${pkgdir}/usr - - # Rebuild libiberty.a with -fPIC - cp -a libiberty libiberty-pic - make -C libiberty-pic clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic - - # Rebuild libbfd.a with -fPIC - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - cp -a bfd bfd-pic - make -C bfd-pic clean - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic - - # Rebuild libopcodes.a with -fPIC - cp -a opcodes opcodes-pic - make -C opcodes-pic clean - make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror) - make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \ - CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # install libraries rebuilt with -fPIC - install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib - install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib - install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/multilib-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/multilib-testing/binutils-multilib/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/multilib-testing/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch b/multilib-testing/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch deleted file mode 100644 index 427efe8a6..000000000 --- a/multilib-testing/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200 -+++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200 -@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go | - # The rusage struct. - rusage=`grep '^type _rusage struct' gen-sysinfo.go` - if test "$rusage" != ""; then -- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -- rusage=`echo $rusage | sed -e 's/^ *//'` - # Remove anonymous unions from GNU/Linux <bits/resource.h>. - rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'` -+ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -+ rusage=`echo $rusage | sed -e 's/^ *//'` - nrusage= - while test -n "$rusage"; do - field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'` diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD deleted file mode 100644 index 2ba356831..000000000 --- a/multilib-testing/lib32-libdrm/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 73060 2012-06-29 20:06:36Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libdrm -pkgname=lib32-$_pkgbasename -pkgver=2.4.37 -pkgrel=1 -pkgdesc="Userspace interface to kernel DRM services (32-bit)" -arch=(x86_64) -license=('custom') -depends=('lib32-libpciaccess' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -url="http://dri.freedesktop.org/" -source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 - no-pthread-stubs.patch) -# git_fixes.diff) -sha1sums=('fa8463e390eee9b589dc369abc4cbe3e4ef16d16' - '2a5410baa3e6e078f9378ce486a88f41d22fd838') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" - - # git fixes - currently none - # patch -Np1 -i ${srcdir}/git_fixes.diff - - # libtoolize --force - autoreconf --force --install - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --enable-udev \ - --enable-vmwgfx-experimental-api - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch deleted file mode 100644 index 6745f4bc4..000000000 --- a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac ---- libdrm-2.4.34.orig/configure.ac 2012-05-12 14:54:06.375335490 +0000 -+++ libdrm-2.4.34/configure.ac 2012-05-12 14:54:32.075142065 +0000 -@@ -47,10 +47,6 @@ - LT_INIT([disable-static]) - - --PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) --AC_SUBST(PTHREADSTUBS_CFLAGS) --AC_SUBST(PTHREADSTUBS_LIBS) -- - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE([udev], -diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am ---- libdrm-2.4.34.orig/intel/Makefile.am 2012-05-12 14:54:06.372001955 +0000 -+++ libdrm-2.4.34/intel/Makefile.am 2012-05-12 14:55:24.164745055 +0000 -@@ -26,7 +26,6 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intel \ -- $(PTHREADSTUBS_CFLAGS) \ - $(PCIACCESS_CFLAGS) \ - $(VALGRIND_CFLAGS) \ - -I$(top_srcdir)/include/drm -@@ -35,7 +34,6 @@ - libdrm_intel_ladir = $(libdir) - libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined - libdrm_intel_la_LIBADD = ../libdrm.la \ -- @PTHREADSTUBS_LIBS@ \ - @PCIACCESS_LIBS@ \ - @CLOCK_LIB@ - -diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am ---- libdrm-2.4.34.orig/nouveau/Makefile.am 2012-05-12 14:54:06.331998148 +0000 -+++ libdrm-2.4.34/nouveau/Makefile.am 2012-05-12 14:56:00.941132085 +0000 -@@ -2,14 +2,13 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm \ - -DDEBUG - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = nouveau.c \ - pushbuf.c \ -diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am ---- libdrm-2.4.34.orig/radeon/Makefile.am 2012-05-12 14:54:06.365334765 +0000 -+++ libdrm-2.4.34/radeon/Makefile.am 2012-05-12 14:55:48.084557437 +0000 -@@ -26,13 +26,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/radeon \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm - - libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la - libdrm_radeon_ladir = $(libdir) - libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_radeon_la_LIBADD = ../libdrm.la - - libdrm_radeon_la_SOURCES = \ - radeon_bo_gem.c \ diff --git a/multilib/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch b/multilib/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch deleted file mode 100644 index 427efe8a6..000000000 --- a/multilib/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200 -+++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200 -@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go | - # The rusage struct. - rusage=`grep '^type _rusage struct' gen-sysinfo.go` - if test "$rusage" != ""; then -- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -- rusage=`echo $rusage | sed -e 's/^ *//'` - # Remove anonymous unions from GNU/Linux <bits/resource.h>. - rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'` -+ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -+ rusage=`echo $rusage | sed -e 's/^ *//'` - nrusage= - while test -n "$rusage"; do - field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'` diff --git a/multilib/lib32-glibc/glibc-2.15-gb18030.patch.gz b/multilib/lib32-glibc/glibc-2.15-gb18030.patch.gz Binary files differdeleted file mode 100644 index dde59c056..000000000 --- a/multilib/lib32-glibc/glibc-2.15-gb18030.patch.gz +++ /dev/null diff --git a/multilib/lib32-glibc/glibc-2.15-testsuite.patch b/multilib/lib32-glibc/glibc-2.15-testsuite.patch deleted file mode 100644 index 7eaeaed65..000000000 --- a/multilib/lib32-glibc/glibc-2.15-testsuite.patch +++ /dev/null @@ -1,110 +0,0 @@ -From d4c2917fc5091dae7ab1b30c165becb70d3c3453 Mon Sep 17 00:00:00 2001 -From: Allan McRae <allan@archlinux.org> -Date: Mon, 16 Apr 2012 14:06:47 +1000 -Subject: [PATCH] Fix test-suite failues with -Wl,--as-needed - -Signed-off-by: Allan McRae <allan@archlinux.org> ---- - ChangeLog | 24 ++++++++++++++++++++++++ - elf/Makefile | 21 ++++++++++++++++++++- - nptl/ChangeLog | 5 +++++ - nptl/Makefile | 3 ++- - stdlib/Makefile | 1 + - 5 files changed, 52 insertions(+), 2 deletions(-) - -diff --git a/elf/Makefile b/elf/Makefile -index 57dcab0..47729c3 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -500,6 +500,18 @@ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb - $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so - $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so - -+LDFLAGS-nodel2mod3.so = $(no-as-needed) -+LDFLAGS-reldepmod5.so = $(no-as-needed) -+LDFLAGS-reldep6mod1.so = $(no-as-needed) -+LDFLAGS-reldep6mod4.so = $(no-as-needed) -+LDFLAGS-reldep8mod3.so = $(no-as-needed) -+LDFLAGS-unload4mod1.so = $(no-as-needed) -+LDFLAGS-unload4mod2.so = $(no-as-needed) -+LDFLAGS-tst-initorder = $(no-as-needed) -+LDFLAGS-tst-initordera2.so = $(no-as-needed) -+LDFLAGS-tst-initordera3.so = $(no-as-needed) -+LDFLAGS-tst-initordera4.so = $(no-as-needed) -+LDFLAGS-tst-initorderb2.so = $(no-as-needed) - LDFLAGS-tst-tlsmod5.so = -nostdlib - LDFLAGS-tst-tlsmod6.so = -nostdlib - -@@ -633,7 +645,7 @@ $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so) - vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so) - - $(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so --LDFLAGS-noload = -rdynamic -+LDFLAGS-noload = -rdynamic $(no-as-needed) - $(objpfx)noload.out: $(objpfx)testobj5.so - - $(objpfx)noload-mem: $(objpfx)noload.out -@@ -678,6 +690,7 @@ $(objpfx)reldep4: $(libdl) - $(objpfx)reldep4.out: $(objpfx)reldep4mod1.so $(objpfx)reldep4mod2.so - - $(objpfx)next: $(objpfx)nextmod1.so $(objpfx)nextmod2.so $(libdl) -+LDFLAGS-next = $(no-as-needed) - - $(objpfx)unload2: $(libdl) - $(objpfx)unload2.out: $(objpfx)unload2mod.so $(objpfx)unload2dep.so -@@ -1025,6 +1038,8 @@ $(objpfx)order2mod1.so: $(objpfx)order2mod4.so - $(objpfx)order2mod4.so: $(objpfx)order2mod3.so - $(objpfx)order2mod2.so: $(objpfx)order2mod3.so - order2mod2.so-no-z-defs = yes -+LDFLAGS-order2mod1.so = $(no-as-needed) -+LDFLAGS-order2mod2.so = $(no-as-needed) - - tst-stackguard1-ARGS = --command "$(built-program-cmd) --child" - tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" -@@ -1113,6 +1128,10 @@ $(objpfx)tst-initorder2: $(objpfx)tst-initorder2a.so $(objpfx)tst-initorder2d.so - $(objpfx)tst-initorder2a.so: $(objpfx)tst-initorder2b.so - $(objpfx)tst-initorder2b.so: $(objpfx)tst-initorder2c.so - $(objpfx)tst-initorder2c.so: $(objpfx)tst-initorder2d.so -+LDFLAGS-tst-initorder2 = $(no-as-needed) -+LDFLAGS-tst-initorder2a.so = $(no-as-needed) -+LDFLAGS-tst-initorder2b.so = $(no-as-needed) -+LDFLAGS-tst-initorder2c.so = $(no-as-needed) - define o-iterator-doit - $(objpfx)tst-initorder2$o.os: tst-initorder2.c; \ - $$(compile-command.c) -DNAME=\"$o\" -diff --git a/nptl/Makefile b/nptl/Makefile -index 09acd8a..07a1022 100644 ---- a/nptl/Makefile -+++ b/nptl/Makefile -@@ -458,6 +458,7 @@ $(objpfx)tst-tls4: $(libdl) $(shared-thread-library) - $(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so - - $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library) -+LDFLAGS-tst-tls5 = $(no-as-needed) - LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so - - ifeq ($(build-shared),yes) -@@ -503,7 +504,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a - $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a - endif - --LDFLAGS-tst-cancel24 = -lstdc++ -+LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++ - - extra-B-pthread.so = -B$(common-objpfx)nptl/ - $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs)) -diff --git a/stdlib/Makefile b/stdlib/Makefile -index 44eb20d..f7811c5 100644 ---- a/stdlib/Makefile -+++ b/stdlib/Makefile -@@ -138,6 +138,7 @@ $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg - $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/ - - $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so -+LDFLAGS-tst-putenv = $(no-as-needed) - - $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os - $(build-module) --- -1.7.3.4 - diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD deleted file mode 100644 index 26571d1a8..000000000 --- a/staging/akonadi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 163118 2012-07-07 15:44:55Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=akonadi -pkgver=1.7.2 -pkgrel=2 -pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" -arch=('i686' 'x86_64') -url='http://pim.kde.org/akonadi' -license=('LGPL') -depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') -install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c73bb835057a3ee07d37a4f7daaf7ecf') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/akonadi/akonadi.install b/staging/akonadi/akonadi.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/staging/akonadi/akonadi.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD deleted file mode 100644 index cf03f9277..000000000 --- a/staging/avogadro/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 163125 2012-07-07 16:07:39Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Nick B <Shirakawasuna at gmail _dot_com> - -pkgname=avogadro -pkgver=1.0.3 -pkgrel=6 -pkgdesc="An advanced molecular editor based on Qt" -arch=('i686' 'x86_64') -url="http://avogadro.openmolecules.net/wiki/Main_Page" -license=('GPL2') -depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') -makedepends=('cmake' 'boost') -install=avogadro.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'replace-qt4_automoc-with-qt4_wrap_cpp.patch' - 'fix-boost.patch' - 'fix-opengl-headers.patch') -md5sums=('92c2702c1980f70fb6d87a1a58147911' - 'aec516daab066c15326a9681f8f15abc' - '46282e4709429447e44a0a54d51ad2ec' - 'f420bfd22e3d5d8fcddc625cf5e711f6') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch - patch -p1 -i "${srcdir}"/fix-boost.patch - patch -p1 -i "${srcdir}"/fix-opengl-headers.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DQT_MKSPECS_RELATIVE=share/qt/mkspecs - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/avogadro/avogadro.install b/staging/avogadro/avogadro.install deleted file mode 100644 index 2eaa60550..000000000 --- a/staging/avogadro/avogadro.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/avogadro/fix-boost.patch b/staging/avogadro/fix-boost.patch deleted file mode 100644 index 8fb53ef12..000000000 --- a/staging/avogadro/fix-boost.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~ 2011-11-29 18:33:01.777291627 +0000 -+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-11-29 18:33:23.480814612 +0000 -@@ -149,7 +149,7 @@ - endforeach(P_ITEM ${PYTHON_SRCS}) - endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) - --QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) -+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - # you have to add link_directories before you add the target - if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) ---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~ 2011-11-29 18:37:15.449506548 +0000 -+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:37:52.729831744 +0000 -@@ -11,7 +11,7 @@ - # use all cpp files in this directory - FILE(GLOB wrapper_SRCS "*.cpp") - --QT4_WRAP_CPP(MOC_SRCS moleculelist.h) -+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) - SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) ---- avogadro-1.0.3/libavogadro/CMakeLists.txt~ 2011-11-29 19:41:34.066938217 +0000 -+++ avogadro-1.0.3/libavogadro/CMakeLists.txt 2011-11-29 19:42:53.084320315 +0000 -@@ -18,7 +18,7 @@ - # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp - # We should probably scan the header to verify the Q_OBJECT macro is used - string(REPLACE ".cpp" ".h" hdr_list "${src_list}") -- qt4_wrap_cpp(moc_files ${hdr_list}) -+ qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - # Now sort out the ui and qrc files, process them as appropriate - set(ui_plugin_files) - set(qrc_plugin_files) diff --git a/staging/avogadro/fix-opengl-headers.patch b/staging/avogadro/fix-opengl-headers.patch deleted file mode 100644 index e6e8bc3b5..000000000 --- a/staging/avogadro/fix-opengl-headers.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- avogadro-1.0.3/libavogadro/src/camera.cpp~ 2012-02-27 18:35:52.109999585 +0000 -+++ avogadro-1.0.3/libavogadro/src/camera.cpp 2012-02-27 18:36:27.103053453 +0000 -@@ -25,6 +25,8 @@ - #include "camera.h" - #include "glwidget.h" - #include <avogadro/molecule.h> -+#include <Eigen/LU> -+#include <GL/glu.h> - - using namespace Eigen; - ---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~ 2012-02-27 18:37:28.535894209 +0000 -+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp 2012-02-27 18:37:46.912413557 +0000 -@@ -42,6 +42,7 @@ - #include <QColor> - #include <QVarLengthArray> - #include <Eigen/Geometry> -+#include <GL/glu.h> - - namespace Avogadro - { ---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~ 2012-02-27 18:37:55.099014598 +0000 -+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp 2012-02-27 18:38:30.805395066 +0000 -@@ -70,6 +70,8 @@ - - #include <openbabel/mol.h> - -+#include <GL/glu.h> -+ - using namespace OpenBabel; - using namespace Eigen; - ---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~ 2012-02-27 18:36:53.646173944 +0000 -+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp 2012-02-27 18:37:10.739370227 +0000 -@@ -36,6 +36,7 @@ - #include <QFile> - #include <QDebug> - #include <Eigen/Geometry> -+#include <GL/glu.h> - - namespace Avogadro - { ---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~ 2012-02-27 18:38:47.491928000 +0000 -+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp 2012-02-27 18:39:05.735115136 +0000 -@@ -44,6 +44,8 @@ - #include <QComboBox> - #include <QDebug> - -+#include <GL/glu.h> -+ - using namespace std; - using namespace OpenBabel; - using namespace Eigen; diff --git a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch deleted file mode 100644 index 11f58a505..000000000 --- a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch +++ /dev/null @@ -1,778 +0,0 @@ -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt ---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt 2011-11-29 18:49:58.520790652 +0100 -@@ -75,6 +75,42 @@ - zmatrix.h - ) - -+SET(libavogadro_MOC_HDRS -+ animation.h -+ atom.h -+ bond.h -+ color.h -+ colorbutton.h -+ colors/elementcolor.h -+ cube.h -+ elementdetail_p.h -+ elementtranslator.h -+ engine.h -+ engines/bsdyengine.h -+ extension.h -+ fragment.h -+ glwidget.h -+ mesh.h -+ molecule.h -+ moleculefile.h -+ moleculefile_p.h -+ periodictablescene_p.h -+ periodictableview.h -+ plotwidget.h -+ plugin.h -+ pluginmanager.h -+ primitive.h -+ protein.h -+ pythonengine_p.h -+ pythonerror.h -+ pythonextension_p.h -+ pythontool_p.h -+ residue.h -+ tool.h -+ toolgroup.h -+ zmatrix.h -+) -+ - set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS}) - # Also add in the qtiocompressor class - #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp) -@@ -113,7 +148,7 @@ - endforeach(P_ITEM ${PYTHON_SRCS}) - endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) - --qt4_automoc(${libavogadro_SRCS}) -+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) - - # you have to add link_directories before you add the target - if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) -@@ -149,7 +184,7 @@ - COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}") - endforeach(headerFile ${libavogadro_HDRS}) - --add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) -+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) - set_target_properties(avogadro - PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 ) - target_link_libraries(avogadro ${AVO_LINK_LIBRARIES}) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp ---- avogadro-1.0.3/libavogadro/src/animation.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp 2011-11-29 18:48:47.967839537 +0100 -@@ -224,5 +224,3 @@ - } - - } // end namespace Avogadro -- --#include "animation.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp ---- avogadro-1.0.3/libavogadro/src/atom.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp 2011-11-29 18:48:39.561218412 +0100 -@@ -293,5 +293,3 @@ - } - - } // End namespace Avogadro -- --#include "atom.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp ---- avogadro-1.0.3/libavogadro/src/bond.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp 2011-11-29 18:49:00.067773985 +0100 -@@ -166,5 +166,3 @@ - } - - } // End namespace Avogadro -- --#include "bond.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp ---- avogadro-1.0.3/libavogadro/src/color.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp 2011-11-29 18:49:05.207746140 +0100 -@@ -152,5 +152,3 @@ - return "Generic Color"; - } - } -- --#include "color.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp ---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp 2011-11-29 18:49:11.987709410 +0100 -@@ -94,5 +94,3 @@ - } - - } // end namespace -- --#include "colorbutton.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp ---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp 2011-11-29 18:50:11.077389292 +0100 -@@ -63,7 +63,5 @@ - - } - --#include "elementcolor.moc" - //this is a static color plugin... - //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory) -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp ---- avogadro-1.0.3/libavogadro/src/cube.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp 2011-11-29 18:50:26.357306516 +0100 -@@ -322,5 +322,3 @@ - } - - } // End namespace Avogadro -- --#include "cube.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp ---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp 2011-11-29 18:50:37.680578505 +0100 -@@ -132,5 +132,3 @@ - } - - } // End namespace Avogadro -- --#include "elementdetail_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp ---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp 2011-11-29 18:50:48.160521729 +0100 -@@ -401,5 +401,3 @@ - } - - } // End namespace Avogadro -- --#include "elementtranslator.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp ---- avogadro-1.0.3/libavogadro/src/engine.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp 2011-11-29 18:50:54.397154610 +0100 -@@ -377,5 +377,3 @@ - return m_molecule->bonds(); - } - } -- --#include "engine.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp ---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp 2011-11-29 18:51:18.733689435 +0100 -@@ -442,7 +442,5 @@ - } - - } -- --#include "bsdyengine.moc" - // This is a static engine... - // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory ) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp ---- avogadro-1.0.3/libavogadro/src/extension.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp 2011-11-29 18:51:56.360152261 +0100 -@@ -80,5 +80,3 @@ - } - - } -- --#include "extension.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp ---- avogadro-1.0.3/libavogadro/src/fragment.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp 2011-11-29 18:52:01.906788880 +0100 -@@ -82,5 +82,3 @@ - } - - } // End namespace Avogadro -- --#include "fragment.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp ---- avogadro-1.0.3/libavogadro/src/glwidget.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp 2011-11-29 18:52:14.346721486 +0100 -@@ -1966,5 +1966,3 @@ - d->updateCache = true; - } - } -- --#include "glwidget.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp ---- avogadro-1.0.3/libavogadro/src/mesh.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp 2011-11-29 18:52:23.033341093 +0100 -@@ -231,5 +231,3 @@ - } - - } // End namespace Avogadro -- --#include "mesh.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp ---- avogadro-1.0.3/libavogadro/src/molecule.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp 2011-11-29 18:52:33.573283993 +0100 -@@ -1575,5 +1575,3 @@ - } - - } // End namespace Avogadro -- --#include "molecule.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp ---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp 2011-11-29 18:56:26.728687548 +0100 -@@ -22,23 +22,14 @@ - 02110-1301, USA. - **********************************************************************/ - --#include "moleculefile.h" -+#include "moleculefile_p.h" - - #include <avogadro/molecule.h> - --#include <QFile> - #include <QFileInfo> --#include <QStringList> --#include <QThread> - #include <QDebug> - #include <QPointer> - --#include <openbabel/mol.h> --#include <openbabel/obconversion.h> -- --// Included in obconversion.h --//#include <iostream> -- - namespace Avogadro { - - using OpenBabel::OBConversion; -@@ -578,164 +569,6 @@ - return false; - } - -- class ReadFileThread : public QThread -- { -- // Q_OBJECT -- -- public: -- ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) -- { -- } -- -- void addConformer(const OpenBabel::OBMol &conformer) -- { -- unsigned int numAtoms = conformer.NumAtoms(); -- std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); -- for (unsigned int i = 0; i < numAtoms; ++i) -- coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); -- m_moleculeFile->m_conformers.push_back(coords); -- } -- -- void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) -- { -- if (!c) { -- // this is the first molecule read -- m_moleculeFile->setConformerFile(true); -- addConformer(current); -- return; -- } -- -- if (!m_moleculeFile->isConformerFile()) -- return; -- -- // as long as we are not sure if this really is a -- // conformer/trajectory file, add the conformers -- addConformer(current); -- -- // performance: check only certain molecule 1-10,20,50 -- switch (c) { -- case 1: -- case 2: -- case 3: -- case 4: -- case 5: -- case 6: -- case 7: -- case 8: -- case 9: -- case 10: -- case 20: -- case 50: -- break; -- default: -- return; -- } -- -- if (first.NumAtoms() != current.NumAtoms()) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- return; -- } -- -- for (unsigned int i = 0; i < first.NumAtoms(); ++i) { -- OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); -- OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); -- if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- return; -- } -- } -- } -- -- void run() -- { -- // Check that the file can be read from disk -- if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { -- // Cannot read the file -- m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") -- .arg(m_moleculeFile->m_fileName)); -- return; -- } -- -- // Construct the OpenBabel objects, set the file type -- OpenBabel::OBConversion conv; -- OpenBabel::OBFormat *inFormat; -- if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { -- // Input format not supported -- m_moleculeFile->m_error.append( -- QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); -- return; -- } else { -- inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); -- if (!inFormat || !conv.SetInFormat(inFormat)) { -- // Input format not supported -- m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") -- .arg(m_moleculeFile->m_fileName)); -- return; -- } -- } -- -- // set any options -- if (!m_moleculeFile->m_fileOptions.isEmpty()) { -- foreach(const QString &option, -- m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { -- conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); -- } -- } -- -- // Now attempt to read the molecule in -- ifstream ifs; -- ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc -- if (!ifs) // Should not happen, already checked file could be opened -- return; -- -- // read all molecules -- OpenBabel::OBMol firstOBMol, currentOBMol; -- unsigned int c = 0; -- conv.SetInStream(&ifs); -- m_moleculeFile->streamposRef().push_back(ifs.tellg()); -- while (ifs.good() && conv.Read(¤tOBMol)) { -- if (!c) -- firstOBMol = currentOBMol; -- -- if (c > 20 && !m_moleculeFile->isConformerFile()) -- m_moleculeFile->setFirstReady(true); -- -- // detect conformer/trajectory files -- detectConformers(c, firstOBMol, currentOBMol); -- // store information about molecule -- m_moleculeFile->streamposRef().push_back(ifs.tellg()); -- m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); -- // increment count -- ++c; -- } -- m_moleculeFile->streamposRef().pop_back(); -- -- // signle molecule files are not conformer files -- if (c == 1) { -- m_moleculeFile->setConformerFile(false); -- m_moleculeFile->m_conformers.clear(); -- } -- -- // check for empty titles -- for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { -- if (!m_moleculeFile->titlesRef()[i].isEmpty()) -- continue; -- -- QString title; -- if (m_moleculeFile->isConformerFile()) -- title = tr("Conformer %1").arg(i+1); -- else -- title = tr("Molecule %1").arg(i+1); -- -- m_moleculeFile->titlesRef()[i] = title; -- } -- } -- -- MoleculeFile *m_moleculeFile; -- }; // end ReadFileThread class -- - MoleculeFile* MoleculeFile::readFile(const QString &fileName, - const QString &fileType, const QString &fileOptions, bool wait) - { -@@ -794,6 +627,3 @@ - } - - } // end namespace Avogadro -- --#include "moleculefile.moc" -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h ---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h 1970-01-01 01:00:00.000000000 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h 2011-11-29 18:57:43.108273764 +0100 -@@ -0,0 +1,202 @@ -+/********************************************************************** -+ MoleculeFile - Class representing molecule file. -+ -+ Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch -+ -+ This file is part of the Avogadro molecular editor project. -+ For more information, see <http://avogadro.openmolecules.net/> -+ -+ Avogadro 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. -+ -+ Avogadro 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 General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ 02110-1301, USA. -+ **********************************************************************/ -+ -+#ifndef MOLECULEFILE_P_H -+#define MOLECULEFILE_P_H -+ -+#include "moleculefile.h" -+ -+#include <openbabel/mol.h> -+#include <openbabel/obconversion.h> -+ -+#include <QFile> -+#include <QStringList> -+#include <QThread> -+ -+namespace Avogadro { -+ -+ using OpenBabel::OBConversion; -+ using std::ifstream; -+ -+class ReadFileThread : public QThread -+{ -+ Q_OBJECT -+ -+ public: -+ ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) -+ { -+ } -+ -+ void addConformer(const OpenBabel::OBMol &conformer) -+ { -+ unsigned int numAtoms = conformer.NumAtoms(); -+ std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); -+ for (unsigned int i = 0; i < numAtoms; ++i) -+ coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); -+ m_moleculeFile->m_conformers.push_back(coords); -+ } -+ -+ void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) -+ { -+ if (!c) { -+ // this is the first molecule read -+ m_moleculeFile->setConformerFile(true); -+ addConformer(current); -+ return; -+ } -+ -+ if (!m_moleculeFile->isConformerFile()) -+ return; -+ -+ // as long as we are not sure if this really is a -+ // conformer/trajectory file, add the conformers -+ addConformer(current); -+ -+ // performance: check only certain molecule 1-10,20,50 -+ switch (c) { -+ case 1: -+ case 2: -+ case 3: -+ case 4: -+ case 5: -+ case 6: -+ case 7: -+ case 8: -+ case 9: -+ case 10: -+ case 20: -+ case 50: -+ break; -+ default: -+ return; -+ } -+ -+ if (first.NumAtoms() != current.NumAtoms()) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ return; -+ } -+ -+ for (unsigned int i = 0; i < first.NumAtoms(); ++i) { -+ OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); -+ OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); -+ if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ return; -+ } -+ } -+ } -+ -+ void run() -+ { -+ // Check that the file can be read from disk -+ if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { -+ // Cannot read the file -+ m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") -+ .arg(m_moleculeFile->m_fileName)); -+ return; -+ } -+ -+ // Construct the OpenBabel objects, set the file type -+ OpenBabel::OBConversion conv; -+ OpenBabel::OBFormat *inFormat; -+ if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { -+ // Input format not supported -+ m_moleculeFile->m_error.append( -+ QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); -+ return; -+ } else { -+ inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); -+ if (!inFormat || !conv.SetInFormat(inFormat)) { -+ // Input format not supported -+ m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") -+ .arg(m_moleculeFile->m_fileName)); -+ return; -+ } -+ } -+ -+ // set any options -+ if (!m_moleculeFile->m_fileOptions.isEmpty()) { -+ foreach(const QString &option, -+ m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { -+ conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); -+ } -+ } -+ -+ // Now attempt to read the molecule in -+ ifstream ifs; -+ ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc -+ if (!ifs) // Should not happen, already checked file could be opened -+ return; -+ -+ // read all molecules -+ OpenBabel::OBMol firstOBMol, currentOBMol; -+ unsigned int c = 0; -+ conv.SetInStream(&ifs); -+ m_moleculeFile->streamposRef().push_back(ifs.tellg()); -+ while (ifs.good() && conv.Read(¤tOBMol)) { -+ if (!c) -+ firstOBMol = currentOBMol; -+ -+ if (c > 20 && !m_moleculeFile->isConformerFile()) -+ m_moleculeFile->setFirstReady(true); -+ -+ // detect conformer/trajectory files -+ detectConformers(c, firstOBMol, currentOBMol); -+ // store information about molecule -+ m_moleculeFile->streamposRef().push_back(ifs.tellg()); -+ m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); -+ // increment count -+ ++c; -+ } -+ m_moleculeFile->streamposRef().pop_back(); -+ -+ // signle molecule files are not conformer files -+ if (c == 1) { -+ m_moleculeFile->setConformerFile(false); -+ m_moleculeFile->m_conformers.clear(); -+ } -+ -+ // check for empty titles -+ for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { -+ if (!m_moleculeFile->titlesRef()[i].isEmpty()) -+ continue; -+ -+ QString title; -+ if (m_moleculeFile->isConformerFile()) -+ title = tr("Conformer %1").arg(i+1); -+ else -+ title = tr("Molecule %1").arg(i+1); -+ -+ m_moleculeFile->titlesRef()[i] = title; -+ } -+ } -+ -+ MoleculeFile *m_moleculeFile; -+}; -+ -+} // end namespace Avogadro -+ -+#endif // MOLECULEFILE_P_H -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp ---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp 2011-11-29 18:52:50.259860261 +0100 -@@ -213,5 +213,3 @@ - } - - } // End namespace Avogadro -- --#include "periodictablescene_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp ---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp 2011-11-29 19:30:25.130970122 +0000 -+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp 2011-11-29 18:52:50.259860261 +0100 -@@ -69,4 +69,3 @@ - - } // End namespace Avogadro - --#include "periodictableview.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp ---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp 2011-11-29 18:53:09.389756626 +0100 -@@ -27,7 +27,6 @@ - **********************************************************************/ - - #include "plotwidget.h" --#include "plotwidget.moc" - - #include <math.h> - #include <QDebug> -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp ---- avogadro-1.0.3/libavogadro/src/plugin.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp 2011-11-29 18:53:16.016387394 +0100 -@@ -65,5 +65,3 @@ - } - - } // end namespace Avogadro -- --#include "plugin.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp ---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp 2011-11-29 18:53:23.569679807 +0100 -@@ -784,5 +784,3 @@ - } - - } -- --#include "pluginmanager.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp ---- avogadro-1.0.3/libavogadro/src/primitive.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp 2011-11-29 18:53:29.139649631 +0100 -@@ -77,5 +77,3 @@ - } - - } -- --#include "primitive.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp ---- avogadro-1.0.3/libavogadro/src/protein.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp 2011-11-29 18:53:37.952935219 +0100 -@@ -978,5 +978,3 @@ - } - - } // End namespace Avogadro -- --#include "protein.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt ---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:58:02.354836165 +0100 -@@ -11,9 +11,9 @@ - # use all cpp files in this directory - FILE(GLOB wrapper_SRCS "*.cpp") - --qt4_automoc(moleculelist.cpp) -+QT4_WRAP_CPP(MOC_SRCS moleculelist.h) - --ADD_LIBRARY(python-module MODULE ${wrapper_SRCS}) -+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) - SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) - SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "") - if (WIN32) -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp ---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:07.562214311 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:14.538843182 +0100 -@@ -70,4 +70,3 @@ - - } - --#include "moleculelist.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp 2011-11-29 18:53:45.492894371 +0100 -@@ -289,5 +289,3 @@ - - - } -- --#include "pythonengine_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp ---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:26.949426045 +0100 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:41.176015640 +0100 -@@ -112,4 +112,3 @@ - - } // namespace - --#include "pythonerror.moc" - -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp 2011-11-29 18:53:54.082847836 +0100 -@@ -340,5 +340,3 @@ - } - - } -- --#include "pythonextension_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp ---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp 2011-11-29 18:54:02.269470152 +0100 -@@ -344,5 +344,3 @@ - } - - } -- --#include "pythontool_p.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp ---- avogadro-1.0.3/libavogadro/src/residue.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp 2011-11-29 18:54:14.316071557 +0100 -@@ -160,6 +160,3 @@ - } - - } // End namespace Avogadro -- -- #include "residue.moc" -- -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp ---- avogadro-1.0.3/libavogadro/src/tool.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp 2011-11-29 18:55:05.515794184 +0100 -@@ -117,5 +117,3 @@ - } - - } // end namespace Avogadro -- --#include "tool.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp ---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp 2011-11-29 18:55:11.699094018 +0100 -@@ -206,5 +206,3 @@ - } - - } // end namespace Avogadro -- --#include "toolgroup.moc" -diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp ---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp 2011-04-25 07:22:18.000000000 +0200 -+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp 2011-11-29 18:55:17.209064168 +0100 -@@ -149,5 +149,3 @@ - - - } // End namespace Avogadro -- --#include "zmatrix.moc" diff --git a/staging/binutils/PKGBUILD b/staging/binutils/PKGBUILD deleted file mode 100644 index 067cf289f..000000000 --- a/staging/binutils/PKGBUILD +++ /dev/null @@ -1,95 +0,0 @@ -# $Id: PKGBUILD 162862 2012-07-02 13:30:53Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils -pkgver=2.22 -pkgrel=8 -_date=20120323 -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('base-devel') -depends=('glibc>=2.16' 'zlib') -checkdepends=('dejagnu') -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('de2ac4298732827f8af706fc24020330') - -mksource() { - mkdir ${pkgname}-${_date} - cd ${pkgname}-${_date} - export _TAG=binutils-2_22-branch - export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' - cvs -z9 co -r $_TAG binutils || return 1 - mv src binutils - tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* -} - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared $CONFIGFLAG - - # check the host environment and makes sure all the necessary tools are available - make configure-host - - make tooldir=${pkgdir}/usr - - # Rebuild libiberty.a with -fPIC - cp -a libiberty libiberty-pic - make -C libiberty-pic clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic - - # Rebuild libbfd.a with -fPIC - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - cp -a bfd bfd-pic - make -C bfd-pic clean - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic - - # Rebuild libopcodes.a with -fPIC - cp -a opcodes opcodes-pic - make -C opcodes-pic clean - make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror) - make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \ - CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # install libraries rebuilt with -fPIC - install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib - install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib - install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/staging/binutils/binutils.install b/staging/binutils/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/staging/binutils/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD deleted file mode 100644 index 0b6dc502c..000000000 --- a/staging/boost/PKGBUILD +++ /dev/null @@ -1,113 +0,0 @@ -# $Id: PKGBUILD 163072 2012-07-06 15:51:12Z ibiru $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Kritoke <kritoke@gamebox.net> -# Contributor: Luca Roccia <little_rock@users.sourceforge.net> - -pkgbase=boost -pkgname=('boost-libs' 'boost') -pkgver=1.50.0 -_boostver=${pkgver//./_} -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.boost.org/" -makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) -license=('custom') -md5sums=('dbc07ab0254df3dda6300fd737b3f264') - -_stagedir="${srcdir}/stagedir" - -build() { - # set python path for bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools" - echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam - echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam - echo "using mpi ;" >> build/v2/user-config.jam - - cd "${srcdir}"/${pkgbase}_${_boostver} - - # build bjam - cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" - ./build.sh cc - - _bindir="bin.linuxx86" - [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64" - - install -d "${_stagedir}"/usr/bin - install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam - - # build tools - cd "${srcdir}/${pkgbase}_${_boostver}/tools/" - "${_stagedir}"/usr/bin/bjam --toolset=gcc - - # copy the tools - cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin" - for i in *;do - install -m755 "${i}" "${_stagedir}/usr/bin/${i}" - done - - #boostbook needed by quickbook - cd "${srcdir}/${pkgbase}_${_boostver}/dist/" - cp -r share "${_stagedir}" - - # build libs - cd "${srcdir}/${pkgbase}_${_boostver}" - - # default "minimal" install: "release link=shared,static - # runtime-link=shared threading=single,multi" - # --layout=tagged will add the "-mt" suffix for multithreaded libraries - # and installs includes in /usr/include/boost. - # --layout=system no longer adds the -mt suffix for multi-threaded libs. - # install to ${_stagedir} in preparation for split packaging - - "${_stagedir}"/usr/bin/bjam \ - release debug-symbols=off threading=multi \ - runtime-link=shared link=shared,static \ - cflags=-fno-strict-aliasing \ - toolset=gcc \ - --prefix="${_stagedir}" \ - -sTOOLS=gcc \ - --layout=system \ - ${MAKEFLAGS} \ - install -} - -package_boost() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Development" - depends=("boost-libs=${pkgver}") - optdepends=('python: for python bindings' - 'python2: for python2 bindings' - 'boost-build: to use boost jam for building your project.') - - install -d "${pkgdir}"/usr/{include,lib,share} - # headers/source files - cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/ - - # static libs - cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/ - - # utilities (bjam, bcp, pyste) - cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/ - - #boostbook - cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share - - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt -} - -package_boost-libs() { - pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime" - depends=('gcc-libs' 'bzip2' 'zlib' 'icu') - optdepends=('openmpi: for mpi support') - - install -d "${pkgdir}/usr/lib" - #shared libs - cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/" - - # license - install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \ - "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt -} diff --git a/staging/gcc/PKGBUILD b/staging/gcc/PKGBUILD deleted file mode 100644 index 4c3dfc6f4..000000000 --- a/staging/gcc/PKGBUILD +++ /dev/null @@ -1,277 +0,0 @@ -# $Id: PKGBUILD 162860 2012-07-02 13:12:42Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.7.1 -pkgrel=4 -#_snapshot=4.7-20120505 -_libstdcppmanver=20120605 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada') -checkdepends=('dejagnu') -options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-4.7.1-libada-pic.patch - gcc-4.7.1-libgo-write.patch - gcc-4.7.1-libgo-mksysinfo.patch) -md5sums=('933e6f15f51c031060af64a9e14149ff' - '767c62f9a047c4434f2345decf1d0819' - 'ced48436c1b3c981d721a829f1094de1' - '2acbc9d35cc9d72329dc71d6b1f162ef' - 'df82dd175ac566c8a6d46b11ac21f14c' - '8e847244dba042d0aa3297713edaf70c') - - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - if [ "${CARCH}" = "x86_64" ]; then - patch -p1 -i ${srcdir}/gcc_pure64.patch - fi - - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679 - patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch - - # bug to file... - patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch - - # http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html - patch -p0 -i ${srcdir}/gcc-4.7.1-libgo-mksysinfo.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --disable-libstdcxx-pch --enable-libstdcxx-time \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --disable-ppl-version-check --disable-cloog-version-check \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --with-linker-hash-style=gnu \ - --disable-multilib --disable-libssp \ - --disable-build-with-cxx --disable-build-poststage1-with-cxx \ - --enable-checking=release - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC" - groups=('base') - depends=('glibc>=2.16') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src libitm; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl') - groups=('base-devel') - install=gcc.install - - cd gcc-build - - make -j1 DESTDIR=${pkgdir} install - - install -d $pkgdir/usr/share/gdb/auto-load/usr/lib - mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a - rm -r $pkgdir/usr/lib/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - #install -dm755 ${pkgdir}/lib - #ln -s /usr/bin/cpp ${pkgdir}/lib/cpp - ln -s gcc ${pkgdir}/usr/bin/cc - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/libstdc++-api.${_libstdcppmanver}.man/man3/* \ - ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran() -{ - pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - ln -s gfortran ${pkgdir}/usr/bin/f95 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc() -{ - pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada() -{ - pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - ln -s gcc ${pkgdir}/usr/bin/gnatgcc - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go() -{ - pkgdesc="Go front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/staging/gcc/gcc-4.7.0-cloog-0.17.patch b/staging/gcc/gcc-4.7.0-cloog-0.17.patch deleted file mode 100644 index c7146fa04..000000000 --- a/staging/gcc/gcc-4.7.0-cloog-0.17.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure ---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 -+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 -@@ -6049,8 +6049,8 @@ - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - - if test "${cloog_org}" = yes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 --$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 -+$as_echo_n "checking for version 0.17 of CLooG... " >&6; } - if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -@@ -6061,8 +6061,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 16 \ -- || CLOOG_VERSION_REVISION < 1 -+ || CLOOG_VERSION_MINOR != 17 - choke me - #endif - ; diff --git a/staging/gcc/gcc-4.7.1-libada-pic.patch b/staging/gcc/gcc-4.7.1-libada-pic.patch deleted file mode 100644 index 591da1e4a..000000000 --- a/staging/gcc/gcc-4.7.1-libada-pic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in ---- gcc-4.7.1-orig/libada/Makefile.in 2012-06-13 01:12:37.000000000 +1000 -+++ gcc-4.7.1/libada/Makefile.in 2012-06-16 15:04:32.179911023 +1000 -@@ -54,7 +54,7 @@ - PICFLAG = @PICFLAG@ - GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc - GNATLIBCFLAGS= -g -O2 --GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \ -+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \ - -fexceptions -DIN_RTS @have_getipinfo@ - - host_subdir = @host_subdir@ diff --git a/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch deleted file mode 100644 index 427efe8a6..000000000 --- a/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200 -+++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200 -@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go | - # The rusage struct. - rusage=`grep '^type _rusage struct' gen-sysinfo.go` - if test "$rusage" != ""; then -- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -- rusage=`echo $rusage | sed -e 's/^ *//'` - # Remove anonymous unions from GNU/Linux <bits/resource.h>. - rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'` -+ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -+ rusage=`echo $rusage | sed -e 's/^ *//'` - nrusage= - while test -n "$rusage"; do - field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'` diff --git a/staging/gcc/gcc-4.7.1-libgo-write.patch b/staging/gcc/gcc-4.7.1-libgo-write.patch deleted file mode 100644 index a7be83fda..000000000 --- a/staging/gcc/gcc-4.7.1-libgo-write.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c ---- gcc-4.7.1-orig/libgo/runtime/print.c 2012-05-26 04:22:14.000000000 +1000 -+++ gcc-4.7.1/libgo/runtime/print.c 2012-06-16 15:06:28.553138502 +1000 -@@ -17,7 +17,8 @@ - G* g = runtime_g(); - - if(g == nil || g->writebuf == nil) { -- runtime_write(2, v, n); -+ ssize_t bytesWritten = runtime_write(2, v, n); -+ (void)bytesWritten; - return; - } - diff --git a/staging/gcc/gcc-ada.install b/staging/gcc/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/staging/gcc/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) - -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/staging/gcc/gcc-fortran.install b/staging/gcc/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/staging/gcc/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/staging/gcc/gcc-go.install b/staging/gcc/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/staging/gcc/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.info) - -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/staging/gcc/gcc-libs.install b/staging/gcc/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/staging/gcc/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/gcc/gcc.install b/staging/gcc/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/staging/gcc/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) - -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/staging/gcc/gcc_pure64.patch b/staging/gcc/gcc_pure64.patch deleted file mode 100644 index a9b09bbcf..000000000 --- a/staging/gcc/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h ---- gcc-orig/gcc/config/i386/linux64.h 2011-07-08 01:38:34.000000000 +1000 -+++ gcc/gcc/config/i386/linux64.h 2011-07-24 19:48:05.000000000 +1000 -@@ -28,6 +28,6 @@ - #define GNU_USER_LINK_EMULATION64 "elf_x86_64" - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64 ---- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000 -+++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000 -@@ -34,8 +34,8 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64 --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 - MULTILIB_OSDIRNAMES+= mx32=../libx32 - - LIBGCC = stmp-multilib diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD deleted file mode 100644 index 79e557f6c..000000000 --- a/staging/hugin/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 163191 2012-07-08 15:53:29Z ibiru $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Dominik Ryba <domryba@post.pl> - -pkgname=hugin -pkgver=2011.4.0 -pkgrel=3 -pkgdesc="A frontend to the panorama-tools" -arch=('i686' 'x86_64') -url="http://hugin.sourceforge.net/" -license=('GPL') -depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' - 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool') -makedepends=('zip' 'cmake' 'boost' 'tclap') -install=hugin.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - gcc47.patch) -sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b' - 'aa0fc9425bd7a4b5e270412f4ca72258fac77298') - -build() { - cd "${srcdir}" - patch -Np0 -i gcc47.patch - mkdir build - cd build - export CXXFLAGS+=" -fpermissive" - 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/gcc47.patch b/staging/hugin/gcc47.patch deleted file mode 100644 index 3814b871c..000000000 --- a/staging/hugin/gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp ---- hugin-2011.4.0.orig/src/celeste/Utilities.cpp 2012-07-08 15:18:16.864454043 +0000 -+++ hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:20.341089422 +0000 -@@ -27,6 +27,7 @@ - - #include <math.h> - #include <stdlib.h> -+#include <unistd.h> - #include "Utilities.h" - - using namespace std; diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install deleted file mode 100644 index 362749233..000000000 --- a/staging/hugin/hugin.install +++ /dev/null @@ -1,15 +0,0 @@ -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/libpst/PKGBUILD b/staging/libpst/PKGBUILD deleted file mode 100644 index ee01ca472..000000000 --- a/staging/libpst/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 163183 2012-07-08 14:59:15Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=libpst -pkgname=('libpst' 'libpst-docs') -pkgver=0.6.54 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.five-ten-sg.com/libpst/" -license=('GPL') -makedepends=('python2' 'boost') -source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz) -sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2 - make -} - -package_libpst() { - pkgdesc="Outlook .pst file converter" - depends=('gcc-libs') - optdepends=('boost-libs: for libpst python interface') - options=('!libtool' '!docs') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_libpst-docs() { - pkgdesc="Documentation for Outlook .pst file converter" - options=('!libtool') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install-htmlDATA - cd "${srcdir}/${pkgbase}-${pkgver}/html" - make DESTDIR="${pkgdir}" install-htmldevelDATA -} diff --git a/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD deleted file mode 100644 index a416c7110..000000000 --- a/staging/libtorrent-rasterbar/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 163074 2012-07-06 16:12:17Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=libtorrent-rasterbar -pkgver=0.16.1 -pkgrel=1 -epoch=1 -pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" -url="http://www.rasterbar.com/products/libtorrent/" -arch=('i686' 'x86_64') -license=('custom') -depends=('boost-libs' 'geoip' 'python2') -makedepends=('boost') -options=('!libtool' '!emptydirs') -source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('798944301ee6ef8e0d8de3d944c59d184ef1a4d3') - -build() { - cd $pkgname-$pkgver - PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \ - --enable-python-binding \ - --with-libgeoip=system - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/staging/licq/PKGBUILD b/staging/licq/PKGBUILD deleted file mode 100644 index f852cde06..000000000 --- a/staging/licq/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 163193 2012-07-08 16:00:41Z ibiru $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=licq -pkgver=1.6.0 -pkgrel=5 -pkgdesc="Advanced graphical ICQ clone and more for Unix" -arch=('i686' 'x86_64') -url="http://www.licq.org" -license=('GPL') -depends=('boost-libs' 'gpgme' 'libxss' 'qt') -makedepends=('cmake' 'boost') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) -md5sums=('383153697e281a0b1b4ff008936731b8') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # licq - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make - - # qt4-gui - cd ../plugins/qt4-gui - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake" .. - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - - cd ../plugins/qt4-gui/build - make DESTDIR="${pkgdir}" install -} diff --git a/staging/lyx/PKGBUILD b/staging/lyx/PKGBUILD deleted file mode 100644 index e6341f0a0..000000000 --- a/staging/lyx/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 163195 2012-07-08 16:34:34Z ibiru $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=lyx -pkgver=2.0.3 -pkgrel=4 -pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" -arch=('i686' 'x86_64') -url="http://www.lyx.org" -depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes') -makedepends=('boost') -optdepends=('rcs: built-in version control system' - 'texlive-latexextra: float wrap support') -license=('GPL') -source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz - lyx.desktop lyxrc.dist) -backup=('etc/lyx/lyxrc.dist') -install=lyx.install -options=('emptydirs') -sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f' - '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 \ - --without-included-mythes - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # install desktop entry - install -Dm644 "${srcdir}/lyx.desktop" \ - "${pkgdir}/usr/share/applications/lyx.desktop" - install -Dm644 "lib/images/lyx.png" \ - "${pkgdir}/usr/share/pixmaps/lyx.png" - - # 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/staging/lyx/lyx.desktop b/staging/lyx/lyx.desktop deleted file mode 100644 index 649b30c98..000000000 --- a/staging/lyx/lyx.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -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 -StartupWMClass=Lyx -Terminal=false -Categories=Office;WordProcessor;Qt; -MimeType=text/x-lyx;application/x-lyx; diff --git a/staging/lyx/lyx.install b/staging/lyx/lyx.install deleted file mode 100644 index c15c17b3a..000000000 --- a/staging/lyx/lyx.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove () { - post_install -} - - - diff --git a/staging/lyx/lyxrc.dist b/staging/lyx/lyxrc.dist deleted file mode 100644 index dd18694f9..000000000 --- a/staging/lyx/lyxrc.dist +++ /dev/null @@ -1,14 +0,0 @@ -### 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/staging/mkvtoolnix/PKGBUILD b/staging/mkvtoolnix/PKGBUILD deleted file mode 100644 index 48bd96863..000000000 --- a/staging/mkvtoolnix/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id: PKGBUILD 163225 2012-07-11 10:08:56Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: xduugu <xduugu@gmx.com> - -pkgbase=mkvtoolnix -pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=5.7.0 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" -makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' - 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') -source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('99ea44be570412dadafe4ccaee0cfe6e') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Disable automagic curl dep used for online update checking - sed -i -e '/curl/d' configure.in - export CURL_CFLAGS="" CURL_LIBS="" - - export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3" - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3" - - autoreconf - - ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib \ - --disable-gui - rake - - mv src/mkvinfo{,-cli} - - ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib - rake -} - -package_mkvtoolnix-cli() { - pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" - depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2') - provides=('mkvtoolnix') - conflicts=('mkvtoolnix') - replaces=('mkvtoolnix') - - cd "${srcdir}/${pkgbase}-${pkgver}" - - rake DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/bin/mkvinfo - install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo - - rm -rf "${pkgdir}"/usr/bin/mmg - rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1 - rm -rf "${pkgdir}"/usr/share/applications - rm -rf "${pkgdir}"/usr/share/icons - rm -rf "${pkgdir}"/usr/share/mime -} - -package_mkvtoolnix-gtk() { - pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI" - depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils') - install=mkvtoolnix.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - - rake DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/bin/mkv* - install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk - sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop - - rm -rf "${pkgdir}"/usr/share/doc - rm -rf "${pkgdir}"/usr/share/locale - rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv* - rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv* -} diff --git a/staging/mkvtoolnix/mkvtoolnix.install b/staging/mkvtoolnix/mkvtoolnix.install deleted file mode 100644 index 74d9eb2ef..000000000 --- a/staging/mkvtoolnix/mkvtoolnix.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - if [ -f usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime &> /dev/null - fi -} - -post_upgrade() { - post_install -} - -pre_remove() { - post_install -} diff --git a/staging/ppl/PKGBUILD b/staging/ppl/PKGBUILD deleted file mode 100644 index 0e5798dcd..000000000 --- a/staging/ppl/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 162774 2012-06-30 08:11:58Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: ezzetabi <ezzetabi at gawab dot com> - -pkgname=ppl -pkgver=1.0 -pkgrel=1 -pkgdesc="A modern library for convex polyhedra and other numerical abstractions." -arch=('i686' 'x86_64') -url="http://bugseng.com/products/ppl" -license=('GPL3') -depends=('gmp>=5.0') -options=('!docs' '!libtool') -source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign}) -md5sums=('c4566928c6b7bb63e95f96d1a7b5cb4c' - '5f490df826c76fed296060ca8fca4eb5') - -build() { - cd $srcdir/ppl-$pkgver - ./configure --prefix=/usr --enable-interfaces="c,cxx" - make -} - -check() { - cd $srcdir/ppl-$pkgver - make check -} - -package() { - cd $srcdir/ppl-$pkgver - make DESTDIR=$pkgdir install -} - diff --git a/staging/source-highlight/PKGBUILD b/staging/source-highlight/PKGBUILD deleted file mode 100644 index e4c135217..000000000 --- a/staging/source-highlight/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 163141 2012-07-08 09:27:47Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=source-highlight -pkgver=3.1.7 -pkgrel=2 -pkgdesc="Convert source code to syntax highlighted document" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/src-highlite/" -license=('GPL') -depends=('bash' 'boost-libs') -makedepends=('ctags' 'boost') -options=('!libtool') -install=$pkgname.install -source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz") -md5sums=('0ff81588d3536b4c4e571122ba940595') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-bash-completion=${pkgdir}/usr/share/bash-completion/completions - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}/usr" install -} diff --git a/staging/source-highlight/source-highlight.install b/staging/source-highlight/source-highlight.install deleted file mode 100644 index 4fd1b3005..000000000 --- a/staging/source-highlight/source-highlight.install +++ /dev/null @@ -1,18 +0,0 @@ -info_dir=usr/share/info -info_files=(source-highlight.info source-highlight-lib.info) - -post_install() { - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/alsa-plugins/PKGBUILD b/testing/alsa-plugins/PKGBUILD deleted file mode 100644 index 7f27f3f21..000000000 --- a/testing/alsa-plugins/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 163052 2012-07-06 15:20:44Z ibiru $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Daniel Ehlers <danielehlers@mindeye.net> - -pkgname=alsa-plugins -pkgver=1.0.25 -pkgrel=2 -pkgdesc="Extra alsa plugins" -arch=(i686 x86_64) -url="http://www.alsa-project.org" -license=(GPL) -depends=(alsa-lib) -makedepends=(libpulse jack ffmpeg) -optdepends=('libpulse: PulseAudio plugin' - 'jack: Jack plugin' - 'ffmpeg: libavcodec resampling plugin' - 'libsamplerate: libsamplerate resampling plugin' - 'speex: libspeexdsp resampling plugin') -options=('!libtool') -source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2" - alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch) -md5sums=('038c023eaa51171f018fbf7141255185' - '50d9adcda20756d063e676a563c201d9' - '697c6275f678d86ded2e5092d8a154c9') - -build() { - cd $pkgname-$pkgver - patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch - ./configure --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - - install -d "$pkgdir/usr/share/doc/$pkgname" - install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" -} diff --git a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch deleted file mode 100644 index cce4f7e7e..000000000 --- a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c ---- alsa-plugins-1.0.25/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 -+++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c 2012-06-09 00:42:52.177219012 +0200 -@@ -702,7 +702,6 @@ - rec->channels = channels; - rec->format = format; - -- avcodec_init(); - avcodec_register_all(); - - rec->codec = avcodec_find_encoder_by_name("ac3_fixed"); diff --git a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch deleted file mode 100644 index f4ebbf466..000000000 --- a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch +++ /dev/null @@ -1,29 +0,0 @@ -Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for -the AV_CH_LAYOUT_* defines. - -diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c ---- alsa-plugins-1.0.25-original/a52/pcm_a52.c 2012-01-25 08:57:07.000000000 +0100 -+++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c 2012-06-01 14:59:47.096671464 +0200 -@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t - #else - rec->avctx->sample_fmt = SAMPLE_FMT_S16; - #endif --#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) -+#if (LIBAVCODEC_VERSION_MAJOR >= 54) -+ switch (io->channels) { -+ case 2: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO; -+ break; -+ case 4: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD; -+ break; -+ case 6: -+ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1; -+ break; -+ default: -+ break; -+ } -+#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) - switch (io->channels) { - case 2: - rec->avctx->channel_layout = CH_LAYOUT_STEREO; diff --git a/testing/amarok/PKGBUILD b/testing/amarok/PKGBUILD deleted file mode 100644 index 214f7f200..000000000 --- a/testing/amarok/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 163053 2012-07-06 15:20:55Z ibiru $ -# Maintainer: Ronald van Haren <ronald@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=amarok -replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.5.0 -pkgrel=5 -pkgdesc="The powerful music player for KDE" -arch=("i686" "x86_64") -url="http://amarok.kde.org" -license=('GPL2' 'LGPL2.1' 'FDL') -depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras' - 'liblastfm' 'ffmpeg' 'libofa' 'qjson') -makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth' - 'libmygpo-qt') -optdepends=("libgpod: support for Apple iPod audio devices" - "libmtp: support for portable media devices" - "loudmouth: backend needed by mp3tunes for syncing" - "ifuse: support for Apple iPod Touch and iPhone" - "libmygpo-qt: gpodder.net Internet Service") -install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - "toolbarfix.patch" - "amarok-2.5.0-ffmpeg-fixes.patch" - "contextviewfix.patch") -sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2' - 'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f' - '61193ccc48e9f99b4856eef27fe7a4aaf465feec' - 'a95e3bfb177adacc268552ae479dd88b70f5f9e1') - -build() { - cd "${srcdir}" - - patch -Np0 -i "${srcdir}"/toolbarfix.patch - patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch - - pushd ${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}"/contextviewfix.patch # FS#30448 - popd - - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package(){ - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/testing/amarok/amarok-2.5.0-ffmpeg-fixes.patch b/testing/amarok/amarok-2.5.0-ffmpeg-fixes.patch deleted file mode 100644 index 602fe47f5..000000000 --- a/testing/amarok/amarok-2.5.0-ffmpeg-fixes.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp ---- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07 16:12:22.000000000 +0300 -+++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp 2012-06-07 16:14:56.000000000 +0300 -@@ -136,7 +136,7 @@ MusicDNSAudioDecoder::run() - foreach( Meta::TrackPtr track, m_tracks ) - { - //TODO replace with "avformat_open_input" since av_open_input_file is deprecated -- if( av_open_input_file( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) ) -+ if( avformat_open_input( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, NULL ) ) - { - warning() << QLatin1String( "Unable to open input file: " ) + track->playableUrl().toLocalFile(); - continue; -@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run() - } - - --#include "MusicDNSAudioDecoder.moc" -\ No newline at end of file -+#include "MusicDNSAudioDecoder.moc" diff --git a/testing/amarok/amarok.install b/testing/amarok/amarok.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/testing/amarok/amarok.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/amarok/contextviewfix.patch b/testing/amarok/contextviewfix.patch deleted file mode 100644 index 2363b623c..000000000 --- a/testing/amarok/contextviewfix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp -index a23305f..8fa6f9b 100644 ---- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp -+++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp -@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry() - if(!view()) - return; - -- QRectF rect = view()->sceneRect(); -+ // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895 -+ QRectF rect( view()->pos(), view()->maximumViewportSize() ); - setGeometry( rect ); - m_applets->setGeometry( rect ); - m_applets->refresh();
\ No newline at end of file diff --git a/testing/amarok/toolbarfix.patch b/testing/amarok/toolbarfix.patch deleted file mode 100644 index ec012ca74..000000000 --- a/testing/amarok/toolbarfix.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp ---- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp 2011-12-15 08:36:48.000000000 +0100 -+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp 2012-01-29 20:20:01.901360205 +0100 -@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P - } - } - -+void Context::AppletToolbar::setContainment( Containment * containment ) -+{ -+ m_cont = containment; -+} -+ -+Context::Containment * -+Context::AppletToolbar::containment() const -+{ -+ return m_cont; -+} -+ - QSizeF - Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const - { -Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig -Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej -diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h ---- amarok-2.5.0/src/context/toolbar/AppletToolbar.h 2011-12-15 08:36:48.000000000 +0100 -+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h 2012-01-29 20:17:52.414686784 +0100 -@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi - - void appletRemoved( Plasma::Applet* applet ); - -+ void setContainment( Containment * containment ); -+ Containment* containment() const; -+ - signals: - void showApplet( Plasma::Applet* ); - void appletAddedToToolbar( Plasma::Applet* applet, int loc ); -Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig -diff -rup amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.new/src/context/ToolbarView.cpp ---- amarok-2.5.0/src/context/ToolbarView.cpp 2011-12-15 08:36:48.000000000 +0100 -+++ amarok-2.5.0.new/src/context/ToolbarView.cpp 2012-01-29 20:17:52.394686782 +0100 -@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm - setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); - - // now we create the toolbar -- m_toolbar = new AppletToolbar( containment ); -+ m_toolbar = new AppletToolbar(0); -+ scene->addItem(m_toolbar.data()); -+ m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) ); - m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 ); - m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 ); - -@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm - - Context::ToolbarView::~ToolbarView() - { -- -+ delete m_toolbar.data(); - } - - void -Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD deleted file mode 100644 index 4f540d839..000000000 --- a/testing/avidemux/PKGBUILD +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: PKGBUILD 163075 2012-07-06 16:17:06Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=avidemux -pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') -pkgver=2.5.6 -pkgrel=3 -arch=('i686' 'x86_64') -license=('GPL') -url="http://fixounet.free.fr/avidemux/" -makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \ - 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ - 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva') -options=('!makeflags') -source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) -sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5') - -build() { - cd "${srcdir}/${pkgbase}_${pkgver}" - mkdir build - cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. - make - -# plugin build expects libraries to be already installed; we fake a prefix -# in build/ by symlinking all libraries to build/lib/ - mkdir -p lib - cd lib - find ../avidemux -name '*.so*' | xargs ln -sft . - cd ../../plugins - mkdir build - cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \ - -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \ - -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \ - -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON .. - make -} - -package_avidemux-cli() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split)" - depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') - optdepends=('lame: for the corresponding audio encoder plugin' - 'faac: for the corresponding audio encoder plugin' - 'faad2: for the corresponding audio decoder plugin' - 'opencore-amr: for the corresponding audio decoder plugin' - 'jack: for the corresponding audio device plugin' - 'libpulse: for the corresponding audio device plugin' - 'sdl: for the corresponding audio device plugin' - 'x264: for the corresponding video encoder plugin' - 'xvidcore: for the corresponding video encoder plugin') - provides=('avidemux') - conflicts=('avidemux') - replaces=('avidemux') - - cd "${srcdir}/${pkgbase}_${pkgver}/build" - make DESTDIR="${pkgdir}" install - - cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build" - make DESTDIR="${pkgdir}" install - rm -r "${pkgdir}"/usr/share/avidemux - rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4} - rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so - rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so - - ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so" - ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so" - - install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" - install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" -} - -package_avidemux-gtk() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" - depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils') - install=avidemux.install - - cd "${srcdir}/${pkgbase}_${pkgver}" - install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk" - - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter - - install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" - install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" - - install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" - sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" -} - -package_avidemux-qt() { - pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt') - install=avidemux.install - - cd "${srcdir}/${pkgbase}_${pkgver}" - install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4" - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid} - install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter - - install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264" - install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid" - install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter" - - install -d "${pkgdir}/usr/share/avidemux/i18n" - install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n" - - install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" - sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" -} diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install deleted file mode 100644 index e111ef946..000000000 --- a/testing/avidemux/avidemux.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD deleted file mode 100644 index 8aaa5832b..000000000 --- a/testing/bash/PKGBUILD +++ /dev/null @@ -1,153 +0,0 @@ -# $Id: PKGBUILD 163211 2012-07-10 21:37:43Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> - -pkgname=bash -_basever=4.2 -_patchlevel=036 #prepare for some patches -pkgver=$_basever.$_patchlevel -pkgrel=1 -pkgdesc="The GNU Bourne Again shell" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/bash/bash.html" -groups=('base') -backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) -depends=('readline>=6.1' 'glibc') -provides=('sh') -install=bash.install -source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} - dot.bashrc - dot.bash_profile - dot.bash_logout - system.bashrc - system.bash_logout) -if [ $_patchlevel -gt 000 ]; then - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) - done -fi - -build() { - cd ${srcdir}/${pkgname}-$_basever - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" - patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) - done - - _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\' - -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\' - -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\' - -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\') - export CFLAGS="${CFLAGS} ${_bashconfig[@]}" - - ./configure --prefix=/usr --with-curses --enable-readline \ - --without-bash-malloc --with-installed-readline \ - --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info - make -} - -check() { - cd ${srcdir}/${pkgname}-$_basever - make check -} - -package() { - cd ${srcdir}/${pkgname}-$_basever - make DESTDIR=${pkgdir} install - - # for now, bash is our default /bin/sh - cd ${pkgdir}/bin - ln -s bash sh - - install -dm755 ${pkgdir}/etc/skel/ - - # system-wide configuration files - install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc - install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout - - # user configuration file skeletons - install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc - install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile - install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout -} - -md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' - '8d37a3f97a48c1e56e1a4ded877ed944' - '027d6bd8f5f6a06b75bb7698cb478089' - '2902e0fee7a9168f3a4fd2ccd60ff047' - '42f4400ed2314bd7519c020d0187edc5' - '3546099a1b2f667adc9794f52e78e35b' - '472f536d7c9e8250dc4568ec4cfaf294' - '1100bc1dda2cdc06ac44d7e5d17864a3' - 'a7184b76eb4a079f10174a0a8f574819' - '30e7948079921d3261efcc6a40722135' - 'c4d45307f7e69fe508ce347c4cec1955' - '9ea06decec43a198f3d7cf29acc602f8' - '74bddae6eeb9227a04a467d42597a34d' - 'fb48f6134d7b013135929476aa0c250c' - '3e6a18226b16c773229246abd07a1f5e' - 'e70e45de33426b38153b390be0dbbcd4' - 'e667dc9348ebc3e0e14bfdd87f4b6ff2' - 'ce4e5c484993705b27daa151eca242c2' - '41cbd8e57589bc081a546a014ddb12f8' - '88d1f96db29461767602e2546803bda7' - 'b8b781520f4c7493a2a1ac3010a44a44' - '24c574bf6d6a581e300823d9c1276af6' - '354a0899a7c4b446454c52546562b55b' - '4c5835f2fbab36c4292bb334977e5b6d' - 'ff4547ca7b508d52101729d61f5b77b6' - '0a51602b535ef661ee707be6c8bdb373' - 'cec7c92a4d8052ea4b29216365d16566' - '58deacf3d57cbd75575444ff6a3b0806' - '9ed2a08e549c3c17745f19e8413cfb31' - '72d5059820015231483bb7415d09e9db' - '45b04b41a4230f469d3e47ab9952c2df' - '608336ebe215984ef126e3c29d2d3409' - '623f63025d155a84977b62531e260ee2' - 'ed19da878e3f630834c62b9d9dcc6fce' - 'eef2dd4a0e4505dc8f8e664b40c6cd66' - '2d07daba0b8ca8f876d2aa052ff594b4' - '0cb823a44e6dc1cde7ac97ae5c8163c9' - '53d246537e1fffd1aaa02ba5c056211c' - '60f983a1dded5f0b28040ff4b3f1e9b5' - '304fd129a58fee2d8a34f8b4704db0aa' - '9df4bf4f46aaadc436f430187741f815' - '6921a0b4228fe89b6537a5c29f027c89' - '4ef0e2a2cbfbdd53346f927000b7e112' - '1195d85447f3d048d2c9bcd075fa765c' - 'b0f3a651ce29a1feee687d93177870f1' - 'b09000bba08da6ac753124593850cdf7' - '204bb5054d1f8bafe2b446d4e5d0d99a' - '09d3f96a16b881334cfaee0cf320b47e' - 'aab415350bcc2bb0c29943b413499d96' - '597bf71a2aac6feb510b7505cdd3d4f7' - 'b0db384bdedecafbdd70c8d22c56af5f' - '3fab459b4e09daea529cacad025b13b3' - 'bab99835ad6198cb1109fac89a085262' - '4ad8d11e72afc6090e701073ff034cf4' - '5658ef10c9d0d804126ec1ce700e4e2c' - 'c7d2493e44490f01dd20bdc8feb0a6a7' - 'e4855dbc4b743618b54d408bd5878637' - '9f19c199dd8d1fa9254eebe738759272' - '600c8e90c2fb13cdbc7aa3f18566df03' - 'a6ed82daf034587aee2f2581ba5fe829' - '821620a0389df723644911c56796ca8c' - 'da9265aa2527fd4a7481baa3e0550287' - '0043f8b75f46f43608a67b863e300fe8' - 'ec444d229e8899fbaaf6fc7de2d82ae6' - 'b632fca3a4943825bfaf3bd29df6b27d' - 'b4bc1c4dc1b508ff9cdfc44f1a5039b5' - '2ffa9a802bbd57540021715f84cc76f4' - '89390ff6a3c2ef7e09dd4b8b097a8e56' - '3e9b529ef3726b75d125d678de76977f' - 'eee08003395c417f677d1a4bf8c548ee' - 'f670f7672b11d0df8c31885dbf15f390' - '2fe070dd6d75d8ff16f269184a16e9c4' - '5018b6b7737808141043b57cf4eb842d' - '4e610506c1711bf3483b965800ac3d5d' - 'cb65e541f9b60a8cb1fe58404f264b73' - '7cd9bfdf7cbfd45274d07620ee94c8d9' - 'a7d2eace0da5fd236c93dbfd93458838' - '9c3142956064d175a880bcb186e51ef9' - 'a1a87649853f20fe99572ddc02b0c67f') diff --git a/testing/bash/bash.install b/testing/bash/bash.install deleted file mode 100644 index bc75e9b6a..000000000 --- a/testing/bash/bash.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(bash.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/bash/dot.bash_logout b/testing/bash/dot.bash_logout deleted file mode 100644 index 0e4e4f184..000000000 --- a/testing/bash/dot.bash_logout +++ /dev/null @@ -1,3 +0,0 @@ -# -# ~/.bash_logout -# diff --git a/testing/bash/dot.bash_profile b/testing/bash/dot.bash_profile deleted file mode 100644 index 5545f007e..000000000 --- a/testing/bash/dot.bash_profile +++ /dev/null @@ -1,5 +0,0 @@ -# -# ~/.bash_profile -# - -[[ -f ~/.bashrc ]] && . ~/.bashrc diff --git a/testing/bash/dot.bashrc b/testing/bash/dot.bashrc deleted file mode 100644 index a355b0cd3..000000000 --- a/testing/bash/dot.bashrc +++ /dev/null @@ -1,9 +0,0 @@ -# -# ~/.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' diff --git a/testing/bash/system.bash_logout b/testing/bash/system.bash_logout deleted file mode 100644 index a76e48e4a..000000000 --- a/testing/bash/system.bash_logout +++ /dev/null @@ -1,3 +0,0 @@ -# -# /etc/bash.bash_logout -# diff --git a/testing/bash/system.bashrc b/testing/bash/system.bashrc deleted file mode 100644 index a2231e861..000000000 --- a/testing/bash/system.bashrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# /etc/bash.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -PS1='[\u@\h \W]\$ ' -PS2='> ' -PS3='> ' -PS4='+ ' - -case ${TERM} in - xterm*|rxvt*|Eterm|aterm|kterm|gnome*) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' - - ;; - screen) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' - ;; -esac - -[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD deleted file mode 100644 index 0804c5a02..000000000 --- a/testing/binutils/PKGBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# $Id: PKGBUILD 163227 2012-07-11 12:24:16Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils -pkgver=2.22 -pkgrel=9 -_date=20120323 -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('base-devel') -depends=('glibc>=2.16' 'zlib') -checkdepends=('dejagnu') -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('de2ac4298732827f8af706fc24020330') - -mksource() { - mkdir ${pkgname}-${_date} - cd ${pkgname}-${_date} - export _TAG=binutils-2_22-branch - export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' - cvs -z9 co -r $_TAG binutils || return 1 - mv src binutils - tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* -} - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - - ${srcdir}/binutils/configure --prefix=/usr \ - --with-lib-path=/usr/lib:/usr/local/lib \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared $CONFIGFLAG - - # check the host environment and makes sure all the necessary tools are available - make configure-host - - make tooldir=${pkgdir}/usr - - # Rebuild libiberty.a with -fPIC - cp -a libiberty libiberty-pic - make -C libiberty-pic clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic - - # Rebuild libbfd.a with -fPIC - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - cp -a bfd bfd-pic - make -C bfd-pic clean - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic - - # Rebuild libopcodes.a with -fPIC - cp -a opcodes opcodes-pic - make -C opcodes-pic clean - make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror) - make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \ - CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # install libraries rebuilt with -fPIC - install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib - install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib - install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/testing/binutils/binutils.install b/testing/binutils/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/testing/binutils/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/testing/bitlbee/PKGBUILD b/testing/bitlbee/PKGBUILD deleted file mode 100644 index ecf6dd549..000000000 --- a/testing/bitlbee/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 163025 2012-07-05 23:25:55Z dreisner $ - -# Contributor: FUBAR <mrfubar@gmail.com> -# Contributor: simo <simo@archlinux.org> -# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Gaetan Bisson <bisson@archlinux.org> -# Maintainer: Dave Reisner <dreisner@archlinux.org> - -pkgname=bitlbee -pkgver=3.0.5 -pkgrel=4 -pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' -url='http://www.bitlbee.org/' -license=('GPL') -arch=('i686' 'x86_64') -depends=('openssl' 'glib2') -makedepends=('asciidoc' 'libotr') -optdepends=('skype4py: to use skyped' - 'libotr: for OTR encryption support' - 'xinetd: to run bitlbee through xinetd') -source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" - 'sbindir.patch' - 'xinetd' - 'rc.d' - 'bitlbee.tmpfiles') -sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6' - '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c' - '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' - '02423c500ac64f673ba26a3395c7c7036c17343e' - '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') -backup=('etc/bitlbee/bitlbee.conf' - 'etc/bitlbee/motd.txt' - 'etc/xinetd.d/bitlbee') -install=bitlbee.install - -build() { - cd "$pkgname-$pkgver" - - patch -p1 -i ../sbindir.patch - - ./configure \ - --prefix=/usr \ - --etcdir=/etc/bitlbee \ - --pidfile=/run/bitlbee/bitlbee.pid \ - --ipcsocket=/run/bitlbee/bitlbee.sock \ - --systemdsystemunitdir=/usr/lib/systemd/system \ - --ssl=openssl \ - --strip=0 \ - --otr=plugin \ - --skype=plugin - - make -} - -package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev} - - 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" - install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" -} diff --git a/testing/bitlbee/bitlbee.install b/testing/bitlbee/bitlbee.install deleted file mode 100644 index aa5a81a70..000000000 --- a/testing/bitlbee/bitlbee.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - 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 - systemd-tmpfiles --create bitlbee.conf -} - -post_upgrade() { - post_install -} - -post_remove() { - getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null - getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null - true -} diff --git a/testing/bitlbee/bitlbee.tmpfiles b/testing/bitlbee/bitlbee.tmpfiles deleted file mode 100644 index da72a0a79..000000000 --- a/testing/bitlbee/bitlbee.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/bitlbee 0755 bitlbee bitlbee - - diff --git a/testing/bitlbee/rc.d b/testing/bitlbee/rc.d deleted file mode 100644 index ade85221a..000000000 --- a/testing/bitlbee/rc.d +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -pidfile=/run/bitlbee/bitlbee.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 bitlbee daemon" - if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then - stat_fail - exit 1 - else - add_daemon bitlbee - stat_done - fi - ;; - stop) - stat_busy "Stopping bitlbee daemon" - if [[ -z $PID ]] || ! kill $PID &>/dev/null; then - stat_fail - exit 1 - else - rm -f "$pidfile" - rm_daemon bitlbee - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - -# vim: set ft=sh et ts=2 sw=2: diff --git a/testing/bitlbee/sbindir.patch b/testing/bitlbee/sbindir.patch deleted file mode 100644 index 7640508f7..000000000 --- a/testing/bitlbee/sbindir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -aur old/Makefile new/Makefile ---- old/Makefile 2012-02-18 21:55:09.000000000 +1100 -+++ new/Makefile 2012-02-20 18:28:08.716130584 +1100 -@@ -135,8 +135,8 @@ - - systemd: - ifdef SYSTEMDSYSTEMUNITDIR -- sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service -- sed 's|@sbindir@|$(BINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service -+ sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service -+ sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service - endif - - install-systemd: diff --git a/testing/bitlbee/xinetd b/testing/bitlbee/xinetd deleted file mode 100644 index d671a8cfc..000000000 --- a/testing/bitlbee/xinetd +++ /dev/null @@ -1,12 +0,0 @@ -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/dialog/PKGBUILD b/testing/dialog/PKGBUILD deleted file mode 100644 index f324a31f4..000000000 --- a/testing/dialog/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 163091 2012-07-06 20:37:15Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=dialog -pkgver=1.1_20120706 -pkgrel=1 -pkgdesc="A tool to display dialog boxes from shell scripts" -arch=('i686' 'x86_64') -url="http://invisible-island.net/dialog/" -license=('LGPL2.1') -depends=('ncurses') -source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -sha1sums=('fa033f0fb166da86e29d70e68159a92a9b9cdb84') - -build() { - cd "${srcdir}/$pkgname-${pkgver/_/-}" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-ncursesw --enable-nls - make -} - -package() { - cd "${srcdir}/$pkgname-${pkgver/_/-}" - make DESTDIR="${pkgdir}" install install-lib -} diff --git a/testing/eclipse/PKGBUILD b/testing/eclipse/PKGBUILD deleted file mode 100644 index 22b3840a0..000000000 --- a/testing/eclipse/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 163177 2012-07-08 12:52:55Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Paul Mattal <paul@archlinux.org> -# Contributor: Andrew Wright <andreww@photism.org> -# Contributor: Andreas W. Hauser <andy-aur@splashground.de> -# Contributor: Marco Crosio <marco.crosio@gmail.com> - -pkgname=eclipse -pkgver=4.2 -pkgrel=1 -_date=201206081400 -pkgdesc="An IDE for Java and other languages" -arch=('i686' 'x86_64') -url="http://eclipse.org" -depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst') -install=${pkgname}.install -makedepends=('zip') -conflicts=('xulrunner') -license=("EPL/1.1") -source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz" - 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg') -md5sums=('506b9f4e3919ebe3d6a717cd9bef5e07' - '7ea99a30fbaf06ec29261541b8eb1e23' - 'ba8a37e30a7ebd69774cec87c69e8c44' - '77cff7543ccf7e177cb6667f5a20ce19') -[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz" -[ "$CARCH" = "x86_64" ] && md5sums[0]='804938dd087c310d8bfd54c8024afbbd' - -package() { - # install eclipse - install -m755 -d "$pkgdir/usr/share" - mv eclipse "$pkgdir/usr/share/" - - # install misc - install -d $pkgdir/usr/bin $pkgdir/usr/share/applications \ - $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps - install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse" - install -m644 eclipse.desktop "$pkgdir/usr/share/applications/" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse.png \ - "$pkgdir/usr/share/icons/hicolor/16x16/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse32.png \ - "$pkgdir/usr/share/icons/hicolor/32x32/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse48.png \ - "$pkgdir/usr/share/icons/hicolor/48x48/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse256.png \ - "$pkgdir/usr/share/icons/hicolor/256x256/apps/eclipse.png" - - # install icon - install -Dm644 "$srcdir"/eclipse.svg \ - "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg - sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/bin/runant.py -} diff --git a/testing/eclipse/eclipse.desktop b/testing/eclipse/eclipse.desktop deleted file mode 100644 index 5b210c81e..000000000 --- a/testing/eclipse/eclipse.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Eclipse -Comment=A Java Development Environment -Icon=eclipse -Exec=eclipse -Terminal=false -Type=Application -Categories=Development;IDE;Java -StartupNotify=true diff --git a/testing/eclipse/eclipse.install b/testing/eclipse/eclipse.install deleted file mode 100644 index a2930a4ff..000000000 --- a/testing/eclipse/eclipse.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/eclipse/eclipse.sh b/testing/eclipse/eclipse.sh deleted file mode 100644 index 498d7fefb..000000000 --- a/testing/eclipse/eclipse.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -export ECLIPSE_HOME=/usr/share/eclipse -export GDK_NATIVE_WINDOWS=true -${ECLIPSE_HOME}/eclipse "$@" diff --git a/testing/eclipse/eclipse.svg b/testing/eclipse/eclipse.svg deleted file mode 100644 index 56316be9e..000000000 --- a/testing/eclipse/eclipse.svg +++ /dev/null @@ -1,1623 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="svg2254" - sodipodi:version="0.32" - inkscape:version="0.45.1" - width="48" - height="48" - version="1.0" - sodipodi:docbase="/home/matt/eclipse33" - sodipodi:docname="eclipse-icon-clean.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/matt/eclipse33/eclipse-icon-ubuntu.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <metadata - id="metadata2259"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <defs - id="defs2257"> - <linearGradient - id="linearGradient4373"> - <stop - style="stop-color:#8ea6d6;stop-opacity:0.73762375;" - offset="0" - id="stop4375" /> - <stop - style="stop-color:#bbc9e6;stop-opacity:1;" - offset="1" - id="stop4377" /> - </linearGradient> - <linearGradient - id="linearGradient4035"> - <stop - style="stop-color:#7474bb;stop-opacity:1;" - offset="0" - id="stop4037" /> - <stop - style="stop-color:#070553;stop-opacity:1;" - offset="1" - id="stop4039" /> - </linearGradient> - <linearGradient - id="linearGradient4003"> - <stop - style="stop-color:#494991;stop-opacity:1;" - offset="0" - id="stop4005" /> - <stop - style="stop-color:#695ae8;stop-opacity:1;" - offset="1" - id="stop4007" /> - </linearGradient> - <linearGradient - id="linearGradient3987"> - <stop - style="stop-color:#414083;stop-opacity:1;" - offset="0" - id="stop3989" /> - <stop - style="stop-color:#5649b9;stop-opacity:1;" - offset="1" - id="stop3991" /> - </linearGradient> - <linearGradient - id="XMLID_8_" - gradientUnits="userSpaceOnUse" - x1="36.2495" - y1="18.1187" - x2="92.7495" - y2="18.1187" - gradientTransform="translate(-142.55625,-33.100248)"> - <stop - offset="0" - style="stop-color:#FEE8BD" - id="stop264" /> - <stop - offset="0.0483" - style="stop-color:#FEEBC6" - id="stop266" /> - <stop - offset="0.2334" - style="stop-color:#FFF6E5" - id="stop268" /> - <stop - offset="0.3905" - style="stop-color:#FFFDF8" - id="stop270" /> - <stop - offset="0.5" - style="stop-color:#FFFFFF" - id="stop272" /> - <stop - offset="0.6094" - style="stop-color:#FFFDF9" - id="stop274" /> - <stop - offset="0.7588" - style="stop-color:#FFF7E7" - id="stop276" /> - <stop - offset="0.9306" - style="stop-color:#FEEDCB" - id="stop278" /> - <stop - offset="1" - style="stop-color:#FEE8BD" - id="stop280" /> - </linearGradient> - <linearGradient - id="XMLID_7_" - gradientUnits="userSpaceOnUse" - x1="45.416" - y1="107.0176" - x2="83.3354" - y2="107.0176" - gradientTransform="translate(-142.55625,-33.100248)"> - <stop - offset="0" - style="stop-color:#A86E45" - id="stop205" /> - <stop - offset="0.1124" - style="stop-color:#E8A06C" - id="stop207" /> - <stop - offset="0.1609" - style="stop-color:#E59E6B" - id="stop209" /> - <stop - offset="0.2012" - style="stop-color:#DA9969" - id="stop211" /> - <stop - offset="0.2387" - style="stop-color:#C99066" - id="stop213" /> - <stop - offset="0.2743" - style="stop-color:#B18461" - id="stop215" /> - <stop - offset="0.3084" - style="stop-color:#92745A" - id="stop217" /> - <stop - offset="0.3315" - style="stop-color:#786755" - id="stop219" /> - <stop - offset="0.4068" - style="stop-color:#B5ACA2" - id="stop221" /> - <stop - offset="0.478" - style="stop-color:#EAE8E5" - id="stop223" /> - <stop - offset="0.5112" - style="stop-color:#FFFFFF" - id="stop225" /> - <stop - offset="0.5376" - style="stop-color:#FDFCFC" - id="stop227" /> - <stop - offset="0.5589" - style="stop-color:#F5F3F2" - id="stop229" /> - <stop - offset="0.5783" - style="stop-color:#E8E4E1" - id="stop231" /> - <stop - offset="0.5966" - style="stop-color:#D6CEC9" - id="stop233" /> - <stop - offset="0.6142" - style="stop-color:#BFB3AA" - id="stop235" /> - <stop - offset="0.6312" - style="stop-color:#A39185" - id="stop237" /> - <stop - offset="0.6475" - style="stop-color:#816959" - id="stop239" /> - <stop - offset="0.6517" - style="stop-color:#785E4C" - id="stop241" /> - <stop - offset="0.671" - style="stop-color:#83654F" - id="stop243" /> - <stop - offset="0.7414" - style="stop-color:#A87958" - id="stop245" /> - <stop - offset="0.807" - style="stop-color:#C3895F" - id="stop247" /> - <stop - offset="0.8652" - style="stop-color:#D39263" - id="stop249" /> - <stop - offset="0.9101" - style="stop-color:#D99564" - id="stop251" /> - <stop - offset="0.9278" - style="stop-color:#C48557" - id="stop253" /> - <stop - offset="0.9557" - style="stop-color:#AA7045" - id="stop255" /> - <stop - offset="0.9807" - style="stop-color:#9A633B" - id="stop257" /> - <stop - offset="1" - style="stop-color:#945F37" - id="stop259" /> - </linearGradient> - <linearGradient - id="XMLID_6_" - gradientUnits="userSpaceOnUse" - x1="-34.5078" - y1="-100.6235" - x2="-20.9253" - y2="-100.6235" - gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)"> - <stop - offset="0" - style="stop-color:#A86E45" - id="stop146" /> - <stop - offset="0.1124" - style="stop-color:#E8A06C" - id="stop148" /> - <stop - offset="0.1609" - style="stop-color:#E59E6B" - id="stop150" /> - <stop - offset="0.2012" - style="stop-color:#DA9969" - id="stop152" /> - <stop - offset="0.2387" - style="stop-color:#C99066" - id="stop154" /> - <stop - offset="0.2743" - style="stop-color:#B18461" - id="stop156" /> - <stop - offset="0.3084" - style="stop-color:#92745A" - id="stop158" /> - <stop - offset="0.3315" - style="stop-color:#786755" - id="stop160" /> - <stop - offset="0.4068" - style="stop-color:#B5ACA2" - id="stop162" /> - <stop - offset="0.478" - style="stop-color:#EAE8E5" - id="stop164" /> - <stop - offset="0.5112" - style="stop-color:#FFFFFF" - id="stop166" /> - <stop - offset="0.5376" - style="stop-color:#FDFCFC" - id="stop168" /> - <stop - offset="0.5589" - style="stop-color:#F5F3F2" - id="stop170" /> - <stop - offset="0.5783" - style="stop-color:#E8E4E1" - id="stop172" /> - <stop - offset="0.5966" - style="stop-color:#D6CEC9" - id="stop174" /> - <stop - offset="0.6142" - style="stop-color:#BFB3AA" - id="stop176" /> - <stop - offset="0.6312" - style="stop-color:#A39185" - id="stop178" /> - <stop - offset="0.6475" - style="stop-color:#816959" - id="stop180" /> - <stop - offset="0.6517" - style="stop-color:#785E4C" - id="stop182" /> - <stop - offset="0.671" - style="stop-color:#83654F" - id="stop184" /> - <stop - offset="0.7414" - style="stop-color:#A87958" - id="stop186" /> - <stop - offset="0.807" - style="stop-color:#C3895F" - id="stop188" /> - <stop - offset="0.8652" - style="stop-color:#D39263" - id="stop190" /> - <stop - offset="0.9101" - style="stop-color:#D99564" - id="stop192" /> - <stop - offset="0.9278" - style="stop-color:#C48557" - id="stop194" /> - <stop - offset="0.9557" - style="stop-color:#AA7045" - id="stop196" /> - <stop - offset="0.9807" - style="stop-color:#9A633B" - id="stop198" /> - <stop - offset="1" - style="stop-color:#945F37" - id="stop200" /> - </linearGradient> - <linearGradient - id="XMLID_5_" - gradientUnits="userSpaceOnUse" - x1="44.7505" - y1="94.7715" - x2="83.3739" - y2="89.1356" - gradientTransform="translate(-142.55625,-33.100248)"> - <stop - offset="0" - style="stop-color:#A86E45" - id="stop87" /> - <stop - offset="0.1124" - style="stop-color:#E8A06C" - id="stop89" /> - <stop - offset="0.1609" - style="stop-color:#E59E6B" - id="stop91" /> - <stop - offset="0.2012" - style="stop-color:#DA9969" - id="stop93" /> - <stop - offset="0.2387" - style="stop-color:#C99066" - id="stop95" /> - <stop - offset="0.2743" - style="stop-color:#B18461" - id="stop97" /> - <stop - offset="0.3084" - style="stop-color:#92745A" - id="stop99" /> - <stop - offset="0.3315" - style="stop-color:#786755" - id="stop101" /> - <stop - offset="0.4068" - style="stop-color:#B5ACA2" - id="stop103" /> - <stop - offset="0.478" - style="stop-color:#EAE8E5" - id="stop105" /> - <stop - offset="0.5112" - style="stop-color:#FFFFFF" - id="stop107" /> - <stop - offset="0.5376" - style="stop-color:#FDFCFC" - id="stop109" /> - <stop - offset="0.5589" - style="stop-color:#F5F3F2" - id="stop111" /> - <stop - offset="0.5783" - style="stop-color:#E8E4E1" - id="stop113" /> - <stop - offset="0.5966" - style="stop-color:#D6CEC9" - id="stop115" /> - <stop - offset="0.6142" - style="stop-color:#BFB3AA" - id="stop117" /> - <stop - offset="0.6312" - style="stop-color:#A39185" - id="stop119" /> - <stop - offset="0.6475" - style="stop-color:#816959" - id="stop121" /> - <stop - offset="0.6517" - style="stop-color:#785E4C" - id="stop123" /> - <stop - offset="0.671" - style="stop-color:#83654F" - id="stop125" /> - <stop - offset="0.7414" - style="stop-color:#A87958" - id="stop127" /> - <stop - offset="0.807" - style="stop-color:#C3895F" - id="stop129" /> - <stop - offset="0.8652" - style="stop-color:#D39263" - id="stop131" /> - <stop - offset="0.9101" - style="stop-color:#D99564" - id="stop133" /> - <stop - offset="0.9278" - style="stop-color:#C48557" - id="stop135" /> - <stop - offset="0.9557" - style="stop-color:#AA7045" - id="stop137" /> - <stop - offset="0.9807" - style="stop-color:#9A633B" - id="stop139" /> - <stop - offset="1" - style="stop-color:#945F37" - id="stop141" /> - </linearGradient> - <linearGradient - id="XMLID_2_" - gradientUnits="userSpaceOnUse" - x1="44.8901" - y1="95.7324" - x2="83.5847" - y2="90.0861" - gradientTransform="translate(-142.55625,-33.100248)"> - <stop - offset="0" - style="stop-color:#A86E45" - id="stop60" /> - <stop - offset="0.5787" - style="stop-color:#785E4C" - id="stop62" /> - <stop - offset="1" - style="stop-color:#945F37" - id="stop64" /> - </linearGradient> - <linearGradient - id="XMLID_1_" - gradientUnits="userSpaceOnUse" - x1="47.9995" - y1="100.5" - x2="81.9995" - y2="100.5" - gradientTransform="translate(-142.55625,-33.100248)"> - <stop - offset="0.0056" - style="stop-color:#9C6137" - id="stop47" /> - <stop - offset="0.1685" - style="stop-color:#C98452" - id="stop49" /> - <stop - offset="0.5337" - style="stop-color:#CD8D5F" - id="stop51" /> - <stop - offset="0.809" - style="stop-color:#C47D4A" - id="stop53" /> - <stop - offset="1" - style="stop-color:#9C6137" - id="stop55" /> - </linearGradient> - <radialGradient - id="light_1_" - cx="-27.6724" - cy="-109.9067" - r="9" - gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0.264" - style="stop-color:#FFFFFF;" - id="stop37" /> - <stop - offset="2.5" - style="stop-color:#FFF18F;stop-opacity:0" - id="stop39" /> - </radialGradient> - <radialGradient - id="XMLID_10_" - cx="-27.6128" - cy="-86.5356" - r="6.2114" - gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)" - gradientUnits="userSpaceOnUse"> - <stop - offset="0.3427" - style="stop-color:#FFFFFF" - id="stop8" /> - <stop - offset="0.3754" - style="stop-color:#ECECEC" - id="stop10" /> - <stop - offset="0.4665" - style="stop-color:#BCBCBC" - id="stop12" /> - <stop - offset="0.5531" - style="stop-color:#979797" - id="stop14" /> - <stop - offset="0.6331" - style="stop-color:#7C7C7C" - id="stop16" /> - <stop - offset="0.704" - style="stop-color:#6C6C6C" - id="stop18" /> - <stop - offset="0.7584" - style="stop-color:#666666" - id="stop20" /> - </radialGradient> - <linearGradient - id="XMLID_4_" - gradientUnits="userSpaceOnUse" - x1="37.6743" - y1="25.6035" - x2="37.6743" - y2="47.5006" - gradientTransform="translate(-2.6725931e-2,-44.465488)"> - <stop - offset="0" - style="stop-color:#FCB462" - id="stop40" /> - <stop - offset="1" - style="stop-color:#FCAF55" - id="stop42" /> - </linearGradient> - <linearGradient - id="XMLID_3_" - gradientUnits="userSpaceOnUse" - x1="75.5039" - y1="11.96" - x2="85.5969" - y2="36.3307" - gradientTransform="translate(-2.6725931e-2,-44.465488)"> - <stop - offset="0" - style="stop-color:#F99D77" - id="stop33" /> - <stop - offset="1" - style="stop-color:#F7804E" - id="stop35" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4035" - id="linearGradient4041" - x1="-43.03101" - y1="8.6383018" - x2="-15.677965" - y2="37.492428" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4035" - id="linearGradient4189" - gradientUnits="userSpaceOnUse" - x1="-43.03101" - y1="8.6383018" - x2="-15.677965" - y2="37.492428" /> - <mask - maskUnits="userSpaceOnUse" - id="mask4181"> - <g - id="g4183" - transform="matrix(0.7925926,0,0,0.8907563,4.6132029,-3.2693226)"> - <path - transform="translate(-15.844752,8.8397036)" - d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" - sodipodi:ry="20.014421" - sodipodi:rx="20.014421" - sodipodi:cy="23.982693" - sodipodi:cx="-30.021633" - id="path4185" - style="opacity:1;fill:#c88cbb;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - sodipodi:type="arc" /> - <path - transform="translate(-13.843309,8.8397036)" - d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" - sodipodi:ry="20.014421" - sodipodi:rx="20.014421" - sodipodi:cy="23.982693" - sodipodi:cx="-30.021633" - id="path4187" - style="opacity:1;fill:url(#linearGradient4189);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - sodipodi:type="arc" /> - </g> - </mask> - <filter - inkscape:collect="always" - x="-0.42083731" - width="1.8416746" - y="-0.42480746" - height="1.8496149" - id="filter4267"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.12931" - id="feGaussianBlur4269" /> - </filter> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4035" - id="linearGradient4301" - gradientUnits="userSpaceOnUse" - x1="-43.03101" - y1="8.6383018" - x2="-15.677965" - y2="37.492428" /> - <mask - maskUnits="userSpaceOnUse" - id="mask4297"> - <path - sodipodi:type="arc" - style="opacity:1;fill:url(#linearGradient4301);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="path4299" - sodipodi:cx="-30.021633" - sodipodi:cy="23.982693" - sodipodi:rx="20.014421" - sodipodi:ry="20.014421" - d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" - transform="translate(3.5679857,1.3974438)" /> - </mask> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4003" - id="linearGradient4368" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9683099,0,0,0.9683099,47.162254,-1.0174889)" - x1="-47.534256" - y1="2.9675496" - x2="-0.16679382" - y2="49.50108" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4003" - id="linearGradient4371" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0105249,0,0,1.0105249,3.4549308e-2,-50.022066)" - x1="-47.534256" - y1="2.9675496" - x2="-0.16679382" - y2="49.50108" /> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath4423"> - <path - transform="translate(4.9557997,-4.7430601e-2)" - d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" - sodipodi:ry="20.014421" - sodipodi:rx="20.014421" - sodipodi:cy="23.982693" - sodipodi:cx="-30.021633" - id="path4425" - style="opacity:1;fill:url(#linearGradient4427);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - sodipodi:type="arc" /> - </clipPath> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4035" - id="linearGradient4427" - gradientUnits="userSpaceOnUse" - x1="-43.03101" - y1="8.6383018" - x2="-15.677965" - y2="37.492428" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4373" - id="linearGradient4429" - gradientUnits="userSpaceOnUse" - x1="-46.468069" - y1="19.312662" - x2="-6.439226" - y2="19.312662" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4373" - id="linearGradient4431" - gradientUnits="userSpaceOnUse" - x1="-46.468067" - y1="22.481251" - x2="-6.4392262" - y2="22.481251" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4373" - id="linearGradient4433" - gradientUnits="userSpaceOnUse" - x1="-46.468067" - y1="25.482334" - x2="-6.4392262" - y2="25.482334" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4373" - id="linearGradient4435" - gradientUnits="userSpaceOnUse" - x1="-46.468067" - y1="28.481611" - x2="-6.4392262" - y2="28.481611" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_10_" - id="radialGradient4753" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)" - cx="-27.6128" - cy="-86.5356" - r="6.2114" /> - <radialGradient - inkscape:collect="always" - xlink:href="#light_1_" - id="radialGradient4755" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)" - cx="-27.6724" - cy="-109.9067" - r="9" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_1_" - id="linearGradient4757" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-142.55625,-33.100248)" - x1="47.9995" - y1="100.5" - x2="81.9995" - y2="100.5" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_2_" - id="linearGradient4759" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-142.55625,-33.100248)" - x1="44.8901" - y1="95.7324" - x2="83.5847" - y2="90.0861" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_3_" - id="linearGradient4761" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-2.6725931e-2,-44.465488)" - x1="75.5039" - y1="11.96" - x2="85.5969" - y2="36.3307" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient4763" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-2.6725931e-2,-44.465488)" - x1="37.6743" - y1="25.6035" - x2="37.6743" - y2="47.5006" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_5_" - id="linearGradient4765" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-142.55625,-33.100248)" - x1="44.7505" - y1="94.7715" - x2="83.3739" - y2="89.1356" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_6_" - id="linearGradient4767" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)" - x1="-34.5078" - y1="-100.6235" - x2="-20.9253" - y2="-100.6235" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_7_" - id="linearGradient4769" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-142.55625,-33.100248)" - x1="45.416" - y1="107.0176" - x2="83.3354" - y2="107.0176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_8_" - id="linearGradient4771" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-142.55625,-33.100248)" - x1="36.2495" - y1="18.1187" - x2="92.7495" - y2="18.1187" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_10_" - id="radialGradient4817" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)" - cx="-27.6128" - cy="-86.5356" - r="6.2114" /> - <radialGradient - inkscape:collect="always" - xlink:href="#light_1_" - id="radialGradient4819" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)" - cx="-27.6724" - cy="-109.9067" - r="9" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_1_" - id="linearGradient4821" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-142.55625,-33.100248)" - x1="47.9995" - y1="100.5" - x2="81.9995" - y2="100.5" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_2_" - id="linearGradient4823" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-142.55625,-33.100248)" - x1="44.8901" - y1="95.7324" - x2="83.5847" - y2="90.0861" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_3_" - id="linearGradient4825" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-2.6725931e-2,-44.465488)" - x1="75.5039" - y1="11.96" - x2="85.5969" - y2="36.3307" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient4827" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-2.6725931e-2,-44.465488)" - x1="37.6743" - y1="25.6035" - x2="37.6743" - y2="47.5006" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_5_" - id="linearGradient4829" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-142.55625,-33.100248)" - x1="44.7505" - y1="94.7715" - x2="83.3739" - y2="89.1356" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_6_" - id="linearGradient4831" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)" - x1="-34.5078" - y1="-100.6235" - x2="-20.9253" - y2="-100.6235" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_7_" - id="linearGradient4833" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-142.55625,-33.100248)" - x1="45.416" - y1="107.0176" - x2="83.3354" - y2="107.0176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_8_" - id="linearGradient4835" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-142.55625,-33.100248)" - x1="36.2495" - y1="18.1187" - x2="92.7495" - y2="18.1187" /> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath7503"> - <g - id="g7505" - transform="matrix(7.4511206,0,0,7.4511206,305.77432,266.76067)"> - <path - id="path7507" - d="M -29.775161,-22.982238 C -29.796903,-23.107991 -29.878636,-23.210123 -29.986136,-23.268906 L -29.986136,-23.560406 C -29.836092,-23.636636 -29.745233,-23.799162 -29.775161,-23.971619 C -29.797037,-24.097641 -29.879038,-24.200041 -29.986942,-24.25869 C -29.991505,-24.402695 -30.109876,-24.519188 -30.254687,-24.519188 L -34.370443,-24.519188 C -34.518072,-24.519188 -34.638859,-24.398401 -34.638859,-24.250772 L -34.638859,-23.677033 L -34.648925,-23.675691 C -34.872381,-23.643481 -35.024305,-23.439619 -34.986727,-23.22247 C -34.956396,-23.047329 -34.811048,-22.917013 -34.638994,-22.889232 L -34.638994,-22.687786 L -34.649059,-22.686175 C -34.872516,-22.654234 -35.024439,-22.450237 -34.986861,-22.233223 C -34.95653,-22.058082 -34.811182,-21.927632 -34.639128,-21.89985 L -34.639128,-21.69827 L -34.649193,-21.696928 C -34.87265,-21.664718 -35.024573,-21.460856 -34.986995,-21.243708 C -34.954785,-21.057829 -34.793199,-20.921072 -34.607186,-20.905503 C -34.562092,-20.820281 -34.473381,-20.761364 -34.370846,-20.761364 L -34.129003,-20.761364 C -33.83294,-20.026441 -33.162303,-19.419284 -32.381347,-19.419284 C -31.600256,-19.419284 -30.929753,-20.026441 -30.63369,-20.761364 L -30.255089,-20.761364 C -30.10746,-20.761364 -29.986673,-20.882151 -29.986673,-21.02978 L -29.986673,-21.581509 C -29.836629,-21.657739 -29.74577,-21.820265 -29.775698,-21.992722 C -29.79744,-22.118475 -29.879173,-22.220608 -29.986673,-22.279391 L -29.986673,-22.570756 C -29.836226,-22.647121 -29.745367,-22.809781 -29.775161,-22.982238 z " - style="opacity:0.2;fill:#141414" /> - <path - id="path7509" - d="M -29.775161,-22.84803 C -29.796903,-22.973783 -29.878636,-23.075915 -29.986136,-23.134698 L -29.986136,-23.426198 C -29.836092,-23.502428 -29.745233,-23.664954 -29.775161,-23.837411 C -29.797037,-23.963433 -29.879038,-24.065833 -29.986942,-24.124482 C -29.991505,-24.268487 -30.109876,-24.38498 -30.254687,-24.38498 L -34.370443,-24.38498 C -34.518072,-24.38498 -34.638859,-24.264193 -34.638859,-24.116564 L -34.638859,-23.542825 L -34.648925,-23.541483 C -34.872381,-23.509273 -35.024305,-23.305411 -34.986727,-23.088262 C -34.956396,-22.913121 -34.811048,-22.782805 -34.638994,-22.755024 L -34.638994,-22.553578 L -34.649059,-22.551967 C -34.872516,-22.520026 -35.024439,-22.316029 -34.986861,-22.099015 C -34.95653,-21.923874 -34.811182,-21.793424 -34.639128,-21.765642 L -34.639128,-21.564062 L -34.649193,-21.56272 C -34.87265,-21.53051 -35.024573,-21.326648 -34.986995,-21.1095 C -34.954785,-20.923621 -34.793199,-20.786864 -34.607186,-20.771295 C -34.562092,-20.686073 -34.473381,-20.627156 -34.370846,-20.627156 L -34.129003,-20.627156 C -33.83294,-19.892233 -33.162303,-19.285076 -32.381347,-19.285076 C -31.600256,-19.285076 -30.929753,-19.892233 -30.63369,-20.627156 L -30.255089,-20.627156 C -30.10746,-20.627156 -29.986673,-20.747943 -29.986673,-20.895572 L -29.986673,-21.447301 C -29.836629,-21.523531 -29.74577,-21.686057 -29.775698,-21.858514 C -29.79744,-21.984267 -29.879173,-22.0864 -29.986673,-22.145183 L -29.986673,-22.436548 C -29.836226,-22.512913 -29.745367,-22.675573 -29.775161,-22.84803 z " - style="opacity:0.2;fill:#141414" /> - <path - id="path7511" - d="M -30.507669,-21.694512 C -30.507669,-20.66044 -31.346469,-19.553492 -32.381078,-19.553492 C -33.415553,-19.553492 -34.254353,-20.66044 -34.254353,-21.694512 C -34.254353,-22.728719 -33.415553,-23.298835 -32.381078,-23.298835 C -31.346469,-23.298835 -30.507669,-22.728719 -30.507669,-21.694512 z " - style="fill:url(#radialGradient7547)" /> - <path - id="path7513" - d="M -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.031465 -27.884976,-30.452926 C -27.884976,-27.874388 -30.519882,-25.378656 -30.519882,-24.634607 L -34.242141,-24.634607 C -34.242141,-25.557018 -36.876912,-27.874388 -36.876912,-30.452926 C -36.876912,-33.031465 -34.86406,-35.12162 -32.380944,-35.12162 z " - style="opacity:0.4;fill:#ffbf61" /> - <path - id="path7515" - d="M -32.380944,-35.926868 C -35.304128,-35.926868 -37.68216,-33.482538 -37.68216,-30.477889 C -37.68216,-28.627429 -36.56045,-26.960163 -35.741378,-25.742494 C -35.544227,-25.449384 -35.083893,-24.765325 -35.046315,-24.59515 C -35.036652,-24.159511 -34.680061,-23.807751 -34.242006,-23.807751 L -30.519882,-23.807751 C -30.10075,-23.807751 -29.759459,-24.130656 -29.722015,-24.540124 C -29.679203,-24.679969 -29.267184,-25.29585 -29.111906,-25.527761 C -28.301826,-26.738451 -27.079728,-28.56462 -27.079728,-30.477889 C -27.079728,-33.482538 -29.457894,-35.926868 -32.380944,-35.926868 z M -29.722015,-24.541198 C -29.721747,-24.54254 -29.721612,-24.544016 -29.721478,-24.545493 C -29.72121,-24.546566 -29.720405,-24.547372 -29.72027,-24.548445 C -29.72027,-24.54858 -29.721478,-24.543077 -29.722015,-24.541198 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " - style="opacity:0.2;fill:#ff8b17" /> - <path - id="path7517" - d="M -32.380944,-35.658452 C -35.156097,-35.658452 -37.413744,-33.334506 -37.413744,-30.477889 C -37.413744,-28.709296 -36.318338,-27.08095 -35.518459,-25.892136 C -35.223872,-25.454215 -34.778838,-24.792972 -34.778838,-24.613134 C -34.778838,-24.317205 -34.538069,-24.076302 -34.242006,-24.076302 L -30.519882,-24.076302 C -30.223953,-24.076302 -29.98305,-24.317205 -29.98305,-24.613134 L -29.984123,-24.597834 C -29.955805,-24.749489 -29.566334,-25.331683 -29.333483,-25.67955 C -28.542864,-26.860983 -27.348144,-28.646218 -27.348144,-30.477889 C -27.348144,-33.334506 -29.605925,-35.658452 -32.380944,-35.658452 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " - style="opacity:0.2;fill:#ff8b17" /> - <path - id="path7519" - d="M -32.380944,-35.390036 C -35.008066,-35.390036 -37.145328,-33.186475 -37.145328,-30.477889 C -37.145328,-28.791163 -36.076227,-27.202006 -35.295673,-26.041912 C -34.891841,-25.4416 -34.510422,-24.874705 -34.510422,-24.613134 C -34.510422,-24.464968 -34.390172,-24.344718 -34.242006,-24.344718 L -30.519882,-24.344718 C -30.371716,-24.344718 -30.251466,-24.464968 -30.251466,-24.613134 C -30.251466,-24.790288 -29.882125,-25.342151 -29.556402,-25.828924 C -28.784035,-26.983113 -27.61656,-28.727817 -27.61656,-30.477889 C -27.61656,-33.186475 -29.753957,-35.390036 -32.380944,-35.390036 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " - style="opacity:0.4;fill:#ff8b17" /> - <path - id="path7521" - d="M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " - style="opacity:0.2;fill:#ffbf61" /> - <path - id="path7523" - d="M -31.631661,-29.235257 L -31.631661,-27.362519 C -31.631661,-27.156778 -31.800494,-26.988078 -32.006369,-26.988078 L -32.755653,-26.988078 C -32.961662,-26.988078 -33.130361,-27.156778 -33.130361,-27.362519 L -33.130361,-29.235257 L -33.50507,-29.235257 L -33.50507,-27.362519 C -33.50507,-26.950634 -33.16794,-26.613504 -32.621579,-26.613504 L -32.621579,-24.366191 L -32.140712,-24.366191 L -32.140712,-26.61337 C -31.594351,-26.61337 -31.25722,-26.9505 -31.25722,-27.362384 L -31.25722,-29.235257 L -31.631661,-29.235257 z " - style="fill:#cba572" /> - <path - id="path7525" - d="M -32.380944,-35.255828 C -34.934117,-35.255828 -37.01112,-33.112392 -37.01112,-30.477889 C -37.01112,-28.831694 -35.955037,-27.278102 -35.184012,-26.14391 C -34.750655,-25.506154 -34.376214,-24.928657 -34.376214,-24.626554 L -34.24308,-24.626554 C -34.267506,-25.553261 -36.876912,-27.924984 -36.876912,-30.477889 C -36.876912,-33.042604 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.927534 -30.489282,-25.382682 -30.518674,-24.626554 L -30.385808,-24.626554 C -30.385808,-24.843971 -30.053375,-25.362551 -29.668466,-25.931996 C -28.859058,-27.128863 -27.750768,-28.768213 -27.750768,-30.477889 C -27.750768,-33.112392 -29.827905,-35.255828 -32.380944,-35.255828 z " - style="fill:#9e8c68" /> - <path - id="path7527" - d="M -30.032304,-21.163988 C -30.032304,-21.016359 -30.153091,-20.895572 -30.30072,-20.895572 L -34.32696,-20.895572 C -34.474589,-20.895572 -34.595376,-21.016359 -34.595376,-21.163988 L -34.595376,-24.38498 C -34.595376,-24.532609 -34.474589,-24.653396 -34.32696,-24.653396 L -30.30072,-24.653396 C -30.153091,-24.653396 -30.032304,-24.532609 -30.032304,-24.38498 L -30.032304,-21.163988 z " - style="fill:#966746" /> - <path - id="path7529" - d="M -30.032304,-21.298196 C -30.032304,-21.076753 -30.213485,-20.895572 -30.434928,-20.895572 L -34.192752,-20.895572 C -34.414195,-20.895572 -34.595376,-21.076753 -34.595376,-21.298196 L -34.595376,-24.116564 C -34.595376,-24.338007 -34.414195,-24.519188 -34.192752,-24.519188 L -30.434928,-24.519188 C -30.213485,-24.519188 -30.032304,-24.338007 -30.032304,-24.116564 L -30.032304,-21.298196 z " - style="fill:url(#linearGradient7549)" /> - <path - id="path7531" - d="M -29.825355,-24.105827 C -29.788582,-23.888813 -29.937553,-23.684817 -30.156581,-23.652741 L -34.470965,-23.020353 C -34.689993,-22.988412 -34.899491,-23.139664 -34.936399,-23.356678 C -34.973306,-23.573827 -34.824201,-23.777689 -34.605173,-23.809899 L -30.290789,-24.442153 C -30.071761,-24.474094 -29.862262,-24.322842 -29.825355,-24.105827 z " - style="fill:url(#linearGradient7551)" /> - <path - id="path7533" - d="M -29.825355,-23.116446 C -29.788582,-22.899297 -29.937553,-22.695435 -30.156581,-22.66336 L -34.470965,-22.031106 C -34.689993,-21.998896 -34.899491,-22.150283 -34.936399,-22.367431 C -34.973306,-22.584445 -34.824201,-22.788442 -34.605173,-22.820383 L -30.290789,-23.452637 C -30.071761,-23.484847 -29.862262,-23.33346 -29.825355,-23.116446 z " - style="fill:url(#linearGradient7553)" /> - <path - id="path7535" - d="M -29.825355,-22.127065 C -29.788582,-21.91005 -29.937553,-21.706054 -30.156581,-21.673978 L -34.470965,-21.04159 C -34.689993,-21.009649 -34.899491,-21.160901 -34.936399,-21.377916 C -34.973306,-21.595064 -34.824201,-21.798926 -34.605173,-21.831136 L -30.290789,-22.46339 C -30.071761,-22.495331 -29.862262,-22.344079 -29.825355,-22.127065 z " - style="fill:url(#linearGradient7555)" /> - <path - id="path7537" - d="M -34.887815,-23.22341 L -34.936533,-23.356678 C -34.97344,-23.573827 -34.824335,-23.777689 -34.605307,-23.809899 L -30.290923,-24.442153 C -30.071895,-24.474094 -29.882528,-24.396656 -29.845755,-24.179642 L -34.887815,-23.22341 z " - style="fill:url(#linearGradient7557)" /> - <path - id="path7539" - d="M -34.880031,-22.220339 L -29.853136,-23.208244 C -29.889909,-23.425259 -30.071761,-23.484847 -30.290789,-23.452503 L -34.605173,-22.820249 C -34.824201,-22.788307 -34.973306,-22.584311 -34.936399,-22.367297 L -34.880031,-22.220339 z " - style="fill:url(#linearGradient7559)" /> - <path - id="path7541" - d="M -34.853592,-21.194185 L -29.853002,-22.218594 C -29.889909,-22.435609 -30.071761,-22.495466 -30.290789,-22.46339 L -34.605173,-21.831136 C -34.824201,-21.798926 -34.973306,-21.595064 -34.936399,-21.377916 L -34.853592,-21.194185 z " - style="fill:url(#linearGradient7561)" /> - <path - id="path7543" - d="M -28.589568,-32.601596 C -29.364217,-34.00152 -30.787895,-34.925676 -32.380944,-34.925676 C -33.973993,-34.925676 -35.397671,-34.00152 -36.17232,-32.601596 C -35.153681,-33.183656 -33.826767,-33.537429 -32.380944,-33.537429 C -30.935121,-33.537295 -29.608207,-33.183656 -28.589568,-32.601596 z " - style="fill:url(#linearGradient7563)" /> - <path - id="path7545" - d="M -34.042707,-20.761364 L -30.719449,-20.761364 C -30.706297,-20.805384 -30.69462,-20.85021 -30.684823,-20.895572 L -34.077199,-20.895572 C -34.067402,-20.85021 -34.055726,-20.805384 -34.042707,-20.761364 z " - style="fill:#3f3f3f" /> - </g> - </clipPath> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_10_" - id="radialGradient7547" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3746685,0,0,0.3745343,-41.145122,6.4690164)" - cx="-27.6128" - cy="-86.5356" - r="6.2114" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_1_" - id="linearGradient7549" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" - x1="47.9995" - y1="100.5" - x2="81.9995" - y2="100.5" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_2_" - id="linearGradient7551" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" - x1="44.8901" - y1="95.7324" - x2="83.5847" - y2="90.0861" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_3_" - id="linearGradient7553" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)" - x1="75.5039" - y1="11.96" - x2="85.5969" - y2="36.3307" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient7555" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)" - x1="37.6743" - y1="25.6035" - x2="37.6743" - y2="47.5006" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_5_" - id="linearGradient7557" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" - x1="44.7505" - y1="94.7715" - x2="83.3739" - y2="89.1356" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_6_" - id="linearGradient7559" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3746685,-5.350873e-2,0,0.3745343,-41.145122,8.898557)" - x1="-34.5078" - y1="-100.6235" - x2="-20.9253" - y2="-100.6235" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_7_" - id="linearGradient7561" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" - x1="45.416" - y1="107.0176" - x2="83.3354" - y2="107.0176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_8_" - id="linearGradient7563" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" - x1="36.2495" - y1="18.1187" - x2="92.7495" - y2="18.1187" /> - <radialGradient - inkscape:collect="always" - xlink:href="#light_1_" - id="radialGradient7653" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)" - cx="-27.6724" - cy="-109.9067" - r="9" /> - <radialGradient - inkscape:collect="always" - xlink:href="#XMLID_10_" - id="radialGradient8092" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3746685,0,0,0.3745343,-41.145122,6.4690164)" - cx="-27.6128" - cy="-86.5356" - r="6.2114" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_1_" - id="linearGradient8094" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" - x1="47.9995" - y1="100.5" - x2="81.9995" - y2="100.5" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_2_" - id="linearGradient8096" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" - x1="44.8901" - y1="95.7324" - x2="83.5847" - y2="90.0861" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_3_" - id="linearGradient8098" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)" - x1="75.5039" - y1="11.96" - x2="85.5969" - y2="36.3307" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient8100" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)" - x1="37.6743" - y1="25.6035" - x2="37.6743" - y2="47.5006" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_5_" - id="linearGradient8102" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" - x1="44.7505" - y1="94.7715" - x2="83.3739" - y2="89.1356" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_6_" - id="linearGradient8104" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3746685,-5.350873e-2,0,0.3745343,-41.145122,8.898557)" - x1="-34.5078" - y1="-100.6235" - x2="-20.9253" - y2="-100.6235" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_7_" - id="linearGradient8106" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" - x1="45.416" - y1="107.0176" - x2="83.3354" - y2="107.0176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_8_" - id="linearGradient8108" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)" - x1="36.2495" - y1="18.1187" - x2="92.7495" - y2="18.1187" /> - <radialGradient - inkscape:collect="always" - xlink:href="#light_1_" - id="radialGradient8110" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)" - cx="-27.6724" - cy="-109.9067" - r="9" /> - <mask - maskUnits="userSpaceOnUse" - id="mask8044"> - <g - id="g8046" - transform="translate(8.8639968,22.032387)"> - <g - id="g8048"> - <path - style="opacity:0.2;fill:#141414" - d="M -29.775161,-22.982238 C -29.796903,-23.107991 -29.878636,-23.210123 -29.986136,-23.268906 L -29.986136,-23.560406 C -29.836092,-23.636636 -29.745233,-23.799162 -29.775161,-23.971619 C -29.797037,-24.097641 -29.879038,-24.200041 -29.986942,-24.25869 C -29.991505,-24.402695 -30.109876,-24.519188 -30.254687,-24.519188 L -34.370443,-24.519188 C -34.518072,-24.519188 -34.638859,-24.398401 -34.638859,-24.250772 L -34.638859,-23.677033 L -34.648925,-23.675691 C -34.872381,-23.643481 -35.024305,-23.439619 -34.986727,-23.22247 C -34.956396,-23.047329 -34.811048,-22.917013 -34.638994,-22.889232 L -34.638994,-22.687786 L -34.649059,-22.686175 C -34.872516,-22.654234 -35.024439,-22.450237 -34.986861,-22.233223 C -34.95653,-22.058082 -34.811182,-21.927632 -34.639128,-21.89985 L -34.639128,-21.69827 L -34.649193,-21.696928 C -34.87265,-21.664718 -35.024573,-21.460856 -34.986995,-21.243708 C -34.954785,-21.057829 -34.793199,-20.921072 -34.607186,-20.905503 C -34.562092,-20.820281 -34.473381,-20.761364 -34.370846,-20.761364 L -34.129003,-20.761364 C -33.83294,-20.026441 -33.162303,-19.419284 -32.381347,-19.419284 C -31.600256,-19.419284 -30.929753,-20.026441 -30.63369,-20.761364 L -30.255089,-20.761364 C -30.10746,-20.761364 -29.986673,-20.882151 -29.986673,-21.02978 L -29.986673,-21.581509 C -29.836629,-21.657739 -29.74577,-21.820265 -29.775698,-21.992722 C -29.79744,-22.118475 -29.879173,-22.220608 -29.986673,-22.279391 L -29.986673,-22.570756 C -29.836226,-22.647121 -29.745367,-22.809781 -29.775161,-22.982238 z " - id="path8050" /> - <path - style="opacity:0.2;fill:#141414" - d="M -29.775161,-22.84803 C -29.796903,-22.973783 -29.878636,-23.075915 -29.986136,-23.134698 L -29.986136,-23.426198 C -29.836092,-23.502428 -29.745233,-23.664954 -29.775161,-23.837411 C -29.797037,-23.963433 -29.879038,-24.065833 -29.986942,-24.124482 C -29.991505,-24.268487 -30.109876,-24.38498 -30.254687,-24.38498 L -34.370443,-24.38498 C -34.518072,-24.38498 -34.638859,-24.264193 -34.638859,-24.116564 L -34.638859,-23.542825 L -34.648925,-23.541483 C -34.872381,-23.509273 -35.024305,-23.305411 -34.986727,-23.088262 C -34.956396,-22.913121 -34.811048,-22.782805 -34.638994,-22.755024 L -34.638994,-22.553578 L -34.649059,-22.551967 C -34.872516,-22.520026 -35.024439,-22.316029 -34.986861,-22.099015 C -34.95653,-21.923874 -34.811182,-21.793424 -34.639128,-21.765642 L -34.639128,-21.564062 L -34.649193,-21.56272 C -34.87265,-21.53051 -35.024573,-21.326648 -34.986995,-21.1095 C -34.954785,-20.923621 -34.793199,-20.786864 -34.607186,-20.771295 C -34.562092,-20.686073 -34.473381,-20.627156 -34.370846,-20.627156 L -34.129003,-20.627156 C -33.83294,-19.892233 -33.162303,-19.285076 -32.381347,-19.285076 C -31.600256,-19.285076 -30.929753,-19.892233 -30.63369,-20.627156 L -30.255089,-20.627156 C -30.10746,-20.627156 -29.986673,-20.747943 -29.986673,-20.895572 L -29.986673,-21.447301 C -29.836629,-21.523531 -29.74577,-21.686057 -29.775698,-21.858514 C -29.79744,-21.984267 -29.879173,-22.0864 -29.986673,-22.145183 L -29.986673,-22.436548 C -29.836226,-22.512913 -29.745367,-22.675573 -29.775161,-22.84803 z " - id="path8052" /> - <path - style="fill:url(#radialGradient8092)" - d="M -30.507669,-21.694512 C -30.507669,-20.66044 -31.346469,-19.553492 -32.381078,-19.553492 C -33.415553,-19.553492 -34.254353,-20.66044 -34.254353,-21.694512 C -34.254353,-22.728719 -33.415553,-23.298835 -32.381078,-23.298835 C -31.346469,-23.298835 -30.507669,-22.728719 -30.507669,-21.694512 z " - id="path8054" /> - <path - style="opacity:0.4;fill:#ffbf61" - d="M -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.031465 -27.884976,-30.452926 C -27.884976,-27.874388 -30.519882,-25.378656 -30.519882,-24.634607 L -34.242141,-24.634607 C -34.242141,-25.557018 -36.876912,-27.874388 -36.876912,-30.452926 C -36.876912,-33.031465 -34.86406,-35.12162 -32.380944,-35.12162 z " - id="path8056" /> - <path - style="opacity:0.2;fill:#ff8b17" - d="M -32.380944,-35.926868 C -35.304128,-35.926868 -37.68216,-33.482538 -37.68216,-30.477889 C -37.68216,-28.627429 -36.56045,-26.960163 -35.741378,-25.742494 C -35.544227,-25.449384 -35.083893,-24.765325 -35.046315,-24.59515 C -35.036652,-24.159511 -34.680061,-23.807751 -34.242006,-23.807751 L -30.519882,-23.807751 C -30.10075,-23.807751 -29.759459,-24.130656 -29.722015,-24.540124 C -29.679203,-24.679969 -29.267184,-25.29585 -29.111906,-25.527761 C -28.301826,-26.738451 -27.079728,-28.56462 -27.079728,-30.477889 C -27.079728,-33.482538 -29.457894,-35.926868 -32.380944,-35.926868 z M -29.722015,-24.541198 C -29.721747,-24.54254 -29.721612,-24.544016 -29.721478,-24.545493 C -29.72121,-24.546566 -29.720405,-24.547372 -29.72027,-24.548445 C -29.72027,-24.54858 -29.721478,-24.543077 -29.722015,-24.541198 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " - id="path8058" /> - <path - style="opacity:0.2;fill:#ff8b17" - d="M -32.380944,-35.658452 C -35.156097,-35.658452 -37.413744,-33.334506 -37.413744,-30.477889 C -37.413744,-28.709296 -36.318338,-27.08095 -35.518459,-25.892136 C -35.223872,-25.454215 -34.778838,-24.792972 -34.778838,-24.613134 C -34.778838,-24.317205 -34.538069,-24.076302 -34.242006,-24.076302 L -30.519882,-24.076302 C -30.223953,-24.076302 -29.98305,-24.317205 -29.98305,-24.613134 L -29.984123,-24.597834 C -29.955805,-24.749489 -29.566334,-25.331683 -29.333483,-25.67955 C -28.542864,-26.860983 -27.348144,-28.646218 -27.348144,-30.477889 C -27.348144,-33.334506 -29.605925,-35.658452 -32.380944,-35.658452 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " - id="path8060" /> - <path - style="opacity:0.4;fill:#ff8b17" - d="M -32.380944,-35.390036 C -35.008066,-35.390036 -37.145328,-33.186475 -37.145328,-30.477889 C -37.145328,-28.791163 -36.076227,-27.202006 -35.295673,-26.041912 C -34.891841,-25.4416 -34.510422,-24.874705 -34.510422,-24.613134 C -34.510422,-24.464968 -34.390172,-24.344718 -34.242006,-24.344718 L -30.519882,-24.344718 C -30.371716,-24.344718 -30.251466,-24.464968 -30.251466,-24.613134 C -30.251466,-24.790288 -29.882125,-25.342151 -29.556402,-25.828924 C -28.784035,-26.983113 -27.61656,-28.727817 -27.61656,-30.477889 C -27.61656,-33.186475 -29.753957,-35.390036 -32.380944,-35.390036 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " - id="path8062" /> - <path - style="opacity:0.2;fill:#ffbf61" - d="M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z " - id="path8064" /> - <path - style="fill:#cba572" - d="M -31.631661,-29.235257 L -31.631661,-27.362519 C -31.631661,-27.156778 -31.800494,-26.988078 -32.006369,-26.988078 L -32.755653,-26.988078 C -32.961662,-26.988078 -33.130361,-27.156778 -33.130361,-27.362519 L -33.130361,-29.235257 L -33.50507,-29.235257 L -33.50507,-27.362519 C -33.50507,-26.950634 -33.16794,-26.613504 -32.621579,-26.613504 L -32.621579,-24.366191 L -32.140712,-24.366191 L -32.140712,-26.61337 C -31.594351,-26.61337 -31.25722,-26.9505 -31.25722,-27.362384 L -31.25722,-29.235257 L -31.631661,-29.235257 z " - id="path8066" /> - <path - style="fill:#9e8c68" - d="M -32.380944,-35.255828 C -34.934117,-35.255828 -37.01112,-33.112392 -37.01112,-30.477889 C -37.01112,-28.831694 -35.955037,-27.278102 -35.184012,-26.14391 C -34.750655,-25.506154 -34.376214,-24.928657 -34.376214,-24.626554 L -34.24308,-24.626554 C -34.267506,-25.553261 -36.876912,-27.924984 -36.876912,-30.477889 C -36.876912,-33.042604 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.927534 -30.489282,-25.382682 -30.518674,-24.626554 L -30.385808,-24.626554 C -30.385808,-24.843971 -30.053375,-25.362551 -29.668466,-25.931996 C -28.859058,-27.128863 -27.750768,-28.768213 -27.750768,-30.477889 C -27.750768,-33.112392 -29.827905,-35.255828 -32.380944,-35.255828 z " - id="path8068" /> - <path - style="fill:#966746" - d="M -30.032304,-21.163988 C -30.032304,-21.016359 -30.153091,-20.895572 -30.30072,-20.895572 L -34.32696,-20.895572 C -34.474589,-20.895572 -34.595376,-21.016359 -34.595376,-21.163988 L -34.595376,-24.38498 C -34.595376,-24.532609 -34.474589,-24.653396 -34.32696,-24.653396 L -30.30072,-24.653396 C -30.153091,-24.653396 -30.032304,-24.532609 -30.032304,-24.38498 L -30.032304,-21.163988 z " - id="path8070" /> - <path - style="fill:url(#linearGradient8094)" - d="M -30.032304,-21.298196 C -30.032304,-21.076753 -30.213485,-20.895572 -30.434928,-20.895572 L -34.192752,-20.895572 C -34.414195,-20.895572 -34.595376,-21.076753 -34.595376,-21.298196 L -34.595376,-24.116564 C -34.595376,-24.338007 -34.414195,-24.519188 -34.192752,-24.519188 L -30.434928,-24.519188 C -30.213485,-24.519188 -30.032304,-24.338007 -30.032304,-24.116564 L -30.032304,-21.298196 z " - id="path8072" /> - <path - style="fill:url(#linearGradient8096)" - d="M -29.825355,-24.105827 C -29.788582,-23.888813 -29.937553,-23.684817 -30.156581,-23.652741 L -34.470965,-23.020353 C -34.689993,-22.988412 -34.899491,-23.139664 -34.936399,-23.356678 C -34.973306,-23.573827 -34.824201,-23.777689 -34.605173,-23.809899 L -30.290789,-24.442153 C -30.071761,-24.474094 -29.862262,-24.322842 -29.825355,-24.105827 z " - id="path8074" /> - <path - style="fill:url(#linearGradient8098)" - d="M -29.825355,-23.116446 C -29.788582,-22.899297 -29.937553,-22.695435 -30.156581,-22.66336 L -34.470965,-22.031106 C -34.689993,-21.998896 -34.899491,-22.150283 -34.936399,-22.367431 C -34.973306,-22.584445 -34.824201,-22.788442 -34.605173,-22.820383 L -30.290789,-23.452637 C -30.071761,-23.484847 -29.862262,-23.33346 -29.825355,-23.116446 z " - id="path8076" /> - <path - style="fill:url(#linearGradient8100)" - d="M -29.825355,-22.127065 C -29.788582,-21.91005 -29.937553,-21.706054 -30.156581,-21.673978 L -34.470965,-21.04159 C -34.689993,-21.009649 -34.899491,-21.160901 -34.936399,-21.377916 C -34.973306,-21.595064 -34.824201,-21.798926 -34.605173,-21.831136 L -30.290789,-22.46339 C -30.071761,-22.495331 -29.862262,-22.344079 -29.825355,-22.127065 z " - id="path8078" /> - <path - style="fill:url(#linearGradient8102)" - d="M -34.887815,-23.22341 L -34.936533,-23.356678 C -34.97344,-23.573827 -34.824335,-23.777689 -34.605307,-23.809899 L -30.290923,-24.442153 C -30.071895,-24.474094 -29.882528,-24.396656 -29.845755,-24.179642 L -34.887815,-23.22341 z " - id="path8080" /> - <path - style="fill:url(#linearGradient8104)" - d="M -34.880031,-22.220339 L -29.853136,-23.208244 C -29.889909,-23.425259 -30.071761,-23.484847 -30.290789,-23.452503 L -34.605173,-22.820249 C -34.824201,-22.788307 -34.973306,-22.584311 -34.936399,-22.367297 L -34.880031,-22.220339 z " - id="path8082" /> - <path - style="fill:url(#linearGradient8106)" - d="M -34.853592,-21.194185 L -29.853002,-22.218594 C -29.889909,-22.435609 -30.071761,-22.495466 -30.290789,-22.46339 L -34.605173,-21.831136 C -34.824201,-21.798926 -34.973306,-21.595064 -34.936399,-21.377916 L -34.853592,-21.194185 z " - id="path8084" /> - <path - style="fill:url(#linearGradient8108)" - d="M -28.589568,-32.601596 C -29.364217,-34.00152 -30.787895,-34.925676 -32.380944,-34.925676 C -33.973993,-34.925676 -35.397671,-34.00152 -36.17232,-32.601596 C -35.153681,-33.183656 -33.826767,-33.537429 -32.380944,-33.537429 C -30.935121,-33.537295 -29.608207,-33.183656 -28.589568,-32.601596 z " - id="path8086" /> - <path - style="fill:#3f3f3f" - d="M -34.042707,-20.761364 L -30.719449,-20.761364 C -30.706297,-20.805384 -30.69462,-20.85021 -30.684823,-20.895572 L -34.077199,-20.895572 C -34.067402,-20.85021 -34.055726,-20.805384 -34.042707,-20.761364 z " - id="path8088" /> - </g> - <ellipse - clip-path="url(#clipPath7503)" - transform="matrix(0.134208,0,0,0.134208,-41.03736,-36.195284)" - ry="60.116001" - rx="60.125" - cy="44.278999" - cx="64.5" - id="ellipse8090" - style="fill:url(#radialGradient8110)" - sodipodi:cx="64.5" - sodipodi:cy="44.278999" - sodipodi:rx="60.125" - sodipodi:ry="60.116001" /> - </g> - </mask> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_3_" - id="linearGradient8386" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-2.6725931e-2,-44.465488)" - x1="75.5039" - y1="11.96" - x2="85.5969" - y2="36.3307" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient8388" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-2.6725931e-2,-44.465488)" - x1="37.6743" - y1="25.6035" - x2="37.6743" - y2="47.5006" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_3_" - id="linearGradient8470" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-2.6725931e-2,-44.465488)" - x1="75.5039" - y1="11.96" - x2="85.5969" - y2="36.3307" /> - <linearGradient - inkscape:collect="always" - xlink:href="#XMLID_4_" - id="linearGradient8472" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-2.6725931e-2,-44.465488)" - x1="37.6743" - y1="25.6035" - x2="37.6743" - y2="47.5006" /> - <mask - maskUnits="userSpaceOnUse" - id="mask8432"> - <g - style="overflow:visible" - id="g8434" - transform="matrix(0.1570828,0,0,0.1570828,-28.616402,11.0008)"> - <path - id="path8436" - d="M 51.868,84.936 C 45.459,79.297 41.784,71.221 41.784,62.78 C 41.784,54.276 45.498,46.164 51.974,40.523 C 52.339,40.204 52.419,39.667 52.16,39.256 L 42.036,23.192 C 41.888,22.958 41.648,22.796 41.375,22.748 C 41.102,22.7 40.819,22.769 40.602,22.937 C 32.334,29.305 26.119,38.265 23.1,48.167 C 22.982,48.554 23.112,48.974 23.431,49.226 C 27.586,52.517 30.066,57.583 30.066,62.779 C 30.066,67.975 27.585,73.043 23.429,76.334 C 23.112,76.585 22.98,77.004 23.098,77.392 C 26.093,87.211 32.238,96.12 40.404,102.474 C 40.623,102.645 40.903,102.715 41.177,102.667 C 41.45,102.62 41.691,102.459 41.84,102.226 L 52.049,86.204 C 52.309,85.794 52.232,85.256 51.868,84.936 z M 12.803,50.223 C 5.732,50.223 0,55.951 0,63.016 C 0,70.081 5.732,75.81 12.803,75.81 C 19.874,75.81 25.606,70.081 25.606,63.016 C 25.606,55.951 19.874,50.223 12.803,50.223 z M 58.779,35.162 C 59.036,35.57 59.551,35.732 59.996,35.545 C 63.75,33.958 67.65,33.153 71.586,33.153 C 86.064,33.153 98.693,43.887 100.963,58.122 C 101.039,58.6 101.451,58.951 101.934,58.951 L 121.014,58.98 C 121.292,58.98 121.557,58.863 121.744,58.657 C 121.931,58.451 122.021,58.178 121.995,57.9 C 120.967,47.338 116.471,37.15 109.336,29.215 C 109.014,28.855 108.477,28.783 108.07,29.046 C 105.193,30.904 101.925,31.888 98.623,31.888 C 88.99,31.888 81.154,24.098 81.153,14.524 C 81.154,14.519 81.172,14.158 81.172,14.142 C 81.172,13.665 80.829,13.254 80.356,13.172 C 77.344,12.65 74.394,12.284 71.586,12.284 C 63.875,12.284 56.084,14.221 49.054,17.695 C 48.804,17.819 48.618,18.043 48.543,18.311 C 48.467,18.579 48.509,18.866 48.657,19.102 L 58.779,35.162 z M 98,27.5 C 104.908,27.5 110.51,21.902 110.51,15 C 110.51,8.096 104.908,2.5 98,2.5 C 91.092,2.5 85.49,8.096 85.49,15 C 85.49,21.902 91.092,27.5 98,27.5 z M 120.994,66.733 L 101.916,66.795 C 101.435,66.796 101.024,67.147 100.947,67.621 C 98.646,81.75 86.024,92.405 71.586,92.405 C 67.604,92.405 63.66,91.581 59.864,89.955 C 59.42,89.766 58.906,89.925 58.645,90.33 L 48.442,106.345 C 48.293,106.58 48.25,106.867 48.324,107.136 C 48.398,107.404 48.583,107.629 48.832,107.753 C 55.917,111.3 63.786,113.174 71.586,113.174 C 74.479,113.174 77.492,112.901 80.541,112.36 C 80.969,112.285 81.297,111.936 81.348,111.505 C 82.364,102.73 89.791,96.112 98.623,96.112 C 101.361,96.112 104.147,96.81 106.679,98.13 C 107.064,98.331 107.533,98.257 107.838,97.946 C 115.823,89.803 120.846,79.104 121.978,67.817 C 122.006,67.54 121.915,67.264 121.727,67.057 C 121.539,66.85 121.272,66.732 120.994,66.733 z M 98.486,100.545 C 91.415,100.545 85.682,106.242 85.682,113.273 C 85.682,120.302 91.414,126.001 98.486,126.001 C 105.556,126.001 111.289,120.303 111.289,113.273 C 111.289,106.242 105.557,100.545 98.486,100.545 z " - style="opacity:0.2;fill:#141414;fill-rule:evenodd" /> - <path - id="path8438" - d="M 51.868,85.936 C 45.459,80.297 41.784,72.221 41.784,63.78 C 41.784,55.276 45.498,47.164 51.974,41.523 C 52.339,41.204 52.419,40.667 52.16,40.256 L 42.036,24.192 C 41.888,23.958 41.648,23.796 41.375,23.748 C 41.102,23.7 40.819,23.769 40.602,23.937 C 32.334,30.305 26.119,39.265 23.1,49.167 C 22.982,49.554 23.112,49.974 23.431,50.226 C 27.586,53.517 30.066,58.583 30.066,63.779 C 30.066,68.975 27.585,74.043 23.429,77.334 C 23.112,77.585 22.98,78.004 23.098,78.392 C 26.093,88.211 32.238,97.12 40.404,103.474 C 40.623,103.645 40.903,103.715 41.177,103.667 C 41.45,103.62 41.691,103.459 41.84,103.226 L 52.049,87.204 C 52.309,86.794 52.232,86.256 51.868,85.936 z M 12.803,51.223 C 5.732,51.223 0,56.951 0,64.016 C 0,71.081 5.732,76.81 12.803,76.81 C 19.874,76.81 25.606,71.081 25.606,64.016 C 25.606,56.951 19.874,51.223 12.803,51.223 z M 58.779,36.162 C 59.036,36.57 59.551,36.732 59.996,36.545 C 63.75,34.958 67.65,34.153 71.586,34.153 C 86.064,34.153 98.693,44.887 100.963,59.122 C 101.039,59.6 101.451,59.951 101.934,59.951 L 121.014,59.98 C 121.292,59.98 121.557,59.863 121.744,59.657 C 121.931,59.451 122.021,59.178 121.995,58.9 C 120.967,48.338 116.471,38.15 109.336,30.215 C 109.014,29.855 108.477,29.783 108.07,30.046 C 105.193,31.904 101.925,32.888 98.623,32.888 C 88.99,32.888 81.154,25.098 81.153,15.524 C 81.154,15.519 81.172,15.158 81.172,15.142 C 81.172,14.665 80.829,14.254 80.356,14.172 C 77.344,13.65 74.394,13.284 71.586,13.284 C 63.875,13.284 56.084,15.221 49.054,18.695 C 48.804,18.819 48.618,19.043 48.543,19.311 C 48.467,19.579 48.509,19.866 48.657,20.102 L 58.779,36.162 z M 98,28.5 C 104.908,28.5 110.51,22.902 110.51,16 C 110.51,9.096 104.908,3.5 98,3.5 C 91.092,3.5 85.49,9.096 85.49,16 C 85.49,22.902 91.092,28.5 98,28.5 z M 120.994,67.733 L 101.916,67.795 C 101.435,67.796 101.024,68.147 100.947,68.621 C 98.646,82.75 86.024,93.405 71.586,93.405 C 67.604,93.405 63.66,92.581 59.864,90.955 C 59.42,90.766 58.906,90.925 58.645,91.33 L 48.442,107.345 C 48.293,107.58 48.25,107.867 48.324,108.136 C 48.398,108.404 48.583,108.629 48.832,108.753 C 55.917,112.3 63.786,114.174 71.586,114.174 C 74.479,114.174 77.492,113.901 80.541,113.36 C 80.969,113.285 81.297,112.936 81.348,112.505 C 82.364,103.73 89.791,97.112 98.623,97.112 C 101.361,97.112 104.147,97.81 106.679,99.13 C 107.064,99.331 107.533,99.257 107.838,98.946 C 115.823,90.803 120.846,80.104 121.978,68.817 C 122.006,68.54 121.915,68.264 121.727,68.057 C 121.539,67.85 121.272,67.732 120.994,67.733 z M 98.486,101.545 C 91.415,101.545 85.682,107.242 85.682,114.273 C 85.682,121.302 91.414,127.001 98.486,127.001 C 105.556,127.001 111.289,121.303 111.289,114.273 C 111.289,107.242 105.557,101.545 98.486,101.545 z " - style="opacity:0.2;fill:#141414;fill-rule:evenodd" /> - <path - id="path8440" - d="M 51.868,86.936 C 45.459,81.297 41.784,73.221 41.784,64.78 C 41.784,56.276 45.498,48.164 51.974,42.523 C 52.339,42.204 52.419,41.667 52.16,41.256 L 42.036,25.192 C 41.888,24.958 41.648,24.796 41.375,24.748 C 41.102,24.7 40.819,24.769 40.602,24.937 C 32.334,31.305 26.119,40.265 23.1,50.167 C 22.982,50.554 23.112,50.974 23.431,51.226 C 27.586,54.517 30.066,59.583 30.066,64.779 C 30.066,69.975 27.585,75.043 23.429,78.334 C 23.112,78.585 22.98,79.004 23.098,79.392 C 26.093,89.211 32.238,98.12 40.404,104.474 C 40.623,104.645 40.903,104.715 41.177,104.667 C 41.45,104.62 41.691,104.459 41.84,104.226 L 52.049,88.204 C 52.309,87.794 52.232,87.256 51.868,86.936 z M 12.803,52.223 C 5.732,52.223 0,57.951 0,65.016 C 0,72.081 5.732,77.81 12.803,77.81 C 19.874,77.81 25.606,72.081 25.606,65.016 C 25.606,57.951 19.874,52.223 12.803,52.223 z M 58.779,37.162 C 59.036,37.57 59.551,37.732 59.996,37.545 C 63.75,35.958 67.65,35.153 71.586,35.153 C 86.064,35.153 98.693,45.887 100.963,60.122 C 101.039,60.6 101.451,60.951 101.934,60.951 L 121.014,60.98 C 121.292,60.98 121.557,60.863 121.744,60.657 C 121.931,60.451 122.021,60.178 121.995,59.9 C 120.967,49.338 116.471,39.15 109.336,31.215 C 109.014,30.855 108.477,30.783 108.07,31.046 C 105.193,32.904 101.925,33.888 98.623,33.888 C 88.99,33.888 81.154,26.098 81.153,16.524 C 81.154,16.519 81.172,16.158 81.172,16.142 C 81.172,15.665 80.829,15.254 80.356,15.172 C 77.344,14.65 74.394,14.284 71.586,14.284 C 63.875,14.284 56.084,16.221 49.054,19.695 C 48.804,19.819 48.618,20.043 48.543,20.311 C 48.467,20.579 48.509,20.866 48.657,21.102 L 58.779,37.162 z M 98,29.5 C 104.908,29.5 110.51,23.902 110.51,17 C 110.51,10.096 104.908,4.5 98,4.5 C 91.092,4.5 85.49,10.096 85.49,17 C 85.49,23.902 91.092,29.5 98,29.5 z M 120.994,68.733 L 101.916,68.795 C 101.435,68.796 101.024,69.147 100.947,69.621 C 98.646,83.75 86.024,94.405 71.586,94.405 C 67.604,94.405 63.66,93.581 59.864,91.955 C 59.42,91.766 58.906,91.925 58.645,92.33 L 48.442,108.345 C 48.293,108.58 48.25,108.867 48.324,109.136 C 48.398,109.404 48.583,109.629 48.832,109.753 C 55.917,113.3 63.786,115.174 71.586,115.174 C 74.479,115.174 77.492,114.901 80.541,114.36 C 80.969,114.285 81.297,113.936 81.348,113.505 C 82.364,104.73 89.791,98.112 98.623,98.112 C 101.361,98.112 104.147,98.81 106.679,100.13 C 107.064,100.331 107.533,100.257 107.838,99.946 C 115.823,91.803 120.846,81.104 121.978,69.817 C 122.006,69.54 121.915,69.264 121.727,69.057 C 121.539,68.85 121.272,68.732 120.994,68.733 z M 98.486,102.545 C 91.415,102.545 85.682,108.242 85.682,115.273 C 85.682,122.302 91.414,128.001 98.486,128.001 C 105.556,128.001 111.289,122.303 111.289,115.273 C 111.289,108.242 105.557,102.545 98.486,102.545 z " - style="opacity:0.2;fill:#141414;fill-rule:evenodd" /> - <path - id="path8442" - d="M 40.602,21.938 C 32.334,28.306 26.119,37.266 23.1,47.168 C 22.982,47.555 23.112,47.975 23.431,48.227 C 27.586,51.518 30.066,56.584 30.066,61.78 C 30.066,66.976 27.585,72.044 23.429,75.335 C 23.112,75.586 22.98,76.005 23.098,76.393 C 26.093,86.212 32.238,95.121 40.404,101.475 C 40.623,101.646 40.903,101.716 41.177,101.668 C 41.45,101.621 41.691,101.46 41.84,101.227 L 52.049,85.205 C 52.31,84.796 52.234,84.258 51.869,83.937 C 45.46,78.298 41.785,70.222 41.785,61.781 C 41.785,53.277 45.499,45.165 51.975,39.524 C 52.34,39.205 52.42,38.668 52.161,38.257 L 42.036,22.192 C 41.888,21.958 41.648,21.796 41.375,21.748 C 41.102,21.7 40.819,21.769 40.602,21.938 z " - style="fill:#f97a00" /> - <path - id="path8444" - d="M 24.042,47.455 C 28.431,50.932 31.051,56.219 31.051,61.779 C 31.051,67.339 28.43,72.628 24.04,76.104 C 26.991,85.785 32.981,94.45 41.008,100.697 C 42.028,99.097 50.449,85.879 51.217,84.674 C 44.602,78.854 40.799,70.574 40.799,61.779 C 40.799,52.92 44.642,44.603 51.327,38.78 C 50.565,37.572 42.215,24.322 41.203,22.717 C 33.076,28.978 27.018,37.694 24.042,47.455 z " - style="fill:#fb8b00" /> - <ellipse - id="ellipse8446" - ry="12.794" - rx="12.803" - cy="62.015999" - cx="12.803" - style="fill:#f83011;fill-rule:evenodd" - sodipodi:cx="12.803" - sodipodi:cy="62.015999" - sodipodi:rx="12.803" - sodipodi:ry="12.794" /> - <path - id="path8448" - d="M 0.984,62.016 C 0.984,68.528 6.286,73.827 12.802,73.827 C 19.318,73.827 24.62,68.528 24.62,62.016 C 24.62,55.504 19.318,50.206 12.802,50.206 C 6.286,50.206 0.984,55.504 0.984,62.016 z " - style="fill:#f83011;fill-rule:evenodd" /> - <path - id="path8450" - d="M 49.054,16.696 C 48.804,16.82 48.618,17.044 48.543,17.312 C 48.467,17.58 48.509,17.867 48.657,18.103 L 58.779,34.162 C 59.036,34.57 59.551,34.732 59.996,34.545 C 63.75,32.958 67.65,32.153 71.586,32.153 C 86.064,32.153 98.693,42.887 100.963,57.122 C 101.039,57.6 101.451,57.951 101.934,57.951 L 121.014,57.98 C 121.292,57.98 121.557,57.863 121.744,57.657 C 121.931,57.451 122.021,57.178 121.995,56.9 C 120.967,46.338 116.471,36.15 109.336,28.215 C 109.014,27.855 108.477,27.783 108.07,28.046 C 105.193,29.904 101.925,30.888 98.623,30.888 C 88.99,30.888 81.154,23.098 81.153,13.524 C 81.154,13.519 81.172,13.158 81.172,13.142 C 81.172,12.665 80.829,12.254 80.356,12.172 C 77.344,11.65 74.394,11.284 71.586,11.284 C 63.875,11.285 56.084,13.222 49.054,16.696 z " - style="fill:#f13b00" /> - <path - id="path8452" - d="M 49.491,17.578 C 50.527,19.223 58.856,32.437 59.613,33.639 C 63.439,32.022 67.458,31.17 71.587,31.17 C 86.704,31.17 99.583,42.205 101.937,56.968 C 103.373,56.97 119.109,56.993 121.017,56.996 C 120.004,46.605 115.636,36.693 108.606,28.873 C 105.609,30.81 102.191,31.872 98.625,31.872 C 88.449,31.872 80.17,23.641 80.17,13.523 C 80.17,13.523 80.18,13.313 80.189,13.142 C 77.356,12.65 74.471,12.268 71.588,12.268 C 63.928,12.269 56.327,14.199 49.491,17.578 z " - style="fill:#f13b00" /> - <ellipse - id="ellipse8454" - ry="12.5" - rx="12.51" - cy="14" - cx="98" - style="fill:#e00916;fill-rule:evenodd" - sodipodi:cx="98" - sodipodi:cy="14" - sodipodi:rx="12.51" - sodipodi:ry="12.5" /> - <path - id="path8456" - d="M 86.992,14 C 86.992,20.065 91.93,25 98,25 C 104.07,25 109.008,20.065 109.008,14 C 109.008,7.935 104.07,3 98,3 C 91.93,3 86.992,7.935 86.992,14 z " - style="fill:#e56363;fill-rule:evenodd" /> - <path - id="path8458" - d="M 120.994,65.733 L 101.916,65.795 C 101.435,65.796 101.024,66.147 100.947,66.621 C 98.646,80.75 86.024,91.405 71.586,91.405 C 67.604,91.405 63.66,90.581 59.864,88.955 C 59.42,88.766 58.906,88.925 58.645,89.33 L 48.442,105.345 C 48.293,105.58 48.25,105.867 48.324,106.136 C 48.398,106.404 48.583,106.629 48.832,106.753 C 55.917,110.3 63.786,112.174 71.586,112.174 C 74.479,112.174 77.492,111.901 80.541,111.36 C 80.969,111.285 81.297,110.936 81.348,110.505 C 82.364,101.73 89.791,95.112 98.623,95.112 C 101.361,95.112 104.147,95.81 106.679,97.13 C 107.064,97.331 107.533,97.257 107.838,96.946 C 115.823,88.803 120.846,78.104 121.978,66.817 C 122.006,66.54 121.915,66.264 121.727,66.057 C 121.539,65.85 121.272,65.732 120.994,65.733 z " - style="fill:#d40000" /> - <ellipse - id="ellipse8460" - ry="12.728" - rx="12.803" - cy="112.272" - cx="98.486" - style="fill:#ff7516;fill-rule:evenodd" - sodipodi:cx="98.486" - sodipodi:cy="112.272" - sodipodi:rx="12.803" - sodipodi:ry="12.728" /> - <path - id="path8462" - d="M 86.844,112.272 C 86.844,118.651 92.067,123.841 98.487,123.841 C 104.907,123.841 110.13,118.651 110.13,112.272 C 110.13,105.893 104.907,100.703 98.487,100.703 C 92.067,100.703 86.844,105.894 86.844,112.272 z " - style="fill:#fb9200;fill-rule:evenodd" /> - <path - id="path8464" - d="M 49.785,17.67 C 50.008,18.024 59.527,33.127 59.695,33.395 C 63.548,31.791 67.547,30.969 71.586,30.969 C 78.265,30.969 84.635,33.086 90.02,37.08 C 90.155,37.07 103.667,36.099 103.667,36.099 C 103.667,36.099 112.654,35.447 113.294,35.4 C 111.865,33.167 110.392,31.264 108.67,29.337 C 105.639,31.256 102.097,32.173 98.623,32.173 C 88.337,32.173 79.969,23.752 79.969,13.525 C 79.969,13.519 79.973,13.418 79.979,13.318 C 77.094,12.827 74.27,12.47 71.586,12.47 C 64.13,12.469 56.6,14.34 49.785,17.67 z " - style="fill:url(#linearGradient8470);fill-rule:evenodd" /> - <path - id="path8466" - d="M 24.274,47.396 C 26.599,49.268 28.451,51.682 29.658,54.398 C 34.14,51.488 38.459,49.95 43.889,47.772 C 45.598,44.761 48.481,41.04 51.074,38.755 C 50.915,38.503 41.39,23.39 41.155,23.017 C 33.202,29.201 27.214,37.844 24.274,47.396 z " - style="fill:url(#linearGradient8472);fill-rule:evenodd" /> - <path - id="path8468" - d="M 23.732,58.691 C 22.313,53.996 17.948,50.566 12.794,50.566 C 6.493,50.566 1.367,55.689 1.367,61.985 C 1.367,66.015 3.469,69.565 6.633,71.597 C 11.926,67.035 17.919,62.755 23.732,58.691 z " - style="fill:#f88657;fill-rule:evenodd" /> - </g> - </mask> - </defs> - <sodipodi:namedview - inkscape:window-height="627" - inkscape:window-width="910" - inkscape:pageshadow="2" - inkscape:pageopacity="0.0" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - inkscape:zoom="7.2055766" - inkscape:cx="35.602016" - inkscape:cy="22.962506" - inkscape:window-x="238" - inkscape:window-y="96" - inkscape:current-layer="svg2254" - showguides="true" - inkscape:guide-bbox="true"> - <sodipodi:guide - orientation="horizontal" - position="0" - id="guide4273" /> - <sodipodi:guide - orientation="horizontal" - position="48" - id="guide4275" /> - <sodipodi:guide - orientation="vertical" - position="0" - id="guide4437" /> - <sodipodi:guide - orientation="vertical" - position="48" - id="guide4439" /> - </sodipodi:namedview> - <rect - style="fill:url(#linearGradient4371);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect4011" - width="47.866001" - height="47.866001" - x="-48" - y="-47.866001" - transform="scale(-1,-1)" - inkscape:export-filename="/home/matt/eclipse33/eclipse-icon-bulb.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <rect - style="fill:url(#linearGradient4368);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect3016" - width="45.866379" - height="45.866383" - x="1.1343775" - y="1.048512" /> - <path - sodipodi:type="arc" - style="opacity:1;fill:#c88cbb;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="path4033" - sodipodi:cx="-30.021633" - sodipodi:cy="23.982693" - sodipodi:rx="20.014421" - sodipodi:ry="20.014421" - d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" - transform="translate(53.070541,-2.5560054e-2)" /> - <path - sodipodi:type="arc" - style="opacity:1;fill:url(#linearGradient4041);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="path4031" - sodipodi:cx="-30.021633" - sodipodi:cy="23.982693" - sodipodi:rx="20.014421" - sodipodi:ry="20.014421" - d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z" - transform="translate(55.071984,-2.5560054e-2)" /> - <path - sodipodi:type="arc" - style="opacity:1;fill:#fffffa;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4267)" - id="path4043" - sodipodi:cx="-38.944729" - sodipodi:cy="15.643351" - sodipodi:rx="8.9230967" - sodipodi:ry="8.8397036" - d="M -30.021632 15.643351 A 8.9230967 8.8397036 0 1 1 -47.867826,15.643351 A 8.9230967 8.8397036 0 1 1 -30.021632 15.643351 z" - transform="matrix(1.2616822,0,0,1.1226415,62.529072,-5.2595765)" - mask="url(#mask4181)" /> - <g - id="g4417" - clip-path="url(#clipPath4423)" - transform="translate(50.116184,2.1870546e-2)"> - <path - transform="translate(1.387814,-0.4734046)" - clip-path="none" - id="path4279" - d="M -47.32329,19.312662 L -6.0456207,19.312662" - style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4429);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <path - transform="translate(1.387814,-0.4734046)" - clip-path="none" - id="path4281" - d="M -47.32329,22.48125 L -6.045621,22.48125" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4431);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <path - transform="translate(1.387814,-0.4734046)" - clip-path="none" - id="path4283" - d="M -47.32329,25.482334 L -6.0456207,25.482334" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4433);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <path - transform="translate(1.387814,-0.4734046)" - clip-path="none" - id="path4285" - d="M -47.32329,28.481612 L -6.0456207,28.481612" - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4435);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - </g> -</svg> diff --git a/testing/ekiga/PKGBUILD b/testing/ekiga/PKGBUILD deleted file mode 100644 index 607051ba4..000000000 --- a/testing/ekiga/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 163076 2012-07-06 16:17:13Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tom K <tomk@runbox.com> - -pkgname=ekiga -pkgver=3.3.2 -pkgrel=5 -pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" -url="http://www.ekiga.org" -license=(GPL) -arch=(i686 x86_64) -depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') -makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') -optdepends=('evolution-data-server: Evolution integration') -options=(!emptydirs) -groups=('gnome-extra') -install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gcc47.patch) -sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a' - '9e3000016e1174be5d6cc60c89abeaeb61a98eb163a38abf11f4af4f2d6363ec') - -build() { - cd "$pkgname-$pkgver" - patch -Np1 -i "$srcdir/gcc47.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-schemas-install \ - --disable-scrollkeeper --enable-dbus - make -} - -package() { - cd "$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 ekiga "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas -} diff --git a/testing/ekiga/ekiga.install b/testing/ekiga/ekiga.install deleted file mode 100644 index 91f3a57a0..000000000 --- a/testing/ekiga/ekiga.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=ekiga - -post_install() { - 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() { - gconfpkg --uninstall $pkgname -} - -post_remove() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} diff --git a/testing/ekiga/gcc47.patch b/testing/ekiga/gcc47.patch deleted file mode 100644 index f12c37524..000000000 --- a/testing/ekiga/gcc47.patch +++ /dev/null @@ -1,99 +0,0 @@ -From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001 -From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> -Date: Sat, 24 Mar 2012 09:17:40 +0000 -Subject: Fix compile error with gcc 4.7 - ---- -diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h -index e16848e..b0a8775 100644 ---- a/lib/engine/account/bank-impl.h -+++ b/lib/engine/account/bank-impl.h -@@ -203,7 +203,7 @@ template<typename AccountType> - void - Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account) - { -- add_object (account); -+ this->add_object (account); - - account->questions.connect (boost::ref (questions)); - } -@@ -213,7 +213,7 @@ template<typename AccountType> - void - Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account) - { -- remove_object (account); -+ this->remove_object (account); - } - - #endif -diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h -index 711d8d9..4fea7d5 100644 ---- a/lib/engine/addressbook/book-impl.h -+++ b/lib/engine/addressbook/book-impl.h -@@ -204,7 +204,7 @@ void - Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact) - { - contact->questions.connect (boost::ref (questions)); -- add_object (contact); -+ this->add_object (contact); - } - - -@@ -212,7 +212,7 @@ template<typename ContactType> - void - Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact) - { -- remove_object (contact); -+ this->remove_object (contact); - } - - #endif -diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h -index a30cd03..630236f 100644 ---- a/lib/engine/addressbook/source-impl.h -+++ b/lib/engine/addressbook/source-impl.h -@@ -206,7 +206,7 @@ template<typename BookType> - void - Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book) - { -- add_object (book); -+ this->add_object (book); - - add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1))); - -diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h -index 245a7c6..92074a8 100644 ---- a/lib/engine/presence/cluster-impl.h -+++ b/lib/engine/presence/cluster-impl.h -@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap) - - add_connection (heap, heap->questions.connect (boost::ref (questions))); - -- add_object (heap); -+ this->add_object (heap); - } - - template<typename HeapType> -diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h -index d63c491..15fe86f 100644 ---- a/lib/engine/presence/heap-impl.h -+++ b/lib/engine/presence/heap-impl.h -@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp - { - presentity->questions.connect (boost::ref (questions)); - -- add_object (presentity); -+ this->add_object (presentity); - } - - template<typename PresentityType> - void - Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity) - { -- remove_object (presentity); -+ this->remove_object (presentity); - } - - #endif --- -cgit v0.9.0.2 diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD deleted file mode 100644 index 265d45050..000000000 --- a/testing/ffmpeg/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 163055 2012-07-06 15:21:01Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=ffmpeg -pkgver=0.11.1 -pkgrel=1 -epoch=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" -arch=('i686' 'x86_64') -url="http://ffmpeg.org/" -license=('GPL') -depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib) -makedepends=('yasm' 'git' 'libvdpau') -source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -md5sums=('ff8cb914f657e164dd60ea1008b555a8') - -build() { - cd $pkgname-$pkgver - - ./configure \ - --prefix=/usr \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-libgsm \ - --enable-libspeex \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libschroedinger \ - --enable-libopenjpeg \ - --enable-librtmp \ - --enable-libpulse \ - --enable-libv4l2 \ - --enable-gpl \ - --enable-version3 \ - --enable-runtime-cpudetect \ - --disable-debug \ - --disable-static - - make - make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/ffmpegthumbnailer/PKGBUILD b/testing/ffmpegthumbnailer/PKGBUILD deleted file mode 100644 index f9afaf39a..000000000 --- a/testing/ffmpegthumbnailer/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: boromil@gmail.com - -pkgname=ffmpegthumbnailer -pkgver=2.0.7 -pkgrel=5 -pkgdesc="Lightweight video thumbnailer that can be used by file managers." -url="http://code.google.com/p/ffmpegthumbnailer/" -license=('GPL2') -arch=('i686' 'x86_64') -depends=('ffmpeg' 'libjpeg' 'libpng') -optdepends=('gvfs: support for gio uris') -source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz" - 'ffmpegthumbnailer.desktop' 'ffmpegapi_fix_r241.patch') -options=('!libtool') -sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73' - 'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53' - '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Don't use deprecated (removed?) ffmpeg api - patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch" - - ./configure --prefix=/usr --enable-gio - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # FS#24105: Generate thumbnails in nautilus - # FS#26540: Rename to .thumbnailer for nautilus - install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \ - "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer" -} diff --git a/testing/ffmpegthumbnailer/ffmpegapi_fix_r241.patch b/testing/ffmpegthumbnailer/ffmpegapi_fix_r241.patch deleted file mode 100644 index 37e65b059..000000000 --- a/testing/ffmpegthumbnailer/ffmpegapi_fix_r241.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- libffmpegthumbnailer/moviedecoder.cpp.old 2012-05-20 11:57:04.503450287 +0200 -+++ libffmpegthumbnailer/moviedecoder.cpp 2012-05-20 11:57:14.633450566 +0200 -@@ -58,19 +58,26 @@ - void MovieDecoder::initialize(const string& filename) - { - av_register_all(); -- avcodec_init(); - avcodec_register_all(); - - string inputFile = filename == "-" ? "pipe:" : filename; - m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0); -- -+ -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0) -+#else -+ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0) -+#endif - { - destroy(); - throw logic_error(string("Could not open input file: ") + filename); - } - -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (av_find_stream_info(m_pFormatContext) < 0) -+#else -+ if (avformat_find_stream_info(m_pFormatContext, NULL) < 0) -+#endif - { - destroy(); - throw logic_error(string("Could not find stream information")); -@@ -90,8 +97,12 @@ - - if ((!m_FormatContextWasGiven) && m_pFormatContext) - { -+#if LIBAVCODEC_VERSION_MAJOR < 53 - av_close_input_file(m_pFormatContext); - m_pFormatContext = NULL; -+#else -+ avformat_close_input(&m_pFormatContext); -+#endif - } - - if (m_pPacket) -@@ -159,7 +170,11 @@ - - m_pVideoCodecContext->workaround_bugs = 1; - -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0) -+#else -+ if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0) -+#endif - { - throw logic_error("Could not open video codec"); - } diff --git a/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop deleted file mode 100644 index 79203e5bc..000000000 --- a/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Thumbnailer Entry] -TryExec=ffmpegthumbnailer -Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10 -MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v; diff --git a/testing/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/testing/gcc/gcc-4.7.1-libgo-mksysinfo.patch deleted file mode 100644 index 427efe8a6..000000000 --- a/testing/gcc/gcc-4.7.1-libgo-mksysinfo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200 -+++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200 -@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go | - # The rusage struct. - rusage=`grep '^type _rusage struct' gen-sysinfo.go` - if test "$rusage" != ""; then -- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -- rusage=`echo $rusage | sed -e 's/^ *//'` - # Remove anonymous unions from GNU/Linux <bits/resource.h>. - rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'` -+ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` -+ rusage=`echo $rusage | sed -e 's/^ *//'` - nrusage= - while test -n "$rusage"; do - field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'` diff --git a/testing/gegl/PKGBUILD b/testing/gegl/PKGBUILD deleted file mode 100644 index af0262d65..000000000 --- a/testing/gegl/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 163057 2012-07-06 15:21:11Z ibiru $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgname=gegl -pkgver=0.2.0 -pkgrel=2 -pkgdesc="Graph based image processing framework" -arch=('i686' 'x86_64') -url="http://www.gegl.org/" -license=('GPL3' 'LGPL3') -depends=('babl' 'gtk2') -makedepends=('intltool' 'ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2') -optdepends=('openexr: for using the openexr plugin' \ - 'ffmpeg: for using the ffmpeg plugin' \ - 'librsvg: for using the svg plugin' \ - 'jasper: for using the jasper plugin') -options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ - --with-libavformat --with-jasper --disable-docs - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gpm/PKGBUILD b/testing/gpm/PKGBUILD deleted file mode 100644 index 3293e1ccc..000000000 --- a/testing/gpm/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 163459 2012-07-12 01:32:54Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=gpm -pkgver=1.20.6 -pkgrel=10 -pkgdesc="A mouse server for the console and xterm" -arch=('i686' 'x86_64') -url="http://www.nico.schottelius.org/software/gpm/" -license=('GPL') -depends=('ncurses' 'bash') -backup=('etc/conf.d/gpm') -options=('!makeflags') -install=gpm.install -source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \ - gpm gpm.conf.d gpm.sh gpm.service) -sha1sums=('4677da0eb2f1910a5a744bbefa08fea82e0dca0c' - '19e1feb1493373512a77801699df012d186336ea' - '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' - '88fe5ff10916c68a87abc8418a56eb0073f69fa9' - '20b92360f0ad38a2032fcae37bdbd01b31e43f77') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm" - install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm" - install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh" - install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service" - -# library fixes - cd "${pkgdir}/usr/lib/" - ln -s libgpm.so.2.* libgpm.so - chmod 755 "${pkgdir}"/usr/lib/libgpm.so.* -} diff --git a/testing/gpm/gpm b/testing/gpm/gpm deleted file mode 100755 index 7b5213dd7..000000000 --- a/testing/gpm/gpm +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -GPM_ARGS= -[ -f /etc/conf.d/gpm ] && . /etc/conf.d/gpm - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/sbin/gpm) -case "$1" in - start) - stat_busy "Starting GPM Daemon" - [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS} - PID=$(pidof -o %PPID /usr/sbin/gpm) - if [ -z "$PID" ]; then - stat_fail - else - add_daemon gpm - stat_done - fi - ;; - stop) - stat_busy "Stopping GPM Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gpm - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/gpm/gpm.conf.d b/testing/gpm/gpm.conf.d deleted file mode 100644 index ab43bb7eb..000000000 --- a/testing/gpm/gpm.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to gpm -# -GPM_ARGS="-m /dev/input/mice -t imps2" diff --git a/testing/gpm/gpm.install b/testing/gpm/gpm.install deleted file mode 100644 index 2a1519a6c..000000000 --- a/testing/gpm/gpm.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=/usr/share/info -file=gpm.info.gz - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file $infodir/dir 2> /dev/null -} diff --git a/testing/gpm/gpm.service b/testing/gpm/gpm.service deleted file mode 100644 index 59e837d80..000000000 --- a/testing/gpm/gpm.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Virtual console mouse server - -[Service] -Type=forking -ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2 - -[Install] -WantedBy=multi-user.target diff --git a/testing/gpm/gpm.sh b/testing/gpm/gpm.sh deleted file mode 100755 index af35a5f33..000000000 --- a/testing/gpm/gpm.sh +++ /dev/null @@ -1,3 +0,0 @@ -case $( /usr/bin/tty ) in - /dev/tty[0-9]*) [ -n "$(pgrep gpm)" ] && /usr/bin/disable-paste ;; -esac diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD deleted file mode 100644 index fd4ee2dec..000000000 --- a/testing/gstreamer0.10-ugly/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 163077 2012-07-06 16:17:18Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gstreamer0.10-ugly -pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') -pkgver=0.10.19 -pkgrel=2 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') -url="http://gstreamer.freedesktop.org/" -options=(!libtool) -source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz - opencore-amr.patch) -md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' - 'd8feb6c99bfaff8be6b2c48ea4e98e47') - -build() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - patch -Np0 -i "${srcdir}/opencore-amr.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" - make - sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile -} - -check() { - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make check -} - -package_gstreamer0.10-ugly() { - pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries" - depends=('gstreamer0.10-base>=0.10.34') - - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -package_gstreamer0.10-ugly-plugins() { - pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)" - depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') - groups=('gstreamer0.10-plugins') - replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') - - cd "${srcdir}/gst-plugins-ugly-${pkgver}" - make -C ext DESTDIR="${pkgdir}" install -} diff --git a/testing/gstreamer0.10-ugly/opencore-amr.patch b/testing/gstreamer0.10-ugly/opencore-amr.patch deleted file mode 100644 index 0a350dc46..000000000 --- a/testing/gstreamer0.10-ugly/opencore-amr.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ext/amrnb/amrnbdec.h.orig 2012-03-12 16:49:14.417405139 +0000 -+++ ext/amrnb/amrnbdec.h 2012-03-12 16:49:35.393899419 +0000 -@@ -22,7 +22,7 @@ - - #include <gst/gst.h> - #include <gst/audio/gstaudiodecoder.h> --#include <interf_dec.h> -+#include <opencore-amrnb/interf_dec.h> - - G_BEGIN_DECLS - ---- ext/amrnb/amrnbenc.h.orig 2012-03-12 16:49:23.833996062 +0000 -+++ ext/amrnb/amrnbenc.h 2012-03-12 16:49:46.597141876 +0000 -@@ -21,7 +21,7 @@ - #define __GST_AMRNBENC_H__ - - #include <gst/gst.h> --#include <interf_enc.h> -+#include <opencore-amrnb/interf_enc.h> - #include <gst/audio/gstaudioencoder.h> - - G_BEGIN_DECLS ---- ext/amrwbdec/amrwbdec.h.orig 2012-03-12 16:47:48.658100992 +0000 -+++ ext/amrwbdec/amrwbdec.h 2012-03-12 16:48:12.177910733 +0000 -@@ -22,8 +22,8 @@ - - #include <gst/gst.h> - #include <gst/audio/gstaudiodecoder.h> --#include <dec_if.h> --#include <if_rom.h> -+#include <opencore-amrwb/dec_if.h> -+#include <opencore-amrwb/if_rom.h> - - G_BEGIN_DECLS - diff --git a/testing/k3b/PKGBUILD b/testing/k3b/PKGBUILD deleted file mode 100644 index 3e5611155..000000000 --- a/testing/k3b/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 163058 2012-07-06 15:21:20Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=k3b -pkgver=2.0.2 -pkgrel=5 -pkgdesc="Feature-rich and easy to handle CD burning application" -arch=('i686' 'x86_64') -url="http://k3b.org/" -license=('GPL') -depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad' - 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrkit' 'libxft') -makedepends=('cmake' 'automoc4' 'docbook-xml') -optdepends=('dvd+rw-tools: for dvd burning support' - 'vcdimager: for vcd burning support' - 'transcode: for advanced mpeg conversion support' - 'emovix: for bootable multimedia cd/dvd support' - 'cdrdao: for disk-at-once (DAO) mode support') -options=('!libtool') -install=k3b.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch) -sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' - '8120c0e22e6c41ea285ca6060be13723ed91c52b' - '5b35bff3f7670686a32bd71afea2deaca4331631') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch" - patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch" - cd .. - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/k3b/k3b-2.0.2-ffmpeg.patch b/testing/k3b/k3b-2.0.2-ffmpeg.patch deleted file mode 100644 index 2878b1edc..000000000 --- a/testing/k3b/k3b-2.0.2-ffmpeg.patch +++ /dev/null @@ -1,96 +0,0 @@ -commit 61ca30beb978f68e72257408777c6433f33129bd -Author: Michal Malek <michalm@jabster.pl> -Date: Sun Aug 28 20:18:53 2011 +0200 - - Fixed compilation with new FFMPEG - - BUG: 274817 - FIXED-IN: 2.0.3 - -diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -index 0ad59fc..0c5f366 100644 ---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open() - #else - ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; - #endif -- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { -+ if( codecContext->codec_type != -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ AVMEDIA_TYPE_AUDIO) -+#else -+ CODEC_TYPE_AUDIO) -+#endif -+ { - kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; - return false; - } -@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const - QString K3bFFMpegFile::title() const - { - // FIXME: is this UTF8 or something?? -- if( d->formatContext->title[0] != '\0' ) -- return QString::fromLocal8Bit( d->formatContext->title ); -+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 ); -+ if( ade == NULL ) -+ return QString(); -+ if( ade->value != '\0' ) -+ return QString::fromLocal8Bit( ade->value ); - else - return QString(); - } -@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const - QString K3bFFMpegFile::author() const - { - // FIXME: is this UTF8 or something?? -- if( d->formatContext->author[0] != '\0' ) -- return QString::fromLocal8Bit( d->formatContext->author ); -+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 ); -+ if( ade == NULL ) -+ return QString(); -+ if( ade->value != '\0' ) -+ return QString::fromLocal8Bit( ade->value ); - else - return QString(); - } -@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const - QString K3bFFMpegFile::comment() const - { - // FIXME: is this UTF8 or something?? -- if( d->formatContext->comment[0] != '\0' ) -- return QString::fromLocal8Bit( d->formatContext->comment ); -+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 ); -+ if( ade == NULL ) -+ return QString(); -+ if( ade->value != '\0' ) -+ return QString::fromLocal8Bit( ade->value ); - else - return QString(); - } -@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer() - #if LIBAVCODEC_VERSION_MAJOR < 52 - int len = ::avcodec_decode_audio( - #else -+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ int len = ::avcodec_decode_audio3( -+ #else - int len = ::avcodec_decode_audio2( -+ #endif - #endif -+ - #ifdef FFMPEG_BUILD_PRE_4629 - &d->formatContext->streams[0]->codec, - #else -@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer() - #endif - (short*)d->alignedOutputBuffer, - &d->outputBufferSize, -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) -+ &d->packet ); -+#else - d->packetData, d->packetSize ); -+#endif - - if( d->packetSize <= 0 || len < 0 ) - ::av_free_packet( &d->packet ); diff --git a/testing/k3b/k3b-2.0.2-libavformat54.patch b/testing/k3b/k3b-2.0.2-libavformat54.patch deleted file mode 100644 index 174a776b8..000000000 --- a/testing/k3b/k3b-2.0.2-libavformat54.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -=================================================================== ---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp -@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open() - close(); - - // open the file -- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); -+ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL); - if( err < 0 ) { - kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; - return false; -@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open() - } - - // dump some debugging info -- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); -+ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); - - return true; - } diff --git a/testing/k3b/k3b.install b/testing/k3b/k3b.install deleted file mode 100644 index 413ad60f7..000000000 --- a/testing/k3b/k3b.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/kdemultimedia/PKGBUILD b/testing/kdemultimedia/PKGBUILD deleted file mode 100644 index 72962105c..000000000 --- a/testing/kdemultimedia/PKGBUILD +++ /dev/null @@ -1,111 +0,0 @@ -# $Id: PKGBUILD 163059 2012-07-06 15:21:31Z ibiru $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdemultimedia -pkgname=('kdemultimedia-dragonplayer' - 'kdemultimedia-ffmpegthumbs' - 'kdemultimedia-juk' - 'kdemultimedia-kioslave' - 'kdemultimedia-kmix' - 'kdemultimedia-kscd' - 'kdemultimedia-mplayerthumbs') -pkgver=4.8.4 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdemultimedia') -makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse' - 'libmusicbrainz3' 'taglib' 'libcanberra') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'mplayerthumbs.config' - 'ffmpeg0.11.patch') -sha1sums=('dac721e82308a6347d578361e25da7c466a26ba7' - 'ba016fa2563c14ffcba852c62506b66bfc6ee683' - '48331f7e2dab760c20708b81fe6c4d47c83a63e7') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs - patch -p1 -i ${srcdir}/ffmpeg0.11.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_TunePimp=OFF - make -} - -package_kdemultimedia-dragonplayer() { - pkgdesc='Video Player' - depends=('kdebase-runtime') - url="http://kde.org/applications/multimedia/dragonplayer/" - install='kdemultimedia-dragonplayer.install' - cd $srcdir/build/dragonplayer - make DESTDIR=$pkgdir install - cd $srcdir/build/dragonplayer/doc - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-ffmpegthumbs() { - pkgdesc='Video Files (ffmpegthumbs)' - depends=('kdebase-runtime' 'ffmpeg') - install='kdemultimedia.install' - cd $srcdir/build/ffmpegthumbs - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-juk() { - pkgdesc='Music Player' - depends=('kdebase-runtime' 'taglib') - url="http://kde.org/applications/multimedia/juk" - install='kdemultimedia.install' - cd $srcdir/build/juk - make DESTDIR=$pkgdir install - cd $srcdir/build/juk/doc - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-kioslave() { - pkgdesc='Audio CD Browser' - depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') - conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') - replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') - for i in kioslave libkcddb libkcompactdisc; do - cd $srcdir/build/${i} - make DESTDIR=$pkgdir install - done -} - -package_kdemultimedia-kmix() { - pkgdesc='Sound Mixer' - depends=('kdebase-runtime') - url="http://kde.org/applications/multimedia/kmix" - install='kdemultimedia.install' - cd $srcdir/build/kmix - make DESTDIR=$pkgdir install - cd $srcdir/build/kmix/doc - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-kscd() { - pkgdesc='CD Player' - depends=('kdebase-runtime' 'libmusicbrainz3') - url="http://kde.org/applications/multimedia/kscd" - install='kdemultimedia.install' - cd $srcdir/build/kscd - make DESTDIR=$pkgdir install -} - -package_kdemultimedia-mplayerthumbs() { - pkgdesc='Video Files (MPlayerThumbs)' - depends=('kdebase-runtime' 'mplayer') - replaces=('mplayerthumbs') - conflicts=('mplayerthumbs') - cd $srcdir/build/mplayerthumbs - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs -} diff --git a/testing/kdemultimedia/ffmpeg0.11.patch b/testing/kdemultimedia/ffmpeg0.11.patch deleted file mode 100644 index 527ac3992..000000000 --- a/testing/kdemultimedia/ffmpeg0.11.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Christoph Feck <christoph@maxiom.de> -Date: Tue, 29 May 2012 13:53:18 +0000 -Subject: Two deprecated calls have been removed from ffmpeg 0.11. -X-Git-Tag: v4.8.80 -X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&a=commitdiff&h=4f03b20614c122e3e14473d42a000c0bffdce39c ---- -Two deprecated calls have been removed from ffmpeg 0.11. - -BUG:300732 ---- - - ---- a/ffmpegthumbnailer/moviedecoder.cpp -+++ b/ffmpegthumbnailer/moviedecoder.cpp -@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder() - void MovieDecoder::initialize(const QString& filename) - { - av_register_all(); -- avcodec_init(); - avcodec_register_all(); - - QFileInfo fileInfo(filename); - -- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) { -+ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) { - kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath(); - return; - } - diff --git a/testing/kdemultimedia/kdemultimedia-dragonplayer.install b/testing/kdemultimedia/kdemultimedia-dragonplayer.install deleted file mode 100644 index 5495fb1b5..000000000 --- a/testing/kdemultimedia/kdemultimedia-dragonplayer.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/kdemultimedia/kdemultimedia.install b/testing/kdemultimedia/kdemultimedia.install deleted file mode 100644 index e70c054ec..000000000 --- a/testing/kdemultimedia/kdemultimedia.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/kdemultimedia/mplayerthumbs.config b/testing/kdemultimedia/mplayerthumbs.config deleted file mode 100644 index 761a17953..000000000 --- a/testing/kdemultimedia/mplayerthumbs.config +++ /dev/null @@ -1,2 +0,0 @@ -[MPlayerThumbsCfg] -backend=0 diff --git a/testing/kmod/kmod.install b/testing/kmod/kmod.install deleted file mode 100644 index 0a2e88dc5..000000000 --- a/testing/kmod/kmod.install +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -post_upgrade() { - if [ "$(vercmp 9-2 "$2")" -eq 1 ]; then - echo "==> Kernel modules are now only read from /usr/lib/modules, all custom" - echo " built kernels and modules must be moved there before rebooting." - fi -} - diff --git a/testing/kradio/PKGBUILD b/testing/kradio/PKGBUILD deleted file mode 100644 index e06525a04..000000000 --- a/testing/kradio/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 163060 2012-07-06 15:21:36Z ibiru $ -# Maintainer: -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=kradio -pkgver=4.0.4 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL2') -pkgdesc="A comfortable KDE internet and AM/FM radio application" -url="http://kradio.sourceforge.net/" -depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') -makedepends=('automoc4' 'cmake') -install=$pkgname.install -source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc}) -md5sums=('4b5495a4f1dda21f7201bc8db0d4f95e' - '51c6d4ec0047d2df595b458bde285012') - -build() { - cd "$srcdir" - mkdir build - cd build - cmake ../${pkgname}4-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install -} diff --git a/testing/kradio/kradio.install b/testing/kradio/kradio.install deleted file mode 100644 index 460e85d7f..000000000 --- a/testing/kradio/kradio.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/libusb-compat/PKGBUILD b/testing/libusb-compat/PKGBUILD deleted file mode 100644 index 3e4235ff4..000000000 --- a/testing/libusb-compat/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 162897 2012-07-03 09:52:18Z tpowa $ -# Maintainer: -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: arjan <arjan@archlinux.org> - -pkgname=libusb-compat -pkgver=0.1.4 -pkgrel=2 -pkgdesc="Library to enable user space application programs to communicate with USB devices" -arch=('i686' 'x86_64') -url="http://libusb.sourceforge.net/" -license=('LGPL') -depends=('libusb' 'sh') -options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2" - "libusb-0.1-libusbx.patch") -md5sums=('2ca521fffadd0c28fdf174e6ec73865b' - '1612c3982f307da1332d6db57b16742b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # http://libusb.org/ticket/138 can be removed with libusbx 1.0.13 - patch -Np0 -i ../libusb-0.1-libusbx.patch - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - diff --git a/testing/libusb-compat/libusb-0.1-libusbx.patch b/testing/libusb-compat/libusb-0.1-libusbx.patch deleted file mode 100644 index 61563651b..000000000 --- a/testing/libusb-compat/libusb-0.1-libusbx.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://bugs.gentoo.org/423135 - ---- libusb/core.c -+++ libusb/core.c -@@ -32,12 +32,6 @@ - static libusb_context *ctx = NULL; - static int usb_debug = 0; - --enum usbi_log_level { -- LOG_LEVEL_DEBUG, -- LOG_LEVEL_INFO, -- LOG_LEVEL_WARNING, -- LOG_LEVEL_ERROR, --}; - - #ifdef ENABLE_LOGGING - #define _usbi_log(level, fmt...) usbi_log(level, __FUNCTION__, fmt) diff --git a/testing/mediastreamer/PKGBUILD b/testing/mediastreamer/PKGBUILD deleted file mode 100644 index 602e9f631..000000000 --- a/testing/mediastreamer/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 163061 2012-07-06 15:21:41Z ibiru $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Adrià Arrufat <swiftscythe@gmail.com> - -pkgname=mediastreamer -pkgver=2.8.2 -pkgrel=2 -pkgdesc="A library written in C that allows you to create and run audio and video streams" -arch=('i686' 'x86_64') -url="http://www.linphone.org/" -license=('GPL') -depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse') -makedepends=('intltool') -options=('!libtool') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} - mediastreamer-ffmpeg.patch) -md5sums=('e51ea9d5fce1396b374d10473dfbadec' - '805da7def98f367e621363fa0c951fe8' - 'f147546489a973f148ce3dd2dba36834') - -build() { - cd "${srcdir}"/$pkgname-$pkgver - patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/testing/mediastreamer/mediastreamer-ffmpeg.patch b/testing/mediastreamer/mediastreamer-ffmpeg.patch deleted file mode 100644 index 944d4b833..000000000 --- a/testing/mediastreamer/mediastreamer-ffmpeg.patch +++ /dev/null @@ -1,205 +0,0 @@ -diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h -index 5ae8a63..86edf86 100644 ---- mediastreamer2/include/mediastreamer2/msvideo.h -+++ mediastreamer2/include/mediastreamer2/msvideo.h -@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #define msvideo_h - - #include <mediastreamer2/msfilter.h> -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - - /* some global constants for video MSFilter(s) */ - #define MS_VIDEO_SIZE_SQCIF_W 128 -@@ -206,7 +212,9 @@ extern "C"{ - MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt); - MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt); - MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - MS2_PUBLIC void ms_ffmpeg_check_init(void); -+#endif - MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m); - MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h); - MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h); -diff --git a/src/h264dec.c b/src/h264dec.c -index 223de3d..8c40a7c 100644 ---- mediastreamer2/src/h264dec.c -+++ mediastreamer2/src/h264dec.c -@@ -44,7 +44,9 @@ typedef struct _DecData{ - static void ffmpeg_init(){ - static bool_t done=FALSE; - if (!done){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - avcodec_init(); -+#endif - avcodec_register_all(); - done=TRUE; - } -diff --git a/src/mscommon.c b/src/mscommon.c -index 2cab005..bebb946 100644 ---- mediastreamer2/src/mscommon.c -+++ mediastreamer2/src/mscommon.c -@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include "mediastreamer2/mscodecutils.h" - #include "mediastreamer2/msfilter.h" - #include <ortp/ortp_srtp.h> -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - - extern void __register_ffmpeg_encoders_if_possible(void); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - extern void ms_ffmpeg_check_init(); -+#endif - extern bool_t libmsandroiddisplay_init(void); - extern void libmsandroiddisplaybad_init(void); - extern void libmsandroidopengldisplay_init(void); -@@ -645,7 +653,9 @@ void ms_init(){ - } - } - #if !defined(NO_FFMPEG) -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - __register_ffmpeg_encoders_if_possible(); - #endif - #endif -diff --git a/src/videodec.c b/src/videodec.c -index c04e1e9..a455075 100644 ---- mediastreamer2/src/videodec.c -+++ mediastreamer2/src/videodec.c -@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include "mediastreamer2/msvideo.h" - #include "mediastreamer2/msticker.h" - #include "rfc2429.h" -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - -- -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - extern void ms_ffmpeg_check_init(); -+#endif - - - typedef struct DecState{ -@@ -50,7 +57,9 @@ typedef struct DecState{ - - static void dec_init(MSFilter *f, enum CodecID cid){ - DecState *s=(DecState *)ms_new0(DecState,1); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - - avcodec_get_context_defaults(&s->av_context); - s->av_codec=NULL; -diff --git a/src/videoenc.c b/src/videoenc.c -index 21d016f..520f06a 100644 ---- mediastreamer2/src/videoenc.c -+++ mediastreamer2/src/videoenc.c -@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - #define RATE_CONTROL_MARGIN 15000 /*bits/second*/ - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - static bool_t avcodec_initialized=FALSE; -+#endif - - #ifdef ENABLE_LOG_FFMPEG - -@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) - - #endif - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - void ms_ffmpeg_check_init(){ - if(!avcodec_initialized){ - avcodec_init(); -@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){ - #endif - } - } -+#endif - - /* the goal of this small object is to tell when to send I frames at startup: - at 2 and 4 seconds*/ -@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec) - { - EncState *s=(EncState *)ms_new(EncState,1); - f->data=s; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - s->profile=0;/*always default to profile 0*/ - s->comp_buf=NULL; - s->fps=15; -@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){ - if (s->profile==0){ - s->codec=CODEC_ID_H263; - }else{ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - c->flags|=CODEC_FLAG_H263P_UMV; -+#endif - c->flags|=CODEC_FLAG_AC_PRED; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; -+#endif - /* - c->flags|=CODEC_FLAG_OBMC; - c->flags|=CODEC_FLAG_AC_PRED; -@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){ - // assume video size is CIF or QCIF - if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60; - else header->b_wptr[1] = 0x40; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10; -+#else -+ if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10; -+#endif - header->b_wptr += 4; - header->b_cont = *packet; - *packet = header; -@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ - s->req_vfu=TRUE; - } - if (s->req_vfu){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - pict.pict_type=FF_I_TYPE; -+#else -+ pict.pict_type=AV_PICTURE_TYPE_I; -+#endif - s->req_vfu=FALSE; - } - comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base; -@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ - if (s->framenum==1){ - video_starter_first_frame (&s->starter,f->ticker->time); - } -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - if (c->coded_frame->pict_type==FF_I_TYPE){ -+#else -+ if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){ -+#endif - ms_message("Emitting I-frame"); - } - comp_buf->b_wptr+=error; -@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={ - #endif - - void __register_ffmpeg_encoders_if_possible(void){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - if (avcodec_find_encoder(CODEC_ID_MPEG4)) - ms_filter_register(&ms_mpeg4_enc_desc); - if (avcodec_find_encoder(CODEC_ID_H263)){ diff --git a/testing/miro/PKGBUILD b/testing/miro/PKGBUILD deleted file mode 100644 index 7302846be..000000000 --- a/testing/miro/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 163062 2012-07-06 15:21:48Z ibiru $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> - -pkgname=miro -pkgver=5.0.1 -pkgrel=2 -pkgdesc="The free and open source internet TV platform" -arch=('i686' 'x86_64') -url="http://www.getmiro.com" -license=('GPL2') -depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' - 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info' - 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' - 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar' - 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' - 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils') -makedepends=('pkg-config' 'boost') -install=miro.install -source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" - 'ffmpeg.patch') -sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa' - 'ce0f42be2a0a3ac99f07b5abfabf0975928c841c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - cd linux - patch -p2 -i "${srcdir}"/ffmpeg.patch - - python2 setup.py install --root="${pkgdir}" - - # fix miro startup script so --debug works with python2 - sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro" - sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro" - - # fix python scripts for python2 - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" ${pkgdir}/usr/share/miro/resources/searchengines/update-icons.py - for i in usr/share/miro/resources/testdata/echonest-replies/generate.py usr/share/miro/resources/searchengines/update-icons.py \ - usr/share/miro/resources/testdata/7digital-replies/generate.py; do - sed -i "s|/usr/bin/python|/usr/bin/python2|" ${pkgdir}/${i} - done - - # Fakeroot segfaults on these; remove - if [ ${arch} == "i686" ]; then - rm -f ${pkgdir}/usr/bin/codegen.Linux-x86_64 || true - else - rm -f ${pkgdir}/usr/bin/codegen.Linux-i686 || true - fi -} diff --git a/testing/miro/ffmpeg.patch b/testing/miro/ffmpeg.patch deleted file mode 100644 index 99c14107d..000000000 --- a/testing/miro/ffmpeg.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- miro-5.0.1/linux/miro-segmenter.c~ 2012-07-06 14:33:24.618082171 +0000 -+++ miro-5.0.1/linux/miro-segmenter.c 2012-07-06 15:10:19.564146117 +0000 -@@ -156,7 +156,7 @@ - exit(1); - } - -- ret = av_open_input_file(&ic, input, ifmt, 0, NULL); -+ ret = avformat_open_input(&ic, input, ifmt, 0); - if (ret != 0) { - fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret); - exit(1); -@@ -215,12 +215,7 @@ - } - } - -- if (av_set_parameters(oc, NULL) < 0) { -- fprintf(stderr, "Invalid output format parameters\n"); -- exit(1); -- } -- -- dump_format(oc, 0, input, 1); -+ av_dump_format(oc, 0, input, 1); - - if (video_st) { - codec = avcodec_find_decoder(video_st->codec->codec_id); -@@ -233,12 +228,12 @@ - } - } - -- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - exit(1); - } - -- if (av_write_header(oc)) { -+ if (avformat_write_header(oc, NULL)) { - fprintf(stderr, "Could not write mpegts header to first output file\n"); - - exit(1); -@@ -274,10 +269,10 @@ - } - - if (segment_time - prev_segment_time >= segment_duration) { -- put_flush_packet(oc->pb); -- url_fclose(oc->pb); -+ avio_flush(oc->pb); -+ avio_close(oc->pb); - -- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { -+ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) { - fprintf(stderr, "Could not open '%s'\n", output_filename); - break; - } -@@ -307,7 +302,7 @@ - av_freep(&oc->streams[i]); - } - -- url_fclose(oc->pb); -+ avio_close(oc->pb); - av_free(oc); - - /* End-of-transcode marker. */ diff --git a/testing/miro/miro.install b/testing/miro/miro.install deleted file mode 100644 index a5ee228aa..000000000 --- a/testing/miro/miro.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q - xdg-icon-resource forceupdate --theme hicolor - update-mime-database usr/share/mime > /dev/null -} - - diff --git a/testing/moc/PKGBUILD b/testing/moc/PKGBUILD deleted file mode 100644 index 13d711cc9..000000000 --- a/testing/moc/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 163063 2012-07-06 15:21:51Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=moc -pkgver=20120224 -pkgrel=2 -pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" -arch=('i686' 'x86_64') -url="http://moc.daper.net/" -license=('GPL') -depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file') -makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') -optdepends=('speex: for using the speex plugin' - 'ffmpeg: for using the ffmpeg plugin' - 'taglib: for using the musepack plugin' - 'libmpcdec: for using the musepack plugin' - 'wavpack: for using the wavpack plugin' - 'libmodplug: for using the modplug plugin') -options=('!libtool') -source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz{,.sig}) -sha1sums=('8ad3521d99fe6f2514907088c70e50c84ec09b46' - 'e8b2396d99692b0c4f85971d3fa6f5aecb1eb9d3') - -# source PKGBUILD && mksource -mksource() { - [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) - _svnver=2412 - _svntrunk="svn://daper.net/moc/trunk" - _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 - rm -r ${pkgname}-${pkgver} - gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - -# Disabling aac to use the external ffmpeg to play them (FS#13164) - autoreconf -i - ./configure --prefix=/usr --without-rcc --without-aac \ - --with-oss --with-alsa --with-jack --with-mp3 \ - --with-musepack --with-vorbis --with-flac --with-wavpack \ - --with-sndfile --with-modplug --with-ffmpeg --with-speex \ - --with-samplerate --with-curl --disable-debug - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/mpd/PKGBUILD b/testing/mpd/PKGBUILD deleted file mode 100644 index 0d0222580..000000000 --- a/testing/mpd/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 163064 2012-07-06 15:22:01Z ibiru $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Ben <ben@benmazer.net> - -pkgname=mpd -pkgver=0.17 -pkgrel=2 -pkgdesc='Flexible, powerful, server-side application for playing music' -url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' -license=('GPL') -arch=('i686' 'x86_64') -depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2' - 'sqlite' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag' - 'libpulse') -makedepends=('doxygen') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" - 'tmpfiles.d' - 'rc.d') -sha1sums=('36201f32ca5729b62b0e6cbddb19ade20ee3f7d7' - 'f4d5922abb69abb739542d8e93f4dfd748acdad7' - '3470d489565f0ed479f1665dd2876f66acb5a585') - -backup=('etc/mpd.conf') -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-lastfm \ - --enable-jack \ - --enable-pulse \ - --enable-documentation \ - --disable-libwrap \ - --disable-cue \ - --disable-sidplay \ - --disable-documentation \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - sed \ - -e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \ - -e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \ - -e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \ - -e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \ - -e '/^#user/c user "mpd"' \ - -i doc/mpdconf.example - - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd - install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists - install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf -} diff --git a/testing/mpd/install b/testing/mpd/install deleted file mode 100644 index 261b8fd0d..000000000 --- a/testing/mpd/install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null - getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null - true -} - -post_remove() { - getent passwd mpd &>/dev/null && userdel mpd >/dev/null - getent group mpd &>/dev/null && groupdel mpd >/dev/null - true -} diff --git a/testing/mpd/rc.d b/testing/mpd/rc.d deleted file mode 100755 index f00e16067..000000000 --- a/testing/mpd/rc.d +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy 'Starting Music Player Daemon' - /usr/bin/mpd /etc/mpd.conf &> /dev/null && - { add_daemon mpd; stat_done; } || stat_fail - ;; - stop) - stat_busy 'Stopping Music Player Daemon' - /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null && - { rm_daemon mpd; stat_done; } || stat_fail - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/mpd/tmpfiles.d b/testing/mpd/tmpfiles.d deleted file mode 100644 index 41c4e743a..000000000 --- a/testing/mpd/tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/mpd 0755 mpd mpd diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD deleted file mode 100644 index 5f53b5efa..000000000 --- a/testing/mpfr/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 162956 2012-07-04 03:39:00Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=mpfr -_pkgver=3.1.1 -#_patchlevel=p1 -#pkgver=${_pkgver}.${_patchlevel} -pkgver=${_pkgver} -pkgrel=1 -pkgdesc="Multiple-precision floating-point library" -arch=('i686' 'x86_64') -url="http://www.mpfr.org/" -license=('LGPL') -depends=('gmp>=5.0') -options=('!libtool') -install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}) -md5sums=('91d51c41fcf2799e4ee7a7126fc95c17' - '91b187a2229211e543ba6fb82a079b2c') - -build() { - cd "${srcdir}/${pkgname}-${_pkgver}" - ./configure --prefix=/usr --enable-thread-safe --enable-shared - make -} - -check() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/mpfr/mpfr-3.1.0.p10.patch b/testing/mpfr/mpfr-3.1.0.p10.patch deleted file mode 100644 index 0073be709..000000000 --- a/testing/mpfr/mpfr-3.1.0.p10.patch +++ /dev/null @@ -1,1896 +0,0 @@ -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 -@@ -0,0 +1 @@ -+mpfr_unlikely -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 -@@ -1 +1 @@ --3.1.0 -+3.1.0-p1 -diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h ---- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 -@@ -988,10 +988,11 @@ - ******************************************************/ - - /* Theses macros help the compiler to determine if a test is -- * likely or unlikely. */ -+ likely or unlikely. The !! is necessary in case x is larger -+ than a long. */ - #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) - # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) --# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) -+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) - #else - # define MPFR_LIKELY(x) (x) - # define MPFR_UNLIKELY(x) (x) -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0" -+#define MPFR_VERSION_STRING "3.1.0-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0"; -+ return "3.1.0-p1"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-10-14 10:43:32.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-10-14 10:43:32.000000000 +0000 -@@ -0,0 +1 @@ -+lib-search-path -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-10-14 10:43:32.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p1 -+3.1.0-p2 -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p1" -+#define MPFR_VERSION_STRING "3.1.0-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-10-14 10:43:32.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p1"; -+ return "3.1.0-p2"; - } -diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am ---- mpfr-3.1.0-a/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 -@@ -65,8 +65,24 @@ - TESTS = $(check_PROGRAMS) - TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) - --# Option to prevent libtool from generating wrapper scripts for the tests. -+# The -no-install option prevents libtool from generating wrapper scripts -+# for the tests. - # This is useful to easily run the test scripts under valgrind or gdb. - # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 - # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. --AM_LDFLAGS = -no-install -+# -+# The -L$(top_builddir)/src/.libs option is necessary for some platforms, -+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR -+# library is already installed in the corresponding lib directory: its -+# purpose is to make sure that the local .libs comes first in the library -+# search path (otherwise the tests are linked against the old MPFR library -+# by the LINK command -- see the generated Makefile). See: -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html -+# and -+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 -+# -+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs -diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in ---- mpfr-3.1.0-a/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 -+++ mpfr-3.1.0-b/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 -@@ -1124,11 +1124,27 @@ - TESTS = $(check_PROGRAMS) - TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) - --# Option to prevent libtool from generating wrapper scripts for the tests. -+# The -no-install option prevents libtool from generating wrapper scripts -+# for the tests. - # This is useful to easily run the test scripts under valgrind or gdb. - # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 - # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. --AM_LDFLAGS = -no-install -+# -+# The -L$(top_builddir)/src/.libs option is necessary for some platforms, -+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR -+# library is already installed in the corresponding lib directory: its -+# purpose is to make sure that the local .libs comes first in the library -+# search path (otherwise the tests are linked against the old MPFR library -+# by the LINK command -- see the generated Makefile). See: -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html -+# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html -+# and -+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 -+# -+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs - all: all-am - - .SUFFIXES: -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-11-03 15:15:11.000000000 +0000 -@@ -0,0 +1 @@ -+vasprintf -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-10-14 10:43:32.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-11-03 15:15:11.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p2 -+3.1.0-p3 -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p2" -+#define MPFR_VERSION_STRING "3.1.0-p3" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c ---- mpfr-3.1.0-a/src/vasprintf.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/vasprintf.c 2011-11-03 15:15:11.000000000 +0000 -@@ -1178,7 +1178,7 @@ - mpfr_exp_t exp; - char * str; - const int spec_g = (spec.spec == 'g' || spec.spec == 'G'); -- const int keep_trailing_zeros = spec_g && spec.alt; -+ const int keep_trailing_zeros = !spec_g || spec.alt; - - /* WARNING: an empty precision field is forbidden (it means precision = 6 - and it should have been changed to 6 before the function call) */ -@@ -1356,7 +1356,7 @@ - else - /* 1 <= |p| */ - { -- size_t nsd; /* Number of significant digits */ -+ size_t str_len; - - /* Determine the position of the most significant decimal digit. */ - exp = floor_log10 (p); -@@ -1365,12 +1365,10 @@ - /* P is too large to print all its integral part digits */ - return -1; - -- np->ip_size = exp + 1; -- -- nsd = spec.prec + np->ip_size; - if (dec_info == NULL) -- { -- str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode); -+ { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */ -+ str = -+ mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode); - register_string (np->sl, str); - } - else -@@ -1379,81 +1377,60 @@ - str = dec_info->str; - } - np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */ -+ str_len = strlen (str); -+ -+ /* integral part */ -+ if (exp > str_len) -+ /* mpfr_get_str gives no trailing zero when p is rounded up to the next -+ power of 10 (p integer, so no fractional part) */ -+ { -+ np->ip_trailing_zeros = exp - str_len; -+ np->ip_size = str_len; -+ } -+ else -+ np->ip_size = exp; - - if (spec.group) - /* thousands separator in integral part */ - np->thousands_sep = MPFR_THOUSANDS_SEPARATOR; - -- if (nsd == 0 || (spec_g && !spec.alt)) -- /* compute how much non-zero digits in integral and fractional -- parts */ -+ /* fractional part */ -+ str += np->ip_size; -+ str_len -= np->ip_size; -+ if (!keep_trailing_zeros) -+ /* remove trailing zeros, if any */ - { -- size_t str_len; -- str_len = strlen (str); /* note: the sign has been skipped */ -- -- if (exp > str_len) -- /* mpfr_get_str doesn't give the trailing zeros when p is a -- multiple of 10 (p integer, so no fractional part) */ -- { -- np->ip_trailing_zeros = exp - str_len; -- np->ip_size = str_len; -- if (spec.alt) -- np->point = MPFR_DECIMAL_POINT; -- } -- else -- /* str may contain some digits which are in fractional part */ -+ char *ptr = str + str_len - 1; /* pointer to the last digit of -+ str */ -+ while ((*ptr == '0') && (str_len != 0)) - { -- char *ptr; -- -- ptr = str + str_len - 1; /* points to the end of str */ -- str_len -= np->ip_size; /* number of digits in fractional -- part */ -- -- if (!keep_trailing_zeros) -- /* remove trailing zeros, if any */ -- { -- while ((*ptr == '0') && (str_len != 0)) -- { -- --ptr; -- --str_len; -- } -- } -- -- if (str_len > INT_MAX) -- /* too many digits in fractional part */ -- return -1; -- -- if (str_len != 0) -- /* some digits in fractional part */ -- { -- np->point = MPFR_DECIMAL_POINT; -- np->fp_ptr = str + np->ip_size; -- np->fp_size = str_len; -- } -+ --ptr; -+ --str_len; - } - } -- else -- /* spec.prec digits in fractional part */ -+ -+ if (str_len > 0) -+ /* some nonzero digits in fractional part */ - { -- if (np->ip_size == exp - 1) -- /* the absolute value of the number has been rounded up to a power -- of ten. -- Insert an additional zero in integral part and put the rest of -- them in fractional part. */ -- np->ip_trailing_zeros = 1; -+ if (str_len > INT_MAX) -+ /* too many digits in fractional part */ -+ return -1; - -- if (spec.prec != 0) -- { -- MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp); -- MPFR_ASSERTD (np->ip_size + spec.prec == nsd); -+ np->point = MPFR_DECIMAL_POINT; -+ np->fp_ptr = str; -+ np->fp_size = str_len; -+ } - -- np->point = MPFR_DECIMAL_POINT; -- np->fp_ptr = str + np->ip_size; -- np->fp_size = spec.prec; -- } -- else if (spec.alt) -- np->point = MPFR_DECIMAL_POINT; -+ if (keep_trailing_zeros && str_len < spec.prec) -+ /* add missing trailing zeros */ -+ { -+ np->point = MPFR_DECIMAL_POINT; -+ np->fp_trailing_zeros = spec.prec - np->fp_size; - } -+ -+ if (spec.alt) -+ /* add decimal point even if no digits follow it */ -+ np->point = MPFR_DECIMAL_POINT; - } - - return 0; -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-10-14 10:43:32.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-11-03 15:15:11.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p2"; -+ return "3.1.0-p3"; - } -diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c ---- mpfr-3.1.0-a/tests/tsprintf.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/tsprintf.c 2011-11-03 15:15:11.000000000 +0000 -@@ -475,6 +475,18 @@ - check_sprintf ("-1.", "%- #0.1RG", x); - - /* precision zero */ -+ mpfr_set_d (x, 9.5, MPFR_RNDN); -+ check_sprintf ("9", "%.0RDf", x); -+ check_sprintf ("10", "%.0RUf", x); -+ -+ mpfr_set_d (x, 19.5, MPFR_RNDN); -+ check_sprintf ("19", "%.0RDf", x); -+ check_sprintf ("20", "%.0RUf", x); -+ -+ mpfr_set_d (x, 99.5, MPFR_RNDN); -+ check_sprintf ("99", "%.0RDf", x); -+ check_sprintf ("100", "%.0RUf", x); -+ - mpfr_set_d (x, -9.5, MPFR_RNDN); - check_sprintf ("-10", "%.0RDf", x); - check_sprintf ("-10", "%.0RYf", x); -@@ -1078,6 +1090,23 @@ - mpfr_clear (x); - } - -+static void -+bug20111102 (void) -+{ -+ mpfr_t t; -+ char s[100]; -+ -+ mpfr_init2 (t, 84); -+ mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN); -+ mpfr_sprintf (s, "%.20RNg", t); -+ if (strcmp (s, "1000") != 0) -+ { -+ printf ("Error in bug20111102, expected 1000, got %s\n", s); -+ exit (1); -+ } -+ mpfr_clear (t); -+} -+ - /* In particular, the following test makes sure that the rounding - * for %Ra and %Rb is not done on the MPFR number itself (as it - * would overflow). Note: it has been reported on comp.std.c that -@@ -1161,6 +1190,7 @@ - locale = setlocale (LC_ALL, "C"); - #endif - -+ bug20111102 (); - native_types (); - hexadecimal (); - binary (); -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-11-28 12:22:52.000000000 +0000 -@@ -0,0 +1 @@ -+gmp41compat -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-11-28 12:22:52.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p3 -+3.1.0-p4 -diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info ---- mpfr-3.1.0-a/doc/mpfr.info 2011-10-03 09:43:04.000000000 +0000 -+++ mpfr-3.1.0-b/doc/mpfr.info 2011-11-28 12:22:52.000000000 +0000 -@@ -2994,11 +2994,12 @@ - - * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1. Their - behavior no longer depends on the platform (assuming this is also -- true for GMP's random generator). As a consequence, the returned -- values can be different between MPFR 3.1 and previous MPFR -- versions. Note: as the reproducibility of these functions was not -- specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded -- as backward incompatible with previous versions. -+ true for GMP's random generator, which is not the case between GMP -+ 4.1 and 4.2 if `gmp_randinit_default' is used). As a consequence, -+ the returned values can be different between MPFR 3.1 and previous -+ MPFR versions. Note: as the reproducibility of these functions -+ was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ -+ regarded as backward incompatible with previous versions. - - - -@@ -4239,13 +4240,13 @@ - Node: Type and Macro Changes129308 - Node: Added Functions132029 - Node: Changed Functions134972 --Node: Removed Functions139167 --Node: Other Changes139579 --Node: Contributors141108 --Node: References143574 --Node: GNU Free Documentation License145315 --Node: Concept Index167758 --Node: Function and Type Index173677 -+Node: Removed Functions139253 -+Node: Other Changes139665 -+Node: Contributors141194 -+Node: References143660 -+Node: GNU Free Documentation License145401 -+Node: Concept Index167844 -+Node: Function and Type Index173763 - - End Tag Table - -diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi ---- mpfr-3.1.0-a/doc/mpfr.texi 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/doc/mpfr.texi 2011-11-28 12:22:52.000000000 +0000 -@@ -3466,8 +3466,9 @@ - a lack of specification. - - @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1. --Their behavior no longer depends on the platform (assuming this is also --true for GMP's random generator). As a consequence, the returned values -+Their behavior no longer depends on the platform (assuming this is also true -+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if -+@code{gmp_randinit_default} is used). As a consequence, the returned values - can be different between MPFR 3.1 and previous MPFR versions. - Note: as the reproducibility of these functions was not specified - before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p3" -+#define MPFR_VERSION_STRING "3.1.0-p4" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-11-28 12:22:52.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p3"; -+ return "3.1.0-p4"; - } -diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c ---- mpfr-3.1.0-a/tests/trandom.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/trandom.c 2011-11-28 12:22:52.000000000 +0000 -@@ -114,21 +114,29 @@ - mpfr_t x; - gmp_randstate_t s; - -+#if __MPFR_GMP(4,2,0) -+# define C1 "0.895943" -+# define C2 "0.848824" -+#else -+# define C1 "0.479652" -+# define C2 "0.648529" -+#endif -+ - gmp_randinit_default (s); - gmp_randseed_ui (s, 42); - mpfr_init2 (x, 17); - mpfr_urandomb (x, s); -- if (mpfr_cmp_str1 (x, "0.895943") != 0) -+ if (mpfr_cmp_str1 (x, C1) != 0) - { -- printf ("Error in bug20100914, expected 0.895943, got "); -+ printf ("Error in bug20100914, expected " C1 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); - } - mpfr_urandomb (x, s); -- if (mpfr_cmp_str1 (x, "0.848824") != 0) -+ if (mpfr_cmp_str1 (x, C2) != 0) - { -- printf ("Error in bug20100914, expected 0.848824, got "); -+ printf ("Error in bug20100914, expected " C2 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); -diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c ---- mpfr-3.1.0-a/tests/turandom.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/turandom.c 2011-11-28 12:22:52.000000000 +0000 -@@ -160,23 +160,29 @@ - mpfr_t x; - gmp_randstate_t s; - -+#if __MPFR_GMP(4,2,0) -+# define C1 "0.8488312" -+# define C2 "0.8156509" -+#else -+# define C1 "0.6485367" -+# define C2 "0.9362717" -+#endif -+ - gmp_randinit_default (s); - gmp_randseed_ui (s, 42); - mpfr_init2 (x, 17); - mpfr_urandom (x, s, MPFR_RNDN); -- /* the following values are obtained on a 32-bit computer, we should get -- the same values on a 64-bit computer */ -- if (mpfr_cmp_str1 (x, "0.8488312") != 0) -+ if (mpfr_cmp_str1 (x, C1) != 0) - { -- printf ("Error in bug20100914, expected 0.8488312, got "); -+ printf ("Error in bug20100914, expected " C1 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); - } - mpfr_urandom (x, s, MPFR_RNDN); -- if (mpfr_cmp_str1 (x, "0.8156509") != 0) -+ if (mpfr_cmp_str1 (x, C2) != 0) - { -- printf ("Error in bug20100914, expected 0.8156509, got "); -+ printf ("Error in bug20100914, expected " C2 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-02-24 12:44:49.000000000 +0000 -@@ -0,0 +1 @@ -+logging-freeze -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-02-24 12:44:49.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p4 -+3.1.0-p5 -diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c ---- mpfr-3.1.0-a/src/add_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add_d.c 2012-02-24 12:44:49.000000000 +0000 -@@ -34,7 +34,7 @@ - (("b[%Pu]=%.*Rg c=%.20g rnd=%d", - mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), - ("a[%Pu]=%.*Rg inexact=%d", -- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); -+ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); - - MPFR_SAVE_EXPO_MARK (expo); - -diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c ---- mpfr-3.1.0-a/src/add_ui.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add_ui.c 2012-02-24 12:44:49.000000000 +0000 -@@ -29,7 +29,7 @@ - MPFR_LOG_FUNC - (("x[%Pu]=%.*Rg u=%d rnd=%d", - mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode), -- ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y)); -+ ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y)); - - if (MPFR_LIKELY(u != 0) ) /* if u=0, do nothing */ - { -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p4" -+#define MPFR_VERSION_STRING "3.1.0-p5" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c ---- mpfr-3.1.0-a/src/mul_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mul_d.c 2012-02-24 12:44:49.000000000 +0000 -@@ -34,7 +34,7 @@ - (("b[%Pu]=%.*Rg c=%.20g rnd=%d", - mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), - ("a[%Pu]=%.*Rg inexact=%d", -- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); -+ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); - - MPFR_SAVE_EXPO_MARK (expo); - -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-02-24 12:44:49.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p4"; -+ return "3.1.0-p5"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-02-24 13:50:05.000000000 +0000 -@@ -0,0 +1 @@ -+logging-varfmt -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-02-24 13:50:05.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p5 -+3.1.0-p6 -diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h ---- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 -@@ -1592,7 +1592,7 @@ - do \ - if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) && \ - (mpfr_log_current <= mpfr_log_level)) \ -- LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__, \ -+ LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__, \ - #x, mpfr_get_prec (x), mpfr_log_prec, x); \ - while (0) - -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p5" -+#define MPFR_VERSION_STRING "3.1.0-p6" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-02-24 13:50:05.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p5"; -+ return "3.1.0-p6"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-03-08 15:17:03.000000000 +0000 -@@ -0,0 +1 @@ -+large-prec -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-03-08 15:17:03.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p6 -+3.1.0-p7 -diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c ---- mpfr-3.1.0-a/src/add1.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add1.c 2012-03-08 15:17:03.000000000 +0000 -@@ -44,12 +44,12 @@ - bq = MPFR_PREC(b); - cq = MPFR_PREC(c); - -- an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */ -+ an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */ - aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS; - sh = aq2 - aq; /* non-significant bits in low limb */ - -- bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */ -- cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - - ap = MPFR_MANT(a); - bp = MPFR_MANT(b); -@@ -124,7 +124,7 @@ - dif = aq2 - diff_exp; - /* dif is the number of bits of c which overlap with a' */ - -- difn = (dif-1)/GMP_NUMB_BITS + 1; -+ difn = MPFR_PREC2LIMBS (dif); - /* only the highest difn limbs from c have to be considered */ - if (MPFR_UNLIKELY(difn > cn)) - { -diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c ---- mpfr-3.1.0-a/src/add1sp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add1sp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -107,7 +107,7 @@ - - /* Read prec and num of limbs */ - p = MPFR_PREC(b); -- n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; -+ n = MPFR_PREC2LIMBS (p); - MPFR_UNSIGNED_MINUS_MODULO(sh, p); - bx = MPFR_GET_EXP(b); - d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c)); -diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c ---- mpfr-3.1.0-a/src/agm.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/agm.c 2012-03-08 15:17:03.000000000 +0000 -@@ -91,7 +91,7 @@ - q = MPFR_PREC(r); - p = q + MPFR_INT_CEIL_LOG2(q) + 15; - MPFR_ASSERTD (p >= 7); /* see algorithms.tex */ -- s = (p - 1) / GMP_NUMB_BITS + 1; -+ s = MPFR_PREC2LIMBS (p); - - /* b (op2) and a (op1) are the 2 operands but we want b >= a */ - compare = mpfr_cmp (op1, op2); -@@ -285,7 +285,7 @@ - - /* Next iteration */ - MPFR_ZIV_NEXT (loop, p); -- s = (p - 1) / GMP_NUMB_BITS + 1; -+ s = MPFR_PREC2LIMBS (p); - } - MPFR_ZIV_FREE (loop); - -diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c ---- mpfr-3.1.0-a/src/eq.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/eq.c 2012-03-08 15:17:03.000000000 +0000 -@@ -56,8 +56,8 @@ - if (uexp != vexp) - return 0; /* no bit agree */ - -- usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1; -- vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1; -+ usize = MPFR_LIMB_SIZE (u); -+ vsize = MPFR_LIMB_SIZE (v); - - if (vsize > usize) /* exchange u and v */ - { -diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c ---- mpfr-3.1.0-a/src/exp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/exp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -133,7 +133,7 @@ - mp_size_t yn; - int sh; - -- yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; -+ yn = MPFR_LIMB_SIZE (y); - sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y); - MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh; - inexact = 1; -diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c ---- mpfr-3.1.0-a/src/get_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_d.c 2012-03-08 15:17:03.000000000 +0000 -@@ -100,7 +100,7 @@ - nbits += (1021 + e); - MPFR_ASSERTD (nbits >= 1); - } -- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ np = MPFR_PREC2LIMBS (nbits); - MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE ); - carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, - nbits, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c ---- mpfr-3.1.0-a/src/get_flt.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_flt.c 2012-03-08 15:17:03.000000000 +0000 -@@ -92,7 +92,7 @@ - nbits += (125 + e); - MPFR_ASSERTD (nbits >= 1); - } -- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ np = MPFR_PREC2LIMBS (nbits); - MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT); - carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, - nbits, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c ---- mpfr-3.1.0-a/src/get_str.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_str.c 2012-03-08 15:17:03.000000000 +0000 -@@ -2351,7 +2351,7 @@ - - /* the first digit will contain only r bits */ - prec = (m - 1) * pow2 + r; /* total number of bits */ -- n = (prec - 1) / GMP_NUMB_BITS + 1; -+ n = MPFR_PREC2LIMBS (prec); - - MPFR_TMP_MARK (marker); - x1 = MPFR_TMP_LIMBS_ALLOC (n + 1); -@@ -2417,12 +2417,12 @@ - exact = 1; - - /* number of limbs */ -- n = 1 + (prec - 1) / GMP_NUMB_BITS; -+ n = MPFR_PREC2LIMBS (prec); - - /* a will contain the approximation of the mantissa */ - a = MPFR_TMP_LIMBS_ALLOC (n); - -- nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; -+ nx = MPFR_LIMB_SIZE (x); - - if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or - division to perform */ -diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c ---- mpfr-3.1.0-a/src/init2.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/init2.c 2012-03-08 15:17:03.000000000 +0000 -@@ -51,7 +51,7 @@ - which both have an odd mantissa */ - MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); - -- xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1; -+ xsize = MPFR_PREC2LIMBS (p); - tmp = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize)); - - MPFR_PREC(x) = p; /* Set prec */ -diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c ---- mpfr-3.1.0-a/src/lngamma.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/lngamma.c 2012-03-08 15:17:03.000000000 +0000 -@@ -67,7 +67,7 @@ - - /* Now, the unit bit is represented. */ - -- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; -+ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; - /* number of represented fractional bits (including the trailing 0's) */ - - x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS); -diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h ---- mpfr-3.1.0-a/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-03-09 12:06:26.000000000 +0000 -@@ -646,10 +646,24 @@ - **************** mpfr_t properties ******************* - ******************************************************/ - -+/* In the following macro, p is usually a mpfr_prec_t, but this macro -+ works with other integer types (without integer overflow). Checking -+ that p >= 1 in debug mode is useful here because this macro can be -+ used on a computed precision (in particular, this formula does not -+ work for a degenerate case p = 0, and could give different results -+ on different platforms). But let us not use an assertion checking -+ in the MPFR_LAST_LIMB() and MPFR_LIMB_SIZE() macros below to avoid -+ too much expansion for assertions (in practice, this should be a -+ problem just when testing MPFR with the --enable-assert configure -+ option and the -ansi -pedantic-errors gcc compiler flags). */ -+#define MPFR_PREC2LIMBS(p) \ -+ (MPFR_ASSERTD ((p) >= 1), ((p) - 1) / GMP_NUMB_BITS + 1) -+ - #define MPFR_PREC(x) ((x)->_mpfr_prec) - #define MPFR_EXP(x) ((x)->_mpfr_exp) - #define MPFR_MANT(x) ((x)->_mpfr_d) --#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1) -+#define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS) -+#define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1) - - - /****************************************************** -@@ -749,7 +763,8 @@ - #define MPFR_IS_FP(x) (!MPFR_IS_NAN(x) && !MPFR_IS_INF(x)) - #define MPFR_IS_SINGULAR(x) (MPFR_EXP(x) <= MPFR_EXP_INF) - #define MPFR_IS_PURE_FP(x) (!MPFR_IS_SINGULAR(x) && \ -- (MPFR_ASSERTD (MPFR_MANT(x)[MPFR_LIMB_SIZE(x)-1] & MPFR_LIMB_HIGHBIT), 1)) -+ (MPFR_ASSERTD ((MPFR_MANT(x)[MPFR_LAST_LIMB(x)] \ -+ & MPFR_LIMB_HIGHBIT) != 0), 1)) - - #define MPFR_ARE_SINGULAR(x,y) \ - (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)) || MPFR_UNLIKELY(MPFR_IS_SINGULAR(y))) -@@ -1061,7 +1076,7 @@ - /* Set a number to 1 (Fast) - It doesn't check if 1 is in the exponent range */ - #define MPFR_SET_ONE(x) \ - do { \ -- mp_size_t _size = MPFR_LIMB_SIZE(x) - 1; \ -+ mp_size_t _size = MPFR_LAST_LIMB(x); \ - MPFR_SET_POS(x); \ - MPFR_EXP(x) = 1; \ - MPN_ZERO ( MPFR_MANT(x), _size); \ -@@ -1213,8 +1228,8 @@ - _destp = MPFR_MANT (dest); \ - if (MPFR_UNLIKELY (_destprec >= _srcprec)) \ - { \ -- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs; \ -+ _srcs = MPFR_PREC2LIMBS (_srcprec); \ -+ _dests = MPFR_PREC2LIMBS (_destprec) - _srcs; \ - MPN_COPY (_destp + _dests, srcp, _srcs); \ - MPN_ZERO (_destp, _dests); \ - inexact = 0; \ -@@ -1227,8 +1242,8 @@ - mp_limb_t _rb, _sb, _ulp; \ - \ - /* Compute Position and shift */ \ -- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -+ _srcs = MPFR_PREC2LIMBS (_srcprec); \ -+ _dests = MPFR_PREC2LIMBS (_destprec); \ - MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec); \ - _sp = (srcp) + _srcs - _dests; \ - \ -@@ -1372,7 +1387,7 @@ - if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src))) \ - { \ - MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src), \ -- (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \ -+ MPFR_LIMB_SIZE (src)); \ - inexact = 0; \ - } \ - else \ -@@ -1682,7 +1697,7 @@ - MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ - if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ - mpfr_abort_prec_max (); \ -- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ -+ _size = MPFR_PREC2LIMBS (_prec); \ - if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE)) \ - { \ - (g).alloc = (num) * _size * sizeof (mp_limb_t); \ -@@ -1733,7 +1748,7 @@ - MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ - if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ - mpfr_abort_prec_max (); \ -- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ -+ _size = MPFR_PREC2LIMBS (_prec); \ - (g).alloc = (num) * _size * sizeof (mp_limb_t); \ - if (MPFR_LIKELY (_oalloc == 0)) \ - (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc); \ -@@ -1886,7 +1901,7 @@ - MPFR_NORETURN_ATTR; - - __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t, -- unsigned long)); -+ mpfr_prec_t)); - - __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*, - unsigned long)); -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-03-08 15:17:03.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p6" -+#define MPFR_VERSION_STRING "3.1.0-p7" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/mul.c mpfr-3.1.0-b/src/mul.c ---- mpfr-3.1.0-a/src/mul.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mul.c 2012-03-08 15:17:03.000000000 +0000 -@@ -93,15 +93,15 @@ - - ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c); - -- bq = MPFR_PREC(b); -- cq = MPFR_PREC(c); -+ bq = MPFR_PREC (b); -+ cq = MPFR_PREC (c); - -- MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); - -- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ -- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ -- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ tn = MPFR_PREC2LIMBS (bq + cq); - /* <= k, thus no int overflow */ - MPFR_ASSERTD(tn <= k); - -@@ -292,12 +292,12 @@ - bq = MPFR_PREC (b); - cq = MPFR_PREC (c); - -- MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); - -- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ -- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ -- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ tn = MPFR_PREC2LIMBS (bq + cq); - MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */ - - /* Check for no size_t overflow*/ -diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c ---- mpfr-3.1.0-a/src/pow.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/pow.c 2012-03-08 15:17:03.000000000 +0000 -@@ -136,7 +136,7 @@ - (b) all the 'z' bits are zero - */ - -- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; -+ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; - /* number of z+0 bits */ - - yn = prec / GMP_NUMB_BITS; -diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c ---- mpfr-3.1.0-a/src/print_raw.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/print_raw.c 2012-03-08 15:17:03.000000000 +0000 -@@ -84,7 +84,7 @@ - int i; - mpfr_prec_t count = 0; - char c; -- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; -+ mp_size_t n = MPFR_PREC2LIMBS (r); - - printf("%s ", str); - for(n-- ; n>=0 ; n--) -@@ -109,7 +109,7 @@ - int i; - mpfr_prec_t count = 0; - char c; -- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; -+ mp_size_t n = MPFR_PREC2LIMBS (r); - - for(n-- ; n>=0 ; n--) - { -diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c ---- mpfr-3.1.0-a/src/round_prec.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/round_prec.c 2012-03-08 15:17:03.000000000 +0000 -@@ -55,12 +55,12 @@ - - MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX); - -- nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */ -+ nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */ - - /* check if x has enough allocated space for the significand */ - /* Get the number of limbs from the precision. - (Compatible with all allocation methods) */ -- ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ ow = MPFR_LIMB_SIZE (x); - if (nw > ow) - { - /* FIXME: Variable can't be created using custom allocation, -diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c ---- mpfr-3.1.0-a/src/round_raw_generic.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/round_raw_generic.c 2012-03-08 15:17:03.000000000 +0000 -@@ -80,7 +80,7 @@ - (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg))) - return 0; - -- xsize = (xprec-1)/GMP_NUMB_BITS + 1; -+ xsize = MPFR_PREC2LIMBS (xprec); - nw = yprec / GMP_NUMB_BITS; - rw = yprec & (GMP_NUMB_BITS - 1); - -diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c ---- mpfr-3.1.0-a/src/set.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set.c 2012-03-08 15:17:03.000000000 +0000 -@@ -48,8 +48,7 @@ - /* Same precision and b is not singular: - * just copy the mantissa, and set the exponent and the sign - * The result is exact. */ -- MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), -- (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); -+ MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b)); - MPFR_RET (0); - } - else -diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c ---- mpfr-3.1.0-a/src/set_f.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set_f.c 2012-03-08 15:17:03.000000000 +0000 -@@ -43,7 +43,7 @@ - if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0) - MPFR_CHANGE_SIGN (y); - -- sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; -+ sy = MPFR_LIMB_SIZE (y); - my = MPFR_MANT(y); - mx = PTR(x); - -diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c ---- mpfr-3.1.0-a/src/set_prec.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set_prec.c 2012-03-08 15:17:03.000000000 +0000 -@@ -32,7 +32,7 @@ - MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); - - /* Calculate the new number of limbs */ -- xsize = (p - 1) / GMP_NUMB_BITS + 1; -+ xsize = MPFR_PREC2LIMBS (p); - - /* Realloc only if the new size is greater than the old */ - xoldsize = MPFR_GET_ALLOC_SIZE (x); -diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c ---- mpfr-3.1.0-a/src/setmax.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/setmax.c 2012-03-08 15:17:03.000000000 +0000 -@@ -32,7 +32,7 @@ - mp_limb_t *xp; - - MPFR_SET_EXP (x, e); -- xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; -+ xn = MPFR_LIMB_SIZE (x); - sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x); - xp = MPFR_MANT(x); - xp[0] = MP_LIMB_T_MAX << sh; -diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c ---- mpfr-3.1.0-a/src/sqr.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/sqr.c 2012-03-08 15:17:03.000000000 +0000 -@@ -56,11 +56,11 @@ - ax = 2 * MPFR_GET_EXP (b); - bq = MPFR_PREC(b); - -- MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX); - -- bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */ -- tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square, -- 2*bn or 2*bn-1 */ -+ bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */ -+ tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square, -+ 2*bn or 2*bn-1 */ - - if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD)) - return mpfr_mul (a, b, b, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c ---- mpfr-3.1.0-a/src/stack_interface.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/stack_interface.c 2012-03-08 15:17:03.000000000 +0000 -@@ -26,7 +26,7 @@ - size_t - mpfr_custom_get_size (mpfr_prec_t prec) - { -- return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB; -+ return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB; - } - - #undef mpfr_custom_init -diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c ---- mpfr-3.1.0-a/src/strtofr.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/strtofr.c 2012-03-08 15:17:03.000000000 +0000 -@@ -467,7 +467,7 @@ - /* Set y to the value of the ~prec most significant bits of pstr->mant - (as long as we guarantee correct rounding, we don't need to get - exactly prec bits). */ -- ysize = (prec - 1) / GMP_NUMB_BITS + 1; -+ ysize = MPFR_PREC2LIMBS (prec); - /* prec bits corresponds to ysize limbs */ - ysize_bits = ysize * GMP_NUMB_BITS; - /* and to ysize_bits >= prec > MPFR_PREC (x) bits */ -diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c ---- mpfr-3.1.0-a/src/sub1sp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/sub1sp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -155,8 +155,8 @@ - MPFR_ASSERTD(MPFR_IS_PURE_FP(c)); - - /* Read prec and num of limbs */ -- p = MPFR_PREC(b); -- n = (p-1)/GMP_NUMB_BITS+1; -+ p = MPFR_PREC (b); -+ n = MPFR_PREC2LIMBS (p); - - /* Fast cmp of |b| and |c|*/ - bx = MPFR_GET_EXP (b); -diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c ---- mpfr-3.1.0-a/src/urandomb.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/urandomb.c 2012-03-08 15:17:03.000000000 +0000 -@@ -31,13 +31,20 @@ - a sufficient number of limbs */ - void - mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate, -- unsigned long int nbits) -+ mpfr_prec_t nbits) - { - mpz_t z; - -+ MPFR_ASSERTN (nbits >= 1); - /* To be sure to avoid the potential allocation of mpz_urandomb */ -- ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1; -+ ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits); - PTR(z) = mp; -+#if __MPFR_GMP(5,0,0) -+ /* Check for integer overflow (unless mp_bitcnt_t is signed, -+ but according to the GMP manual, this shouldn't happen). -+ Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */ -+ MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1); -+#endif - mpz_urandomb (z, rstate, nbits); - } - -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-03-08 15:17:03.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p6"; -+ return "3.1.0-p7"; - } -diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c ---- mpfr-3.1.0-a/tests/tinits.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/tinits.c 2012-03-08 15:17:03.000000000 +0000 -@@ -1,4 +1,4 @@ --/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears. -+/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears. - - Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - Contributed by the Arenaire and Caramel projects, INRIA. -@@ -20,18 +20,43 @@ - http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - -+#include <stdlib.h> -+ - #include "mpfr-test.h" - - int - main (void) - { - mpfr_t a, b, c; -+ long large_prec; - - tests_start_mpfr (); -+ - mpfr_inits (a, b, c, (mpfr_ptr) 0); - mpfr_clears (a, b, c, (mpfr_ptr) 0); - mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0); - mpfr_clears (a, b, c, (mpfr_ptr) 0); -+ -+ /* test for precision 2^31-1, see -+ https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */ -+ large_prec = 2147483647; -+ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL) -+ { -+ /* We assume that the precision won't be increased internally. */ -+ if (large_prec > MPFR_PREC_MAX) -+ large_prec = MPFR_PREC_MAX; -+ mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0); -+ mpfr_set_ui (a, 17, MPFR_RNDN); -+ mpfr_set (b, a, MPFR_RNDN); -+ if (mpfr_get_ui (a, MPFR_RNDN) != 17) -+ { -+ printf ("Error in mpfr_init2 with precision 2^31-1\n"); -+ exit (1); -+ } -+ mpfr_clears (a, b, (mpfr_ptr) 0); -+ } -+ - tests_end_mpfr (); -+ - return 0; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-03-12 11:59:47.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-03-12 11:59:47.000000000 +0000 -@@ -0,0 +1 @@ -+__gmp_const -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-03-12 11:59:47.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p7 -+3.1.0-p8 -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-03-12 11:59:47.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p7" -+#define MPFR_VERSION_STRING "3.1.0-p8" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -@@ -39,6 +39,18 @@ - # include <gmp.h> - #endif - -+/* GMP's internal __gmp_const macro has been removed on 2012-03-04: -+ http://gmplib.org:8000/gmp/rev/d287cfaf6732 -+ const is standard and now assumed to be available. If the __gmp_const -+ definition is no longer present in GMP, this probably means that GMP -+ assumes that const is available; thus let's define it to const. -+ Note: this is a temporary fix that can be backported to previous MPFR -+ versions. In the future, __gmp_const should be replaced by const like -+ in GMP. */ -+#ifndef __gmp_const -+# define __gmp_const const -+#endif -+ - /* Avoid some problems with macro expansion if the user defines macros - with the same name as keywords. By convention, identifiers and macro - names starting with mpfr_ are reserved by MPFR. */ -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-03-12 11:59:47.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p7"; -+ return "3.1.0-p8"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-04-27 01:13:15.000000000 +0000 -@@ -0,0 +1 @@ -+gamma-underflow -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-03-12 11:59:47.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-04-27 01:13:15.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p8 -+3.1.0-p9 -diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c ---- mpfr-3.1.0-a/src/gamma.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/gamma.c 2012-04-27 01:13:15.000000000 +0000 -@@ -296,7 +296,7 @@ - /* we want an upper bound for x * [log(2-x)-1]. - since x < 0, we need a lower bound on log(2-x) */ - mpfr_ui_sub (xp, 2, x, MPFR_RNDD); -- mpfr_log2 (xp, xp, MPFR_RNDD); -+ mpfr_log (xp, xp, MPFR_RNDD); - mpfr_sub_ui (xp, xp, 1, MPFR_RNDD); - mpfr_mul (xp, xp, x, MPFR_RNDU); - -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2012-03-12 11:59:47.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-04-27 01:13:15.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p8" -+#define MPFR_VERSION_STRING "3.1.0-p9" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2012-03-12 11:59:47.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-04-27 01:13:15.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p8"; -+ return "3.1.0-p9"; - } -diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c ---- mpfr-3.1.0-a/tests/tgamma.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/tgamma.c 2012-04-27 01:13:15.000000000 +0000 -@@ -478,6 +478,36 @@ - mpfr_clear (x); - } - -+/* bug found by Giridhar Tammana */ -+static void -+test20120426 (void) -+{ -+ mpfr_t xa, xb; -+ int i; -+ mpfr_exp_t emin; -+ -+ mpfr_init2 (xa, 53); -+ mpfr_init2 (xb, 53); -+ mpfr_set_d (xb, -168.5, MPFR_RNDN); -+ emin = mpfr_get_emin (); -+ mpfr_set_emin (-1073); -+ i = mpfr_gamma (xa, xb, MPFR_RNDN); -+ i = mpfr_subnormalize (xa, i, MPFR_RNDN); /* new ternary value */ -+ mpfr_set_str (xb, "-9.5737343987585366746184749943e-304", 10, MPFR_RNDN); -+ if (!((i > 0) && (mpfr_cmp (xa, xb) == 0))) -+ { -+ printf ("Error in test20120426, i=%d\n", i); -+ printf ("expected "); -+ mpfr_print_binary (xb); putchar ('\n'); -+ printf ("got "); -+ mpfr_print_binary (xa); putchar ('\n'); -+ exit (1); -+ } -+ mpfr_set_emin (emin); -+ mpfr_clear (xa); -+ mpfr_clear (xb); -+} -+ - static void - exprange (void) - { -@@ -821,6 +851,7 @@ - gamma_integer (); - test20071231 (); - test20100709 (); -+ test20120426 (); - - data_check ("data/gamma", mpfr_gamma, "mpfr_gamma"); - -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-05-07 18:52:45.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-05-07 18:52:45.000000000 +0000 -@@ -0,0 +1 @@ -+gamma-overunderflow -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-05-07 18:52:45.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p9 -+3.1.0-p10 -diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c ---- mpfr-3.1.0-a/src/gamma.c 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/src/gamma.c 2012-05-07 18:52:45.000000000 +0000 -@@ -100,7 +100,8 @@ - mpfr_t xp, GammaTrial, tmp, tmp2; - mpz_t fact; - mpfr_prec_t realprec; -- int compared, inex, is_integer; -+ int compared, is_integer; -+ int inex = 0; /* 0 means: result gamma not set yet */ - MPFR_GROUP_DECL (group); - MPFR_SAVE_EXPO_DECL (expo); - MPFR_ZIV_DECL (loop); -@@ -377,6 +378,15 @@ - mpfr_mul (GammaTrial, tmp2, xp, MPFR_RNDN); /* Pi*(2-x), error (1+u)^2 */ - err_g = MPFR_GET_EXP(GammaTrial); - mpfr_sin (GammaTrial, GammaTrial, MPFR_RNDN); /* sin(Pi*(2-x)) */ -+ /* If tmp is +Inf, we compute exp(lngamma(x)). */ -+ if (mpfr_inf_p (tmp)) -+ { -+ inex = mpfr_explgamma (gamma, x, &expo, tmp, tmp2, rnd_mode); -+ if (inex) -+ goto end; -+ else -+ goto ziv_next; -+ } - err_g = err_g + 1 - MPFR_GET_EXP(GammaTrial); - /* let g0 the true value of Pi*(2-x), g the computed value. - We have g = g0 + h with |h| <= |(1+u^2)-1|*g. -@@ -411,11 +421,16 @@ - if (MPFR_LIKELY (MPFR_CAN_ROUND (GammaTrial, realprec - err_g, - MPFR_PREC(gamma), rnd_mode))) - break; -+ -+ ziv_next: - MPFR_ZIV_NEXT (loop, realprec); - } -+ -+ end: - MPFR_ZIV_FREE (loop); - -- inex = mpfr_set (gamma, GammaTrial, rnd_mode); -+ if (inex == 0) -+ inex = mpfr_set (gamma, GammaTrial, rnd_mode); - MPFR_GROUP_CLEAR (group); - mpz_clear (fact); - -diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c ---- mpfr-3.1.0-a/src/lngamma.c 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/src/lngamma.c 2012-05-07 18:52:45.000000000 +0000 -@@ -49,9 +49,72 @@ - mpfr_set_ui_2exp (s, 9, -1, MPFR_RNDN); /* 4.5 */ - } - --#ifndef IS_GAMMA -+#ifdef IS_GAMMA -+ -+/* This function is called in case of intermediate overflow/underflow. -+ The s1 and s2 arguments are temporary MPFR numbers, having the -+ working precision. If the result could be determined, then the -+ flags are updated via pexpo, y is set to the result, and the -+ (non-zero) ternary value is returned. Otherwise 0 is returned -+ in order to perform the next Ziv iteration. */ - static int --unit_bit (mpfr_srcptr (x)) -+mpfr_explgamma (mpfr_ptr y, mpfr_srcptr x, mpfr_save_expo_t *pexpo, -+ mpfr_ptr s1, mpfr_ptr s2, mpfr_rnd_t rnd) -+{ -+ mpfr_t t1, t2; -+ int inex1, inex2, sign; -+ MPFR_BLOCK_DECL (flags1); -+ MPFR_BLOCK_DECL (flags2); -+ MPFR_GROUP_DECL (group); -+ -+ MPFR_BLOCK (flags1, inex1 = mpfr_lgamma (s1, &sign, x, MPFR_RNDD)); -+ MPFR_ASSERTN (inex1 != 0); -+ /* s1 = RNDD(lngamma(x)), inexact */ -+ if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags1))) -+ { -+ if (MPFR_SIGN (s1) > 0) -+ { -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_OVERFLOW); -+ return mpfr_overflow (y, rnd, sign); -+ } -+ else -+ { -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_UNDERFLOW); -+ return mpfr_underflow (y, rnd == MPFR_RNDN ? MPFR_RNDZ : rnd, sign); -+ } -+ } -+ -+ mpfr_set (s2, s1, MPFR_RNDN); /* exact */ -+ mpfr_nextabove (s2); /* v = RNDU(lngamma(z0)) */ -+ -+ if (sign < 0) -+ rnd = MPFR_INVERT_RND (rnd); /* since the result with be negated */ -+ MPFR_GROUP_INIT_2 (group, MPFR_PREC (y), t1, t2); -+ MPFR_BLOCK (flags1, inex1 = mpfr_exp (t1, s1, rnd)); -+ MPFR_BLOCK (flags2, inex2 = mpfr_exp (t2, s2, rnd)); -+ /* t1 is the rounding with mode 'rnd' of a lower bound on |Gamma(x)|, -+ t2 is the rounding with mode 'rnd' of an upper bound, thus if both -+ are equal, so is the wanted result. If t1 and t2 differ or the flags -+ differ, at some point of Ziv's loop they should agree. */ -+ if (mpfr_equal_p (t1, t2) && flags1 == flags2) -+ { -+ MPFR_ASSERTN ((inex1 > 0 && inex2 > 0) || (inex1 < 0 && inex2 < 0)); -+ mpfr_set4 (y, t1, MPFR_RNDN, sign); /* exact */ -+ if (sign < 0) -+ inex1 = - inex1; -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, flags1); -+ } -+ else -+ inex1 = 0; /* couldn't determine the result */ -+ MPFR_GROUP_CLEAR (group); -+ -+ return inex1; -+} -+ -+#else -+ -+static int -+unit_bit (mpfr_srcptr x) - { - mpfr_exp_t expo; - mpfr_prec_t prec; -@@ -75,6 +138,7 @@ - - return (x0 >> (prec % GMP_NUMB_BITS)) & 1; - } -+ - #endif - - /* lngamma(x) = log(gamma(x)). -@@ -99,12 +163,14 @@ - mpfr_t s, t, u, v, z; - unsigned long m, k, maxm; - mpz_t *INITIALIZED(B); /* variable B declared as initialized */ -- int inexact, compared; -+ int compared; -+ int inexact = 0; /* 0 means: result y not set yet */ - mpfr_exp_t err_s, err_t; - unsigned long Bm = 0; /* number of allocated B[] */ - unsigned long oldBm; - double d; - MPFR_SAVE_EXPO_DECL (expo); -+ MPFR_ZIV_DECL (loop); - - compared = mpfr_cmp_ui (z0, 1); - -@@ -122,7 +188,7 @@ - if (MPFR_EXP(z0) <= - (mpfr_exp_t) MPFR_PREC(y)) - { - mpfr_t l, h, g; -- int ok, inex2; -+ int ok, inex1, inex2; - mpfr_prec_t prec = MPFR_PREC(y) + 14; - MPFR_ZIV_DECL (loop); - -@@ -157,14 +223,14 @@ - mpfr_sub (h, h, g, MPFR_RNDD); - mpfr_mul (g, z0, z0, MPFR_RNDU); - mpfr_add (h, h, g, MPFR_RNDU); -- inexact = mpfr_prec_round (l, MPFR_PREC(y), rnd); -+ inex1 = mpfr_prec_round (l, MPFR_PREC(y), rnd); - inex2 = mpfr_prec_round (h, MPFR_PREC(y), rnd); - /* Caution: we not only need l = h, but both inexact flags should - agree. Indeed, one of the inexact flags might be zero. In that - case if we assume lngamma(z0) cannot be exact, the other flag - should be correct. We are conservative here and request that both - inexact flags agree. */ -- ok = SAME_SIGN (inexact, inex2) && mpfr_cmp (l, h) == 0; -+ ok = SAME_SIGN (inex1, inex2) && mpfr_cmp (l, h) == 0; - if (ok) - mpfr_set (y, h, rnd); /* exact */ - mpfr_clear (l); -@@ -172,8 +238,9 @@ - mpfr_clear (g); - if (ok) - { -+ MPFR_ZIV_FREE (loop); - MPFR_SAVE_EXPO_FREE (expo); -- return mpfr_check_range (y, inexact, rnd); -+ return mpfr_check_range (y, inex1, rnd); - } - /* since we have log|gamma(x)| = - log|x| - gamma*x + O(x^2), - if x ~ 2^(-n), then we have a n-bit approximation, thus -@@ -205,9 +272,10 @@ - thus lngamma(x) = log(Pi*(x-1)/sin(Pi*(2-x))) - lngamma(2-x) */ - - w = precy + MPFR_INT_CEIL_LOG2 (precy); -+ w += MPFR_INT_CEIL_LOG2 (w) + 14; -+ MPFR_ZIV_INIT (loop, w); - while (1) - { -- w += MPFR_INT_CEIL_LOG2 (w) + 14; - MPFR_ASSERTD(w >= 3); - mpfr_set_prec (s, w); - mpfr_set_prec (t, w); -@@ -288,7 +356,9 @@ - + (rnd == MPFR_RNDN))) - goto end; - } -+ MPFR_ZIV_NEXT (loop, w); - } -+ MPFR_ZIV_FREE (loop); - } - - /* now z0 > 1 */ -@@ -298,10 +368,10 @@ - /* since k is O(w), the value of log(z0*...*(z0+k-1)) is about w*log(w), - so there is a cancellation of ~log(w) in the argument reconstruction */ - w = precy + MPFR_INT_CEIL_LOG2 (precy); -- -- do -+ w += MPFR_INT_CEIL_LOG2 (w) + 13; -+ MPFR_ZIV_INIT (loop, w); -+ while (1) - { -- w += MPFR_INT_CEIL_LOG2 (w) + 13; - MPFR_ASSERTD (w >= 3); - - /* argument reduction: we compute gamma(z0 + k), where the series -@@ -441,6 +511,15 @@ - #ifdef IS_GAMMA - err_s = MPFR_GET_EXP(s); - mpfr_exp (s, s, MPFR_RNDN); -+ /* If s is +Inf, we compute exp(lngamma(z0)). */ -+ if (mpfr_inf_p (s)) -+ { -+ inexact = mpfr_explgamma (y, z0, &expo, s, t, rnd); -+ if (inexact) -+ goto end0; -+ else -+ goto ziv_next; -+ } - /* before the exponential, we have s = s0 + h where - |h| <= (2m+48)*ulp(s), thus exp(s0) = exp(s) * exp(-h). - For |h| <= 1/4, we have |exp(h)-1| <= 1.2*|h| thus -@@ -480,16 +559,26 @@ - err_s = (err_t == err_s) ? 1 + err_s : ((err_t > err_s) ? err_t : err_s); - err_s += 1 - MPFR_GET_EXP(s); - #endif -+ if (MPFR_LIKELY (MPFR_CAN_ROUND (s, w - err_s, precy, rnd))) -+ break; -+#ifdef IS_GAMMA -+ ziv_next: -+#endif -+ MPFR_ZIV_NEXT (loop, w); - } -- while (MPFR_UNLIKELY (!MPFR_CAN_ROUND (s, w - err_s, precy, rnd))); - -+#ifdef IS_GAMMA -+ end0: -+#endif - oldBm = Bm; - while (Bm--) - mpz_clear (B[Bm]); - (*__gmp_free_func) (B, oldBm * sizeof (mpz_t)); - - end: -- inexact = mpfr_set (y, s, rnd); -+ if (inexact == 0) -+ inexact = mpfr_set (y, s, rnd); -+ MPFR_ZIV_FREE (loop); - - mpfr_clear (s); - mpfr_clear (t); -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-05-07 18:52:45.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0-p9" -+#define MPFR_VERSION_STRING "3.1.0-p10" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-05-07 18:52:45.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p9"; -+ return "3.1.0-p10"; - } -diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c ---- mpfr-3.1.0-a/tests/tgamma.c 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/tests/tgamma.c 2012-05-07 18:52:45.000000000 +0000 -@@ -838,6 +838,175 @@ - exit (1); - } - -+/* Test mpfr_gamma in precision p1 by comparing it with exp(lgamma(x)) -+ computing with a working precision p2. Assume that x is not an -+ integer <= 2. */ -+static void -+exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2) -+{ -+ mpfr_t yd, yu, zd, zu; -+ int inexd, inexu, sign; -+ int underflow = -1, overflow = -1; /* -1: we don't know */ -+ int got_underflow, got_overflow; -+ -+ if (mpfr_integer_p (x) && mpfr_cmp_si (x, 2) <= 0) -+ { -+ printf ("Warning! x is an integer <= 2 in exp_lgamma: "); -+ mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); putchar ('\n'); -+ return; -+ } -+ mpfr_inits2 (p2, yd, yu, (mpfr_ptr) 0); -+ inexd = mpfr_lgamma (yd, &sign, x, MPFR_RNDD); -+ mpfr_set (yu, yd, MPFR_RNDN); /* exact */ -+ if (inexd) -+ mpfr_nextabove (yu); -+ mpfr_clear_flags (); -+ mpfr_exp (yd, yd, MPFR_RNDD); -+ if (! mpfr_underflow_p ()) -+ underflow = 0; -+ if (mpfr_overflow_p ()) -+ overflow = 1; -+ mpfr_clear_flags (); -+ mpfr_exp (yu, yu, MPFR_RNDU); -+ if (mpfr_underflow_p ()) -+ underflow = 1; -+ if (! mpfr_overflow_p ()) -+ overflow = 0; -+ if (sign < 0) -+ { -+ mpfr_neg (yd, yd, MPFR_RNDN); /* exact */ -+ mpfr_neg (yu, yu, MPFR_RNDN); /* exact */ -+ mpfr_swap (yd, yu); -+ } -+ /* yd < Gamma(x) < yu (strict inequalities since x != 1 and x != 2) */ -+ mpfr_inits2 (p1, zd, zu, (mpfr_ptr) 0); -+ mpfr_clear_flags (); -+ inexd = mpfr_gamma (zd, x, MPFR_RNDD); /* zd <= Gamma(x) < yu */ -+ got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p (); -+ got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p (); -+ if (! mpfr_less_p (zd, yu) || inexd > 0 || -+ got_underflow != underflow || -+ got_overflow != overflow) -+ { -+ printf ("Error in exp_lgamma on x = "); -+ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); -+ printf ("yu = "); -+ mpfr_dump (yu); -+ printf ("zd = "); -+ mpfr_dump (zd); -+ printf ("got inexd = %d, expected <= 0\n", inexd); -+ printf ("got underflow = %d, expected %d\n", got_underflow, underflow); -+ printf ("got overflow = %d, expected %d\n", got_overflow, overflow); -+ exit (1); -+ } -+ mpfr_clear_flags (); -+ inexu = mpfr_gamma (zu, x, MPFR_RNDU); /* zu >= Gamma(x) > yd */ -+ got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p (); -+ got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p (); -+ if (! mpfr_greater_p (zu, yd) || inexu < 0 || -+ got_underflow != underflow || -+ got_overflow != overflow) -+ { -+ printf ("Error in exp_lgamma on x = "); -+ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); -+ printf ("yd = "); -+ mpfr_dump (yd); -+ printf ("zu = "); -+ mpfr_dump (zu); -+ printf ("got inexu = %d, expected >= 0\n", inexu); -+ printf ("got underflow = %d, expected %d\n", got_underflow, underflow); -+ printf ("got overflow = %d, expected %d\n", got_overflow, overflow); -+ exit (1); -+ } -+ if (mpfr_equal_p (zd, zu)) -+ { -+ if (inexd != 0 || inexu != 0) -+ { -+ printf ("Error in exp_lgamma on x = "); -+ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); -+ printf ("zd = zu, thus exact, but inexd = %d and inexu = %d\n", -+ inexd, inexu); -+ exit (1); -+ } -+ MPFR_ASSERTN (got_underflow == 0); -+ MPFR_ASSERTN (got_overflow == 0); -+ } -+ else if (inexd == 0 || inexu == 0) -+ { -+ printf ("Error in exp_lgamma on x = "); -+ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); -+ printf ("zd != zu, thus inexact, but inexd = %d and inexu = %d\n", -+ inexd, inexu); -+ exit (1); -+ } -+ mpfr_clears (yd, yu, zd, zu, (mpfr_ptr) 0); -+} -+ -+static void -+exp_lgamma_tests (void) -+{ -+ mpfr_t x; -+ mpfr_exp_t emin, emax; -+ int i; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ set_emin (MPFR_EMIN_MIN); -+ set_emax (MPFR_EMAX_MAX); -+ -+ mpfr_init2 (x, 96); -+ for (i = 3; i <= 8; i++) -+ { -+ mpfr_set_ui (x, i, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ mpfr_nextbelow (x); -+ exp_lgamma (x, 53, 64); -+ mpfr_nextabove (x); -+ mpfr_nextabove (x); -+ exp_lgamma (x, 53, 64); -+ } -+ mpfr_set_str (x, "1.7", 10, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ mpfr_set_str (x, "-90.6308260837372266e+15", 10, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ /* The following test gives a large positive result < +Inf */ -+ mpfr_set_str (x, "1.2b13fc45a92dea1@14", 16, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ /* Idem for a large negative result > -Inf */ -+ mpfr_set_str (x, "-1.2b13fc45a92de81@14", 16, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ /* The following two tests trigger an endless loop in r8186 -+ on 64-bit machines (64-bit exponent). The second one (due -+ to undetected overflow) is a direct consequence of the -+ first one, due to the call of Gamma(2-x) if x < 1. */ -+ mpfr_set_str (x, "1.2b13fc45a92dec8@14", 16, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ mpfr_set_str (x, "-1.2b13fc45a92dea8@14", 16, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ /* Similar tests (overflow threshold) for 32-bit machines. */ -+ mpfr_set_str (x, "2ab68d8.657542f855111c61", 16, MPFR_RNDN); -+ exp_lgamma (x, 12, 64); -+ mpfr_set_str (x, "-2ab68d6.657542f855111c61", 16, MPFR_RNDN); -+ exp_lgamma (x, 12, 64); -+ /* The following test is an overflow on 32-bit and 64-bit machines. -+ Revision r8189 fails on 64-bit machines as the flag is unset. */ -+ mpfr_set_str (x, "1.2b13fc45a92ded8@14", 16, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ /* On the following tests, with r8196, one gets an underflow on -+ 32-bit machines, while a normal result is expected (see FIXME -+ in gamma.c:382). */ -+ mpfr_set_str (x, "-2ab68d6.657542f855111c6104", 16, MPFR_RNDN); -+ exp_lgamma (x, 12, 64); /* failure on 32-bit machines */ -+ mpfr_set_str (x, "-12b13fc45a92deb.1c6c5bc964", 16, MPFR_RNDN); -+ exp_lgamma (x, 12, 64); /* failure on 64-bit machines */ -+ mpfr_clear (x); -+ -+ set_emin (emin); -+ set_emax (emax); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -852,6 +1021,7 @@ - test20071231 (); - test20100709 (); - test20120426 (); -+ exp_lgamma_tests (); - - data_check ("data/gamma", mpfr_gamma, "mpfr_gamma"); - diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install deleted file mode 100644 index d6dd0475b..000000000 --- a/testing/mpfr/mpfr.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(mpfr.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD deleted file mode 100644 index 555d21baf..000000000 --- a/testing/opal/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 163079 2012-07-06 16:17:32Z ibiru $ -# Maintainer: Jan de Groot <jan@archlinux.org> -# Contributor: Tom K <tomk@runbox.com> -pkgname=opal -pkgver=3.10.5 -pkgrel=1 -pkgdesc="Open Phone Abstraction Library" -arch=(i686 x86_64) -url="http://www.opalvoip.org" -license=('GPL') -depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm') -makedepends=('ffmpeg') -options=(!makeflags) -source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2 - opal-ffmpeg.patch) -md5sums=('22b0d716ed1cbc935245539e0bbab38f' '53bb06a376fb57a306522bfa6a573217') - -build() { - cd "${srcdir}/opal-${pkgver}" - patch -Np1 -i "${srcdir}/opal-ffmpeg.patch" - CXXFLAGS="$CXXFLAGS -fpermissive" \ - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd "${srcdir}/opal-${pkgver}" - make DESTDIR="${pkgdir}" install - chmod 644 "${pkgdir}/usr/lib/libopal_s.a" -} diff --git a/testing/opal/opal-ffmpeg.patch b/testing/opal/opal-ffmpeg.patch deleted file mode 100644 index ebfd1f037..000000000 --- a/testing/opal/opal-ffmpeg.patch +++ /dev/null @@ -1,194 +0,0 @@ -diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx ---- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx 2012-04-26 06:56:01.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx 2012-06-10 16:39:35.447021150 +0200 -@@ -51,6 +51,7 @@ - #endif - - #include "h263-1998.h" -+#include <libavutil/opt.h> - #include <limits> - #include <iomanip> - #include <stdio.h> -@@ -324,9 +325,9 @@ - // Level 2+ - // works with eyeBeam, signaled via non-standard "D" - if (atoi(value) == 1) -- m_context->flags |= CODEC_FLAG_H263P_UMV; -+ av_opt_set_int(m_context->priv_data, "umv", 1, 0); - else -- m_context->flags &= ~CODEC_FLAG_H263P_UMV; -+ av_opt_set_int(m_context->priv_data, "umv", 0, 0); - return; - } - -@@ -335,9 +336,9 @@ - // Annex F: Advanced Prediction Mode - // does not work with eyeBeam - if (atoi(value) == 1) -- m_context->flags |= CODEC_FLAG_OBMC; -+ av_opt_set_int(m_context->priv_data, "obmc", 1, 0); - else -- m_context->flags &= ~CODEC_FLAG_OBMC; -+ av_opt_set_int(m_context->priv_data, "obmc", 0, 0); - return; - } - #endif -@@ -367,9 +368,9 @@ - // Annex K: Slice Structure - // does not work with eyeBeam - if (atoi(value) != 0) -- m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; -+ av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0); - else -- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; -+ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0); - return; - } - -@@ -377,9 +378,9 @@ - // Annex S: Alternative INTER VLC mode - // does not work with eyeBeam - if (atoi(value) == 1) -- m_context->flags |= CODEC_FLAG_H263P_AIV; -+ av_opt_set_int(m_context->priv_data, "aiv", 1, 0); - else -- m_context->flags &= ~CODEC_FLAG_H263P_AIV; -+ av_opt_set_int(m_context->priv_data, "aiv", 0, 0); - return; - } - } -@@ -445,15 +446,6 @@ - PTRACE(5, m_prefix, "qmax set to " << m_context->qmax); - PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size); - -- #define CODEC_TRACER_FLAG(tracer, flag) \ -- PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled")); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT) -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER); -- CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV); -- - return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0; - } - -@@ -516,7 +508,7 @@ - - // Need to copy to local buffer to guarantee 16 byte alignment - memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2); -- m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE; -+ m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE; - - /* - m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE; -@@ -598,13 +590,13 @@ - m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack; - m_context->opaque = this; // used to separate out packets from different encode threads - -- m_context->flags &= ~CODEC_FLAG_H263P_UMV; -+ av_opt_set_int(m_context->priv_data, "umv", 0, 0); - m_context->flags &= ~CODEC_FLAG_4MV; - #if LIBAVCODEC_RTP_MODE - m_context->flags &= ~CODEC_FLAG_H263P_AIC; - #endif -- m_context->flags &= ~CODEC_FLAG_H263P_AIV; -- m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; -+ av_opt_set_int(m_context->priv_data, "aiv", 0, 0); -+ av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0); - - return true; - } -diff -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx ---- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx 2012-04-26 06:56:00.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx 2012-06-10 16:49:11.210568639 +0200 -@@ -25,6 +25,7 @@ - #include <fstream> - #include <stdlib.h> - #include <sys/stat.h> -+#include <unistd.h> - - - #ifndef PLUGINCODEC_TRACING -diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx ---- opal-3.10.5/plugins/video/H.264/h264-x264.cxx 2012-04-26 06:56:00.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx 2012-06-10 17:04:19.695646950 +0200 -@@ -1035,13 +1035,10 @@ - return false; - - m_context->workaround_bugs = FF_BUG_AUTODETECT; -- m_context->error_recognition = FF_ER_AGGRESSIVE; - m_context->idct_algo = FF_IDCT_H264; - m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; - m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE; -- m_context->flags2 = CODEC_FLAG2_BRDO | -- CODEC_FLAG2_MEMC_ONLY | -- CODEC_FLAG2_DROP_FRAME_TIMECODE | -+ m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE | - CODEC_FLAG2_SKIP_RD | - CODEC_FLAG2_CHUNKS; - -diff -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx ---- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx 2012-04-26 06:56:00.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx 2012-06-10 17:04:46.012171051 +0200 -@@ -33,6 +33,7 @@ - - #include <codec/opalplugin.hpp> - #include <stdio.h> -+#include <unistd.h> - - - #if defined(X264_LICENSED) || defined(GPL_HELPER_APP) -diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx ---- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-04-26 06:56:02.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-06-10 16:46:33.498089705 +0200 -@@ -101,8 +101,10 @@ - #include <libavutil/bswap.h> - #include <libavcodec/mpegvideo.h> - -+ - #else /* LIBAVCODEC_HAVE_SOURCE_DIR */ - #include LIBAVCODEC_HEADER -+#include <libavutil/opt.h> - #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */ - } - -@@ -589,17 +591,17 @@ - m_avpicture->quality = m_videoQMin; - - #ifdef USE_ORIG -- m_avcontext->flags |= CODEC_FLAG_PART; // data partitioning -+ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0); - m_avcontext->flags |= CODEC_FLAG_4MV; // 4 motion vectors - #else - m_avcontext->max_b_frames=0; /*don't use b frames*/ - m_avcontext->flags|=CODEC_FLAG_AC_PRED; -- m_avcontext->flags|=CODEC_FLAG_H263P_UMV; -+ av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0); - /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */ - m_avcontext->flags|=CODEC_FLAG_4MV; - m_avcontext->flags|=CODEC_FLAG_GMC; - m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER; -- m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; -+ av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0); - #endif - m_avcontext->opaque = this; // for use in RTP callback - } -@@ -804,7 +806,7 @@ - // Should the next frame be an I-Frame? - if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0)) - { -- m_avpicture->pict_type = FF_I_TYPE; -+ m_avpicture->pict_type = AV_PICTURE_TYPE_I; - } - else // No IFrame requested, let avcodec decide what to do - { -@@ -1325,7 +1327,7 @@ - - void MPEG4DecoderContext::SetStaticDecodingParams() { - m_avcontext->flags |= CODEC_FLAG_4MV; -- m_avcontext->flags |= CODEC_FLAG_PART; -+ av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0); - m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations - } - diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD deleted file mode 100644 index 308df61c3..000000000 --- a/testing/opencv/PKGBUILD +++ /dev/null @@ -1,118 +0,0 @@ -# $Id: PKGBUILD 163133 2012-07-07 20:34:06Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgbase=opencv -pkgname=('opencv' 'opencv-docs' 'opencv-samples') -_realname=OpenCV -pkgver=2.4.2 -pkgrel=2 -pkgdesc="Open Source Computer Vision Library" -arch=('i686' 'x86_64') -license=('BSD') -url="http://opencv.org/" -depends=('jasper' 'gstreamer0.10-base' 'openexr' - 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') -makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') -optdepends=('opencv-docs' - 'opencv-samples' - 'eigen2' - 'python2-numpy: Python 2.x interface') -options=('!libtool') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2") -md5sums=('059ef86fc1724d69b75832a0d2929ff5') - -_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' - '-D CMAKE_INSTALL_PREFIX=/usr' - '-D CMAKE_SKIP_RPATH=ON' - '-D BUILD_TESTS=OFF' - '-D ENABLE_SSE=ON' - '-D ENABLE_SSE2=ON' - '-D ENABLE_SSE3=OFF' - '-D ENABLE_SSSE3=OFF' - '-D ENABLE_SSE41=OFF' - '-D ENABLE_SSE42=OFF' - '-D BUILD_EXAMPLES=ON' - '-D INSTALL_C_EXAMPLES=ON' - '-D INSTALL_PYTHON_EXAMPLES=ON' - '-D WITH_XINE=ON' - '-D WITH_QT=OFF' - '-D WITH_QT_OPENGL=OFF' - '-D WITH_UNICAP=OFF' - '-D WITH_PVAPI=OFF' - '-D WITH_OPENNI=OFF' - '-D WITH_TBB=OFF' - '-D WITH_IPP=OFF' - '-D WITH_CUDA=OFF' - '-D USE_FAST_MATH=ON') - -build() { - cd "$srcdir/$_realname-$pkgver" - - # x64, i.e "Athlon64" and upwards, can use SSE3 - [ $CARCH = x86_64 ] && \ - _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} - - cmake ${_cmakeopts[@]} . - - make -} - -package_opencv() { - cd "$srcdir/$_realname-$pkgver" - - make DESTDIR="$pkgdir" install - - # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - cd "$pkgdir/usr/share" - - # prepare FSH-friendly dirs - #if [ -d OpenCV ]; then - # mv opencv/samples OpenCV/ - # rm -r opencv - # mv OpenCV opencv - #fi - - # separate docs package; also be -R friendly - [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc" - - # separate samples package - [ -d $_realname/samples ] && mv $_realname/samples "$srcdir/opencv-samples" -} - -package_opencv-docs() { - pkgdesc+=" (documentation)" - unset depends - unset optdepends - options=('docs') - - cd "$srcdir" - - mkdir -p "$pkgdir/usr/share/doc" - cp -r opencv-doc "$pkgdir/usr/share/doc/$_realname" - - # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_opencv-samples() { - pkgdesc+=" (samples)" - depends=('bash') - unset optdepends - unset options - - cd "$srcdir" - - mkdir -p "$pkgdir/usr/share/$_realname" - cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples" - - # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD deleted file mode 100644 index 8672846ce..000000000 --- a/testing/pcre/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 163200 2012-07-09 01:30:40Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -pkgname=pcre -pkgver=8.31 -pkgrel=1 -pkgdesc="A library that implements Perl 5-style regular expressions" -arch=('i686' 'x86_64') -url="http://www.pcre.org/" -license=('BSD') -depends=('gcc-libs') -options=('!libtool') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('1c9a276af932b5599157f96e945391f0' - '873bcd2cd9f1e0aa1e28e256b3e31506') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --enable-pcre16 --enable-jit \ - --enable-utf8 --enable-unicode-properties - make -} - -check() { - cd "${srcdir}"/${pkgname}-${pkgver} - make check -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/pkg-config/PKGBUILD b/testing/pkg-config/PKGBUILD deleted file mode 100644 index fb1f82bf7..000000000 --- a/testing/pkg-config/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 163231 2012-07-11 13:10:57Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> - -pkgname=pkg-config -pkgver=0.27 -pkgrel=1 -pkgdesc="A system for managing library compile/link flags" -arch=('i686' 'x86_64') -url="http://pkgconfig.freedesktop.org/wiki/" -license=('GPL') -groups=('base-devel') -depends=('glib2') -provides=("pkgconfig=${pkgver}") -conflicts=('pkgconfig') -replaces=('pkgconfig') -source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('3a4c9feab14b6719afd8904945d9b4e4') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/postfix/PKGBUILD b/testing/postfix/PKGBUILD deleted file mode 100644 index 2a2e80e52..000000000 --- a/testing/postfix/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 163102 2012-07-07 03:16:44Z bisson $ -# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> -# Contributor: Paul Mattal <paul@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=postfix -pkgver=2.9.3 -pkgrel=2 -pkgdesc='Fast, easy to administer, secure mail server' -url='http://www.postfix.org/' -license=('custom') -arch=('i686' 'x86_64') -depends=('pcre' 'libsasl' 'libldap' 'db' - 'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb') -backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ - 'aliases.patch' \ - 'rc.d') -sha1sums=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d' - '5fc3de6c7df1e5851a0a379e825148868808318b' - '40c6be2eb55e6437a402f43775cdb3d22ea87a66') - -provides=('smtp-server' 'smtp-forwarder') -conflicts=('smtp-server' 'smtp-forwarder') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make makefiles DEBUG='' CCARGS=' \ - -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ - -DHAS_LDAP \ - -DUSE_TLS \ - -DHAS_MYSQL -I/usr/include/mysql \ - -DHAS_PGSQL -I/usr/include/postgresql \ - -DHAS_SQLITE \ - -DHAS_CDB \ - ' AUXLIBS=' \ - -lsasl2 \ - -lldap -llber \ - -lssl -lcrypto \ - -lmysqlclient -lz -lm \ - -lpq \ - -lsqlite3 -lpthread \ - -lcdb \ - ' OPT="${CFLAGS} ${LDFLAGS}" - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sh postfix-install -non-interactive \ - install_root="${pkgdir}" \ - daemon_directory="/usr/lib/${pkgname}" \ - sample_directory="/etc/${pkgname}/sample" \ - manpage_directory="/usr/share/man" \ - readme_directory="/usr/share/doc/${pkgname}" \ - - install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files" - cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch -} diff --git a/testing/postfix/aliases.patch b/testing/postfix/aliases.patch deleted file mode 100644 index 6767870b7..000000000 --- a/testing/postfix/aliases.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100 -+++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100 -@@ -382,6 +382,7 @@ - #alias_maps = hash:/etc/aliases - #alias_maps = hash:/etc/aliases, nis:mail.aliases - #alias_maps = netinfo:/aliases -+alias_maps = hash:/etc/postfix/aliases - - # The alias_database parameter specifies the alias database(s) that - # are built with "newaliases" or "sendmail -bi". This is a separate -@@ -392,6 +393,7 @@ - #alias_database = dbm:/etc/mail/aliases - #alias_database = hash:/etc/aliases - #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases -+alias_database = $alias_maps - - # ADDRESS EXTENSIONS (e.g., user+foo) - # diff --git a/testing/postfix/install b/testing/postfix/install deleted file mode 100644 index cb97e2e6c..000000000 --- a/testing/postfix/install +++ /dev/null @@ -1,33 +0,0 @@ -post_install() { - getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null - getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null - getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null - - cd var/spool/postfix - chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved - chgrp postdrop public maildrop - cd ../../../usr/sbin - chgrp postdrop postqueue postdrop - chmod g+s postqueue postdrop - cd ../.. - chown postfix var/lib/postfix - - newaliases -} - -post_upgrade() { - post_install - - if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF - -==> You must now run "postfix reload" due to inter-daemon protocol change. - -EOF - fi -} - -pre_remove() { - getent passwd postfix &>/dev/null && userdel postfix >/dev/null - getent group postfix &>/dev/null && groupdel postfix >/dev/null - getent group postdrop &>/dev/null && groupdel postdrop >/dev/null -} diff --git a/testing/postfix/rc.d b/testing/postfix/rc.d deleted file mode 100755 index fa314bb84..000000000 --- a/testing/postfix/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=postfix - -case "$1" in -start) - stat_busy "Starting $name daemon" - /usr/sbin/postfix start &>/dev/null \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - /usr/sbin/postfix stop &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -reload) - stat_busy "Reloading $name daemon" - /usr/sbin/postfix reload &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 1 - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/testing/ppl/PKGBUILD b/testing/ppl/PKGBUILD deleted file mode 100644 index f7ad1798b..000000000 --- a/testing/ppl/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 162818 2012-07-01 07:04:36Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: ezzetabi <ezzetabi at gawab dot com> - -pkgname=ppl -pkgver=1.0 -pkgrel=1 -pkgdesc="A modern library for convex polyhedra and other numerical abstractions." -arch=('i686' 'x86_64') -url="http://bugseng.com/products/ppl" -license=('GPL3') -depends=('gmp>=5.0') -options=('!docs' '!libtool') -source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign}) -md5sums=('c4566928c6b7bb63e95f96d1a7b5cb4c' - '5f490df826c76fed296060ca8fca4eb5') - -build() { - cd $srcdir/ppl-$pkgver - ./configure --prefix=/usr --enable-interfaces="c,cxx" - make -} - -check() { - cd $srcdir/ppl-$pkgver - make check -} - -package() { - cd $srcdir/ppl-$pkgver - make DESTDIR=$pkgdir install -} - diff --git a/testing/procps-ng/PKGBUILD b/testing/procps-ng/PKGBUILD deleted file mode 100644 index 9f3395472..000000000 --- a/testing/procps-ng/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 163236 2012-07-11 17:53:04Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=procps-ng -pkgver=3.3.3 -pkgrel=3 -pkgdesc="Utilities for monitoring your system and processes on your system" -arch=('i686' 'x86_64') -url="http://gitorious.org/procps" -license=('GPL' 'LGPL') -groups=('base') -depends=('ncurses') -conflicts=('procps') -provides=('procps') -replaces=('procps') -backup=('etc/sysctl.conf') -options=('!libtool') -source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver} - sysctl.conf) -sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0' - 'efb6cdc17ee39be8433ae9c8e9bb02d1f47eeefc') - -build() { - cd "${srcdir}/procps-procps" - echo ${pkgver} > .tarball-version - ./autogen.sh - ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib - make -} - -package() { - cd "${srcdir}/procps-procps" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf" -} diff --git a/testing/procps-ng/sysctl.conf b/testing/procps-ng/sysctl.conf deleted file mode 100644 index baddd90a6..000000000 --- a/testing/procps-ng/sysctl.conf +++ /dev/null @@ -1,46 +0,0 @@ -# /etc/sysctl.conf - Configuration file for setting system variables -# See sysctl.conf (5) for information. - -# you can have the CD-ROM close when you use it, and open -# when you are done. -#dev.cdrom.autoeject = 1 -#dev.cdrom.autoclose = 1 - -# protection from the SYN flood attack -net.ipv4.tcp_syncookies = 1 - -# see the evil packets in your log files -#net.ipv4.conf.all.log_martians = 1 - -# if not functioning as a router, there is no need to accept redirects or source routes -#net.ipv4.conf.all.accept_redirects = 0 -#net.ipv4.conf.all.accept_source_route = 0 -#net.ipv6.conf.all.accept_redirects = 0 -#net.ipv6.conf.all.accept_source_route = 0 - -# Disable packet forwarding -net.ipv4.ip_forward = 0 -net.ipv6.conf.all.forwarding = 0 - -# Enable IPv6 Privacy Extensions -net.ipv6.conf.default.use_tempaddr = 2 -net.ipv6.conf.all.use_tempaddr = 2 - -# sets the port range used for outgoing connections -#net.ipv4.ip_local_port_range = 32768 61000 - -# Swapping too much or not enough? Disks spinning up when you'd -# rather they didn't? Tweak these. -#vm.vfs_cache_pressure = 100 -#vm.laptop_mode = 0 -#vm.swappiness = 60 - -#kernel.printk_ratelimit_burst = 10 -#kernel.printk_ratelimit = 5 -#kernel.panic_on_oops = 0 - -# Reboot 600 seconds after a panic -#kernel.panic = 600 - -# Disable SysRq key (note: console security issues) -kernel.sysrq = 0 diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD deleted file mode 100644 index f81f8c530..000000000 --- a/testing/readline/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 163215 2012-07-10 21:53:26Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=readline -_basever=6.2 -_patchlevel=003 #prepare for some patches -pkgver=$_basever.$_patchlevel -pkgrel=2 -pkgdesc="GNU readline library" -arch=('i686' 'x86_64') -url="http://tiswww.case.edu/php/chet/readline/rltop.html" -license=('GPL') -depends=('glibc' 'ncurses') -backup=('etc/inputrc') -options=('!emptydirs') -install=readline.install -source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} - inputrc) -if [ $_patchlevel -gt 00 ]; then - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig}) - done -fi -md5sums=('67948acb2ca081f23359d0256e9a271c' - '928f7d248320a65e43c2dc427e99582b' - '58d54966c1191db45973cb3191ac621a' - '83287d52a482f790dfb30ec0a8746669' - '8e6a51e2e0e6e45a82752e3692c111ac' - '0665020ea118e8434bd145fb71f452cc' - '285361ca6d48c51ae2428157e174e812' - 'c9d5d79718856e711667dede87cb7622' - '4437205bb1462f5f32e4812b8292c675') - -build() { - cd ${srcdir}/${pkgname}-$_basever - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" - patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) - done - - # Remove RPATH from shared objects (FS#14366) - sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf - - # build with -fPIC for x86_64 (FS#15634) - [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" - - ./configure --prefix=/usr - make SHLIB_LIBS=-lncurses -} - -package() { - cd ${srcdir}/${pkgname}-$_basever - make DESTDIR=${pkgdir} install - - install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc -} diff --git a/testing/readline/inputrc b/testing/readline/inputrc deleted file mode 100644 index fd13a673b..000000000 --- a/testing/readline/inputrc +++ /dev/null @@ -1,36 +0,0 @@ -# do not bell on tab-completion -#set bell-style none - -set meta-flag on -set input-meta on -set convert-meta off -set output-meta on - -$if mode=emacs - -# for linux console and RH/Debian xterm -"\e[1~": beginning-of-line -"\e[4~": end-of-line -"\e[5~": beginning-of-history -"\e[6~": end-of-history -"\e[7~": beginning-of-line -"\e[3~": delete-char -"\e[2~": quoted-insert -"\e[5C": forward-word -"\e[5D": backward-word -"\e\e[C": forward-word -"\e\e[D": backward-word -"\e[1;5C": forward-word -"\e[1;5D": backward-word - -# for rxvt -"\e[8~": end-of-line - -# for non RH/Debian xterm, can't hurt for RH/DEbian xterm -"\eOH": beginning-of-line -"\eOF": end-of-line - -# for freebsd console -"\e[H": beginning-of-line -"\e[F": end-of-line -$endif diff --git a/testing/readline/readline.install b/testing/readline/readline.install deleted file mode 100644 index 06b646f23..000000000 --- a/testing/readline/readline.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(history.info readline.info rluserman.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD deleted file mode 100644 index a9845c449..000000000 --- a/testing/run-parts/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 162728 2012-06-29 07:39:29Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=run-parts -pkgver=4.3.2 -pkgrel=1 -pkgdesc='run scripts or programs in a directory' -arch=('i686' 'x86_64') -url='http://packages.qa.debian.org/d/debianutils.html' -license=('GPL') -depends=('glibc') -source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") -sha256sums=('0062d774306a6acc34d3b855a5c4eeb845653b0cd34dbb5c13aa00b4ecb8af22') - -build() { - cd $srcdir/debianutils-$pkgver - ./configure --prefix=/usr - make run-parts -} - -package() { - cd $srcdir/debianutils-$pkgver - install -D -m755 run-parts $pkgdir/usr/bin/run-parts - install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 - for l in po4a/*/run-parts.8; do - install -D -m644 ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8 - done -} diff --git a/testing/shadow/LICENSE b/testing/shadow/LICENSE deleted file mode 100644 index c5ab15a56..000000000 --- a/testing/shadow/LICENSE +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 1990 - 1994, Julianne Frances Haugh - * Copyright (c) 1996 - 2000, Marek Michałkiewicz - * Copyright (c) 2001 - 2006, Tomasz Kłoczko - * Copyright (c) 2007 - 2009, Nicolas François - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the copyright holders or contributors may not be used to - * endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD deleted file mode 100644 index c82fb65dc..000000000 --- a/testing/shadow/PKGBUILD +++ /dev/null @@ -1,131 +0,0 @@ -# $Id: PKGBUILD 162811 2012-06-30 18:46:44Z tomegun $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> - -pkgname=shadow -pkgver=4.1.5.1 -pkgrel=1 -pkgdesc="Password and account management tool suite with support for shadow files and PAM" -arch=('i686' 'x86_64') -url='http://pkg-shadow.alioth.debian.org/' -license=('BSD') -groups=('base') -depends=('bash' 'pam' 'acl') -backup=(etc/login.defs - etc/pam.d/{chage,passwd,shadow,useradd,usermod,userdel} - etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} - etc/pam.d/{chgpasswd,groupmems} - etc/default/useradd) -options=('!libtool') -install='shadow.install' -source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig} - LICENSE - adduser - chgpasswd - chpasswd - defaults.pam - login.defs - newusers - passwd - shadow.cron.daily - useradd.defaults - xstrdup.patch - shadow-strncpy-usage.patch) -sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30' - '126570e2939bf3b57f28df5197ab9309747a6b5c' - '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' - '78ec184a499f9708adcfcf0b7a3b22a60bf39f91' - '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' - '12427b1ca92a9b85ca8202239f0d9f50198b818f' - '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' - 'e5cab2118ecb1e61874cde842d7d04d1003f35cb' - '12427b1ca92a9b85ca8202239f0d9f50198b818f' - '611be25d91c3f8f307c7fe2485d5f781e5dee75f' - '5d83ba7e11c765c951867cbe00b0ae7ff57148fa' - '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' - '6010fffeed1fc6673ad9875492e1193b1a847b53' - '21e12966a6befb25ec123b403cd9b5c492fe5b16') - -build() { - cd "$pkgname-$pkgver" - - # avoid transitive linking issues with binutils 2.22 - sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am - - # link to glibc's crypt(3) - LDFLAGS+=" -lcrypt" - - # need to offer these upstream - patch -Np1 <"$srcdir/xstrdup.patch" - patch -Np1 <"$srcdir/shadow-strncpy-usage.patch" - - # supress etc/pam.d/*, we provide our own - sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in - - ./configure \ - --prefix=/usr \ - --libdir=/lib \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --with-libpam \ - --without-selinux - - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # license - install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE" - - # interactive useradd - install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser" - - # useradd defaults - install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd" - - # cron job - install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow" - - # login.defs - install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" - - # PAM config - custom - install -dm755 "$pkgdir/etc/pam.d" - install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{passwd,chgpasswd,chpasswd,newusers} - - # PAM config - from tarball - install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" - - # we use the 'useradd' PAM file for other similar utilities - for file in chage groupadd groupdel groupmod shadow \ - useradd usermod userdel; do - install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" - done - - # Remove utilities provided by util-linux - rm \ - "$pkgdir"/usr/bin/{chsh,chfn,sg} \ - "$pkgdir"/bin/{login,su} \ - "$pkgdir"/usr/sbin/{vipw,vigr} - - # but we keep newgrp, as sg is really an alias to it - mv "$pkgdir"/usr/bin/{newgrp,sg} - - # ...and their many man pages - find "$pkgdir"/usr/share/man \ - '(' -name 'chsh.1' -o \ - -name 'chfn.1' -o \ - -name 'su.1' -o \ - -name 'login.1' -o \ - -name 'vipw.8' -o \ - -name 'vigr.8' -o \ - -name 'newgrp.1' ')' \ - -delete - rmdir \ - "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \ - "$pkgdir"/usr/share/man/{fi,ko/man8} -} diff --git a/testing/shadow/adduser b/testing/shadow/adduser deleted file mode 100644 index a5d7fd4fa..000000000 --- a/testing/shadow/adduser +++ /dev/null @@ -1,399 +0,0 @@ -#!/bin/bash -# -# Copyright 1995 Hrvoje Dogan, Croatia. -# Copyright 2002, 2003, 2004 Stuart Winter, West Midlands, England, UK. -# Copyright 2004 Slackware Linux, Inc., Concord, CA, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# -########################################################################## -# Program: /usr/sbin/adduser -# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux -# Author : Stuart Winter <stuart@polplex.co.uk> -# Based on the original Slackware adduser by Hrvoje Dogan -# with modifications by Patrick Volkerding -# Version: 1.09 -########################################################################## -# Usage..: adduser [<new_user_name>] -########################################################################## -# History # -########### -# v1.09 - 07/06/04 -# * Added standard Slackware script licence to the head of this file. -# v1.08 - 25/04/04 -# * Disallow user names that begin with a numeric because useradd -# (from shadow v4.03) does not allow them. <sw> -# v1.07 - 07/03/03 -# * When supplying a null string for the uid (meaning 'Choose next available'), -# if there were file names in the range 'a-z' in the pwd then the -# egrep command considered these files rather than the null string. -# The egrep expression is now in quotes. -# Reported & fixed by Vadim O. Ustiansky <sw> -# v1.06 - 31/03/03 -# * Ask to chown user.group the home directory if it already exists. -# This helps reduce later confusion when adding users whose home dir -# already exists (mounted partition for example) and is owned -# by a user other than the user to which the directory is being -# assigned as home. Default is not to chown. -# Brought to my attention by mRgOBLIN. <sw> -# v1.05 - 04/01/03 -# * Advise & prevent users from creating logins with '.' characters -# in the user name. <sw> -# * Made pending account creation info look neater <sw> -# v1.04 - 09/06/02 -# * Catered for shadow-4.0.3's 'useradd' binary that no longer -# will let you create a user that has any uppercase chars in it -# This was reported on the userlocal.org forums -# by 'xcp' - thanks. <sw,pjv> -# v1.03 - 20/05/02 -# * Support 'broken' (null lines in) /etc/passwd and -# /etc/group files <sw> -# * For recycling UIDs (default still 'off'), we now look in -# /etc/login.defs for the UID_MIN value and use it -# If not found then default to 1000 <sw> -# v1.02 - 10/04/02 -# * Fix user-specified UID bug. <pjv> -# v1.01 - 23/03/02 -# * Match Slackware indenting style, simplify. <pjv> -# v1.00 - 22/03/02 -# * Created -####################################################################### - -# Path to files -pfile=/etc/passwd -gfile=/etc/group -sfile=/etc/shells - -# Paths to binaries -useradd=/usr/sbin/useradd -chfn=/usr/bin/chfn -passwd=/usr/bin/passwd - -# Defaults -defhome=/home -defshell=/bin/bash -defgroup=users - -# Determine what the minimum UID is (for UID recycling) -# (we ignore it if it's not at the beginning of the line (i.e. commented out with #)) -export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)" -# If we couldn't find it, set it to the default of 1000 -if [ -z "$recycleUIDMIN" ]; then - export recycleUIDMIN=1000 # this is the default from Slackware's /etc/login.defs -fi - - -# This setting enables the 'recycling' of older unused UIDs. -# When you userdel a user, it removes it from passwd and shadow but it will -# never get used again unless you specify it expliticly -- useradd (appears to) just -# look at the last line in passwd and increment the uid. I like the idea of -# recycling uids but you may have very good reasons not to (old forgotten -# confidential files still on the system could then be owned by this new user). -# We'll set this to no because this is what the original adduser shell script -# did and it's what users expect. -recycleuids=no - -# Function to read keyboard input. -# bash1 is broken (even ash will take read -ep!), so we work around -# it (even though bash1 is no longer supported on Slackware). -function get_input() { - local output - if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then - echo -n "${1} " >&2 # fudge for use with bash v1 - read output - else # this should work with any other /bin/sh - read -ep "${1} " output - fi - echo $output -} - -# Function to display the account info -function display () { - local goose - goose="$(echo $2 | cut -d ' ' -f 2-)" # lop off the prefixed argument useradd needs - echo -n "$1 " - # If it's null then display the 'other' information - if [ -z "$goose" -a ! -z "$3" ]; then - echo "$3" - else - echo "$goose" - fi -} - -# Function to check whether groups exist in the /etc/group file -function check_group () { - local got_error group - if [ ! -z "$@" ]; then - for group in $@ ; do - local uid_not_named="" uid_not_num="" - grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes - grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes - if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then - echo "- Group '$group' does not exist" - got_error=yes - fi - done - fi - # Return exit code of 1 if at least one of the groups didn't exist - if [ ! -z "$got_error" ]; then - return 1 - fi -} - -#: Read the login name for the new user :# -# -# Remember that most Mail Transfer Agents are case independant, so having -# 'uSer' and 'user' may cause confusion/things to break. Because of this, -# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase, -# and we must reject them, too. - -# Set the login variable to the command line param -echo -LOGIN="$1" -needinput=yes -while [ ! -z $needinput ]; do - if [ -z "$LOGIN" ]; then - while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done - fi - grep "^${LOGIN}:" $pfile >/dev/null 2>&1 # ensure it's not already used - if [ $? -eq 0 ]; then - echo "- User '$LOGIN' already exists; please choose another" - unset LOGIN - elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then - echo "- User names cannot begin with a number; please choose another" - unset LOGIN - elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase - echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another" - unset LOGIN - elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then - echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another" - unset LOGIN - else - unset needinput - fi -done - -# Display the user name passed from the shell if it hasn't changed -if [ "$1" = "$LOGIN" ]; then - echo "Login name for new user: $LOGIN" -fi - -#: Get the UID for the user & ensure it's not already in use :# -# -# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because -# when you change password for the uid, it finds the first match in /etc/passwd -# which isn't necessarily the correct user -# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")" - grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "- That UID is already in use; please choose another" - elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then - echo "- UIDs are numerics only" - else - unset needinput - fi -done -# If we were given a UID, then syntax up the variable to pass to useradd -if [ ! -z "$_UID" ]; then - U_ID="-u ${_UID}" -else - # Will we be recycling UIDs? - if [ "$recycleuids" = "yes" ]; then - U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)" - fi -fi - -#: Get the initial group for the user & ensure it exists :# -# -# We check /etc/group for both the text version and the group ID number -echo -needinput=yes -while [ ! -z "$needinput" ]; do - GID="$(get_input "Initial group [ ${defgroup} ]:")" - check_group "$GID" - if [ $? -gt 0 ]; then - echo "- Please choose another" - else - unset needinput - fi -done -# Syntax the variable ready for useradd -if [ -z "$GID" ]; then - GID="-g ${defgroup}" -else - GID="-g ${GID}" -fi - -#: Get additional groups for the user :# -# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - AGID="$(get_input "Additional groups (comma separated) []:")" - AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing - if [ ! -z "$AGID" ]; then - check_group "$AGID" # check all groups at once (treated as N # of params) - if [ $? -gt 0 ]; then - echo "- Please re-enter the group(s)" - else - unset needinput # we found all groups specified - AGID="-G $(echo "$AGID" | tr ' ' ,)" - fi - else - unset needinput # we don't *have* to have additional groups - fi -done - -#: Get the new user's home dir :# -# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")" - if [ -z "$HME" ]; then - HME="${defhome}/${LOGIN}" - fi - # Warn the user if the home dir already exists - if [ -d "$HME" ]; then - echo "- Warning: '$HME' already exists !" - getyn="$(get_input " Do you wish to change the home directory path ? (Y/n) ")" - if [ "$(echo $getyn | grep -i "n")" ]; then - unset needinput - # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME - getyn="$(get_input " Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")" - if [ "$(echo $getyn | grep -i "y")" ]; then - CHOWNHOMEDIR=$HME # set this to the home directory - fi - fi - else - unset needinput - fi -done -HME="-d ${HME}" - -#: Get the new user's shell :# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - unset got_error - SHL="$(get_input "Shell [ ${defshell} ]")" - if [ -z "$SHL" ]; then - SHL="${defshell}" - fi - # Warn the user if the shell doesn't exist in /etc/shells or as a file - if [ -z "$(grep "^${SHL}$" $sfile)" ]; then - echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)" - got_error=yes - fi - if [ ! -f "$SHL" ]; then - echo "- Warning: ${SHL} does not exist as a file" - got_error=yes - fi - if [ ! -z "$got_error" ]; then - getyn="$(get_input " Do you wish to change the shell ? (Y/n) ")" - if [ "$(echo $getyn | grep -i "n")" ]; then - unset needinput - fi - else - unset needinput - fi -done -SHL="-s ${SHL}" - -#: Get the expiry date :# -echo -needinput=yes -while [ ! -z "$needinput" ]; do - EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")" - if [ ! -z "$EXP" ]; then - # Check to see whether the expiry date is in the valid format - if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then - echo "- That is not a valid expiration date" - else - unset needinput - EXP="-e ${EXP}" - fi - else - unset needinput - fi -done - -# Display the info about the new impending account -echo -echo "New account will be created as follows:" -echo -echo "---------------------------------------" -display "Login name.......: " "$LOGIN" -display "UID..............: " "$_UID" "[ Next available ]" -display "Initial group....: " "$GID" -display "Additional groups: " "$AGID" "[ None ]" -display "Home directory...: " "$HME" -display "Shell............: " "$SHL" -display "Expiry date......: " "$EXP" "[ Never ]" -echo - -echo "This is it... if you want to bail out, hit Control-C. Otherwise, press" -echo "ENTER to go ahead and make the account." -read junk - -echo -echo "Creating new account..." -echo -echo - -# Add the account to the system -CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN"" -$CMD - -if [ $? -gt 0 ]; then - echo "- Error running useradd command -- account not created!" - echo "(cmd: $CMD)" - exit 1 -fi - -# chown the home dir ? We can only do this once the useradd has -# completed otherwise the user name doesn't exist. -if [ ! -z "${CHOWNHOMEDIR}" ]; then - chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}" -fi - -# Set the finger information -$chfn "$LOGIN" -if [ $? -gt 0 ]; then - echo "- Warning: an error occurred while setting finger information" -fi - -# Set a password -$passwd "$LOGIN" -if [ $? -gt 0 ]; then - echo "* WARNING: An error occured while setting the password for" - echo " this account. Please manually investigate this *" - exit 1 -fi - -echo -echo -echo "Account setup complete." -exit 0 - diff --git a/testing/shadow/chgpasswd b/testing/shadow/chgpasswd deleted file mode 100644 index 8f49f5cc8..000000000 --- a/testing/shadow/chgpasswd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -account required pam_permit.so -password include system-auth diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd deleted file mode 100644 index 5d447985a..000000000 --- a/testing/shadow/chpasswd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so sha512 shadow diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam deleted file mode 100644 index a7bf8a4a5..000000000 --- a/testing/shadow/defaults.pam +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs deleted file mode 100644 index 2500ee447..000000000 --- a/testing/shadow/login.defs +++ /dev/null @@ -1,197 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the login package. -# -# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. -# If unspecified, some arbitrary (and possibly incorrect) value will -# be assumed. All other items are optional - if not specified then -# the described action or option will be inhibited. -# -# Comment lines (lines beginning with "#") and blank lines are ignored. -# -# Modified for Linux. --marekm - -# -# Delay in seconds before being allowed another attempt after a login failure -# -FAIL_DELAY 3 - -# -# Enable display of unknown usernames when login failures are recorded. -# -LOG_UNKFAIL_ENAB no - -# -# Enable logging of successful logins -# -LOG_OK_LOGINS no - -# -# Enable "syslog" logging of su activity - in addition to sulog file logging. -# SYSLOG_SG_ENAB does the same for newgrp and sg. -# -SYSLOG_SU_ENAB yes -SYSLOG_SG_ENAB yes - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -CONSOLE /etc/securetty -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# If defined, all su activity is logged to this file. -# -#SULOG_FILE /var/log/sulog - -# -# If defined, file which maps tty line to TERM environment parameter. -# Each line of the file is in a format something like "vt100 tty01". -# -#TTYTYPE_FILE /etc/ttytype - -# -# If defined, the command name to display when running "su -". For -# example, if this is defined as "su" then a "ps" will display the -# command is "-su". If not defined, then "ps" would display the -# name of the shell actually being run, e.g. something like "-sh". -# -SU_NAME su - -# -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, MAIL_DIR takes precedence. -# QMAIL_DIR is for Qmail -# -#QMAIL_DIR Maildir -MAIL_DIR /var/spool/mail - -# -# If defined, file which inhibits all the usual chatter during the login -# sequence. If a full pathname, then hushed mode will be enabled if the -# user's name or shell are found in the file. If not a full pathname, then -# hushed mode will be enabled if the file exists in the user's home directory. -# -HUSHLOGIN_FILE .hushlogin -#HUSHLOGIN_FILE /etc/hushlogins - -# -# *REQUIRED* The default PATH settings, for superuser and normal users. -# -# (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin -ENV_PATH PATH=/bin:/usr/bin - -# -# Terminal permissions -# -# TTYGROUP Login tty will be assigned this group ownership. -# TTYPERM Login tty will be set to this permission. -# -# If you have a "write" program which is "setgid" to a special group -# which owns the terminals, define TTYGROUP to the group number and -# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign -# TTYPERM to either 622 or 600. -# -TTYGROUP tty -TTYPERM 0600 - -# -# Login configuration initializations: -# -# ERASECHAR Terminal ERASE character ('\010' = backspace). -# KILLCHAR Terminal KILL character ('\025' = CTRL/U). -# UMASK Default "umask" value. -# -# The ERASECHAR and KILLCHAR are used only on System V machines. -# The ULIMIT is used only if the system supports it. -# (now it works with setrlimit too; ulimit is in 512-byte units) -# -# Prefix these values with "0" to get octal, "0x" to get hexadecimal. -# -ERASECHAR 0177 -KILLCHAR 025 -UMASK 077 - -# -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_WARN_AGE 7 - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 -# System accounts -SYS_UID_MIN 500 -SYS_UID_MAX 999 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 1000 -GID_MAX 60000 -# System accounts -SYS_GID_MIN 500 -SYS_GID_MAX 999 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 5 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -#CONSOLE_GROUPS floppy:audio:cdrom - -# -# Should login be allowed if we can't cd to the home directory? -# Default in no. -# -DEFAULT_HOME yes - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# Enable setting of the umask group bits to be the same as owner bits -# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is -# the same as gid, and username is the same as the primary group name. -# -# This also enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB yes - diff --git a/testing/shadow/newusers b/testing/shadow/newusers deleted file mode 100644 index 5d447985a..000000000 --- a/testing/shadow/newusers +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so sha512 shadow diff --git a/testing/shadow/passwd b/testing/shadow/passwd deleted file mode 100644 index ab56da496..000000000 --- a/testing/shadow/passwd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so sha512 shadow use_authtok -password required pam_unix.so sha512 shadow nullok diff --git a/testing/shadow/shadow-strncpy-usage.patch b/testing/shadow/shadow-strncpy-usage.patch deleted file mode 100644 index 5aba8fa01..000000000 --- a/testing/shadow/shadow-strncpy-usage.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c ---- shadow-4.1.5/src/usermod.c.orig 2012-02-13 08:19:43.792146449 -0500 -+++ shadow-4.1.5/src/usermod.c 2012-02-13 08:21:19.375114500 -0500 -@@ -182,7 +182,7 @@ - struct tm *tp; - - if (date < 0) { -- strncpy (buf, "never", maxsize); -+ strncpy (buf, "never", maxsize - 1); - } else { - time_t t = (time_t) date; - tp = gmtime (&t); -diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c ---- shadow-4.1.5/src/login.c.orig 2012-02-13 08:19:50.951994454 -0500 -+++ shadow-4.1.5/src/login.c 2012-02-13 08:21:04.490430937 -0500 -@@ -752,7 +752,8 @@ - _("%s login: "), hostn); - } else { - strncpy (loginprompt, _("login: "), -- sizeof (loginprompt)); -+ sizeof (loginprompt) - 1); -+ loginprompt[sizeof (loginprompt) - 1] = '\0'; - } - - retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt); diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily deleted file mode 100755 index 1931a793e..000000000 --- a/testing/shadow/shadow.cron.daily +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Verify integrity of password and group files -/usr/sbin/pwck -r -/usr/sbin/grpck -r - diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install deleted file mode 100644 index 14384c333..000000000 --- a/testing/shadow/shadow.install +++ /dev/null @@ -1,9 +0,0 @@ -post_upgrade() { - grpck -r >/dev/null 2>&1 - if [ $? -eq 2 ]; then - printf '%s\n' \ - "==> Warning: /etc/group or /etc/gshadow are inconsistent." \ - " Run 'grpck' to correct this." - fi - return 0 -} diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults deleted file mode 100644 index b800b1777..000000000 --- a/testing/shadow/useradd.defaults +++ /dev/null @@ -1,9 +0,0 @@ -# useradd defaults file for ArchLinux -# original changes by TomK -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/bash -SKEL=/etc/skel -CREATE_MAIL_SPOOL=no diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch deleted file mode 100644 index bce434264..000000000 --- a/testing/shadow/xstrdup.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- shadow-4.1.2.1/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500 -+++ shadow-4.1.2.1/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500 -@@ -61,5 +61,6 @@ - - char *xstrdup (const char *str) - { -+ if(str == NULL) return NULL; - return strcpy (xmalloc (strlen (str) + 1), str); - } diff --git a/testing/sox/PKGBUILD b/testing/sox/PKGBUILD deleted file mode 100644 index 8613aa777..000000000 --- a/testing/sox/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 163066 2012-07-06 15:22:11Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=sox -pkgver=14.4.0 -pkgrel=3 -pkgdesc="The Swiss Army knife of sound processing tools" -arch=('i686' 'x86_64') -url="http://sox.sourceforge.net/" -license=('GPL' 'LGPL') -depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm') -makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') -checkdepends=('time') -optdepends=('libao: for ao plugin' - 'ffmpeg: for ffmpeg plugin' - 'libmad: for mp3 plugin' - 'libid3tag: for mp3 plugin' - 'wavpack: for wavpack plugin' - 'libpulse: for pulse plugin') -options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - sox_default_audio_driver_fallback.patch sox-ffmpeg0.11.patch) -sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978' - 'ab304f1fc17269262dbc4977aa9b7e97ec805ae4' - '2f92bcaebcaf300782396f106cdd27c72048a851') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch" - patch -p1 -i "${srcdir}/sox-ffmpeg0.11.patch" - sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-dyn-default --with-distro="Arch Linux" - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make bindir=. installcheck -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/sox/sox-ffmpeg0.11.patch b/testing/sox/sox-ffmpeg0.11.patch deleted file mode 100644 index 901c81582..000000000 --- a/testing/sox/sox-ffmpeg0.11.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure ---- sox-14.4.0-orig/configure 2012-06-12 00:35:53.462360803 -0400 -+++ sox-14.4.0/configure 2012-06-12 00:36:08.572361294 -0400 -@@ -15781,9 +15781,9 @@ - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5 --$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; } --if ${ac_cv_lib_avformat_av_open_input_file+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5 -+$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; } -+if ${ac_cv_lib_avformat_avformat_open_input+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -15797,27 +15797,27 @@ - #ifdef __cplusplus - extern "C" - #endif --char av_open_input_file (); -+char avformat_open_input (); - int - main () - { --return av_open_input_file (); -+return avformat_open_input (); - ; - return 0; - } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_avformat_av_open_input_file=yes -+ ac_cv_lib_avformat_avformat_open_input=yes - else -- ac_cv_lib_avformat_av_open_input_file=no -+ ac_cv_lib_avformat_avformat_open_input=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5 --$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; } --if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5 -+$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; } -+if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then : - for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c ---- sox-14.4.0-orig/src/ffmpeg.c 2012-06-12 00:35:53.459027469 -0400 -+++ sox-14.4.0/src/ffmpeg.c 2012-06-12 00:36:26.539028545 -0400 -@@ -93,7 +93,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - enc->error_resilience = 1; - #else -- enc->error_recognition = 1; -+ enc->err_recognition = 1; - #endif - - if (!codec || avcodec_open(enc, codec) < 0) -@@ -157,7 +157,7 @@ - static int startread(sox_format_t * ft) - { - priv_t * ffmpeg = (priv_t *)ft->priv; -- AVFormatParameters params; -+ AVDictionary *params; - int ret; - int i; - -@@ -172,7 +172,7 @@ - - /* Open file and get format */ - memset(¶ms, 0, sizeof(params)); -- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, ¶ms)) < 0) { -+ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, ¶ms)) < 0) { - lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret); - return SOX_EOF; - } -@@ -231,7 +231,7 @@ - /* If input buffer empty, read more data */ - if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) { - if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 && -- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb))) -+ (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error)) - break; - ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE); - ffmpeg->audio_buf_index = 0; -@@ -373,13 +373,6 @@ - return SOX_EOF; - } - -- /* set the output parameters (must be done even if no -- parameters). */ -- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) { -- lsx_fail("ffmpeg invalid output format parameters"); -- return SOX_EOF; -- } -- - /* Next line for debugging */ - /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */ - -@@ -391,14 +384,14 @@ - - /* open the output file, if needed */ - if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) { -- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) { -+ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) { - lsx_fail("ffmpeg could not open `%s'", ft->filename); - return SOX_EOF; - } - } - - /* write the stream header, if any */ -- av_write_header(ffmpeg->ctxt); -+ avformat_write_header(ffmpeg->ctxt, NULL); - - return SOX_SUCCESS; - } -@@ -478,7 +471,7 @@ - #if (LIBAVFORMAT_VERSION_INT < 0x340000) - url_fclose(&ffmpeg->ctxt->pb); - #else -- url_fclose(ffmpeg->ctxt->pb); -+ avio_close(ffmpeg->ctxt->pb); - #endif - } - diff --git a/testing/sox/sox_default_audio_driver_fallback.patch b/testing/sox/sox_default_audio_driver_fallback.patch deleted file mode 100644 index 9f9060e17..000000000 --- a/testing/sox/sox_default_audio_driver_fallback.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- src/sox.c.old 2012-05-06 22:45:45.380564154 -0400 -+++ src/sox.c 2012-05-06 22:47:11.948248987 -0400 -@@ -2538,20 +2538,38 @@ - return name? from_env? from_env : name : NULL; - } - -+static char const * try_device(char const * name) -+{ -+ sox_format_handler_t const * handler = sox_find_format(name, sox_false); -+ if (handler) { -+ sox_format_t format, * ft = &format; -+ memset(ft, 0, sizeof(*ft)); -+ ft->filename = (char *)device_name(name); -+ ft->priv = lsx_calloc(1, handler->priv_size); -+ if (handler->startwrite(ft) == SOX_SUCCESS) { -+ handler->stopwrite(ft); -+ free(ft->priv); -+ return name; -+ } -+ free(ft->priv); -+ } -+ return NULL; -+} -+ - static char const * set_default_device(file_t * f) - { - /* Default audio driver type in order of preference: */ - if (!f->filetype) f->filetype = getenv("AUDIODRIVER"); -- if (!f->filetype && sox_find_format("coreaudio", sox_false)) f->filetype = "coreaudio"; -- if (!f->filetype && sox_find_format("pulseaudio" , sox_false)) f->filetype = "pulseaudio"; -- if (!f->filetype && sox_find_format("alsa", sox_false)) f->filetype = "alsa"; -- if (!f->filetype && sox_find_format("waveaudio" , sox_false)) f->filetype = "waveaudio"; -- if (!f->filetype && sox_find_format("sndio", sox_false)) f->filetype = "sndio"; -- if (!f->filetype && sox_find_format("oss" , sox_false)) f->filetype = "oss"; -- if (!f->filetype && sox_find_format("sunau",sox_false)) f->filetype = "sunau"; -- if (!f->filetype && sox_find_format("ao" , sox_false) && file_count) /*!rec*/ -- f->filetype = "ao"; -- -+ if (!f->filetype) f->filetype = try_device("coreaudio"); -+ if (!f->filetype) f->filetype = try_device("pulseaudio"); -+ if (!f->filetype) f->filetype = try_device("alsa"); -+ if (!f->filetype) f->filetype = try_device("waveaudio"); -+ if (!f->filetype) f->filetype = try_device("sndio"); -+ if (!f->filetype) f->filetype = try_device("oss"); -+ if (!f->filetype) f->filetype = try_device("sunau"); -+ if (!f->filetype && file_count) /*!rec*/ -+ f->filetype = try_device("ao"); -+ - if (!f->filetype) { - lsx_fail("Sorry, there is no default audio device configured"); - exit(1); diff --git a/testing/tinycdb/PKGBUILD b/testing/tinycdb/PKGBUILD deleted file mode 100644 index 69c665528..000000000 --- a/testing/tinycdb/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 163100 2012-07-07 03:15:00Z bisson $ -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=tinycdb -pkgver=0.78 -pkgrel=1 -pkgdesc='Very fast and simple package for creating and reading constant data bases' -url='http://www.corpit.ru/mjt/tinycdb.html' -license=('custom') -arch=('i686' 'x86_64') -source=("http://www.corpit.ru/mjt/tinycdb/${pkgname}-${pkgver}.tar.gz") -sha1sums=('ade42ee1e7c56f66a63cb933206c089b9983adba') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -e 's/all: static/all: shared/' -e '/libcdb.a/d' -i Makefile - make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" prefix=/usr mandir=/usr/share/man \ - INSTALLPROG=cdb-shared install-{all,sharedlib} - install -Dm644 debian/copyright "${pkgdir}"/usr/share/licenses/tinycdb/copyright -} diff --git a/testing/transcode/PKGBUILD b/testing/transcode/PKGBUILD deleted file mode 100644 index f8c6bb74d..000000000 --- a/testing/transcode/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 163067 2012-07-06 15:22:20Z ibiru $ -# Maintainer: -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: roberto <roberto@archlinux.org> - -pkgname=transcode -_sripver=0.3-4 -pkgver=1.1.7 -pkgrel=5 -pkgdesc="A video/DVD ripper and encoder for the terminal/console" -arch=('i686' 'x86_64') -url="http://tcforge.berlios.de/" -license=('GPL') -depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' - 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') -makedepends=('nasm') -options=('!libtool') -source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 - http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch - ffmpeg-0.11.patch) -sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' - 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' - 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' - '591943a33235342a66c3df0625a164a1479c09ae' - '765dacce5ee463adf5c124556d68bb873ef436c6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch" - ./configure --prefix=/usr \ - --disable-sse --disable-sse2 --disable-altivec --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 - make - - cd "${srcdir}/subtitleripper" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" - 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 "${srcdir}/subtitleripper" - 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/ffmpeg-0.11.patch b/testing/transcode/ffmpeg-0.11.patch deleted file mode 100644 index 24beb1069..000000000 --- a/testing/transcode/ffmpeg-0.11.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur transcode-1.1.7/export/export_ffmpeg.c fixed-tc/export/export_ffmpeg.c ---- transcode-1.1.7/export/export_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/export/export_ffmpeg.c 2012-07-05 16:22:41.095346080 -0400 -@@ -180,7 +180,7 @@ - - - /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */ --#include <libavcodec/opt.h> -+#include <libavutil/opt.h> - #include <libavutil/avstring.h> - #include <libswscale/swscale.h> - -@@ -470,7 +470,6 @@ - } - - TC_LOCK_LIBAVCODEC; -- avcodec_init(); - avcodec_register_all(); - TC_UNLOCK_LIBAVCODEC; - -@@ -634,7 +633,6 @@ - lavc_param_rc_max_rate = 2516; - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; - - break; - -@@ -674,7 +673,6 @@ - - lavc_param_rc_buffer_size = 224 * 8; - lavc_param_rc_buffer_aggressivity = 99; -- lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET; - - break; - -diff -Naur transcode-1.1.7/export/ffmpeg_cfg.c fixed-tc/export/ffmpeg_cfg.c ---- transcode-1.1.7/export/ffmpeg_cfg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/export/ffmpeg_cfg.c 2012-07-05 15:26:29.112103273 -0400 -@@ -160,9 +160,7 @@ - {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, - {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, - {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, -- {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, - // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, -- {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART}, - {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1}, - {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0}, - {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, -@@ -211,7 +211,6 @@ - #else - {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED}, - #endif -- {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV}, - {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512}, - {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, -@@ -223,9 +223,6 @@ - {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, - {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, - {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, -- {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT}, -- {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET}, -- {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN}, - {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, - {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, - {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, -diff -Naur transcode-1.1.7/filter/filter_pp.c fixed-tc/filter/filter_pp.c ---- transcode-1.1.7/filter/filter_pp.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/filter/filter_pp.c 2012-07-05 15:26:28.945436613 -0400 -@@ -38,8 +38,8 @@ - - /* FIXME: these use the filter ID as an index--the ID can grow - * arbitrarily large, so this needs to be fixed */ --static pp_mode_t *mode[100]; --static pp_context_t *context[100]; -+static pp_mode *mode[100]; -+static pp_context *context[100]; - static int width[100], height[100]; - static int pre[100]; - -diff -Naur transcode-1.1.7/import/decode_lavc.c fixed-tc/import/decode_lavc.c ---- transcode-1.1.7/import/decode_lavc.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/decode_lavc.c 2012-07-05 15:26:28.842103278 -0400 -@@ -181,7 +181,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -Naur transcode-1.1.7/import/import_ffmpeg.c fixed-tc/import/import_ffmpeg.c ---- transcode-1.1.7/import/import_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/import_ffmpeg.c 2012-07-05 15:26:28.848769946 -0400 -@@ -314,7 +314,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - lavc_dec_context->error_resilience = 2; - #else -- lavc_dec_context->error_recognition = 2; -+ lavc_dec_context->err_recognition = 2; - #endif - lavc_dec_context->error_concealment = 3; - lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; -diff -Naur transcode-1.1.7/import/probe_ffmpeg.c fixed-tc/import/probe_ffmpeg.c ---- transcode-1.1.7/import/probe_ffmpeg.c 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/import/probe_ffmpeg.c 2012-07-05 15:26:28.838769947 -0400 -@@ -99,8 +99,8 @@ - - TC_INIT_LIBAVCODEC; - -- ret = av_open_input_file(&lavf_dmx_context, ipipe->name, -- NULL, 0, NULL); -+ ret = avformat_open_input(&lavf_dmx_context, ipipe->name, -+ NULL, NULL); - if (ret != 0) { - tc_log_error(__FILE__, "unable to open '%s'" - " (libavformat failure)", -diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h ---- transcode-1.1.7/libtc/tcavcodec.h 2011-11-19 11:50:27.000000000 -0500 -+++ fixed-tc/libtc/tcavcodec.h 2012-07-05 15:26:28.828769951 -0400 -@@ -53,7 +53,6 @@ - - #define TC_INIT_LIBAVCODEC do { \ - TC_LOCK_LIBAVCODEC; \ -- avcodec_init(); \ - avcodec_register_all(); \ - TC_UNLOCK_LIBAVCODEC; \ - } while (0) diff --git a/testing/transcode/subtitleripper-0.3.4-linkingorder.patch b/testing/transcode/subtitleripper-0.3.4-linkingorder.patch deleted file mode 100644 index 7efe22346..000000000 --- a/testing/transcode/subtitleripper-0.3.4-linkingorder.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: subtitleripper/Makefile -=================================================================== ---- subtitleripper.orig/Makefile -+++ subtitleripper/Makefile -@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud - # Target - subtitle2pgm: subtitle2pgm.o spudec.o - @echo "Linking $@" -- @$(CC) $(LIBS) $^ -o $@ -+ @$(CC) $^ -o $@ $(LIBS) - - subtitle2vobsub: subtitle2vobsub.o vobsub.o - @echo "Linking $@" -- @$(CC) $(LIBS) $^ -o $@ -+ @$(CC) $^ -o $@ $(LIBS) - - srttool: srttool.o - @echo "Linking $@" -- @$(CC) $(LIBS) -g $^ -o $@ -+ @$(CC) -g $^ -o $@ $(LIBS) - - vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o - @echo "Linking $@" -- @$(CC) $(LIBS) -g $^ -o $@ -+ @$(CC) -g $^ -o $@ $(LIBS) - - .PHONY: clean dist rpm - clean: diff --git a/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch deleted file mode 100644 index 2af11d257..000000000 --- a/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Index: subtitleripper/Makefile -=================================================================== ---- subtitleripper.orig/Makefile -+++ subtitleripper/Makefile -@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud - # Target - subtitle2pgm: subtitle2pgm.o spudec.o - @echo "Linking $@" -- @$(CC) $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - subtitle2vobsub: subtitle2vobsub.o vobsub.o - @echo "Linking $@" -- @$(CC) $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - srttool: srttool.o - @echo "Linking $@" -- @$(CC) -g $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o - @echo "Linking $@" -- @$(CC) -g $^ -o $@ $(LIBS) -+ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) - - .PHONY: clean dist rpm - clean: diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD deleted file mode 100644 index 06cf88c0a..000000000 --- a/testing/upower/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 162916 2012-07-03 23:39:56Z tomegun $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=upower -pkgver=0.9.17 -pkgrel=1 -pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" -arch=('i686' 'x86_64') -url="http://upower.freedesktop.org" -license=('GPL') -depends=('systemd-tools' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') -options=('!libtool') -source=($url/releases/$pkgname-$pkgver.tar.xz) - -build() { - cd "$pkgname-$pkgver" - - # put udev files in /usr/lib - sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/upower \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --disable-static - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} -md5sums=('9ef7fc8ec438542f014f3a34552822aa') diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD deleted file mode 100644 index ac171a037..000000000 --- a/testing/usbutils/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 163167 2012-07-08 10:08:11Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Tom Gundersen <teg@jklm.no> -# Contributor: Judd Vinet <jvinet@zeroflux.org> -# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> -pkgname=usbutils -pkgver=006 -pkgrel=1 -pkgdesc="USB Device Utilities" -arch=(i686 x86_64) -license=('GPL') -groups=('base') -depends=('libusb' 'hwids') -optdepends=('python2: for lsusb.py usage' - 'coreutils: for lsusb.py usage') -url="http://linux-usb.sourceforge.net/" -source=("http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz" - fix-python2.patch) -md5sums=('c9aa14ee3d6c991fda183f42cf72a8a8' - '45766196895b4cc50b53cd56e1bbf3d1') - -build() { - cd $srcdir/$pkgname-$pkgver - # patch lsusb.py to use correct usb.ids file and python2 interpreter - patch -Np1 -i $srcdir/fix-python2.patch - ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - # this is now in the hwids package - rm -rf $pkgdir/usr/{share/hwdata,sbin} -} diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch deleted file mode 100644 index 7e2875e99..000000000 --- a/testing/usbutils/fix-python2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 -+++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # lsusb.py - # Displays your USB devices in reasonable form. - # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. -@@ -16,7 +16,7 @@ - warnsort = False - - prefix = "/sys/bus/usb/devices/" --usbids = "/usr/share/usb.ids" -+usbids = "/usr/share/hwdata/usb.ids" - - esc = chr(27) - norm = esc + "[0;0m" diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD deleted file mode 100644 index 2dc698974..000000000 --- a/testing/util-linux/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 163397 2012-07-11 22:26:49Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=util-linux -pkgver=2.21.2 -pkgrel=4 -pkgdesc="Miscellaneous system utilities for Linux" -url="http://www.kernel.org/pub/linux/utils/util-linux/" -arch=('i686' 'x86_64') -groups=('base') -depends=('pam') -conflicts=('util-linux-ng') -provides=("util-linux-ng=${pkgver}") -license=('GPL2') -options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz - pam-login - pam-common) -backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login) -install=util-linux.install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --libdir=/usr/lib \ - --enable-fs-paths-extra=/usr/bin:/usr/sbin \ - --enable-write \ - --enable-raw \ - --disable-wall \ - --enable-new-mount \ - --enable-login-utils - - make -} - -check() { - make -C "$pkgname-$pkgver" check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}" - - # broken tool, going away in next major release, so just remove it now - rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} - - # delete stray empty dir, fixed upstream - rm -r usr/share/man/ru - - # setuid chfn and chsh - chmod 4755 "$pkgdir"/usr/bin/ch{sh,fn} - - # install PAM files for login-utils - install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" - install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" - install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" -} -md5sums=('54ba880f1d66782c2287ee2c898520e9' - '4368b3f98abd8a32662e094c54e7f9b1' - 'a31374fef2cba0ca34dfc7078e2969e4') diff --git a/testing/util-linux/pam-common b/testing/util-linux/pam-common deleted file mode 100644 index a7bf8a4a5..000000000 --- a/testing/util-linux/pam-common +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/testing/util-linux/pam-login b/testing/util-linux/pam-login deleted file mode 100644 index 1960d9497..000000000 --- a/testing/util-linux/pam-login +++ /dev/null @@ -1,7 +0,0 @@ -#%PAM-1.0 - -auth required pam_securetty.so -auth requisite pam_nologin.so -auth include system-local-login -account include system-local-login -session include system-local-login diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install deleted file mode 100644 index fa27d4555..000000000 --- a/testing/util-linux/util-linux.install +++ /dev/null @@ -1,8 +0,0 @@ -post_upgrade() { - if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then - if [ -f /var/lib/hwclock/adjtime ]; then - mv /var/lib/hwclock/adjtime /etc/adjtime - fi - rmdir /var/lib/hwclock - fi -} diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD deleted file mode 100644 index c2da0713a..000000000 --- a/testing/valgrind/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 162945 2012-07-04 01:13:31Z allan $ -# Maintainer: Dan McGee <dan@archlinux.org> -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=valgrind -pkgver=3.7.0 -pkgrel=3 -pkgdesc="A tool to help find memory-management problems in programs" -arch=('i686' 'x86_64') -license=('GPL') -url="http://valgrind.org/" -depends=('glibc>=2.16' 'glibc<2.17' 'perl') -makedepends=('gdb') -options=('!emptydirs') -source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2 - valgrind-3.7.0-glibc-2.16.patch) -md5sums=('a855fda56edf05614f099dca316d1775' - '8362c9c10b8d7d08d1be628a717cfba7') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch - - if [ "${CARCH}" = "x86_64" ]; then - ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit - else - ./configure --prefix=/usr --mandir=/usr/share/man - fi - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/valgrind/valgrind-3.7.0-glibc-2.16.patch b/testing/valgrind/valgrind-3.7.0-glibc-2.16.patch deleted file mode 100644 index 4d28ff11a..000000000 --- a/testing/valgrind/valgrind-3.7.0-glibc-2.16.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure ---- valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.000000000 +1000 -+++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000 -@@ -6402,6 +6402,28 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.15) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5 -+$as_echo "2.15 family" >&6; } -+ -+$as_echo "#define GLIBC_2_15 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; -+ -+ 2.16) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5 -+$as_echo "2.16 family" >&6; } -+ -+$as_echo "#define GLIBC_2_16 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; -+ - darwin) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 - $as_echo "Darwin" >&6; } -@@ -6422,7 +6433,7 @@ - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; - esac diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD deleted file mode 100644 index 6b303a952..000000000 --- a/testing/vlc/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 163068 2012-07-06 15:22:25Z ibiru $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> - -pkgname=vlc -pkgver=2.0.2 -pkgrel=2 -pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" -arch=('i686' 'x86_64') -url="http://www.videolan.org/vlc/" -license=('LGPL2.1' 'GPL2') -depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' - 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms' 'ttf-freefont') -makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils' - 'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' - 'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss' - 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager') -optdepends=('avahi: for service discovery using bonjour protocol' - 'libnotify: for notification plugin' - 'ncurses: for ncurses interface support' - 'libdvdcss: for decoding encrypted DVDs' - 'lirc-utils: for lirc plugin' - 'libavc1394: for devices using the 1394ta AV/C' - 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: vdpau back-end for nvidia' - 'libva-driver-intel: back-end for intel cards' - 'libbluray: for Blu-Ray support' - 'flac: for Free Lossless Audio Codec plugin' - 'oss: for OSS audio support' - 'portaudio: for portaudio support' - 'twolame: for TwoLAME mpeg2 encoder plugin' - 'projectm: for ProjectM visualisation plugin' - 'libcaca: for colored ASCII art video output' - 'libgme: for libgme plugin' - 'librsvg: for SVG plugin' - 'gnome-vfs: for GNOME Virtual File System support' - 'libgoom2: for libgoom plugin' - 'vcdimager: navigate VCD with libvcdinfo' - 'xosd: for xosd support' - 'aalib: for ASCII art plugin' - 'libmtp: for MTP devices support' - 'fluidsynth: for synthesizer MIDI FluidSynth' - 'smbclient: for SMB access plugin' - 'libcdio: for audio CD playback support') -conflicts=('vlc-plugin') -replaces=('vlc-plugin') -backup=('usr/share/vlc/lua/http/.hosts' - 'usr/share/vlc/lua/http/dialogs/.hosts') -options=('!libtool' '!emptydirs') -install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('93e729cc970a4535b3213dbef0e69528') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c - - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-oss \ - --enable-faad \ - --enable-nls \ - --enable-lirc \ - --enable-pvr \ - --enable-ncurses \ - --enable-realrtsp \ - --enable-xosd \ - --enable-aa \ - --enable-vcdx - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ - "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" - done -} diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install deleted file mode 100644 index dc4961cae..000000000 --- a/testing/vlc/vlc.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/vlc/plugins/plugins-*.dat -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD deleted file mode 100644 index 7fb20c2ac..000000000 --- a/testing/x264/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 163081 2012-07-06 16:26:37Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: damir <damir@archlinux.org> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=x264 -pkgver=20120705 -pkgrel=1 -pkgdesc="free library for encoding H264/AVC video streams" -arch=('i686' 'x86_64') -url="http://www.videolan.org/developers/x264.html" -license=('GPL') -depends=('glibc') -makedepends=('yasm') -source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2) -md5sums=('81e5bec5d5774a4a3f567f14bd94289c') - -build() { - cd "$pkgname-snapshot-$pkgver-2245-stable" - - ./configure --enable-shared - - make -} -package() { - cd "$pkgname-snapshot-$pkgver-2245-stable" - - make DESTDIR="$pkgdir" \ - bindir=/usr/bin \ - libdir=/usr/lib \ - includedir=/usr/include \ - install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD deleted file mode 100644 index 6ebe5c8ab..000000000 --- a/testing/xf86-video-intel/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 162779 2012-06-30 11:55:07Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=xf86-video-intel -pkgname=('xf86-video-intel-uxa' 'xf86-video-intel-sna') -pkgver=2.19.0 -pkgrel=5 -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools') -makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/archive/individual/driver/${pkgbase}-${pkgver}.tar.bz2) -sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - mkdir build-{UXA,SNA} - - pushd build-UXA - ../configure --prefix=/usr --enable-dri --enable-uxa - make - popd - - pushd build-SNA - ../configure --prefix=/usr --enable-dri --enable-sna --enable-vmap - make - popd -} - -package_xf86-video-intel-uxa() { - - pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with UXA acceleration" - provides=('xf86-video-intel') - replaces=('xf86-video-intel') - conflicts=('xf86-video-intel-sna' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install -C build-UXA - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} - -package_xf86-video-intel-sna() { - - pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with SNA acceleration" - provides=('xf86-video-intel') - conflicts=('xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install -C build-SNA - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xine-lib/PKGBUILD b/testing/xine-lib/PKGBUILD deleted file mode 100644 index 98355362b..000000000 --- a/testing/xine-lib/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 163069 2012-07-06 15:22:28Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=xine-lib -pkgver=1.2.2 -pkgrel=1 -pkgdesc="A multimedia playback engine" -arch=('i686' 'x86_64') -url="http://www.xine-project.org" -license=('LGPL' 'GPL') -depends=('libxvmc' 'ffmpeg' 'libxinerama') -makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug' - 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' - 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau') -optdepends=('imagemagick: for using the imagemagick plugin' \ - 'jack: for using the jack plugin' \ - 'vcdimager: for using the vcd plugin' \ - 'mesa: for using the opengl 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' \ - 'libmodplug: for using the modplug plugin' \ - 'libdca: for using the dca plugin' \ - 'a52dec: for using the a52 plugin' \ - 'libmad: for using the mp3 plugin' \ - 'libmpcdec: for using the musepack plugin' \ - 'libcaca: for using the caca plugin' \ - 'libbluray: for using the bluray plugin' \ - 'gnome-vfs: for using the gnome-vfs plugin' \ - 'libvdpau: for using the VDPAU plugin') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) -sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/xorg-xdm/PKGBUILD b/testing/xorg-xdm/PKGBUILD deleted file mode 100644 index 1bcad22de..000000000 --- a/testing/xorg-xdm/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 162974 2012-07-04 13:21:33Z dreisner $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -pkgname=xorg-xdm -pkgver=1.1.11 -pkgrel=3 -pkgdesc="X Display Manager" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'consolekit') -makedepends=('pkgconfig' 'xorg-util-macros' 'systemd' 'xtrans') -backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession) -options=('!libtool') -source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2 - Xsession-loginshell.patch - Xsession-xsm.patch - xdm-consolekit.patch - xdm-1.0.5-sessreg-utmp-fix-bug177890.patch - xdm.pam) -md5sums=('64a1af1f7eb69feae12e75d4cc3aaf19' - '234ae568e7b22cbc09433bb396ff3d80' - '2c30078c50bc653d72eb5114506eb313' - '25c6d8adeed0796d432b2bbf1d83a7e9' - '13032add23a0a8d48a638418094bfc00' - '6de9362b1bf0835026270b20d8029909') -sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47' - 'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff' - '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb' - '10ce850e6a93c6ba68b5d71104b1fd6680ad9760274068512f43a694b1edda76' - '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a' - '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418') - -build() { - cd "${srcdir}/xdm-${pkgver}" - patch -Np0 -i "${srcdir}/Xsession-loginshell.patch" - patch -Np1 -i "${srcdir}/Xsession-xsm.patch" - patch -Np1 -i "${srcdir}/xdm-consolekit.patch" - patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch" - - autoreconf -fi - ./configure --prefix=/usr \ - --disable-xdm-auth \ - --disable-static \ - --with-xdmconfigdir=/etc/X11/xdm \ - --with-xdmscriptdir=/etc/X11/xdm \ - --with-pixmapdir=/usr/share/xdm/pixmaps - make -} - -package() { - cd "${srcdir}/xdm-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/var/lib/xdm" - install -m755 -d "${pkgdir}/etc/pam.d" - install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/* - - sed -i 's|^Alias=.*|Alias=display-manager.service|' \ - "$pkgdir/usr/lib/systemd/system/xdm.service" -} diff --git a/testing/xorg-xdm/Xsession-loginshell.patch b/testing/xorg-xdm/Xsession-loginshell.patch deleted file mode 100644 index 3710752ef..000000000 --- a/testing/xorg-xdm/Xsession-loginshell.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- config/Xsession.cpp.orig 2008-06-21 13:57:36.000000000 +0000 -+++ config/Xsession.cpp 2008-06-21 14:01:25.000000000 +0000 -@@ -56,11 +56,7 @@ - resources=$HOME/.Xresources - - if [ -s "$startup" ]; then -- if [ -x "$startup" ]; then -- exec "$startup" -- else -- exec /bin/sh "$startup" -- fi -+ exec /bin/sh -ls -c "$startup" - else - if [ -r "$resources" ]; then - BINDIR/xrdb -load "$resources" diff --git a/testing/xorg-xdm/Xsession-xsm.patch b/testing/xorg-xdm/Xsession-xsm.patch deleted file mode 100644 index a2d4d6cc6..000000000 --- a/testing/xorg-xdm/Xsession-xsm.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur xdm-1.1.8-orig/config/Xsession.cpp xdm-1.1.8/config/Xsession.cpp ---- xdm-1.1.8-orig/config/Xsession.cpp 2008-05-21 14:08:45.000000000 -0400 -+++ xdm-1.1.8/config/Xsession.cpp 2009-04-28 02:56:11.000000000 -0400 -@@ -54,6 +54,7 @@ - - startup=$HOME/.xsession - resources=$HOME/.Xresources -+xinitrc=$HOME/.xinitrc - - if [ -s "$startup" ]; then - if [ -x "$startup" ]; then -@@ -83,5 +84,9 @@ - exec `eval $XDESKTOP` - } - #endif -- exec BINDIR/xsm -+ if [ -r "$xinitrc" ]; then -+ exec /bin/sh -ls -c "$xinitrc" -+ else -+ exec /bin/sh -l /etc/X11/xinit/xinitrc -+ fi - fi diff --git a/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch deleted file mode 100644 index 195858883..000000000 --- a/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- config/GiveConsole.sessreg-utmp-fix-bug177890 2006-07-24 04:20:10.000000000 -0400 -+++ config/GiveConsole 2006-07-24 04:21:16.000000000 -0400 -@@ -8,3 +8,5 @@ - # causing serious grief. - # - chown $USER /dev/console -+exec /usr/bin/sessreg -a -w "/var/log/wtmp" -u "/run/utmp" \ -+ -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER diff --git a/testing/xorg-xdm/xdm-consolekit.patch b/testing/xorg-xdm/xdm-consolekit.patch deleted file mode 100644 index c52a26138..000000000 --- a/testing/xorg-xdm/xdm-consolekit.patch +++ /dev/null @@ -1,225 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -362,6 +362,20 @@ - - AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes) - -+# ConsoleKit support -+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]), -+ [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes]) -+if test x"$USE_CONSOLEKIT" != xno; then -+ PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector, -+ [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no]) -+ if test x"$USE_CONSOLEKIT" = xyes; then -+ AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit]) -+ XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT" -+ XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS" -+ fi -+fi -+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes) -+ - # - # XDM - # ---- a/xdm/session.c -+++ b/xdm/session.c -@@ -66,6 +66,11 @@ - #endif - #endif /* USE_PAM */ - -+#ifdef USE_CONSOLEKIT -+#include <ck-connector.h> -+#include <dbus/dbus.h> -+#endif -+ - #ifdef __SCO__ - #include <prot.h> - #endif -@@ -472,6 +477,97 @@ - } - } - -+#ifdef USE_CONSOLEKIT -+ -+static CkConnector *connector; -+ -+static int openCKSession(struct verify_info *verify, struct display *d) -+{ -+ int ret; -+ DBusError error; -+ char *remote_host_name = ""; -+ dbus_bool_t is_local; -+ char *display_name = ""; -+ char *display_device = ""; -+ char devtmp[16]; -+ -+ if (!use_consolekit) -+ return 1; -+ -+ is_local = d->displayType.location == Local; -+ if (d->peerlen > 0 && d->peer) -+ remote_host_name = d->peer; -+ if (d->name) -+ display_name = d->name; -+ /* how can we get the corresponding tty at best...? */ -+ if (d->windowPath) { -+ display_device = strchr(d->windowPath, ':'); -+ if (display_device && display_device[1]) -+ display_device++; -+ else -+ display_device = d->windowPath; -+ snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device); -+ display_device = devtmp; -+ } -+ -+ connector = ck_connector_new(); -+ if (!connector) { -+ LogOutOfMem("ck_connector"); -+ return 0; -+ } -+ -+ dbus_error_init(&error); -+ ret = ck_connector_open_session_with_parameters( -+ connector, &error, -+ "unix-user", &verify->uid, -+ "x11-display", &display_name, -+ "x11-display-device", &display_device, -+ "remote-host-name", &remote_host_name, -+ "is-local", &is_local, -+ NULL); -+ if (!ret) { -+ if (dbus_error_is_set(&error)) { -+ LogError("Dbus error: %s\n", error.message); -+ dbus_error_free(&error); -+ } else { -+ LogError("ConsoleKit error\n"); -+ } -+ LogError("console-kit-daemon not running?\n"); -+ ck_connector_unref(connector); -+ connector = NULL; -+ return 1; -+ } -+ -+ verify->userEnviron = setEnv(verify->userEnviron, -+ "XDG_SESSION_COOKIE", ck_connector_get_cookie(connector)); -+ return 1; -+} -+ -+static void closeCKSession(void) -+{ -+ DBusError error; -+ -+ if (!connector) -+ return; -+ -+ dbus_error_init(&error); -+ if (!ck_connector_close_session(connector, &error)) { -+ if (dbus_error_is_set(&error)) { -+ LogError("Dbus error: %s\n", error.message); -+ dbus_error_free(&error); -+ } else { -+ LogError("ConsoleKit close error\n"); -+ } -+ LogError("console-kit-daemon not running?\n"); -+ } -+ ck_connector_unref(connector); -+ connector = NULL; -+} -+#else -+#define openCKSession(v,d) 1 -+#define closeCKSession() -+#endif -+ - void - SessionExit (struct display *d, int status, int removeAuth) - { -@@ -486,6 +580,8 @@ - } - #endif - -+ closeCKSession(); -+ - /* make sure the server gets reset after the session is over */ - if (d->serverPid >= 2 && d->resetSignal) - kill (d->serverPid, d->resetSignal); -@@ -568,6 +664,10 @@ - #ifdef USE_PAM - if (pamh) pam_open_session(pamh, 0); - #endif -+ -+ if (!openCKSession(verify, d)) -+ return 0; -+ - switch (pid = fork ()) { - case 0: - CleanUpChild (); ---- a/include/dm.h -+++ b/include/dm.h -@@ -325,6 +325,9 @@ - extern char *prngdSocket; - extern int prngdPort; - # endif -+#ifdef USE_CONSOLEKIT -+extern int use_consolekit; -+#endif - - extern char *greeterLib; - extern char *willing; ---- a/xdm/resource.c -+++ b/xdm/resource.c -@@ -68,6 +68,9 @@ - char *prngdSocket; - int prngdPort; - #endif -+#ifdef USE_CONSOLEKIT -+int use_consolekit; -+#endif - - char *greeterLib; - char *willing; -@@ -258,6 +261,10 @@ - "false"} , - { "willing", "Willing", DM_STRING, &willing, - ""} , -+#ifdef USE_CONSOLEKIT -+{ "consoleKit", "ConsoleKit", DM_BOOL, (char **) &use_consolekit, -+ "true"} , -+#endif - }; - - # define NUM_DM_RESOURCES (sizeof DmResources / sizeof DmResources[0]) -@@ -440,7 +447,11 @@ - {"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL }, - {"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL }, - {"-daemon", ".daemonMode", XrmoptionNoArg, "true" }, --{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" } -+{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" }, -+#ifdef USE_CONSOLEKIT -+{"-consolekit", ".consoleKit", XrmoptionNoArg, "true" }, -+{"-noconsolekit", ".consoleKit", XrmoptionNoArg, "false" } -+#endif - }; - - static int originalArgc; ---- a/man/xdm.man -+++ b/man/xdm.man -@@ -51,6 +51,8 @@ - ] [ - .B \-session - .I session_program -+] [ -+.B \-noconsolekit - ] - .SH DESCRIPTION - .I Xdm -@@ -218,6 +220,10 @@ - .IP "\fB\-xrm\fP \fIresource_specification\fP" - Allows an arbitrary resource to be specified, as in most - X Toolkit applications. -+.IP "\fB\-noconsolekit\fP" -+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP -+resource. -+This suppresses the session management using ConsoleKit. - .SH RESOURCES - At many stages the actions of - .I xdm diff --git a/testing/xorg-xdm/xdm.pam b/testing/xorg-xdm/xdm.pam deleted file mode 100644 index a0b601db6..000000000 --- a/testing/xorg-xdm/xdm.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so -auth required pam_env.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so -session required pam_loginuid.so --session optional pam_systemd.so |
